diff --git a/REUSE.toml b/REUSE.toml
index 109e90b40..95b680d93 100644
--- a/REUSE.toml
+++ b/REUSE.toml
@@ -12,7 +12,7 @@ SPDX-FileCopyrightText = "Copyright (c) 2019 B.Hoppe"
 SPDX-License-Identifier = "MIT"
 
 [[annotations]]
-path = "src/blackgui/**.ui"
+path = "src/gui/**.ui"
 precedence = "aggregate"
 SPDX-FileCopyrightText = "Copyright (C) swift Project Community / Contributors"
 SPDX-License-Identifier = "GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1"
diff --git a/samples/hotkey/main.cpp b/samples/hotkey/main.cpp
index 096e97bde..a151b9f24 100644
--- a/samples/hotkey/main.cpp
+++ b/samples/hotkey/main.cpp
@@ -5,13 +5,13 @@
 //! \ingroup samplehotkey
 
 #include "misc/directoryutils.h"
-#include "blackgui/components/settingshotkeycomponent.h"
-#include "blackgui/guiapplication.h"
+#include "gui/components/settingshotkeycomponent.h"
+#include "gui/guiapplication.h"
 
 #include <QApplication>
 
 using namespace swift::misc;
-using namespace BlackGui;
+using namespace swift::gui;
 
 //! main
 int main(int argc, char *argv[])
@@ -19,7 +19,7 @@ int main(int argc, char *argv[])
     CGuiApplication::highDpiScreenSupport();
     QApplication qa(argc, argv);
     CGuiApplication a("samplehotkey", swift::misc::CApplicationInfo::Sample, QPixmap());
-    BlackGui::Components::CSettingsHotkeyComponent w;
+    swift::gui::components::CSettingsHotkeyComponent w;
     w.show();
     return a.exec();
 }
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a1ab7fbc2..5a5dbf9f9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,7 +4,7 @@
 add_subdirectory(config)
 add_subdirectory(core)
 add_subdirectory(misc)
-add_subdirectory(blackgui)
+add_subdirectory(gui)
 add_subdirectory(input)
 add_subdirectory(sound)
 
diff --git a/src/blackgui/blackguiexport.h b/src/blackgui/blackguiexport.h
deleted file mode 100644
index 86fd809a4..000000000
--- a/src/blackgui/blackguiexport.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
-// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
-
-//! \file
-
-#ifndef BLACKGUI_BLACKGUIEXPORT_H
-#define BLACKGUI_BLACKGUIEXPORT_H
-
-#include <QtGlobal>
-
-/*!
- * \def BLACKGUI_EXPORT
- * Export a class or function from the library
- */
-#ifndef WITH_STATIC
-#    if defined(BUILD_BLACKGUI_LIB)
-#        define BLACKGUI_EXPORT Q_DECL_EXPORT
-#    else
-#        define BLACKGUI_EXPORT Q_DECL_IMPORT
-#    endif
-#else
-#    define BLACKGUI_EXPORT
-#endif
-
-/*!
- * \def BLACKGUI_EXPORT_DECLARE_TEMPLATE
- * BLACKGUI Export explicit template declaration
- */
-#if defined(Q_OS_WIN) && defined(Q_CC_GNU)
-#    define BLACKGUI_EXPORT_DECLARE_TEMPLATE BLACKGUI_EXPORT
-#else
-#    define BLACKGUI_EXPORT_DECLARE_TEMPLATE
-#endif
-
-#endif // guard
diff --git a/src/blackgui/components/allmaininfoareacomponents.h b/src/blackgui/components/allmaininfoareacomponents.h
deleted file mode 100644
index 6f0f08247..000000000
--- a/src/blackgui/components/allmaininfoareacomponents.h
+++ /dev/null
@@ -1,18 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (C) 2014 swift Project Community / Contributors
-// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
-
-#ifndef BLACKGUI_ALLMAININFOAREACOMPONENTS_H
-#define BLACKGUI_ALLMAININFOAREACOMPONENTS_H
-
-#include "blackgui/components/atcstationcomponent.h"
-#include "blackgui/components/aircraftcomponent.h"
-#include "blackgui/components/cockpitcomponent.h"
-#include "blackgui/components/usercomponent.h"
-#include "blackgui/components/mappingcomponent.h"
-#include "blackgui/components/textmessagecomponent.h"
-#include "blackgui/components/simulatorcomponent.h"
-#include "blackgui/components/flightplancomponent.h"
-#include "blackgui/components/settingscomponent.h"
-#include "blackgui/components/logcomponent.h"
-
-#endif // guard
diff --git a/src/blackgui/models/allmodels.h b/src/blackgui/models/allmodels.h
deleted file mode 100644
index e68cbcf39..000000000
--- a/src/blackgui/models/allmodels.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
-// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
-
-#ifndef BLACKGUI_MODELS_ALLMODELS_H
-#define BLACKGUI_MODELS_ALLMODELS_H
-
-#include "blackgui/models/actionhotkeylistmodel.h"
-#include "blackgui/models/aircrafticaolistmodel.h"
-#include "blackgui/models/aircraftcategorylistmodel.h"
-#include "blackgui/models/aircraftmodellistmodel.h"
-#include "blackgui/models/aircraftpartslistmodel.h"
-#include "blackgui/models/aircraftsituationlistmodel.h"
-#include "blackgui/models/aircraftsituationchangelistmodel.h"
-#include "blackgui/models/airlineicaolistmodel.h"
-#include "blackgui/models/airportlistmodel.h"
-#include "blackgui/models/applicationinfolistmodel.h"
-#include "blackgui/models/atcstationlistmodel.h"
-#include "blackgui/models/audiodeviceinfolistmodel.h"
-#include "blackgui/models/clientlistmodel.h"
-#include "blackgui/models/cloudlayerlistmodel.h"
-#include "blackgui/models/countrylistmodel.h"
-#include "blackgui/models/distributorlistmodel.h"
-#include "blackgui/models/identifierlistmodel.h"
-#include "blackgui/models/interpolationsetupmodel.h"
-#include "blackgui/models/liverylistmodel.h"
-#include "blackgui/models/matchingstatisticsmodel.h"
-#include "blackgui/models/namevariantpairlistmodel.h"
-#include "blackgui/models/serverlistmodel.h"
-#include "blackgui/models/simulatedaircraftlistmodel.h"
-#include "blackgui/models/statusmessagelistmodel.h"
-#include "blackgui/models/textmessagelistmodel.h"
-#include "blackgui/models/userlistmodel.h"
-#include "blackgui/models/windlayerlistmodel.h"
-
-#endif // guard
diff --git a/src/blackgui/registermetadata.cpp b/src/blackgui/registermetadata.cpp
deleted file mode 100644
index fbf44231d..000000000
--- a/src/blackgui/registermetadata.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (C) 2016 swift Project Community / Contributors
-// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
-
-#include "blackgui/registermetadata.h"
-#include "blackgui/settings/dockwidgetsettings.h"
-#include "blackgui/settings/navigatorsettings.h"
-#include "blackgui/settings/viewupdatesettings.h"
-#include "blackgui/settings/guisettings.h"
-#include "blackgui/settings/textmessagesettings.h"
-#include "blackgui/components/registermetadatacomponents.h"
-
-namespace BlackGui
-{
-    void registerMetadata()
-    {
-        BlackGui::Settings::CDockWidgetSettings::registerMetadata();
-        BlackGui::Settings::CNavigatorSettings::registerMetadata();
-        BlackGui::Settings::CViewUpdateSettings::registerMetadata();
-        BlackGui::Settings::CGeneralGuiSettings::registerMetadata();
-        BlackGui::Settings::CTextMessageSettings::registerMetadata();
-        BlackGui::Components::registerMetadata();
-    }
-}
diff --git a/src/blackgui/views/aircraftpartsview.h b/src/blackgui/views/aircraftpartsview.h
deleted file mode 100644
index 6994bb536..000000000
--- a/src/blackgui/views/aircraftpartsview.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (C) 2018 swift Project Community / Contributors
-// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
-
-//! \file
-
-#ifndef BLACKGUI_VIEWS_AIRCRAFTPARTSVIEW_H
-#define BLACKGUI_VIEWS_AIRCRAFTPARTSVIEW_H
-
-#include "blackgui/views/viewtimestampobjects.h"
-#include "blackgui/models/aircraftpartslistmodel.h"
-#include "blackgui/blackguiexport.h"
-
-namespace BlackGui::Views
-{
-    //! Aircraft parts
-    class BLACKGUI_EXPORT CAircraftPartsView : public CViewWithTimestampWithOffsetObjects<Models::CAircraftPartsListModel>
-    {
-        Q_OBJECT
-
-    public:
-        //! Constructor
-        explicit CAircraftPartsView(QWidget *parent = nullptr);
-    };
-} // ns
-
-#endif // guard
diff --git a/src/blackgui/views/distributorview.h b/src/blackgui/views/distributorview.h
deleted file mode 100644
index 005b08e3b..000000000
--- a/src/blackgui/views/distributorview.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
-// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
-
-//! \file
-
-#ifndef BLACKGUI_VIEWS_DISTRIBUTORVIEW_H
-#define BLACKGUI_VIEWS_DISTRIBUTORVIEW_H
-
-#include "blackgui/blackguiexport.h"
-#include "blackgui/models/distributorlistmodel.h"
-#include "blackgui/views/viewdbobjects.h"
-
-class QString;
-class QWidget;
-
-namespace swift::misc::simulation
-{
-    class CDistributor;
-    class CDistributorList;
-}
-
-namespace BlackGui::Views
-{
-    //! Distributors
-    class BLACKGUI_EXPORT CDistributorView :
-        public COrderableViewWithDbObjects<BlackGui::Models::CDistributorListModel>
-    {
-        Q_OBJECT
-
-    public:
-        //! Constructor
-        explicit CDistributorView(QWidget *parent = nullptr);
-
-        //! Set mode
-        void setDistributorMode(BlackGui::Models::CDistributorListModel::DistributorMode distributorMode);
-
-        //! Mode
-        BlackGui::Models::CDistributorListModel::DistributorMode getDistributorMode() const;
-    };
-} // ns
-#endif // guard
diff --git a/src/blackgui/views/viewbaseaviation.cpp b/src/blackgui/views/viewbaseaviation.cpp
deleted file mode 100644
index ba49d25da..000000000
--- a/src/blackgui/views/viewbaseaviation.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (C) 2018 swift Project Community / Contributors
-// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
-
-#include "viewbase.cpp"
-
-namespace BlackGui::Views
-{
-    template class CViewBase<BlackGui::Models::CAircraftPartsListModel>;
-    template class CViewBase<BlackGui::Models::CAircraftSituationListModel>;
-    template class CViewBase<BlackGui::Models::CAircraftSituationChangeListModel>;
-    template class CViewBase<BlackGui::Models::CAirlineIcaoCodeListModel>;
-    template class CViewBase<BlackGui::Models::CAircraftCategoryListModel>;
-    template class CViewBase<BlackGui::Models::CAircraftIcaoCodeListModel>;
-    template class CViewBase<BlackGui::Models::CAirportListModel>;
-    template class CViewBase<BlackGui::Models::CAtcStationListModel>;
-    template class CViewBase<BlackGui::Models::CLiveryListModel>;
-} // namespace
diff --git a/src/blackgui/views/viewbasemisc.cpp b/src/blackgui/views/viewbasemisc.cpp
deleted file mode 100644
index f192585ed..000000000
--- a/src/blackgui/views/viewbasemisc.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (C) 2018 swift Project Community / Contributors
-// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
-
-#include "viewbase.cpp"
-
-namespace BlackGui::Views
-{
-    template class CViewBase<BlackGui::Models::CApplicationInfoListModel>;
-    template class CViewBase<BlackGui::Models::CCountryListModel>;
-    template class CViewBase<BlackGui::Models::CStatusMessageListModel>;
-    template class CViewBase<BlackGui::Models::CIdentifierListModel>;
-    template class CViewBase<BlackGui::Models::CNameVariantPairModel>;
-
-    template class CViewBase<BlackGui::Models::CAudioDeviceInfoListModel>;
-
-} // namespace
diff --git a/src/blackgui/views/viewbasenetwork.cpp b/src/blackgui/views/viewbasenetwork.cpp
deleted file mode 100644
index a830299c8..000000000
--- a/src/blackgui/views/viewbasenetwork.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (C) 2018 swift Project Community / Contributors
-// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
-
-#include "viewbase.cpp"
-
-namespace BlackGui::Views
-{
-    template class CViewBase<BlackGui::Models::CClientListModel>;
-    template class CViewBase<BlackGui::Models::CServerListModel>;
-    template class CViewBase<BlackGui::Models::CTextMessageListModel>;
-    template class CViewBase<BlackGui::Models::CUserListModel>;
-} // namespace
diff --git a/src/blackgui/views/viewbasesimulation.cpp b/src/blackgui/views/viewbasesimulation.cpp
deleted file mode 100644
index a7d3793e2..000000000
--- a/src/blackgui/views/viewbasesimulation.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (C) 2018 swift Project Community / Contributors
-// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
-
-#include "viewbase.cpp"
-
-namespace BlackGui::Views
-{
-    template class CViewBase<BlackGui::Models::CAircraftModelListModel>;
-    template class CViewBase<BlackGui::Models::CDistributorListModel>;
-    template class CViewBase<BlackGui::Models::CInterpolationSetupListModel>;
-    template class CViewBase<BlackGui::Models::CMatchingStatisticsModel>;
-    template class CViewBase<BlackGui::Models::CSimulatedAircraftListModel>;
-} // namespace
diff --git a/src/core/application.h b/src/core/application.h
index 6b89b7228..97f1dbd08 100644
--- a/src/core/application.h
+++ b/src/core/application.h
@@ -83,7 +83,7 @@ namespace swift::core
      * - If applicable VATSIM status data (where are the VATSIM files?) are loaded
      * - An end of lifetime can be specified, aka time bombing
      *
-     * \sa BlackGui::CGuiApplication for the GUI version of application
+     * \sa swift::gui::CGuiApplication for the GUI version of application
      */
     class SWIFT_CORE_EXPORT CApplication :
         public QObject,
@@ -526,7 +526,7 @@ namespace swift::core
         //! Startup completed
         virtual void onStartUpCompleted();
 
-        //! Init class, allows to init from BlackGui::CGuiApplication as well (pseudo virtual)
+        //! Init class, allows to init from swift::gui::CGuiApplication as well (pseudo virtual)
         void init(bool withMetadata);
 
         //! Is the command line option represented in the given arguments?
diff --git a/src/core/pluginmanagersimulator.cpp b/src/core/pluginmanagersimulator.cpp
index 0e0de0280..637f6d976 100644
--- a/src/core/pluginmanagersimulator.cpp
+++ b/src/core/pluginmanagersimulator.cpp
@@ -101,7 +101,7 @@ namespace swift::core
     {
         return {
             QStringLiteral("org.swift-project.swift_core.simulatorinterface"),
-            QStringLiteral("org.swift-project.blackgui.pluginconfiginterface")
+            QStringLiteral("org.swift-project.swiftgui.pluginconfiginterface")
         };
     }
 
diff --git a/src/core/swiftcore.dox b/src/core/swiftcore.dox
index c0bc753ef..4f07b3830 100644
--- a/src/core/swiftcore.dox
+++ b/src/core/swiftcore.dox
@@ -30,7 +30,7 @@
  */
 
 /*!
- * \namespace swift::core::Settings::Network
+ * \namespace swift::core::settings::Network
  * Network settings traits.
  */
 
diff --git a/src/blackgui/CMakeLists.txt b/src/gui/CMakeLists.txt
similarity index 99%
rename from src/blackgui/CMakeLists.txt
rename to src/gui/CMakeLists.txt
index 870088d58..5fb6b8bf5 100644
--- a/src/blackgui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -275,7 +275,7 @@ add_library(gui SHARED
         editors/pbhsform.h
         editors/aircrafticaoform.cpp
         editors/cockpitcomform.h
-        blackguiexport.h
+        swiftguiexport.h
         pluginselector.cpp
         levelmeter.cpp
         loadindicator.h
@@ -918,7 +918,7 @@ target_link_libraries(gui
         Qt::Svg
         )
 
-target_compile_definitions(gui PRIVATE BUILD_BLACKGUI_LIB)
+target_compile_definitions(gui PRIVATE BUILD_SWIFT_GUI_LIB)
 
 target_precompile_headers(gui
         PRIVATE
diff --git a/src/blackgui/altitudeedit.cpp b/src/gui/altitudeedit.cpp
similarity index 98%
rename from src/blackgui/altitudeedit.cpp
rename to src/gui/altitudeedit.cpp
index e1e1e2f10..900ed4e64 100644
--- a/src/blackgui/altitudeedit.cpp
+++ b/src/gui/altitudeedit.cpp
@@ -9,7 +9,7 @@ using namespace swift::misc;
 using namespace swift::misc::aviation;
 using namespace swift::misc::physical_quantities;
 
-namespace BlackGui
+namespace swift::gui
 {
     CAltitudeEdit::CAltitudeEdit(QWidget *parent) : QLineEdit(parent)
     {
diff --git a/src/blackgui/altitudeedit.h b/src/gui/altitudeedit.h
similarity index 81%
rename from src/blackgui/altitudeedit.h
rename to src/gui/altitudeedit.h
index eb87f7a47..f96a3eb07 100644
--- a/src/blackgui/altitudeedit.h
+++ b/src/gui/altitudeedit.h
@@ -3,21 +3,21 @@
 
 //! \file
 
-#ifndef BLACKGUI_ALTITUDEEDIT_H
-#define BLACKGUI_ALTITUDEEDIT_H
+#ifndef SWIFT_GUI_ALTITUDEEDIT_H
+#define SWIFT_GUI_ALTITUDEEDIT_H
 
 #include "misc/aviation/altitude.h"
 #include "misc/statusmessagelist.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include <QLineEdit>
 #include <QRegularExpression>
 
-namespace BlackGui
+namespace swift::gui
 {
     /*!
      * Line edit for altitude as used in flight plan
      */
-    class BLACKGUI_EXPORT CAltitudeEdit : public QLineEdit
+    class SWIFT_GUI_EXPORT CAltitudeEdit : public QLineEdit
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/aboutdialog.cpp b/src/gui/components/aboutdialog.cpp
similarity index 95%
rename from src/blackgui/components/aboutdialog.cpp
rename to src/gui/components/aboutdialog.cpp
index 55e54dd12..f1c6cf7c9 100644
--- a/src/blackgui/components/aboutdialog.cpp
+++ b/src/gui/components/aboutdialog.cpp
@@ -4,11 +4,11 @@
 #include "aboutdialog.h"
 #include "ui_aboutdialog.h"
 
-#include "blackgui/guiapplication.h"
-#include "blackgui/guiutility.h"
+#include "gui/guiapplication.h"
+#include "gui/guiutility.h"
 #include "misc/fileutils.h"
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CAboutDialog::CAboutDialog(QWidget *parent) : QDialog(parent), ui(new Ui::CAboutDialog)
     {
diff --git a/src/blackgui/components/aboutdialog.h b/src/gui/components/aboutdialog.h
similarity index 86%
rename from src/blackgui/components/aboutdialog.h
rename to src/gui/components/aboutdialog.h
index a6c9a67d1..d84d5507f 100644
--- a/src/blackgui/components/aboutdialog.h
+++ b/src/gui/components/aboutdialog.h
@@ -3,8 +3,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_ABOUTDIALOG_H
-#define BLACKGUI_COMPONENTS_ABOUTDIALOG_H
+#ifndef SWIFT_GUI_COMPONENTS_ABOUTDIALOG_H
+#define SWIFT_GUI_COMPONENTS_ABOUTDIALOG_H
 
 #include <QDialog>
 #include <QScopedPointer>
@@ -13,7 +13,7 @@ namespace Ui
 {
     class CAboutDialog;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * About dialog
diff --git a/src/blackgui/components/aboutdialog.ui b/src/gui/components/aboutdialog.ui
similarity index 100%
rename from src/blackgui/components/aboutdialog.ui
rename to src/gui/components/aboutdialog.ui
diff --git a/src/blackgui/components/abouthtmlcomponent.cpp b/src/gui/components/abouthtmlcomponent.cpp
similarity index 97%
rename from src/blackgui/components/abouthtmlcomponent.cpp
rename to src/gui/components/abouthtmlcomponent.cpp
index dadc96ee9..46034e988 100644
--- a/src/blackgui/components/abouthtmlcomponent.cpp
+++ b/src/gui/components/abouthtmlcomponent.cpp
@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright (C) 2018 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/guiapplication.h"
+#include "gui/guiapplication.h"
 #include "misc/fileutils.h"
 #include "misc/directoryutils.h"
 #include "abouthtmlcomponent.h"
@@ -17,7 +17,7 @@
 
 using namespace swift::misc;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CAboutHtmlComponent::CAboutHtmlComponent(QWidget *parent) : QFrame(parent),
                                                                 ui(new Ui::CAboutHtmlComponent)
diff --git a/src/blackgui/components/abouthtmlcomponent.h b/src/gui/components/abouthtmlcomponent.h
similarity index 77%
rename from src/blackgui/components/abouthtmlcomponent.h
rename to src/gui/components/abouthtmlcomponent.h
index 6e69648b2..d688aded5 100644
--- a/src/blackgui/components/abouthtmlcomponent.h
+++ b/src/gui/components/abouthtmlcomponent.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_ABOUTHTMLCOMPONENT_H
-#define BLACKGUI_COMPONENTS_ABOUTHTMLCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_ABOUTHTMLCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_ABOUTHTMLCOMPONENT_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include <QUrl>
 #include <QFrame>
 #include <QScopedPointer>
@@ -15,12 +15,12 @@ namespace Ui
 {
     class CAboutHtmlComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Display the HTML info "about swift"
      */
-    class BLACKGUI_EXPORT CAboutHtmlComponent : public QFrame
+    class SWIFT_GUI_EXPORT CAboutHtmlComponent : public QFrame
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/abouthtmlcomponent.ui b/src/gui/components/abouthtmlcomponent.ui
similarity index 100%
rename from src/blackgui/components/abouthtmlcomponent.ui
rename to src/gui/components/abouthtmlcomponent.ui
diff --git a/src/blackgui/components/aircraftcombinedtypeselector.cpp b/src/gui/components/aircraftcombinedtypeselector.cpp
similarity index 96%
rename from src/blackgui/components/aircraftcombinedtypeselector.cpp
rename to src/gui/components/aircraftcombinedtypeselector.cpp
index c4e4f341b..b0a2d50e3 100644
--- a/src/blackgui/components/aircraftcombinedtypeselector.cpp
+++ b/src/gui/components/aircraftcombinedtypeselector.cpp
@@ -1,9 +1,9 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/aircraftcombinedtypeselector.h"
-#include "blackgui/guiutility.h"
-#include "blackgui/uppercasevalidator.h"
+#include "gui/components/aircraftcombinedtypeselector.h"
+#include "gui/guiutility.h"
+#include "gui/uppercasevalidator.h"
 #include "misc/aviation/aircrafticaocode.h"
 #include "ui_aircraftcombinedtypeselector.h"
 
@@ -14,7 +14,7 @@
 
 using namespace swift::misc::aviation;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CAircraftCombinedTypeSelector::CAircraftCombinedTypeSelector(QWidget *parent) : QFrame(parent),
                                                                                     ui(new Ui::CAircraftCombinedTypeSelector)
diff --git a/src/blackgui/components/aircraftcombinedtypeselector.h b/src/gui/components/aircraftcombinedtypeselector.h
similarity index 87%
rename from src/blackgui/components/aircraftcombinedtypeselector.h
rename to src/gui/components/aircraftcombinedtypeselector.h
index c6892ebb8..3e7ea8963 100644
--- a/src/blackgui/components/aircraftcombinedtypeselector.h
+++ b/src/gui/components/aircraftcombinedtypeselector.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_AIRCRAFTCOMBINEDTYPESELECTOR_H
-#define BLACKGUI_AIRCRAFTCOMBINEDTYPESELECTOR_H
+#ifndef SWIFT_GUI_AIRCRAFTCOMBINEDTYPESELECTOR_H
+#define SWIFT_GUI_AIRCRAFTCOMBINEDTYPESELECTOR_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include "misc/aviation/aircrafticaocode.h"
 
 #include <QFrame>
@@ -22,12 +22,12 @@ namespace swift::misc::aviation
 {
     class CAircraftIcaoCode;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Select by comined type ("L2J", "H1T", ...)
      */
-    class BLACKGUI_EXPORT CAircraftCombinedTypeSelector : public QFrame
+    class SWIFT_GUI_EXPORT CAircraftCombinedTypeSelector : public QFrame
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/aircraftcombinedtypeselector.ui b/src/gui/components/aircraftcombinedtypeselector.ui
similarity index 100%
rename from src/blackgui/components/aircraftcombinedtypeselector.ui
rename to src/gui/components/aircraftcombinedtypeselector.ui
diff --git a/src/blackgui/components/aircraftcomponent.cpp b/src/gui/components/aircraftcomponent.cpp
similarity index 93%
rename from src/blackgui/components/aircraftcomponent.cpp
rename to src/gui/components/aircraftcomponent.cpp
index 49e03e8b4..2cf31ff1a 100644
--- a/src/blackgui/components/aircraftcomponent.cpp
+++ b/src/gui/components/aircraftcomponent.cpp
@@ -1,14 +1,14 @@
 // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/aircraftcomponent.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/guiutility.h"
-#include "blackgui/infoarea.h"
-#include "blackgui/models/simulatedaircraftlistmodel.h"
-#include "blackgui/views/airportview.h"
-#include "blackgui/views/simulatedaircraftview.h"
-#include "blackgui/views/viewbase.h"
+#include "gui/components/aircraftcomponent.h"
+#include "gui/guiapplication.h"
+#include "gui/guiutility.h"
+#include "gui/infoarea.h"
+#include "gui/models/simulatedaircraftlistmodel.h"
+#include "gui/views/airportview.h"
+#include "gui/views/simulatedaircraftview.h"
+#include "gui/views/viewbase.h"
 #include "core/context/contextnetwork.h"
 #include "core/context/contextsimulator.h"
 #include "core/context/contextownaircraft.h"
@@ -21,17 +21,17 @@
 #include <QTimer>
 #include <QPointer>
 
-using namespace BlackGui;
-using namespace BlackGui::Views;
-using namespace BlackGui::Models;
-using namespace BlackGui::Settings;
+using namespace swift::gui;
+using namespace swift::gui::views;
+using namespace swift::gui::models;
+using namespace swift::gui::settings;
 using namespace swift::core;
 using namespace swift::core::context;
 using namespace swift::misc::network;
 using namespace swift::misc::simulation;
 using namespace swift::misc::physical_quantities;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CAircraftComponent::CAircraftComponent(QWidget *parent) : QTabWidget(parent),
                                                               ui(new Ui::CAircraftComponent)
diff --git a/src/blackgui/components/aircraftcomponent.h b/src/gui/components/aircraftcomponent.h
similarity index 80%
rename from src/blackgui/components/aircraftcomponent.h
rename to src/gui/components/aircraftcomponent.h
index e2c83c230..c812e926d 100644
--- a/src/blackgui/components/aircraftcomponent.h
+++ b/src/gui/components/aircraftcomponent.h
@@ -3,12 +3,12 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_AIRCRAFTCOMPONENT_H
-#define BLACKGUI_COMPONENTS_AIRCRAFTCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_AIRCRAFTCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_AIRCRAFTCOMPONENT_H
 
-#include "blackgui/settings/viewupdatesettings.h"
-#include "blackgui/enablefordockwidgetinfoarea.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/settings/viewupdatesettings.h"
+#include "gui/enablefordockwidgetinfoarea.h"
+#include "gui/swiftguiexport.h"
 #include "misc/network/connectionstatus.h"
 
 #include <QObject>
@@ -32,14 +32,14 @@ namespace swift::misc
         class CSimulatedAircraft;
     }
 }
-namespace BlackGui
+namespace swift::gui
 {
     class CDockWidgetInfoArea;
 
-    namespace Components
+    namespace components
     {
         //! Aircraft widget
-        class BLACKGUI_EXPORT CAircraftComponent :
+        class SWIFT_GUI_EXPORT CAircraftComponent :
             public QTabWidget,
             public CEnableForDockWidgetInfoArea
         {
@@ -67,7 +67,7 @@ namespace BlackGui
             int countAirportsInRangeInView() const;
 
             //! \copydoc CEnableForDockWidgetInfoArea::setParentDockWidgetInfoArea
-            virtual bool setParentDockWidgetInfoArea(BlackGui::CDockWidgetInfoArea *parentDockableWidget) override;
+            virtual bool setParentDockWidgetInfoArea(swift::gui::CDockWidgetInfoArea *parentDockableWidget) override;
 
             //! Update aircraft/airport view
             void update();
@@ -99,7 +99,7 @@ namespace BlackGui
             void onOwnAircraftMoved(const swift::misc::physical_quantities::CLength &distance);
 
             QScopedPointer<Ui::CAircraftComponent> ui;
-            swift::misc::CSettingReadOnly<BlackGui::Settings::TViewUpdateSettings> m_settings { this, &CAircraftComponent::onSettingsChanged }; //!< settings changed
+            swift::misc::CSettingReadOnly<swift::gui::settings::TViewUpdateSettings> m_settings { this, &CAircraftComponent::onSettingsChanged }; //!< settings changed
             QTimer m_updateTimer;
             int m_updateCounter = 0;
         };
diff --git a/src/blackgui/components/aircraftcomponent.ui b/src/gui/components/aircraftcomponent.ui
similarity index 86%
rename from src/blackgui/components/aircraftcomponent.ui
rename to src/gui/components/aircraftcomponent.ui
index 14957fb67..84d74ddd6 100644
--- a/src/blackgui/components/aircraftcomponent.ui
+++ b/src/gui/components/aircraftcomponent.ui
@@ -37,7 +37,7 @@
      <number>0</number>
     </property>
     <item>
-     <widget class="BlackGui::Views::CSimulatedAircraftView" name="tvp_AircraftInRange">
+     <widget class="swift::gui::views::CSimulatedAircraftView" name="tvp_AircraftInRange">
       <property name="selectionMode">
        <enum>QAbstractItemView::SingleSelection</enum>
       </property>
@@ -72,7 +72,7 @@
      <number>0</number>
     </property>
     <item>
-     <widget class="BlackGui::Views::CAirportView" name="tvp_AirportsInRange">
+     <widget class="swift::gui::views::CAirportView" name="tvp_AirportsInRange">
       <property name="selectionMode">
        <enum>QAbstractItemView::NoSelection</enum>
       </property>
@@ -89,14 +89,14 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Views::CSimulatedAircraftView</class>
+   <class>swift::gui::views::CSimulatedAircraftView</class>
    <extends>QTableView</extends>
-   <header>blackgui/views/simulatedaircraftview.h</header>
+   <header>gui/views/simulatedaircraftview.h</header>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Views::CAirportView</class>
+   <class>swift::gui::views::CAirportView</class>
    <extends>QTableView</extends>
-   <header>blackgui/views/airportview.h</header>
+   <header>gui/views/airportview.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/src/blackgui/components/aircraftmodelsetvalidationdialog.cpp b/src/gui/components/aircraftmodelsetvalidationdialog.cpp
similarity index 95%
rename from src/blackgui/components/aircraftmodelsetvalidationdialog.cpp
rename to src/gui/components/aircraftmodelsetvalidationdialog.cpp
index 30ccc3e60..b57da9bb3 100644
--- a/src/blackgui/components/aircraftmodelsetvalidationdialog.cpp
+++ b/src/gui/components/aircraftmodelsetvalidationdialog.cpp
@@ -2,14 +2,14 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "aircraftmodelsetvalidationdialog.h"
-#include "blackgui/guiapplication.h"
+#include "gui/guiapplication.h"
 #include "misc/simulation/simulatorinfo.h"
 #include "ui_aircraftmodelsetvalidationdialog.h"
 
 using namespace swift::misc;
 using namespace swift::misc::simulation;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CAircraftModelSetValidationDialog::CAircraftModelSetValidationDialog(QWidget *parent) : QDialog(parent),
                                                                                             ui(new Ui::CAircraftModelSetValidationDialog)
diff --git a/src/blackgui/components/aircraftmodelsetvalidationdialog.h b/src/gui/components/aircraftmodelsetvalidationdialog.h
similarity index 77%
rename from src/blackgui/components/aircraftmodelsetvalidationdialog.h
rename to src/gui/components/aircraftmodelsetvalidationdialog.h
index 6d3e239e1..ff6541cb0 100644
--- a/src/blackgui/components/aircraftmodelsetvalidationdialog.h
+++ b/src/gui/components/aircraftmodelsetvalidationdialog.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_AIRCRAFTMODELSETVALIDATIONDIALOG_H
-#define BLACKGUI_COMPONENTS_AIRCRAFTMODELSETVALIDATIONDIALOG_H
+#ifndef SWIFT_GUI_COMPONENTS_AIRCRAFTMODELSETVALIDATIONDIALOG_H
+#define SWIFT_GUI_COMPONENTS_AIRCRAFTMODELSETVALIDATIONDIALOG_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 
 #include <QDialog>
 #include <QScopedPointer>
@@ -24,13 +24,13 @@ namespace swift::misc
         class CAircraftModelList;
     }
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Dialog for CAircraftModelValidationComponent
-     * \remark aircraft model view has a simplified version BlackGui::Views::CAircraftModelValidationDialog
+     * \remark aircraft model view has a simplified version swift::gui::views::CAircraftModelValidationDialog
      */
-    class BLACKGUI_EXPORT CAircraftModelSetValidationDialog : public QDialog
+    class SWIFT_GUI_EXPORT CAircraftModelSetValidationDialog : public QDialog
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/aircraftmodelsetvalidationdialog.ui b/src/gui/components/aircraftmodelsetvalidationdialog.ui
similarity index 87%
rename from src/blackgui/components/aircraftmodelsetvalidationdialog.ui
rename to src/gui/components/aircraftmodelsetvalidationdialog.ui
index ae263e9e7..c76bbccfa 100644
--- a/src/blackgui/components/aircraftmodelsetvalidationdialog.ui
+++ b/src/gui/components/aircraftmodelsetvalidationdialog.ui
@@ -21,7 +21,7 @@
   </property>
   <layout class="QVBoxLayout" name="vl_AircraaftModelValidation">
    <item>
-    <widget class="BlackGui::Components::CAircraftModelValidationComponent" name="comp_AircraftModelValidation"/>
+    <widget class="swift::gui::components::CAircraftModelValidationComponent" name="comp_AircraftModelValidation"/>
    </item>
    <item>
     <widget class="QDialogButtonBox" name="bb_CAircraftModelSetValidationDialog">
@@ -37,9 +37,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CAircraftModelValidationComponent</class>
+   <class>swift::gui::components::CAircraftModelValidationComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/aircraftmodelvalidationcomponent.h</header>
+   <header>gui/components/aircraftmodelvalidationcomponent.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/aircraftmodelstringcompleter.cpp b/src/gui/components/aircraftmodelstringcompleter.cpp
similarity index 98%
rename from src/blackgui/components/aircraftmodelstringcompleter.cpp
rename to src/gui/components/aircraftmodelstringcompleter.cpp
index 7d6abe289..229fb3999 100644
--- a/src/blackgui/components/aircraftmodelstringcompleter.cpp
+++ b/src/gui/components/aircraftmodelstringcompleter.cpp
@@ -3,8 +3,8 @@
 
 #include "aircraftmodelstringcompleter.h"
 #include "ui_aircraftmodelstringcompleter.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/uppercasevalidator.h"
+#include "gui/guiapplication.h"
+#include "gui/uppercasevalidator.h"
 #include "core/webdataservices.h"
 #include "core/context/contextsimulator.h"
 
@@ -17,7 +17,7 @@ using namespace swift::core::context;
 using namespace swift::misc::simulation;
 using namespace swift::misc::simulation::data;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CAircraftModelStringCompleter::CAircraftModelStringCompleter(QWidget *parent) : QFrame(parent),
                                                                                     ui(new Ui::CAircraftModelStringCompleter)
diff --git a/src/blackgui/components/aircraftmodelstringcompleter.h b/src/gui/components/aircraftmodelstringcompleter.h
similarity index 91%
rename from src/blackgui/components/aircraftmodelstringcompleter.h
rename to src/gui/components/aircraftmodelstringcompleter.h
index 03effa377..f82a5c4e3 100644
--- a/src/blackgui/components/aircraftmodelstringcompleter.h
+++ b/src/gui/components/aircraftmodelstringcompleter.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPLETER_AIRCRAFTMODELSTRINGCOMPLETER_H
-#define BLACKGUI_COMPLETER_AIRCRAFTMODELSTRINGCOMPLETER_H
+#ifndef SWIFT_GUI_COMPLETER_AIRCRAFTMODELSTRINGCOMPLETER_H
+#define SWIFT_GUI_COMPLETER_AIRCRAFTMODELSTRINGCOMPLETER_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include "misc/simulation/data/modelcaches.h"
 #include "misc/simulation/aircraftmodel.h"
 
@@ -19,12 +19,12 @@ namespace Ui
 {
     class CAircraftModelStringCompleter;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Completer for model strings
      */
-    class BLACKGUI_EXPORT CAircraftModelStringCompleter : public QFrame
+    class SWIFT_GUI_EXPORT CAircraftModelStringCompleter : public QFrame
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/aircraftmodelstringcompleter.ui b/src/gui/components/aircraftmodelstringcompleter.ui
similarity index 100%
rename from src/blackgui/components/aircraftmodelstringcompleter.ui
rename to src/gui/components/aircraftmodelstringcompleter.ui
diff --git a/src/blackgui/components/aircraftmodelvalidationcomponent.cpp b/src/gui/components/aircraftmodelvalidationcomponent.cpp
similarity index 99%
rename from src/blackgui/components/aircraftmodelvalidationcomponent.cpp
rename to src/gui/components/aircraftmodelvalidationcomponent.cpp
index 8617dda28..6fa4d4118 100644
--- a/src/blackgui/components/aircraftmodelvalidationcomponent.cpp
+++ b/src/gui/components/aircraftmodelvalidationcomponent.cpp
@@ -3,7 +3,7 @@
 
 #include "ui_aircraftmodelvalidationcomponent.h"
 #include "aircraftmodelvalidationcomponent.h"
-#include "blackgui/guiapplication.h"
+#include "gui/guiapplication.h"
 #include "core/context/contextsimulator.h"
 
 #include <QPointer>
@@ -12,7 +12,7 @@ using namespace swift::misc;
 using namespace swift::misc::simulation;
 using namespace swift::core::context;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CAircraftModelValidationComponent::CAircraftModelValidationComponent(QWidget *parent) : COverlayMessagesFrame(parent),
                                                                                             ui(new Ui::CAircraftModelValidationComponent)
diff --git a/src/blackgui/components/aircraftmodelvalidationcomponent.h b/src/gui/components/aircraftmodelvalidationcomponent.h
similarity index 87%
rename from src/blackgui/components/aircraftmodelvalidationcomponent.h
rename to src/gui/components/aircraftmodelvalidationcomponent.h
index 137ee698d..ff21f8937 100644
--- a/src/blackgui/components/aircraftmodelvalidationcomponent.h
+++ b/src/gui/components/aircraftmodelvalidationcomponent.h
@@ -3,13 +3,13 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_AIRCRAFTMODELVALIDATIONCOMPONENT_H
-#define BLACKGUI_COMPONENTS_AIRCRAFTMODELVALIDATIONCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_AIRCRAFTMODELVALIDATIONCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_AIRCRAFTMODELVALIDATIONCOMPONENT_H
 
 #include "misc/simulation/settings/modelmatchersettings.h"
 #include "misc/settingscache.h"
-#include "blackgui/overlaymessagesframe.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/overlaymessagesframe.h"
+#include "gui/swiftguiexport.h"
 
 #include <QFrame>
 #include <QScopedPointer>
@@ -27,12 +27,12 @@ namespace swift::misc
         class CAircraftModelList;
     }
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Handle validation result
      */
-    class BLACKGUI_EXPORT CAircraftModelValidationComponent : public COverlayMessagesFrame
+    class SWIFT_GUI_EXPORT CAircraftModelValidationComponent : public COverlayMessagesFrame
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/aircraftmodelvalidationcomponent.ui b/src/gui/components/aircraftmodelvalidationcomponent.ui
similarity index 91%
rename from src/blackgui/components/aircraftmodelvalidationcomponent.ui
rename to src/gui/components/aircraftmodelvalidationcomponent.ui
index 72143d5bf..9423071ec 100644
--- a/src/blackgui/components/aircraftmodelvalidationcomponent.ui
+++ b/src/gui/components/aircraftmodelvalidationcomponent.ui
@@ -35,7 +35,7 @@
       </attribute>
       <layout class="QVBoxLayout" name="vl_InvalidModels">
        <item>
-        <widget class="BlackGui::Views::CAircraftModelView" name="tvp_InvalidModels">
+        <widget class="swift::gui::views::CAircraftModelView" name="tvp_InvalidModels">
          <property name="selectionBehavior">
           <enum>QAbstractItemView::SelectRows</enum>
          </property>
@@ -60,7 +60,7 @@
            <number>4</number>
           </property>
           <item row="0" column="0">
-           <widget class="BlackGui::Components::CSimulatorSelector" name="comp_Simulator">
+           <widget class="swift::gui::components::CSimulatorSelector" name="comp_Simulator">
             <property name="minimumSize">
              <size>
               <width>75</width>
@@ -173,7 +173,7 @@
       </attribute>
       <layout class="QVBoxLayout" name="vl_Messages">
        <item>
-        <widget class="BlackGui::Components::CStatusMessagesDetail" name="comp_Messages">
+        <widget class="swift::gui::components::CStatusMessagesDetail" name="comp_Messages">
          <property name="frameShape">
           <enum>QFrame::StyledPanel</enum>
          </property>
@@ -190,20 +190,20 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CStatusMessagesDetail</class>
+   <class>swift::gui::components::CStatusMessagesDetail</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/statusmessagesdetail.h</header>
+   <header>gui/components/statusmessagesdetail.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Views::CAircraftModelView</class>
+   <class>swift::gui::views::CAircraftModelView</class>
    <extends>QTableView</extends>
-   <header>blackgui/views/aircraftmodelview.h</header>
+   <header>gui/views/aircraftmodelview.h</header>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CSimulatorSelector</class>
+   <class>swift::gui::components::CSimulatorSelector</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/simulatorselector.h</header>
+   <header>gui/components/simulatorselector.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/aircraftpartscomponent.cpp b/src/gui/components/aircraftpartscomponent.cpp
similarity index 99%
rename from src/blackgui/components/aircraftpartscomponent.cpp
rename to src/gui/components/aircraftpartscomponent.cpp
index 85a9f3886..17d32f9bd 100644
--- a/src/blackgui/components/aircraftpartscomponent.cpp
+++ b/src/gui/components/aircraftpartscomponent.cpp
@@ -4,7 +4,7 @@
 #include "aircraftpartscomponent.h"
 #include "ui_aircraftpartscomponent.h"
 
-#include "blackgui/guiapplication.h"
+#include "gui/guiapplication.h"
 #include "core/context/contextnetwork.h"
 #include "core/context/contextsimulator.h"
 #include "core/context/contextownaircraft.h"
@@ -20,7 +20,7 @@ using namespace swift::misc::simulation;
 using namespace swift::core;
 using namespace swift::core::context;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CAircraftPartsComponent::CAircraftPartsComponent(QWidget *parent) : QFrame(parent),
                                                                         ui(new Ui::CAircraftPartsComponent)
diff --git a/src/blackgui/components/aircraftpartscomponent.h b/src/gui/components/aircraftpartscomponent.h
similarity index 90%
rename from src/blackgui/components/aircraftpartscomponent.h
rename to src/gui/components/aircraftpartscomponent.h
index 492fd42d9..6b30520f8 100644
--- a/src/blackgui/components/aircraftpartscomponent.h
+++ b/src/gui/components/aircraftpartscomponent.h
@@ -3,8 +3,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_AIRCRAFTPARTSCOMPONENT_H
-#define BLACKGUI_COMPONENTS_AIRCRAFTPARTSCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_AIRCRAFTPARTSCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_AIRCRAFTPARTSCOMPONENT_H
 
 #include "misc/aviation/callsign.h"
 
@@ -15,7 +15,7 @@ namespace Ui
 {
     class CAircraftPartsComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! Allows to display and manipulate parts
     class CAircraftPartsComponent : public QFrame
diff --git a/src/blackgui/components/aircraftpartscomponent.ui b/src/gui/components/aircraftpartscomponent.ui
similarity index 94%
rename from src/blackgui/components/aircraftpartscomponent.ui
rename to src/gui/components/aircraftpartscomponent.ui
index f2795b1fa..044eb6791 100644
--- a/src/blackgui/components/aircraftpartscomponent.ui
+++ b/src/gui/components/aircraftpartscomponent.ui
@@ -55,7 +55,7 @@
        </widget>
       </item>
       <item row="0" column="1">
-       <widget class="BlackGui::Components::CCallsignCompleter" name="comp_RemoteAircraftCompleter">
+       <widget class="swift::gui::components::CCallsignCompleter" name="comp_RemoteAircraftCompleter">
         <property name="minimumSize">
          <size>
           <width>0</width>
@@ -189,7 +189,7 @@
            <number>2</number>
           </property>
           <item>
-           <widget class="BlackGui::Editors::CAircraftPartsForm" name="editor_AircraftParts">
+           <widget class="swift::gui::editors::CAircraftPartsForm" name="editor_AircraftParts">
             <property name="frameShape">
              <enum>QFrame::StyledPanel</enum>
             </property>
@@ -270,15 +270,15 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CCallsignCompleter</class>
+   <class>swift::gui::components::CCallsignCompleter</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/callsigncompleter.h</header>
+   <header>gui/components/callsigncompleter.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Editors::CAircraftPartsForm</class>
+   <class>swift::gui::editors::CAircraftPartsForm</class>
    <extends>QFrame</extends>
-   <header>blackgui/editors/aircraftpartsform.h</header>
+   <header>gui/editors/aircraftpartsform.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/aircraftpartshistory.cpp b/src/gui/components/aircraftpartshistory.cpp
similarity index 98%
rename from src/blackgui/components/aircraftpartshistory.cpp
rename to src/gui/components/aircraftpartshistory.cpp
index 1cc5514f3..f1eb1e68e 100644
--- a/src/blackgui/components/aircraftpartshistory.cpp
+++ b/src/gui/components/aircraftpartshistory.cpp
@@ -4,8 +4,8 @@
 #include "aircraftpartshistory.h"
 #include "ui_aircraftpartshistory.h"
 
-#include "blackgui/guiapplication.h"
-#include "blackgui/uppercasevalidator.h"
+#include "gui/guiapplication.h"
+#include "gui/uppercasevalidator.h"
 #include "core/context/contextnetwork.h"
 #include "core/context/contextsimulator.h"
 #include "misc/propertyindexlist.h"
@@ -22,7 +22,7 @@ using namespace swift::misc::network;
 using namespace swift::core;
 using namespace swift::core::context;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CAircraftPartsHistory::CAircraftPartsHistory(QWidget *parent) : QFrame(parent),
                                                                     ui(new Ui::CAircraftPartsHistory)
diff --git a/src/blackgui/components/aircraftpartshistory.h b/src/gui/components/aircraftpartshistory.h
similarity index 92%
rename from src/blackgui/components/aircraftpartshistory.h
rename to src/gui/components/aircraftpartshistory.h
index 5c0c76f5c..430378564 100644
--- a/src/blackgui/components/aircraftpartshistory.h
+++ b/src/gui/components/aircraftpartshistory.h
@@ -3,8 +3,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENT_AIRCRAFTPARTSHISTORY_H
-#define BLACKGUI_COMPONENT_AIRCRAFTPARTSHISTORY_H
+#ifndef SWIFT_GUI_COMPONENT_AIRCRAFTPARTSHISTORY_H
+#define SWIFT_GUI_COMPONENT_AIRCRAFTPARTSHISTORY_H
 
 #include <QFrame>
 #include <QTabWidget>
@@ -16,7 +16,7 @@ namespace Ui
 {
     class CAircraftPartsHistory;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * History frame for received aircraft parts
diff --git a/src/blackgui/components/aircraftpartshistory.ui b/src/gui/components/aircraftpartshistory.ui
similarity index 94%
rename from src/blackgui/components/aircraftpartshistory.ui
rename to src/gui/components/aircraftpartshistory.ui
index 599681926..a4ed699ea 100644
--- a/src/blackgui/components/aircraftpartshistory.ui
+++ b/src/gui/components/aircraftpartshistory.ui
@@ -61,7 +61,7 @@
        </widget>
       </item>
       <item row="0" column="1">
-       <widget class="BlackGui::Components::CCallsignCompleter" name="comp_CallsignCompleter"/>
+       <widget class="swift::gui::components::CCallsignCompleter" name="comp_CallsignCompleter"/>
       </item>
       <item row="2" column="0">
        <widget class="QLabel" name="lbl_Enable">
@@ -141,9 +141,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CCallsignCompleter</class>
+   <class>swift::gui::components::CCallsignCompleter</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/callsigncompleter.h</header>
+   <header>gui/components/callsigncompleter.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/airportcompleter.cpp b/src/gui/components/airportcompleter.cpp
similarity index 98%
rename from src/blackgui/components/airportcompleter.cpp
rename to src/gui/components/airportcompleter.cpp
index 2bfe5b94a..efc2144c4 100644
--- a/src/blackgui/components/airportcompleter.cpp
+++ b/src/gui/components/airportcompleter.cpp
@@ -3,8 +3,8 @@
 
 #include "airportcompleter.h"
 #include "ui_airportcompleter.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/uppercasevalidator.h"
+#include "gui/guiapplication.h"
+#include "gui/uppercasevalidator.h"
 #include "core/webdataservices.h"
 #include "misc/aviation/airportlist.h"
 #include <QCompleter>
@@ -12,7 +12,7 @@
 using namespace swift::core;
 using namespace swift::misc::aviation;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CAirportCompleter::CAirportCompleter(QWidget *parent) : QFrame(parent),
                                                             ui(new Ui::CAirportCompleter)
diff --git a/src/blackgui/components/airportcompleter.h b/src/gui/components/airportcompleter.h
similarity index 92%
rename from src/blackgui/components/airportcompleter.h
rename to src/gui/components/airportcompleter.h
index 7a76d8dbf..122c46c13 100644
--- a/src/blackgui/components/airportcompleter.h
+++ b/src/gui/components/airportcompleter.h
@@ -3,8 +3,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_AIRPORTCOMPLETER_H
-#define BLACKGUI_COMPONENTS_AIRPORTCOMPLETER_H
+#ifndef SWIFT_GUI_COMPONENTS_AIRPORTCOMPLETER_H
+#define SWIFT_GUI_COMPONENTS_AIRPORTCOMPLETER_H
 
 #include "misc/aviation/airport.h"
 #include <QFrame>
@@ -14,7 +14,7 @@ namespace Ui
 {
     class CAirportCompleter;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! Airport completer, UI element so select by ICAO, name or location
     class CAirportCompleter : public QFrame
diff --git a/src/blackgui/components/airportcompleter.ui b/src/gui/components/airportcompleter.ui
similarity index 100%
rename from src/blackgui/components/airportcompleter.ui
rename to src/gui/components/airportcompleter.ui
diff --git a/src/blackgui/components/airportdialog.cpp b/src/gui/components/airportdialog.cpp
similarity index 96%
rename from src/blackgui/components/airportdialog.cpp
rename to src/gui/components/airportdialog.cpp
index 437612157..e622dc715 100644
--- a/src/blackgui/components/airportdialog.cpp
+++ b/src/gui/components/airportdialog.cpp
@@ -6,7 +6,7 @@
 
 using namespace swift::misc::aviation;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CAirportDialog::CAirportDialog(QWidget *parent) : QDialog(parent),
                                                       ui(new Ui::CAirportDialog)
diff --git a/src/blackgui/components/airportdialog.h b/src/gui/components/airportdialog.h
similarity index 87%
rename from src/blackgui/components/airportdialog.h
rename to src/gui/components/airportdialog.h
index 5b9bd8f62..1842b5172 100644
--- a/src/blackgui/components/airportdialog.h
+++ b/src/gui/components/airportdialog.h
@@ -3,8 +3,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_AIRPORTDIALOG_H
-#define BLACKGUI_COMPONENTS_AIRPORTDIALOG_H
+#ifndef SWIFT_GUI_COMPONENTS_AIRPORTDIALOG_H
+#define SWIFT_GUI_COMPONENTS_AIRPORTDIALOG_H
 
 #include "misc/aviation/airport.h"
 #include <QDialog>
@@ -14,7 +14,7 @@ namespace Ui
 {
     class CAirportDialog;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! Dialog for finding an airport
     class CAirportDialog : public QDialog
diff --git a/src/blackgui/components/airportdialog.ui b/src/gui/components/airportdialog.ui
similarity index 88%
rename from src/blackgui/components/airportdialog.ui
rename to src/gui/components/airportdialog.ui
index de1f97e2f..90e6cadc2 100644
--- a/src/blackgui/components/airportdialog.ui
+++ b/src/gui/components/airportdialog.ui
@@ -15,7 +15,7 @@
   </property>
   <layout class="QVBoxLayout" name="vl_LayoutAirpotDialog">
    <item alignment="Qt::AlignTop">
-    <widget class="BlackGui::Components::CAirportCompleter" name="comp_AirportCompleter"/>
+    <widget class="swift::gui::components::CAirportCompleter" name="comp_AirportCompleter"/>
    </item>
    <item>
     <widget class="QDialogButtonBox" name="bb_AirportDialog">
@@ -31,9 +31,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CAirportCompleter</class>
+   <class>swift::gui::components::CAirportCompleter</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/airportcompleter.h</header>
+   <header>gui/components/airportcompleter.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/airportsmallcompleter.cpp b/src/gui/components/airportsmallcompleter.cpp
similarity index 96%
rename from src/blackgui/components/airportsmallcompleter.cpp
rename to src/gui/components/airportsmallcompleter.cpp
index bacd29ccc..c5fdf79b4 100644
--- a/src/blackgui/components/airportsmallcompleter.cpp
+++ b/src/gui/components/airportsmallcompleter.cpp
@@ -3,10 +3,10 @@
 
 #include "airportsmallcompleter.h"
 #include "ui_airportsmallcompleter.h"
-#include "blackgui/components/airportdialog.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/guiutility.h"
-#include "blackgui/uppercasevalidator.h"
+#include "gui/components/airportdialog.h"
+#include "gui/guiapplication.h"
+#include "gui/guiutility.h"
+#include "gui/uppercasevalidator.h"
 #include "core/webdataservices.h"
 #include "misc/aviation/airportlist.h"
 #include <QCompleter>
@@ -14,7 +14,7 @@
 using namespace swift::core;
 using namespace swift::misc::aviation;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CAirportSmallCompleter::CAirportSmallCompleter(QWidget *parent) : QFrame(parent),
                                                                       ui(new Ui::CAirportSmallCompleter)
diff --git a/src/blackgui/components/airportsmallcompleter.h b/src/gui/components/airportsmallcompleter.h
similarity index 93%
rename from src/blackgui/components/airportsmallcompleter.h
rename to src/gui/components/airportsmallcompleter.h
index c91dd5a45..f1a427c6b 100644
--- a/src/blackgui/components/airportsmallcompleter.h
+++ b/src/gui/components/airportsmallcompleter.h
@@ -3,8 +3,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_AIRPORTSMALLCOMPLETER_H
-#define BLACKGUI_COMPONENTS_AIRPORTSMALLCOMPLETER_H
+#ifndef SWIFT_GUI_COMPONENTS_AIRPORTSMALLCOMPLETER_H
+#define SWIFT_GUI_COMPONENTS_AIRPORTSMALLCOMPLETER_H
 
 #include "misc/aviation/airport.h"
 #include <QFrame>
@@ -14,7 +14,7 @@ namespace Ui
 {
     class CAirportSmallCompleter;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     class CAirportDialog;
 
diff --git a/src/blackgui/components/airportsmallcompleter.ui b/src/gui/components/airportsmallcompleter.ui
similarity index 100%
rename from src/blackgui/components/airportsmallcompleter.ui
rename to src/gui/components/airportsmallcompleter.ui
diff --git a/src/gui/components/allmaininfoareacomponents.h b/src/gui/components/allmaininfoareacomponents.h
new file mode 100644
index 000000000..1d34c7e9b
--- /dev/null
+++ b/src/gui/components/allmaininfoareacomponents.h
@@ -0,0 +1,18 @@
+// SPDX-FileCopyrightText: Copyright (C) 2014 swift Project Community / Contributors
+// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
+
+#ifndef SWIFT_GUI_COMPONENTS_ALLMAININFOAREACOMPONENTS_H
+#define SWIFT_GUI_COMPONENTS_ALLMAININFOAREACOMPONENTS_H
+
+#include "gui/components/atcstationcomponent.h"
+#include "gui/components/aircraftcomponent.h"
+#include "gui/components/cockpitcomponent.h"
+#include "gui/components/usercomponent.h"
+#include "gui/components/mappingcomponent.h"
+#include "gui/components/textmessagecomponent.h"
+#include "gui/components/simulatorcomponent.h"
+#include "gui/components/flightplancomponent.h"
+#include "gui/components/settingscomponent.h"
+#include "gui/components/logcomponent.h"
+
+#endif
diff --git a/src/blackgui/components/altitudedialog.cpp b/src/gui/components/altitudedialog.cpp
similarity index 99%
rename from src/blackgui/components/altitudedialog.cpp
rename to src/gui/components/altitudedialog.cpp
index 1ff029f40..39f07d41a 100644
--- a/src/blackgui/components/altitudedialog.cpp
+++ b/src/gui/components/altitudedialog.cpp
@@ -15,7 +15,7 @@ using namespace swift::misc;
 using namespace swift::misc::aviation;
 using namespace swift::misc::physical_quantities;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CAltitudeDialog::CAltitudeDialog(QWidget *parent) : QDialog(parent),
                                                         ui(new Ui::CAltitudeDialog)
diff --git a/src/blackgui/components/altitudedialog.h b/src/gui/components/altitudedialog.h
similarity index 94%
rename from src/blackgui/components/altitudedialog.h
rename to src/gui/components/altitudedialog.h
index 91aa60b27..5148a1dd7 100644
--- a/src/blackgui/components/altitudedialog.h
+++ b/src/gui/components/altitudedialog.h
@@ -3,8 +3,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_ALTITUDEDIALOG_H
-#define BLACKGUI_COMPONENTS_ALTITUDEDIALOG_H
+#ifndef SWIFT_GUI_COMPONENTS_ALTITUDEDIALOG_H
+#define SWIFT_GUI_COMPONENTS_ALTITUDEDIALOG_H
 
 #include "misc/aviation/altitude.h"
 
@@ -15,7 +15,7 @@ namespace Ui
 {
     class CAltitudeDialog;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Dialog to get a correct altitude
diff --git a/src/blackgui/components/altitudedialog.ui b/src/gui/components/altitudedialog.ui
similarity index 100%
rename from src/blackgui/components/altitudedialog.ui
rename to src/gui/components/altitudedialog.ui
diff --git a/src/blackgui/components/applicationclosedialog.cpp b/src/gui/components/applicationclosedialog.cpp
similarity index 96%
rename from src/blackgui/components/applicationclosedialog.cpp
rename to src/gui/components/applicationclosedialog.cpp
index 83e208962..263a84dd9 100644
--- a/src/blackgui/components/applicationclosedialog.cpp
+++ b/src/gui/components/applicationclosedialog.cpp
@@ -3,8 +3,8 @@
 
 #include "applicationclosedialog.h"
 #include "ui_applicationclosedialog.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/guiutility.h"
+#include "gui/guiapplication.h"
+#include "gui/guiutility.h"
 #include "core/context/contextapplication.h"
 #include "misc/settingscache.h"
 #include "misc/logmessage.h"
@@ -14,10 +14,10 @@
 #include <QPushButton>
 
 using namespace swift::misc;
-using namespace BlackGui;
+using namespace swift::gui;
 using namespace swift::core::context;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CApplicationCloseDialog::CApplicationCloseDialog(QWidget *parent) : QDialog(parent),
                                                                         ui(new Ui::CApplicationCloseDialog)
diff --git a/src/blackgui/components/applicationclosedialog.h b/src/gui/components/applicationclosedialog.h
similarity index 89%
rename from src/blackgui/components/applicationclosedialog.h
rename to src/gui/components/applicationclosedialog.h
index 902a0cc83..2cd96031c 100644
--- a/src/blackgui/components/applicationclosedialog.h
+++ b/src/gui/components/applicationclosedialog.h
@@ -3,8 +3,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_APPLICATIONCLOSEDIALOG_H
-#define BLACKGUI_COMPONENTS_APPLICATIONCLOSEDIALOG_H
+#ifndef SWIFT_GUI_COMPONENTS_APPLICATIONCLOSEDIALOG_H
+#define SWIFT_GUI_COMPONENTS_APPLICATIONCLOSEDIALOG_H
 
 #include <QDialog>
 #include <QScopedPointer>
@@ -15,7 +15,7 @@ namespace Ui
 {
     class CApplicationCloseDialog;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Close dialog for application
diff --git a/src/blackgui/components/applicationclosedialog.ui b/src/gui/components/applicationclosedialog.ui
similarity index 100%
rename from src/blackgui/components/applicationclosedialog.ui
rename to src/gui/components/applicationclosedialog.ui
diff --git a/src/blackgui/components/atcbuttoncomponent.cpp b/src/gui/components/atcbuttoncomponent.cpp
similarity index 97%
rename from src/blackgui/components/atcbuttoncomponent.cpp
rename to src/gui/components/atcbuttoncomponent.cpp
index 6853e15af..de5ea148f 100644
--- a/src/blackgui/components/atcbuttoncomponent.cpp
+++ b/src/gui/components/atcbuttoncomponent.cpp
@@ -4,8 +4,8 @@
 #include "atcbuttoncomponent.h"
 #include "ui_atcbuttoncomponent.h"
 
-#include "blackgui/guiapplication.h"
-#include "blackgui/guiutility.h"
+#include "gui/guiapplication.h"
+#include "gui/guiutility.h"
 #include "misc/aviation/atcstationlist.h"
 
 #include <math.h>
@@ -18,7 +18,7 @@ using namespace swift::misc::network;
 using namespace swift::core;
 using namespace swift::core::context;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CAtcButtonComponent::CAtcButtonComponent(QWidget *parent) : QFrame(parent),
                                                                 ui(new Ui::CAtcButtonComponent)
diff --git a/src/blackgui/components/atcbuttoncomponent.h b/src/gui/components/atcbuttoncomponent.h
similarity index 93%
rename from src/blackgui/components/atcbuttoncomponent.h
rename to src/gui/components/atcbuttoncomponent.h
index 2bdf3f548..a4f3a691f 100644
--- a/src/blackgui/components/atcbuttoncomponent.h
+++ b/src/gui/components/atcbuttoncomponent.h
@@ -3,8 +3,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_ATCBUTTONCOMPONENT_H
-#define BLACKGUI_COMPONENTS_ATCBUTTONCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_ATCBUTTONCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_ATCBUTTONCOMPONENT_H
 
 #include "core/context/contextnetwork.h"
 #include "misc/network/connectionstatus.h"
@@ -15,7 +15,7 @@ namespace Ui
 {
     class CAtcButtonComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! ATC stations as button bar
     class CAtcButtonComponent : public QFrame
diff --git a/src/blackgui/components/atcbuttoncomponent.ui b/src/gui/components/atcbuttoncomponent.ui
similarity index 100%
rename from src/blackgui/components/atcbuttoncomponent.ui
rename to src/gui/components/atcbuttoncomponent.ui
diff --git a/src/blackgui/components/atcstationcomponent.cpp b/src/gui/components/atcstationcomponent.cpp
similarity index 97%
rename from src/blackgui/components/atcstationcomponent.cpp
rename to src/gui/components/atcstationcomponent.cpp
index 913bea779..d0dd2abc7 100644
--- a/src/blackgui/components/atcstationcomponent.cpp
+++ b/src/gui/components/atcstationcomponent.cpp
@@ -1,16 +1,16 @@
 // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/atcstationcomponent.h"
-#include "blackgui/views/atcstationview.h"
-#include "blackgui/views/viewbase.h"
-#include "blackgui/models/atcstationlistmodel.h"
-#include "blackgui/models/atcstationtreemodel.h"
-#include "blackgui/uppercasevalidator.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/guiutility.h"
-#include "blackgui/dockwidgetinfoarea.h"
-#include "blackgui/infoarea.h"
+#include "gui/components/atcstationcomponent.h"
+#include "gui/views/atcstationview.h"
+#include "gui/views/viewbase.h"
+#include "gui/models/atcstationlistmodel.h"
+#include "gui/models/atcstationtreemodel.h"
+#include "gui/uppercasevalidator.h"
+#include "gui/guiapplication.h"
+#include "gui/guiutility.h"
+#include "gui/dockwidgetinfoarea.h"
+#include "gui/infoarea.h"
 #include "core/context/contextnetwork.h"
 #include "core/context/contextownaircraft.h"
 #include "core/webdataservices.h"
@@ -37,9 +37,9 @@
 #include <QCompleter>
 #include <QPointer>
 
-using namespace BlackGui::Models;
-using namespace BlackGui::Views;
-using namespace BlackGui::Settings;
+using namespace swift::gui::models;
+using namespace swift::gui::views;
+using namespace swift::gui::settings;
 using namespace swift::misc;
 using namespace swift::misc::aviation;
 using namespace swift::misc::network;
@@ -48,7 +48,7 @@ using namespace swift::misc::weather;
 using namespace swift::core;
 using namespace swift::core::context;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CAtcStationComponent::CAtcStationComponent(QWidget *parent) : COverlayMessagesFrameEnableForDockWidgetInfoArea(parent),
                                                                   CIdentifiable(this),
diff --git a/src/blackgui/components/atcstationcomponent.h b/src/gui/components/atcstationcomponent.h
similarity index 88%
rename from src/blackgui/components/atcstationcomponent.h
rename to src/gui/components/atcstationcomponent.h
index edc3fc8a7..c7c58d1b4 100644
--- a/src/blackgui/components/atcstationcomponent.h
+++ b/src/gui/components/atcstationcomponent.h
@@ -3,12 +3,12 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_ATCSTATIONCOMPONENT_H
-#define BLACKGUI_COMPONENTS_ATCSTATIONCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_ATCSTATIONCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_ATCSTATIONCOMPONENT_H
 
-#include "blackgui/settings/viewupdatesettings.h"
-#include "blackgui/overlaymessagesframe.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/settings/viewupdatesettings.h"
+#include "gui/overlaymessagesframe.h"
+#include "gui/swiftguiexport.h"
 #include "misc/aviation/atcstation.h"
 #include "misc/aviation/comsystem.h"
 #include "misc/pq/frequency.h"
@@ -35,14 +35,14 @@ namespace swift::misc::aviation
 {
     class CCallsign;
 }
-namespace BlackGui
+namespace swift::gui
 {
     class CDockWidgetInfoArea;
 
-    namespace Components
+    namespace components
     {
         //! ATC stations component
-        class BLACKGUI_EXPORT CAtcStationComponent :
+        class SWIFT_GUI_EXPORT CAtcStationComponent :
             public COverlayMessagesFrameEnableForDockWidgetInfoArea,
             public swift::misc::CIdentifiable
         {
@@ -76,7 +76,7 @@ namespace BlackGui
             void getMetar(const QString &airportIcaoCode);
 
             //! \copydoc CEnableForDockWidgetInfoArea::setParentDockWidgetInfoArea
-            virtual bool setParentDockWidgetInfoArea(BlackGui::CDockWidgetInfoArea *parentDockableWidget) override;
+            virtual bool setParentDockWidgetInfoArea(swift::gui::CDockWidgetInfoArea *parentDockableWidget) override;
 
         signals:
             //! Request audio widget
@@ -155,7 +155,7 @@ namespace BlackGui
             swift::misc::aviation::CCallsign m_selectedCallsign;
             QDateTime m_timestampLastReadOnlineStations; //!< stations read
             QDateTime m_timestampOnlineStationsChanged; //!< stations marked as changed
-            swift::misc::CSettingReadOnly<BlackGui::Settings::TViewUpdateSettings> m_settingsView { this, &CAtcStationComponent::settingsChanged };
+            swift::misc::CSettingReadOnly<swift::gui::settings::TViewUpdateSettings> m_settingsView { this, &CAtcStationComponent::settingsChanged };
         };
     } // namespace
 } // namespace
diff --git a/src/blackgui/components/atcstationcomponent.ui b/src/gui/components/atcstationcomponent.ui
similarity index 95%
rename from src/blackgui/components/atcstationcomponent.ui
rename to src/gui/components/atcstationcomponent.ui
index 03178299f..019f0b461 100644
--- a/src/blackgui/components/atcstationcomponent.ui
+++ b/src/gui/components/atcstationcomponent.ui
@@ -56,7 +56,7 @@
          <number>0</number>
         </property>
         <item>
-         <widget class="BlackGui::Views::CAtcStationView" name="tvp_AtcStationsOnline">
+         <widget class="swift::gui::views::CAtcStationView" name="tvp_AtcStationsOnline">
           <property name="maximumSize">
            <size>
             <width>16777215</width>
@@ -103,7 +103,7 @@
          <number>0</number>
         </property>
         <item>
-         <widget class="BlackGui::Views::CAtcStationTreeView" name="tvp_AtcStationsOnlineTree">
+         <widget class="swift::gui::views::CAtcStationTreeView" name="tvp_AtcStationsOnlineTree">
           <property name="selectionMode">
            <enum>QAbstractItemView::SingleSelection</enum>
           </property>
@@ -251,14 +251,14 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Views::CAtcStationView</class>
+   <class>swift::gui::views::CAtcStationView</class>
    <extends>QTableView</extends>
-   <header>blackgui/views/atcstationview.h</header>
+   <header>gui/views/atcstationview.h</header>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Views::CAtcStationTreeView</class>
+   <class>swift::gui::views::CAtcStationTreeView</class>
    <extends>QTreeView</extends>
-   <header>blackgui/views/atcstationtreeview.h</header>
+   <header>gui/views/atcstationtreeview.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/blackgui/components/audioadvanceddistributedcomponent.cpp b/src/gui/components/audioadvanceddistributedcomponent.cpp
similarity index 95%
rename from src/blackgui/components/audioadvanceddistributedcomponent.cpp
rename to src/gui/components/audioadvanceddistributedcomponent.cpp
index 683b06c30..3ccff32ea 100644
--- a/src/blackgui/components/audioadvanceddistributedcomponent.cpp
+++ b/src/gui/components/audioadvanceddistributedcomponent.cpp
@@ -4,7 +4,7 @@
 #include "audioadvanceddistributedcomponent.h"
 #include "ui_audioadvanceddistributedcomponent.h"
 
-#include "blackgui/guiapplication.h"
+#include "gui/guiapplication.h"
 #include "core/context/contextaudio.h"
 #include "core/context/contextnetwork.h"
 #include "core/afv/clients/afvclient.h"
@@ -12,7 +12,7 @@
 using namespace swift::misc::audio;
 using namespace swift::core::context;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CAudioAdvancedDistributedComponent::CAudioAdvancedDistributedComponent(QWidget *parent) : QFrame(parent),
                                                                                               ui(new Ui::CAudioAdvancedDistributedComponent)
diff --git a/src/blackgui/components/audioadvanceddistributedcomponent.h b/src/gui/components/audioadvanceddistributedcomponent.h
similarity index 84%
rename from src/blackgui/components/audioadvanceddistributedcomponent.h
rename to src/gui/components/audioadvanceddistributedcomponent.h
index 8925c9bff..f39ea5700 100644
--- a/src/blackgui/components/audioadvanceddistributedcomponent.h
+++ b/src/gui/components/audioadvanceddistributedcomponent.h
@@ -3,8 +3,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_AUDIOADVANCEDDISTRIBUTEDCOMPONENT_H
-#define BLACKGUI_COMPONENTS_AUDIOADVANCEDDISTRIBUTEDCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_AUDIOADVANCEDDISTRIBUTEDCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_AUDIOADVANCEDDISTRIBUTEDCOMPONENT_H
 
 #include "misc/audio/audiodeviceinfo.h"
 
@@ -15,7 +15,7 @@ namespace Ui
 {
     class CAudioAdvancedDistributedComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! Adv. and sitributed audio setup
     class CAudioAdvancedDistributedComponent : public QFrame
diff --git a/src/blackgui/components/audioadvanceddistributedcomponent.ui b/src/gui/components/audioadvanceddistributedcomponent.ui
similarity index 87%
rename from src/blackgui/components/audioadvanceddistributedcomponent.ui
rename to src/gui/components/audioadvanceddistributedcomponent.ui
index db26ef5b1..2a3046f2e 100644
--- a/src/blackgui/components/audioadvanceddistributedcomponent.ui
+++ b/src/gui/components/audioadvanceddistributedcomponent.ui
@@ -15,7 +15,7 @@
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="2" column="0" colspan="3">
-    <widget class="BlackGui::Views::CAudioDeviceInfoView" name="tvp_RegisteredDevices">
+    <widget class="swift::gui::views::CAudioDeviceInfoView" name="tvp_RegisteredDevices">
      <property name="selectionMode">
       <enum>QAbstractItemView::SingleSelection</enum>
      </property>
@@ -41,9 +41,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Views::CAudioDeviceInfoView</class>
+   <class>swift::gui::views::CAudioDeviceInfoView</class>
    <extends>QTableView</extends>
-   <header>blackgui/views/audiodeviceinfoview.h</header>
+   <header>gui/views/audiodeviceinfoview.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/blackgui/components/audioadvanceddistributeddialog.cpp b/src/gui/components/audioadvanceddistributeddialog.cpp
similarity index 96%
rename from src/blackgui/components/audioadvanceddistributeddialog.cpp
rename to src/gui/components/audioadvanceddistributeddialog.cpp
index 36cb32c9a..27cefb33e 100644
--- a/src/blackgui/components/audioadvanceddistributeddialog.cpp
+++ b/src/gui/components/audioadvanceddistributeddialog.cpp
@@ -4,7 +4,7 @@
 #include "audioadvanceddistributeddialog.h"
 #include "ui_audioadvanceddistributeddialog.h"
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CAudioAdvancedDistributedDialog::CAudioAdvancedDistributedDialog(QWidget *parent) : QDialog(parent),
                                                                                         ui(new Ui::CAudioAdvancedDistributedDialog)
diff --git a/src/blackgui/components/audioadvanceddistributeddialog.h b/src/gui/components/audioadvanceddistributeddialog.h
similarity index 73%
rename from src/blackgui/components/audioadvanceddistributeddialog.h
rename to src/gui/components/audioadvanceddistributeddialog.h
index 11e2672e5..4b77f3de3 100644
--- a/src/blackgui/components/audioadvanceddistributeddialog.h
+++ b/src/gui/components/audioadvanceddistributeddialog.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_AUDIOADVANCEDDISTRIBUTEDDIALOG_H
-#define BLACKGUI_COMPONENTS_AUDIOADVANCEDDISTRIBUTEDDIALOG_H
+#ifndef SWIFT_GUI_COMPONENTS_AUDIOADVANCEDDISTRIBUTEDDIALOG_H
+#define SWIFT_GUI_COMPONENTS_AUDIOADVANCEDDISTRIBUTEDDIALOG_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 
 #include <QDialog>
 #include <QScopedPointer>
@@ -15,10 +15,10 @@ namespace Ui
 {
     class CAudioAdvancedDistributedDialog;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! Audio advanced setup as dialog
-    class BLACKGUI_EXPORT CAudioAdvancedDistributedDialog : public QDialog
+    class SWIFT_GUI_EXPORT CAudioAdvancedDistributedDialog : public QDialog
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/audioadvanceddistributeddialog.ui b/src/gui/components/audioadvanceddistributeddialog.ui
similarity index 88%
rename from src/blackgui/components/audioadvanceddistributeddialog.ui
rename to src/gui/components/audioadvanceddistributeddialog.ui
index de4a29f33..6c7e47940 100644
--- a/src/blackgui/components/audioadvanceddistributeddialog.ui
+++ b/src/gui/components/audioadvanceddistributeddialog.ui
@@ -21,7 +21,7 @@
   </property>
   <layout class="QVBoxLayout" name="vl_CAudioAdvancedDistributedComponent">
    <item>
-    <widget class="BlackGui::Components::CAudioAdvancedDistributedComponent" name="comp_AudioAdvancedDistributed">
+    <widget class="swift::gui::components::CAudioAdvancedDistributedComponent" name="comp_AudioAdvancedDistributed">
      <property name="frameShape">
       <enum>QFrame::StyledPanel</enum>
      </property>
@@ -44,9 +44,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CAudioAdvancedDistributedComponent</class>
+   <class>swift::gui::components::CAudioAdvancedDistributedComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/audioadvanceddistributedcomponent.h</header>
+   <header>gui/components/audioadvanceddistributedcomponent.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/audiodevicevolumesetupcomponent.cpp b/src/gui/components/audiodevicevolumesetupcomponent.cpp
similarity index 99%
rename from src/blackgui/components/audiodevicevolumesetupcomponent.cpp
rename to src/gui/components/audiodevicevolumesetupcomponent.cpp
index ed0bc3020..6f08e49c4 100644
--- a/src/blackgui/components/audiodevicevolumesetupcomponent.cpp
+++ b/src/gui/components/audiodevicevolumesetupcomponent.cpp
@@ -1,9 +1,9 @@
 // SPDX-FileCopyrightText: Copyright (C) 2019 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/audiodevicevolumesetupcomponent.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/guiutility.h"
+#include "gui/components/audiodevicevolumesetupcomponent.h"
+#include "gui/guiapplication.h"
+#include "gui/guiutility.h"
 #include "core/afv/clients/afvclient.h"
 #include "core/context/contextsimulator.h"
 #include "core/context/contextaudioimpl.h"
@@ -33,7 +33,7 @@ using namespace swift::misc::audio;
 using namespace swift::misc::physical_quantities;
 using namespace swift::misc::simulation;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CAudioDeviceVolumeSetupComponent::CAudioDeviceVolumeSetupComponent(QWidget *parent) : QFrame(parent),
                                                                                           ui(new Ui::CAudioDeviceVolumeSetupComponent)
diff --git a/src/blackgui/components/audiodevicevolumesetupcomponent.h b/src/gui/components/audiodevicevolumesetupcomponent.h
similarity index 95%
rename from src/blackgui/components/audiodevicevolumesetupcomponent.h
rename to src/gui/components/audiodevicevolumesetupcomponent.h
index 1cc2cc5e6..f21ba7993 100644
--- a/src/blackgui/components/audiodevicevolumesetupcomponent.h
+++ b/src/gui/components/audiodevicevolumesetupcomponent.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_AUDIODEVICEVOLUMESETUPCOMPONENT_H
-#define BLACKGUI_COMPONENTS_AUDIODEVICEVOLUMESETUPCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_AUDIODEVICEVOLUMESETUPCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_AUDIODEVICEVOLUMESETUPCOMPONENT_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include "misc/audio/audiosettings.h"
 #include "misc/audio/audiodeviceinfolist.h"
 #include "misc/aviation/callsignset.h"
@@ -27,10 +27,10 @@ namespace swift::core::afv::clients
 {
     class CAfvClient;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! Audio setup such as input / output devices
-    class BLACKGUI_EXPORT CAudioDeviceVolumeSetupComponent : public QFrame
+    class SWIFT_GUI_EXPORT CAudioDeviceVolumeSetupComponent : public QFrame
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/audiodevicevolumesetupcomponent.ui b/src/gui/components/audiodevicevolumesetupcomponent.ui
similarity index 95%
rename from src/blackgui/components/audiodevicevolumesetupcomponent.ui
rename to src/gui/components/audiodevicevolumesetupcomponent.ui
index 0296b0637..89eadac49 100644
--- a/src/blackgui/components/audiodevicevolumesetupcomponent.ui
+++ b/src/gui/components/audiodevicevolumesetupcomponent.ui
@@ -194,13 +194,13 @@
        <number>4</number>
       </property>
       <item>
-       <widget class="BlackGui::CLedWidget" name="led_AudioConnected" native="true"/>
+       <widget class="swift::gui::CLedWidget" name="led_AudioConnected" native="true"/>
       </item>
       <item>
-       <widget class="BlackGui::CLedWidget" name="led_Rx1" native="true"/>
+       <widget class="swift::gui::CLedWidget" name="led_Rx1" native="true"/>
       </item>
       <item>
-       <widget class="BlackGui::CLedWidget" name="led_Rx2" native="true"/>
+       <widget class="swift::gui::CLedWidget" name="led_Rx2" native="true"/>
       </item>
       <item>
        <spacer name="hs_AudioEffects">
@@ -348,7 +348,7 @@
     </widget>
    </item>
    <item row="14" column="1">
-    <widget class="BlackGui::CLevelMeter" name="wip_OutLevelMeter">
+    <widget class="swift::gui::CLevelMeter" name="wip_OutLevelMeter">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
        <horstretch>0</horstretch>
@@ -365,7 +365,7 @@
     </widget>
   </item>
    <item row="9" column="1">
-    <widget class="BlackGui::CLevelMeter" name="wip_InLevelMeter">
+    <widget class="swift::gui::CLevelMeter" name="wip_InLevelMeter">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
        <horstretch>0</horstretch>
@@ -385,15 +385,15 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::CLevelMeter</class>
+   <class>swift::gui::CLevelMeter</class>
    <extends>QFrame</extends>
-   <header>blackgui/levelmeter.h</header>
+   <header>gui/levelmeter.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::CLedWidget</class>
+   <class>swift::gui::CLedWidget</class>
    <extends>QWidget</extends>
-   <header>blackgui/led.h</header>
+   <header>gui/led.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/audionotificationcomponent.cpp b/src/gui/components/audionotificationcomponent.cpp
similarity index 98%
rename from src/blackgui/components/audionotificationcomponent.cpp
rename to src/gui/components/audionotificationcomponent.cpp
index 119cc9690..4d3f3a58a 100644
--- a/src/blackgui/components/audionotificationcomponent.cpp
+++ b/src/gui/components/audionotificationcomponent.cpp
@@ -1,8 +1,8 @@
 // SPDX-FileCopyrightText: Copyright (C) 2019 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/audionotificationcomponent.h"
-#include "blackgui/guiapplication.h"
+#include "gui/components/audionotificationcomponent.h"
+#include "gui/guiapplication.h"
 #include "core/context/contextaudio.h"
 #include "misc/audio/notificationsounds.h"
 #include "misc/audio/audiosettings.h"
@@ -23,7 +23,7 @@ using namespace swift::misc::aviation;
 using namespace swift::misc::audio;
 using namespace swift::misc::physical_quantities;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CAudioNotificationComponent::CAudioNotificationComponent(QWidget *parent) : QFrame(parent),
                                                                                 ui(new Ui::CAudioNotificationComponent)
diff --git a/src/blackgui/components/audionotificationcomponent.h b/src/gui/components/audionotificationcomponent.h
similarity index 86%
rename from src/blackgui/components/audionotificationcomponent.h
rename to src/gui/components/audionotificationcomponent.h
index d31eaa0e5..034e489ed 100644
--- a/src/blackgui/components/audionotificationcomponent.h
+++ b/src/gui/components/audionotificationcomponent.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_AUDIONOTIFICATION_COMPONENT_H
-#define BLACKGUI_AUDIONOTIFICATION_COMPONENT_H
+#ifndef SWIFT_GUI_AUDIONOTIFICATION_COMPONENT_H
+#define SWIFT_GUI_AUDIONOTIFICATION_COMPONENT_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include "misc/audio/audiosettings.h"
 #include "misc/audio/audiodeviceinfolist.h"
 #include "misc/settingscache.h"
@@ -20,10 +20,10 @@ namespace Ui
 {
     class CAudioNotificationComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! Audio component, volume, ...
-    class BLACKGUI_EXPORT CAudioNotificationComponent : public QFrame
+    class SWIFT_GUI_EXPORT CAudioNotificationComponent : public QFrame
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/audionotificationcomponent.ui b/src/gui/components/audionotificationcomponent.ui
similarity index 100%
rename from src/blackgui/components/audionotificationcomponent.ui
rename to src/gui/components/audionotificationcomponent.ui
diff --git a/src/blackgui/components/autopublishcomponent.cpp b/src/gui/components/autopublishcomponent.cpp
similarity index 97%
rename from src/blackgui/components/autopublishcomponent.cpp
rename to src/gui/components/autopublishcomponent.cpp
index cb3463aad..c904dc053 100644
--- a/src/blackgui/components/autopublishcomponent.cpp
+++ b/src/gui/components/autopublishcomponent.cpp
@@ -3,8 +3,8 @@
 
 #include "autopublishcomponent.h"
 #include "ui_autopublishcomponent.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/guiutility.h"
+#include "gui/guiapplication.h"
+#include "gui/guiutility.h"
 
 #include "core/webdataservices.h"
 #include "core/db/databasewriter.h"
@@ -20,7 +20,7 @@ using namespace swift::misc;
 using namespace swift::misc::simulation;
 using namespace swift::core::db;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CAutoPublishComponent::CAutoPublishComponent(QWidget *parent) : COverlayMessagesFrame(parent),
                                                                     ui(new Ui::CAutoPublishComponent)
diff --git a/src/blackgui/components/autopublishcomponent.h b/src/gui/components/autopublishcomponent.h
similarity index 89%
rename from src/blackgui/components/autopublishcomponent.h
rename to src/gui/components/autopublishcomponent.h
index adb4fce30..d8dc1112e 100644
--- a/src/blackgui/components/autopublishcomponent.h
+++ b/src/gui/components/autopublishcomponent.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_AUTOPUBLISHCOMPONENT_H
-#define BLACKGUI_COMPONENTS_AUTOPUBLISHCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_AUTOPUBLISHCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_AUTOPUBLISHCOMPONENT_H
 
-#include "blackgui/overlaymessagesframe.h"
+#include "gui/overlaymessagesframe.h"
 #include "misc/simulation/autopublishdata.h"
 
 #include <QFrame>
@@ -16,7 +16,7 @@ namespace Ui
 {
     class CAutoPublishComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! Data automatically collected and be be sent to backend
     class CAutoPublishComponent : public COverlayMessagesFrame
diff --git a/src/blackgui/components/autopublishcomponent.ui b/src/gui/components/autopublishcomponent.ui
similarity index 100%
rename from src/blackgui/components/autopublishcomponent.ui
rename to src/gui/components/autopublishcomponent.ui
diff --git a/src/blackgui/components/autopublishdialog.cpp b/src/gui/components/autopublishdialog.cpp
similarity index 92%
rename from src/blackgui/components/autopublishdialog.cpp
rename to src/gui/components/autopublishdialog.cpp
index 48f775a3e..c0b818060 100644
--- a/src/blackgui/components/autopublishdialog.cpp
+++ b/src/gui/components/autopublishdialog.cpp
@@ -2,10 +2,10 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "autopublishdialog.h"
-#include "blackgui/guiapplication.h"
+#include "gui/guiapplication.h"
 #include "ui_autopublishdialog.h"
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CAutoPublishDialog::CAutoPublishDialog(QWidget *parent) : QDialog(parent),
                                                               ui(new Ui::CAutoPublishDialog)
diff --git a/src/blackgui/components/autopublishdialog.h b/src/gui/components/autopublishdialog.h
similarity index 76%
rename from src/blackgui/components/autopublishdialog.h
rename to src/gui/components/autopublishdialog.h
index ab91f18f8..c16f2a6d3 100644
--- a/src/blackgui/components/autopublishdialog.h
+++ b/src/gui/components/autopublishdialog.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_AUTOPUBLISHDIALOG_H
-#define BLACKGUI_COMPONENTS_AUTOPUBLISHDIALOG_H
+#ifndef SWIFT_GUI_COMPONENTS_AUTOPUBLISHDIALOG_H
+#define SWIFT_GUI_COMPONENTS_AUTOPUBLISHDIALOG_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 
 #include <QDialog>
 #include <QScopedPointer>
@@ -15,10 +15,10 @@ namespace Ui
 {
     class CAutoPublishDialog;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! CAutoPublishComponent as dialog
-    class BLACKGUI_EXPORT CAutoPublishDialog : public QDialog
+    class SWIFT_GUI_EXPORT CAutoPublishDialog : public QDialog
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/autopublishdialog.ui b/src/gui/components/autopublishdialog.ui
similarity index 88%
rename from src/blackgui/components/autopublishdialog.ui
rename to src/gui/components/autopublishdialog.ui
index 791d6c0fe..c50114522 100644
--- a/src/blackgui/components/autopublishdialog.ui
+++ b/src/gui/components/autopublishdialog.ui
@@ -15,7 +15,7 @@
   </property>
   <layout class="QVBoxLayout" name="vl_AutoPublishDialog">
    <item>
-    <widget class="BlackGui::Components::CAutoPublishComponent" name="comp_AutoPublish"/>
+    <widget class="swift::gui::components::CAutoPublishComponent" name="comp_AutoPublish"/>
    </item>
    <item>
     <widget class="QDialogButtonBox" name="bb_AutoPublishDialog">
@@ -31,9 +31,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CAutoPublishComponent</class>
+   <class>swift::gui::components::CAutoPublishComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/autopublishcomponent.h</header>
+   <header>gui/components/autopublishcomponent.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/callsigncompleter.cpp b/src/gui/components/callsigncompleter.cpp
similarity index 97%
rename from src/blackgui/components/callsigncompleter.cpp
rename to src/gui/components/callsigncompleter.cpp
index b9a29f7a0..f697c23f1 100644
--- a/src/blackgui/components/callsigncompleter.cpp
+++ b/src/gui/components/callsigncompleter.cpp
@@ -3,9 +3,9 @@
 
 #include "callsigncompleter.h"
 #include "ui_callsigncompleter.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/led.h"
-#include "blackgui/uppercasevalidator.h"
+#include "gui/guiapplication.h"
+#include "gui/led.h"
+#include "gui/uppercasevalidator.h"
 #include "core/context/contextnetwork.h"
 #include "core/context/contextownaircraft.h"
 #include "misc/simulation/simulatedaircraftlist.h"
@@ -19,7 +19,7 @@ using namespace swift::misc::simulation;
 using namespace swift::core;
 using namespace swift::core::context;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CCallsignCompleter::CCallsignCompleter(QWidget *parent) : QFrame(parent),
                                                               ui(new Ui::CCallsignCompleter)
diff --git a/src/blackgui/components/callsigncompleter.h b/src/gui/components/callsigncompleter.h
similarity index 90%
rename from src/blackgui/components/callsigncompleter.h
rename to src/gui/components/callsigncompleter.h
index 34452b70b..b99a44fdc 100644
--- a/src/blackgui/components/callsigncompleter.h
+++ b/src/gui/components/callsigncompleter.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_CALLSIGNCOMPLETER_H
-#define BLACKGUI_COMPONENTS_CALLSIGNCOMPLETER_H
+#ifndef SWIFT_GUI_COMPONENTS_CALLSIGNCOMPLETER_H
+#define SWIFT_GUI_COMPONENTS_CALLSIGNCOMPLETER_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/sharedstringlistcompleter.h"
+#include "gui/swiftguiexport.h"
+#include "gui/sharedstringlistcompleter.h"
 #include "misc/digestsignal.h"
 #include "misc/aviation/callsignset.h"
 #include "misc/network/connectionstatus.h"
@@ -20,12 +20,12 @@ namespace Ui
 {
     class CCallsignCompleter;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Completer for aircraft callsigns
      */
-    class BLACKGUI_EXPORT CCallsignCompleter : public QFrame
+    class SWIFT_GUI_EXPORT CCallsignCompleter : public QFrame
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/callsigncompleter.ui b/src/gui/components/callsigncompleter.ui
similarity index 88%
rename from src/blackgui/components/callsigncompleter.ui
rename to src/gui/components/callsigncompleter.ui
index ece6dfbc0..d68fcdd6b 100644
--- a/src/blackgui/components/callsigncompleter.ui
+++ b/src/gui/components/callsigncompleter.ui
@@ -37,15 +37,15 @@
     </widget>
    </item>
    <item>
-    <widget class="BlackGui::CLedWidget" name="led_Status" native="true"/>
+    <widget class="swift::gui::CLedWidget" name="led_Status" native="true"/>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::CLedWidget</class>
+   <class>swift::gui::CLedWidget</class>
    <extends>QWidget</extends>
-   <header>blackgui/led.h</header>
+   <header>gui/led.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/cgsourceselector.cpp b/src/gui/components/cgsourceselector.cpp
similarity index 98%
rename from src/blackgui/components/cgsourceselector.cpp
rename to src/gui/components/cgsourceselector.cpp
index e4e0a5948..b643e5062 100644
--- a/src/blackgui/components/cgsourceselector.cpp
+++ b/src/gui/components/cgsourceselector.cpp
@@ -6,7 +6,7 @@
 
 using namespace swift::misc::simulation::settings;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CCGSourceSelector::CCGSourceSelector(QWidget *parent) : QFrame(parent),
                                                             ui(new Ui::CCGSourceSelector)
diff --git a/src/blackgui/components/cgsourceselector.h b/src/gui/components/cgsourceselector.h
similarity index 89%
rename from src/blackgui/components/cgsourceselector.h
rename to src/gui/components/cgsourceselector.h
index 85bd1229b..afb1e493c 100644
--- a/src/blackgui/components/cgsourceselector.h
+++ b/src/gui/components/cgsourceselector.h
@@ -3,8 +3,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_CGSOURCESELECTOR_H
-#define BLACKGUI_COMPONENTS_CGSOURCESELECTOR_H
+#ifndef SWIFT_GUI_COMPONENTS_CGSOURCESELECTOR_H
+#define SWIFT_GUI_COMPONENTS_CGSOURCESELECTOR_H
 
 #include "misc/simulation/settings/simulatorsettings.h"
 #include <QFrame>
@@ -14,7 +14,7 @@ namespace Ui
 {
     class CCGSourceSelector;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! CG (aka vertical offset) selector
     class CCGSourceSelector : public QFrame
diff --git a/src/blackgui/components/cgsourceselector.ui b/src/gui/components/cgsourceselector.ui
similarity index 100%
rename from src/blackgui/components/cgsourceselector.ui
rename to src/gui/components/cgsourceselector.ui
diff --git a/src/blackgui/components/cockpitcomaudiodialog.cpp b/src/gui/components/cockpitcomaudiodialog.cpp
similarity index 95%
rename from src/blackgui/components/cockpitcomaudiodialog.cpp
rename to src/gui/components/cockpitcomaudiodialog.cpp
index 7f7b80559..d59b51280 100644
--- a/src/blackgui/components/cockpitcomaudiodialog.cpp
+++ b/src/gui/components/cockpitcomaudiodialog.cpp
@@ -4,7 +4,7 @@
 #include "cockpitcomaudiodialog.h"
 #include "ui_cockpitcomaudiodialog.h"
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CCockpitComAudioDialog::CCockpitComAudioDialog(QWidget *parent) : QDialog(parent),
                                                                       ui(new Ui::CCockpitComAudioDialog)
diff --git a/src/blackgui/components/cockpitcomaudiodialog.h b/src/gui/components/cockpitcomaudiodialog.h
similarity index 71%
rename from src/blackgui/components/cockpitcomaudiodialog.h
rename to src/gui/components/cockpitcomaudiodialog.h
index fa415831a..b06eac92b 100644
--- a/src/blackgui/components/cockpitcomaudiodialog.h
+++ b/src/gui/components/cockpitcomaudiodialog.h
@@ -3,20 +3,20 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_COCKPITCOMAUDIODIALOG_H
-#define BLACKGUI_COMPONENTS_COCKPITCOMAUDIODIALOG_H
+#ifndef SWIFT_GUI_COMPONENTS_COCKPITCOMAUDIODIALOG_H
+#define SWIFT_GUI_COMPONENTS_COCKPITCOMAUDIODIALOG_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include <QDialog>
 
 namespace Ui
 {
     class CCockpitComAudioDialog;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! Cockpit COM component as dialog
-    class BLACKGUI_EXPORT CCockpitComAudioDialog : public QDialog
+    class SWIFT_GUI_EXPORT CCockpitComAudioDialog : public QDialog
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/cockpitcomaudiodialog.ui b/src/gui/components/cockpitcomaudiodialog.ui
similarity index 88%
rename from src/blackgui/components/cockpitcomaudiodialog.ui
rename to src/gui/components/cockpitcomaudiodialog.ui
index 53b60c948..9f314988e 100644
--- a/src/blackgui/components/cockpitcomaudiodialog.ui
+++ b/src/gui/components/cockpitcomaudiodialog.ui
@@ -33,7 +33,7 @@
      </property>
      <layout class="QVBoxLayout" name="verticalLayout">
       <item>
-       <widget class="BlackGui::Components::CCockpitComComponent" name="comp_Com">
+       <widget class="swift::gui::components::CCockpitComComponent" name="comp_Com">
         <property name="frameShape">
          <enum>QFrame::StyledPanel</enum>
         </property>
@@ -58,7 +58,7 @@
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_2">
       <item>
-       <widget class="BlackGui::Components::CAudioDeviceVolumeSetupComponent" name="comp_Audio">
+       <widget class="swift::gui::components::CAudioDeviceVolumeSetupComponent" name="comp_Audio">
         <property name="frameShape">
          <enum>QFrame::StyledPanel</enum>
         </property>
@@ -97,15 +97,15 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CCockpitComComponent</class>
+   <class>swift::gui::components::CCockpitComComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/cockpitcomcomponent.h</header>
+   <header>gui/components/cockpitcomcomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CAudioDeviceVolumeSetupComponent</class>
+   <class>swift::gui::components::CAudioDeviceVolumeSetupComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/audiodevicevolumesetupcomponent.h</header>
+   <header>gui/components/audiodevicevolumesetupcomponent.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/cockpitcomcomponent.cpp b/src/gui/components/cockpitcomcomponent.cpp
similarity index 94%
rename from src/blackgui/components/cockpitcomcomponent.cpp
rename to src/gui/components/cockpitcomcomponent.cpp
index 68bc275bd..c2b74a545 100644
--- a/src/blackgui/components/cockpitcomcomponent.cpp
+++ b/src/gui/components/cockpitcomcomponent.cpp
@@ -5,13 +5,13 @@
 #include "core/context/contextnetwork.h"
 #include "core/context/contextsimulator.h"
 #include "core/context/contextownaircraft.h"
-#include "blackgui/components/cockpitcomcomponent.h"
-#include "blackgui/components/selcalcodeselector.h"
-#include "blackgui/components/transpondercodespinbox.h"
-#include "blackgui/components/transpondermodeselector.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/led.h"
-#include "blackgui/stylesheetutility.h"
+#include "gui/components/cockpitcomcomponent.h"
+#include "gui/components/selcalcodeselector.h"
+#include "gui/components/transpondercodespinbox.h"
+#include "gui/components/transpondermodeselector.h"
+#include "gui/guiapplication.h"
+#include "gui/led.h"
+#include "gui/stylesheetutility.h"
 #include "misc/aviation/atcstationlist.h"
 #include "misc/aviation/atcstation.h"
 #include "misc/aviation/callsign.h"
@@ -29,8 +29,8 @@
 #include <QString>
 #include <QtGlobal>
 
-using namespace BlackGui;
-using namespace BlackGui::Editors;
+using namespace swift::gui;
+using namespace swift::gui::editors;
 using namespace swift::core;
 using namespace swift::core::context;
 using namespace swift::misc;
@@ -39,7 +39,7 @@ using namespace swift::misc::aviation;
 using namespace swift::misc::simulation;
 using namespace swift::misc::physical_quantities;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CCockpitComComponent::CCockpitComComponent(QWidget *parent) : QFrame(parent),
                                                                   CIdentifiable(this),
diff --git a/src/blackgui/components/cockpitcomcomponent.h b/src/gui/components/cockpitcomcomponent.h
similarity index 84%
rename from src/blackgui/components/cockpitcomcomponent.h
rename to src/gui/components/cockpitcomcomponent.h
index 3c85079e2..233713d7c 100644
--- a/src/blackgui/components/cockpitcomcomponent.h
+++ b/src/gui/components/cockpitcomcomponent.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_COCKPITCOMCOMPONENT_H
-#define BLACKGUI_COMPONENTS_COCKPITCOMCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_COCKPITCOMCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_COCKPITCOMCOMPONENT_H
 
-#include "blackgui/enablefordockwidgetinfoarea.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/enablefordockwidgetinfoarea.h"
+#include "gui/swiftguiexport.h"
 
 #include "misc/aviation/selcal.h"
 #include "misc/aviation/transponder.h"
@@ -29,10 +29,10 @@ namespace swift::misc::aviation
 {
     class CComSystem;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! The main cockpit area
-    class BLACKGUI_EXPORT CCockpitComComponent :
+    class SWIFT_GUI_EXPORT CCockpitComComponent :
         public QFrame,
         public swift::misc::CIdentifiable,
         public CEnableForDockWidgetInfoArea
@@ -50,10 +50,10 @@ namespace BlackGui::Components
         void setTransponderModeStateIdent();
 
     signals:
-        //! \copydoc BlackGui::Components::CTransponderModeSelector::transponderModeChanged
+        //! \copydoc swift::gui::components::CTransponderModeSelector::transponderModeChanged
         void transponderModeChanged(swift::misc::aviation::CTransponder::TransponderMode newMode);
 
-        //! \copydoc BlackGui::Components::CTransponderModeSelector::transponderStateIdentEnded
+        //! \copydoc swift::gui::components::CTransponderModeSelector::transponderStateIdentEnded
         void transponderStateIdentEnded();
 
         //! @{
diff --git a/src/blackgui/components/cockpitcomcomponent.ui b/src/gui/components/cockpitcomcomponent.ui
similarity index 85%
rename from src/blackgui/components/cockpitcomcomponent.ui
rename to src/gui/components/cockpitcomcomponent.ui
index 7fd5529b6..de00906e2 100644
--- a/src/blackgui/components/cockpitcomcomponent.ui
+++ b/src/gui/components/cockpitcomcomponent.ui
@@ -27,7 +27,7 @@
     <number>0</number>
    </property>
    <item>
-    <widget class="BlackGui::Editors::CCockpitComForm" name="editor_Com">
+    <widget class="swift::gui::editors::CCockpitComForm" name="editor_Com">
      <property name="frameShape">
       <enum>QFrame::StyledPanel</enum>
      </property>
@@ -40,9 +40,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Editors::CCockpitComForm</class>
+   <class>swift::gui::editors::CCockpitComForm</class>
    <extends>QFrame</extends>
-   <header>blackgui/editors/cockpitcomform.h</header>
+   <header>gui/editors/cockpitcomform.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/cockpitcomponent.cpp b/src/gui/components/cockpitcomponent.cpp
similarity index 95%
rename from src/blackgui/components/cockpitcomponent.cpp
rename to src/gui/components/cockpitcomponent.cpp
index a08e3d5e6..9873bdf65 100644
--- a/src/blackgui/components/cockpitcomponent.cpp
+++ b/src/gui/components/cockpitcomponent.cpp
@@ -1,17 +1,17 @@
 // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/cockpitcomcomponent.h"
-#include "blackgui/components/cockpitcomponent.h"
-#include "blackgui/components/cockpitinfoareacomponent.h"
-#include "blackgui/dockwidgetinfoarea.h"
-#include "blackgui/showhidebar.h"
+#include "gui/components/cockpitcomcomponent.h"
+#include "gui/components/cockpitcomponent.h"
+#include "gui/components/cockpitinfoareacomponent.h"
+#include "gui/dockwidgetinfoarea.h"
+#include "gui/showhidebar.h"
 #include "ui_cockpitcomponent.h"
 
 #include <QDockWidget>
 #include <QtGlobal>
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CCockpitComponent::CCockpitComponent(QWidget *parent) : COverlayMessagesFrameEnableForDockWidgetInfoArea(parent),
                                                             ui(new Ui::CCockpitComponent)
diff --git a/src/blackgui/components/cockpitcomponent.h b/src/gui/components/cockpitcomponent.h
similarity index 78%
rename from src/blackgui/components/cockpitcomponent.h
rename to src/gui/components/cockpitcomponent.h
index 012849e6e..9b5c4ce33 100644
--- a/src/blackgui/components/cockpitcomponent.h
+++ b/src/gui/components/cockpitcomponent.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_COCKPITCOMPONENT_H
-#define BLACKGUI_COMPONENTS_COCKPITCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_COCKPITCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_COCKPITCOMPONENT_H
 
-#include "blackgui/overlaymessagesframe.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/overlaymessagesframe.h"
+#include "gui/swiftguiexport.h"
 
 #include <QFrame>
 #include <QObject>
@@ -18,14 +18,14 @@ namespace Ui
 {
     class CCockpitComponent;
 }
-namespace BlackGui
+namespace swift::gui
 {
     class CDockWidgetInfoArea;
 
-    namespace Components
+    namespace components
     {
         //! Cockpit component: COM unit, show / hide bar, voice rooms
-        class BLACKGUI_EXPORT CCockpitComponent : public COverlayMessagesFrameEnableForDockWidgetInfoArea
+        class SWIFT_GUI_EXPORT CCockpitComponent : public COverlayMessagesFrameEnableForDockWidgetInfoArea
         {
             Q_OBJECT
 
@@ -37,12 +37,12 @@ namespace BlackGui
             virtual ~CCockpitComponent() override;
 
             //! \copydoc CEnableForDockWidgetInfoArea::setParentDockWidgetInfoArea
-            virtual bool setParentDockWidgetInfoArea(BlackGui::CDockWidgetInfoArea *parentDockableWidget) override;
+            virtual bool setParentDockWidgetInfoArea(swift::gui::CDockWidgetInfoArea *parentDockableWidget) override;
 
             //! Is the info area shown?
             bool isInfoAreaShown() const;
 
-            //! \copydoc BlackGui::Components::CTransponderModeSelector::setSelectedTransponderModeStateIdent
+            //! \copydoc swift::gui::components::CTransponderModeSelector::setSelectedTransponderModeStateIdent
             void setSelectedTransponderModeStateIdent();
 
             //! Show the audio UI
diff --git a/src/blackgui/components/cockpitcomponent.ui b/src/gui/components/cockpitcomponent.ui
similarity index 77%
rename from src/blackgui/components/cockpitcomponent.ui
rename to src/gui/components/cockpitcomponent.ui
index d116af3e4..e1877c406 100644
--- a/src/blackgui/components/cockpitcomponent.ui
+++ b/src/gui/components/cockpitcomponent.ui
@@ -36,7 +36,7 @@
     <number>0</number>
    </property>
    <item alignment="Qt::AlignTop">
-    <widget class="BlackGui::Components::CCockpitComComponent" name="comp_CockpitComComponent">
+    <widget class="swift::gui::components::CCockpitComComponent" name="comp_CockpitComComponent">
      <property name="minimumSize">
       <size>
        <width>0</width>
@@ -46,7 +46,7 @@
     </widget>
    </item>
    <item>
-    <widget class="BlackGui::CShowHideBar" name="wip_CockpitComPanelShowHideBar" native="true">
+    <widget class="swift::gui::CShowHideBar" name="wip_CockpitComPanelShowHideBar" native="true">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
        <horstretch>0</horstretch>
@@ -62,7 +62,7 @@
     </widget>
    </item>
    <item>
-    <widget class="BlackGui::Components::CCockpitInfoAreaComponent" name="comp_CockpitInfoArea" native="true">
+    <widget class="swift::gui::components::CCockpitInfoAreaComponent" name="comp_CockpitInfoArea" native="true">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
        <horstretch>0</horstretch>
@@ -81,21 +81,21 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::CShowHideBar</class>
+   <class>swift::gui::CShowHideBar</class>
    <extends>QWidget</extends>
-   <header>blackgui/showhidebar.h</header>
+   <header>gui/showhidebar.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CCockpitComComponent</class>
+   <class>swift::gui::components::CCockpitComComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/cockpitcomcomponent.h</header>
+   <header>gui/components/cockpitcomcomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CCockpitInfoAreaComponent</class>
+   <class>swift::gui::components::CCockpitInfoAreaComponent</class>
    <extends>QWidget</extends>
-   <header>blackgui/components/cockpitinfoareacomponent.h</header>
+   <header>gui/components/cockpitinfoareacomponent.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/cockpitcomtransmissioncomponent.cpp b/src/gui/components/cockpitcomtransmissioncomponent.cpp
similarity index 98%
rename from src/blackgui/components/cockpitcomtransmissioncomponent.cpp
rename to src/gui/components/cockpitcomtransmissioncomponent.cpp
index 3a352b15d..4aa999c31 100644
--- a/src/blackgui/components/cockpitcomtransmissioncomponent.cpp
+++ b/src/gui/components/cockpitcomtransmissioncomponent.cpp
@@ -7,7 +7,7 @@
 using namespace swift::misc::aviation;
 using namespace swift::misc::simulation;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CCockpitComTransmissionComponent::CCockpitComTransmissionComponent(QWidget *parent) : QFrame(parent),
                                                                                           ui(new Ui::CCockpitComTransmissionComponent)
diff --git a/src/blackgui/components/cockpitcomtransmissioncomponent.h b/src/gui/components/cockpitcomtransmissioncomponent.h
similarity index 84%
rename from src/blackgui/components/cockpitcomtransmissioncomponent.h
rename to src/gui/components/cockpitcomtransmissioncomponent.h
index 60cfba9e0..a43fa8364 100644
--- a/src/blackgui/components/cockpitcomtransmissioncomponent.h
+++ b/src/gui/components/cockpitcomtransmissioncomponent.h
@@ -3,12 +3,12 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_COCKPITCOMPONENTTRANSMISSION_H
-#define BLACKGUI_COMPONENTS_COCKPITCOMPONENTTRANSMISSION_H
+#ifndef SWIFT_GUI_COMPONENTS_COCKPITCOMPONENTTRANSMISSION_H
+#define SWIFT_GUI_COMPONENTS_COCKPITCOMPONENTTRANSMISSION_H
 
 #include "misc/simulation/simulatedaircraft.h"
 #include "misc/aviation/comsystem.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include <QFrame>
 #include <QScopedPointer>
 
@@ -16,10 +16,10 @@ namespace Ui
 {
     class CCockpitComTransmissionComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! Transmission for COM units
-    class BLACKGUI_EXPORT CCockpitComTransmissionComponent : public QFrame
+    class SWIFT_GUI_EXPORT CCockpitComTransmissionComponent : public QFrame
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/cockpitcomtransmissioncomponent.ui b/src/gui/components/cockpitcomtransmissioncomponent.ui
similarity index 100%
rename from src/blackgui/components/cockpitcomtransmissioncomponent.ui
rename to src/gui/components/cockpitcomtransmissioncomponent.ui
diff --git a/src/blackgui/components/cockpitinfoareacomponent.cpp b/src/gui/components/cockpitinfoareacomponent.cpp
similarity index 92%
rename from src/blackgui/components/cockpitinfoareacomponent.cpp
rename to src/gui/components/cockpitinfoareacomponent.cpp
index a230cf676..51644c335 100644
--- a/src/blackgui/components/cockpitinfoareacomponent.cpp
+++ b/src/gui/components/cockpitinfoareacomponent.cpp
@@ -1,8 +1,8 @@
 // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/cockpitinfoareacomponent.h"
-#include "blackgui/infoarea.h"
+#include "gui/components/cockpitinfoareacomponent.h"
+#include "gui/infoarea.h"
 #include "misc/icons.h"
 #include "ui_cockpitinfoareacomponent.h"
 
@@ -11,7 +11,7 @@
 
 using namespace swift::misc;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CCockpitInfoAreaComponent::CCockpitInfoAreaComponent(QWidget *parent) : CInfoArea(parent),
                                                                             ui(new Ui::CCockpitInfoAreaComponent)
diff --git a/src/blackgui/components/cockpitinfoareacomponent.h b/src/gui/components/cockpitinfoareacomponent.h
similarity index 85%
rename from src/blackgui/components/cockpitinfoareacomponent.h
rename to src/gui/components/cockpitinfoareacomponent.h
index d303c6c4f..ad74e3f21 100644
--- a/src/blackgui/components/cockpitinfoareacomponent.h
+++ b/src/gui/components/cockpitinfoareacomponent.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_COCKPITINFOAREACOMPONENT_H
-#define BLACKGUI_COCKPITINFOAREACOMPONENT_H
+#ifndef SWIFT_GUI_COCKPITINFOAREACOMPONENT_H
+#define SWIFT_GUI_COCKPITINFOAREACOMPONENT_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/infoarea.h"
+#include "gui/swiftguiexport.h"
+#include "gui/infoarea.h"
 
 #include <QObject>
 #include <QScopedPointer>
@@ -20,11 +20,11 @@ namespace Ui
 {
     class CCockpitInfoAreaComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! The cockpit itself is part of the main info area, but itself also an info area.
     //! hence windows can be docked in the cockpit too.
-    class BLACKGUI_EXPORT CCockpitInfoAreaComponent : public BlackGui::CInfoArea
+    class SWIFT_GUI_EXPORT CCockpitInfoAreaComponent : public swift::gui::CInfoArea
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/cockpitinfoareacomponent.ui b/src/gui/components/cockpitinfoareacomponent.ui
similarity index 87%
rename from src/blackgui/components/cockpitinfoareacomponent.ui
rename to src/gui/components/cockpitinfoareacomponent.ui
index 9a2af6b16..90bfb5eee 100644
--- a/src/blackgui/components/cockpitinfoareacomponent.ui
+++ b/src/gui/components/cockpitinfoareacomponent.ui
@@ -42,7 +42,7 @@
     </size>
    </property>
   </widget>
-  <widget class="BlackGui::CDockWidgetInfoArea" name="dwp_DeviceVolume">
+  <widget class="swift::gui::CDockWidgetInfoArea" name="dwp_DeviceVolume">
    <property name="floating">
     <bool>false</bool>
    </property>
@@ -103,7 +103,7 @@
          <number>0</number>
         </property>
         <item alignment="Qt::AlignTop">
-         <widget class="BlackGui::Components::CAudioDeviceVolumeSetupComponent" name="comp_DeviceVolume"/>
+         <widget class="swift::gui::components::CAudioDeviceVolumeSetupComponent" name="comp_DeviceVolume"/>
         </item>
        </layout>
       </widget>
@@ -111,7 +111,7 @@
     </layout>
    </widget>
   </widget>
-  <widget class="BlackGui::CDockWidgetInfoArea" name="dwp_AudioNotificaton">
+  <widget class="swift::gui::CDockWidgetInfoArea" name="dwp_AudioNotificaton">
    <property name="floating">
     <bool>false</bool>
    </property>
@@ -172,7 +172,7 @@
          <number>0</number>
         </property>
         <item alignment="Qt::AlignTop">
-         <widget class="BlackGui::Components::CAudioNotificationComponent" name="comp_AudioNotificaton">
+         <widget class="swift::gui::components::CAudioNotificationComponent" name="comp_AudioNotificaton">
           <property name="minimumSize">
            <size>
             <width>0</width>
@@ -190,7 +190,7 @@
     </layout>
    </widget>
   </widget>
-  <widget class="BlackGui::CDockWidgetInfoArea" name="dwp_AudioAdv">
+  <widget class="swift::gui::CDockWidgetInfoArea" name="dwp_AudioAdv">
    <property name="allowedAreas">
     <set>Qt::BottomDockWidgetArea</set>
    </property>
@@ -236,7 +236,7 @@
          <number>0</number>
         </property>
         <item alignment="Qt::AlignTop">
-         <widget class="BlackGui::Components::CAudioAdvancedDistributedComponent" name="comp_AudioAdv">
+         <widget class="swift::gui::components::CAudioAdvancedDistributedComponent" name="comp_AudioAdv">
           <property name="frameShape">
            <enum>QFrame::StyledPanel</enum>
           </property>
@@ -254,27 +254,27 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CAudioNotificationComponent</class>
+   <class>swift::gui::components::CAudioNotificationComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/audionotificationcomponent.h</header>
+   <header>gui/components/audionotificationcomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::CDockWidgetInfoArea</class>
+   <class>swift::gui::CDockWidgetInfoArea</class>
    <extends>QDockWidget</extends>
-   <header>blackgui/dockwidgetinfoarea.h</header>
+   <header>gui/dockwidgetinfoarea.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CAudioDeviceVolumeSetupComponent</class>
+   <class>swift::gui::components::CAudioDeviceVolumeSetupComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/audiodevicevolumesetupcomponent.h</header>
+   <header>gui/components/audiodevicevolumesetupcomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CAudioAdvancedDistributedComponent</class>
+   <class>swift::gui::components::CAudioAdvancedDistributedComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/audioadvanceddistributedcomponent.h</header>
+   <header>gui/components/audioadvanceddistributedcomponent.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/cockpittranspondermodeledscomponent.cpp b/src/gui/components/cockpittranspondermodeledscomponent.cpp
similarity index 97%
rename from src/blackgui/components/cockpittranspondermodeledscomponent.cpp
rename to src/gui/components/cockpittranspondermodeledscomponent.cpp
index a873a0db4..4b2b32132 100644
--- a/src/blackgui/components/cockpittranspondermodeledscomponent.cpp
+++ b/src/gui/components/cockpittranspondermodeledscomponent.cpp
@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "core/context/contextownaircraft.h"
-#include "blackgui/components/cockpittranspondermodeledscomponent.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/led.h"
+#include "gui/components/cockpittranspondermodeledscomponent.h"
+#include "gui/guiapplication.h"
+#include "gui/led.h"
 
 #include <QBoxLayout>
 #include <QHBoxLayout>
@@ -17,7 +17,7 @@ using namespace swift::misc::simulation;
 using namespace swift::core;
 using namespace swift::core::context;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CCockpitTransponderModeLedsComponent::CCockpitTransponderModeLedsComponent(QWidget *parent) : QFrame(parent),
                                                                                                   CIdentifiable(this),
diff --git a/src/blackgui/components/cockpittranspondermodeledscomponent.h b/src/gui/components/cockpittranspondermodeledscomponent.h
similarity index 77%
rename from src/blackgui/components/cockpittranspondermodeledscomponent.h
rename to src/gui/components/cockpittranspondermodeledscomponent.h
index ffb338274..6c9fc21bc 100644
--- a/src/blackgui/components/cockpittranspondermodeledscomponent.h
+++ b/src/gui/components/cockpittranspondermodeledscomponent.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKMISC_COCKPITTRANSPONDERMODELEDSCOMPONENT_H
-#define BLACKMISC_COCKPITTRANSPONDERMODELEDSCOMPONENT_H
+#ifndef SWIFT_MISC_COCKPITTRANSPONDERMODELEDSCOMPONENT_H
+#define SWIFT_MISC_COCKPITTRANSPONDERMODELEDSCOMPONENT_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/led.h"
+#include "gui/swiftguiexport.h"
+#include "gui/led.h"
 #include "misc/aviation/transponder.h"
 #include "misc/identifiable.h"
 #include "misc/identifier.h"
@@ -17,10 +17,10 @@
 #include <QObject>
 #include <QScopedPointer>
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! LEDs representing transponder mode state
-    class BLACKGUI_EXPORT CCockpitTransponderModeLedsComponent :
+    class SWIFT_GUI_EXPORT CCockpitTransponderModeLedsComponent :
         public QFrame,
         public swift::misc::CIdentifiable
     {
@@ -52,9 +52,9 @@ namespace BlackGui::Components
         swift::misc::simulation::CSimulatedAircraft getOwnAircraft() const;
 
         swift::misc::aviation::CTransponder::TransponderMode m_mode = swift::misc::aviation::CTransponder::StateStandby;
-        QScopedPointer<BlackGui::CLedWidget> m_ledStandby;
-        QScopedPointer<BlackGui::CLedWidget> m_ledModes;
-        QScopedPointer<BlackGui::CLedWidget> m_ledIdent;
+        QScopedPointer<swift::gui::CLedWidget> m_ledStandby;
+        QScopedPointer<swift::gui::CLedWidget> m_ledModes;
+        QScopedPointer<swift::gui::CLedWidget> m_ledIdent;
     };
 } // namespace
 
diff --git a/src/blackgui/components/colorselector.cpp b/src/gui/components/colorselector.cpp
similarity index 98%
rename from src/blackgui/components/colorselector.cpp
rename to src/gui/components/colorselector.cpp
index f27e92c6f..40eb5e4a5 100644
--- a/src/blackgui/components/colorselector.cpp
+++ b/src/gui/components/colorselector.cpp
@@ -1,8 +1,8 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/colorselector.h"
-#include "blackgui/guiutility.h"
+#include "gui/components/colorselector.h"
+#include "gui/guiutility.h"
 #include "misc/mixin/mixincompare.h"
 #include "misc/icons.h"
 #include "misc/rgbcolor.h"
@@ -30,7 +30,7 @@
 
 using namespace swift::misc;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CColorSelector::CColorSelector(QWidget *parent) : QFrame(parent),
                                                       ui(new Ui::CColorSelector)
diff --git a/src/blackgui/components/colorselector.h b/src/gui/components/colorselector.h
similarity index 90%
rename from src/blackgui/components/colorselector.h
rename to src/gui/components/colorselector.h
index 91bf6482c..dfdfc9604 100644
--- a/src/blackgui/components/colorselector.h
+++ b/src/gui/components/colorselector.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_COLORSELECTOR_H
-#define BLACKGUI_COMPONENTS_COLORSELECTOR_H
+#ifndef SWIFT_GUI_COMPONENTS_COLORSELECTOR_H
+#define SWIFT_GUI_COMPONENTS_COLORSELECTOR_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include "misc/rgbcolor.h"
 
 #include <QColor>
@@ -27,12 +27,12 @@ namespace Ui
     class CColorSelector;
 }
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Select a color
      */
-    class BLACKGUI_EXPORT CColorSelector : public QFrame
+    class SWIFT_GUI_EXPORT CColorSelector : public QFrame
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/colorselector.ui b/src/gui/components/colorselector.ui
similarity index 100%
rename from src/blackgui/components/colorselector.ui
rename to src/gui/components/colorselector.ui
diff --git a/src/blackgui/components/commandinput.cpp b/src/gui/components/commandinput.cpp
similarity index 94%
rename from src/blackgui/components/commandinput.cpp
rename to src/gui/components/commandinput.cpp
index 3090d5f55..19fb536c7 100644
--- a/src/blackgui/components/commandinput.cpp
+++ b/src/gui/components/commandinput.cpp
@@ -1,8 +1,8 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/commandinput.h"
-#include "blackgui/guiapplication.h"
+#include "gui/components/commandinput.h"
+#include "gui/guiapplication.h"
 #include "core/context/contextapplication.h"
 #include "core/context/contextsimulator.h"
 #include "core/context/contextnetwork.h"
@@ -13,12 +13,12 @@ using namespace swift::misc::network;
 using namespace swift::misc::simulation;
 using namespace swift::core::context;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CCommandInput::CCommandInput(QWidget *parent) : CLineEditHistory(parent),
                                                     CIdentifiable(this)
     {
-        if (!CSimpleCommandParser::registered("BlackGui::Components::CCommandInput"))
+        if (!CSimpleCommandParser::registered("swift::gui::components::CCommandInput"))
         {
             CSimpleCommandParser::registerCommand({ ".tooltip", "toggle dot command tooltip" });
             CSimpleCommandParser::registerCommand({ ".help", "show help" });
diff --git a/src/blackgui/components/commandinput.h b/src/gui/components/commandinput.h
similarity index 87%
rename from src/blackgui/components/commandinput.h
rename to src/gui/components/commandinput.h
index 5df1f4413..63bbef922 100644
--- a/src/blackgui/components/commandinput.h
+++ b/src/gui/components/commandinput.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_COMMANDINPUT_H
-#define BLACKGUI_COMPONENTS_COMMANDINPUT_H
+#ifndef SWIFT_GUI_COMPONENTS_COMMANDINPUT_H
+#define SWIFT_GUI_COMPONENTS_COMMANDINPUT_H
 
-#include "blackgui/lineedithistory.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/lineedithistory.h"
+#include "gui/swiftguiexport.h"
 #include "misc/digestsignal.h"
 #include "misc/identifiable.h"
 #include "misc/identifier.h"
@@ -27,10 +27,10 @@ namespace swift::misc
         class CSimulatorPluginInfo;
     }
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! Specialized line edit for command inputs
-    class BLACKGUI_EXPORT CCommandInput :
+    class SWIFT_GUI_EXPORT CCommandInput :
         public CLineEditHistory,
         public swift::misc::CIdentifiable
     {
diff --git a/src/blackgui/components/configsimulatorcomponent.cpp b/src/gui/components/configsimulatorcomponent.cpp
similarity index 98%
rename from src/blackgui/components/configsimulatorcomponent.cpp
rename to src/gui/components/configsimulatorcomponent.cpp
index 4ec821364..afe9777a5 100644
--- a/src/blackgui/components/configsimulatorcomponent.cpp
+++ b/src/gui/components/configsimulatorcomponent.cpp
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "configsimulatorcomponent.h"
-#include "blackgui/guiutility.h"
+#include "gui/guiutility.h"
 #include "misc/logmessage.h"
 #include "misc/simulation/fscommon/fsdirectories.h"
 #include "config/buildconfig.h"
@@ -13,7 +13,7 @@ using namespace swift::misc::simulation;
 using namespace swift::misc::simulation::fscommon;
 using namespace swift::config;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CConfigSimulatorComponent::CConfigSimulatorComponent(QWidget *parent) : QFrame(parent),
                                                                             ui(new Ui::CConfigSimulatorComponent)
diff --git a/src/blackgui/components/configsimulatorcomponent.h b/src/gui/components/configsimulatorcomponent.h
similarity index 93%
rename from src/blackgui/components/configsimulatorcomponent.h
rename to src/gui/components/configsimulatorcomponent.h
index f4e92922a..0da4e8cf1 100644
--- a/src/blackgui/components/configsimulatorcomponent.h
+++ b/src/gui/components/configsimulatorcomponent.h
@@ -3,8 +3,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_CONFIGSIMULATORCOMPONENT_H
-#define BLACKGUI_COMPONENTS_CONFIGSIMULATORCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_CONFIGSIMULATORCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_CONFIGSIMULATORCOMPONENT_H
 
 #include "misc/simulation/data/modelcaches.h"
 #include "core/application/applicationsettings.h"
@@ -16,7 +16,7 @@ namespace Ui
 {
     class CConfigSimulatorComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Simulator configuration
diff --git a/src/blackgui/components/configsimulatorcomponent.ui b/src/gui/components/configsimulatorcomponent.ui
similarity index 94%
rename from src/blackgui/components/configsimulatorcomponent.ui
rename to src/gui/components/configsimulatorcomponent.ui
index aae22d5c2..b159d7bdc 100644
--- a/src/blackgui/components/configsimulatorcomponent.ui
+++ b/src/gui/components/configsimulatorcomponent.ui
@@ -117,7 +117,7 @@
        </widget>
       </item>
       <item>
-       <widget class="BlackGui::Components::CSettingsSimulatorBasicsComponent" name="comp_SettingsSimulator">
+       <widget class="swift::gui::components::CSettingsSimulatorBasicsComponent" name="comp_SettingsSimulator">
         <property name="minimumSize">
          <size>
           <width>0</width>
@@ -146,9 +146,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CSettingsSimulatorBasicsComponent</class>
+   <class>swift::gui::components::CSettingsSimulatorBasicsComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/settingssimulatorbasicscomponent.h</header>
+   <header>gui/components/settingssimulatorbasicscomponent.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/configurationwizard.cpp b/src/gui/components/configurationwizard.cpp
similarity index 98%
rename from src/blackgui/components/configurationwizard.cpp
rename to src/gui/components/configurationwizard.cpp
index 9d83466f3..8eacba7fc 100644
--- a/src/blackgui/components/configurationwizard.cpp
+++ b/src/gui/components/configurationwizard.cpp
@@ -3,8 +3,8 @@
 
 #include "configurationwizard.h"
 #include "ui_configurationwizard.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/guiutility.h"
+#include "gui/guiapplication.h"
+#include "gui/guiutility.h"
 #include "misc/math/mathutils.h"
 #include "misc/directoryutils.h"
 #include <QPointer>
@@ -12,7 +12,7 @@
 using namespace swift::misc;
 using namespace swift::misc::math;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CConfigurationWizard::CConfigurationWizard(QWidget *parent) : QWizard(parent),
                                                                   ui(new Ui::CConfigurationWizard)
diff --git a/src/blackgui/components/configurationwizard.h b/src/gui/components/configurationwizard.h
similarity index 88%
rename from src/blackgui/components/configurationwizard.h
rename to src/gui/components/configurationwizard.h
index c53209d13..5ef0afd9a 100644
--- a/src/blackgui/components/configurationwizard.h
+++ b/src/gui/components/configurationwizard.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_CONFIGURATIONWIZARD_H
-#define BLACKGUI_COMPONENTS_CONFIGURATIONWIZARD_H
+#ifndef SWIFT_GUI_COMPONENTS_CONFIGURATIONWIZARD_H
+#define SWIFT_GUI_COMPONENTS_CONFIGURATIONWIZARD_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include <QWizard>
 #include <QScopedPointer>
 
@@ -14,12 +14,12 @@ namespace Ui
 {
     class CConfigurationWizard;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Configure the most important settings
      */
-    class BLACKGUI_EXPORT CConfigurationWizard : public QWizard
+    class SWIFT_GUI_EXPORT CConfigurationWizard : public QWizard
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/configurationwizard.ui b/src/gui/components/configurationwizard.ui
similarity index 72%
rename from src/blackgui/components/configurationwizard.ui
rename to src/gui/components/configurationwizard.ui
index ef3bc906b..adb36b8c1 100644
--- a/src/blackgui/components/configurationwizard.ui
+++ b/src/gui/components/configurationwizard.ui
@@ -31,7 +31,7 @@
   <property name="options">
    <set>QWizard::HaveCustomButton1</set>
   </property>
-  <widget class="BlackGui::Components::CLegalInfoWizardPage" name="wp_Legal">
+  <widget class="swift::gui::components::CLegalInfoWizardPage" name="wp_Legal">
    <property name="title">
     <string>Legal</string>
    </property>
@@ -52,11 +52,11 @@
      <number>4</number>
     </property>
     <item>
-     <widget class="BlackGui::Components::CLegalInfoComponent" name="comp_LegalInformation"/>
+     <widget class="swift::gui::components::CLegalInfoComponent" name="comp_LegalInformation"/>
     </item>
    </layout>
   </widget>
-  <widget class="BlackGui::Components::CInitialDataLoadWizardPage" name="wp_DataLoad">
+  <widget class="swift::gui::components::CInitialDataLoadWizardPage" name="wp_DataLoad">
    <property name="title">
     <string>Data loading</string>
    </property>
@@ -77,7 +77,7 @@
      <number>4</number>
     </property>
     <item>
-     <widget class="BlackGui::Components::CInitialDataLoadComponent" name="comp_DataLoad">
+     <widget class="swift::gui::components::CInitialDataLoadComponent" name="comp_DataLoad">
       <property name="minimumSize">
        <size>
         <width>0</width>
@@ -88,7 +88,7 @@
     </item>
    </layout>
   </widget>
-  <widget class="BlackGui::Components::CCopyModelsFromOtherSwiftVersionsWizardPage" name="wp_CopyModels">
+  <widget class="swift::gui::components::CCopyModelsFromOtherSwiftVersionsWizardPage" name="wp_CopyModels">
    <property name="title">
     <string>Copy models</string>
    </property>
@@ -109,11 +109,11 @@
      <number>4</number>
     </property>
     <item>
-     <widget class="BlackGui::Components::CCopyModelsFromOtherSwiftVersionsComponent" name="comp_CopyModels"/>
+     <widget class="swift::gui::components::CCopyModelsFromOtherSwiftVersionsComponent" name="comp_CopyModels"/>
     </item>
    </layout>
   </widget>
-  <widget class="BlackGui::Components::CCopySettingsAndCachesWizardPage" name="wp_CopySettingsAndCaches">
+  <widget class="swift::gui::components::CCopySettingsAndCachesWizardPage" name="wp_CopySettingsAndCaches">
    <property name="title">
     <string>Copy settings and caches</string>
    </property>
@@ -161,7 +161,7 @@
          <number>0</number>
         </property>
         <item>
-         <widget class="BlackGui::Components::CCopySettingsAndCachesComponent" name="comp_CopySettingsAndCachesComponent"/>
+         <widget class="swift::gui::components::CCopySettingsAndCachesComponent" name="comp_CopySettingsAndCachesComponent"/>
         </item>
        </layout>
       </widget>
@@ -169,7 +169,7 @@
     </item>
    </layout>
   </widget>
-  <widget class="BlackGui::Components::CConfigSimulatorWizardPage" name="wp_Simulator">
+  <widget class="swift::gui::components::CConfigSimulatorWizardPage" name="wp_Simulator">
    <property name="title">
     <string>Simulator</string>
    </property>
@@ -190,7 +190,7 @@
      <number>4</number>
     </property>
     <item>
-     <widget class="BlackGui::Components::CConfigSimulatorComponent" name="comp_Simulator">
+     <widget class="swift::gui::components::CConfigSimulatorComponent" name="comp_Simulator">
       <property name="minimumSize">
        <size>
         <width>0</width>
@@ -201,7 +201,7 @@
     </item>
    </layout>
   </widget>
-  <widget class="BlackGui::Components::CFirstModelSetWizardPage" name="wp_FirstModelSet">
+  <widget class="swift::gui::components::CFirstModelSetWizardPage" name="wp_FirstModelSet">
    <property name="title">
     <string>First model set</string>
    </property>
@@ -217,7 +217,7 @@
      </widget>
     </item>
     <item>
-     <widget class="BlackGui::Components::CFirstModelSetComponent" name="comp_FirstModelSet">
+     <widget class="swift::gui::components::CFirstModelSetComponent" name="comp_FirstModelSet">
       <property name="minimumSize">
        <size>
         <width>0</width>
@@ -228,7 +228,7 @@
     </item>
    </layout>
   </widget>
-  <widget class="BlackGui::Components::CInstallSimulatorSpecificWizardPage" name="wp_SimulatorSpecific">
+  <widget class="swift::gui::components::CInstallSimulatorSpecificWizardPage" name="wp_SimulatorSpecific">
    <property name="title">
     <string>Simulator specific installations</string>
    </property>
@@ -255,7 +255,7 @@
        </attribute>
        <layout class="QVBoxLayout" name="vl_P3DFsx">
         <item alignment="Qt::AlignTop">
-         <widget class="BlackGui::Components::CInstallFsxTerrainProbeComponent" name="comp_InstallFsxTerrainProbe">
+         <widget class="swift::gui::components::CInstallFsxTerrainProbeComponent" name="comp_InstallFsxTerrainProbe">
           <property name="minimumSize">
            <size>
             <width>0</width>
@@ -280,7 +280,7 @@
        </attribute>
        <layout class="QVBoxLayout" name="vl_XPlane">
         <item alignment="Qt::AlignTop">
-         <widget class="BlackGui::Components::CInstallXSwiftBusComponent" name="comp_InstallXSwiftBus">
+         <widget class="swift::gui::components::CInstallXSwiftBusComponent" name="comp_InstallXSwiftBus">
           <property name="minimumSize">
            <size>
             <width>0</width>
@@ -295,7 +295,7 @@
     </item>
    </layout>
   </widget>
-  <widget class="BlackGui::Components::CConfigHotkeyWizardPage" name="wp_Hotkeys">
+  <widget class="swift::gui::components::CConfigHotkeyWizardPage" name="wp_Hotkeys">
    <property name="title">
     <string>Hotkeys</string>
    </property>
@@ -328,7 +328,7 @@
       </property>
       <layout class="QVBoxLayout" name="vl_GroupBoxHotkey">
        <item>
-        <widget class="BlackGui::Components::CSettingsHotkeyComponent" name="comp_Hotkeys"/>
+        <widget class="swift::gui::components::CSettingsHotkeyComponent" name="comp_Hotkeys"/>
        </item>
       </layout>
      </widget>
@@ -338,105 +338,105 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CFirstModelSetComponent</class>
+   <class>swift::gui::components::CFirstModelSetComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/firstmodelsetcomponent.h</header>
+   <header>gui/components/firstmodelsetcomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CConfigSimulatorComponent</class>
+   <class>swift::gui::components::CConfigSimulatorComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/configsimulatorcomponent.h</header>
+   <header>gui/components/configsimulatorcomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CConfigSimulatorWizardPage</class>
+   <class>swift::gui::components::CConfigSimulatorWizardPage</class>
    <extends>QWizardPage</extends>
-   <header>blackgui/components/configsimulatorcomponent.h</header>
+   <header>gui/components/configsimulatorcomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CInitialDataLoadWizardPage</class>
+   <class>swift::gui::components::CInitialDataLoadWizardPage</class>
    <extends>QWizardPage</extends>
-   <header>blackgui/components/initialdataloadcomponent.h</header>
+   <header>gui/components/initialdataloadcomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CInitialDataLoadComponent</class>
+   <class>swift::gui::components::CInitialDataLoadComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/initialdataloadcomponent.h</header>
+   <header>gui/components/initialdataloadcomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CSettingsHotkeyComponent</class>
+   <class>swift::gui::components::CSettingsHotkeyComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/settingshotkeycomponent.h</header>
+   <header>gui/components/settingshotkeycomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CConfigHotkeyWizardPage</class>
+   <class>swift::gui::components::CConfigHotkeyWizardPage</class>
    <extends>QWizardPage</extends>
-   <header>blackgui/components/settingshotkeycomponent.h</header>
+   <header>gui/components/settingshotkeycomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CInstallXSwiftBusComponent</class>
+   <class>swift::gui::components::CInstallXSwiftBusComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/installxswiftbuscomponent.h</header>
+   <header>gui/components/installxswiftbuscomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CFirstModelSetWizardPage</class>
+   <class>swift::gui::components::CFirstModelSetWizardPage</class>
    <extends>QWizardPage</extends>
-   <header>blackgui/components/firstmodelsetcomponent.h</header>
+   <header>gui/components/firstmodelsetcomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CCopyModelsFromOtherSwiftVersionsWizardPage</class>
+   <class>swift::gui::components::CCopyModelsFromOtherSwiftVersionsWizardPage</class>
    <extends>QWizardPage</extends>
-   <header>blackgui/components/copymodelsfromotherswiftversionscomponent.h</header>
+   <header>gui/components/copymodelsfromotherswiftversionscomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CCopyModelsFromOtherSwiftVersionsComponent</class>
+   <class>swift::gui::components::CCopyModelsFromOtherSwiftVersionsComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/copymodelsfromotherswiftversionscomponent.h</header>
+   <header>gui/components/copymodelsfromotherswiftversionscomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CLegalInfoComponent</class>
+   <class>swift::gui::components::CLegalInfoComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/legalinfocomponent.h</header>
+   <header>gui/components/legalinfocomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CLegalInfoWizardPage</class>
+   <class>swift::gui::components::CLegalInfoWizardPage</class>
    <extends>QWizardPage</extends>
-   <header>blackgui/components/legalinfocomponent.h</header>
+   <header>gui/components/legalinfocomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CCopySettingsAndCachesComponent</class>
+   <class>swift::gui::components::CCopySettingsAndCachesComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/copysettingsandcachescomponent.h</header>
+   <header>gui/components/copysettingsandcachescomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CCopySettingsAndCachesWizardPage</class>
+   <class>swift::gui::components::CCopySettingsAndCachesWizardPage</class>
    <extends>QWizardPage</extends>
-   <header>blackgui/components/copysettingsandcachescomponent.h</header>
+   <header>gui/components/copysettingsandcachescomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CInstallSimulatorSpecificWizardPage</class>
+   <class>swift::gui::components::CInstallSimulatorSpecificWizardPage</class>
    <extends>QWizardPage</extends>
-   <header>blackgui/components/installsimulatorspecificwizardpage.h</header>
+   <header>gui/components/installsimulatorspecificwizardpage.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CInstallFsxTerrainProbeComponent</class>
+   <class>swift::gui::components::CInstallFsxTerrainProbeComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/installfsxterrainprobecomponent.h</header>
+   <header>gui/components/installfsxterrainprobecomponent.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/coordinatedialog.cpp b/src/gui/components/coordinatedialog.cpp
similarity index 96%
rename from src/blackgui/components/coordinatedialog.cpp
rename to src/gui/components/coordinatedialog.cpp
index 92fdcfaa8..5639d6abc 100644
--- a/src/blackgui/components/coordinatedialog.cpp
+++ b/src/gui/components/coordinatedialog.cpp
@@ -7,9 +7,9 @@
 
 using namespace swift::misc;
 using namespace swift::misc::geo;
-using namespace BlackGui::Editors;
+using namespace swift::gui::editors;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CCoordinateDialog::CCoordinateDialog(QWidget *parent) : QDialog(parent),
                                                             ui(new Ui::CCoordinateDialog)
diff --git a/src/blackgui/components/coordinatedialog.h b/src/gui/components/coordinatedialog.h
similarity index 56%
rename from src/blackgui/components/coordinatedialog.h
rename to src/gui/components/coordinatedialog.h
index a83a6ade2..d59ce9fcc 100644
--- a/src/blackgui/components/coordinatedialog.h
+++ b/src/gui/components/coordinatedialog.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_COORDINATEDIALOG_H
-#define BLACKGUI_COMPONENTS_COORDINATEDIALOG_H
+#ifndef SWIFT_GUI_COMPONENTS_COORDINATEDIALOG_H
+#define SWIFT_GUI_COMPONENTS_COORDINATEDIALOG_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/editors/coordinateform.h"
+#include "gui/swiftguiexport.h"
+#include "gui/editors/coordinateform.h"
 
 #include <QDialog>
 #include <QScopedPointer>
@@ -16,11 +16,11 @@ namespace Ui
 {
     class CCoordinateDialog;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! Coordinate form as dialog
-    //! \sa BlackGui::Editors::CCoordinateForm
-    class BLACKGUI_EXPORT CCoordinateDialog : public QDialog
+    //! \sa swift::gui::editors::CCoordinateForm
+    class SWIFT_GUI_EXPORT CCoordinateDialog : public QDialog
     {
         Q_OBJECT
 
@@ -31,26 +31,26 @@ namespace BlackGui::Components
         //! Destructor
         virtual ~CCoordinateDialog();
 
-        //! \copydoc BlackGui::Editors::CCoordinateForm::getCoordinate
+        //! \copydoc swift::gui::editors::CCoordinateForm::getCoordinate
         swift::misc::geo::CCoordinateGeodetic getCoordinate() const;
 
-        //! \copydoc BlackGui::Editors::CCoordinateForm::setCoordinate
+        //! \copydoc swift::gui::editors::CCoordinateForm::setCoordinate
         void setCoordinate(const swift::misc::geo::ICoordinateGeodetic &coordinate);
 
-        //! \copydoc BlackGui::Editors::CCoordinateForm::setReadOnly
+        //! \copydoc swift::gui::editors::CCoordinateForm::setReadOnly
         void setReadOnly(bool readonly);
 
-        //! \copydoc BlackGui::Editors::CCoordinateForm::setSelectOnly
+        //! \copydoc swift::gui::editors::CCoordinateForm::setSelectOnly
         void setSelectOnly();
 
-        //! \copydoc BlackGui::Editors::CCoordinateForm::showElevation
+        //! \copydoc swift::gui::editors::CCoordinateForm::showElevation
         void showElevation(bool show);
 
-        //! \copydoc BlackGui::Editors::CCoordinateForm::validate
+        //! \copydoc swift::gui::editors::CCoordinateForm::validate
         swift::misc::CStatusMessageList validate(bool nested = false) const;
 
     signals:
-        //! \copydoc BlackGui::Editors::CCoordinateForm::changedCoordinate
+        //! \copydoc swift::gui::editors::CCoordinateForm::changedCoordinate
         void changedCoordinate();
 
     private:
diff --git a/src/blackgui/components/coordinatedialog.ui b/src/gui/components/coordinatedialog.ui
similarity index 93%
rename from src/blackgui/components/coordinatedialog.ui
rename to src/gui/components/coordinatedialog.ui
index 1678a0bfc..1a892e4c3 100644
--- a/src/blackgui/components/coordinatedialog.ui
+++ b/src/gui/components/coordinatedialog.ui
@@ -30,7 +30,7 @@
     <number>4</number>
    </property>
    <item alignment="Qt::AlignTop">
-    <widget class="BlackGui::Editors::CCoordinateForm" name="editor_Coordinate">
+    <widget class="swift::gui::editors::CCoordinateForm" name="editor_Coordinate">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
        <horstretch>0</horstretch>
@@ -65,9 +65,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Editors::CCoordinateForm</class>
+   <class>swift::gui::editors::CCoordinateForm</class>
    <extends>QFrame</extends>
-   <header>blackgui/editors/coordinateform.h</header>
+   <header>gui/editors/coordinateform.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/copymodelsfromotherswiftversionscomponent.cpp b/src/gui/components/copymodelsfromotherswiftversionscomponent.cpp
similarity index 98%
rename from src/blackgui/components/copymodelsfromotherswiftversionscomponent.cpp
rename to src/gui/components/copymodelsfromotherswiftversionscomponent.cpp
index a60a89038..a876a1309 100644
--- a/src/blackgui/components/copymodelsfromotherswiftversionscomponent.cpp
+++ b/src/gui/components/copymodelsfromotherswiftversionscomponent.cpp
@@ -3,7 +3,7 @@
 
 #include "copymodelsfromotherswiftversionscomponent.h"
 #include "ui_copymodelsfromotherswiftversionscomponent.h"
-#include "blackgui/models/aircraftmodellistmodel.h"
+#include "gui/models/aircraftmodellistmodel.h"
 #include "core/application.h"
 #include "misc/stringutils.h"
 #include "misc/fileutils.h"
@@ -18,9 +18,9 @@
 using namespace swift::core;
 using namespace swift::misc;
 using namespace swift::misc::simulation;
-using namespace BlackGui::Models;
+using namespace swift::gui::models;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CCopyModelsFromOtherSwiftVersionsComponent::CCopyModelsFromOtherSwiftVersionsComponent(QWidget *parent) : COverlayMessagesFrame(parent),
                                                                                                               ui(new Ui::CCopyModelsFromOtherSwiftVersionsComponent)
diff --git a/src/blackgui/components/copymodelsfromotherswiftversionscomponent.h b/src/gui/components/copymodelsfromotherswiftversionscomponent.h
similarity index 92%
rename from src/blackgui/components/copymodelsfromotherswiftversionscomponent.h
rename to src/gui/components/copymodelsfromotherswiftversionscomponent.h
index c886d0013..cbe684e38 100644
--- a/src/blackgui/components/copymodelsfromotherswiftversionscomponent.h
+++ b/src/gui/components/copymodelsfromotherswiftversionscomponent.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_COPYMODELSFROMOTHERSWIFTVERSIONS_H
-#define BLACKGUI_COMPONENTS_COPYMODELSFROMOTHERSWIFTVERSIONS_H
+#ifndef SWIFT_GUI_COMPONENTS_COPYMODELSFROMOTHERSWIFTVERSIONS_H
+#define SWIFT_GUI_COMPONENTS_COPYMODELSFROMOTHERSWIFTVERSIONS_H
 
-#include "blackgui/overlaymessagesframe.h"
+#include "gui/overlaymessagesframe.h"
 #include "misc/simulation/data/modelcaches.h"
 #include "misc/applicationinfo.h"
 #include <QFrame>
@@ -17,7 +17,7 @@ namespace Ui
 {
     class CCopyModelsFromOtherSwiftVersionsComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Copy models from another swift version
diff --git a/src/blackgui/components/copymodelsfromotherswiftversionscomponent.ui b/src/gui/components/copymodelsfromotherswiftversionscomponent.ui
similarity index 88%
rename from src/blackgui/components/copymodelsfromotherswiftversionscomponent.ui
rename to src/gui/components/copymodelsfromotherswiftversionscomponent.ui
index 67a6f1f9e..5b648ac22 100644
--- a/src/blackgui/components/copymodelsfromotherswiftversionscomponent.ui
+++ b/src/gui/components/copymodelsfromotherswiftversionscomponent.ui
@@ -21,7 +21,7 @@
      </property>
      <layout class="QVBoxLayout" name="vl_OtherSwiftVersions">
       <item>
-       <widget class="BlackGui::Components::COtherSwiftVersionsComponent" name="comp_OtherSwiftVersions">
+       <widget class="swift::gui::components::COtherSwiftVersionsComponent" name="comp_OtherSwiftVersions">
         <property name="minimumSize">
          <size>
           <width>0</width>
@@ -64,7 +64,7 @@
        </widget>
       </item>
       <item>
-       <widget class="BlackGui::Components::CSimulatorSelector" name="comp_SimulatorSelector">
+       <widget class="swift::gui::components::CSimulatorSelector" name="comp_SimulatorSelector">
         <property name="minimumSize">
          <size>
           <width>100</width>
@@ -142,7 +142,7 @@
        </widget>
       </item>
       <item>
-       <widget class="BlackGui::Views::CAircraftModelView" name="tvp_AircraftModels">
+       <widget class="swift::gui::views::CAircraftModelView" name="tvp_AircraftModels">
         <property name="selectionMode">
          <enum>QAbstractItemView::SingleSelection</enum>
         </property>
@@ -161,21 +161,21 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CSimulatorSelector</class>
+   <class>swift::gui::components::CSimulatorSelector</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/simulatorselector.h</header>
+   <header>gui/components/simulatorselector.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::COtherSwiftVersionsComponent</class>
+   <class>swift::gui::components::COtherSwiftVersionsComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/otherswiftversionscomponent.h</header>
+   <header>gui/components/otherswiftversionscomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Views::CAircraftModelView</class>
+   <class>swift::gui::views::CAircraftModelView</class>
    <extends>QTableView</extends>
-   <header>blackgui/views/aircraftmodelview.h</header>
+   <header>gui/views/aircraftmodelview.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/blackgui/components/copymodelsfromotherswiftversionsdialog.cpp b/src/gui/components/copymodelsfromotherswiftversionsdialog.cpp
similarity index 95%
rename from src/blackgui/components/copymodelsfromotherswiftversionsdialog.cpp
rename to src/gui/components/copymodelsfromotherswiftversionsdialog.cpp
index 74fa80248..a08e0fa67 100644
--- a/src/blackgui/components/copymodelsfromotherswiftversionsdialog.cpp
+++ b/src/gui/components/copymodelsfromotherswiftversionsdialog.cpp
@@ -4,7 +4,7 @@
 #include "copymodelsfromotherswiftversionsdialog.h"
 #include "ui_copymodelsfromotherswiftversionsdialog.h"
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CCopyModelsFromOtherSwiftVersionsDialog::CCopyModelsFromOtherSwiftVersionsDialog(QWidget *parent) : QDialog(parent),
                                                                                                         ui(new Ui::CCopyModelsFromOtherSwiftVersionsDialog)
diff --git a/src/blackgui/components/copymodelsfromotherswiftversionsdialog.h b/src/gui/components/copymodelsfromotherswiftversionsdialog.h
similarity index 81%
rename from src/blackgui/components/copymodelsfromotherswiftversionsdialog.h
rename to src/gui/components/copymodelsfromotherswiftversionsdialog.h
index f44ae8354..a7dbf2a16 100644
--- a/src/blackgui/components/copymodelsfromotherswiftversionsdialog.h
+++ b/src/gui/components/copymodelsfromotherswiftversionsdialog.h
@@ -3,8 +3,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_COPYMODELSFROMOTHERSWIFTVERSIONSDIALOG_H
-#define BLACKGUI_COMPONENTS_COPYMODELSFROMOTHERSWIFTVERSIONSDIALOG_H
+#ifndef SWIFT_GUI_COMPONENTS_COPYMODELSFROMOTHERSWIFTVERSIONSDIALOG_H
+#define SWIFT_GUI_COMPONENTS_COPYMODELSFROMOTHERSWIFTVERSIONSDIALOG_H
 
 #include <QDialog>
 #include <QScopedPointer>
@@ -13,7 +13,7 @@ namespace Ui
 {
     class CCopyModelsFromOtherSwiftVersionsDialog;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Copy models from other swift versions as dialog
diff --git a/src/blackgui/components/copymodelsfromotherswiftversionsdialog.ui b/src/gui/components/copymodelsfromotherswiftversionsdialog.ui
similarity index 76%
rename from src/blackgui/components/copymodelsfromotherswiftversionsdialog.ui
rename to src/gui/components/copymodelsfromotherswiftversionsdialog.ui
index 2a6619c40..a463566a3 100644
--- a/src/blackgui/components/copymodelsfromotherswiftversionsdialog.ui
+++ b/src/gui/components/copymodelsfromotherswiftversionsdialog.ui
@@ -15,7 +15,7 @@
   </property>
   <layout class="QVBoxLayout" name="vl_CopyFromAnotherSwiftDialog">
    <item>
-    <widget class="BlackGui::Components::CCopyModelsFromOtherSwiftVersionsComponent" name="comp_CopyComponent"/>
+    <widget class="swift::gui::components::CCopyModelsFromOtherSwiftVersionsComponent" name="comp_CopyComponent"/>
    </item>
    <item>
     <widget class="QDialogButtonBox" name="bb_CopyDialog">
@@ -28,9 +28,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CCopyModelsFromOtherSwiftVersionsComponent</class>
+   <class>swift::gui::components::CCopyModelsFromOtherSwiftVersionsComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/copymodelsfromotherswiftversionscomponent.h</header>
+   <header>gui/components/copymodelsfromotherswiftversionscomponent.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/copysettingsandcachescomponent.cpp b/src/gui/components/copysettingsandcachescomponent.cpp
similarity index 99%
rename from src/blackgui/components/copysettingsandcachescomponent.cpp
rename to src/gui/components/copysettingsandcachescomponent.cpp
index 2531e01c2..648668211 100644
--- a/src/blackgui/components/copysettingsandcachescomponent.cpp
+++ b/src/gui/components/copysettingsandcachescomponent.cpp
@@ -3,8 +3,8 @@
 
 #include "copysettingsandcachescomponent.h"
 #include "ui_copysettingsandcachescomponent.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/guiutility.h"
+#include "gui/guiapplication.h"
+#include "gui/guiutility.h"
 #include "misc/cachesettingsutils.h"
 #include "misc/json.h"
 #include "misc/fileutils.h"
@@ -25,9 +25,9 @@ using namespace swift::misc::simulation::settings;
 using namespace swift::core::audio;
 using namespace swift::core::application;
 using namespace swift::core::data;
-using namespace BlackGui::Settings;
+using namespace swift::gui::settings;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CCopySettingsAndCachesComponent::CCopySettingsAndCachesComponent(QWidget *parent) : COverlayMessagesFrame(parent),
                                                                                         ui(new Ui::CCopySettingsAndCachesComponent)
diff --git a/src/blackgui/components/copysettingsandcachescomponent.h b/src/gui/components/copysettingsandcachescomponent.h
similarity index 88%
rename from src/blackgui/components/copysettingsandcachescomponent.h
rename to src/gui/components/copysettingsandcachescomponent.h
index 71b4e98ec..0e008bf20 100644
--- a/src/blackgui/components/copysettingsandcachescomponent.h
+++ b/src/gui/components/copysettingsandcachescomponent.h
@@ -3,15 +3,15 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_COPYSETTINGSANDCACHESCOMPONENT_H
-#define BLACKGUI_COMPONENTS_COPYSETTINGSANDCACHESCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_COPYSETTINGSANDCACHESCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_COPYSETTINGSANDCACHESCOMPONENT_H
 
-#include "blackgui/settings/guisettings.h"
-#include "blackgui/settings/dockwidgetsettings.h"
-#include "blackgui/settings/viewupdatesettings.h"
-#include "blackgui/settings/textmessagesettings.h"
-#include "blackgui/overlaymessagesframe.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/settings/guisettings.h"
+#include "gui/settings/dockwidgetsettings.h"
+#include "gui/settings/viewupdatesettings.h"
+#include "gui/settings/textmessagesettings.h"
+#include "gui/overlaymessagesframe.h"
+#include "gui/swiftguiexport.h"
 #include "core/data/launchersetup.h"
 #include "core/data/vatsimsetup.h"
 #include "core/audio/audiosettings.h"
@@ -36,7 +36,7 @@ namespace Ui
 {
     class CCopySettingsAndCachesComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Copy settings and caches
@@ -111,11 +111,11 @@ namespace BlackGui::Components
 
         swift::misc::CSetting<swift::core::audio::TInputDevice> m_settingsAudioInputDevice { this };
         swift::misc::CSetting<swift::core::audio::TOutputDevice> m_settingsAudioOutputDevice { this };
-        swift::misc::CSetting<Settings::TGeneralGui> m_settingsGuiGeneral { this };
-        swift::misc::CSetting<Settings::TDockWidget> m_settingsDockWidget { this };
-        swift::misc::CSetting<Settings::TViewUpdateSettings> m_settingsViewUpdate { this };
-        swift::misc::CSetting<Settings::TBackgroundConsolidation> m_settingsConsolidation { this }; //!< consolidation time
-        swift::misc::CSetting<Settings::TextMessageSettings> m_settingsTextMessage { this };
+        swift::misc::CSetting<settings::TGeneralGui> m_settingsGuiGeneral { this };
+        swift::misc::CSetting<settings::TDockWidget> m_settingsDockWidget { this };
+        swift::misc::CSetting<settings::TViewUpdateSettings> m_settingsViewUpdate { this };
+        swift::misc::CSetting<settings::TBackgroundConsolidation> m_settingsConsolidation { this }; //!< consolidation time
+        swift::misc::CSetting<settings::TextMessageSettings> m_settingsTextMessage { this };
         swift::misc::CSetting<swift::core::application::TEnabledSimulators> m_settingsEnabledSimulators { this };
         swift::misc::CSetting<swift::core::application::TActionHotkeys> m_settingsActionHotkeys { this };
         swift::misc::CSetting<swift::misc::audio::TSettings> m_settingsAudio { this };
diff --git a/src/blackgui/components/copysettingsandcachescomponent.ui b/src/gui/components/copysettingsandcachescomponent.ui
similarity index 97%
rename from src/blackgui/components/copysettingsandcachescomponent.ui
rename to src/gui/components/copysettingsandcachescomponent.ui
index c2b21105d..bdeed111c 100644
--- a/src/blackgui/components/copysettingsandcachescomponent.ui
+++ b/src/gui/components/copysettingsandcachescomponent.ui
@@ -21,7 +21,7 @@
      </property>
      <layout class="QVBoxLayout" name="vl_OtherSwiftVersions">
       <item>
-       <widget class="BlackGui::Components::COtherSwiftVersionsComponent" name="comp_OtherSwiftVersions">
+       <widget class="swift::gui::components::COtherSwiftVersionsComponent" name="comp_OtherSwiftVersions">
         <property name="minimumSize">
          <size>
           <width>0</width>
@@ -320,9 +320,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::COtherSwiftVersionsComponent</class>
+   <class>swift::gui::components::COtherSwiftVersionsComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/otherswiftversionscomponent.h</header>
+   <header>gui/components/otherswiftversionscomponent.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/coreinfoareacomponent.cpp b/src/gui/components/coreinfoareacomponent.cpp
similarity index 91%
rename from src/blackgui/components/coreinfoareacomponent.cpp
rename to src/gui/components/coreinfoareacomponent.cpp
index 934bff0ae..79184b386 100644
--- a/src/blackgui/components/coreinfoareacomponent.cpp
+++ b/src/gui/components/coreinfoareacomponent.cpp
@@ -1,15 +1,15 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/coreinfoareacomponent.h"
-#include "blackgui/infoarea.h"
+#include "gui/components/coreinfoareacomponent.h"
+#include "gui/infoarea.h"
 #include "misc/icons.h"
 #include "ui_coreinfoareacomponent.h"
 
 using namespace swift::misc;
-using namespace BlackGui;
+using namespace swift::gui;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CCoreInfoAreaComponent::CCoreInfoAreaComponent(QWidget *parent) : CInfoArea(parent),
                                                                       ui(new Ui::CCoreInfoAreaComponent)
diff --git a/src/blackgui/components/coreinfoareacomponent.h b/src/gui/components/coreinfoareacomponent.h
similarity index 85%
rename from src/blackgui/components/coreinfoareacomponent.h
rename to src/gui/components/coreinfoareacomponent.h
index ae3566172..ca6af7397 100644
--- a/src/blackgui/components/coreinfoareacomponent.h
+++ b/src/gui/components/coreinfoareacomponent.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_COREINFOAREACOMPONENT_H
-#define BLACKGUI_COMPONENTS_COREINFOAREACOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_COREINFOAREACOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_COREINFOAREACOMPONENT_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/infoarea.h"
+#include "gui/swiftguiexport.h"
+#include "gui/infoarea.h"
 
 #include <QObject>
 #include <QScopedPointer>
@@ -21,13 +21,13 @@ namespace Ui
     class CCoreInfoAreaComponent;
 }
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     class CCoreStatusComponent;
     class CLogComponent;
 
     //! Main info area
-    class BLACKGUI_EXPORT CCoreInfoAreaComponent : public BlackGui::CInfoArea
+    class SWIFT_GUI_EXPORT CCoreInfoAreaComponent : public swift::gui::CInfoArea
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/coreinfoareacomponent.ui b/src/gui/components/coreinfoareacomponent.ui
similarity index 89%
rename from src/blackgui/components/coreinfoareacomponent.ui
rename to src/gui/components/coreinfoareacomponent.ui
index 81a6dd6d2..cb00df039 100644
--- a/src/blackgui/components/coreinfoareacomponent.ui
+++ b/src/gui/components/coreinfoareacomponent.ui
@@ -43,7 +43,7 @@
     </size>
    </property>
   </widget>
-  <widget class="BlackGui::CDockWidgetInfoArea" name="dwp_Log">
+  <widget class="swift::gui::CDockWidgetInfoArea" name="dwp_Log">
    <property name="minimumSize">
     <size>
      <width>80</width>
@@ -104,7 +104,7 @@
          <number>0</number>
         </property>
         <item>
-         <widget class="BlackGui::Components::CLogComponent" name="comp_Log">
+         <widget class="swift::gui::components::CLogComponent" name="comp_Log">
           <property name="lineWidth">
            <number>0</number>
           </property>
@@ -116,7 +116,7 @@
     </layout>
    </widget>
   </widget>
-  <widget class="BlackGui::CDockWidgetInfoArea" name="dwp_Status">
+  <widget class="swift::gui::CDockWidgetInfoArea" name="dwp_Status">
    <property name="minimumSize">
     <size>
      <width>165</width>
@@ -177,7 +177,7 @@
          <number>0</number>
         </property>
         <item>
-         <widget class="BlackGui::Components::CCoreStatusComponent" name="comp_Status">
+         <widget class="swift::gui::components::CCoreStatusComponent" name="comp_Status">
           <property name="frameShape">
            <enum>QFrame::StyledPanel</enum>
           </property>
@@ -195,21 +195,21 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::CDockWidgetInfoArea</class>
+   <class>swift::gui::CDockWidgetInfoArea</class>
    <extends>QDockWidget</extends>
-   <header>blackgui/dockwidgetinfoarea.h</header>
+   <header>gui/dockwidgetinfoarea.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CLogComponent</class>
+   <class>swift::gui::components::CLogComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/logcomponent.h</header>
+   <header>gui/components/logcomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CCoreStatusComponent</class>
+   <class>swift::gui::components::CCoreStatusComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/corestatuscomponent.h</header>
+   <header>gui/components/corestatuscomponent.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/coresettingsdialog.cpp b/src/gui/components/coresettingsdialog.cpp
similarity index 93%
rename from src/blackgui/components/coresettingsdialog.cpp
rename to src/gui/components/coresettingsdialog.cpp
index 39b8d30d3..ae5d3786c 100644
--- a/src/blackgui/components/coresettingsdialog.cpp
+++ b/src/gui/components/coresettingsdialog.cpp
@@ -3,10 +3,10 @@
 
 #include "coresettingsdialog.h"
 #include "ui_coresettingsdialog.h"
-#include "blackgui/guiapplication.h"
+#include "gui/guiapplication.h"
 #include <QPushButton>
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CCoreSettingsDialog::CCoreSettingsDialog(QWidget *parent) : QDialog(parent),
                                                                 ui(new Ui::CCoreSettingsDialog)
diff --git a/src/blackgui/components/coresettingsdialog.h b/src/gui/components/coresettingsdialog.h
similarity index 75%
rename from src/blackgui/components/coresettingsdialog.h
rename to src/gui/components/coresettingsdialog.h
index cc5e51726..37332a3b5 100644
--- a/src/blackgui/components/coresettingsdialog.h
+++ b/src/gui/components/coresettingsdialog.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_CORESETTINGSDIALOG_H
-#define BLACKGUI_COMPONENTS_CORESETTINGSDIALOG_H
+#ifndef SWIFT_GUI_COMPONENTS_CORESETTINGSDIALOG_H
+#define SWIFT_GUI_COMPONENTS_CORESETTINGSDIALOG_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include <QDialog>
 #include <QScopedPointer>
 
@@ -14,12 +14,12 @@ namespace Ui
 {
     class CCoreSettingsDialog;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Core / swift pilot client settings as Dialog
      */
-    class BLACKGUI_EXPORT CCoreSettingsDialog : public QDialog
+    class SWIFT_GUI_EXPORT CCoreSettingsDialog : public QDialog
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/coresettingsdialog.ui b/src/gui/components/coresettingsdialog.ui
similarity index 89%
rename from src/blackgui/components/coresettingsdialog.ui
rename to src/gui/components/coresettingsdialog.ui
index 1d6e70a9f..23db58bd8 100644
--- a/src/blackgui/components/coresettingsdialog.ui
+++ b/src/gui/components/coresettingsdialog.ui
@@ -21,7 +21,7 @@
   </property>
   <layout class="QVBoxLayout" name="vl_SettingsDialog">
    <item>
-    <widget class="BlackGui::Components::CSettingsComponent" name="comp_SettingsComponent"/>
+    <widget class="swift::gui::components::CSettingsComponent" name="comp_SettingsComponent"/>
    </item>
    <item>
     <widget class="QDialogButtonBox" name="bb_CoreSettingsDialog">
@@ -37,9 +37,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CSettingsComponent</class>
+   <class>swift::gui::components::CSettingsComponent</class>
    <extends>QTabWidget</extends>
-   <header>blackgui/components/settingscomponent.h</header>
+   <header>gui/components/settingscomponent.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/corestatuscomponent.cpp b/src/gui/components/corestatuscomponent.cpp
similarity index 85%
rename from src/blackgui/components/corestatuscomponent.cpp
rename to src/gui/components/corestatuscomponent.cpp
index c742880b9..dc13a0892 100644
--- a/src/blackgui/components/corestatuscomponent.cpp
+++ b/src/gui/components/corestatuscomponent.cpp
@@ -1,12 +1,12 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/corestatuscomponent.h"
+#include "gui/components/corestatuscomponent.h"
 #include "ui_corestatuscomponent.h"
 
 class QWidget;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CCoreStatusComponent::CCoreStatusComponent(QWidget *parent) : QFrame(parent),
                                                                   ui(new Ui::CCoreStatusComponent)
diff --git a/src/blackgui/components/corestatuscomponent.h b/src/gui/components/corestatuscomponent.h
similarity index 73%
rename from src/blackgui/components/corestatuscomponent.h
rename to src/gui/components/corestatuscomponent.h
index dd9e41205..7c3bcbe08 100644
--- a/src/blackgui/components/corestatuscomponent.h
+++ b/src/gui/components/corestatuscomponent.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_CORESTATUSCOMPONENT_H
-#define BLACKGUI_COMPONENTS_CORESTATUSCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_CORESTATUSCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_CORESTATUSCOMPONENT_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 
 #include <QFrame>
 #include <QObject>
@@ -19,10 +19,10 @@ namespace Ui
     class CCoreStatusComponent;
 }
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! Display status information about the core
-    class BLACKGUI_EXPORT CCoreStatusComponent : public QFrame
+    class SWIFT_GUI_EXPORT CCoreStatusComponent : public QFrame
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/corestatuscomponent.ui b/src/gui/components/corestatuscomponent.ui
similarity index 87%
rename from src/blackgui/components/corestatuscomponent.ui
rename to src/gui/components/corestatuscomponent.ui
index 8310d9b03..b31dd7a05 100644
--- a/src/blackgui/components/corestatuscomponent.ui
+++ b/src/gui/components/corestatuscomponent.ui
@@ -39,7 +39,7 @@
     <number>0</number>
    </property>
    <item>
-    <widget class="BlackGui::Components::CRegisterComponent" name="comp_Registered">
+    <widget class="swift::gui::components::CRegisterComponent" name="comp_Registered">
      <property name="frameShape">
       <enum>QFrame::StyledPanel</enum>
      </property>
@@ -55,9 +55,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CRegisterComponent</class>
+   <class>swift::gui::components::CRegisterComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/registercomponent.h</header>
+   <header>gui/components/registercomponent.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/countryselector.cpp b/src/gui/components/countryselector.cpp
similarity index 95%
rename from src/blackgui/components/countryselector.cpp
rename to src/gui/components/countryselector.cpp
index 16fa6ba79..3a7b3a5c1 100644
--- a/src/blackgui/components/countryselector.cpp
+++ b/src/gui/components/countryselector.cpp
@@ -4,8 +4,8 @@
 #include "countryselector.h"
 #include "ui_countryselector.h"
 
-#include "blackgui/guiapplication.h"
-#include "blackgui/uppercasevalidator.h"
+#include "gui/guiapplication.h"
+#include "gui/uppercasevalidator.h"
 #include "core/webdataservices.h"
 #include "misc/countrylist.h"
 #include <QCompleter>
@@ -13,7 +13,7 @@
 using namespace swift::misc;
 using namespace swift::core;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CCountrySelector::CCountrySelector(QWidget *parent) : QFrame(parent),
                                                           ui(new Ui::CCountrySelector)
diff --git a/src/blackgui/components/countryselector.h b/src/gui/components/countryselector.h
similarity index 90%
rename from src/blackgui/components/countryselector.h
rename to src/gui/components/countryselector.h
index 16d0d53f9..c9adcd5c2 100644
--- a/src/blackgui/components/countryselector.h
+++ b/src/gui/components/countryselector.h
@@ -3,8 +3,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_COUNTRYSELECTOR_H
-#define BLACKGUI_COMPONENTS_COUNTRYSELECTOR_H
+#ifndef SWIFT_GUI_COMPONENTS_COUNTRYSELECTOR_H
+#define SWIFT_GUI_COMPONENTS_COUNTRYSELECTOR_H
 
 #include "misc/country.h"
 #include <QFrame>
@@ -14,7 +14,7 @@ namespace Ui
 {
     class CCountrySelector;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * @brief Select a valid country
diff --git a/src/blackgui/components/countryselector.ui b/src/gui/components/countryselector.ui
similarity index 100%
rename from src/blackgui/components/countryselector.ui
rename to src/gui/components/countryselector.ui
diff --git a/src/blackgui/components/datainfoareacomponent.cpp b/src/gui/components/datainfoareacomponent.cpp
similarity index 90%
rename from src/blackgui/components/datainfoareacomponent.cpp
rename to src/gui/components/datainfoareacomponent.cpp
index f0f71ee02..410e56ce8 100644
--- a/src/blackgui/components/datainfoareacomponent.cpp
+++ b/src/gui/components/datainfoareacomponent.cpp
@@ -2,15 +2,15 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "core/webdataservices.h"
-#include "blackgui/components/datainfoareacomponent.h"
-#include "blackgui/components/dbaircrafticaocomponent.h"
-#include "blackgui/components/dbairlineicaocomponent.h"
-#include "blackgui/components/dbcountrycomponent.h"
-#include "blackgui/components/dbdistributorcomponent.h"
-#include "blackgui/components/dbliverycomponent.h"
-#include "blackgui/components/dbmodelcomponent.h"
-#include "blackgui/components/dbaircraftcategorycomponent.h"
-#include "blackgui/guiapplication.h"
+#include "gui/components/datainfoareacomponent.h"
+#include "gui/components/dbaircrafticaocomponent.h"
+#include "gui/components/dbairlineicaocomponent.h"
+#include "gui/components/dbcountrycomponent.h"
+#include "gui/components/dbdistributorcomponent.h"
+#include "gui/components/dbliverycomponent.h"
+#include "gui/components/dbmodelcomponent.h"
+#include "gui/components/dbaircraftcategorycomponent.h"
+#include "gui/guiapplication.h"
 #include "misc/icons.h"
 #include "misc/logmessage.h"
 #include "misc/network/entityflags.h"
@@ -27,10 +27,10 @@
 
 using namespace swift::misc;
 using namespace swift::misc::network;
-using namespace BlackGui;
-using namespace BlackGui::Components;
+using namespace swift::gui;
+using namespace swift::gui::components;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CDataInfoAreaComponent::CDataInfoAreaComponent(QWidget *parent) : CInfoArea(parent),
                                                                       ui(new Ui::CDataInfoAreaComponent)
diff --git a/src/blackgui/components/datainfoareacomponent.h b/src/gui/components/datainfoareacomponent.h
similarity index 91%
rename from src/blackgui/components/datainfoareacomponent.h
rename to src/gui/components/datainfoareacomponent.h
index d32fada06..991b0b840 100644
--- a/src/blackgui/components/datainfoareacomponent.h
+++ b/src/gui/components/datainfoareacomponent.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_DATAINFOAREACOMPONENT_H
-#define BLACKGUI_DATAINFOAREACOMPONENT_H
+#ifndef SWIFT_GUI_DATAINFOAREACOMPONENT_H
+#define SWIFT_GUI_DATAINFOAREACOMPONENT_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/infoarea.h"
+#include "gui/swiftguiexport.h"
+#include "gui/infoarea.h"
 #include "misc/network/entityflags.h"
 
 #include <QObject>
@@ -21,7 +21,7 @@ namespace Ui
 {
     class CDataInfoAreaComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     class CDbAircraftIcaoComponent;
     class CDbAirlineIcaoComponent;
@@ -34,8 +34,8 @@ namespace BlackGui::Components
     /*!
      * Info area containing the DB data (models, liveries ...)
      */
-    class BLACKGUI_EXPORT CDataInfoAreaComponent :
-        public BlackGui::CInfoArea
+    class SWIFT_GUI_EXPORT CDataInfoAreaComponent :
+        public swift::gui::CInfoArea
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/datainfoareacomponent.ui b/src/gui/components/datainfoareacomponent.ui
similarity index 86%
rename from src/blackgui/components/datainfoareacomponent.ui
rename to src/gui/components/datainfoareacomponent.ui
index adde95fc6..01d243f60 100644
--- a/src/blackgui/components/datainfoareacomponent.ui
+++ b/src/gui/components/datainfoareacomponent.ui
@@ -21,7 +21,7 @@
     </size>
    </property>
   </widget>
-  <widget class="BlackGui::CDockWidgetInfoArea" name="dwp_AircraftModels">
+  <widget class="swift::gui::CDockWidgetInfoArea" name="dwp_AircraftModels">
    <property name="allowedAreas">
     <set>Qt::TopDockWidgetArea</set>
    </property>
@@ -76,7 +76,7 @@
          <number>0</number>
         </property>
         <item>
-         <widget class="BlackGui::Components::CDbModelComponent" name="comp_DbModels">
+         <widget class="swift::gui::components::CDbModelComponent" name="comp_DbModels">
           <property name="frameShape">
            <enum>QFrame::StyledPanel</enum>
           </property>
@@ -91,7 +91,7 @@
     </layout>
    </widget>
   </widget>
-  <widget class="BlackGui::CDockWidgetInfoArea" name="dwp_Liveries">
+  <widget class="swift::gui::CDockWidgetInfoArea" name="dwp_Liveries">
    <property name="allowedAreas">
     <set>Qt::TopDockWidgetArea</set>
    </property>
@@ -146,7 +146,7 @@
          <number>0</number>
         </property>
         <item>
-         <widget class="BlackGui::Components::CDbLiveryComponent" name="comp_DbLiveries">
+         <widget class="swift::gui::components::CDbLiveryComponent" name="comp_DbLiveries">
           <property name="frameShape">
            <enum>QFrame::StyledPanel</enum>
           </property>
@@ -161,7 +161,7 @@
     </layout>
    </widget>
   </widget>
-  <widget class="BlackGui::CDockWidgetInfoArea" name="dwp_Distributors">
+  <widget class="swift::gui::CDockWidgetInfoArea" name="dwp_Distributors">
    <property name="allowedAreas">
     <set>Qt::TopDockWidgetArea</set>
    </property>
@@ -216,7 +216,7 @@
          <number>0</number>
         </property>
         <item>
-         <widget class="BlackGui::Components::CDbDistributorComponent" name="comp_DbDistributors">
+         <widget class="swift::gui::components::CDbDistributorComponent" name="comp_DbDistributors">
           <property name="frameShape">
            <enum>QFrame::StyledPanel</enum>
           </property>
@@ -231,7 +231,7 @@
     </layout>
    </widget>
   </widget>
-  <widget class="BlackGui::CDockWidgetInfoArea" name="dwp_AircraftIcao">
+  <widget class="swift::gui::CDockWidgetInfoArea" name="dwp_AircraftIcao">
    <property name="allowedAreas">
     <set>Qt::TopDockWidgetArea</set>
    </property>
@@ -277,7 +277,7 @@
          <number>0</number>
         </property>
         <item>
-         <widget class="BlackGui::Components::CDbAircraftIcaoComponent" name="comp_DbAircraftIcao">
+         <widget class="swift::gui::components::CDbAircraftIcaoComponent" name="comp_DbAircraftIcao">
           <property name="frameShape">
            <enum>QFrame::StyledPanel</enum>
           </property>
@@ -292,7 +292,7 @@
     </layout>
    </widget>
   </widget>
-  <widget class="BlackGui::CDockWidgetInfoArea" name="dwp_AirlineIcao">
+  <widget class="swift::gui::CDockWidgetInfoArea" name="dwp_AirlineIcao">
    <property name="allowedAreas">
     <set>Qt::TopDockWidgetArea</set>
    </property>
@@ -338,7 +338,7 @@
          <number>0</number>
         </property>
         <item>
-         <widget class="BlackGui::Components::CDbAirlineIcaoComponent" name="comp_DbAirlineIcao">
+         <widget class="swift::gui::components::CDbAirlineIcaoComponent" name="comp_DbAirlineIcao">
           <property name="frameShape">
            <enum>QFrame::StyledPanel</enum>
           </property>
@@ -353,7 +353,7 @@
     </layout>
    </widget>
   </widget>
-  <widget class="BlackGui::CDockWidgetInfoArea" name="dwp_Countries">
+  <widget class="swift::gui::CDockWidgetInfoArea" name="dwp_Countries">
    <property name="allowedAreas">
     <set>Qt::TopDockWidgetArea</set>
    </property>
@@ -399,7 +399,7 @@
          <number>0</number>
         </property>
         <item>
-         <widget class="BlackGui::Components::CDbCountryComponent" name="comp_DbCountries">
+         <widget class="swift::gui::components::CDbCountryComponent" name="comp_DbCountries">
           <property name="frameShape">
            <enum>QFrame::StyledPanel</enum>
           </property>
@@ -414,7 +414,7 @@
     </layout>
    </widget>
   </widget>
-  <widget class="BlackGui::CDockWidgetInfoArea" name="dwp_AircraftCategories">
+  <widget class="swift::gui::CDockWidgetInfoArea" name="dwp_AircraftCategories">
    <property name="allowedAreas">
     <set>Qt::TopDockWidgetArea</set>
    </property>
@@ -460,7 +460,7 @@
          <number>0</number>
         </property>
         <item>
-         <widget class="BlackGui::Components::CDbAircraftCategoryComponent" name="comp_DbAircraftCategories">
+         <widget class="swift::gui::components::CDbAircraftCategoryComponent" name="comp_DbAircraftCategories">
           <property name="frameShape">
            <enum>QFrame::StyledPanel</enum>
           </property>
@@ -478,51 +478,51 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::CDockWidgetInfoArea</class>
+   <class>swift::gui::CDockWidgetInfoArea</class>
    <extends>QDockWidget</extends>
-   <header>blackgui/dockwidgetinfoarea.h</header>
+   <header>gui/dockwidgetinfoarea.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CDbModelComponent</class>
+   <class>swift::gui::components::CDbModelComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/dbmodelcomponent.h</header>
+   <header>gui/components/dbmodelcomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CDbLiveryComponent</class>
+   <class>swift::gui::components::CDbLiveryComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/dbliverycomponent.h</header>
+   <header>gui/components/dbliverycomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CDbDistributorComponent</class>
+   <class>swift::gui::components::CDbDistributorComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/dbdistributorcomponent.h</header>
+   <header>gui/components/dbdistributorcomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CDbAircraftIcaoComponent</class>
+   <class>swift::gui::components::CDbAircraftIcaoComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/dbaircrafticaocomponent.h</header>
+   <header>gui/components/dbaircrafticaocomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CDbAirlineIcaoComponent</class>
+   <class>swift::gui::components::CDbAirlineIcaoComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/dbairlineicaocomponent.h</header>
+   <header>gui/components/dbairlineicaocomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CDbCountryComponent</class>
+   <class>swift::gui::components::CDbCountryComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/dbcountrycomponent.h</header>
+   <header>gui/components/dbcountrycomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CDbAircraftCategoryComponent</class>
+   <class>swift::gui::components::CDbAircraftCategoryComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/dbaircraftcategorycomponent.h</header>
+   <header>gui/components/dbaircraftcategorycomponent.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/datamaininfoareacomponent.cpp b/src/gui/components/datamaininfoareacomponent.cpp
similarity index 87%
rename from src/blackgui/components/datamaininfoareacomponent.cpp
rename to src/gui/components/datamaininfoareacomponent.cpp
index 06c755136..365a84fb4 100644
--- a/src/blackgui/components/datamaininfoareacomponent.cpp
+++ b/src/gui/components/datamaininfoareacomponent.cpp
@@ -1,23 +1,23 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/datainfoareacomponent.h"
-#include "blackgui/components/datamaininfoareacomponent.h"
-#include "blackgui/components/dbaircrafticaocomponent.h"
-#include "blackgui/components/dbliverycomponent.h"
-#include "blackgui/components/dbmappingcomponent.h"
-#include "blackgui/components/dbmodelcomponent.h"
-#include "blackgui/components/logcomponent.h"
+#include "gui/components/datainfoareacomponent.h"
+#include "gui/components/datamaininfoareacomponent.h"
+#include "gui/components/dbaircrafticaocomponent.h"
+#include "gui/components/dbliverycomponent.h"
+#include "gui/components/dbmappingcomponent.h"
+#include "gui/components/dbmodelcomponent.h"
+#include "gui/components/logcomponent.h"
 #include "misc/icons.h"
 #include "misc/verify.h"
 #include "ui_datamaininfoareacomponent.h"
 #include <QIcon>
 
 using namespace swift::misc;
-using namespace BlackGui;
-using namespace BlackGui::Components;
+using namespace swift::gui;
+using namespace swift::gui::components;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CDataMainInfoAreaComponent::CDataMainInfoAreaComponent(QWidget *parent) : CInfoArea(parent),
                                                                               ui(new Ui::CDataMainInfoAreaComponent)
diff --git a/src/blackgui/components/datamaininfoareacomponent.h b/src/gui/components/datamaininfoareacomponent.h
similarity index 83%
rename from src/blackgui/components/datamaininfoareacomponent.h
rename to src/gui/components/datamaininfoareacomponent.h
index 5b0400489..e815928c8 100644
--- a/src/blackgui/components/datamaininfoareacomponent.h
+++ b/src/gui/components/datamaininfoareacomponent.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_DATAMAININFOAREACOMPONENT_H
-#define BLACKGUI_DATAMAININFOAREACOMPONENT_H
+#ifndef SWIFT_GUI_DATAMAININFOAREACOMPONENT_H
+#define SWIFT_GUI_DATAMAININFOAREACOMPONENT_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/infoarea.h"
+#include "gui/swiftguiexport.h"
+#include "gui/infoarea.h"
 
 #include <QObject>
 #include <QScopedPointer>
@@ -20,7 +20,7 @@ namespace Ui
 {
     class CDataMainInfoAreaComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     class CDataInfoAreaComponent;
     class CDbMappingComponent;
@@ -30,8 +30,8 @@ namespace BlackGui::Components
     /*!
      * Main info area for data entry tool
      */
-    class BLACKGUI_EXPORT CDataMainInfoAreaComponent :
-        public BlackGui::CInfoArea
+    class SWIFT_GUI_EXPORT CDataMainInfoAreaComponent :
+        public swift::gui::CInfoArea
     {
         Q_OBJECT
 
@@ -63,7 +63,7 @@ namespace BlackGui::Components
         CDataInfoAreaComponent *getDataInfoAreaComponent() const;
 
         //! Settings component
-        BlackGui::Components::CDataSettingsComponent *getDataSettingsComponent() const;
+        swift::gui::components::CDataSettingsComponent *getDataSettingsComponent() const;
 
         //! Display the log
         void displayLog();
diff --git a/src/blackgui/components/datamaininfoareacomponent.ui b/src/gui/components/datamaininfoareacomponent.ui
similarity index 87%
rename from src/blackgui/components/datamaininfoareacomponent.ui
rename to src/gui/components/datamaininfoareacomponent.ui
index 50355119f..5e9585f74 100644
--- a/src/blackgui/components/datamaininfoareacomponent.ui
+++ b/src/gui/components/datamaininfoareacomponent.ui
@@ -33,7 +33,7 @@
     </size>
    </property>
   </widget>
-  <widget class="BlackGui::CDockWidgetInfoArea" name="dwp_Mapping">
+  <widget class="swift::gui::CDockWidgetInfoArea" name="dwp_Mapping">
    <property name="floating">
     <bool>false</bool>
    </property>
@@ -88,7 +88,7 @@
          <number>0</number>
         </property>
         <item>
-         <widget class="BlackGui::Components::CDbMappingComponent" name="comp_Mapping">
+         <widget class="swift::gui::components::CDbMappingComponent" name="comp_Mapping">
           <property name="frameShape">
            <enum>QFrame::StyledPanel</enum>
           </property>
@@ -103,7 +103,7 @@
     </layout>
    </widget>
   </widget>
-  <widget class="BlackGui::CDockWidgetInfoArea" name="dwp_DataInfoArea">
+  <widget class="swift::gui::CDockWidgetInfoArea" name="dwp_DataInfoArea">
    <property name="sizePolicy">
     <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
      <horstretch>0</horstretch>
@@ -164,7 +164,7 @@
          <number>0</number>
         </property>
         <item>
-         <widget class="BlackGui::Components::CDataInfoAreaComponent" name="comp_DataInfoArea" native="true"/>
+         <widget class="swift::gui::components::CDataInfoAreaComponent" name="comp_DataInfoArea" native="true"/>
         </item>
        </layout>
       </widget>
@@ -172,7 +172,7 @@
     </layout>
    </widget>
   </widget>
-  <widget class="BlackGui::CDockWidgetInfoArea" name="dwp_Settings">
+  <widget class="swift::gui::CDockWidgetInfoArea" name="dwp_Settings">
    <property name="allowedAreas">
     <set>Qt::TopDockWidgetArea</set>
    </property>
@@ -224,7 +224,7 @@
          <number>0</number>
         </property>
         <item>
-         <widget class="BlackGui::Components::CDataSettingsComponent" name="comp_Settings">
+         <widget class="swift::gui::components::CDataSettingsComponent" name="comp_Settings">
           <property name="frameShape">
            <enum>QFrame::StyledPanel</enum>
           </property>
@@ -239,7 +239,7 @@
     </layout>
    </widget>
   </widget>
-  <widget class="BlackGui::CDockWidgetInfoArea" name="dwp_Log">
+  <widget class="swift::gui::CDockWidgetInfoArea" name="dwp_Log">
    <property name="minimumSize">
     <size>
      <width>80</width>
@@ -297,7 +297,7 @@
          <number>0</number>
         </property>
         <item>
-         <widget class="BlackGui::Components::CLogComponent" name="comp_Log">
+         <widget class="swift::gui::components::CLogComponent" name="comp_Log">
           <property name="frameShape">
            <enum>QFrame::StyledPanel</enum>
           </property>
@@ -315,33 +315,33 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::CDockWidgetInfoArea</class>
+   <class>swift::gui::CDockWidgetInfoArea</class>
    <extends>QDockWidget</extends>
-   <header>blackgui/dockwidgetinfoarea.h</header>
+   <header>gui/dockwidgetinfoarea.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CLogComponent</class>
+   <class>swift::gui::components::CLogComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/logcomponent.h</header>
+   <header>gui/components/logcomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CDataInfoAreaComponent</class>
+   <class>swift::gui::components::CDataInfoAreaComponent</class>
    <extends>QWidget</extends>
-   <header>blackgui/components/datainfoareacomponent.h</header>
+   <header>gui/components/datainfoareacomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CDbMappingComponent</class>
+   <class>swift::gui::components::CDbMappingComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/dbmappingcomponent.h</header>
+   <header>gui/components/dbmappingcomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CDataSettingsComponent</class>
+   <class>swift::gui::components::CDataSettingsComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/datasettingscomponent.h</header>
+   <header>gui/components/datasettingscomponent.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/datasettingscomponent.cpp b/src/gui/components/datasettingscomponent.cpp
similarity index 87%
rename from src/blackgui/components/datasettingscomponent.cpp
rename to src/gui/components/datasettingscomponent.cpp
index 54f20e7ae..be351ac28 100644
--- a/src/blackgui/components/datasettingscomponent.cpp
+++ b/src/gui/components/datasettingscomponent.cpp
@@ -1,13 +1,13 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/datasettingscomponent.h"
+#include "gui/components/datasettingscomponent.h"
 #include "ui_datasettingscomponent.h"
 
-using namespace BlackGui;
+using namespace swift::gui;
 using namespace swift::core::db;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CDataSettingsComponent::CDataSettingsComponent(QWidget *parent) : COverlayMessagesFrame(parent),
                                                                       ui(new Ui::CDataSettingsComponent)
diff --git a/src/blackgui/components/datasettingscomponent.h b/src/gui/components/datasettingscomponent.h
similarity index 73%
rename from src/blackgui/components/datasettingscomponent.h
rename to src/gui/components/datasettingscomponent.h
index 3d5921c3e..fb9d0f8db 100644
--- a/src/blackgui/components/datasettingscomponent.h
+++ b/src/gui/components/datasettingscomponent.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_SETTINGS_DATASETTINGSCOMPONENT_H
-#define BLACKGUI_SETTINGS_DATASETTINGSCOMPONENT_H
+#ifndef SWIFT_GUI_SETTINGS_DATASETTINGSCOMPONENT_H
+#define SWIFT_GUI_SETTINGS_DATASETTINGSCOMPONENT_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/overlaymessagesframe.h"
+#include "gui/swiftguiexport.h"
+#include "gui/overlaymessagesframe.h"
 #include <QObject>
 #include <QScopedPointer>
 
@@ -21,12 +21,12 @@ namespace swift::core::db
 {
     class CBackgroundDataUpdater;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Settings
      */
-    class BLACKGUI_EXPORT CDataSettingsComponent : public COverlayMessagesFrame
+    class SWIFT_GUI_EXPORT CDataSettingsComponent : public COverlayMessagesFrame
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/datasettingscomponent.ui b/src/gui/components/datasettingscomponent.ui
similarity index 83%
rename from src/blackgui/components/datasettingscomponent.ui
rename to src/gui/components/datasettingscomponent.ui
index 09c0d5bfd..76b1ebe24 100644
--- a/src/blackgui/components/datasettingscomponent.ui
+++ b/src/gui/components/datasettingscomponent.ui
@@ -63,7 +63,7 @@
        <number>4</number>
       </property>
       <item>
-       <widget class="BlackGui::Components::CDistributorPreferencesComponent" name="comp_DistributorPreferences">
+       <widget class="swift::gui::components::CDistributorPreferencesComponent" name="comp_DistributorPreferences">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
           <horstretch>0</horstretch>
@@ -94,7 +94,7 @@
        <number>3</number>
       </property>
       <item>
-       <widget class="BlackGui::Components::CSettingsModelComponent" name="comp_ModelSettings"/>
+       <widget class="swift::gui::components::CSettingsModelComponent" name="comp_ModelSettings"/>
       </item>
      </layout>
     </widget>
@@ -124,7 +124,7 @@
        <number>4</number>
       </property>
       <item>
-       <widget class="BlackGui::Components::CSettingsGuiComponent" name="comp_GuiSettings">
+       <widget class="swift::gui::components::CSettingsGuiComponent" name="comp_GuiSettings">
         <property name="minimumSize">
          <size>
           <width>0</width>
@@ -184,7 +184,7 @@
        </spacer>
       </item>
       <item row="0" column="0">
-       <widget class="BlackGui::Components::CDbLoginComponent" name="comp_LoginComponent">
+       <widget class="swift::gui::components::CDbLoginComponent" name="comp_LoginComponent">
         <property name="minimumSize">
          <size>
           <width>0</width>
@@ -215,7 +215,7 @@
        <number>4</number>
       </property>
       <item>
-       <widget class="BlackGui::Components::CSettingsSimulatorBasicsComponent" name="comp_SimulatorComponent">
+       <widget class="swift::gui::components::CSettingsSimulatorBasicsComponent" name="comp_SimulatorComponent">
         <property name="frameShape">
          <enum>QFrame::StyledPanel</enum>
         </property>
@@ -246,7 +246,7 @@
        <number>3</number>
       </property>
       <item>
-       <widget class="BlackGui::Components::CModelConverterXSetupComponent" name="comp_ModelConverterX"/>
+       <widget class="swift::gui::components::CModelConverterXSetupComponent" name="comp_ModelConverterX"/>
       </item>
      </layout>
     </widget>
@@ -255,39 +255,39 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CDbLoginComponent</class>
+   <class>swift::gui::components::CDbLoginComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/dblogincomponent.h</header>
+   <header>gui/components/dblogincomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CDistributorPreferencesComponent</class>
+   <class>swift::gui::components::CDistributorPreferencesComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/distributorpreferencescomponent.h</header>
+   <header>gui/components/distributorpreferencescomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CSettingsSimulatorBasicsComponent</class>
+   <class>swift::gui::components::CSettingsSimulatorBasicsComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/settingssimulatorbasicscomponent.h</header>
+   <header>gui/components/settingssimulatorbasicscomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CSettingsGuiComponent</class>
+   <class>swift::gui::components::CSettingsGuiComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/settingsguicomponent.h</header>
+   <header>gui/components/settingsguicomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CSettingsModelComponent</class>
+   <class>swift::gui::components::CSettingsModelComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/settingsmodelcomponent.h</header>
+   <header>gui/components/settingsmodelcomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CModelConverterXSetupComponent</class>
+   <class>swift::gui::components::CModelConverterXSetupComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/modelconverterxsetupcomponent.h</header>
+   <header>gui/components/modelconverterxsetupcomponent.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/dbaircraftcategorycomponent.cpp b/src/gui/components/dbaircraftcategorycomponent.cpp
similarity index 97%
rename from src/blackgui/components/dbaircraftcategorycomponent.cpp
rename to src/gui/components/dbaircraftcategorycomponent.cpp
index ee52097d0..ccc4a5129 100644
--- a/src/blackgui/components/dbaircraftcategorycomponent.cpp
+++ b/src/gui/components/dbaircraftcategorycomponent.cpp
@@ -3,7 +3,7 @@
 
 #include "dbaircraftcategorycomponent.h"
 #include "ui_dbaircraftcategorycomponent.h"
-#include "blackgui/guiapplication.h"
+#include "gui/guiapplication.h"
 #include "core/webdataservices.h"
 
 #include <QStringBuilder>
@@ -11,9 +11,9 @@
 using namespace swift::core;
 using namespace swift::misc::network;
 using namespace swift::misc::aviation;
-using namespace BlackGui::Views;
+using namespace swift::gui::views;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CDbAircraftCategoryComponent::CDbAircraftCategoryComponent(QWidget *parent) : COverlayMessagesFrame(parent),
                                                                                   ui(new Ui::CDbAircraftCategoryComponent)
diff --git a/src/blackgui/components/dbaircraftcategorycomponent.h b/src/gui/components/dbaircraftcategorycomponent.h
similarity index 76%
rename from src/blackgui/components/dbaircraftcategorycomponent.h
rename to src/gui/components/dbaircraftcategorycomponent.h
index 43f032c06..ca0cf2f95 100644
--- a/src/blackgui/components/dbaircraftcategorycomponent.h
+++ b/src/gui/components/dbaircraftcategorycomponent.h
@@ -3,13 +3,13 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_DBAIRCRAFTCATEGORYCOMPONENT_H
-#define BLACKGUI_COMPONENTS_DBAIRCRAFTCATEGORYCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_DBAIRCRAFTCATEGORYCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_DBAIRCRAFTCATEGORYCOMPONENT_H
 
-#include "blackgui/overlaymessagesframe.h"
-#include "blackgui/enablefordockwidgetinfoarea.h"
-#include "blackgui/enableforviewbasedindicator.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/overlaymessagesframe.h"
+#include "gui/enablefordockwidgetinfoarea.h"
+#include "gui/enableforviewbasedindicator.h"
+#include "gui/swiftguiexport.h"
 #include "misc/network/entityflags.h"
 
 #include <QScopedPointer>
@@ -18,12 +18,12 @@ namespace Ui
 {
     class CDbAircraftCategoryComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * DB aircraft categories
      */
-    class BLACKGUI_EXPORT CDbAircraftCategoryComponent :
+    class SWIFT_GUI_EXPORT CDbAircraftCategoryComponent :
         public COverlayMessagesFrame,
         public CEnableForDockWidgetInfoArea,
         public CEnableForViewBasedIndicator
diff --git a/src/blackgui/components/dbaircraftcategorycomponent.ui b/src/gui/components/dbaircraftcategorycomponent.ui
similarity index 82%
rename from src/blackgui/components/dbaircraftcategorycomponent.ui
rename to src/gui/components/dbaircraftcategorycomponent.ui
index d6eb915b6..10b4e5eac 100644
--- a/src/blackgui/components/dbaircraftcategorycomponent.ui
+++ b/src/gui/components/dbaircraftcategorycomponent.ui
@@ -37,7 +37,7 @@
       </attribute>
       <layout class="QVBoxLayout" name="vl_Tree">
        <item>
-        <widget class="BlackGui::Views::CAircraftCategoryTreeView" name="tvp_AircraftCategoryTree">
+        <widget class="swift::gui::views::CAircraftCategoryTreeView" name="tvp_AircraftCategoryTree">
          <attribute name="headerVisible">
           <bool>false</bool>
          </attribute>
@@ -51,7 +51,7 @@
       </attribute>
       <layout class="QVBoxLayout" name="vl_Table">
        <item>
-        <widget class="BlackGui::Views::CAircraftCategoryView" name="tvp_AircraftCategoryView">
+        <widget class="swift::gui::views::CAircraftCategoryView" name="tvp_AircraftCategoryView">
          <property name="selectionMode">
           <enum>QAbstractItemView::SingleSelection</enum>
          </property>
@@ -71,14 +71,14 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Views::CAircraftCategoryView</class>
+   <class>swift::gui::views::CAircraftCategoryView</class>
    <extends>QTableView</extends>
-   <header>blackgui/views/aircraftcategoryview.h</header>
+   <header>gui/views/aircraftcategoryview.h</header>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Views::CAircraftCategoryTreeView</class>
+   <class>swift::gui::views::CAircraftCategoryTreeView</class>
    <extends>QTreeView</extends>
-   <header>blackgui/views/aircraftcategorytreeview.h</header>
+   <header>gui/views/aircraftcategorytreeview.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/src/blackgui/components/dbaircrafticaocomponent.cpp b/src/gui/components/dbaircrafticaocomponent.cpp
similarity index 90%
rename from src/blackgui/components/dbaircrafticaocomponent.cpp
rename to src/gui/components/dbaircrafticaocomponent.cpp
index d0b33f7c7..bce998b54 100644
--- a/src/blackgui/components/dbaircrafticaocomponent.cpp
+++ b/src/gui/components/dbaircrafticaocomponent.cpp
@@ -1,11 +1,11 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/dbaircrafticaocomponent.h"
-#include "blackgui/filters/aircrafticaofilterbar.h"
-#include "blackgui/views/aircrafticaoview.h"
-#include "blackgui/views/viewbase.h"
-#include "blackgui/guiapplication.h"
+#include "gui/components/dbaircrafticaocomponent.h"
+#include "gui/filters/aircrafticaofilterbar.h"
+#include "gui/views/aircrafticaoview.h"
+#include "gui/views/viewbase.h"
+#include "gui/guiapplication.h"
 #include "core/webdataservices.h"
 #include "dbaircrafticaocomponent.h"
 #include "ui_dbaircrafticaocomponent.h"
@@ -17,9 +17,9 @@
 using namespace swift::core;
 using namespace swift::misc::network;
 using namespace swift::misc::aviation;
-using namespace BlackGui::Views;
+using namespace swift::gui::views;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CDbAircraftIcaoComponent::CDbAircraftIcaoComponent(QWidget *parent) : COverlayMessagesFrame(parent),
                                                                           ui(new Ui::CDbAircraftIcaoComponent)
@@ -41,7 +41,7 @@ namespace BlackGui::Components
     CDbAircraftIcaoComponent::~CDbAircraftIcaoComponent()
     {}
 
-    BlackGui::Views::CAircraftIcaoCodeView *CDbAircraftIcaoComponent::view() const
+    swift::gui::views::CAircraftIcaoCodeView *CDbAircraftIcaoComponent::view() const
     {
         return ui->tvp_AircraftIcao;
     }
diff --git a/src/blackgui/components/dbaircrafticaocomponent.h b/src/gui/components/dbaircrafticaocomponent.h
similarity index 78%
rename from src/blackgui/components/dbaircrafticaocomponent.h
rename to src/gui/components/dbaircrafticaocomponent.h
index 70e6ab198..42cad625c 100644
--- a/src/blackgui/components/dbaircrafticaocomponent.h
+++ b/src/gui/components/dbaircrafticaocomponent.h
@@ -3,13 +3,13 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_DBAIRCRAFTICAOCOMPONENT_H
-#define BLACKGUI_COMPONENTS_DBAIRCRAFTICAOCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_DBAIRCRAFTICAOCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_DBAIRCRAFTICAOCOMPONENT_H
 
-#include "blackgui/enablefordockwidgetinfoarea.h"
-#include "blackgui/enableforviewbasedindicator.h"
-#include "blackgui/overlaymessagesframe.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/enablefordockwidgetinfoarea.h"
+#include "gui/enableforviewbasedindicator.h"
+#include "gui/overlaymessagesframe.h"
+#include "gui/swiftguiexport.h"
 #include "misc/network/entityflags.h"
 
 #include <QObject>
@@ -23,18 +23,18 @@ namespace swift::misc::aviation
 {
     class CAircraftIcaoCode;
 }
-namespace BlackGui
+namespace swift::gui
 {
-    namespace Views
+    namespace views
     {
         class CAircraftIcaoCodeView;
     }
-    namespace Components
+    namespace components
     {
         /*!
          * DB aircraft ICAO data
          */
-        class BLACKGUI_EXPORT CDbAircraftIcaoComponent :
+        class SWIFT_GUI_EXPORT CDbAircraftIcaoComponent :
             public COverlayMessagesFrame,
             public CEnableForDockWidgetInfoArea,
             public CEnableForViewBasedIndicator
@@ -49,7 +49,7 @@ namespace BlackGui
             virtual ~CDbAircraftIcaoComponent() override;
 
             //! Get the view
-            BlackGui::Views::CAircraftIcaoCodeView *view() const;
+            swift::gui::views::CAircraftIcaoCodeView *view() const;
 
             //! Filter by ICAO as default
             void filter(const swift::misc::aviation::CAircraftIcaoCode &icao);
diff --git a/src/blackgui/components/dbaircrafticaocomponent.ui b/src/gui/components/dbaircrafticaocomponent.ui
similarity index 82%
rename from src/blackgui/components/dbaircrafticaocomponent.ui
rename to src/gui/components/dbaircrafticaocomponent.ui
index 309eace89..b4ed2416d 100644
--- a/src/blackgui/components/dbaircrafticaocomponent.ui
+++ b/src/gui/components/dbaircrafticaocomponent.ui
@@ -39,7 +39,7 @@
     <number>0</number>
    </property>
    <item>
-    <widget class="BlackGui::Filters::CAircraftIcaoFilterBar" name="filter_AircraftIcao">
+    <widget class="swift::gui::filters::CAircraftIcaoFilterBar" name="filter_AircraftIcao">
      <property name="maximumSize">
       <size>
        <width>16777215</width>
@@ -52,7 +52,7 @@
     </widget>
    </item>
    <item>
-    <widget class="BlackGui::Views::CAircraftIcaoCodeView" name="tvp_AircraftIcao">
+    <widget class="swift::gui::views::CAircraftIcaoCodeView" name="tvp_AircraftIcao">
      <property name="selectionMode">
       <enum>QAbstractItemView::SingleSelection</enum>
      </property>
@@ -68,14 +68,14 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Views::CAircraftIcaoCodeView</class>
+   <class>swift::gui::views::CAircraftIcaoCodeView</class>
    <extends>QTableView</extends>
-   <header>blackgui/views/aircrafticaoview.h</header>
+   <header>gui/views/aircrafticaoview.h</header>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Filters::CAircraftIcaoFilterBar</class>
+   <class>swift::gui::filters::CAircraftIcaoFilterBar</class>
    <extends>QFrame</extends>
-   <header>blackgui/filters/aircrafticaofilterbar.h</header>
+   <header>gui/filters/aircrafticaofilterbar.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/dbaircrafticaoselectorcomponent.cpp b/src/gui/components/dbaircrafticaoselectorcomponent.cpp
similarity index 97%
rename from src/blackgui/components/dbaircrafticaoselectorcomponent.cpp
rename to src/gui/components/dbaircrafticaoselectorcomponent.cpp
index 5a0204631..c6ebef625 100644
--- a/src/blackgui/components/dbaircrafticaoselectorcomponent.cpp
+++ b/src/gui/components/dbaircrafticaoselectorcomponent.cpp
@@ -4,9 +4,9 @@
 #include "ui_dbaircrafticaoselectorcomponent.h"
 #include "core/application.h"
 #include "core/webdataservices.h"
-#include "blackgui/components/dbaircrafticaoselectorcomponent.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/uppercasevalidator.h"
+#include "gui/components/dbaircrafticaoselectorcomponent.h"
+#include "gui/guiapplication.h"
+#include "gui/uppercasevalidator.h"
 #include "misc/aviation/aircrafticaocodelist.h"
 #include "misc/db/datastoreutility.h"
 #include "misc/mixin/mixincompare.h"
@@ -24,14 +24,14 @@
 #include <QPalette>
 #include <Qt>
 
-using namespace BlackGui;
+using namespace swift::gui;
 using namespace swift::core;
 using namespace swift::misc;
 using namespace swift::misc::aviation;
 using namespace swift::misc::db;
 using namespace swift::misc::network;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CDbAircraftIcaoSelectorComponent::CDbAircraftIcaoSelectorComponent(QWidget *parent) : QFrame(parent),
                                                                                           ui(new Ui::CDbAircraftIcaoSelectorComponent)
diff --git a/src/blackgui/components/dbaircrafticaoselectorcomponent.h b/src/gui/components/dbaircrafticaoselectorcomponent.h
similarity index 91%
rename from src/blackgui/components/dbaircrafticaoselectorcomponent.h
rename to src/gui/components/dbaircrafticaoselectorcomponent.h
index 81acf6ebf..06c0f771b 100644
--- a/src/blackgui/components/dbaircrafticaoselectorcomponent.h
+++ b/src/gui/components/dbaircrafticaoselectorcomponent.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_DBAIRCRAFTICAOSELECTORCOMPONENT_H
-#define BLACKGUI_COMPONENTS_DBAIRCRAFTICAOSELECTORCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_DBAIRCRAFTICAOSELECTORCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_DBAIRCRAFTICAOSELECTORCOMPONENT_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/dropbase.h"
+#include "gui/swiftguiexport.h"
+#include "gui/dropbase.h"
 #include "misc/aviation/aircrafticaocode.h"
 #include "misc/network/entityflags.h"
 
@@ -26,12 +26,12 @@ namespace Ui
 {
     class CDbAircraftIcaoSelectorComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Aircraft ICAO selector
      */
-    class BLACKGUI_EXPORT CDbAircraftIcaoSelectorComponent :
+    class SWIFT_GUI_EXPORT CDbAircraftIcaoSelectorComponent :
         public QFrame,
         public CDropBase
     {
diff --git a/src/blackgui/components/dbaircrafticaoselectorcomponent.ui b/src/gui/components/dbaircrafticaoselectorcomponent.ui
similarity index 100%
rename from src/blackgui/components/dbaircrafticaoselectorcomponent.ui
rename to src/gui/components/dbaircrafticaoselectorcomponent.ui
diff --git a/src/blackgui/components/dbairlineicaocomponent.cpp b/src/gui/components/dbairlineicaocomponent.cpp
similarity index 89%
rename from src/blackgui/components/dbairlineicaocomponent.cpp
rename to src/gui/components/dbairlineicaocomponent.cpp
index 7ea9f7f51..70dd67fa2 100644
--- a/src/blackgui/components/dbairlineicaocomponent.cpp
+++ b/src/gui/components/dbairlineicaocomponent.cpp
@@ -2,11 +2,11 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "core/webdataservices.h"
-#include "blackgui/components/dbairlineicaocomponent.h"
-#include "blackgui/filters/airlineicaofilterbar.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/views/airlineicaoview.h"
-#include "blackgui/views/viewbase.h"
+#include "gui/components/dbairlineicaocomponent.h"
+#include "gui/filters/airlineicaofilterbar.h"
+#include "gui/guiapplication.h"
+#include "gui/views/airlineicaoview.h"
+#include "gui/views/viewbase.h"
 #include "ui_dbairlineicaocomponent.h"
 
 #include <QDateTime>
@@ -15,10 +15,10 @@
 
 using namespace swift::core;
 using namespace swift::misc::network;
-using namespace BlackGui;
-using namespace BlackGui::Views;
+using namespace swift::gui;
+using namespace swift::gui::views;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CDbAirlineIcaoComponent::CDbAirlineIcaoComponent(QWidget *parent) : COverlayMessagesFrame(parent),
                                                                         ui(new Ui::CDbAirlineIcaoComponent)
@@ -42,7 +42,7 @@ namespace BlackGui::Components
     CDbAirlineIcaoComponent::~CDbAirlineIcaoComponent()
     {}
 
-    BlackGui::Views::CAirlineIcaoCodeView *CDbAirlineIcaoComponent::view() const
+    swift::gui::views::CAirlineIcaoCodeView *CDbAirlineIcaoComponent::view() const
     {
         return ui->tvp_AirlineIcao;
     }
diff --git a/src/blackgui/components/dbairlineicaocomponent.h b/src/gui/components/dbairlineicaocomponent.h
similarity index 75%
rename from src/blackgui/components/dbairlineicaocomponent.h
rename to src/gui/components/dbairlineicaocomponent.h
index bcac97bf9..4b28c1aaf 100644
--- a/src/blackgui/components/dbairlineicaocomponent.h
+++ b/src/gui/components/dbairlineicaocomponent.h
@@ -3,13 +3,13 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_DBAIRLINEICAOCOMPONENT_H
-#define BLACKGUI_COMPONENTS_DBAIRLINEICAOCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_DBAIRLINEICAOCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_DBAIRLINEICAOCOMPONENT_H
 
-#include "blackgui/enablefordockwidgetinfoarea.h"
-#include "blackgui/enableforviewbasedindicator.h"
-#include "blackgui/overlaymessagesframe.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/enablefordockwidgetinfoarea.h"
+#include "gui/enableforviewbasedindicator.h"
+#include "gui/overlaymessagesframe.h"
+#include "gui/swiftguiexport.h"
 #include "misc/network/entityflags.h"
 
 #include <QFrame>
@@ -20,18 +20,18 @@ namespace Ui
 {
     class CDbAirlineIcaoComponent;
 }
-namespace BlackGui
+namespace swift::gui
 {
-    namespace Views
+    namespace views
     {
         class CAirlineIcaoCodeView;
     }
-    namespace Components
+    namespace components
     {
         /*!
          * Airline ICAO code
          */
-        class BLACKGUI_EXPORT CDbAirlineIcaoComponent :
+        class SWIFT_GUI_EXPORT CDbAirlineIcaoComponent :
             public COverlayMessagesFrame,
             public CEnableForDockWidgetInfoArea,
             public CEnableForViewBasedIndicator
@@ -46,7 +46,7 @@ namespace BlackGui
             virtual ~CDbAirlineIcaoComponent();
 
             //! Get the view
-            BlackGui::Views::CAirlineIcaoCodeView *view() const;
+            swift::gui::views::CAirlineIcaoCodeView *view() const;
 
         private:
             //! ICAO codes have been read
diff --git a/src/blackgui/components/dbairlineicaocomponent.ui b/src/gui/components/dbairlineicaocomponent.ui
similarity index 82%
rename from src/blackgui/components/dbairlineicaocomponent.ui
rename to src/gui/components/dbairlineicaocomponent.ui
index ffb8b8dbb..7b7119aab 100644
--- a/src/blackgui/components/dbairlineicaocomponent.ui
+++ b/src/gui/components/dbairlineicaocomponent.ui
@@ -39,7 +39,7 @@
     <number>0</number>
    </property>
    <item>
-    <widget class="BlackGui::Filters::CAirlineIcaoFilterBar" name="filter_AirlineIcao">
+    <widget class="swift::gui::filters::CAirlineIcaoFilterBar" name="filter_AirlineIcao">
      <property name="frameShape">
       <enum>QFrame::StyledPanel</enum>
      </property>
@@ -49,7 +49,7 @@
     </widget>
    </item>
    <item>
-    <widget class="BlackGui::Views::CAirlineIcaoCodeView" name="tvp_AirlineIcao">
+    <widget class="swift::gui::views::CAirlineIcaoCodeView" name="tvp_AirlineIcao">
      <property name="selectionMode">
       <enum>QAbstractItemView::SingleSelection</enum>
      </property>
@@ -65,14 +65,14 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Views::CAirlineIcaoCodeView</class>
+   <class>swift::gui::views::CAirlineIcaoCodeView</class>
    <extends>QTableView</extends>
-   <header>blackgui/views/airlineicaoview.h</header>
+   <header>gui/views/airlineicaoview.h</header>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Filters::CAirlineIcaoFilterBar</class>
+   <class>swift::gui::filters::CAirlineIcaoFilterBar</class>
    <extends>QFrame</extends>
-   <header>blackgui/filters/airlineicaofilterbar.h</header>
+   <header>gui/filters/airlineicaofilterbar.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/dbairlineicaoselectorbase.cpp b/src/gui/components/dbairlineicaoselectorbase.cpp
similarity index 97%
rename from src/blackgui/components/dbairlineicaoselectorbase.cpp
rename to src/gui/components/dbairlineicaoselectorbase.cpp
index 323f1f368..8c314c7b0 100644
--- a/src/blackgui/components/dbairlineicaoselectorbase.cpp
+++ b/src/gui/components/dbairlineicaoselectorbase.cpp
@@ -1,8 +1,8 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/dbairlineicaoselectorbase.h"
-#include "blackgui/guiapplication.h"
+#include "gui/components/dbairlineicaoselectorbase.h"
+#include "gui/guiapplication.h"
 #include "core/webdataservices.h"
 #include "misc/aviation/airlineicaocodelist.h"
 #include "misc/db/datastoreutility.h"
@@ -19,7 +19,7 @@
 #include <QtGlobal>
 #include <QPointer>
 
-using namespace BlackGui;
+using namespace swift::gui;
 using namespace swift::core;
 using namespace swift::misc;
 using namespace swift::misc::db;
@@ -27,7 +27,7 @@ using namespace swift::misc::network;
 using namespace swift::misc::aviation;
 using namespace swift::misc::network;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CDbAirlineIcaoSelectorBase::CDbAirlineIcaoSelectorBase(QWidget *parent) : QFrame(parent)
     {
diff --git a/src/blackgui/components/dbairlineicaoselectorbase.h b/src/gui/components/dbairlineicaoselectorbase.h
similarity index 89%
rename from src/blackgui/components/dbairlineicaoselectorbase.h
rename to src/gui/components/dbairlineicaoselectorbase.h
index 11ef86af5..f25ab1800 100644
--- a/src/blackgui/components/dbairlineicaoselectorbase.h
+++ b/src/gui/components/dbairlineicaoselectorbase.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_DBAIRLINEICAOSELECTORBASE_H
-#define BLACKGUI_DBAIRLINEICAOSELECTORBASE_H
+#ifndef SWIFT_GUI_DBAIRLINEICAOSELECTORBASE_H
+#define SWIFT_GUI_DBAIRLINEICAOSELECTORBASE_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/dropbase.h"
+#include "gui/swiftguiexport.h"
+#include "gui/dropbase.h"
 #include "misc/aviation/airlineicaocode.h"
 #include "misc/network/entityflags.h"
 
@@ -23,14 +23,14 @@ class QDragMoveEvent;
 class QDropEvent;
 class QWidget;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Airline ICAO selector base class
      */
-    class BLACKGUI_EXPORT CDbAirlineIcaoSelectorBase :
+    class SWIFT_GUI_EXPORT CDbAirlineIcaoSelectorBase :
         public QFrame,
-        public BlackGui::CDropBase
+        public swift::gui::CDropBase
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/dbairlineicaoselectorcomponent.cpp b/src/gui/components/dbairlineicaoselectorcomponent.cpp
similarity index 95%
rename from src/blackgui/components/dbairlineicaoselectorcomponent.cpp
rename to src/gui/components/dbairlineicaoselectorcomponent.cpp
index 7600e6f48..1b74ac200 100644
--- a/src/blackgui/components/dbairlineicaoselectorcomponent.cpp
+++ b/src/gui/components/dbairlineicaoselectorcomponent.cpp
@@ -3,9 +3,9 @@
 
 #include "ui_dbairlineicaoselectorcomponent.h"
 #include "core/webdataservices.h"
-#include "blackgui/components/dbairlineicaoselectorcomponent.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/uppercasevalidator.h"
+#include "gui/components/dbairlineicaoselectorcomponent.h"
+#include "gui/guiapplication.h"
+#include "gui/uppercasevalidator.h"
 #include "misc/db/datastoreutility.h"
 #include "misc/aviation/airlineicaocodelist.h"
 #include "misc/stringutils.h"
@@ -16,13 +16,13 @@
 #include <Qt>
 
 using namespace swift::core;
-using namespace BlackGui;
+using namespace swift::gui;
 using namespace swift::misc;
 using namespace swift::misc::db;
 using namespace swift::misc::network;
 using namespace swift::misc::aviation;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CDbAirlineIcaoSelectorComponent::CDbAirlineIcaoSelectorComponent(QWidget *parent) : CDbAirlineIcaoSelectorBase(parent),
                                                                                         ui(new Ui::CDbAirlineIcaoSelectorComponent)
diff --git a/src/blackgui/components/dbairlineicaoselectorcomponent.h b/src/gui/components/dbairlineicaoselectorcomponent.h
similarity index 84%
rename from src/blackgui/components/dbairlineicaoselectorcomponent.h
rename to src/gui/components/dbairlineicaoselectorcomponent.h
index fd7a5be56..63e36910d 100644
--- a/src/blackgui/components/dbairlineicaoselectorcomponent.h
+++ b/src/gui/components/dbairlineicaoselectorcomponent.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_DBAIRLINEICAOSELECTORCOMPONENT_H
-#define BLACKGUI_COMPONENTS_DBAIRLINEICAOSELECTORCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_DBAIRLINEICAOSELECTORCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_DBAIRLINEICAOSELECTORCOMPONENT_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/components/dbairlineicaoselectorbase.h"
+#include "gui/swiftguiexport.h"
+#include "gui/components/dbairlineicaoselectorbase.h"
 #include "misc/aviation/airlineicaocode.h"
 
 #include <QObject>
@@ -21,12 +21,12 @@ namespace Ui
 {
     class CDbAirlineIcaoSelectorComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Airline ICAO selector
      */
-    class BLACKGUI_EXPORT CDbAirlineIcaoSelectorComponent : public CDbAirlineIcaoSelectorBase
+    class SWIFT_GUI_EXPORT CDbAirlineIcaoSelectorComponent : public CDbAirlineIcaoSelectorBase
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/dbairlineicaoselectorcomponent.ui b/src/gui/components/dbairlineicaoselectorcomponent.ui
similarity index 100%
rename from src/blackgui/components/dbairlineicaoselectorcomponent.ui
rename to src/gui/components/dbairlineicaoselectorcomponent.ui
diff --git a/src/blackgui/components/dbairlinenameselectorcomponent.cpp b/src/gui/components/dbairlinenameselectorcomponent.cpp
similarity index 94%
rename from src/blackgui/components/dbairlinenameselectorcomponent.cpp
rename to src/gui/components/dbairlinenameselectorcomponent.cpp
index f559ea7f8..b59395941 100644
--- a/src/blackgui/components/dbairlinenameselectorcomponent.cpp
+++ b/src/gui/components/dbairlinenameselectorcomponent.cpp
@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "ui_dbairlinenameselectorcomponent.h"
-#include "blackgui/components/dbairlinenameselectorcomponent.h"
-#include "blackgui/guiapplication.h"
+#include "gui/components/dbairlinenameselectorcomponent.h"
+#include "gui/guiapplication.h"
 #include "core/webdataservices.h"
 #include "misc/aviation/airlineicaocodelist.h"
 #include "misc/db/datastoreutility.h"
@@ -14,12 +14,12 @@
 #include <Qt>
 
 using namespace swift::core;
-using namespace BlackGui;
+using namespace swift::gui;
 using namespace swift::misc;
 using namespace swift::misc::aviation;
 using namespace swift::misc::db;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CDbAirlineNameSelectorComponent::CDbAirlineNameSelectorComponent(QWidget *parent) : CDbAirlineIcaoSelectorBase(parent),
                                                                                         ui(new Ui::CDbAirlineNameSelectorComponent)
diff --git a/src/blackgui/components/dbairlinenameselectorcomponent.h b/src/gui/components/dbairlinenameselectorcomponent.h
similarity index 79%
rename from src/blackgui/components/dbairlinenameselectorcomponent.h
rename to src/gui/components/dbairlinenameselectorcomponent.h
index e0e7d3801..d8c36a339 100644
--- a/src/blackgui/components/dbairlinenameselectorcomponent.h
+++ b/src/gui/components/dbairlinenameselectorcomponent.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_DBAIRLINENAMESELECTORCOMPONENT_H
-#define BLACKGUI_COMPONENTS_DBAIRLINENAMESELECTORCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_DBAIRLINENAMESELECTORCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_DBAIRLINENAMESELECTORCOMPONENT_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/components/dbairlineicaoselectorbase.h"
+#include "gui/swiftguiexport.h"
+#include "gui/components/dbairlineicaoselectorbase.h"
 #include "misc/aviation/airlineicaocode.h"
 
 #include <QObject>
@@ -20,12 +20,12 @@ namespace Ui
 {
     class CDbAirlineNameSelectorComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Select airline by name
      */
-    class BLACKGUI_EXPORT CDbAirlineNameSelectorComponent : public CDbAirlineIcaoSelectorBase
+    class SWIFT_GUI_EXPORT CDbAirlineNameSelectorComponent : public CDbAirlineIcaoSelectorBase
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/dbairlinenameselectorcomponent.ui b/src/gui/components/dbairlinenameselectorcomponent.ui
similarity index 100%
rename from src/blackgui/components/dbairlinenameselectorcomponent.ui
rename to src/gui/components/dbairlinenameselectorcomponent.ui
diff --git a/src/blackgui/components/dbautosimulatorstashingcomponent.cpp b/src/gui/components/dbautosimulatorstashingcomponent.cpp
similarity index 95%
rename from src/blackgui/components/dbautosimulatorstashingcomponent.cpp
rename to src/gui/components/dbautosimulatorstashingcomponent.cpp
index d54228a88..d4f451ac8 100644
--- a/src/blackgui/components/dbautosimulatorstashingcomponent.cpp
+++ b/src/gui/components/dbautosimulatorstashingcomponent.cpp
@@ -3,16 +3,16 @@
 
 #include "core/db/databaseutils.h"
 #include "dbautosimulatorstashingcomponent.h"
-#include "blackgui/components/dbmappingcomponent.h"
+#include "gui/components/dbmappingcomponent.h"
 #include "ui_dbautosimulatorstashingcomponent.h"
 #include <QIntValidator>
 
-using namespace BlackGui;
+using namespace swift::gui;
 using namespace swift::core::db;
 using namespace swift::misc;
 using namespace swift::misc::simulation;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CDbAutoSimulatorStashingComponent::CDbAutoSimulatorStashingComponent(QWidget *parent) : QDialog(parent, Qt::WindowSystemMenuHint | Qt::WindowTitleHint),
                                                                                             CDbMappingComponentAware(qobject_cast<CDbMappingComponent *>(parent)),
@@ -20,7 +20,7 @@ namespace BlackGui::Components
     {
         ui->setupUi(this);
         ui->le_MaxModelsStashed->setValidator(new QIntValidator(this));
-        ui->tvp_StatusMessages->setMode(BlackGui::Models::CStatusMessageListModel::Simplified);
+        ui->tvp_StatusMessages->setMode(swift::gui::models::CStatusMessageListModel::Simplified);
         ui->le_MaxModelsStashed->setText("100");
     }
 
@@ -66,7 +66,7 @@ namespace BlackGui::Components
         ui->pb_StashingProgress->setValue(percent);
     }
 
-    Views::CAircraftModelView *CDbAutoSimulatorStashingComponent::currentModelView() const
+    views::CAircraftModelView *CDbAutoSimulatorStashingComponent::currentModelView() const
     {
         return this->getMappingComponent()->currentModelView();
     }
diff --git a/src/blackgui/components/dbautosimulatorstashingcomponent.h b/src/gui/components/dbautosimulatorstashingcomponent.h
similarity index 80%
rename from src/blackgui/components/dbautosimulatorstashingcomponent.h
rename to src/gui/components/dbautosimulatorstashingcomponent.h
index 3c5840058..5981934da 100644
--- a/src/blackgui/components/dbautosimulatorstashingcomponent.h
+++ b/src/gui/components/dbautosimulatorstashingcomponent.h
@@ -3,12 +3,12 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_DBAUTOSIMULATORSTASHINGCOMPONENT_H
-#define BLACKGUI_COMPONENTS_DBAUTOSIMULATORSTASHINGCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_DBAUTOSIMULATORSTASHINGCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_DBAUTOSIMULATORSTASHINGCOMPONENT_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/components/dbmappingcomponentaware.h"
-#include "blackgui/views/aircraftmodelview.h"
+#include "gui/swiftguiexport.h"
+#include "gui/components/dbmappingcomponentaware.h"
+#include "gui/views/aircraftmodelview.h"
 #include "core/progress.h"
 #include "misc/simulation/aircraftmodel.h"
 #include "misc/statusmessage.h"
@@ -19,19 +19,19 @@ namespace Ui
 {
     class CDbAutoSimulatorStashingComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Allows to automatically update models if found in own model set, but already existing
      * for a sibling simulator (ie. FSX/P3D/FS9)
      */
-    class BLACKGUI_EXPORT CDbAutoSimulatorStashingComponent :
+    class SWIFT_GUI_EXPORT CDbAutoSimulatorStashingComponent :
         public QDialog,
-        public Components::CDbMappingComponentAware,
+        public components::CDbMappingComponentAware,
         public swift::core::IProgressIndicator
     {
         Q_OBJECT
-        Q_INTERFACES(BlackGui::Components::CDbMappingComponentAware)
+        Q_INTERFACES(swift::gui::components::CDbMappingComponentAware)
 
     public:
         //! Current state of this component
@@ -66,7 +66,7 @@ namespace BlackGui::Components
         void initGui();
 
         //! Model view to take models from
-        BlackGui::Views::CAircraftModelView *currentModelView() const;
+        swift::gui::views::CAircraftModelView *currentModelView() const;
 
         //! Add a status message
         void addStatusMessage(const swift::misc::CStatusMessage &msg);
diff --git a/src/blackgui/components/dbautosimulatorstashingcomponent.ui b/src/gui/components/dbautosimulatorstashingcomponent.ui
similarity index 96%
rename from src/blackgui/components/dbautosimulatorstashingcomponent.ui
rename to src/gui/components/dbautosimulatorstashingcomponent.ui
index 9082be05a..f35b9b889 100644
--- a/src/blackgui/components/dbautosimulatorstashingcomponent.ui
+++ b/src/gui/components/dbautosimulatorstashingcomponent.ui
@@ -97,7 +97,7 @@
        </widget>
       </item>
       <item row="2" column="0" colspan="4">
-       <widget class="BlackGui::Views::CStatusMessageView" name="tvp_StatusMessages">
+       <widget class="swift::gui::views::CStatusMessageView" name="tvp_StatusMessages">
         <property name="selectionMode">
          <enum>QAbstractItemView::NoSelection</enum>
         </property>
@@ -130,9 +130,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Views::CStatusMessageView</class>
+   <class>swift::gui::views::CStatusMessageView</class>
    <extends>QTableView</extends>
-   <header>blackgui/views/statusmessageview.h</header>
+   <header>gui/views/statusmessageview.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/blackgui/components/dbautostashingcomponent.cpp b/src/gui/components/dbautostashingcomponent.cpp
similarity index 97%
rename from src/blackgui/components/dbautostashingcomponent.cpp
rename to src/gui/components/dbautostashingcomponent.cpp
index ae45937cf..aa2e5ccd1 100644
--- a/src/blackgui/components/dbautostashingcomponent.cpp
+++ b/src/gui/components/dbautostashingcomponent.cpp
@@ -2,13 +2,13 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "core/webdataservices.h"
-#include "blackgui/components/dbautostashingcomponent.h"
-#include "blackgui/components/dbmappingcomponent.h"
-#include "blackgui/components/dbstashcomponent.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/views/aircraftmodelview.h"
-#include "blackgui/views/statusmessageview.h"
-#include "blackgui/views/viewbase.h"
+#include "gui/components/dbautostashingcomponent.h"
+#include "gui/components/dbmappingcomponent.h"
+#include "gui/components/dbstashcomponent.h"
+#include "gui/guiapplication.h"
+#include "gui/views/aircraftmodelview.h"
+#include "gui/views/statusmessageview.h"
+#include "gui/views/viewbase.h"
 #include "misc/aviation/livery.h"
 #include "misc/logcategories.h"
 #include "misc/sequence.h"
@@ -35,9 +35,9 @@ using namespace swift::misc;
 using namespace swift::misc::aviation;
 using namespace swift::misc::network;
 using namespace swift::misc::simulation;
-using namespace BlackGui::Views;
+using namespace swift::gui::views;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     const QStringList &CDbAutoStashingComponent::getLogCategories()
     {
diff --git a/src/blackgui/components/dbautostashingcomponent.h b/src/gui/components/dbautostashingcomponent.h
similarity index 88%
rename from src/blackgui/components/dbautostashingcomponent.h
rename to src/gui/components/dbautostashingcomponent.h
index daa557689..be72703af 100644
--- a/src/blackgui/components/dbautostashingcomponent.h
+++ b/src/gui/components/dbautostashingcomponent.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_DBAUTOSTASHINGCOMPONENT_H
-#define BLACKGUI_COMPONENTS_DBAUTOSTASHINGCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_DBAUTOSTASHINGCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_DBAUTOSTASHINGCOMPONENT_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/components/dbmappingcomponentaware.h"
+#include "gui/swiftguiexport.h"
+#include "gui/components/dbmappingcomponentaware.h"
 #include "core/progress.h"
 #include "misc/network/entityflags.h"
 #include "misc/simulation/aircraftmodellist.h"
@@ -29,24 +29,24 @@ namespace Ui
 {
     class CDbAutoStashingComponent;
 }
-namespace BlackGui
+namespace swift::gui
 {
-    namespace Views
+    namespace views
     {
         class CAircraftModelView;
     }
-    namespace Components
+    namespace components
     {
         /*!
          * Stashing component
          */
-        class BLACKGUI_EXPORT CDbAutoStashingComponent :
+        class SWIFT_GUI_EXPORT CDbAutoStashingComponent :
             public QDialog,
             public CDbMappingComponentAware,
             public swift::core::IProgressIndicator
         {
             Q_OBJECT
-            Q_INTERFACES(BlackGui::Components::CDbMappingComponentAware)
+            Q_INTERFACES(swift::gui::components::CDbMappingComponentAware)
 
         public:
             //! Current state of this component
@@ -95,7 +95,7 @@ namespace BlackGui
             int getSelectedOrAllCount() const;
 
             //! Model view to take models from
-            BlackGui::Views::CAircraftModelView *currentModelView() const;
+            swift::gui::views::CAircraftModelView *currentModelView() const;
 
             //! Add a status message
             void addStatusMessage(const swift::misc::CStatusMessage &msg);
diff --git a/src/blackgui/components/dbautostashingcomponent.ui b/src/gui/components/dbautostashingcomponent.ui
similarity index 98%
rename from src/blackgui/components/dbautostashingcomponent.ui
rename to src/gui/components/dbautostashingcomponent.ui
index 47352542d..fa6f65b8a 100644
--- a/src/blackgui/components/dbautostashingcomponent.ui
+++ b/src/gui/components/dbautostashingcomponent.ui
@@ -180,7 +180,7 @@
      </property>
      <layout class="QHBoxLayout" name="hl_Result">
       <item>
-       <widget class="BlackGui::Views::CStatusMessageView" name="tvp_StatusMessages">
+       <widget class="swift::gui::views::CStatusMessageView" name="tvp_StatusMessages">
         <property name="selectionMode">
          <enum>QAbstractItemView::NoSelection</enum>
         </property>
@@ -302,9 +302,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Views::CStatusMessageView</class>
+   <class>swift::gui::views::CStatusMessageView</class>
    <extends>QTableView</extends>
-   <header>blackgui/views/statusmessageview.h</header>
+   <header>gui/views/statusmessageview.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/blackgui/components/dbcountrycomponent.cpp b/src/gui/components/dbcountrycomponent.cpp
similarity index 88%
rename from src/blackgui/components/dbcountrycomponent.cpp
rename to src/gui/components/dbcountrycomponent.cpp
index 534f07bd8..af107350e 100644
--- a/src/blackgui/components/dbcountrycomponent.cpp
+++ b/src/gui/components/dbcountrycomponent.cpp
@@ -3,20 +3,20 @@
 
 #include "core/application.h"
 #include "core/webdataservices.h"
-#include "blackgui/components/dbcountrycomponent.h"
-#include "blackgui/filters/countryfilterbar.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/views/countryview.h"
-#include "blackgui/views/viewbase.h"
+#include "gui/components/dbcountrycomponent.h"
+#include "gui/filters/countryfilterbar.h"
+#include "gui/guiapplication.h"
+#include "gui/views/countryview.h"
+#include "gui/views/viewbase.h"
 #include "ui_dbcountrycomponent.h"
 
 #include <QtGlobal>
 
 using namespace swift::core;
 using namespace swift::misc::network;
-using namespace BlackGui::Views;
+using namespace swift::gui::views;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CDbCountryComponent::CDbCountryComponent(QWidget *parent) : QFrame(parent),
                                                                 ui(new Ui::CDbCountryComponent)
diff --git a/src/blackgui/components/dbcountrycomponent.h b/src/gui/components/dbcountrycomponent.h
similarity index 73%
rename from src/blackgui/components/dbcountrycomponent.h
rename to src/gui/components/dbcountrycomponent.h
index 4aedf71b4..d2cdd06ec 100644
--- a/src/blackgui/components/dbcountrycomponent.h
+++ b/src/gui/components/dbcountrycomponent.h
@@ -3,12 +3,12 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_DBCOUNTRYCOMPONENT_H
-#define BLACKGUI_COMPONENTS_DBCOUNTRYCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_DBCOUNTRYCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_DBCOUNTRYCOMPONENT_H
 
-#include "blackgui/enablefordockwidgetinfoarea.h"
-#include "blackgui/enableforviewbasedindicator.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/enablefordockwidgetinfoarea.h"
+#include "gui/enableforviewbasedindicator.h"
+#include "gui/swiftguiexport.h"
 #include "misc/network/entityflags.h"
 
 #include <QFrame>
@@ -21,15 +21,15 @@ namespace Ui
 {
     class CDbCountryComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * The countries
      */
-    class BLACKGUI_EXPORT CDbCountryComponent :
+    class SWIFT_GUI_EXPORT CDbCountryComponent :
         public QFrame,
         public CEnableForDockWidgetInfoArea,
-        public BlackGui::CEnableForViewBasedIndicator
+        public swift::gui::CEnableForViewBasedIndicator
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/dbcountrycomponent.ui b/src/gui/components/dbcountrycomponent.ui
similarity index 83%
rename from src/blackgui/components/dbcountrycomponent.ui
rename to src/gui/components/dbcountrycomponent.ui
index 450fc327e..f1ace3c44 100644
--- a/src/blackgui/components/dbcountrycomponent.ui
+++ b/src/gui/components/dbcountrycomponent.ui
@@ -39,7 +39,7 @@
     <number>0</number>
    </property>
    <item>
-    <widget class="BlackGui::Filters::CCountryFilterBar" name="filter_CountryComponent">
+    <widget class="swift::gui::filters::CCountryFilterBar" name="filter_CountryComponent">
      <property name="frameShape">
       <enum>QFrame::StyledPanel</enum>
      </property>
@@ -49,7 +49,7 @@
     </widget>
    </item>
    <item>
-    <widget class="BlackGui::Views::CCountryView" name="tvp_Countries">
+    <widget class="swift::gui::views::CCountryView" name="tvp_Countries">
      <property name="selectionMode">
       <enum>QAbstractItemView::SingleSelection</enum>
      </property>
@@ -65,14 +65,14 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Views::CCountryView</class>
+   <class>swift::gui::views::CCountryView</class>
    <extends>QTableView</extends>
-   <header>blackgui/views/countryview.h</header>
+   <header>gui/views/countryview.h</header>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Filters::CCountryFilterBar</class>
+   <class>swift::gui::filters::CCountryFilterBar</class>
    <extends>QFrame</extends>
-   <header>blackgui/filters/countryfilterbar.h</header>
+   <header>gui/filters/countryfilterbar.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/dbcountryselectorcomponent.cpp b/src/gui/components/dbcountryselectorcomponent.cpp
similarity index 97%
rename from src/blackgui/components/dbcountryselectorcomponent.cpp
rename to src/gui/components/dbcountryselectorcomponent.cpp
index 71e1729d3..a91450e60 100644
--- a/src/blackgui/components/dbcountryselectorcomponent.cpp
+++ b/src/gui/components/dbcountryselectorcomponent.cpp
@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "core/webdataservices.h"
-#include "blackgui/components/dbcountryselectorcomponent.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/uppercasevalidator.h"
+#include "gui/components/dbcountryselectorcomponent.h"
+#include "gui/guiapplication.h"
+#include "gui/uppercasevalidator.h"
 #include "misc/mixin/mixincompare.h"
 #include "misc/countrylist.h"
 #include "misc/variant.h"
@@ -22,12 +22,12 @@
 #include <QPixmap>
 #include <Qt>
 
-using namespace BlackGui;
+using namespace swift::gui;
 using namespace swift::core;
 using namespace swift::misc;
 using namespace swift::misc::network;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CDbCountrySelectorComponent::CDbCountrySelectorComponent(QWidget *parent) : QFrame(parent),
                                                                                 ui(new Ui::CDbCountrySelectorComponent)
diff --git a/src/blackgui/components/dbcountryselectorcomponent.h b/src/gui/components/dbcountryselectorcomponent.h
similarity index 89%
rename from src/blackgui/components/dbcountryselectorcomponent.h
rename to src/gui/components/dbcountryselectorcomponent.h
index 5ec5d84e4..5c5ffe60e 100644
--- a/src/blackgui/components/dbcountryselectorcomponent.h
+++ b/src/gui/components/dbcountryselectorcomponent.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_DBCOUNTRYSELECTORCOMPONENT_H
-#define BLACKGUI_DBCOUNTRYSELECTORCOMPONENT_H
+#ifndef SWIFT_GUI_DBCOUNTRYSELECTORCOMPONENT_H
+#define SWIFT_GUI_DBCOUNTRYSELECTORCOMPONENT_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/dropbase.h"
+#include "gui/swiftguiexport.h"
+#include "gui/dropbase.h"
 #include "misc/country.h"
 #include "misc/network/entityflags.h"
 
@@ -27,14 +27,14 @@ namespace Ui
 {
     class CDbCountrySelectorComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Country selector
      */
-    class BLACKGUI_EXPORT CDbCountrySelectorComponent :
+    class SWIFT_GUI_EXPORT CDbCountrySelectorComponent :
         public QFrame,
-        public BlackGui::CDropBase
+        public swift::gui::CDropBase
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/dbcountryselectorcomponent.ui b/src/gui/components/dbcountryselectorcomponent.ui
similarity index 100%
rename from src/blackgui/components/dbcountryselectorcomponent.ui
rename to src/gui/components/dbcountryselectorcomponent.ui
diff --git a/src/blackgui/components/dbdistributorcomponent.cpp b/src/gui/components/dbdistributorcomponent.cpp
similarity index 94%
rename from src/blackgui/components/dbdistributorcomponent.cpp
rename to src/gui/components/dbdistributorcomponent.cpp
index ea3a70fa9..21ec853b6 100644
--- a/src/blackgui/components/dbdistributorcomponent.cpp
+++ b/src/gui/components/dbdistributorcomponent.cpp
@@ -2,10 +2,10 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "ui_dbdistributorcomponent.h"
-#include "blackgui/components/dbdistributorcomponent.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/views/distributorview.h"
-#include "blackgui/views/viewbase.h"
+#include "gui/components/dbdistributorcomponent.h"
+#include "gui/guiapplication.h"
+#include "gui/views/distributorview.h"
+#include "gui/views/viewbase.h"
 #include "core/webdataservices.h"
 #include "misc/simulation/simulatorinfo.h"
 
@@ -16,9 +16,9 @@
 using namespace swift::core;
 using namespace swift::misc::network;
 using namespace swift::misc::simulation;
-using namespace BlackGui::Views;
+using namespace swift::gui::views;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CDbDistributorComponent::CDbDistributorComponent(QWidget *parent) : QFrame(parent),
                                                                         ui(new Ui::CDbDistributorComponent)
diff --git a/src/blackgui/components/dbdistributorcomponent.h b/src/gui/components/dbdistributorcomponent.h
similarity index 81%
rename from src/blackgui/components/dbdistributorcomponent.h
rename to src/gui/components/dbdistributorcomponent.h
index 7904104b5..492916286 100644
--- a/src/blackgui/components/dbdistributorcomponent.h
+++ b/src/gui/components/dbdistributorcomponent.h
@@ -3,12 +3,12 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_DBDISTRIBUTORCOMPONENT_H
-#define BLACKGUI_COMPONENTS_DBDISTRIBUTORCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_DBDISTRIBUTORCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_DBDISTRIBUTORCOMPONENT_H
 
-#include "blackgui/enablefordockwidgetinfoarea.h"
-#include "blackgui/enableforviewbasedindicator.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/enablefordockwidgetinfoarea.h"
+#include "gui/enableforviewbasedindicator.h"
+#include "gui/swiftguiexport.h"
 #include "misc/simulation/distributorlist.h"
 #include "misc/network/entityflags.h"
 #include <QFrame>
@@ -23,18 +23,18 @@ namespace swift::misc::simulation
 {
     class CSimulatorInfo;
 }
-namespace BlackGui
+namespace swift::gui
 {
-    namespace Views
+    namespace views
     {
         class CDistributorView;
     }
-    namespace Components
+    namespace components
     {
         /*!
          * Distributors
          */
-        class BLACKGUI_EXPORT CDbDistributorComponent :
+        class SWIFT_GUI_EXPORT CDbDistributorComponent :
             public QFrame,
             public CEnableForDockWidgetInfoArea,
             public CEnableForViewBasedIndicator
@@ -49,7 +49,7 @@ namespace BlackGui
             virtual ~CDbDistributorComponent() override;
 
             //! Get the view
-            BlackGui::Views::CDistributorView *view() const;
+            swift::gui::views::CDistributorView *view() const;
 
             //! Filter by simulator
             void filterBySimulator(const swift::misc::simulation::CSimulatorInfo &simulator);
diff --git a/src/blackgui/components/dbdistributorcomponent.ui b/src/gui/components/dbdistributorcomponent.ui
similarity index 91%
rename from src/blackgui/components/dbdistributorcomponent.ui
rename to src/gui/components/dbdistributorcomponent.ui
index 51d7755ff..a56f8d0b3 100644
--- a/src/blackgui/components/dbdistributorcomponent.ui
+++ b/src/gui/components/dbdistributorcomponent.ui
@@ -60,7 +60,7 @@
        <number>1</number>
       </property>
       <item>
-       <widget class="BlackGui::Filters::CDistributorFilterBar" name="filter_Distributor">
+       <widget class="swift::gui::filters::CDistributorFilterBar" name="filter_Distributor">
         <property name="minimumSize">
          <size>
           <width>150</width>
@@ -131,7 +131,7 @@
     </widget>
    </item>
    <item>
-    <widget class="BlackGui::Views::CDistributorView" name="tvp_Distributors">
+    <widget class="swift::gui::views::CDistributorView" name="tvp_Distributors">
      <property name="dragDropMode">
       <enum>QAbstractItemView::DragOnly</enum>
      </property>
@@ -150,14 +150,14 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Views::CDistributorView</class>
+   <class>swift::gui::views::CDistributorView</class>
    <extends>QTableView</extends>
-   <header>blackgui/views/distributorview.h</header>
+   <header>gui/views/distributorview.h</header>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Filters::CDistributorFilterBar</class>
+   <class>swift::gui::filters::CDistributorFilterBar</class>
    <extends>QFrame</extends>
-   <header>blackgui/filters/distributorfilterbar.h</header>
+   <header>gui/filters/distributorfilterbar.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/dbdistributorselectorcomponent.cpp b/src/gui/components/dbdistributorselectorcomponent.cpp
similarity index 97%
rename from src/blackgui/components/dbdistributorselectorcomponent.cpp
rename to src/gui/components/dbdistributorselectorcomponent.cpp
index 12982deb7..7f325b9cd 100644
--- a/src/blackgui/components/dbdistributorselectorcomponent.cpp
+++ b/src/gui/components/dbdistributorselectorcomponent.cpp
@@ -3,9 +3,9 @@
 
 #include "core/application.h"
 #include "core/webdataservices.h"
-#include "blackgui/components/dbdistributorselectorcomponent.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/uppercasevalidator.h"
+#include "gui/components/dbdistributorselectorcomponent.h"
+#include "gui/guiapplication.h"
+#include "gui/uppercasevalidator.h"
 #include "misc/mixin/mixincompare.h"
 #include "misc/simulation/distributorlist.h"
 #include "misc/variant.h"
@@ -24,13 +24,13 @@
 #include <Qt>
 #include <QtGlobal>
 
-using namespace BlackGui;
+using namespace swift::gui;
 using namespace swift::core;
 using namespace swift::misc;
 using namespace swift::misc::simulation;
 using namespace swift::misc::network;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CDbDistributorSelectorComponent::CDbDistributorSelectorComponent(QWidget *parent) : QFrame(parent),
                                                                                         ui(new Ui::CDbDistributorSelectorComponent)
diff --git a/src/blackgui/components/dbdistributorselectorcomponent.h b/src/gui/components/dbdistributorselectorcomponent.h
similarity index 91%
rename from src/blackgui/components/dbdistributorselectorcomponent.h
rename to src/gui/components/dbdistributorselectorcomponent.h
index 08dbafc62..9779a9665 100644
--- a/src/blackgui/components/dbdistributorselectorcomponent.h
+++ b/src/gui/components/dbdistributorselectorcomponent.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_DBDISTRIBUTORSELECTORCOMPONENT_H
-#define BLACKGUI_DBDISTRIBUTORSELECTORCOMPONENT_H
+#ifndef SWIFT_GUI_DBDISTRIBUTORSELECTORCOMPONENT_H
+#define SWIFT_GUI_DBDISTRIBUTORSELECTORCOMPONENT_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/dropbase.h"
+#include "gui/swiftguiexport.h"
+#include "gui/dropbase.h"
 #include "misc/network/entityflags.h"
 #include "misc/simulation/distributor.h"
 
@@ -28,12 +28,12 @@ namespace Ui
 {
     class CDbDistributorSelectorComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Distributor selector
      */
-    class BLACKGUI_EXPORT CDbDistributorSelectorComponent :
+    class SWIFT_GUI_EXPORT CDbDistributorSelectorComponent :
         public QFrame,
         public CDropBase
     {
diff --git a/src/blackgui/components/dbdistributorselectorcomponent.ui b/src/gui/components/dbdistributorselectorcomponent.ui
similarity index 100%
rename from src/blackgui/components/dbdistributorselectorcomponent.ui
rename to src/gui/components/dbdistributorselectorcomponent.ui
diff --git a/src/blackgui/components/dbliverycolorsearch.cpp b/src/gui/components/dbliverycolorsearch.cpp
similarity index 91%
rename from src/blackgui/components/dbliverycolorsearch.cpp
rename to src/gui/components/dbliverycolorsearch.cpp
index ef8685bd3..d1ca2c2f9 100644
--- a/src/blackgui/components/dbliverycolorsearch.cpp
+++ b/src/gui/components/dbliverycolorsearch.cpp
@@ -1,8 +1,8 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/dbliverycolorsearch.h"
-#include "blackgui/guiapplication.h"
+#include "gui/components/dbliverycolorsearch.h"
+#include "gui/guiapplication.h"
 #include "core/webdataservices.h"
 #include "misc/aviation/liverylist.h"
 #include "ui_dbliverycolorsearch.h"
@@ -10,7 +10,7 @@
 using namespace swift::misc;
 using namespace swift::misc::aviation;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CDbLiveryColorSearch::CDbLiveryColorSearch(QWidget *parent) : QFrame(parent),
                                                                   ui(new Ui::CDbLiveryColorSearch)
diff --git a/src/blackgui/components/dbliverycolorsearch.h b/src/gui/components/dbliverycolorsearch.h
similarity index 87%
rename from src/blackgui/components/dbliverycolorsearch.h
rename to src/gui/components/dbliverycolorsearch.h
index cdc04bab0..5704dd690 100644
--- a/src/blackgui/components/dbliverycolorsearch.h
+++ b/src/gui/components/dbliverycolorsearch.h
@@ -3,8 +3,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_DBLIVERYCOLORSEARCH_H
-#define BLACKGUI_COMPONENTS_DBLIVERYCOLORSEARCH_H
+#ifndef SWIFT_GUI_COMPONENTS_DBLIVERYCOLORSEARCH_H
+#define SWIFT_GUI_COMPONENTS_DBLIVERYCOLORSEARCH_H
 
 #include "misc/aviation/livery.h"
 #include <QFrame>
@@ -14,7 +14,7 @@ namespace Ui
 {
     class CDbLiveryColorSearch;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Search for best matching color livery
diff --git a/src/blackgui/components/dbliverycolorsearch.ui b/src/gui/components/dbliverycolorsearch.ui
similarity index 83%
rename from src/blackgui/components/dbliverycolorsearch.ui
rename to src/gui/components/dbliverycolorsearch.ui
index 7d0c433a6..377ad8543 100644
--- a/src/blackgui/components/dbliverycolorsearch.ui
+++ b/src/gui/components/dbliverycolorsearch.ui
@@ -32,7 +32,7 @@
     </widget>
    </item>
    <item row="0" column="1">
-    <widget class="BlackGui::Components::CColorSelector" name="comp_FuselageSelector">
+    <widget class="swift::gui::components::CColorSelector" name="comp_FuselageSelector">
      <property name="minimumSize">
       <size>
        <width>100</width>
@@ -42,7 +42,7 @@
     </widget>
    </item>
    <item row="1" column="1">
-    <widget class="BlackGui::Components::CColorSelector" name="comp_TailSelector">
+    <widget class="swift::gui::components::CColorSelector" name="comp_TailSelector">
      <property name="minimumSize">
       <size>
        <width>100</width>
@@ -55,9 +55,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CColorSelector</class>
+   <class>swift::gui::components::CColorSelector</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/colorselector.h</header>
+   <header>gui/components/colorselector.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/dbliverycolorsearchdialog.cpp b/src/gui/components/dbliverycolorsearchdialog.cpp
similarity index 93%
rename from src/blackgui/components/dbliverycolorsearchdialog.cpp
rename to src/gui/components/dbliverycolorsearchdialog.cpp
index 98005cd5c..66b077a73 100644
--- a/src/blackgui/components/dbliverycolorsearchdialog.cpp
+++ b/src/gui/components/dbliverycolorsearchdialog.cpp
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "dbliverycolorsearchdialog.h"
-#include "blackgui/guiapplication.h"
+#include "gui/guiapplication.h"
 #include "core/webdataservices.h"
 #include "misc/aviation/liverylist.h"
 #include "ui_dbliverycolorsearchdialog.h"
@@ -10,7 +10,7 @@
 using namespace swift::misc;
 using namespace swift::misc::aviation;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CDbLiveryColorSearchDialog::CDbLiveryColorSearchDialog(QWidget *parent) : QDialog(parent),
                                                                               ui(new Ui::CDbLiveryColorSearchDialog)
diff --git a/src/blackgui/components/dbliverycolorsearchdialog.h b/src/gui/components/dbliverycolorsearchdialog.h
similarity index 87%
rename from src/blackgui/components/dbliverycolorsearchdialog.h
rename to src/gui/components/dbliverycolorsearchdialog.h
index ced4f68b0..945d5b89b 100644
--- a/src/blackgui/components/dbliverycolorsearchdialog.h
+++ b/src/gui/components/dbliverycolorsearchdialog.h
@@ -3,8 +3,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_DBLIVERYCOLORSEARCHDIALOG_H
-#define BLACKGUI_COMPONENTS_DBLIVERYCOLORSEARCHDIALOG_H
+#ifndef SWIFT_GUI_COMPONENTS_DBLIVERYCOLORSEARCHDIALOG_H
+#define SWIFT_GUI_COMPONENTS_DBLIVERYCOLORSEARCHDIALOG_H
 
 #include "misc/aviation/livery.h"
 #include <QDialog>
@@ -14,7 +14,7 @@ namespace Ui
 {
     class CDbLiveryColorSearchDialog;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Search for best matching color livery
diff --git a/src/blackgui/components/dbliverycolorsearchdialog.ui b/src/gui/components/dbliverycolorsearchdialog.ui
similarity index 89%
rename from src/blackgui/components/dbliverycolorsearchdialog.ui
rename to src/gui/components/dbliverycolorsearchdialog.ui
index 9663a715b..f9fff5a89 100644
--- a/src/blackgui/components/dbliverycolorsearchdialog.ui
+++ b/src/gui/components/dbliverycolorsearchdialog.ui
@@ -15,7 +15,7 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <widget class="BlackGui::Components::CDbLiveryColorSearch" name="comp_LiverySearch">
+    <widget class="swift::gui::components::CDbLiveryColorSearch" name="comp_LiverySearch">
      <property name="frameShape">
       <enum>QFrame::StyledPanel</enum>
      </property>
@@ -38,9 +38,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CDbLiveryColorSearch</class>
+   <class>swift::gui::components::CDbLiveryColorSearch</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/dbliverycolorsearch.h</header>
+   <header>gui/components/dbliverycolorsearch.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/dbliverycomponent.cpp b/src/gui/components/dbliverycomponent.cpp
similarity index 93%
rename from src/blackgui/components/dbliverycomponent.cpp
rename to src/gui/components/dbliverycomponent.cpp
index 2227b902b..1f51d4f81 100644
--- a/src/blackgui/components/dbliverycomponent.cpp
+++ b/src/gui/components/dbliverycomponent.cpp
@@ -2,21 +2,21 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "core/webdataservices.h"
-#include "blackgui/components/dbliverycomponent.h"
-#include "blackgui/filters/liveryfilterbar.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/views/liveryview.h"
+#include "gui/components/dbliverycomponent.h"
+#include "gui/filters/liveryfilterbar.h"
+#include "gui/guiapplication.h"
+#include "gui/views/liveryview.h"
 #include "ui_dbliverycomponent.h"
 
 #include <QtGlobal>
 #include <QStringBuilder>
 
 using namespace swift::core;
-using namespace BlackGui::Views;
+using namespace swift::gui::views;
 using namespace swift::misc::aviation;
 using namespace swift::misc::network;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CDbLiveryComponent::CDbLiveryComponent(QWidget *parent) : COverlayMessagesFrame(parent),
                                                               ui(new Ui::CDbLiveryComponent)
diff --git a/src/blackgui/components/dbliverycomponent.h b/src/gui/components/dbliverycomponent.h
similarity index 79%
rename from src/blackgui/components/dbliverycomponent.h
rename to src/gui/components/dbliverycomponent.h
index 6aa85c37b..1fb0a12d4 100644
--- a/src/blackgui/components/dbliverycomponent.h
+++ b/src/gui/components/dbliverycomponent.h
@@ -3,13 +3,13 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_DBLIVERYCOMPONENT_H
-#define BLACKGUI_COMPONENTS_DBLIVERYCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_DBLIVERYCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_DBLIVERYCOMPONENT_H
 
-#include "blackgui/enablefordockwidgetinfoarea.h"
-#include "blackgui/enableforviewbasedindicator.h"
-#include "blackgui/overlaymessagesframe.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/enablefordockwidgetinfoarea.h"
+#include "gui/enableforviewbasedindicator.h"
+#include "gui/overlaymessagesframe.h"
+#include "gui/swiftguiexport.h"
 #include "misc/aviation/airlineicaocode.h"
 #include "misc/network/entityflags.h"
 
@@ -25,18 +25,18 @@ namespace swift::misc::aviation
 {
     class CLivery;
 }
-namespace BlackGui
+namespace swift::gui
 {
-    namespace Views
+    namespace views
     {
         class CLiveryView;
     }
-    namespace Components
+    namespace components
     {
         /*!
          * Liveries from DB
          */
-        class BLACKGUI_EXPORT CDbLiveryComponent :
+        class SWIFT_GUI_EXPORT CDbLiveryComponent :
             public COverlayMessagesFrame,
             public CEnableForDockWidgetInfoArea,
             public CEnableForViewBasedIndicator
@@ -51,7 +51,7 @@ namespace BlackGui
             virtual ~CDbLiveryComponent();
 
             //! The livery view
-            BlackGui::Views::CLiveryView *view();
+            swift::gui::views::CLiveryView *view();
 
             //! Filter by livery
             void filter(const swift::misc::aviation::CLivery &livery);
diff --git a/src/blackgui/components/dbliverycomponent.ui b/src/gui/components/dbliverycomponent.ui
similarity index 85%
rename from src/blackgui/components/dbliverycomponent.ui
rename to src/gui/components/dbliverycomponent.ui
index 774b9efca..ea40fb179 100644
--- a/src/blackgui/components/dbliverycomponent.ui
+++ b/src/gui/components/dbliverycomponent.ui
@@ -42,7 +42,7 @@
     <number>0</number>
    </property>
    <item alignment="Qt::AlignLeft">
-    <widget class="BlackGui::Filters::CLiveryFilterBar" name="filter_Livery">
+    <widget class="swift::gui::filters::CLiveryFilterBar" name="filter_Livery">
      <property name="minimumSize">
       <size>
        <width>200</width>
@@ -58,7 +58,7 @@
     </widget>
    </item>
    <item>
-    <widget class="BlackGui::Views::CLiveryView" name="tvp_Liveries">
+    <widget class="swift::gui::views::CLiveryView" name="tvp_Liveries">
      <property name="selectionMode">
       <enum>QAbstractItemView::SingleSelection</enum>
      </property>
@@ -74,14 +74,14 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Views::CLiveryView</class>
+   <class>swift::gui::views::CLiveryView</class>
    <extends>QTableView</extends>
-   <header>blackgui/views/liveryview.h</header>
+   <header>gui/views/liveryview.h</header>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Filters::CLiveryFilterBar</class>
+   <class>swift::gui::filters::CLiveryFilterBar</class>
    <extends>QFrame</extends>
-   <header>blackgui/filters/liveryfilterbar.h</header>
+   <header>gui/filters/liveryfilterbar.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/dbliveryselectorcomponent.cpp b/src/gui/components/dbliveryselectorcomponent.cpp
similarity index 97%
rename from src/blackgui/components/dbliveryselectorcomponent.cpp
rename to src/gui/components/dbliveryselectorcomponent.cpp
index a677cfc2a..b271a9aae 100644
--- a/src/blackgui/components/dbliveryselectorcomponent.cpp
+++ b/src/gui/components/dbliveryselectorcomponent.cpp
@@ -3,9 +3,9 @@
 
 #include "core/application.h"
 #include "core/webdataservices.h"
-#include "blackgui/components/dbliveryselectorcomponent.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/uppercasevalidator.h"
+#include "gui/components/dbliveryselectorcomponent.h"
+#include "gui/guiapplication.h"
+#include "gui/uppercasevalidator.h"
 #include "misc/aviation/liverylist.h"
 #include "misc/db/datastoreutility.h"
 #include "misc/mixin/mixincompare.h"
@@ -26,14 +26,14 @@
 #include <Qt>
 #include <QtGlobal>
 
-using namespace BlackGui;
+using namespace swift::gui;
 using namespace swift::core;
 using namespace swift::misc;
 using namespace swift::misc::aviation;
 using namespace swift::misc::db;
 using namespace swift::misc::network;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CDbLiverySelectorComponent::CDbLiverySelectorComponent(QWidget *parent) : QFrame(parent),
                                                                               ui(new Ui::CDbLiverySelectorComponent)
diff --git a/src/blackgui/components/dbliveryselectorcomponent.h b/src/gui/components/dbliveryselectorcomponent.h
similarity index 89%
rename from src/blackgui/components/dbliveryselectorcomponent.h
rename to src/gui/components/dbliveryselectorcomponent.h
index e40872e31..7cf2c9a61 100644
--- a/src/blackgui/components/dbliveryselectorcomponent.h
+++ b/src/gui/components/dbliveryselectorcomponent.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_CDBLIVERYSELECTORCOMPONENT_H
-#define BLACKGUI_COMPONENTS_CDBLIVERYSELECTORCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_CDBLIVERYSELECTORCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_CDBLIVERYSELECTORCOMPONENT_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/dropbase.h"
+#include "gui/swiftguiexport.h"
+#include "gui/dropbase.h"
 #include "misc/aviation/livery.h"
 #include "misc/network/entityflags.h"
 
@@ -29,14 +29,14 @@ namespace Ui
     class CDbLiverySelectorComponent;
 }
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Selector for liveries
      */
-    class BLACKGUI_EXPORT CDbLiverySelectorComponent :
+    class SWIFT_GUI_EXPORT CDbLiverySelectorComponent :
         public QFrame,
-        public BlackGui::CDropBase
+        public swift::gui::CDropBase
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/dbliveryselectorcomponent.ui b/src/gui/components/dbliveryselectorcomponent.ui
similarity index 100%
rename from src/blackgui/components/dbliveryselectorcomponent.ui
rename to src/gui/components/dbliveryselectorcomponent.ui
diff --git a/src/blackgui/components/dbloaddatadialog.cpp b/src/gui/components/dbloaddatadialog.cpp
similarity index 98%
rename from src/blackgui/components/dbloaddatadialog.cpp
rename to src/gui/components/dbloaddatadialog.cpp
index 44ad889ed..b9e1cb066 100644
--- a/src/blackgui/components/dbloaddatadialog.cpp
+++ b/src/gui/components/dbloaddatadialog.cpp
@@ -1,9 +1,9 @@
 // SPDX-FileCopyrightText: Copyright (C) 2018 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/dbloaddatadialog.h"
+#include "gui/components/dbloaddatadialog.h"
 #include "ui_dbloaddatadialog.h"
-#include "blackgui/guiapplication.h"
+#include "gui/guiapplication.h"
 #include "core/webdataservices.h"
 #include "core/db/databaseutils.h"
 #include "misc/simulation/aircraftmodellist.h"
@@ -21,7 +21,7 @@ using namespace swift::misc::simulation::data;
 using namespace swift::core;
 using namespace swift::core::db;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CDbLoadDataDialog::CDbLoadDataDialog(QWidget *parent) : QDialog(parent),
                                                             ui(new Ui::CDbLoadDataDialog)
diff --git a/src/blackgui/components/dbloaddatadialog.h b/src/gui/components/dbloaddatadialog.h
similarity index 90%
rename from src/blackgui/components/dbloaddatadialog.h
rename to src/gui/components/dbloaddatadialog.h
index c4eaa6f4a..37883e24f 100644
--- a/src/blackgui/components/dbloaddatadialog.h
+++ b/src/gui/components/dbloaddatadialog.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_DBLOADDATADIALOG_H
-#define BLACKGUI_COMPONENTS_DBLOADDATADIALOG_H
+#ifndef SWIFT_GUI_COMPONENTS_DBLOADDATADIALOG_H
+#define SWIFT_GUI_COMPONENTS_DBLOADDATADIALOG_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include "misc/network/entityflags.h"
 #include "misc/simulation/data/modelcaches.h"
 #include <QDialog>
@@ -19,12 +19,12 @@ namespace Ui
 {
     class CDbLoadDataDialog;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Load data from DB as dialog
      */
-    class BLACKGUI_EXPORT CDbLoadDataDialog : public QDialog
+    class SWIFT_GUI_EXPORT CDbLoadDataDialog : public QDialog
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/dbloaddatadialog.ui b/src/gui/components/dbloaddatadialog.ui
similarity index 95%
rename from src/blackgui/components/dbloaddatadialog.ui
rename to src/gui/components/dbloaddatadialog.ui
index 067a6e330..f77ed282e 100644
--- a/src/blackgui/components/dbloaddatadialog.ui
+++ b/src/gui/components/dbloaddatadialog.ui
@@ -73,7 +73,7 @@
     <widget class="QWidget" name="wi_Consolidate" native="true">
      <layout class="QHBoxLayout" name="horizontalLayout">
       <item>
-       <widget class="BlackGui::Components::CSimulatorSelector" name="comp_SimulatorSelector">
+       <widget class="swift::gui::components::CSimulatorSelector" name="comp_SimulatorSelector">
         <property name="minimumSize">
          <size>
           <width>125</width>
@@ -145,9 +145,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CSimulatorSelector</class>
+   <class>swift::gui::components::CSimulatorSelector</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/simulatorselector.h</header>
+   <header>gui/components/simulatorselector.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/dbloadoverviewcomponent.cpp b/src/gui/components/dbloadoverviewcomponent.cpp
similarity index 99%
rename from src/blackgui/components/dbloadoverviewcomponent.cpp
rename to src/gui/components/dbloadoverviewcomponent.cpp
index 088941ff0..9a67b196e 100644
--- a/src/blackgui/components/dbloadoverviewcomponent.cpp
+++ b/src/gui/components/dbloadoverviewcomponent.cpp
@@ -4,8 +4,8 @@
 #include "dbloadoverviewcomponent.h"
 #include "ui_dbloadoverviewcomponent.h"
 
-#include "blackgui/guiapplication.h"
-#include "blackgui/guiutility.h"
+#include "gui/guiapplication.h"
+#include "gui/guiutility.h"
 #include "core/webdataservices.h"
 #include "core/db/infodatareader.h"
 #include "misc/network/networkutils.h"
@@ -14,12 +14,12 @@
 #include <QPointer>
 #include <QMessageBox>
 
-using namespace BlackGui;
+using namespace swift::gui;
 using namespace swift::core;
 using namespace swift::misc;
 using namespace swift::misc::network;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CDbLoadOverviewComponent::CDbLoadOverviewComponent(QWidget *parent) : QFrame(parent), CLoadIndicatorEnabled(this),
                                                                           ui(new Ui::CDbLoadOverviewComponent)
diff --git a/src/blackgui/components/dbloadoverviewcomponent.h b/src/gui/components/dbloadoverviewcomponent.h
similarity index 92%
rename from src/blackgui/components/dbloadoverviewcomponent.h
rename to src/gui/components/dbloadoverviewcomponent.h
index 886580f36..91d98f878 100644
--- a/src/blackgui/components/dbloadoverviewcomponent.h
+++ b/src/gui/components/dbloadoverviewcomponent.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_DBLOADOVERVIEWCOMPONENT_H
-#define BLACKGUI_COMPONENTS_DBLOADOVERVIEWCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_DBLOADOVERVIEWCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_DBLOADOVERVIEWCOMPONENT_H
 
-#include "blackgui/loadindicator.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/loadindicator.h"
+#include "gui/swiftguiexport.h"
 #include "misc/digestsignal.h"
 #include "misc/network/entityflags.h"
 
@@ -18,14 +18,14 @@ namespace Ui
 {
     class CDbLoadOverviewComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Overview about load state of DB data
      */
-    class BLACKGUI_EXPORT CDbLoadOverviewComponent :
+    class SWIFT_GUI_EXPORT CDbLoadOverviewComponent :
         public QFrame,
-        public BlackGui::CLoadIndicatorEnabled
+        public swift::gui::CLoadIndicatorEnabled
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/dbloadoverviewcomponent.ui b/src/gui/components/dbloadoverviewcomponent.ui
similarity index 100%
rename from src/blackgui/components/dbloadoverviewcomponent.ui
rename to src/gui/components/dbloadoverviewcomponent.ui
diff --git a/src/blackgui/components/dblogincomponent.cpp b/src/gui/components/dblogincomponent.cpp
similarity index 96%
rename from src/blackgui/components/dblogincomponent.cpp
rename to src/gui/components/dblogincomponent.cpp
index 9fbd0a327..d0a9b3933 100644
--- a/src/blackgui/components/dblogincomponent.cpp
+++ b/src/gui/components/dblogincomponent.cpp
@@ -2,10 +2,10 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "ui_dblogincomponent.h"
-#include "blackgui/components/dblogincomponent.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/guiutility.h"
-#include "blackgui/overlaymessagesframe.h"
+#include "gui/components/dblogincomponent.h"
+#include "gui/guiapplication.h"
+#include "gui/guiutility.h"
+#include "gui/overlaymessagesframe.h"
 #include "core/data/globalsetup.h"
 #include "misc/network/authenticateduser.h"
 #include "misc/network/url.h"
@@ -27,12 +27,12 @@
 
 using namespace swift::core;
 using namespace swift::core::db;
-using namespace BlackGui;
+using namespace swift::gui;
 using namespace swift::config;
 using namespace swift::misc;
 using namespace swift::misc::network;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CDbLoginComponent::CDbLoginComponent(QWidget *parent) : QFrame(parent),
                                                             CLoadIndicatorEnabled(this),
diff --git a/src/blackgui/components/dblogincomponent.h b/src/gui/components/dblogincomponent.h
similarity index 87%
rename from src/blackgui/components/dblogincomponent.h
rename to src/gui/components/dblogincomponent.h
index ba927fbc9..aae8b5f62 100644
--- a/src/blackgui/components/dblogincomponent.h
+++ b/src/gui/components/dblogincomponent.h
@@ -3,13 +3,13 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_DBLOGINCOMPONENT_H
-#define BLACKGUI_COMPONENTS_DBLOGINCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_DBLOGINCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_DBLOGINCOMPONENT_H
 
 #include "core/db/databaseauthentication.h"
 #include "core/data/globalsetup.h"
-#include "blackgui/blackguiexport.h"
-#include "blackgui/loadindicator.h"
+#include "gui/swiftguiexport.h"
+#include "gui/loadindicator.h"
 #include "misc/statusmessagelist.h"
 
 #include <QFrame>
@@ -24,13 +24,13 @@ namespace Ui
 {
     class CDbLoginComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Login to DB
      * \sa swift::core::db::CDatabaseAuthenticationService
      */
-    class BLACKGUI_EXPORT CDbLoginComponent :
+    class SWIFT_GUI_EXPORT CDbLoginComponent :
         public QFrame,
         public CLoadIndicatorEnabled
     {
diff --git a/src/blackgui/components/dblogincomponent.ui b/src/gui/components/dblogincomponent.ui
similarity index 100%
rename from src/blackgui/components/dblogincomponent.ui
rename to src/gui/components/dblogincomponent.ui
diff --git a/src/blackgui/components/dbmappingcomponent.cpp b/src/gui/components/dbmappingcomponent.cpp
similarity index 97%
rename from src/blackgui/components/dbmappingcomponent.cpp
rename to src/gui/components/dbmappingcomponent.cpp
index 3d8cfd9a4..0a8cb79ca 100644
--- a/src/blackgui/components/dbmappingcomponent.cpp
+++ b/src/gui/components/dbmappingcomponent.cpp
@@ -2,26 +2,26 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "core/webdataservices.h"
-#include "blackgui/components/dbautostashingcomponent.h"
-#include "blackgui/components/dbautosimulatorstashingcomponent.h"
-#include "blackgui/components/dbmappingcomponent.h"
-#include "blackgui/components/dbmodelmappingmodifydialog.h"
-#include "blackgui/components/dbownmodelscomponent.h"
-#include "blackgui/components/dbownmodelsetcomponent.h"
-#include "blackgui/components/dbstashcomponent.h"
-#include "blackgui/components/modelmatchercomponent.h"
-#include "blackgui/editors/aircrafticaoform.h"
-#include "blackgui/editors/distributorform.h"
-#include "blackgui/editors/liveryform.h"
-#include "blackgui/editors/modelmappingform.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/guiutility.h"
-#include "blackgui/menus/aircraftmodelmenus.h"
-#include "blackgui/menus/menuaction.h"
-#include "blackgui/models/aircraftmodellistmodel.h"
-#include "blackgui/views/aircraftmodelview.h"
-#include "blackgui/views/viewbase.h"
-#include "blackgui/shortcut.h"
+#include "gui/components/dbautostashingcomponent.h"
+#include "gui/components/dbautosimulatorstashingcomponent.h"
+#include "gui/components/dbmappingcomponent.h"
+#include "gui/components/dbmodelmappingmodifydialog.h"
+#include "gui/components/dbownmodelscomponent.h"
+#include "gui/components/dbownmodelsetcomponent.h"
+#include "gui/components/dbstashcomponent.h"
+#include "gui/components/modelmatchercomponent.h"
+#include "gui/editors/aircrafticaoform.h"
+#include "gui/editors/distributorform.h"
+#include "gui/editors/liveryform.h"
+#include "gui/editors/modelmappingform.h"
+#include "gui/guiapplication.h"
+#include "gui/guiutility.h"
+#include "gui/menus/aircraftmodelmenus.h"
+#include "gui/menus/menuaction.h"
+#include "gui/models/aircraftmodellistmodel.h"
+#include "gui/views/aircraftmodelview.h"
+#include "gui/views/viewbase.h"
+#include "gui/shortcut.h"
 #include "misc/aviation/aircrafticaocode.h"
 #include "misc/aviation/livery.h"
 #include "misc/icons.h"
@@ -53,13 +53,13 @@ using namespace swift::misc::aviation;
 using namespace swift::misc::network;
 using namespace swift::misc::simulation;
 using namespace swift::misc::simulation::fscommon;
-using namespace BlackGui;
-using namespace BlackGui::Editors;
-using namespace BlackGui::Views;
-using namespace BlackGui::Models;
-using namespace BlackGui::Menus;
+using namespace swift::gui;
+using namespace swift::gui::editors;
+using namespace swift::gui::views;
+using namespace swift::gui::models;
+using namespace swift::gui::menus;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CDbMappingComponent::CDbMappingComponent(QWidget *parent) : COverlayMessagesFrame(parent),
                                                                 ui(new Ui::CDbMappingComponent),
@@ -913,7 +913,7 @@ namespace BlackGui::Components
         return qobject_cast<CDbMappingComponent *>(this->parent());
     }
 
-    CDbMappingComponent::CStashToolsMenu::CStashToolsMenu(CDbMappingComponent *mappingComponent) : Menus::IMenuDelegate(mappingComponent)
+    CDbMappingComponent::CStashToolsMenu::CStashToolsMenu(CDbMappingComponent *mappingComponent) : menus::IMenuDelegate(mappingComponent)
     {}
 
     void CDbMappingComponent::CStashToolsMenu::customMenu(CMenuActions &menuActions)
diff --git a/src/blackgui/components/dbmappingcomponent.h b/src/gui/components/dbmappingcomponent.h
similarity index 90%
rename from src/blackgui/components/dbmappingcomponent.h
rename to src/gui/components/dbmappingcomponent.h
index 3cda42b0e..57001f252 100644
--- a/src/blackgui/components/dbmappingcomponent.h
+++ b/src/gui/components/dbmappingcomponent.h
@@ -3,14 +3,14 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_DBMAPPINGCOMPONENT_H
-#define BLACKGUI_COMPONENTS_DBMAPPINGCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_DBMAPPINGCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_DBMAPPINGCOMPONENT_H
 
-#include "blackgui/enableforviewbasedindicator.h"
-#include "blackgui/menus/menudelegate.h"
-#include "blackgui/overlaymessagesframe.h"
-#include "blackgui/enablefordockwidgetinfoarea.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/enableforviewbasedindicator.h"
+#include "gui/menus/menudelegate.h"
+#include "gui/overlaymessagesframe.h"
+#include "gui/enablefordockwidgetinfoarea.h"
+#include "gui/swiftguiexport.h"
 #include "core/data/authenticateduser.h"
 #include "misc/aviation/airlineicaocode.h"
 #include "misc/network/entityflags.h"
@@ -42,18 +42,18 @@ namespace Ui
 {
     class CDbMappingComponent;
 }
-namespace BlackGui
+namespace swift::gui
 {
-    namespace Menus
+    namespace menus
     {
         class CMenuActions;
     }
-    namespace Views
+    namespace views
     {
         class CAircraftModelView;
     }
 
-    namespace Components
+    namespace components
     {
         class CDbAutoStashingComponent;
         class CDbAutoSimulatorStashingComponent;
@@ -62,7 +62,7 @@ namespace BlackGui
         /*!
          * Mapping component
          */
-        class BLACKGUI_EXPORT CDbMappingComponent :
+        class SWIFT_GUI_EXPORT CDbMappingComponent :
             public COverlayMessagesFrame,
             public CEnableForDockWidgetInfoArea,
             public CEnableForViewBasedIndicator
@@ -114,10 +114,10 @@ namespace BlackGui
             bool canAddToModelSetTab() const;
 
             //! Current model view
-            Views::CAircraftModelView *currentModelView() const;
+            views::CAircraftModelView *currentModelView() const;
 
             //! Current model view
-            Views::CAircraftModelView *modelView(TabIndex tab) const;
+            views::CAircraftModelView *modelView(TabIndex tab) const;
 
             //! Unvalidated consolidated aircraft model from the editor subparts (icao, distributor)
             //! \note not guaranteed to be valid, just a snapshot of its current editor state
@@ -125,7 +125,7 @@ namespace BlackGui
 
             // ---------------- stash -----------------
 
-            //! \name Models from BlackGui::Components::CDbStashComponent
+            //! \name Models from swift::gui::components::CDbStashComponent
             //! @{
             //! Stashed models
             const swift::misc::simulation::CAircraftModelList &getStashedModels() const;
@@ -139,7 +139,7 @@ namespace BlackGui
 
             // ---------------- own models -----------------
 
-            //! \name Own models from BlackGui::Components::CDbOwnModelsComponent
+            //! \name Own models from swift::gui::components::CDbOwnModelsComponent
             //! @{
             //! Own models
             swift::misc::simulation::CAircraftModelList getOwnModels() const;
@@ -358,15 +358,15 @@ namespace BlackGui
             //! The menu for loading and handling VPilot rules for mapping tasks
             //! \note This is a specific menu for that very component
             //! \fixme MS 2018-12 Move to namespace scope and add Q_OBJECT
-            class CMappingVPilotMenu : public Menus::IMenuDelegate
+            class CMappingVPilotMenu : public menus::IMenuDelegate
             {
             public:
                 //! Constructor
-                CMappingVPilotMenu(CDbMappingComponent *mappingComponent) : Menus::IMenuDelegate(mappingComponent)
+                CMappingVPilotMenu(CDbMappingComponent *mappingComponent) : menus::IMenuDelegate(mappingComponent)
                 {}
 
                 //! \copydoc IMenuDelegate::customMenu
-                virtual void customMenu(Menus::CMenuActions &menuActions) override;
+                virtual void customMenu(menus::CMenuActions &menuActions) override;
 
             private:
                 //! Mapping component
@@ -382,21 +382,21 @@ namespace BlackGui
             //! -# show changed attributes
             //! \note This is a specific menu for the CDbMappingComponent component
             //! \fixme MS 2018-12 Move to namespace scope and add Q_OBJECT
-            class CStashToolsMenu : public Menus::IMenuDelegate
+            class CStashToolsMenu : public menus::IMenuDelegate
             {
             public:
                 //! Constructor
                 CStashToolsMenu(CDbMappingComponent *mappingComponent);
 
                 //! \copydoc IMenuDelegate::customMenu
-                virtual void customMenu(Menus::CMenuActions &menuActions) override;
+                virtual void customMenu(menus::CMenuActions &menuActions) override;
 
             private:
                 //! Mapping component
                 CDbMappingComponent *mappingComponent() const;
 
                 //! Removel models existing in DB
-                void addStashViewSpecificMenus(Menus::CMenuActions &menuActions);
+                void addStashViewSpecificMenus(menus::CMenuActions &menuActions);
 
                 QAction *m_autoStashing = nullptr;
                 QAction *m_autoSimulatorStashing = nullptr;
@@ -405,15 +405,15 @@ namespace BlackGui
 
             //! Menu for own model sets
             //! \fixme MS 2018-12 Move to namespace scope and add Q_OBJECT
-            class COwnModelSetMenu : public Menus::IMenuDelegate
+            class COwnModelSetMenu : public menus::IMenuDelegate
             {
             public:
                 //! Constructor
-                COwnModelSetMenu(CDbMappingComponent *mappingComponent) : Menus::IMenuDelegate(mappingComponent)
+                COwnModelSetMenu(CDbMappingComponent *mappingComponent) : menus::IMenuDelegate(mappingComponent)
                 {}
 
                 //! \copydoc IMenuDelegate::customMenu
-                virtual void customMenu(Menus::CMenuActions &menuActions) override;
+                virtual void customMenu(menus::CMenuActions &menuActions) override;
 
             private:
                 //! Mapping component
@@ -424,15 +424,15 @@ namespace BlackGui
 
             //! Menu for removed models
             //! \fixme MS 2018-12 Move to namespace scope and add Q_OBJECT
-            class CRemovedModelsMenu : public Menus::IMenuDelegate
+            class CRemovedModelsMenu : public menus::IMenuDelegate
             {
             public:
                 //! Constructor
-                CRemovedModelsMenu(CDbMappingComponent *mappingComponent) : Menus::IMenuDelegate(mappingComponent)
+                CRemovedModelsMenu(CDbMappingComponent *mappingComponent) : menus::IMenuDelegate(mappingComponent)
                 {}
 
                 //! \copydoc IMenuDelegate::customMenu
-                virtual void customMenu(Menus::CMenuActions &menuActions) override;
+                virtual void customMenu(menus::CMenuActions &menuActions) override;
 
             private:
                 //! Mapping component
@@ -443,15 +443,15 @@ namespace BlackGui
 
             //! Apply DB data to selected models
             //! \fixme MS 2018-12 Move to namespace scope and add Q_OBJECT
-            class CApplyDbDataMenu : public Menus::IMenuDelegate
+            class CApplyDbDataMenu : public menus::IMenuDelegate
             {
             public:
                 //! Constructor
-                CApplyDbDataMenu(CDbMappingComponent *mappingComponent) : Menus::IMenuDelegate(mappingComponent)
+                CApplyDbDataMenu(CDbMappingComponent *mappingComponent) : menus::IMenuDelegate(mappingComponent)
                 {}
 
                 //! \copydoc IMenuDelegate::customMenu
-                virtual void customMenu(Menus::CMenuActions &menuActions) override;
+                virtual void customMenu(menus::CMenuActions &menuActions) override;
 
             private:
                 //! Mapping component
@@ -463,14 +463,14 @@ namespace BlackGui
             //! Merge with vPilot data
             //! \deprecated vPilot menus will be removed in the future
             //! \fixme MS 2018-12 Move to namespace scope and add Q_OBJECT
-            class CMergeWithVPilotMenu : public Menus::IMenuDelegate
+            class CMergeWithVPilotMenu : public menus::IMenuDelegate
             {
             public:
                 //! Constructor
                 CMergeWithVPilotMenu(CDbMappingComponent *mappingComponent);
 
                 //! \copydoc IMenuDelegate::customMenu
-                virtual void customMenu(Menus::CMenuActions &menuActions) override;
+                virtual void customMenu(menus::CMenuActions &menuActions) override;
 
                 //! Mapping component
                 CDbMappingComponent *mappingComponent() const;
diff --git a/src/blackgui/components/dbmappingcomponent.ui b/src/gui/components/dbmappingcomponent.ui
similarity index 86%
rename from src/blackgui/components/dbmappingcomponent.ui
rename to src/gui/components/dbmappingcomponent.ui
index be937b4a1..14609bc62 100644
--- a/src/blackgui/components/dbmappingcomponent.ui
+++ b/src/gui/components/dbmappingcomponent.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>CDbMappingComponent</class>
- <widget class="BlackGui::COverlayMessagesFrame" name="CDbMappingComponent">
+ <widget class="swift::gui::COverlayMessagesFrame" name="CDbMappingComponent">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -101,7 +101,7 @@
             <number>0</number>
            </property>
            <item>
-            <widget class="BlackGui::Components::CDbOwnModelSetComponent" name="comp_OwnModelSet">
+            <widget class="swift::gui::components::CDbOwnModelSetComponent" name="comp_OwnModelSet">
              <property name="frameShape">
               <enum>QFrame::StyledPanel</enum>
              </property>
@@ -133,7 +133,7 @@
             <number>0</number>
            </property>
            <item>
-            <widget class="BlackGui::Components::CDbOwnModelsComponent" name="comp_OwnAircraftModels">
+            <widget class="swift::gui::components::CDbOwnModelsComponent" name="comp_OwnAircraftModels">
              <property name="frameShape">
               <enum>QFrame::StyledPanel</enum>
              </property>
@@ -165,7 +165,7 @@
             <number>0</number>
            </property>
            <item>
-            <widget class="BlackGui::Components::CDbModelWorkbenchComponent" name="comp_ModelWorkbench">
+            <widget class="swift::gui::components::CDbModelWorkbenchComponent" name="comp_ModelWorkbench">
              <property name="frameShape">
               <enum>QFrame::StyledPanel</enum>
              </property>
@@ -197,7 +197,7 @@
             <number>0</number>
            </property>
            <item>
-            <widget class="BlackGui::Components::CDbStashComponent" name="comp_StashAircraft">
+            <widget class="swift::gui::components::CDbStashComponent" name="comp_StashAircraft">
              <property name="frameShape">
               <enum>QFrame::StyledPanel</enum>
              </property>
@@ -229,7 +229,7 @@
             <number>0</number>
            </property>
            <item>
-            <widget class="BlackGui::Components::CModelMatcherComponent" name="comp_ModelMatcher">
+            <widget class="swift::gui::components::CModelMatcherComponent" name="comp_ModelMatcher">
              <property name="frameShape">
               <enum>QFrame::StyledPanel</enum>
              </property>
@@ -261,7 +261,7 @@
             <number>0</number>
            </property>
            <item>
-            <widget class="BlackGui::Views::CAircraftModelView" name="tvp_AircraftModelsForVPilot">
+            <widget class="swift::gui::views::CAircraftModelView" name="tvp_AircraftModelsForVPilot">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
                <horstretch>0</horstretch>
@@ -284,7 +284,7 @@
         </widget>
        </item>
        <item>
-        <widget class="BlackGui::Editors::CModelMappingForm" name="editor_ModelMapping">
+        <widget class="swift::gui::editors::CModelMappingForm" name="editor_ModelMapping">
          <property name="minimumSize">
           <size>
            <width>0</width>
@@ -349,7 +349,7 @@
             <number>0</number>
            </property>
            <item>
-            <widget class="BlackGui::Editors::CAircraftModelForm" name="editor_AircraftModel">
+            <widget class="swift::gui::editors::CAircraftModelForm" name="editor_AircraftModel">
              <property name="frameShape">
               <enum>QFrame::StyledPanel</enum>
              </property>
@@ -370,56 +370,56 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Views::CAircraftModelView</class>
+   <class>swift::gui::views::CAircraftModelView</class>
    <extends>QTableView</extends>
-   <header>blackgui/views/aircraftmodelview.h</header>
+   <header>gui/views/aircraftmodelview.h</header>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Editors::CAircraftModelForm</class>
+   <class>swift::gui::editors::CAircraftModelForm</class>
    <extends>QFrame</extends>
-   <header>blackgui/editors/aircraftmodelform.h</header>
+   <header>gui/editors/aircraftmodelform.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Editors::CModelMappingForm</class>
+   <class>swift::gui::editors::CModelMappingForm</class>
    <extends>QFrame</extends>
-   <header>blackgui/editors/modelmappingform.h</header>
+   <header>gui/editors/modelmappingform.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::COverlayMessagesFrame</class>
+   <class>swift::gui::COverlayMessagesFrame</class>
    <extends>QFrame</extends>
-   <header>blackgui/overlaymessagesframe.h</header>
+   <header>gui/overlaymessagesframe.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CDbStashComponent</class>
+   <class>swift::gui::components::CDbStashComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/dbstashcomponent.h</header>
+   <header>gui/components/dbstashcomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CDbOwnModelSetComponent</class>
+   <class>swift::gui::components::CDbOwnModelSetComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/dbownmodelsetcomponent.h</header>
+   <header>gui/components/dbownmodelsetcomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CDbOwnModelsComponent</class>
+   <class>swift::gui::components::CDbOwnModelsComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/dbownmodelscomponent.h</header>
+   <header>gui/components/dbownmodelscomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CModelMatcherComponent</class>
+   <class>swift::gui::components::CModelMatcherComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/modelmatchercomponent.h</header>
+   <header>gui/components/modelmatchercomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CDbModelWorkbenchComponent</class>
+   <class>swift::gui::components::CDbModelWorkbenchComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/dbmodelworkbenchcomponent.h</header>
+   <header>gui/components/dbmodelworkbenchcomponent.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/dbmappingcomponentaware.cpp b/src/gui/components/dbmappingcomponentaware.cpp
similarity index 89%
rename from src/blackgui/components/dbmappingcomponentaware.cpp
rename to src/gui/components/dbmappingcomponentaware.cpp
index 8686743aa..997b5b22c 100644
--- a/src/blackgui/components/dbmappingcomponentaware.cpp
+++ b/src/gui/components/dbmappingcomponentaware.cpp
@@ -1,14 +1,14 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/dbmappingcomponent.h"
-#include "blackgui/components/dbmappingcomponentaware.h"
+#include "gui/components/dbmappingcomponent.h"
+#include "gui/components/dbmappingcomponentaware.h"
 
 #include <QObject>
 
 using namespace swift::misc;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     void CDbMappingComponentAware::setMappingComponent(CDbMappingComponent *component)
     {
diff --git a/src/blackgui/components/dbmappingcomponentaware.h b/src/gui/components/dbmappingcomponentaware.h
similarity index 79%
rename from src/blackgui/components/dbmappingcomponentaware.h
rename to src/gui/components/dbmappingcomponentaware.h
index 944e61c88..9949b4b54 100644
--- a/src/blackgui/components/dbmappingcomponentaware.h
+++ b/src/gui/components/dbmappingcomponentaware.h
@@ -3,19 +3,19 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_DBMAPPINGCOMPONENTAWARE_H
-#define BLACKGUI_COMPONENTS_DBMAPPINGCOMPONENTAWARE_H
+#ifndef SWIFT_GUI_COMPONENTS_DBMAPPINGCOMPONENTAWARE_H
+#define SWIFT_GUI_COMPONENTS_DBMAPPINGCOMPONENTAWARE_H
 
 #include "misc/statusmessage.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include <QObject>
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     class CDbMappingComponent;
 
     //! Allows subcomponents to gain access to model component
-    class BLACKGUI_EXPORT CDbMappingComponentAware
+    class SWIFT_GUI_EXPORT CDbMappingComponentAware
     {
     public:
         //! Set the corresponding component
@@ -48,6 +48,6 @@ namespace BlackGui::Components
     };
 } // ns
 
-Q_DECLARE_INTERFACE(BlackGui::Components::CDbMappingComponentAware, "org.swift-project.blackgui.components.dbmappingcomponentaware")
+Q_DECLARE_INTERFACE(swift::gui::components::CDbMappingComponentAware, "org.swift-project.swiftgui.components.dbmappingcomponentaware")
 
 #endif // guard
diff --git a/src/blackgui/components/dbmodelcomponent.cpp b/src/gui/components/dbmodelcomponent.cpp
similarity index 92%
rename from src/blackgui/components/dbmodelcomponent.cpp
rename to src/gui/components/dbmodelcomponent.cpp
index 4974c8083..0babc9227 100644
--- a/src/blackgui/components/dbmodelcomponent.cpp
+++ b/src/gui/components/dbmodelcomponent.cpp
@@ -1,14 +1,14 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/dbmodelcomponent.h"
-#include "blackgui/filters/aircraftmodelfilterbar.h"
-#include "blackgui/models/aircraftmodellistmodel.h"
-#include "blackgui/guiapplication.h"
+#include "gui/components/dbmodelcomponent.h"
+#include "gui/filters/aircraftmodelfilterbar.h"
+#include "gui/models/aircraftmodellistmodel.h"
+#include "gui/guiapplication.h"
 #include "core/application.h"
 #include "core/webdataservices.h"
-#include "blackgui/views/aircraftmodelview.h"
-#include "blackgui/views/viewbase.h"
+#include "gui/views/aircraftmodelview.h"
+#include "gui/views/viewbase.h"
 #include "misc/simulation/aircraftmodel.h"
 #include "ui_dbmodelcomponent.h"
 
@@ -21,10 +21,10 @@ using namespace swift::misc;
 using namespace swift::misc::network;
 using namespace swift::misc::simulation;
 using namespace swift::core;
-using namespace BlackGui::Views;
-using namespace BlackGui::Models;
+using namespace swift::gui::views;
+using namespace swift::gui::models;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CDbModelComponent::CDbModelComponent(QWidget *parent) : COverlayMessagesFrame(parent),
                                                             CDbMappingComponentAware(parent),
diff --git a/src/blackgui/components/dbmodelcomponent.h b/src/gui/components/dbmodelcomponent.h
similarity index 81%
rename from src/blackgui/components/dbmodelcomponent.h
rename to src/gui/components/dbmodelcomponent.h
index 106694bde..4164864b6 100644
--- a/src/blackgui/components/dbmodelcomponent.h
+++ b/src/gui/components/dbmodelcomponent.h
@@ -3,14 +3,14 @@
 
 //! \file
 
-#ifndef BLACKUI_COMPONENTS_DBMODELCOMPONENT_H
-#define BLACKUI_COMPONENTS_DBMODELCOMPONENT_H
+#ifndef SWIFT_UI_COMPONENTS_DBMODELCOMPONENT_H
+#define SWIFT_UI_COMPONENTS_DBMODELCOMPONENT_H
 
-#include "blackgui/components/dbmappingcomponentaware.h"
-#include "blackgui/enablefordockwidgetinfoarea.h"
-#include "blackgui/enableforviewbasedindicator.h"
-#include "blackgui/overlaymessagesframe.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/components/dbmappingcomponentaware.h"
+#include "gui/enablefordockwidgetinfoarea.h"
+#include "gui/enableforviewbasedindicator.h"
+#include "gui/overlaymessagesframe.h"
+#include "gui/swiftguiexport.h"
 #include "misc/network/entityflags.h"
 #include "misc/simulation/aircraftmodel.h"
 #include "misc/simulation/aircraftmodellist.h"
@@ -22,12 +22,12 @@ namespace Ui
 {
     class CDbModelComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Database models. Those are the models loaaded from the DB.
      */
-    class BLACKGUI_EXPORT CDbModelComponent :
+    class SWIFT_GUI_EXPORT CDbModelComponent :
         public COverlayMessagesFrame,
         public CDbMappingComponentAware,
         public CEnableForDockWidgetInfoArea,
diff --git a/src/blackgui/components/dbmodelcomponent.ui b/src/gui/components/dbmodelcomponent.ui
similarity index 82%
rename from src/blackgui/components/dbmodelcomponent.ui
rename to src/gui/components/dbmodelcomponent.ui
index 0a9089c37..d39175011 100644
--- a/src/blackgui/components/dbmodelcomponent.ui
+++ b/src/gui/components/dbmodelcomponent.ui
@@ -39,7 +39,7 @@
     <number>0</number>
    </property>
    <item>
-    <widget class="BlackGui::Filters::CAircraftModelFilterBar" name="filter_AircraftModelFilter">
+    <widget class="swift::gui::filters::CAircraftModelFilterBar" name="filter_AircraftModelFilter">
      <property name="frameShape">
       <enum>QFrame::StyledPanel</enum>
      </property>
@@ -49,7 +49,7 @@
     </widget>
    </item>
    <item>
-    <widget class="BlackGui::Views::CAircraftModelView" name="tvp_AircraftModel">
+    <widget class="swift::gui::views::CAircraftModelView" name="tvp_AircraftModel">
      <property name="selectionMode">
       <enum>QAbstractItemView::SingleSelection</enum>
      </property>
@@ -68,14 +68,14 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Views::CAircraftModelView</class>
+   <class>swift::gui::views::CAircraftModelView</class>
    <extends>QTableView</extends>
-   <header>blackgui/views/aircraftmodelview.h</header>
+   <header>gui/views/aircraftmodelview.h</header>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Filters::CAircraftModelFilterBar</class>
+   <class>swift::gui::filters::CAircraftModelFilterBar</class>
    <extends>QFrame</extends>
-   <header>blackgui/filters/aircraftmodelfilterbar.h</header>
+   <header>gui/filters/aircraftmodelfilterbar.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/dbmodelkeycompleter.cpp b/src/gui/components/dbmodelkeycompleter.cpp
similarity index 93%
rename from src/blackgui/components/dbmodelkeycompleter.cpp
rename to src/gui/components/dbmodelkeycompleter.cpp
index 7727c5ba7..27ffb42d6 100644
--- a/src/blackgui/components/dbmodelkeycompleter.cpp
+++ b/src/gui/components/dbmodelkeycompleter.cpp
@@ -2,15 +2,15 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "dbmodelkeycompleter.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/uppercasevalidator.h"
+#include "gui/guiapplication.h"
+#include "gui/uppercasevalidator.h"
 #include "core/webdataservices.h"
 #include <QCompleter>
 
 using namespace swift::core;
 using namespace swift::misc::simulation;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CDbModelKeyCompleter::CDbModelKeyCompleter(QWidget *parent) : QLineEdit(parent)
     {
diff --git a/src/blackgui/components/dbmodelkeycompleter.h b/src/gui/components/dbmodelkeycompleter.h
similarity index 88%
rename from src/blackgui/components/dbmodelkeycompleter.h
rename to src/gui/components/dbmodelkeycompleter.h
index 7a7a98520..0ccc95992 100644
--- a/src/blackgui/components/dbmodelkeycompleter.h
+++ b/src/gui/components/dbmodelkeycompleter.h
@@ -3,14 +3,14 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_DBMODELKEYCOMPLETER_H
-#define BLACKGUI_COMPONENTS_DBMODELKEYCOMPLETER_H
+#ifndef SWIFT_GUI_COMPONENTS_DBMODELKEYCOMPLETER_H
+#define SWIFT_GUI_COMPONENTS_DBMODELKEYCOMPLETER_H
 
 #include "misc/simulation/simulatorinfo.h"
 #include "misc/simulation/aircraftmodel.h"
 #include <QLineEdit>
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Completer for model keys
diff --git a/src/blackgui/components/dbmodelmappingmodifydialog.cpp b/src/gui/components/dbmodelmappingmodifydialog.cpp
similarity index 88%
rename from src/blackgui/components/dbmodelmappingmodifydialog.cpp
rename to src/gui/components/dbmodelmappingmodifydialog.cpp
index 7d1055128..bc0907112 100644
--- a/src/blackgui/components/dbmodelmappingmodifydialog.cpp
+++ b/src/gui/components/dbmodelmappingmodifydialog.cpp
@@ -1,8 +1,8 @@
 // SPDX-FileCopyrightText: Copyright (C) 2016 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/dbmodelmappingmodifydialog.h"
-#include "blackgui/editors/modelmappingmodifyform.h"
+#include "gui/components/dbmodelmappingmodifydialog.h"
+#include "gui/editors/modelmappingmodifyform.h"
 #include "ui_dbmodelmappingmodifydialog.h"
 
 #include <QWidget>
@@ -10,7 +10,7 @@
 using namespace swift::misc;
 using namespace swift::misc::simulation;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CDbModelMappingModifyDialog::CDbModelMappingModifyDialog(QWidget *parent) : QDialog(parent),
                                                                                 CDbMappingComponentAware(parent),
diff --git a/src/blackgui/components/dbmodelmappingmodifydialog.h b/src/gui/components/dbmodelmappingmodifydialog.h
similarity index 77%
rename from src/blackgui/components/dbmodelmappingmodifydialog.h
rename to src/gui/components/dbmodelmappingmodifydialog.h
index 7e6d9b178..2d45818f2 100644
--- a/src/blackgui/components/dbmodelmappingmodifydialog.h
+++ b/src/gui/components/dbmodelmappingmodifydialog.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_DBMODELMAPPINGMODIFYDIALOG_H
-#define BLACKGUI_COMPONENTS_DBMODELMAPPINGMODIFYDIALOG_H
+#ifndef SWIFT_GUI_COMPONENTS_DBMODELMAPPINGMODIFYDIALOG_H
+#define SWIFT_GUI_COMPONENTS_DBMODELMAPPINGMODIFYDIALOG_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/components/dbmappingcomponentaware.h"
+#include "gui/swiftguiexport.h"
+#include "gui/components/dbmappingcomponentaware.h"
 #include "misc/propertyindexvariantmap.h"
 
 #include <QDialog>
@@ -22,12 +22,12 @@ namespace Ui
 {
     class CDbModelMappingModifyDialog;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Modify model fields as dialog
      */
-    class BLACKGUI_EXPORT CDbModelMappingModifyDialog :
+    class SWIFT_GUI_EXPORT CDbModelMappingModifyDialog :
         public QDialog,
         public CDbMappingComponentAware
     {
diff --git a/src/blackgui/components/dbmodelmappingmodifydialog.ui b/src/gui/components/dbmodelmappingmodifydialog.ui
similarity index 90%
rename from src/blackgui/components/dbmodelmappingmodifydialog.ui
rename to src/gui/components/dbmodelmappingmodifydialog.ui
index 080f189f7..2dcebddd7 100644
--- a/src/blackgui/components/dbmodelmappingmodifydialog.ui
+++ b/src/gui/components/dbmodelmappingmodifydialog.ui
@@ -21,7 +21,7 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item alignment="Qt::AlignTop">
-    <widget class="BlackGui::Editors::CModelMappingModifyForm" name="editor_ModelMappingModify">
+    <widget class="swift::gui::editors::CModelMappingModifyForm" name="editor_ModelMappingModify">
      <property name="minimumSize">
       <size>
        <width>0</width>
@@ -50,9 +50,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Editors::CModelMappingModifyForm</class>
+   <class>swift::gui::editors::CModelMappingModifyForm</class>
    <extends>QFrame</extends>
-   <header>blackgui/editors/modelmappingmodifyform.h</header>
+   <header>gui/editors/modelmappingmodifyform.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/dbmodelworkbenchcomponent.cpp b/src/gui/components/dbmodelworkbenchcomponent.cpp
similarity index 86%
rename from src/blackgui/components/dbmodelworkbenchcomponent.cpp
rename to src/gui/components/dbmodelworkbenchcomponent.cpp
index 5129840b5..a105cdde3 100644
--- a/src/blackgui/components/dbmodelworkbenchcomponent.cpp
+++ b/src/gui/components/dbmodelworkbenchcomponent.cpp
@@ -1,13 +1,13 @@
 // SPDX-FileCopyrightText: Copyright (C) 2018 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/dbownmodelscomponent.h"
-#include "blackgui/components/simulatorselector.h"
-#include "blackgui/menus/aircraftmodelmenus.h"
-#include "blackgui/menus/menuaction.h"
-#include "blackgui/views/aircraftmodelview.h"
-#include "blackgui/models/aircraftmodellistmodel.h"
-#include "blackgui/guiapplication.h"
+#include "gui/components/dbownmodelscomponent.h"
+#include "gui/components/simulatorselector.h"
+#include "gui/menus/aircraftmodelmenus.h"
+#include "gui/menus/menuaction.h"
+#include "gui/views/aircraftmodelview.h"
+#include "gui/models/aircraftmodellistmodel.h"
+#include "gui/guiapplication.h"
 #include "core/webdataservices.h"
 #include "core/db/databaseutils.h"
 #include "misc/icons.h"
@@ -26,11 +26,11 @@
 using namespace swift::misc;
 using namespace swift::misc::simulation;
 using namespace swift::core::db;
-using namespace BlackGui::Menus;
-using namespace BlackGui::Views;
-using namespace BlackGui::Models;
+using namespace swift::gui::menus;
+using namespace swift::gui::views;
+using namespace swift::gui::models;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CDbModelWorkbenchComponent::CDbModelWorkbenchComponent(QWidget *parent) : COverlayMessagesFrame(parent),
                                                                               ui(new Ui::CDbModelWorkbenchComponent)
diff --git a/src/blackgui/components/dbmodelworkbenchcomponent.h b/src/gui/components/dbmodelworkbenchcomponent.h
similarity index 89%
rename from src/blackgui/components/dbmodelworkbenchcomponent.h
rename to src/gui/components/dbmodelworkbenchcomponent.h
index c0f1c16dc..889af9ace 100644
--- a/src/blackgui/components/dbmodelworkbenchcomponent.h
+++ b/src/gui/components/dbmodelworkbenchcomponent.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_DBMODELSWORKBENCHCOMPONENT_H
-#define BLACKGUI_COMPONENTS_DBMODELSWORKBENCHCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_DBMODELSWORKBENCHCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_DBMODELSWORKBENCHCOMPONENT_H
 
-#include "blackgui/overlaymessagesframe.h"
+#include "gui/overlaymessagesframe.h"
 #include "misc/simulation/aircraftmodelinterfaces.h"
 #include "misc/simulation/aircraftmodellist.h"
 #include "misc/directories.h"
@@ -22,21 +22,21 @@ namespace Ui
 {
     class CDbModelWorkbenchComponent;
 }
-namespace BlackGui
+namespace swift::gui
 {
-    namespace Menus
+    namespace menus
     {
         class CMenuActions;
     }
-    namespace Models
+    namespace models
     {
         class CAircraftModelListModel;
     }
-    namespace Views
+    namespace views
     {
         class CAircraftModelView;
     }
-    namespace Components
+    namespace components
     {
         /*!
          * Handling of own models on disk (the models installed for the simulator)
@@ -77,10 +77,10 @@ namespace BlackGui
             int getModelsCount() const;
 
             //! Models view
-            BlackGui::Views::CAircraftModelView *view() const;
+            swift::gui::views::CAircraftModelView *view() const;
 
             //! Access to aircraft model
-            Models::CAircraftModelListModel *model() const;
+            models::CAircraftModelListModel *model() const;
 
             //! \name Implementations of the models interfaces
             //! @{
diff --git a/src/blackgui/components/dbmodelworkbenchcomponent.ui b/src/gui/components/dbmodelworkbenchcomponent.ui
similarity index 86%
rename from src/blackgui/components/dbmodelworkbenchcomponent.ui
rename to src/gui/components/dbmodelworkbenchcomponent.ui
index c7ca04217..f4074e7dc 100644
--- a/src/blackgui/components/dbmodelworkbenchcomponent.ui
+++ b/src/gui/components/dbmodelworkbenchcomponent.ui
@@ -26,7 +26,7 @@
     </widget>
    </item>
    <item>
-    <widget class="BlackGui::Views::CAircraftModelView" name="tvp_Models">
+    <widget class="swift::gui::views::CAircraftModelView" name="tvp_Models">
      <property name="selectionBehavior">
       <enum>QAbstractItemView::SelectRows</enum>
      </property>
@@ -39,9 +39,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Views::CAircraftModelView</class>
+   <class>swift::gui::views::CAircraftModelView</class>
    <extends>QTableView</extends>
-   <header>blackgui/views/aircraftmodelview.h</header>
+   <header>gui/views/aircraftmodelview.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/src/blackgui/components/dbownmodelscomponent.cpp b/src/gui/components/dbownmodelscomponent.cpp
similarity index 98%
rename from src/blackgui/components/dbownmodelscomponent.cpp
rename to src/gui/components/dbownmodelscomponent.cpp
index dc00c9c08..a6db4871e 100644
--- a/src/blackgui/components/dbownmodelscomponent.cpp
+++ b/src/gui/components/dbownmodelscomponent.cpp
@@ -1,13 +1,13 @@
 // SPDX-FileCopyrightText: Copyright (C) 2016 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/dbownmodelscomponent.h"
-#include "blackgui/components/simulatorselector.h"
-#include "blackgui/menus/aircraftmodelmenus.h"
-#include "blackgui/menus/menuaction.h"
-#include "blackgui/views/aircraftmodelview.h"
-#include "blackgui/models/aircraftmodellistmodel.h"
-#include "blackgui/guiapplication.h"
+#include "gui/components/dbownmodelscomponent.h"
+#include "gui/components/simulatorselector.h"
+#include "gui/menus/aircraftmodelmenus.h"
+#include "gui/menus/menuaction.h"
+#include "gui/views/aircraftmodelview.h"
+#include "gui/models/aircraftmodellistmodel.h"
+#include "gui/guiapplication.h"
 #include "core/webdataservices.h"
 #include "core/db/databaseutils.h"
 #include "misc/simulation/aircraftmodelloaderprovider.h"
@@ -31,11 +31,11 @@ using namespace swift::config;
 using namespace swift::misc;
 using namespace swift::misc::simulation;
 using namespace swift::core::db;
-using namespace BlackGui::Menus;
-using namespace BlackGui::Views;
-using namespace BlackGui::Models;
+using namespace swift::gui::menus;
+using namespace swift::gui::views;
+using namespace swift::gui::models;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CDbOwnModelsComponent::CDbOwnModelsComponent(QWidget *parent) : COverlayMessagesFrame(parent),
                                                                     ui(new Ui::CDbOwnModelsComponent)
diff --git a/src/blackgui/components/dbownmodelscomponent.h b/src/gui/components/dbownmodelscomponent.h
similarity index 92%
rename from src/blackgui/components/dbownmodelscomponent.h
rename to src/gui/components/dbownmodelscomponent.h
index f993a2c27..05a44ebfb 100644
--- a/src/blackgui/components/dbownmodelscomponent.h
+++ b/src/gui/components/dbownmodelscomponent.h
@@ -3,12 +3,12 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_DBOWNMODELSCOMPONENT_H
-#define BLACKGUI_COMPONENTS_DBOWNMODELSCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_DBOWNMODELSCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_DBOWNMODELSCOMPONENT_H
 
-#include "blackgui/components/simulatorselector.h"
-#include "blackgui/menus/menudelegate.h"
-#include "blackgui/overlaymessagesframe.h"
+#include "gui/components/simulatorselector.h"
+#include "gui/menus/menudelegate.h"
+#include "gui/overlaymessagesframe.h"
 #include "misc/simulation/aircraftmodellist.h"
 #include "misc/simulation/aircraftmodelloader.h"
 #include "misc/simulation/aircraftmodelinterfaces.h"
@@ -33,21 +33,21 @@ namespace Ui
 {
     class CDbOwnModelsComponent;
 }
-namespace BlackGui
+namespace swift::gui
 {
-    namespace Menus
+    namespace menus
     {
         class CMenuActions;
     }
-    namespace Models
+    namespace models
     {
         class CAircraftModelListModel;
     }
-    namespace Views
+    namespace views
     {
         class CAircraftModelView;
     }
-    namespace Components
+    namespace components
     {
         /*!
          * Handling of own models on disk (the models installed for the simulator)
@@ -93,7 +93,7 @@ namespace BlackGui
             //! Change current simulator for own models
             bool setSimulator(const swift::misc::simulation::CSimulatorInfo &simulator, bool forced = false);
 
-            //! \copydoc BlackGui::Components::CSimulatorSelector::setMode
+            //! \copydoc swift::gui::components::CSimulatorSelector::setMode
             void setSimulatorSelectorMode(CSimulatorSelector::Mode mode);
 
             //! Number of own models
@@ -112,10 +112,10 @@ namespace BlackGui
             void clearView();
 
             //! Models view
-            BlackGui::Views::CAircraftModelView *view() const;
+            swift::gui::views::CAircraftModelView *view() const;
 
             //! Access to aircraft model
-            Models::CAircraftModelListModel *model() const;
+            models::CAircraftModelListModel *model() const;
 
             //! Access to model loader
             swift::misc::simulation::IAircraftModelLoader *modelLoader() const { return m_modelLoader; }
@@ -205,15 +205,15 @@ namespace BlackGui
             //! The menu for loading and handling own models for mapping tasks
             //! \note This is specific for that very component
             //! \fixme MS 2018-12 Move to namespace scope and add Q_OBJECT
-            class CLoadModelsMenu : public Menus::IMenuDelegate
+            class CLoadModelsMenu : public menus::IMenuDelegate
             {
             public:
                 //! Constructor
-                CLoadModelsMenu(CDbOwnModelsComponent *ownModelsComponent) : BlackGui::Menus::IMenuDelegate(ownModelsComponent)
+                CLoadModelsMenu(CDbOwnModelsComponent *ownModelsComponent) : swift::gui::menus::IMenuDelegate(ownModelsComponent)
                 {}
 
                 //! \copydoc IMenuDelegate::customMenu
-                virtual void customMenu(Menus::CMenuActions &menuActions) override;
+                virtual void customMenu(menus::CMenuActions &menuActions) override;
 
             private:
                 QList<QAction *> m_loadActions; //!< load actions
diff --git a/src/blackgui/components/dbownmodelscomponent.ui b/src/gui/components/dbownmodelscomponent.ui
similarity index 89%
rename from src/blackgui/components/dbownmodelscomponent.ui
rename to src/gui/components/dbownmodelscomponent.ui
index 5ad22dff3..603eb8289 100644
--- a/src/blackgui/components/dbownmodelscomponent.ui
+++ b/src/gui/components/dbownmodelscomponent.ui
@@ -33,7 +33,7 @@
     <number>0</number>
    </property>
    <item>
-    <widget class="BlackGui::Views::CAircraftModelView" name="tvp_OwnAircraftModels">
+    <widget class="swift::gui::views::CAircraftModelView" name="tvp_OwnAircraftModels">
      <property name="selectionBehavior">
       <enum>QAbstractItemView::SelectRows</enum>
      </property>
@@ -67,7 +67,7 @@
        <number>0</number>
       </property>
       <item>
-       <widget class="BlackGui::Components::CSimulatorSelector" name="comp_SimulatorSelector">
+       <widget class="swift::gui::components::CSimulatorSelector" name="comp_SimulatorSelector">
         <property name="minimumSize">
          <size>
           <width>50</width>
@@ -126,14 +126,14 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Views::CAircraftModelView</class>
+   <class>swift::gui::views::CAircraftModelView</class>
    <extends>QTableView</extends>
-   <header>blackgui/views/aircraftmodelview.h</header>
+   <header>gui/views/aircraftmodelview.h</header>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CSimulatorSelector</class>
+   <class>swift::gui::components::CSimulatorSelector</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/simulatorselector.h</header>
+   <header>gui/components/simulatorselector.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/dbownmodelsdialog.cpp b/src/gui/components/dbownmodelsdialog.cpp
similarity index 94%
rename from src/blackgui/components/dbownmodelsdialog.cpp
rename to src/gui/components/dbownmodelsdialog.cpp
index e0645788f..9d130f885 100644
--- a/src/blackgui/components/dbownmodelsdialog.cpp
+++ b/src/gui/components/dbownmodelsdialog.cpp
@@ -2,12 +2,12 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "dbownmodelsdialog.h"
-#include "blackgui/components/dbownmodelscomponent.h"
+#include "gui/components/dbownmodelscomponent.h"
 #include "ui_dbownmodelsdialog.h"
 
 using namespace swift::misc::simulation;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CDbOwnModelsDialog::CDbOwnModelsDialog(QWidget *parent) : QDialog(parent),
                                                               ui(new Ui::CDbOwnModelsDialog)
diff --git a/src/blackgui/components/dbownmodelsdialog.h b/src/gui/components/dbownmodelsdialog.h
similarity index 86%
rename from src/blackgui/components/dbownmodelsdialog.h
rename to src/gui/components/dbownmodelsdialog.h
index 746d8ca4b..c134df48f 100644
--- a/src/blackgui/components/dbownmodelsdialog.h
+++ b/src/gui/components/dbownmodelsdialog.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_CDBOWNMODELSDIALOG_H
-#define BLACKGUI_COMPONENTS_CDBOWNMODELSDIALOG_H
+#ifndef SWIFT_GUI_COMPONENTS_CDBOWNMODELSDIALOG_H
+#define SWIFT_GUI_COMPONENTS_CDBOWNMODELSDIALOG_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include "misc/simulation/simulatorinfo.h"
 #include <QDialog>
 #include <QScopedPointer>
@@ -15,12 +15,12 @@ namespace Ui
 {
     class CDbOwnModelsDialog;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     class CDbOwnModelsComponent;
 
     //! Own models dialog
-    class BLACKGUI_EXPORT CDbOwnModelsDialog : public QDialog
+    class SWIFT_GUI_EXPORT CDbOwnModelsDialog : public QDialog
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/dbownmodelsdialog.ui b/src/gui/components/dbownmodelsdialog.ui
similarity index 89%
rename from src/blackgui/components/dbownmodelsdialog.ui
rename to src/gui/components/dbownmodelsdialog.ui
index 227a3f673..6374af1ce 100644
--- a/src/blackgui/components/dbownmodelsdialog.ui
+++ b/src/gui/components/dbownmodelsdialog.ui
@@ -15,7 +15,7 @@
   </property>
   <layout class="QVBoxLayout" name="vl_OwnModelsDialog">
    <item>
-    <widget class="BlackGui::Components::CDbOwnModelsComponent" name="comp_OwnModels">
+    <widget class="swift::gui::components::CDbOwnModelsComponent" name="comp_OwnModels">
      <property name="frameShape">
       <enum>QFrame::StyledPanel</enum>
      </property>
@@ -38,9 +38,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CDbOwnModelsComponent</class>
+   <class>swift::gui::components::CDbOwnModelsComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/dbownmodelscomponent.h</header>
+   <header>gui/components/dbownmodelscomponent.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/dbownmodelsetcomponent.cpp b/src/gui/components/dbownmodelsetcomponent.cpp
similarity index 96%
rename from src/blackgui/components/dbownmodelsetcomponent.cpp
rename to src/gui/components/dbownmodelsetcomponent.cpp
index 5e014d8ac..6c03959f1 100644
--- a/src/blackgui/components/dbownmodelsetcomponent.cpp
+++ b/src/gui/components/dbownmodelsetcomponent.cpp
@@ -1,20 +1,20 @@
 // SPDX-FileCopyrightText: Copyright (C) 2016 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/dbmappingcomponent.h"
-#include "blackgui/components/dbownmodelsetcomponent.h"
-#include "blackgui/components/dbownmodelsetformdialog.h"
-#include "blackgui/components/dbreducemodelduplicates.h"
-#include "blackgui/components/firstmodelsetdialog.h"
-#include "blackgui/components/copymodelsfromotherswiftversionsdialog.h"
-#include "blackgui/menus/aircraftmodelmenus.h"
-#include "blackgui/menus/menuaction.h"
-#include "blackgui/models/aircraftmodellistmodel.h"
-#include "blackgui/views/aircraftmodelview.h"
-#include "blackgui/views/viewbase.h"
-#include "blackgui/views/aircraftmodelstatisticsdialog.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/guiutility.h"
+#include "gui/components/dbmappingcomponent.h"
+#include "gui/components/dbownmodelsetcomponent.h"
+#include "gui/components/dbownmodelsetformdialog.h"
+#include "gui/components/dbreducemodelduplicates.h"
+#include "gui/components/firstmodelsetdialog.h"
+#include "gui/components/copymodelsfromotherswiftversionsdialog.h"
+#include "gui/menus/aircraftmodelmenus.h"
+#include "gui/menus/menuaction.h"
+#include "gui/models/aircraftmodellistmodel.h"
+#include "gui/views/aircraftmodelview.h"
+#include "gui/views/viewbase.h"
+#include "gui/views/aircraftmodelstatisticsdialog.h"
+#include "gui/guiapplication.h"
+#include "gui/guiutility.h"
 #include "misc/simulation/aircraftmodelutils.h"
 #include "misc/simulation/aircraftmodellist.h"
 #include "misc/simulation/distributorlist.h"
@@ -41,11 +41,11 @@
 
 using namespace swift::misc;
 using namespace swift::misc::simulation;
-using namespace BlackGui::Models;
-using namespace BlackGui::Menus;
-using namespace BlackGui::Views;
+using namespace swift::gui::models;
+using namespace swift::gui::menus;
+using namespace swift::gui::views;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CDbOwnModelSetComponent::CDbOwnModelSetComponent(QWidget *parent) : QFrame(parent),
                                                                         CDbMappingComponentAware(parent),
@@ -96,7 +96,7 @@ namespace BlackGui::Components
         // void
     }
 
-    Views::CAircraftModelView *CDbOwnModelSetComponent::view() const
+    views::CAircraftModelView *CDbOwnModelSetComponent::view() const
     {
         return ui->tvp_OwnModelSet;
     }
diff --git a/src/blackgui/components/dbownmodelsetcomponent.h b/src/gui/components/dbownmodelsetcomponent.h
similarity index 91%
rename from src/blackgui/components/dbownmodelsetcomponent.h
rename to src/gui/components/dbownmodelsetcomponent.h
index ecd8b8a4f..474ca22eb 100644
--- a/src/blackgui/components/dbownmodelsetcomponent.h
+++ b/src/gui/components/dbownmodelsetcomponent.h
@@ -3,12 +3,12 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_CDBOWNMODELSETCOMPONENT_H
-#define BLACKGUI_COMPONENTS_CDBOWNMODELSETCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_CDBOWNMODELSETCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_CDBOWNMODELSETCOMPONENT_H
 
-#include "blackgui/components/dbmappingcomponentaware.h"
-#include "blackgui/components/simulatorselector.h"
-#include "blackgui/menus/menudelegate.h"
+#include "gui/components/dbmappingcomponentaware.h"
+#include "gui/components/simulatorselector.h"
+#include "gui/menus/menudelegate.h"
 #include "misc/simulation/data/modelcaches.h"
 #include "misc/simulation/settings/modelsettings.h"
 #include "misc/simulation/settings/simulatorsettings.h"
@@ -32,18 +32,18 @@ namespace swift::misc::simulation
 {
     class CAircraftModel;
 }
-namespace BlackGui
+namespace swift::gui
 {
-    namespace Menus
+    namespace menus
     {
         class CMenuActions;
     }
-    namespace Views
+    namespace views
     {
         class CAircraftModelView;
         class CAircraftModelStatisticsDialog;
     }
-    namespace Components
+    namespace components
     {
         class CDbMappingComponent;
         class CDbOwnModelSetFormDialog;
@@ -63,7 +63,7 @@ namespace BlackGui
             public swift::misc::simulation::ISimulatorSelectable
         {
             Q_OBJECT
-            Q_INTERFACES(BlackGui::Components::CDbMappingComponentAware)
+            Q_INTERFACES(swift::gui::components::CDbMappingComponentAware)
             Q_INTERFACES(swift::misc::simulation::IModelsSetable)
             Q_INTERFACES(swift::misc::simulation::IModelsUpdatable)
             Q_INTERFACES(swift::misc::simulation::IModelsForSimulatorSetable)
@@ -78,7 +78,7 @@ namespace BlackGui
             virtual ~CDbOwnModelSetComponent() override;
 
             //! Corresponding view
-            Views::CAircraftModelView *view() const;
+            views::CAircraftModelView *view() const;
 
             //! Add to model set
             swift::misc::CStatusMessage addToModelSet(const swift::misc::simulation::CAircraftModelList &models, const swift::misc::simulation::CSimulatorInfo &simulator);
@@ -109,7 +109,7 @@ namespace BlackGui
             //! Deferred init of simulator
             void triggerSetSimulatorDeferred(const swift::misc::simulation::CSimulatorInfo &simulator);
 
-            //! \copydoc BlackGui::Components::CSimulatorSelector::setMode
+            //! \copydoc swift::gui::components::CSimulatorSelector::setMode
             void setSimulatorSelectorMode(CSimulatorSelector::Mode mode);
 
             //! \copydoc CDbMappingComponentAware::setMappingComponent
@@ -191,7 +191,7 @@ namespace BlackGui
             QScopedPointer<CFirstModelSetDialog> m_firstModelSetDialog;
             QScopedPointer<CDbReduceModelDuplicates> m_reduceModelsDialog;
             QScopedPointer<CCopyModelsFromOtherSwiftVersionsDialog> m_copyFromAnotherSwiftDialog;
-            QScopedPointer<Views::CAircraftModelStatisticsDialog> m_modelStatisticsDialog;
+            QScopedPointer<views::CAircraftModelStatisticsDialog> m_modelStatisticsDialog;
 
             swift::misc::simulation::CSimulatorInfo m_simulator; //!< currently set simulator
             swift::misc::CSettingReadOnly<swift::misc::simulation::settings::TDistributorListPreferences> m_distributorPreferences { this, &CDbOwnModelSetComponent::distributorPreferencesChanged }; //!< distributor preferences
@@ -203,15 +203,15 @@ namespace BlackGui
             //! The menu for loading models from cache or create a new model set
             //! \note This is specific for that very model set component
             //! \fixme MS 2018-12 Move to namespace scope and add Q_OBJECT
-            class CLoadModelSetMenu : public Menus::IMenuDelegate
+            class CLoadModelSetMenu : public menus::IMenuDelegate
             {
             public:
                 //! Constructor
-                CLoadModelSetMenu(CDbOwnModelSetComponent *ownModelSetComponent) : Menus::IMenuDelegate(ownModelSetComponent)
+                CLoadModelSetMenu(CDbOwnModelSetComponent *ownModelSetComponent) : menus::IMenuDelegate(ownModelSetComponent)
                 {}
 
                 //! \copydoc IMenuDelegate::customMenu
-                virtual void customMenu(BlackGui::Menus::CMenuActions &menuActions) override;
+                virtual void customMenu(swift::gui::menus::CMenuActions &menuActions) override;
 
             private:
                 QList<QAction *> m_setActions;
diff --git a/src/blackgui/components/dbownmodelsetcomponent.ui b/src/gui/components/dbownmodelsetcomponent.ui
similarity index 93%
rename from src/blackgui/components/dbownmodelsetcomponent.ui
rename to src/gui/components/dbownmodelsetcomponent.ui
index 8d2cec3e3..1598aa0d2 100644
--- a/src/blackgui/components/dbownmodelsetcomponent.ui
+++ b/src/gui/components/dbownmodelsetcomponent.ui
@@ -33,7 +33,7 @@
     <number>0</number>
    </property>
    <item>
-    <widget class="BlackGui::Views::CAircraftModelView" name="tvp_OwnModelSet">
+    <widget class="swift::gui::views::CAircraftModelView" name="tvp_OwnModelSet">
      <property name="selectionBehavior">
       <enum>QAbstractItemView::SelectRows</enum>
      </property>
@@ -64,7 +64,7 @@
        <number>0</number>
       </property>
       <item>
-       <widget class="BlackGui::Components::CSimulatorSelector" name="comp_SimulatorSelector">
+       <widget class="swift::gui::components::CSimulatorSelector" name="comp_SimulatorSelector">
         <property name="minimumSize">
          <size>
           <width>50</width>
@@ -192,14 +192,14 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Views::CAircraftModelView</class>
+   <class>swift::gui::views::CAircraftModelView</class>
    <extends>QTableView</extends>
-   <header>blackgui/views/aircraftmodelview.h</header>
+   <header>gui/views/aircraftmodelview.h</header>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CSimulatorSelector</class>
+   <class>swift::gui::components::CSimulatorSelector</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/simulatorselector.h</header>
+   <header>gui/components/simulatorselector.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/dbownmodelsetdialog.cpp b/src/gui/components/dbownmodelsetdialog.cpp
similarity index 97%
rename from src/blackgui/components/dbownmodelsetdialog.cpp
rename to src/gui/components/dbownmodelsetdialog.cpp
index 063992b1c..6871ed669 100644
--- a/src/blackgui/components/dbownmodelsetdialog.cpp
+++ b/src/gui/components/dbownmodelsetdialog.cpp
@@ -6,7 +6,7 @@
 
 using namespace swift::misc::simulation;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CDbOwnModelSetDialog::CDbOwnModelSetDialog(QWidget *parent) : QDialog(parent),
                                                                   ui(new Ui::CDbOwnModelSetDialog)
diff --git a/src/blackgui/components/dbownmodelsetdialog.h b/src/gui/components/dbownmodelsetdialog.h
similarity index 89%
rename from src/blackgui/components/dbownmodelsetdialog.h
rename to src/gui/components/dbownmodelsetdialog.h
index 42dcde7ae..3f75ce38e 100644
--- a/src/blackgui/components/dbownmodelsetdialog.h
+++ b/src/gui/components/dbownmodelsetdialog.h
@@ -3,8 +3,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_DBOWNMODELSETDIALOG_H
-#define BLACKGUI_COMPONENTS_DBOWNMODELSETDIALOG_H
+#ifndef SWIFT_GUI_COMPONENTS_DBOWNMODELSETDIALOG_H
+#define SWIFT_GUI_COMPONENTS_DBOWNMODELSETDIALOG_H
 
 #include "misc/simulation/simulatorinfo.h"
 #include <QDialog>
@@ -14,7 +14,7 @@ namespace Ui
 {
     class CDbOwnModelSetDialog;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     class CDbOwnModelSetComponent;
 
diff --git a/src/blackgui/components/dbownmodelsetdialog.ui b/src/gui/components/dbownmodelsetdialog.ui
similarity index 89%
rename from src/blackgui/components/dbownmodelsetdialog.ui
rename to src/gui/components/dbownmodelsetdialog.ui
index 11cb41154..9d3d9a456 100644
--- a/src/blackgui/components/dbownmodelsetdialog.ui
+++ b/src/gui/components/dbownmodelsetdialog.ui
@@ -15,7 +15,7 @@
   </property>
   <layout class="QVBoxLayout" name="vl_OwnModelSetDialog">
    <item>
-    <widget class="BlackGui::Components::CDbOwnModelSetComponent" name="comp_OwnModelSet">
+    <widget class="swift::gui::components::CDbOwnModelSetComponent" name="comp_OwnModelSet">
      <property name="frameShape">
       <enum>QFrame::StyledPanel</enum>
      </property>
@@ -38,9 +38,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CDbOwnModelSetComponent</class>
+   <class>swift::gui::components::CDbOwnModelSetComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/dbownmodelsetcomponent.h</header>
+   <header>gui/components/dbownmodelsetcomponent.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/dbownmodelsetformdialog.cpp b/src/gui/components/dbownmodelsetformdialog.cpp
similarity index 96%
rename from src/blackgui/components/dbownmodelsetformdialog.cpp
rename to src/gui/components/dbownmodelsetformdialog.cpp
index 514fd2b20..d735ddc68 100644
--- a/src/blackgui/components/dbownmodelsetformdialog.cpp
+++ b/src/gui/components/dbownmodelsetformdialog.cpp
@@ -2,10 +2,10 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "core/modelsetbuilder.h"
-#include "blackgui/components/dbmappingcomponent.h"
-#include "blackgui/components/dbownmodelsetformdialog.h"
-#include "blackgui/editors/ownmodelsetform.h"
-#include "blackgui/guiapplication.h"
+#include "gui/components/dbmappingcomponent.h"
+#include "gui/components/dbownmodelsetformdialog.h"
+#include "gui/editors/ownmodelsetform.h"
+#include "gui/guiapplication.h"
 #include "misc/logcategories.h"
 #include "misc/simulation/distributorlist.h"
 #include "ui_dbownmodelsetformdialog.h"
@@ -18,9 +18,9 @@
 using namespace swift::misc;
 using namespace swift::misc::simulation;
 using namespace swift::core;
-using namespace BlackGui::Editors;
+using namespace swift::gui::editors;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     const QStringList &CDbOwnModelSetFormDialog::getLogCategories()
     {
diff --git a/src/blackgui/components/dbownmodelsetformdialog.h b/src/gui/components/dbownmodelsetformdialog.h
similarity index 92%
rename from src/blackgui/components/dbownmodelsetformdialog.h
rename to src/gui/components/dbownmodelsetformdialog.h
index abcd55268..b9aa1a7cb 100644
--- a/src/blackgui/components/dbownmodelsetformdialog.h
+++ b/src/gui/components/dbownmodelsetformdialog.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_DBOWNMODELSETFORMDIALOG_H
-#define BLACKGUI_COMPONENTS_DBOWNMODELSETFORMDIALOG_H
+#ifndef SWIFT_GUI_COMPONENTS_DBOWNMODELSETFORMDIALOG_H
+#define SWIFT_GUI_COMPONENTS_DBOWNMODELSETFORMDIALOG_H
 
-#include "blackgui/components/dbmappingcomponentaware.h"
+#include "gui/components/dbmappingcomponentaware.h"
 #include "misc/simulation/aircraftmodellist.h"
 #include "misc/simulation/simulatorinfo.h"
 
@@ -22,7 +22,7 @@ namespace swift::misc
 {
     class CLogCategoryList;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Dialog to create new model set
diff --git a/src/blackgui/components/dbownmodelsetformdialog.ui b/src/gui/components/dbownmodelsetformdialog.ui
similarity index 91%
rename from src/blackgui/components/dbownmodelsetformdialog.ui
rename to src/gui/components/dbownmodelsetformdialog.ui
index ad0bece3e..6cea49ed5 100644
--- a/src/blackgui/components/dbownmodelsetformdialog.ui
+++ b/src/gui/components/dbownmodelsetformdialog.ui
@@ -27,7 +27,7 @@
     <number>3</number>
    </property>
    <item>
-    <widget class="BlackGui::Editors::COwnModelSetForm" name="form_OwnModelSet">
+    <widget class="swift::gui::editors::COwnModelSetForm" name="form_OwnModelSet">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
        <horstretch>0</horstretch>
@@ -79,9 +79,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Editors::COwnModelSetForm</class>
+   <class>swift::gui::editors::COwnModelSetForm</class>
    <extends>QFrame</extends>
-   <header>blackgui/editors/ownmodelsetform.h</header>
+   <header>gui/editors/ownmodelsetform.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/dbquickmappingwizard.cpp b/src/gui/components/dbquickmappingwizard.cpp
similarity index 97%
rename from src/blackgui/components/dbquickmappingwizard.cpp
rename to src/gui/components/dbquickmappingwizard.cpp
index 9e99daf82..924483fc0 100644
--- a/src/blackgui/components/dbquickmappingwizard.cpp
+++ b/src/gui/components/dbquickmappingwizard.cpp
@@ -3,14 +3,14 @@
 
 #include "dbquickmappingwizard.h"
 #include "ui_dbquickmappingwizard.h"
-#include "blackgui/components/dbaircrafticaoselectorcomponent.h"
-#include "blackgui/components/dbairlinenameselectorcomponent.h"
-#include "blackgui/views/aircrafticaoview.h"
-#include "blackgui/views/liveryview.h"
-#include "blackgui/views/distributorview.h"
-#include "blackgui/uppercasevalidator.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/guiutility.h"
+#include "gui/components/dbaircrafticaoselectorcomponent.h"
+#include "gui/components/dbairlinenameselectorcomponent.h"
+#include "gui/views/aircrafticaoview.h"
+#include "gui/views/liveryview.h"
+#include "gui/views/distributorview.h"
+#include "gui/uppercasevalidator.h"
+#include "gui/guiapplication.h"
+#include "gui/guiutility.h"
 #include "core/context/contextsimulator.h"
 #include "core/db/databasewriter.h"
 #include "core/webdataservices.h"
@@ -25,7 +25,7 @@ using namespace swift::misc;
 using namespace swift::misc::aviation;
 using namespace swift::misc::simulation;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CDbQuickMappingWizard::CDbQuickMappingWizard(QWidget *parent) : QWizard(parent),
                                                                     ui(new Ui::CDbQuickMappingWizard)
diff --git a/src/blackgui/components/dbquickmappingwizard.h b/src/gui/components/dbquickmappingwizard.h
similarity index 96%
rename from src/blackgui/components/dbquickmappingwizard.h
rename to src/gui/components/dbquickmappingwizard.h
index 7acea7536..6df59edcb 100644
--- a/src/blackgui/components/dbquickmappingwizard.h
+++ b/src/gui/components/dbquickmappingwizard.h
@@ -3,8 +3,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_DBQUICKMAPPINGWIZARD_H
-#define BLACKGUI_COMPONENTS_DBQUICKMAPPINGWIZARD_H
+#ifndef SWIFT_GUI_COMPONENTS_DBQUICKMAPPINGWIZARD_H
+#define SWIFT_GUI_COMPONENTS_DBQUICKMAPPINGWIZARD_H
 
 #include "misc/simulation/aircraftmodellist.h"
 #include "misc/aviation/aircrafticaocode.h"
@@ -15,7 +15,7 @@ namespace Ui
 {
     class CDbQuickMappingWizard;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Wizard to quickly provide a single mapping
diff --git a/src/blackgui/components/dbquickmappingwizard.ui b/src/gui/components/dbquickmappingwizard.ui
similarity index 86%
rename from src/blackgui/components/dbquickmappingwizard.ui
rename to src/gui/components/dbquickmappingwizard.ui
index 589cd9d39..31a40fb5b 100644
--- a/src/blackgui/components/dbquickmappingwizard.ui
+++ b/src/gui/components/dbquickmappingwizard.ui
@@ -22,7 +22,7 @@
   <property name="wizardStyle">
    <enum>QWizard::ClassicStyle</enum>
   </property>
-  <widget class="BlackGui::COverlayMessagesWizardPage" name="wp1_Intro">
+  <widget class="swift::gui::COverlayMessagesWizardPage" name="wp1_Intro">
    <property name="title">
     <string>Model</string>
    </property>
@@ -96,7 +96,7 @@
         </property>
         <layout class="QVBoxLayout" name="vl_AircraftIcao">
          <item>
-          <widget class="BlackGui::Components::CDbAircraftIcaoSelectorComponent" name="selector_AircraftIcaoCode">
+          <widget class="swift::gui::components::CDbAircraftIcaoSelectorComponent" name="selector_AircraftIcaoCode">
            <property name="focusPolicy">
             <enum>Qt::StrongFocus</enum>
            </property>
@@ -243,7 +243,7 @@
              </widget>
             </item>
             <item row="2" column="1">
-             <widget class="BlackGui::Components::CDbAirlineIcaoSelectorComponent" name="selector_AirlineIcaoCode">
+             <widget class="swift::gui::components::CDbAirlineIcaoSelectorComponent" name="selector_AirlineIcaoCode">
               <property name="maximumSize">
                <size>
                 <width>225</width>
@@ -263,7 +263,7 @@
              </widget>
             </item>
             <item row="3" column="1">
-             <widget class="BlackGui::Components::CDbAirlineNameSelectorComponent" name="selector_AirlineName">
+             <widget class="swift::gui::components::CDbAirlineNameSelectorComponent" name="selector_AirlineName">
               <property name="maximumSize">
                <size>
                 <width>225</width>
@@ -319,7 +319,7 @@
     </item>
    </layout>
   </widget>
-  <widget class="BlackGui::COverlayMessagesWizardPage" name="wp2_Aircraft">
+  <widget class="swift::gui::COverlayMessagesWizardPage" name="wp2_Aircraft">
    <property name="title">
     <string>Aircraft</string>
    </property>
@@ -328,7 +328,7 @@
    </property>
    <layout class="QVBoxLayout" name="vl_AircraftPage">
     <item>
-     <widget class="BlackGui::Components::CDbAircraftIcaoComponent" name="comp_AircraftIcao">
+     <widget class="swift::gui::components::CDbAircraftIcaoComponent" name="comp_AircraftIcao">
       <property name="minimumSize">
        <size>
         <width>0</width>
@@ -339,7 +339,7 @@
     </item>
    </layout>
   </widget>
-  <widget class="BlackGui::COverlayMessagesWizardPage" name="wp3_LiveryColor">
+  <widget class="swift::gui::COverlayMessagesWizardPage" name="wp3_LiveryColor">
    <property name="title">
     <string>Livery</string>
    </property>
@@ -376,7 +376,7 @@
       </property>
       <layout class="QVBoxLayout" name="vl_ColorSearch">
        <item>
-        <widget class="BlackGui::Components::CDbLiveryColorSearch" name="comp_ColorSearch">
+        <widget class="swift::gui::components::CDbLiveryColorSearch" name="comp_ColorSearch">
          <property name="minimumSize">
           <size>
            <width>0</width>
@@ -402,7 +402,7 @@
     </item>
    </layout>
   </widget>
-  <widget class="BlackGui::COverlayMessagesWizardPage" name="wp4_Livery">
+  <widget class="swift::gui::COverlayMessagesWizardPage" name="wp4_Livery">
    <property name="title">
     <string>Livery</string>
    </property>
@@ -411,7 +411,7 @@
    </property>
    <layout class="QVBoxLayout" name="vl_LiveryPage">
     <item>
-     <widget class="BlackGui::Components::CDbLiveryComponent" name="comp_Livery">
+     <widget class="swift::gui::components::CDbLiveryComponent" name="comp_Livery">
       <property name="minimumSize">
        <size>
         <width>0</width>
@@ -422,7 +422,7 @@
     </item>
    </layout>
   </widget>
-  <widget class="BlackGui::COverlayMessagesWizardPage" name="wp5_Distributor">
+  <widget class="swift::gui::COverlayMessagesWizardPage" name="wp5_Distributor">
    <property name="title">
     <string>Distributor / package</string>
    </property>
@@ -431,7 +431,7 @@
    </property>
    <layout class="QVBoxLayout" name="vl_DistributorPage">
     <item>
-     <widget class="BlackGui::Components::CDbDistributorComponent" name="comp_Distributor">
+     <widget class="swift::gui::components::CDbDistributorComponent" name="comp_Distributor">
       <property name="minimumSize">
        <size>
         <width>0</width>
@@ -442,7 +442,7 @@
     </item>
    </layout>
   </widget>
-  <widget class="BlackGui::COverlayMessagesWizardPage" name="wp6_Confirmation">
+  <widget class="swift::gui::COverlayMessagesWizardPage" name="wp6_Confirmation">
    <property name="title">
     <string>Confirmation</string>
    </property>
@@ -457,7 +457,7 @@
       </property>
       <layout class="QHBoxLayout" name="hl_SupportedSimulators">
        <item alignment="Qt::AlignLeft">
-        <widget class="BlackGui::Components::CSimulatorSelector" name="selector_Simulator">
+        <widget class="swift::gui::components::CSimulatorSelector" name="selector_Simulator">
          <property name="minimumSize">
           <size>
            <width>175</width>
@@ -470,7 +470,7 @@
      </widget>
     </item>
     <item>
-     <widget class="BlackGui::Editors::CAircraftModelForm" name="editor_AircraftModel">
+     <widget class="swift::gui::editors::CAircraftModelForm" name="editor_AircraftModel">
       <property name="minimumSize">
        <size>
         <width>0</width>
@@ -519,7 +519,7 @@
     </item>
    </layout>
   </widget>
-  <widget class="BlackGui::COverlayMessagesWizardPage" name="wp7_Credentials">
+  <widget class="swift::gui::COverlayMessagesWizardPage" name="wp7_Credentials">
    <property name="title">
     <string>Credentials</string>
    </property>
@@ -540,7 +540,7 @@
       </property>
       <layout class="QVBoxLayout" name="vl_Credentials">
        <item>
-        <widget class="BlackGui::Components::CDbLoginComponent" name="comp_DbLogin">
+        <widget class="swift::gui::components::CDbLoginComponent" name="comp_DbLogin">
          <property name="frameShape">
           <enum>QFrame::StyledPanel</enum>
          </property>
@@ -554,7 +554,7 @@
     </item>
    </layout>
   </widget>
-  <widget class="BlackGui::COverlayMessagesWizardPage" name="wp8_LastConfirmation">
+  <widget class="swift::gui::COverlayMessagesWizardPage" name="wp8_LastConfirmation">
    <layout class="QVBoxLayout" name="verticalLayout_3">
     <item>
      <widget class="QLabel" name="lbl_Info">
@@ -574,7 +574,7 @@
     </item>
    </layout>
   </widget>
-  <widget class="BlackGui::COverlayMessagesWizardPage" name="wp9_SendStatus">
+  <widget class="swift::gui::COverlayMessagesWizardPage" name="wp9_SendStatus">
    <property name="title">
     <string>Status</string>
    </property>
@@ -595,7 +595,7 @@
       </property>
       <layout class="QVBoxLayout" name="vl_SendStatus">
        <item>
-        <widget class="BlackGui::Components::CStatusMessagesDetail" name="comp_Log">
+        <widget class="swift::gui::components::CStatusMessagesDetail" name="comp_Log">
          <property name="frameShape">
           <enum>QFrame::StyledPanel</enum>
          </property>
@@ -612,75 +612,75 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CDbDistributorComponent</class>
+   <class>swift::gui::components::CDbDistributorComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/dbdistributorcomponent.h</header>
+   <header>gui/components/dbdistributorcomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CDbAircraftIcaoSelectorComponent</class>
+   <class>swift::gui::components::CDbAircraftIcaoSelectorComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/dbaircrafticaoselectorcomponent.h</header>
+   <header>gui/components/dbaircrafticaoselectorcomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CDbAirlineIcaoSelectorComponent</class>
+   <class>swift::gui::components::CDbAirlineIcaoSelectorComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/dbairlineicaoselectorcomponent.h</header>
+   <header>gui/components/dbairlineicaoselectorcomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CDbLiveryColorSearch</class>
+   <class>swift::gui::components::CDbLiveryColorSearch</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/dbliverycolorsearch.h</header>
+   <header>gui/components/dbliverycolorsearch.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CDbAircraftIcaoComponent</class>
+   <class>swift::gui::components::CDbAircraftIcaoComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/dbaircrafticaocomponent.h</header>
+   <header>gui/components/dbaircrafticaocomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CDbLiveryComponent</class>
+   <class>swift::gui::components::CDbLiveryComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/dbliverycomponent.h</header>
+   <header>gui/components/dbliverycomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CDbAirlineNameSelectorComponent</class>
+   <class>swift::gui::components::CDbAirlineNameSelectorComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/dbairlinenameselectorcomponent.h</header>
+   <header>gui/components/dbairlinenameselectorcomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CStatusMessagesDetail</class>
+   <class>swift::gui::components::CStatusMessagesDetail</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/statusmessagesdetail.h</header>
+   <header>gui/components/statusmessagesdetail.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Editors::CAircraftModelForm</class>
+   <class>swift::gui::editors::CAircraftModelForm</class>
    <extends>QFrame</extends>
-   <header>blackgui/editors/aircraftmodelform.h</header>
+   <header>gui/editors/aircraftmodelform.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CDbLoginComponent</class>
+   <class>swift::gui::components::CDbLoginComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/dblogincomponent.h</header>
+   <header>gui/components/dblogincomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::COverlayMessagesWizardPage</class>
+   <class>swift::gui::COverlayMessagesWizardPage</class>
    <extends>QWizardPage</extends>
-   <header>blackgui/overlaymessagesframe.h</header>
+   <header>gui/overlaymessagesframe.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CSimulatorSelector</class>
+   <class>swift::gui::components::CSimulatorSelector</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/simulatorselector.h</header>
+   <header>gui/components/simulatorselector.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/dbreducemodelduplicates.cpp b/src/gui/components/dbreducemodelduplicates.cpp
similarity index 97%
rename from src/blackgui/components/dbreducemodelduplicates.cpp
rename to src/gui/components/dbreducemodelduplicates.cpp
index 51321c0ba..b334f8ab3 100644
--- a/src/blackgui/components/dbreducemodelduplicates.cpp
+++ b/src/gui/components/dbreducemodelduplicates.cpp
@@ -4,8 +4,8 @@
 #include "dbreducemodelduplicates.h"
 #include "ui_dbreducemodelduplicates.h"
 
-#include "blackgui/guiapplication.h"
-#include "blackgui/uppercasevalidator.h"
+#include "gui/guiapplication.h"
+#include "gui/uppercasevalidator.h"
 #include "core/webdataservices.h"
 #include "misc/statusmessage.h"
 
@@ -14,10 +14,10 @@
 
 using namespace swift::misc;
 using namespace swift::misc::simulation;
-using namespace BlackGui::Models;
-using namespace BlackGui::Views;
+using namespace swift::gui::models;
+using namespace swift::gui::views;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CDbReduceModelDuplicates::CDbReduceModelDuplicates(QWidget *parent) : QDialog(parent),
                                                                           ui(new Ui::CDbReduceModelDuplicates)
diff --git a/src/blackgui/components/dbreducemodelduplicates.h b/src/gui/components/dbreducemodelduplicates.h
similarity index 93%
rename from src/blackgui/components/dbreducemodelduplicates.h
rename to src/gui/components/dbreducemodelduplicates.h
index 907ac23c3..55e7b0967 100644
--- a/src/blackgui/components/dbreducemodelduplicates.h
+++ b/src/gui/components/dbreducemodelduplicates.h
@@ -3,8 +3,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_DBREDUCEMODELDUPLICATES_H
-#define BLACKGUI_COMPONENTS_DBREDUCEMODELDUPLICATES_H
+#ifndef SWIFT_GUI_COMPONENTS_DBREDUCEMODELDUPLICATES_H
+#define SWIFT_GUI_COMPONENTS_DBREDUCEMODELDUPLICATES_H
 
 #include "core/progress.h"
 #include "misc/simulation/aircraftmodellist.h"
@@ -18,7 +18,7 @@ namespace Ui
 {
     class CDbReduceModelDuplicates;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! Reduce modelss
     class CDbReduceModelDuplicates :
diff --git a/src/blackgui/components/dbreducemodelduplicates.ui b/src/gui/components/dbreducemodelduplicates.ui
similarity index 94%
rename from src/blackgui/components/dbreducemodelduplicates.ui
rename to src/gui/components/dbreducemodelduplicates.ui
index fc277bacb..3b8e0df64 100644
--- a/src/blackgui/components/dbreducemodelduplicates.ui
+++ b/src/gui/components/dbreducemodelduplicates.ui
@@ -15,7 +15,7 @@
   </property>
   <layout class="QVBoxLayout" name="vl_ReduceModelDuplicate" stretch="1,0">
    <item>
-    <widget class="BlackGui::COverlayMessagesFrame" name="fr_Overlay">
+    <widget class="swift::gui::COverlayMessagesFrame" name="fr_Overlay">
      <layout class="QVBoxLayout" name="vl_OverlayFrame" stretch="0,1">
       <property name="leftMargin">
        <number>2</number>
@@ -157,7 +157,7 @@
         </property>
         <layout class="QVBoxLayout" name="vl_RemoveModels">
          <item>
-          <widget class="BlackGui::Views::CAircraftModelView" name="tvp_RemoveModels">
+          <widget class="swift::gui::views::CAircraftModelView" name="tvp_RemoveModels">
            <property name="selectionBehavior">
             <enum>QAbstractItemView::SelectRows</enum>
            </property>
@@ -186,14 +186,14 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Views::CAircraftModelView</class>
+   <class>swift::gui::views::CAircraftModelView</class>
    <extends>QTableView</extends>
-   <header>blackgui/views/aircraftmodelview.h</header>
+   <header>gui/views/aircraftmodelview.h</header>
   </customwidget>
   <customwidget>
-   <class>BlackGui::COverlayMessagesFrame</class>
+   <class>swift::gui::COverlayMessagesFrame</class>
    <extends>QFrame</extends>
-   <header>blackgui/overlaymessagesframe.h</header>
+   <header>gui/overlaymessagesframe.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/dbstashcomponent.cpp b/src/gui/components/dbstashcomponent.cpp
similarity index 98%
rename from src/blackgui/components/dbstashcomponent.cpp
rename to src/gui/components/dbstashcomponent.cpp
index 239813559..983da1228 100644
--- a/src/blackgui/components/dbstashcomponent.cpp
+++ b/src/gui/components/dbstashcomponent.cpp
@@ -1,12 +1,12 @@
 // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/dbmappingcomponent.h"
-#include "blackgui/components/dbstashcomponent.h"
-#include "blackgui/views/aircraftmodelview.h"
-#include "blackgui/views/viewbase.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/models/aircraftmodellistmodel.h"
+#include "gui/components/dbmappingcomponent.h"
+#include "gui/components/dbstashcomponent.h"
+#include "gui/views/aircraftmodelview.h"
+#include "gui/views/viewbase.h"
+#include "gui/guiapplication.h"
+#include "gui/models/aircraftmodellistmodel.h"
 #include "core/db/databasewriter.h"
 #include "core/db/databaseutils.h"
 #include "core/application.h"
@@ -35,11 +35,11 @@ using namespace swift::misc;
 using namespace swift::misc::simulation;
 using namespace swift::misc::aviation;
 using namespace swift::misc::network;
-using namespace BlackGui;
-using namespace BlackGui::Models;
-using namespace BlackGui::Views;
+using namespace swift::gui;
+using namespace swift::gui::models;
+using namespace swift::gui::views;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CDbStashComponent::CDbStashComponent(QWidget *parent) : QFrame(parent),
                                                             CDbMappingComponentAware(parent),
diff --git a/src/blackgui/components/dbstashcomponent.h b/src/gui/components/dbstashcomponent.h
similarity index 95%
rename from src/blackgui/components/dbstashcomponent.h
rename to src/gui/components/dbstashcomponent.h
index cc5189746..93e1e7c10 100644
--- a/src/blackgui/components/dbstashcomponent.h
+++ b/src/gui/components/dbstashcomponent.h
@@ -3,12 +3,12 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_DBSTASHCOMPONENT_H
-#define BLACKGUI_COMPONENTS_DBSTASHCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_DBSTASHCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_DBSTASHCOMPONENT_H
 
-#include "blackgui/components/dbmappingcomponentaware.h"
-#include "blackgui/enablefordockwidgetinfoarea.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/components/dbmappingcomponentaware.h"
+#include "gui/enablefordockwidgetinfoarea.h"
+#include "gui/swiftguiexport.h"
 #include "core/data/authenticateduser.h"
 #include "misc/aviation/airlineicaocode.h"
 #include "misc/propertyindexvariantmap.h"
@@ -42,18 +42,18 @@ namespace Ui
 {
     class CDbStashComponent;
 }
-namespace BlackGui
+namespace swift::gui
 {
-    namespace Views
+    namespace views
     {
         class CAircraftModelView;
     }
-    namespace Components
+    namespace components
     {
         /*!
          * Stashed objects
          */
-        class BLACKGUI_EXPORT CDbStashComponent :
+        class SWIFT_GUI_EXPORT CDbStashComponent :
             public QFrame,
             public CDbMappingComponentAware,
             public CEnableForDockWidgetInfoArea
@@ -83,7 +83,7 @@ namespace BlackGui
             int unstashModels(const swift::misc::simulation::CAircraftModelList &models);
 
             //! The embedded view
-            BlackGui::Views::CAircraftModelView *view() const;
+            swift::gui::views::CAircraftModelView *view() const;
 
             //! Has stashed models
             bool hasStashedModels() const;
diff --git a/src/blackgui/components/dbstashcomponent.ui b/src/gui/components/dbstashcomponent.ui
similarity index 96%
rename from src/blackgui/components/dbstashcomponent.ui
rename to src/gui/components/dbstashcomponent.ui
index f5fa7bd4b..2c5cd6aef 100644
--- a/src/blackgui/components/dbstashcomponent.ui
+++ b/src/gui/components/dbstashcomponent.ui
@@ -27,7 +27,7 @@
     <number>0</number>
    </property>
    <item>
-    <widget class="BlackGui::Views::CAircraftModelView" name="tvp_StashAircraftModels">
+    <widget class="swift::gui::views::CAircraftModelView" name="tvp_StashAircraftModels">
      <property name="selectionBehavior">
       <enum>QAbstractItemView::SelectRows</enum>
      </property>
@@ -197,9 +197,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Views::CAircraftModelView</class>
+   <class>swift::gui::views::CAircraftModelView</class>
    <extends>QTableView</extends>
-   <header>blackgui/views/aircraftmodelview.h</header>
+   <header>gui/views/aircraftmodelview.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/blackgui/components/dbusserveraddressselector.cpp b/src/gui/components/dbusserveraddressselector.cpp
similarity index 98%
rename from src/blackgui/components/dbusserveraddressselector.cpp
rename to src/gui/components/dbusserveraddressselector.cpp
index 8f08fb0ed..e8df23cd9 100644
--- a/src/blackgui/components/dbusserveraddressselector.cpp
+++ b/src/gui/components/dbusserveraddressselector.cpp
@@ -3,7 +3,7 @@
 
 #include "dbusserveraddressselector.h"
 #include "ui_dbusserveraddressselector.h"
-#include "blackgui/guiapplication.h"
+#include "gui/guiapplication.h"
 #include "misc/network/networkutils.h"
 #include "misc/dbusserver.h"
 #include "config/buildconfig.h"
@@ -14,7 +14,7 @@ using namespace swift::config;
 using namespace swift::misc;
 using namespace swift::misc::network;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CDBusServerAddressSelector::CDBusServerAddressSelector(QWidget *parent) : QFrame(parent),
                                                                               ui(new Ui::CDBusServerAddressSelector)
diff --git a/src/blackgui/components/dbusserveraddressselector.h b/src/gui/components/dbusserveraddressselector.h
similarity index 85%
rename from src/blackgui/components/dbusserveraddressselector.h
rename to src/gui/components/dbusserveraddressselector.h
index 4d46b8c95..9e4240dbd 100644
--- a/src/blackgui/components/dbusserveraddressselector.h
+++ b/src/gui/components/dbusserveraddressselector.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_DBUSSERVERADDRESSSELECTOR_H
-#define BLACKGUI_COMPONENTS_DBUSSERVERADDRESSSELECTOR_H
+#ifndef SWIFT_GUI_COMPONENTS_DBUSSERVERADDRESSSELECTOR_H
+#define SWIFT_GUI_COMPONENTS_DBUSSERVERADDRESSSELECTOR_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include <QFrame>
 #include <QScopedPointer>
 
@@ -14,10 +14,10 @@ namespace Ui
 {
     class CDBusServerAddressSelector;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! Select DBus address such as session P2P, ...
-    class BLACKGUI_EXPORT CDBusServerAddressSelector : public QFrame
+    class SWIFT_GUI_EXPORT CDBusServerAddressSelector : public QFrame
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/dbusserveraddressselector.ui b/src/gui/components/dbusserveraddressselector.ui
similarity index 100%
rename from src/blackgui/components/dbusserveraddressselector.ui
rename to src/gui/components/dbusserveraddressselector.ui
diff --git a/src/blackgui/components/distributorpreferencescomponent.cpp b/src/gui/components/distributorpreferencescomponent.cpp
similarity index 93%
rename from src/blackgui/components/distributorpreferencescomponent.cpp
rename to src/gui/components/distributorpreferencescomponent.cpp
index 19f0fd778..59c74ecf3 100644
--- a/src/blackgui/components/distributorpreferencescomponent.cpp
+++ b/src/gui/components/distributorpreferencescomponent.cpp
@@ -2,14 +2,14 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "core/webdataservices.h"
-#include "blackgui/components/distributorpreferencescomponent.h"
-#include "blackgui/components/simulatorselector.h"
-#include "blackgui/views/distributorview.h"
-#include "blackgui/views/viewbase.h"
-#include "blackgui/models/distributorlistmodel.h"
-#include "blackgui/overlaymessagesframe.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/guiutility.h"
+#include "gui/components/distributorpreferencescomponent.h"
+#include "gui/components/simulatorselector.h"
+#include "gui/views/distributorview.h"
+#include "gui/views/viewbase.h"
+#include "gui/models/distributorlistmodel.h"
+#include "gui/overlaymessagesframe.h"
+#include "gui/guiapplication.h"
+#include "gui/guiutility.h"
 #include "misc/simulation/data/modelcaches.h"
 #include "misc/simulation/aircraftmodellist.h"
 #include "misc/simulation/distributor.h"
@@ -30,10 +30,10 @@ using namespace swift::misc;
 using namespace swift::misc::simulation;
 using namespace swift::misc::simulation::data;
 using namespace swift::misc::network;
-using namespace BlackGui::Views;
-using namespace BlackGui::Models;
+using namespace swift::gui::views;
+using namespace swift::gui::models;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CDistributorPreferencesComponent::CDistributorPreferencesComponent(QWidget *parent) : COverlayMessagesFrame(parent),
                                                                                           ui(new Ui::CDistributorPreferencesComponent)
diff --git a/src/blackgui/components/distributorpreferencescomponent.h b/src/gui/components/distributorpreferencescomponent.h
similarity index 90%
rename from src/blackgui/components/distributorpreferencescomponent.h
rename to src/gui/components/distributorpreferencescomponent.h
index b1ee90c17..d824e3c9b 100644
--- a/src/blackgui/components/distributorpreferencescomponent.h
+++ b/src/gui/components/distributorpreferencescomponent.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_DISTRIBUTORPREFERENCESCOMPONENT_H
-#define BLACKGUI_COMPONENTS_DISTRIBUTORPREFERENCESCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_DISTRIBUTORPREFERENCESCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_DISTRIBUTORPREFERENCESCOMPONENT_H
 
-#include "blackgui/overlaymessagesframe.h"
+#include "gui/overlaymessagesframe.h"
 #include "misc/simulation/settings/modelsettings.h"
 #include "misc/simulation/simulatorinfo.h"
 #include "misc/settingscache.h"
@@ -18,11 +18,11 @@ namespace Ui
 {
     class CDistributorPreferencesComponent;
 }
-namespace BlackGui
+namespace swift::gui
 {
     class COverlayMessagesFrame;
 
-    namespace Components
+    namespace components
     {
         /*!
          * Set and order distributors (to be used for model set)
diff --git a/src/blackgui/components/distributorpreferencescomponent.ui b/src/gui/components/distributorpreferencescomponent.ui
similarity index 88%
rename from src/blackgui/components/distributorpreferencescomponent.ui
rename to src/gui/components/distributorpreferencescomponent.ui
index ef06d6ce2..bf0c0eeac 100644
--- a/src/blackgui/components/distributorpreferencescomponent.ui
+++ b/src/gui/components/distributorpreferencescomponent.ui
@@ -36,7 +36,7 @@
     <number>0</number>
    </property>
    <item>
-    <widget class="BlackGui::Views::CDistributorView" name="tvp_Distributors">
+    <widget class="swift::gui::views::CDistributorView" name="tvp_Distributors">
      <property name="dragEnabled">
       <bool>true</bool>
      </property>
@@ -67,7 +67,7 @@
      </property>
      <layout class="QHBoxLayout" name="horizontalLayout">
       <item>
-       <widget class="BlackGui::Components::CSimulatorSelector" name="comp_SimulatorSelector">
+       <widget class="swift::gui::components::CSimulatorSelector" name="comp_SimulatorSelector">
         <property name="frameShape">
          <enum>QFrame::StyledPanel</enum>
         </property>
@@ -111,14 +111,14 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Views::CDistributorView</class>
+   <class>swift::gui::views::CDistributorView</class>
    <extends>QTableView</extends>
-   <header>blackgui/views/distributorview.h</header>
+   <header>gui/views/distributorview.h</header>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CSimulatorSelector</class>
+   <class>swift::gui::components::CSimulatorSelector</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/simulatorselector.h</header>
+   <header>gui/components/simulatorselector.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/downloadcomponent.cpp b/src/gui/components/downloadcomponent.cpp
similarity index 99%
rename from src/blackgui/components/downloadcomponent.cpp
rename to src/gui/components/downloadcomponent.cpp
index e8a2a3bc9..ddbe06206 100644
--- a/src/blackgui/components/downloadcomponent.cpp
+++ b/src/gui/components/downloadcomponent.cpp
@@ -3,8 +3,8 @@
 
 #include "downloadcomponent.h"
 #include "ui_downloadcomponent.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/overlaymessagesframe.h"
+#include "gui/guiapplication.h"
+#include "gui/overlaymessagesframe.h"
 #include "misc/simulation/xplane/xplaneutil.h"
 #include "misc/logmessage.h"
 #include "misc/directoryutils.h"
@@ -25,7 +25,7 @@ using namespace swift::misc::db;
 using namespace swift::misc::network;
 using namespace swift::misc::simulation;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CDownloadComponent::CDownloadComponent(QWidget *parent) : COverlayMessagesFrame(parent),
                                                               CLoadIndicatorEnabled(this),
diff --git a/src/blackgui/components/downloadcomponent.h b/src/gui/components/downloadcomponent.h
similarity index 88%
rename from src/blackgui/components/downloadcomponent.h
rename to src/gui/components/downloadcomponent.h
index f53ba4ad8..08692aec6 100644
--- a/src/blackgui/components/downloadcomponent.h
+++ b/src/gui/components/downloadcomponent.h
@@ -3,12 +3,12 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_DOWNLOADCOMPONENT_H
-#define BLACKGUI_COMPONENTS_DOWNLOADCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_DOWNLOADCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_DOWNLOADCOMPONENT_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/overlaymessagesframe.h"
-#include "blackgui/loadindicator.h"
+#include "gui/swiftguiexport.h"
+#include "gui/overlaymessagesframe.h"
+#include "gui/loadindicator.h"
 #include "misc/network/remotefilelist.h"
 
 #include <QNetworkReply>
@@ -21,12 +21,12 @@ namespace Ui
 {
     class CDownloadComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Download a file
      */
-    class BLACKGUI_EXPORT CDownloadComponent :
+    class SWIFT_GUI_EXPORT CDownloadComponent :
         public COverlayMessagesFrame,
         public CLoadIndicatorEnabled
     {
@@ -133,8 +133,8 @@ namespace BlackGui::Components
     };
 } // ns
 
-Q_DECLARE_METATYPE(BlackGui::Components::CDownloadComponent::Mode)
-Q_DECLARE_METATYPE(BlackGui::Components::CDownloadComponent::ModeFlag)
-Q_DECLARE_OPERATORS_FOR_FLAGS(BlackGui::Components::CDownloadComponent::Mode)
+Q_DECLARE_METATYPE(swift::gui::components::CDownloadComponent::Mode)
+Q_DECLARE_METATYPE(swift::gui::components::CDownloadComponent::ModeFlag)
+Q_DECLARE_OPERATORS_FOR_FLAGS(swift::gui::components::CDownloadComponent::Mode)
 
 #endif // guard
diff --git a/src/blackgui/components/downloadcomponent.ui b/src/gui/components/downloadcomponent.ui
similarity index 100%
rename from src/blackgui/components/downloadcomponent.ui
rename to src/gui/components/downloadcomponent.ui
diff --git a/src/blackgui/components/downloaddialog.cpp b/src/gui/components/downloaddialog.cpp
similarity index 98%
rename from src/blackgui/components/downloaddialog.cpp
rename to src/gui/components/downloaddialog.cpp
index 11c26c86b..ceee2b821 100644
--- a/src/blackgui/components/downloaddialog.cpp
+++ b/src/gui/components/downloaddialog.cpp
@@ -7,7 +7,7 @@
 
 using namespace swift::misc::network;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CDownloadDialog::CDownloadDialog(QWidget *parent) : QDialog(parent),
                                                         ui(new Ui::CDownloadDialog)
diff --git a/src/blackgui/components/downloaddialog.h b/src/gui/components/downloaddialog.h
similarity index 83%
rename from src/blackgui/components/downloaddialog.h
rename to src/gui/components/downloaddialog.h
index ab0e6f060..3e8e5b519 100644
--- a/src/blackgui/components/downloaddialog.h
+++ b/src/gui/components/downloaddialog.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_DOWNLOADDIALOG_H
-#define BLACKGUI_COMPONENTS_DOWNLOADDIALOG_H
+#ifndef SWIFT_GUI_COMPONENTS_DOWNLOADDIALOG_H
+#define SWIFT_GUI_COMPONENTS_DOWNLOADDIALOG_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/components/downloadcomponent.h"
+#include "gui/swiftguiexport.h"
+#include "gui/components/downloadcomponent.h"
 
 #include <QDialog>
 #include <QScopedPointer>
@@ -21,12 +21,12 @@ namespace swift::misc::network
     class CRemoteFile;
     class CRemoteFileList;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * CDownloadComponent as dialog
      */
-    class BLACKGUI_EXPORT CDownloadDialog : public QDialog
+    class SWIFT_GUI_EXPORT CDownloadDialog : public QDialog
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/downloaddialog.ui b/src/gui/components/downloaddialog.ui
similarity index 88%
rename from src/blackgui/components/downloaddialog.ui
rename to src/gui/components/downloaddialog.ui
index 189ad2f18..05ab9f300 100644
--- a/src/blackgui/components/downloaddialog.ui
+++ b/src/gui/components/downloaddialog.ui
@@ -19,7 +19,7 @@
     <number>6</number>
    </property>
    <item>
-    <widget class="BlackGui::Components::CDownloadComponent" name="comp_Download"/>
+    <widget class="swift::gui::components::CDownloadComponent" name="comp_Download"/>
    </item>
    <item>
     <widget class="QDialogButtonBox" name="bb_DownloadDialog">
@@ -38,9 +38,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CDownloadComponent</class>
+   <class>swift::gui::components::CDownloadComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/downloadcomponent.h</header>
+   <header>gui/components/downloadcomponent.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/firstmodelsetcomponent.cpp b/src/gui/components/firstmodelsetcomponent.cpp
similarity index 97%
rename from src/blackgui/components/firstmodelsetcomponent.cpp
rename to src/gui/components/firstmodelsetcomponent.cpp
index cfc837c9f..f9f3cfe11 100644
--- a/src/blackgui/components/firstmodelsetcomponent.cpp
+++ b/src/gui/components/firstmodelsetcomponent.cpp
@@ -1,15 +1,15 @@
 // SPDX-FileCopyrightText: Copyright (C) 2018 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/firstmodelsetcomponent.h"
-#include "blackgui/components/dbownmodelsdialog.h"
-#include "blackgui/components/dbownmodelscomponent.h"
-#include "blackgui/components/dbownmodelsetdialog.h"
-#include "blackgui/components/dbownmodelsetcomponent.h"
+#include "gui/components/firstmodelsetcomponent.h"
+#include "gui/components/dbownmodelsdialog.h"
+#include "gui/components/dbownmodelscomponent.h"
+#include "gui/components/dbownmodelsetdialog.h"
+#include "gui/components/dbownmodelsetcomponent.h"
 #include "ui_firstmodelsetcomponent.h"
 
-#include "blackgui/views/distributorview.h"
-#include "blackgui/guiapplication.h"
+#include "gui/views/distributorview.h"
+#include "gui/guiapplication.h"
 #include "core/webdataservices.h"
 #include "misc/directoryutils.h"
 #include "misc/verify.h"
@@ -25,7 +25,7 @@ using namespace swift::misc;
 using namespace swift::misc::simulation;
 using namespace swift::misc::simulation::settings;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     const QStringList &CFirstModelSetComponent::getLogCategories()
     {
diff --git a/src/blackgui/components/firstmodelsetcomponent.h b/src/gui/components/firstmodelsetcomponent.h
similarity index 93%
rename from src/blackgui/components/firstmodelsetcomponent.h
rename to src/gui/components/firstmodelsetcomponent.h
index 3827cc002..8dc4de2e9 100644
--- a/src/blackgui/components/firstmodelsetcomponent.h
+++ b/src/gui/components/firstmodelsetcomponent.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_FIRSTMODELSETCOMPONENT_H
-#define BLACKGUI_COMPONENTS_FIRSTMODELSETCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_FIRSTMODELSETCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_FIRSTMODELSETCOMPONENT_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/overlaymessagesframe.h"
+#include "gui/swiftguiexport.h"
+#include "gui/overlaymessagesframe.h"
 #include "core/application/applicationsettings.h"
 #include "misc/simulation/settings/simulatorsettings.h"
 #include "misc/simulation/aircraftmodelloader.h"
@@ -20,7 +20,7 @@ namespace Ui
 {
     class CFirstModelSetComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     class CDbOwnModelsDialog;
     class CDbOwnModelsComponent;
diff --git a/src/blackgui/components/firstmodelsetcomponent.ui b/src/gui/components/firstmodelsetcomponent.ui
similarity index 95%
rename from src/blackgui/components/firstmodelsetcomponent.ui
rename to src/gui/components/firstmodelsetcomponent.ui
index 297dfa476..34b6c6912 100644
--- a/src/blackgui/components/firstmodelsetcomponent.ui
+++ b/src/gui/components/firstmodelsetcomponent.ui
@@ -77,7 +77,7 @@
            </property>
            <layout class="QHBoxLayout" name="hl_Simulator">
             <item alignment="Qt::AlignLeft">
-             <widget class="BlackGui::Components::CSimulatorSelector" name="comp_SimulatorSelector">
+             <widget class="swift::gui::components::CSimulatorSelector" name="comp_SimulatorSelector">
               <property name="minimumSize">
                <size>
                 <width>100</width>
@@ -242,7 +242,7 @@
         </property>
         <layout class="QVBoxLayout" name="vl_Distributors">
          <item>
-          <widget class="BlackGui::Components::CDbDistributorComponent" name="comp_Distributors"/>
+          <widget class="swift::gui::components::CDbDistributorComponent" name="comp_Distributors"/>
          </item>
         </layout>
        </widget>
@@ -254,15 +254,15 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CSimulatorSelector</class>
+   <class>swift::gui::components::CSimulatorSelector</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/simulatorselector.h</header>
+   <header>gui/components/simulatorselector.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CDbDistributorComponent</class>
+   <class>swift::gui::components::CDbDistributorComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/dbdistributorcomponent.h</header>
+   <header>gui/components/dbdistributorcomponent.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/firstmodelsetdialog.cpp b/src/gui/components/firstmodelsetdialog.cpp
similarity index 94%
rename from src/blackgui/components/firstmodelsetdialog.cpp
rename to src/gui/components/firstmodelsetdialog.cpp
index c8fdd96a3..4f320347a 100644
--- a/src/blackgui/components/firstmodelsetdialog.cpp
+++ b/src/gui/components/firstmodelsetdialog.cpp
@@ -4,7 +4,7 @@
 #include "firstmodelsetdialog.h"
 #include "ui_firstmodelsetdialog.h"
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CFirstModelSetDialog::CFirstModelSetDialog(QWidget *parent) : QDialog(parent),
                                                                   ui(new Ui::CFirstModelSetDialog)
diff --git a/src/blackgui/components/firstmodelsetdialog.h b/src/gui/components/firstmodelsetdialog.h
similarity index 82%
rename from src/blackgui/components/firstmodelsetdialog.h
rename to src/gui/components/firstmodelsetdialog.h
index ebe8efd04..6d618d295 100644
--- a/src/blackgui/components/firstmodelsetdialog.h
+++ b/src/gui/components/firstmodelsetdialog.h
@@ -3,8 +3,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_FIRSTMODELSETDIALOG_H
-#define BLACKGUI_COMPONENTS_FIRSTMODELSETDIALOG_H
+#ifndef SWIFT_GUI_COMPONENTS_FIRSTMODELSETDIALOG_H
+#define SWIFT_GUI_COMPONENTS_FIRSTMODELSETDIALOG_H
 
 #include <QDialog>
 #include <QScopedPointer>
@@ -13,7 +13,7 @@ namespace Ui
 {
     class CFirstModelSetDialog;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * First model set dialog
diff --git a/src/blackgui/components/firstmodelsetdialog.ui b/src/gui/components/firstmodelsetdialog.ui
similarity index 89%
rename from src/blackgui/components/firstmodelsetdialog.ui
rename to src/gui/components/firstmodelsetdialog.ui
index 8c5b3fdd0..b6fbe90f1 100644
--- a/src/blackgui/components/firstmodelsetdialog.ui
+++ b/src/gui/components/firstmodelsetdialog.ui
@@ -15,7 +15,7 @@
   </property>
   <layout class="QVBoxLayout" name="vl_FirstModelSet">
    <item>
-    <widget class="BlackGui::Components::CFirstModelSetComponent" name="comp_FirstModelSet">
+    <widget class="swift::gui::components::CFirstModelSetComponent" name="comp_FirstModelSet">
      <property name="frameShape">
       <enum>QFrame::StyledPanel</enum>
      </property>
@@ -38,9 +38,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CFirstModelSetComponent</class>
+   <class>swift::gui::components::CFirstModelSetComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/firstmodelsetcomponent.h</header>
+   <header>gui/components/firstmodelsetcomponent.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/flightplancomponent.cpp b/src/gui/components/flightplancomponent.cpp
similarity index 99%
rename from src/blackgui/components/flightplancomponent.cpp
rename to src/gui/components/flightplancomponent.cpp
index 23454aefd..4686a358f 100644
--- a/src/blackgui/components/flightplancomponent.cpp
+++ b/src/gui/components/flightplancomponent.cpp
@@ -2,13 +2,13 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "flightplancomponent.h"
-#include "blackgui/components/altitudedialog.h"
-#include "blackgui/components/stringlistdialog.h"
-#include "blackgui/components/simbriefdownloaddialog.h"
-#include "blackgui/components/selcalcodeselector.h"
-#include "blackgui/uppercasevalidator.h"
-#include "blackgui/eventfilter.h"
-#include "blackgui/guiapplication.h"
+#include "gui/components/altitudedialog.h"
+#include "gui/components/stringlistdialog.h"
+#include "gui/components/simbriefdownloaddialog.h"
+#include "gui/components/selcalcodeselector.h"
+#include "gui/uppercasevalidator.h"
+#include "gui/eventfilter.h"
+#include "gui/guiapplication.h"
 #include "core/context/contextnetwork.h"
 #include "core/context/contextownaircraft.h"
 #include "core/context/contextsimulator.h"
@@ -56,11 +56,11 @@ using namespace swift::misc::aviation;
 using namespace swift::misc::network;
 using namespace swift::misc::simulation;
 using namespace swift::misc::physical_quantities;
-using namespace BlackGui;
+using namespace swift::gui;
 using namespace swift::core;
 using namespace swift::config;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CFlightPlanComponent::CFlightPlanComponent(QWidget *parent) : COverlayMessagesTabWidget(parent),
                                                                   ui(new Ui::CFlightPlanComponent)
diff --git a/src/blackgui/components/flightplancomponent.h b/src/gui/components/flightplancomponent.h
similarity index 97%
rename from src/blackgui/components/flightplancomponent.h
rename to src/gui/components/flightplancomponent.h
index 50982cc7c..0cfc3a797 100644
--- a/src/blackgui/components/flightplancomponent.h
+++ b/src/gui/components/flightplancomponent.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_FLIGHTPLANCOMPONENT_H
-#define BLACKGUI_COMPONENTS_FLIGHTPLANCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_FLIGHTPLANCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_FLIGHTPLANCOMPONENT_H
 
-#include "blackgui/overlaymessagesframe.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/overlaymessagesframe.h"
+#include "gui/swiftguiexport.h"
 #include "misc/simulation/data/lastmodel.h"
 #include "misc/simulation/simulatedaircraft.h"
 #include "misc/aviation/flightplan.h"
@@ -35,7 +35,7 @@ namespace Ui
 {
     class CFlightPlanComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     namespace FlightPlanSettings
     {
@@ -73,7 +73,7 @@ namespace BlackGui::Components
     class CSimBriefDownloadDialog;
 
     //! Flight plan widget
-    class BLACKGUI_EXPORT CFlightPlanComponent : public COverlayMessagesTabWidget
+    class SWIFT_GUI_EXPORT CFlightPlanComponent : public COverlayMessagesTabWidget
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/flightplancomponent.ui b/src/gui/components/flightplancomponent.ui
similarity index 99%
rename from src/blackgui/components/flightplancomponent.ui
rename to src/gui/components/flightplancomponent.ui
index 9ac5e51b3..87dec2076 100644
--- a/src/blackgui/components/flightplancomponent.ui
+++ b/src/gui/components/flightplancomponent.ui
@@ -230,7 +230,7 @@
           <item row="5" column="3">
            <layout class="QGridLayout" name="gl_CruiseAltitude">
             <item row="0" column="0">
-             <widget class="BlackGui::CAltitudeEdit" name="lep_CrusingAltitude"/>
+             <widget class="swift::gui::CAltitudeEdit" name="lep_CrusingAltitude"/>
             </item>
             <item row="0" column="1">
              <widget class="QToolButton" name="tb_AltitudeDialog">
@@ -1079,7 +1079,7 @@
            </widget>
           </item>
           <item row="7" column="1">
-           <widget class="BlackGui::Components::CSelcalCodeSelector" name="frp_SelcalCode"/>
+           <widget class="swift::gui::components::CSelcalCodeSelector" name="frp_SelcalCode"/>
           </item>
           <item row="5" column="0">
            <widget class="QLabel" name="lbl_VoiceCapabilities">
@@ -1109,15 +1109,15 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CSelcalCodeSelector</class>
+   <class>swift::gui::components::CSelcalCodeSelector</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/selcalcodeselector.h</header>
+   <header>gui/components/selcalcodeselector.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::CAltitudeEdit</class>
+   <class>swift::gui::CAltitudeEdit</class>
    <extends>QLineEdit</extends>
-   <header>blackgui/altitudeedit.h</header>
+   <header>gui/altitudeedit.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/blackgui/components/hotkeydialog.cpp b/src/gui/components/hotkeydialog.cpp
similarity index 98%
rename from src/blackgui/components/hotkeydialog.cpp
rename to src/gui/components/hotkeydialog.cpp
index 6f496e292..5515c0e2c 100644
--- a/src/blackgui/components/hotkeydialog.cpp
+++ b/src/gui/components/hotkeydialog.cpp
@@ -1,9 +1,9 @@
 // SPDX-FileCopyrightText: Copyright (C) 2014 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/hotkeydialog.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/stylesheetutility.h"
+#include "gui/components/hotkeydialog.h"
+#include "gui/guiapplication.h"
+#include "gui/stylesheetutility.h"
 #include "core/context/contextapplication.h"
 #include "core/inputmanager.h"
 #include "misc/icons.h"
@@ -35,9 +35,9 @@
 using namespace swift::misc;
 using namespace swift::misc::input;
 using namespace swift::core;
-using namespace BlackGui::Models;
+using namespace swift::gui::models;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CHotkeyDialog::CHotkeyDialog(const CActionHotkey &actionHotkey, const CIdentifierList &identifiers, QWidget *parent) : QDialog(parent),
                                                                                                                            ui(new Ui::CHotkeyDialog),
diff --git a/src/blackgui/components/hotkeydialog.h b/src/gui/components/hotkeydialog.h
similarity index 88%
rename from src/blackgui/components/hotkeydialog.h
rename to src/gui/components/hotkeydialog.h
index 537cea691..d409abbc3 100644
--- a/src/blackgui/components/hotkeydialog.h
+++ b/src/gui/components/hotkeydialog.h
@@ -3,12 +3,12 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_HOTKEYDIALOG_H
-#define BLACKGUI_COMPONENTS_HOTKEYDIALOG_H
+#ifndef SWIFT_GUI_COMPONENTS_HOTKEYDIALOG_H
+#define SWIFT_GUI_COMPONENTS_HOTKEYDIALOG_H
 
-#include "blackgui/models/actionmodel.h"
-#include "blackgui/horizontalcombobox.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/models/actionmodel.h"
+#include "gui/horizontalcombobox.h"
+#include "gui/swiftguiexport.h"
 #include "misc/input/actionhotkey.h"
 #include "misc/identifierlist.h"
 
@@ -31,12 +31,12 @@ namespace swift::misc::input
     class CHotkeyCombination;
     class CKeyboardKeyList;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * ComboBox for selecting keyboard keys
      */
-    class BLACKGUI_EXPORT CKeySelectionBox : public CHorizontalComboBox
+    class SWIFT_GUI_EXPORT CKeySelectionBox : public CHorizontalComboBox
     {
         Q_OBJECT
 
@@ -60,7 +60,7 @@ namespace BlackGui::Components
     /*!
      * Hotkey dialog
      */
-    class BLACKGUI_EXPORT CHotkeyDialog : public QDialog
+    class SWIFT_GUI_EXPORT CHotkeyDialog : public QDialog
     {
         Q_OBJECT
 
@@ -109,7 +109,7 @@ namespace BlackGui::Components
 
         QScopedPointer<Ui::CHotkeyDialog> ui;
         swift::misc::input::CActionHotkey m_actionHotkey;
-        BlackGui::Models::CActionModel m_actionModel;
+        swift::gui::models::CActionModel m_actionModel;
 
         //! "No key/button"
         static const QString &noKeyButton();
diff --git a/src/blackgui/components/hotkeydialog.ui b/src/gui/components/hotkeydialog.ui
similarity index 100%
rename from src/blackgui/components/hotkeydialog.ui
rename to src/gui/components/hotkeydialog.ui
diff --git a/src/blackgui/components/infobarstatuscomponent.cpp b/src/gui/components/infobarstatuscomponent.cpp
similarity index 97%
rename from src/blackgui/components/infobarstatuscomponent.cpp
rename to src/gui/components/infobarstatuscomponent.cpp
index ec0377600..781c19491 100644
--- a/src/blackgui/components/infobarstatuscomponent.cpp
+++ b/src/gui/components/infobarstatuscomponent.cpp
@@ -1,11 +1,11 @@
 // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/infobarstatuscomponent.h"
-#include "blackgui/components/transpondermodecomponent.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/led.h"
-#include "blackgui/guiutility.h"
+#include "gui/components/infobarstatuscomponent.h"
+#include "gui/components/transpondermodecomponent.h"
+#include "gui/guiapplication.h"
+#include "gui/led.h"
+#include "gui/guiutility.h"
 #include "core/context/contextapplication.h"
 #include "core/context/contextaudio.h"
 #include "core/context/contextnetwork.h"
@@ -31,12 +31,12 @@
 using namespace swift::config;
 using namespace swift::core;
 using namespace swift::core::context;
-using namespace BlackGui;
+using namespace swift::gui;
 using namespace swift::misc;
 using namespace swift::misc::audio;
 using namespace swift::misc::network;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CInfoBarStatusComponent::CInfoBarStatusComponent(QWidget *parent) : QFrame(parent), ui(new Ui::CInfoBarStatusComponent)
     {
diff --git a/src/blackgui/components/infobarstatuscomponent.h b/src/gui/components/infobarstatuscomponent.h
similarity index 92%
rename from src/blackgui/components/infobarstatuscomponent.h
rename to src/gui/components/infobarstatuscomponent.h
index aa6da397b..148067ab6 100644
--- a/src/blackgui/components/infobarstatuscomponent.h
+++ b/src/gui/components/infobarstatuscomponent.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_INFOBARSTATUSCOMPONENT_H
-#define BLACKGUI_INFOBARSTATUSCOMPONENT_H
+#ifndef SWIFT_GUI_INFOBARSTATUSCOMPONENT_H
+#define SWIFT_GUI_INFOBARSTATUSCOMPONENT_H
 
 #include "core/actionbind.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 
 #include "misc/audio/audiodeviceinfo.h"
 #include "misc/input/actionhotkeydefs.h"
@@ -24,10 +24,10 @@ namespace Ui
 {
     class CInfoBarStatusComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! Info bar displaying status (Network, Simulator, DBus)
-    class BLACKGUI_EXPORT CInfoBarStatusComponent : public QFrame
+    class SWIFT_GUI_EXPORT CInfoBarStatusComponent : public QFrame
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/infobarstatuscomponent.ui b/src/gui/components/infobarstatuscomponent.ui
similarity index 85%
rename from src/blackgui/components/infobarstatuscomponent.ui
rename to src/gui/components/infobarstatuscomponent.ui
index 1145731c3..e3bb0c241 100644
--- a/src/blackgui/components/infobarstatuscomponent.ui
+++ b/src/gui/components/infobarstatuscomponent.ui
@@ -36,7 +36,7 @@
     <number>0</number>
    </property>
    <item>
-    <widget class="BlackGui::Components::CTransponderModeComponent" name="comp_XpdrMode">
+    <widget class="swift::gui::components::CTransponderModeComponent" name="comp_XpdrMode">
      <property name="minimumSize">
       <size>
        <width>25</width>
@@ -56,7 +56,7 @@
     </widget>
    </item>
    <item alignment="Qt::AlignLeft">
-    <widget class="BlackGui::CLedWidget" name="led_Network" native="true"/>
+    <widget class="swift::gui::CLedWidget" name="led_Network" native="true"/>
    </item>
    <item>
     <widget class="QLabel" name="lbl_Simulator">
@@ -78,7 +78,7 @@
     </widget>
    </item>
    <item alignment="Qt::AlignLeft">
-    <widget class="BlackGui::CLedWidget" name="led_Simulator" native="true">
+    <widget class="swift::gui::CLedWidget" name="led_Simulator" native="true">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
        <horstretch>0</horstretch>
@@ -101,7 +101,7 @@
     </widget>
    </item>
    <item alignment="Qt::AlignLeft">
-    <widget class="BlackGui::CLedWidget" name="led_MapperReady" native="true"/>
+    <widget class="swift::gui::CLedWidget" name="led_MapperReady" native="true"/>
    </item>
    <item>
     <widget class="QLabel" name="lbl_DBus">
@@ -114,7 +114,7 @@
     </widget>
    </item>
    <item alignment="Qt::AlignLeft">
-    <widget class="BlackGui::CLedWidget" name="led_DBus" native="true">
+    <widget class="swift::gui::CLedWidget" name="led_DBus" native="true">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
        <horstretch>0</horstretch>
@@ -143,7 +143,7 @@
     </widget>
    </item>
    <item alignment="Qt::AlignLeft">
-    <widget class="BlackGui::CLedWidget" name="led_Ptt" native="true"/>
+    <widget class="swift::gui::CLedWidget" name="led_Ptt" native="true"/>
    </item>
    <item>
     <widget class="QLabel" name="lbl_Audio">
@@ -159,21 +159,21 @@
     </widget>
    </item>
    <item alignment="Qt::AlignLeft">
-    <widget class="BlackGui::CLedWidget" name="led_Audio" native="true"/>
+    <widget class="swift::gui::CLedWidget" name="led_Audio" native="true"/>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::CLedWidget</class>
+   <class>swift::gui::CLedWidget</class>
    <extends>QWidget</extends>
-   <header>blackgui/led.h</header>
+   <header>gui/led.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CTransponderModeComponent</class>
+   <class>swift::gui::components::CTransponderModeComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/transpondermodecomponent.h</header>
+   <header>gui/components/transpondermodecomponent.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/infobarwebreadersstatuscomponent.cpp b/src/gui/components/infobarwebreadersstatuscomponent.cpp
similarity index 97%
rename from src/blackgui/components/infobarwebreadersstatuscomponent.cpp
rename to src/gui/components/infobarwebreadersstatuscomponent.cpp
index b1068b4d7..a9c834c34 100644
--- a/src/blackgui/components/infobarwebreadersstatuscomponent.cpp
+++ b/src/gui/components/infobarwebreadersstatuscomponent.cpp
@@ -2,19 +2,19 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "core/webdataservices.h"
-#include "blackgui/components/infobarwebreadersstatuscomponent.h"
-#include "blackgui/guiapplication.h"
+#include "gui/components/infobarwebreadersstatuscomponent.h"
+#include "gui/guiapplication.h"
 #include "misc/verify.h"
 #include "ui_infobarwebreadersstatuscomponent.h"
 
 #include <QtGlobal>
 
-using namespace BlackGui;
+using namespace swift::gui;
 using namespace swift::misc;
 using namespace swift::core;
 using namespace swift::misc::network;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CInfoBarWebReadersStatusBase::CInfoBarWebReadersStatusBase(QWidget *parent) : QFrame(parent)
     {}
diff --git a/src/blackgui/components/infobarwebreadersstatuscomponent.h b/src/gui/components/infobarwebreadersstatuscomponent.h
similarity index 66%
rename from src/blackgui/components/infobarwebreadersstatuscomponent.h
rename to src/gui/components/infobarwebreadersstatuscomponent.h
index 07c0f5c98..b64a47c60 100644
--- a/src/blackgui/components/infobarwebreadersstatuscomponent.h
+++ b/src/gui/components/infobarwebreadersstatuscomponent.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_INFOBARWEBREADERSSTATUSCOMPONENT_H
-#define BLACKGUI_INFOBARWEBREADERSSTATUSCOMPONENT_H
+#ifndef SWIFT_GUI_INFOBARWEBREADERSSTATUSCOMPONENT_H
+#define SWIFT_GUI_INFOBARWEBREADERSSTATUSCOMPONENT_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/led.h"
+#include "gui/swiftguiexport.h"
+#include "gui/led.h"
 #include "misc/network/url.h"
 #include "misc/network/entityflags.h"
 
@@ -21,13 +21,13 @@ namespace Ui
 {
     class CInfoBarWebReadersStatusComponent;
 }
-namespace BlackGui
+namespace swift::gui
 {
     class CLedWidget;
-    namespace Components
+    namespace components
     {
         //! Info bar displaying status of web readers(swift DB, ...)
-        class BLACKGUI_EXPORT CInfoBarWebReadersStatusBase : public QFrame
+        class SWIFT_GUI_EXPORT CInfoBarWebReadersStatusBase : public QFrame
         {
             Q_OBJECT
 
@@ -61,9 +61,9 @@ namespace BlackGui
             bool hasAllData() const;
 
             //! Initial setup of leds
-            void setLeds(BlackGui::CLedWidget *ledDataReady, CLedWidget *ledConsolidation,
-                         BlackGui::CLedWidget *ledIcaoAircraft, BlackGui::CLedWidget *ledIcaoAirline, BlackGui::CLedWidget *ledCountries,
-                         BlackGui::CLedWidget *ledDistributors, BlackGui::CLedWidget *ledLiveries, BlackGui::CLedWidget *ledModels);
+            void setLeds(swift::gui::CLedWidget *ledDataReady, CLedWidget *ledConsolidation,
+                         swift::gui::CLedWidget *ledIcaoAircraft, swift::gui::CLedWidget *ledIcaoAirline, swift::gui::CLedWidget *ledCountries,
+                         swift::gui::CLedWidget *ledDistributors, swift::gui::CLedWidget *ledLiveries, swift::gui::CLedWidget *ledModels);
 
             //! Data have been read
             void dataRead(swift::misc::network::CEntityFlags::Entity entities, swift::misc::network::CEntityFlags::ReadState readState, int count);
@@ -76,18 +76,18 @@ namespace BlackGui
 
         private:
             QTimer m_timer; //!< check timer
-            BlackGui::CLedWidget *m_ledDataReady = nullptr;
-            BlackGui::CLedWidget *m_ledConsolidation = nullptr;
-            BlackGui::CLedWidget *m_ledIcaoAircraft = nullptr;
-            BlackGui::CLedWidget *m_ledIcaoAirline = nullptr;
-            BlackGui::CLedWidget *m_ledCountries = nullptr;
-            BlackGui::CLedWidget *m_ledDistributors = nullptr;
-            BlackGui::CLedWidget *m_ledLiveries = nullptr;
-            BlackGui::CLedWidget *m_ledModels = nullptr;
+            swift::gui::CLedWidget *m_ledDataReady = nullptr;
+            swift::gui::CLedWidget *m_ledConsolidation = nullptr;
+            swift::gui::CLedWidget *m_ledIcaoAircraft = nullptr;
+            swift::gui::CLedWidget *m_ledIcaoAirline = nullptr;
+            swift::gui::CLedWidget *m_ledCountries = nullptr;
+            swift::gui::CLedWidget *m_ledDistributors = nullptr;
+            swift::gui::CLedWidget *m_ledLiveries = nullptr;
+            swift::gui::CLedWidget *m_ledModels = nullptr;
         };
 
         //! Info bar displaying status of web readers(swift DB, ...)
-        class BLACKGUI_EXPORT CInfoBarWebReadersStatusComponent : public CInfoBarWebReadersStatusBase
+        class SWIFT_GUI_EXPORT CInfoBarWebReadersStatusComponent : public CInfoBarWebReadersStatusBase
         {
             Q_OBJECT
 
diff --git a/src/blackgui/components/infobarwebreadersstatuscomponent.ui b/src/gui/components/infobarwebreadersstatuscomponent.ui
similarity index 84%
rename from src/blackgui/components/infobarwebreadersstatuscomponent.ui
rename to src/gui/components/infobarwebreadersstatuscomponent.ui
index 1a46f1743..b70a2ef3e 100644
--- a/src/blackgui/components/infobarwebreadersstatuscomponent.ui
+++ b/src/gui/components/infobarwebreadersstatuscomponent.ui
@@ -40,7 +40,7 @@
     </widget>
    </item>
    <item>
-    <widget class="BlackGui::CLedWidget" name="led_DataReady" native="true"/>
+    <widget class="swift::gui::CLedWidget" name="led_DataReady" native="true"/>
    </item>
    <item>
     <widget class="QLabel" name="lbl_Consolidation">
@@ -53,7 +53,7 @@
     </widget>
    </item>
    <item>
-    <widget class="BlackGui::CLedWidget" name="led_Consolidation" native="true"/>
+    <widget class="swift::gui::CLedWidget" name="led_Consolidation" native="true"/>
    </item>
    <item>
     <spacer name="hs_Spacer">
@@ -86,7 +86,7 @@
     </widget>
    </item>
    <item>
-    <widget class="BlackGui::CLedWidget" name="led_Models" native="true"/>
+    <widget class="swift::gui::CLedWidget" name="led_Models" native="true"/>
    </item>
    <item>
     <widget class="QLabel" name="lbl_Liveries">
@@ -96,7 +96,7 @@
     </widget>
    </item>
    <item>
-    <widget class="BlackGui::CLedWidget" name="led_Liveries" native="true"/>
+    <widget class="swift::gui::CLedWidget" name="led_Liveries" native="true"/>
    </item>
    <item>
     <widget class="QLabel" name="lbl_Distributors">
@@ -106,7 +106,7 @@
     </widget>
    </item>
    <item>
-    <widget class="BlackGui::CLedWidget" name="led_Distributors" native="true"/>
+    <widget class="swift::gui::CLedWidget" name="led_Distributors" native="true"/>
    </item>
    <item>
     <widget class="QLabel" name="lbl_Aircraft">
@@ -116,7 +116,7 @@
     </widget>
    </item>
    <item>
-    <widget class="BlackGui::CLedWidget" name="led_IcaoAircraft" native="true"/>
+    <widget class="swift::gui::CLedWidget" name="led_IcaoAircraft" native="true"/>
    </item>
    <item>
     <widget class="QLabel" name="lbl_Airlines">
@@ -126,7 +126,7 @@
     </widget>
    </item>
    <item>
-    <widget class="BlackGui::CLedWidget" name="led_IcaoAirline" native="true"/>
+    <widget class="swift::gui::CLedWidget" name="led_IcaoAirline" native="true"/>
    </item>
    <item>
     <widget class="QLabel" name="lbl_Countries">
@@ -136,7 +136,7 @@
     </widget>
    </item>
    <item>
-    <widget class="BlackGui::CLedWidget" name="led_Countries" native="true"/>
+    <widget class="swift::gui::CLedWidget" name="led_Countries" native="true"/>
    </item>
    <item>
     <spacer name="hs_InfoBarWebReadersStatusComponent">
@@ -155,9 +155,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::CLedWidget</class>
+   <class>swift::gui::CLedWidget</class>
    <extends>QWidget</extends>
-   <header>blackgui/led.h</header>
+   <header>gui/led.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/infobarwebreadersstatussmallcomponent.cpp b/src/gui/components/infobarwebreadersstatussmallcomponent.cpp
similarity index 96%
rename from src/blackgui/components/infobarwebreadersstatussmallcomponent.cpp
rename to src/gui/components/infobarwebreadersstatussmallcomponent.cpp
index 5032292c2..958672ea8 100644
--- a/src/blackgui/components/infobarwebreadersstatussmallcomponent.cpp
+++ b/src/gui/components/infobarwebreadersstatussmallcomponent.cpp
@@ -4,7 +4,7 @@
 #include "infobarwebreadersstatussmallcomponent.h"
 #include "ui_infobarwebreadersstatussmallcomponent.h"
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CInfoBarWebReadersStatusSmallComponent::CInfoBarWebReadersStatusSmallComponent(QWidget *parent) : CInfoBarWebReadersStatusBase(parent),
                                                                                                       ui(new Ui::CInfoBarWebReadersStatusSmallComponent)
diff --git a/src/blackgui/components/infobarwebreadersstatussmallcomponent.h b/src/gui/components/infobarwebreadersstatussmallcomponent.h
similarity index 67%
rename from src/blackgui/components/infobarwebreadersstatussmallcomponent.h
rename to src/gui/components/infobarwebreadersstatussmallcomponent.h
index 54165bee9..959c21411 100644
--- a/src/blackgui/components/infobarwebreadersstatussmallcomponent.h
+++ b/src/gui/components/infobarwebreadersstatussmallcomponent.h
@@ -3,22 +3,22 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_INFOBARWEBREADERSSTATUSSMALLCOMPONENT_H
-#define BLACKGUI_COMPONENTS_INFOBARWEBREADERSSTATUSSMALLCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_INFOBARWEBREADERSSTATUSSMALLCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_INFOBARWEBREADERSSTATUSSMALLCOMPONENT_H
 
-#include "blackgui/components/infobarwebreadersstatuscomponent.h"
+#include "gui/components/infobarwebreadersstatuscomponent.h"
 #include <QScopedPointer>
 
 namespace Ui
 {
     class CInfoBarWebReadersStatusSmallComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Smaller version of CInfoBarWebReadersStatusComponent
      */
-    class BLACKGUI_EXPORT CInfoBarWebReadersStatusSmallComponent : public CInfoBarWebReadersStatusBase
+    class SWIFT_GUI_EXPORT CInfoBarWebReadersStatusSmallComponent : public CInfoBarWebReadersStatusBase
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/infobarwebreadersstatussmallcomponent.ui b/src/gui/components/infobarwebreadersstatussmallcomponent.ui
similarity index 81%
rename from src/blackgui/components/infobarwebreadersstatussmallcomponent.ui
rename to src/gui/components/infobarwebreadersstatussmallcomponent.ui
index 9623f8b2d..5cf7bb314 100644
--- a/src/blackgui/components/infobarwebreadersstatussmallcomponent.ui
+++ b/src/gui/components/infobarwebreadersstatussmallcomponent.ui
@@ -34,10 +34,10 @@
     </widget>
    </item>
    <item>
-    <widget class="BlackGui::CLedWidget" name="led_SwiftDb" native="true"/>
+    <widget class="swift::gui::CLedWidget" name="led_SwiftDb" native="true"/>
    </item>
    <item>
-    <widget class="BlackGui::CLedWidget" name="led_DataReady" native="true"/>
+    <widget class="swift::gui::CLedWidget" name="led_DataReady" native="true"/>
    </item>
    <item>
     <widget class="QLabel" name="lbl_Models">
@@ -50,7 +50,7 @@
     </widget>
    </item>
    <item>
-    <widget class="BlackGui::CLedWidget" name="led_Models" native="true"/>
+    <widget class="swift::gui::CLedWidget" name="led_Models" native="true"/>
    </item>
    <item>
     <widget class="QLabel" name="lbl_Liveries">
@@ -63,7 +63,7 @@
     </widget>
    </item>
    <item>
-    <widget class="BlackGui::CLedWidget" name="led_Liveries" native="true"/>
+    <widget class="swift::gui::CLedWidget" name="led_Liveries" native="true"/>
    </item>
    <item>
     <widget class="QLabel" name="lbl_Distributors">
@@ -76,7 +76,7 @@
     </widget>
    </item>
    <item>
-    <widget class="BlackGui::CLedWidget" name="led_Distributors" native="true"/>
+    <widget class="swift::gui::CLedWidget" name="led_Distributors" native="true"/>
    </item>
    <item>
     <widget class="QLabel" name="lbl_Aircraft">
@@ -89,7 +89,7 @@
     </widget>
    </item>
    <item>
-    <widget class="BlackGui::CLedWidget" name="led_IcaoAircraft" native="true"/>
+    <widget class="swift::gui::CLedWidget" name="led_IcaoAircraft" native="true"/>
    </item>
    <item>
     <widget class="QLabel" name="lbl_Airlines">
@@ -102,7 +102,7 @@
     </widget>
    </item>
    <item>
-    <widget class="BlackGui::CLedWidget" name="led_IcaoAirline" native="true"/>
+    <widget class="swift::gui::CLedWidget" name="led_IcaoAirline" native="true"/>
    </item>
    <item>
     <widget class="QLabel" name="lbl_Countries">
@@ -115,7 +115,7 @@
     </widget>
    </item>
    <item>
-    <widget class="BlackGui::CLedWidget" name="led_Countries" native="true"/>
+    <widget class="swift::gui::CLedWidget" name="led_Countries" native="true"/>
    </item>
    <item>
     <spacer name="hs_InfoBar">
@@ -134,9 +134,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::CLedWidget</class>
+   <class>swift::gui::CLedWidget</class>
    <extends>QWidget</extends>
-   <header>blackgui/led.h</header>
+   <header>gui/led.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/initialdataloadcomponent.cpp b/src/gui/components/initialdataloadcomponent.cpp
similarity index 97%
rename from src/blackgui/components/initialdataloadcomponent.cpp
rename to src/gui/components/initialdataloadcomponent.cpp
index 0373c8b44..6a6e261d8 100644
--- a/src/blackgui/components/initialdataloadcomponent.cpp
+++ b/src/gui/components/initialdataloadcomponent.cpp
@@ -4,7 +4,7 @@
 #include "initialdataloadcomponent.h"
 #include "ui_initialdataloadcomponent.h"
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CInitialDataLoadComponent::CInitialDataLoadComponent(QWidget *parent) : QFrame(parent),
                                                                             ui(new Ui::CInitialDataLoadComponent)
diff --git a/src/blackgui/components/initialdataloadcomponent.h b/src/gui/components/initialdataloadcomponent.h
similarity index 78%
rename from src/blackgui/components/initialdataloadcomponent.h
rename to src/gui/components/initialdataloadcomponent.h
index e153967fb..9d67bf3dc 100644
--- a/src/blackgui/components/initialdataloadcomponent.h
+++ b/src/gui/components/initialdataloadcomponent.h
@@ -3,8 +3,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_INITIALDATALOADCOMPONENT_H
-#define BLACKGUI_COMPONENTS_INITIALDATALOADCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_INITIALDATALOADCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_INITIALDATALOADCOMPONENT_H
 
 #include <QFrame>
 #include <QScopedPointer>
@@ -14,7 +14,7 @@ namespace Ui
 {
     class CInitialDataLoadComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Initial data load to prefill caches
@@ -31,13 +31,13 @@ namespace BlackGui::Components
         //! Destructor
         virtual ~CInitialDataLoadComponent();
 
-        //! \copydoc BlackGui::Components::CDbLoadOverviewComponent::loadAllFromShared
+        //! \copydoc swift::gui::components::CDbLoadOverviewComponent::loadAllFromShared
         void loadAllFromShared();
 
-        //! \copydoc BlackGui::Components::CDbLoadOverviewComponent::loadAllFromDb
+        //! \copydoc swift::gui::components::CDbLoadOverviewComponent::loadAllFromDb
         void loadAllFromDb();
 
-        //! \copydoc BlackGui::Components::CDbLoadOverviewComponent::isLoadInProgress
+        //! \copydoc swift::gui::components::CDbLoadOverviewComponent::isLoadInProgress
         bool isLoadInProgress() const;
 
     private:
diff --git a/src/blackgui/components/initialdataloadcomponent.ui b/src/gui/components/initialdataloadcomponent.ui
similarity index 88%
rename from src/blackgui/components/initialdataloadcomponent.ui
rename to src/gui/components/initialdataloadcomponent.ui
index b3fbe11d4..ec074b9a8 100644
--- a/src/blackgui/components/initialdataloadcomponent.ui
+++ b/src/gui/components/initialdataloadcomponent.ui
@@ -71,7 +71,7 @@
        <number>4</number>
       </property>
       <item>
-       <widget class="BlackGui::Components::CInfoBarWebReadersStatusSmallComponent" name="comp_InfoBar">
+       <widget class="swift::gui::components::CInfoBarWebReadersStatusSmallComponent" name="comp_InfoBar">
         <property name="frameShape">
          <enum>QFrame::StyledPanel</enum>
         </property>
@@ -81,7 +81,7 @@
        </widget>
       </item>
       <item>
-       <widget class="BlackGui::Components::CDbLoadOverviewComponent" name="comp_DataUpdates">
+       <widget class="swift::gui::components::CDbLoadOverviewComponent" name="comp_DataUpdates">
         <property name="minimumSize">
          <size>
           <width>0</width>
@@ -103,15 +103,15 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CDbLoadOverviewComponent</class>
+   <class>swift::gui::components::CDbLoadOverviewComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/dbloadoverviewcomponent.h</header>
+   <header>gui/components/dbloadoverviewcomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CInfoBarWebReadersStatusSmallComponent</class>
+   <class>swift::gui::components::CInfoBarWebReadersStatusSmallComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/infobarwebreadersstatussmallcomponent.h</header>
+   <header>gui/components/infobarwebreadersstatussmallcomponent.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/installfsxterrainprobecomponent.cpp b/src/gui/components/installfsxterrainprobecomponent.cpp
similarity index 96%
rename from src/blackgui/components/installfsxterrainprobecomponent.cpp
rename to src/gui/components/installfsxterrainprobecomponent.cpp
index 06bf77ac6..556497c58 100644
--- a/src/blackgui/components/installfsxterrainprobecomponent.cpp
+++ b/src/gui/components/installfsxterrainprobecomponent.cpp
@@ -3,8 +3,8 @@
 
 #include "installfsxterrainprobecomponent.h"
 #include "ui_installfsxterrainprobecomponent.h"
-#include "blackgui/overlaymessagesframe.h"
-#include "blackgui/guiutility.h"
+#include "gui/overlaymessagesframe.h"
+#include "gui/guiutility.h"
 #include "misc/simulation/fscommon/fscommonutil.h"
 #include "misc/simulation/simulatorinfo.h"
 #include "misc/swiftdirectories.h"
@@ -20,7 +20,7 @@ using namespace swift::misc;
 using namespace swift::misc::simulation;
 using namespace swift::misc::simulation::fscommon;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CInstallFsxTerrainProbeComponent::CInstallFsxTerrainProbeComponent(QWidget *parent) : QFrame(parent),
                                                                                           ui(new Ui::CInstallFsxTerrainProbeComponent)
diff --git a/src/blackgui/components/installfsxterrainprobecomponent.h b/src/gui/components/installfsxterrainprobecomponent.h
similarity index 87%
rename from src/blackgui/components/installfsxterrainprobecomponent.h
rename to src/gui/components/installfsxterrainprobecomponent.h
index 453bbabdf..41be54524 100644
--- a/src/blackgui/components/installfsxterrainprobecomponent.h
+++ b/src/gui/components/installfsxterrainprobecomponent.h
@@ -3,8 +3,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_INSTALLFSXTERRAINPROBECOMPONENT_H
-#define BLACKGUI_COMPONENTS_INSTALLFSXTERRAINPROBECOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_INSTALLFSXTERRAINPROBECOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_INSTALLFSXTERRAINPROBECOMPONENT_H
 
 #include "misc/simulation/settings/simulatorsettings.h"
 #include <QFrame>
@@ -14,7 +14,7 @@ namespace Ui
 {
     class CInstallFsxTerrainProbeComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! Install the FSX/P3D terrain probe
     class CInstallFsxTerrainProbeComponent : public QFrame
diff --git a/src/blackgui/components/installfsxterrainprobecomponent.ui b/src/gui/components/installfsxterrainprobecomponent.ui
similarity index 95%
rename from src/blackgui/components/installfsxterrainprobecomponent.ui
rename to src/gui/components/installfsxterrainprobecomponent.ui
index ed28a5f40..648272890 100644
--- a/src/blackgui/components/installfsxterrainprobecomponent.ui
+++ b/src/gui/components/installfsxterrainprobecomponent.ui
@@ -58,7 +58,7 @@
           <number>0</number>
          </property>
          <item alignment="Qt::AlignLeft">
-          <widget class="BlackGui::Components::CSimulatorSelector" name="comp_SimulatorSelector">
+          <widget class="swift::gui::components::CSimulatorSelector" name="comp_SimulatorSelector">
            <property name="minimumSize">
             <size>
              <width>125</width>
@@ -135,9 +135,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CSimulatorSelector</class>
+   <class>swift::gui::components::CSimulatorSelector</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/simulatorselector.h</header>
+   <header>gui/components/simulatorselector.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/installsimulatorspecificwizardpage.h b/src/gui/components/installsimulatorspecificwizardpage.h
similarity index 84%
rename from src/blackgui/components/installsimulatorspecificwizardpage.h
rename to src/gui/components/installsimulatorspecificwizardpage.h
index 1e3bf883a..b32cbc438 100644
--- a/src/blackgui/components/installsimulatorspecificwizardpage.h
+++ b/src/gui/components/installsimulatorspecificwizardpage.h
@@ -3,13 +3,13 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_INSTALLSIMULATORSPECIFICCOMPONENT_H
-#define BLACKGUI_COMPONENTS_INSTALLSIMULATORSPECIFICCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_INSTALLSIMULATORSPECIFICCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_INSTALLSIMULATORSPECIFICCOMPONENT_H
 
-#include "blackgui/overlaymessagesframe.h"
+#include "gui/overlaymessagesframe.h"
 #include <QWizard>
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     class CInstallXSwiftBusComponent;
     class CInstallFsxTerrainProbeComponent;
diff --git a/src/blackgui/components/installxswiftbuscomponent.cpp b/src/gui/components/installxswiftbuscomponent.cpp
similarity index 99%
rename from src/blackgui/components/installxswiftbuscomponent.cpp
rename to src/gui/components/installxswiftbuscomponent.cpp
index c483b0fdc..6d06e87d0 100644
--- a/src/blackgui/components/installxswiftbuscomponent.cpp
+++ b/src/gui/components/installxswiftbuscomponent.cpp
@@ -3,8 +3,8 @@
 
 #include "installxswiftbuscomponent.h"
 #include "ui_installxswiftbuscomponent.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/overlaymessagesframe.h"
+#include "gui/guiapplication.h"
+#include "gui/overlaymessagesframe.h"
 #include "misc/simulation/xplane/xplaneutil.h"
 #include "misc/compressutils.h"
 #include "misc/logmessage.h"
@@ -29,7 +29,7 @@ using namespace swift::misc::simulation;
 using namespace swift::misc::simulation::settings;
 using namespace swift::misc::simulation::xplane;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CInstallXSwiftBusComponent::CInstallXSwiftBusComponent(QWidget *parent) : COverlayMessagesFrame(parent),
                                                                               CLoadIndicatorEnabled(this),
diff --git a/src/blackgui/components/installxswiftbuscomponent.h b/src/gui/components/installxswiftbuscomponent.h
similarity index 94%
rename from src/blackgui/components/installxswiftbuscomponent.h
rename to src/gui/components/installxswiftbuscomponent.h
index a54a45316..70291071a 100644
--- a/src/blackgui/components/installxswiftbuscomponent.h
+++ b/src/gui/components/installxswiftbuscomponent.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_INSTALLXSWIFTBUSCOMPONENT_H
-#define BLACKGUI_COMPONENTS_INSTALLXSWIFTBUSCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_INSTALLXSWIFTBUSCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_INSTALLXSWIFTBUSCOMPONENT_H
 
-#include "blackgui/overlaymessagesframe.h"
-#include "blackgui/loadindicator.h"
+#include "gui/overlaymessagesframe.h"
+#include "gui/loadindicator.h"
 #include "core/application/applicationsettings.h"
 #include "core/application/updatesettings.h"
 #include "misc/db/updateinfo.h"
@@ -22,7 +22,7 @@ namespace Ui
 {
     class CInstallXSwiftBusComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Download and install xswiftbus
diff --git a/src/blackgui/components/installxswiftbuscomponent.ui b/src/gui/components/installxswiftbuscomponent.ui
similarity index 97%
rename from src/blackgui/components/installxswiftbuscomponent.ui
rename to src/gui/components/installxswiftbuscomponent.ui
index 673123a1c..d9d25947c 100644
--- a/src/blackgui/components/installxswiftbuscomponent.ui
+++ b/src/gui/components/installxswiftbuscomponent.ui
@@ -184,7 +184,7 @@
        <number>5</number>
       </property>
       <item>
-       <widget class="BlackGui::Components::CSettingsXSwiftBusComponent" name="comp_SettingsXSwiftBus">
+       <widget class="swift::gui::components::CSettingsXSwiftBusComponent" name="comp_SettingsXSwiftBus">
         <property name="minimumSize">
          <size>
           <width>0</width>
@@ -200,9 +200,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CSettingsXSwiftBusComponent</class>
+   <class>swift::gui::components::CSettingsXSwiftBusComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/settingsxswiftbuscomponent.h</header>
+   <header>gui/components/settingsxswiftbuscomponent.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/installxswiftbusdialog.cpp b/src/gui/components/installxswiftbusdialog.cpp
similarity index 95%
rename from src/blackgui/components/installxswiftbusdialog.cpp
rename to src/gui/components/installxswiftbusdialog.cpp
index c603f3d38..22e1736f2 100644
--- a/src/blackgui/components/installxswiftbusdialog.cpp
+++ b/src/gui/components/installxswiftbusdialog.cpp
@@ -4,7 +4,7 @@
 #include "installxswiftbusdialog.h"
 #include "ui_installxswiftbusdialog.h"
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CInstallXSwiftBusDialog::CInstallXSwiftBusDialog(QWidget *parent) : QDialog(parent),
                                                                         ui(new Ui::CInstallXSwiftBusDialog)
diff --git a/src/blackgui/components/installxswiftbusdialog.h b/src/gui/components/installxswiftbusdialog.h
similarity index 85%
rename from src/blackgui/components/installxswiftbusdialog.h
rename to src/gui/components/installxswiftbusdialog.h
index 4bf13b8b8..1130b1823 100644
--- a/src/blackgui/components/installxswiftbusdialog.h
+++ b/src/gui/components/installxswiftbusdialog.h
@@ -3,8 +3,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_INSTALLXSWIFTBUSDIALOG_H
-#define BLACKGUI_COMPONENTS_INSTALLXSWIFTBUSDIALOG_H
+#ifndef SWIFT_GUI_COMPONENTS_INSTALLXSWIFTBUSDIALOG_H
+#define SWIFT_GUI_COMPONENTS_INSTALLXSWIFTBUSDIALOG_H
 
 #include <QString>
 #include <QDialog>
@@ -13,7 +13,7 @@ namespace Ui
 {
     class CInstallXSwiftBusDialog;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * CInstallXSwiftBusComponent as dialog
diff --git a/src/blackgui/components/installxswiftbusdialog.ui b/src/gui/components/installxswiftbusdialog.ui
similarity index 89%
rename from src/blackgui/components/installxswiftbusdialog.ui
rename to src/gui/components/installxswiftbusdialog.ui
index af9f6ce3d..79dff7486 100644
--- a/src/blackgui/components/installxswiftbusdialog.ui
+++ b/src/gui/components/installxswiftbusdialog.ui
@@ -33,7 +33,7 @@
     <number>9</number>
    </property>
    <item>
-    <widget class="BlackGui::Components::CInstallXSwiftBusComponent" name="comp_InstallXSwiftBus"/>
+    <widget class="swift::gui::components::CInstallXSwiftBusComponent" name="comp_InstallXSwiftBus"/>
    </item>
    <item>
     <widget class="QDialogButtonBox" name="bb_Dialog">
@@ -49,9 +49,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CInstallXSwiftBusComponent</class>
+   <class>swift::gui::components::CInstallXSwiftBusComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/installxswiftbuscomponent.h</header>
+   <header>gui/components/installxswiftbuscomponent.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/internalscomponent.cpp b/src/gui/components/internalscomponent.cpp
similarity index 98%
rename from src/blackgui/components/internalscomponent.cpp
rename to src/gui/components/internalscomponent.cpp
index 7e1513eed..4a6943781 100644
--- a/src/blackgui/components/internalscomponent.cpp
+++ b/src/gui/components/internalscomponent.cpp
@@ -1,10 +1,10 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/internalscomponent.h"
-#include "blackgui/components/remoteaircraftselector.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/uppercasevalidator.h"
+#include "gui/components/internalscomponent.h"
+#include "gui/components/remoteaircraftselector.h"
+#include "gui/guiapplication.h"
+#include "gui/uppercasevalidator.h"
 #include "core/context/contextapplication.h"
 #include "core/context/contextaudio.h"
 #include "core/context/contextnetwork.h"
@@ -42,7 +42,7 @@ using namespace swift::misc::math;
 using namespace swift::misc::physical_quantities;
 using namespace swift::misc::simulation;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CInternalsComponent::CInternalsComponent(QWidget *parent) : QWidget(parent),
                                                                 ui(new Ui::CInternalsComponent)
diff --git a/src/blackgui/components/internalscomponent.h b/src/gui/components/internalscomponent.h
similarity index 89%
rename from src/blackgui/components/internalscomponent.h
rename to src/gui/components/internalscomponent.h
index ece4f78e7..5a6891ca6 100644
--- a/src/blackgui/components/internalscomponent.h
+++ b/src/gui/components/internalscomponent.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_INTERNALSCOMPONENT_H
-#define BLACKGUI_INTERNALSCOMPONENT_H
+#ifndef SWIFT_GUI_INTERNALSCOMPONENT_H
+#define SWIFT_GUI_INTERNALSCOMPONENT_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include "misc/aviation/aircraftparts.h"
 
 #include <QObject>
@@ -19,10 +19,10 @@ namespace Ui
 {
     class CInternalsComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! Internals for debugging, statistics
-    class BLACKGUI_EXPORT CInternalsComponent : public QWidget
+    class SWIFT_GUI_EXPORT CInternalsComponent : public QWidget
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/internalscomponent.ui b/src/gui/components/internalscomponent.ui
similarity index 97%
rename from src/blackgui/components/internalscomponent.ui
rename to src/gui/components/internalscomponent.ui
index f89850dcc..9e79e991d 100644
--- a/src/blackgui/components/internalscomponent.ui
+++ b/src/gui/components/internalscomponent.ui
@@ -448,7 +448,7 @@
         <number>0</number>
        </property>
        <item>
-        <widget class="BlackGui::Components::CAircraftPartsComponent" name="comp_AircraftParts">
+        <widget class="swift::gui::components::CAircraftPartsComponent" name="comp_AircraftParts">
          <property name="frameShape">
           <enum>QFrame::StyledPanel</enum>
          </property>
@@ -477,7 +477,7 @@
         <number>0</number>
        </property>
        <item>
-        <widget class="BlackGui::Components::CRawFsdMessagesComponent" name="comp_RawFsdMessages">
+        <widget class="swift::gui::components::CRawFsdMessagesComponent" name="comp_RawFsdMessages">
          <property name="frameShape">
           <enum>QFrame::StyledPanel</enum>
          </property>
@@ -494,15 +494,15 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CRawFsdMessagesComponent</class>
+   <class>swift::gui::components::CRawFsdMessagesComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/rawfsdmessagescomponent.h</header>
+   <header>gui/components/rawfsdmessagescomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CAircraftPartsComponent</class>
+   <class>swift::gui::components::CAircraftPartsComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/aircraftpartscomponent.h</header>
+   <header>gui/components/aircraftpartscomponent.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/interpolationcomponent.cpp b/src/gui/components/interpolationcomponent.cpp
similarity index 91%
rename from src/blackgui/components/interpolationcomponent.cpp
rename to src/gui/components/interpolationcomponent.cpp
index c580054c0..910e3d336 100644
--- a/src/blackgui/components/interpolationcomponent.cpp
+++ b/src/gui/components/interpolationcomponent.cpp
@@ -4,15 +4,15 @@
 #include "interpolationcomponent.h"
 #include "ui_interpolationcomponent.h"
 
-#include "blackgui/guiapplication.h"
-#include "blackgui/views/statusmessageview.h"
+#include "gui/guiapplication.h"
+#include "gui/views/statusmessageview.h"
 #include "core/context/contextsimulator.h"
 
 using namespace swift::misc;
 using namespace swift::misc::aviation;
-using namespace BlackGui::Views;
+using namespace swift::gui::views;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CInterpolationComponent::CInterpolationComponent(QWidget *parent) : QFrame(parent),
                                                                         ui(new Ui::CInterpolationComponent)
diff --git a/src/blackgui/components/interpolationcomponent.h b/src/gui/components/interpolationcomponent.h
similarity index 76%
rename from src/blackgui/components/interpolationcomponent.h
rename to src/gui/components/interpolationcomponent.h
index f172db55b..4bc528505 100644
--- a/src/blackgui/components/interpolationcomponent.h
+++ b/src/gui/components/interpolationcomponent.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_INTERPOLATIONCOMPONENT_H
-#define BLACKGUI_COMPONENTS_INTERPOLATIONCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_INTERPOLATIONCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_INTERPOLATIONCOMPONENT_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include <QFrame>
 #include <QScopedPointer>
 
@@ -14,10 +14,10 @@ namespace Ui
 {
     class CInterpolationComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! Interpolation
-    class BLACKGUI_EXPORT CInterpolationComponent : public QFrame
+    class SWIFT_GUI_EXPORT CInterpolationComponent : public QFrame
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/interpolationcomponent.ui b/src/gui/components/interpolationcomponent.ui
similarity index 80%
rename from src/blackgui/components/interpolationcomponent.ui
rename to src/gui/components/interpolationcomponent.ui
index 016e871e0..1077399e0 100644
--- a/src/blackgui/components/interpolationcomponent.ui
+++ b/src/gui/components/interpolationcomponent.ui
@@ -49,7 +49,7 @@
         <number>0</number>
        </property>
        <item>
-        <widget class="BlackGui::Components::CInterpolationSetupComponent" name="comp_InterpolationSetup"/>
+        <widget class="swift::gui::components::CInterpolationSetupComponent" name="comp_InterpolationSetup"/>
        </item>
       </layout>
      </widget>
@@ -71,7 +71,7 @@
         <number>0</number>
        </property>
        <item>
-        <widget class="BlackGui::Components::CAircraftPartsHistory" name="comp_PartsHistory"/>
+        <widget class="swift::gui::components::CAircraftPartsHistory" name="comp_PartsHistory"/>
        </item>
       </layout>
      </widget>
@@ -93,7 +93,7 @@
         <number>4</number>
        </property>
        <item>
-        <widget class="BlackGui::Components::CCallsignCompleter" name="comp_CallsignCompleter">
+        <widget class="swift::gui::components::CCallsignCompleter" name="comp_CallsignCompleter">
          <property name="frameShape">
           <enum>QFrame::StyledPanel</enum>
          </property>
@@ -103,7 +103,7 @@
         </widget>
        </item>
        <item>
-        <widget class="BlackGui::Views::CStatusMessageView" name="tvp_InterpolationMessages">
+        <widget class="swift::gui::views::CStatusMessageView" name="tvp_InterpolationMessages">
          <attribute name="verticalHeaderVisible">
           <bool>false</bool>
          </attribute>
@@ -124,27 +124,27 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CAircraftPartsHistory</class>
+   <class>swift::gui::components::CAircraftPartsHistory</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/aircraftpartshistory.h</header>
+   <header>gui/components/aircraftpartshistory.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CInterpolationSetupComponent</class>
+   <class>swift::gui::components::CInterpolationSetupComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/interpolationsetupcomponent.h</header>
+   <header>gui/components/interpolationsetupcomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CCallsignCompleter</class>
+   <class>swift::gui::components::CCallsignCompleter</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/callsigncompleter.h</header>
+   <header>gui/components/callsigncompleter.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Views::CStatusMessageView</class>
+   <class>swift::gui::views::CStatusMessageView</class>
    <extends>QTableView</extends>
-   <header>blackgui/views/statusmessageview.h</header>
+   <header>gui/views/statusmessageview.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/src/blackgui/components/interpolationlogdisplay.cpp b/src/gui/components/interpolationlogdisplay.cpp
similarity index 99%
rename from src/blackgui/components/interpolationlogdisplay.cpp
rename to src/gui/components/interpolationlogdisplay.cpp
index a69b2031f..a4889372b 100644
--- a/src/blackgui/components/interpolationlogdisplay.cpp
+++ b/src/gui/components/interpolationlogdisplay.cpp
@@ -3,8 +3,8 @@
 
 #include "interpolationlogdisplay.h"
 #include "ui_interpolationlogdisplay.h"
-#include "blackgui/editors/coordinateform.h"
-#include "blackgui/guiapplication.h"
+#include "gui/editors/coordinateform.h"
+#include "gui/guiapplication.h"
 #include "core/context/contextnetworkimpl.h"
 #include "core/context/contextsimulator.h"
 #include "core/airspacemonitor.h"
@@ -15,8 +15,8 @@
 
 using namespace swift::core;
 using namespace swift::core::context;
-using namespace BlackGui::Views;
-using namespace BlackGui::Editors;
+using namespace swift::gui::views;
+using namespace swift::gui::editors;
 using namespace swift::misc;
 using namespace swift::misc::aviation;
 using namespace swift::misc::geo;
@@ -24,7 +24,7 @@ using namespace swift::misc::network;
 using namespace swift::misc::simulation;
 using namespace swift::misc::physical_quantities;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     const QStringList &CInterpolationLogDisplay::getLogCategories()
     {
diff --git a/src/blackgui/components/interpolationlogdisplay.h b/src/gui/components/interpolationlogdisplay.h
similarity index 95%
rename from src/blackgui/components/interpolationlogdisplay.h
rename to src/gui/components/interpolationlogdisplay.h
index ee4ef78ef..978008bd1 100644
--- a/src/blackgui/components/interpolationlogdisplay.h
+++ b/src/gui/components/interpolationlogdisplay.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_INTERPOLATIONLOGDISPLAY_H
-#define BLACKGUI_COMPONENTS_INTERPOLATIONLOGDISPLAY_H
+#ifndef SWIFT_GUI_COMPONENTS_INTERPOLATIONLOGDISPLAY_H
+#define SWIFT_GUI_COMPONENTS_INTERPOLATIONLOGDISPLAY_H
 
-#include "blackgui/overlaymessagesframe.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/overlaymessagesframe.h"
+#include "gui/swiftguiexport.h"
 #include "core/simulator.h"
 #include "misc/simulation/interpolation/interpolationlogger.h"
 #include "misc/aviation/aircraftsituationlist.h"
@@ -29,12 +29,12 @@ namespace swift::core
 {
     class CAirspaceMonitor;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Display live data of interpolation
      */
-    class BLACKGUI_EXPORT CInterpolationLogDisplay :
+    class SWIFT_GUI_EXPORT CInterpolationLogDisplay :
         public COverlayMessagesFrame,
         public swift::misc::CIdentifiable
     {
diff --git a/src/blackgui/components/interpolationlogdisplay.ui b/src/gui/components/interpolationlogdisplay.ui
similarity index 94%
rename from src/blackgui/components/interpolationlogdisplay.ui
rename to src/gui/components/interpolationlogdisplay.ui
index 8b6e04540..ce6a40e77 100644
--- a/src/blackgui/components/interpolationlogdisplay.ui
+++ b/src/gui/components/interpolationlogdisplay.ui
@@ -70,7 +70,7 @@
           </widget>
          </item>
          <item>
-          <widget class="BlackGui::CLedWidget" name="led_Running" native="true"/>
+          <widget class="swift::gui::CLedWidget" name="led_Running" native="true"/>
          </item>
          <item>
           <widget class="QLabel" name="lbl_Updating">
@@ -83,7 +83,7 @@
           </widget>
          </item>
          <item>
-          <widget class="BlackGui::CLedWidget" name="led_Updating" native="true"/>
+          <widget class="swift::gui::CLedWidget" name="led_Updating" native="true"/>
          </item>
          <item>
           <widget class="QFrame" name="fr_Updating">
@@ -147,7 +147,7 @@
           </widget>
          </item>
          <item>
-          <widget class="BlackGui::CLedWidget" name="led_Situation" native="true"/>
+          <widget class="swift::gui::CLedWidget" name="led_Situation" native="true"/>
          </item>
          <item>
           <widget class="QLabel" name="lbl_PartsLed">
@@ -157,7 +157,7 @@
           </widget>
          </item>
          <item>
-          <widget class="BlackGui::CLedWidget" name="led_Parts" native="true"/>
+          <widget class="swift::gui::CLedWidget" name="led_Parts" native="true"/>
          </item>
          <item>
           <widget class="QLabel" name="lbl_ElevationLed">
@@ -170,7 +170,7 @@
           </widget>
          </item>
          <item>
-          <widget class="BlackGui::CLedWidget" name="led_Elevation" native="true"/>
+          <widget class="swift::gui::CLedWidget" name="led_Elevation" native="true"/>
          </item>
         </layout>
        </widget>
@@ -191,7 +191,7 @@
           <number>3</number>
          </property>
          <item>
-          <widget class="BlackGui::Components::CCallsignCompleter" name="comp_CallsignCompleter">
+          <widget class="swift::gui::components::CCallsignCompleter" name="comp_CallsignCompleter">
            <property name="focusPolicy">
             <enum>Qt::StrongFocus</enum>
            </property>
@@ -572,7 +572,7 @@
                </widget>
               </item>
               <item>
-               <widget class="BlackGui::Views::CAircraftSituationView" name="tvp_InboundAircraftSituations">
+               <widget class="swift::gui::views::CAircraftSituationView" name="tvp_InboundAircraftSituations">
                 <property name="selectionMode">
                  <enum>QAbstractItemView::NoSelection</enum>
                 </property>
@@ -595,7 +595,7 @@
              </property>
              <layout class="QVBoxLayout" name="vl_InboundParts">
               <item>
-               <widget class="BlackGui::Views::CAircraftPartsView" name="tvp_InboundAircraftParts">
+               <widget class="swift::gui::views::CAircraftPartsView" name="tvp_InboundAircraftParts">
                 <property name="selectionMode">
                  <enum>QAbstractItemView::NoSelection</enum>
                 </property>
@@ -628,7 +628,7 @@
          </property>
          <layout class="QVBoxLayout" name="vl_CalculatedChanges">
           <item>
-           <widget class="BlackGui::Views::CAircraftSituationChangeView" name="tvp_Changes">
+           <widget class="swift::gui::views::CAircraftSituationChangeView" name="tvp_Changes">
             <property name="selectionMode">
              <enum>QAbstractItemView::NoSelection</enum>
             </property>
@@ -648,7 +648,7 @@
       </attribute>
       <layout class="QVBoxLayout" name="vl_AircraftParts">
        <item>
-        <widget class="BlackGui::Components::CAircraftPartsComponent" name="comp_Parts">
+        <widget class="swift::gui::components::CAircraftPartsComponent" name="comp_Parts">
          <property name="frameShape">
           <enum>QFrame::StyledPanel</enum>
          </property>
@@ -833,7 +833,7 @@
          </property>
          <layout class="QVBoxLayout" name="vl_InterpolatedGb">
           <item>
-           <widget class="BlackGui::Views::CAircraftSituationView" name="tvp_InterpolatedAircraftSituations">
+           <widget class="swift::gui::views::CAircraftSituationView" name="tvp_InterpolatedAircraftSituations">
             <property name="selectionMode">
              <enum>QAbstractItemView::NoSelection</enum>
             </property>
@@ -855,7 +855,7 @@
          </property>
          <layout class="QVBoxLayout" name="vl_LoopbackGb">
           <item>
-           <widget class="BlackGui::Views::CAircraftSituationView" name="tvp_LoopbackAircraftSituations">
+           <widget class="swift::gui::views::CAircraftSituationView" name="tvp_LoopbackAircraftSituations">
             <property name="selectionMode">
              <enum>QAbstractItemView::NoSelection</enum>
             </property>
@@ -910,7 +910,7 @@
            <number>3</number>
           </property>
           <item>
-           <widget class="BlackGui::Editors::CCoordinateForm" name="editor_ElevationCoordinate">
+           <widget class="swift::gui::editors::CCoordinateForm" name="editor_ElevationCoordinate">
             <property name="minimumSize">
              <size>
               <width>0</width>
@@ -1041,42 +1041,42 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CCallsignCompleter</class>
+   <class>swift::gui::components::CCallsignCompleter</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/callsigncompleter.h</header>
+   <header>gui/components/callsigncompleter.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Views::CAircraftPartsView</class>
+   <class>swift::gui::views::CAircraftPartsView</class>
    <extends>QTableView</extends>
-   <header>blackgui/views/aircraftpartsview.h</header>
+   <header>gui/views/aircraftpartsview.h</header>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Views::CAircraftSituationView</class>
+   <class>swift::gui::views::CAircraftSituationView</class>
    <extends>QTableView</extends>
-   <header>blackgui/views/aircraftsituationview.h</header>
+   <header>gui/views/aircraftsituationview.h</header>
   </customwidget>
   <customwidget>
-   <class>BlackGui::CLedWidget</class>
+   <class>swift::gui::CLedWidget</class>
    <extends>QWidget</extends>
-   <header>blackgui/led.h</header>
+   <header>gui/led.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Views::CAircraftSituationChangeView</class>
+   <class>swift::gui::views::CAircraftSituationChangeView</class>
    <extends>QTableView</extends>
-   <header>blackgui/views/aircraftsituationchangeview.h</header>
+   <header>gui/views/aircraftsituationchangeview.h</header>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Editors::CCoordinateForm</class>
+   <class>swift::gui::editors::CCoordinateForm</class>
    <extends>QFrame</extends>
-   <header>blackgui/editors/coordinateform.h</header>
+   <header>gui/editors/coordinateform.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CAircraftPartsComponent</class>
+   <class>swift::gui::components::CAircraftPartsComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/aircraftpartscomponent.h</header>
+   <header>gui/components/aircraftpartscomponent.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/interpolationlogdisplaydialog.cpp b/src/gui/components/interpolationlogdisplaydialog.cpp
similarity index 96%
rename from src/blackgui/components/interpolationlogdisplaydialog.cpp
rename to src/gui/components/interpolationlogdisplaydialog.cpp
index 1cfc43bd2..00f93496d 100644
--- a/src/blackgui/components/interpolationlogdisplaydialog.cpp
+++ b/src/gui/components/interpolationlogdisplaydialog.cpp
@@ -3,12 +3,12 @@
 
 #include "interpolationlogdisplaydialog.h"
 #include "ui_interpolationlogdisplaydialog.h"
-#include "blackgui/guiapplication.h"
+#include "gui/guiapplication.h"
 #include "core/simulator.h"
 
 using namespace swift::core;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CInterpolationLogDisplayDialog::CInterpolationLogDisplayDialog(ISimulator *simulator, CAirspaceMonitor *airspaceMonitor, QWidget *parent) : QDialog(parent),
                                                                                                                                                 ui(new Ui::CInterpolationLogDisplayDialog)
diff --git a/src/blackgui/components/interpolationlogdisplaydialog.h b/src/gui/components/interpolationlogdisplaydialog.h
similarity index 81%
rename from src/blackgui/components/interpolationlogdisplaydialog.h
rename to src/gui/components/interpolationlogdisplaydialog.h
index 2d2f08830..5b6ed171a 100644
--- a/src/blackgui/components/interpolationlogdisplaydialog.h
+++ b/src/gui/components/interpolationlogdisplaydialog.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_INTERPOLATIONLOGDISPLAYDIALOG_H
-#define BLACKGUI_COMPONENTS_INTERPOLATIONLOGDISPLAYDIALOG_H
+#ifndef SWIFT_GUI_COMPONENTS_INTERPOLATIONLOGDISPLAYDIALOG_H
+#define SWIFT_GUI_COMPONENTS_INTERPOLATIONLOGDISPLAYDIALOG_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include <QScopedPointer>
 #include <QDialog>
 
@@ -19,12 +19,12 @@ namespace Ui
 {
     class CInterpolationLogDisplayDialog;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * CInterpolationLogDisplay as dialog
      */
-    class BLACKGUI_EXPORT CInterpolationLogDisplayDialog : public QDialog
+    class SWIFT_GUI_EXPORT CInterpolationLogDisplayDialog : public QDialog
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/interpolationlogdisplaydialog.ui b/src/gui/components/interpolationlogdisplaydialog.ui
similarity index 89%
rename from src/blackgui/components/interpolationlogdisplaydialog.ui
rename to src/gui/components/interpolationlogdisplaydialog.ui
index bfe054987..a4396cd2c 100644
--- a/src/blackgui/components/interpolationlogdisplaydialog.ui
+++ b/src/gui/components/interpolationlogdisplaydialog.ui
@@ -21,7 +21,7 @@
   </property>
   <layout class="QVBoxLayout" name="vl_InterpolationLogDisplay">
    <item>
-    <widget class="BlackGui::Components::CInterpolationLogDisplay" name="comp_InterpolationLogDisplay">
+    <widget class="swift::gui::components::CInterpolationLogDisplay" name="comp_InterpolationLogDisplay">
      <property name="frameShape">
       <enum>QFrame::StyledPanel</enum>
      </property>
@@ -44,9 +44,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CInterpolationLogDisplay</class>
+   <class>swift::gui::components::CInterpolationLogDisplay</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/interpolationlogdisplay.h</header>
+   <header>gui/components/interpolationlogdisplay.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/interpolationsetupcomponent.cpp b/src/gui/components/interpolationsetupcomponent.cpp
similarity index 98%
rename from src/blackgui/components/interpolationsetupcomponent.cpp
rename to src/gui/components/interpolationsetupcomponent.cpp
index b73b1ea6f..c7b0f0ece 100644
--- a/src/blackgui/components/interpolationsetupcomponent.cpp
+++ b/src/gui/components/interpolationsetupcomponent.cpp
@@ -3,20 +3,20 @@
 
 #include "interpolationsetupcomponent.h"
 #include "ui_interpolationsetupcomponent.h"
-#include "blackgui/views/interpolationsetupview.h"
-#include "blackgui/guiapplication.h"
+#include "gui/views/interpolationsetupview.h"
+#include "gui/guiapplication.h"
 #include "core/context/contextsimulator.h"
 #include "misc/simulation/interpolation/interpolationsetuplist.h"
 #include "misc/statusmessage.h"
 #include <QPointer>
 
-using namespace BlackGui::Views;
+using namespace swift::gui::views;
 using namespace swift::misc;
 using namespace swift::misc::aviation;
 using namespace swift::misc::simulation;
 using namespace swift::core::context;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CInterpolationSetupComponent::CInterpolationSetupComponent(QWidget *parent) : COverlayMessagesFrame(parent),
                                                                                   ui(new Ui::CInterpolationSetupComponent)
diff --git a/src/blackgui/components/interpolationsetupcomponent.h b/src/gui/components/interpolationsetupcomponent.h
similarity index 92%
rename from src/blackgui/components/interpolationsetupcomponent.h
rename to src/gui/components/interpolationsetupcomponent.h
index 300f4f342..012edd897 100644
--- a/src/blackgui/components/interpolationsetupcomponent.h
+++ b/src/gui/components/interpolationsetupcomponent.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_INTERPOLATIONSETUPCOMPONENT_H
-#define BLACKGUI_COMPONENTS_INTERPOLATIONSETUPCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_INTERPOLATIONSETUPCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_INTERPOLATIONSETUPCOMPONENT_H
 
 #include "misc/simulation/interpolation/interpolationsetuplist.h"
-#include "blackgui/overlaymessagesframe.h"
+#include "gui/overlaymessagesframe.h"
 #include <QFrame>
 #include <QScopedPointer>
 #include <QModelIndex>
@@ -16,7 +16,7 @@ namespace Ui
 {
     class CInterpolationSetupComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! Setup component
     class CInterpolationSetupComponent : public COverlayMessagesFrame
diff --git a/src/blackgui/components/interpolationsetupcomponent.ui b/src/gui/components/interpolationsetupcomponent.ui
similarity index 89%
rename from src/blackgui/components/interpolationsetupcomponent.ui
rename to src/gui/components/interpolationsetupcomponent.ui
index d1a7d4be5..6196e6fe7 100644
--- a/src/blackgui/components/interpolationsetupcomponent.ui
+++ b/src/gui/components/interpolationsetupcomponent.ui
@@ -27,7 +27,7 @@
     <number>2</number>
    </property>
    <item>
-    <widget class="BlackGui::Views::CInterpolationSetupView" name="tvp_InterpolationSetup">
+    <widget class="swift::gui::views::CInterpolationSetupView" name="tvp_InterpolationSetup">
      <property name="selectionMode">
       <enum>QAbstractItemView::SingleSelection</enum>
      </property>
@@ -64,7 +64,7 @@
        <number>0</number>
       </property>
       <item>
-       <widget class="BlackGui::Components::CCallsignCompleter" name="comp_CallsignCompleter">
+       <widget class="swift::gui::components::CCallsignCompleter" name="comp_CallsignCompleter">
         <property name="sizePolicy">
          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
           <horstretch>0</horstretch>
@@ -101,7 +101,7 @@
     </widget>
    </item>
    <item alignment="Qt::AlignTop">
-    <widget class="BlackGui::Editors::CInterpolationSetupForm" name="form_InterpolationSetup">
+    <widget class="swift::gui::editors::CInterpolationSetupForm" name="form_InterpolationSetup">
      <property name="minimumSize">
       <size>
        <width>0</width>
@@ -192,20 +192,20 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CCallsignCompleter</class>
+   <class>swift::gui::components::CCallsignCompleter</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/callsigncompleter.h</header>
+   <header>gui/components/callsigncompleter.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Views::CInterpolationSetupView</class>
+   <class>swift::gui::views::CInterpolationSetupView</class>
    <extends>QTableView</extends>
-   <header>blackgui/views/interpolationsetupview.h</header>
+   <header>gui/views/interpolationsetupview.h</header>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Editors::CInterpolationSetupForm</class>
+   <class>swift::gui::editors::CInterpolationSetupForm</class>
    <extends>QFrame</extends>
-   <header>blackgui/editors/interpolationsetupform.h</header>
+   <header>gui/editors/interpolationsetupform.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/legalinfocomponent.cpp b/src/gui/components/legalinfocomponent.cpp
similarity index 97%
rename from src/blackgui/components/legalinfocomponent.cpp
rename to src/gui/components/legalinfocomponent.cpp
index fb4e6958a..8da917bbe 100644
--- a/src/blackgui/components/legalinfocomponent.cpp
+++ b/src/gui/components/legalinfocomponent.cpp
@@ -4,7 +4,7 @@
 #include "legalinfocomponent.h"
 #include "ui_legalinfocomponent.h"
 
-#include "blackgui/guiapplication.h"
+#include "gui/guiapplication.h"
 #include "core/data/globalsetup.h"
 #include "misc/network/url.h"
 #include "misc/logmessage.h"
@@ -18,7 +18,7 @@ using namespace swift::misc::network;
 using namespace swift::core::data;
 using namespace swift::config;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CLegalInfoComponent::CLegalInfoComponent(QWidget *parent) : COverlayMessagesFrame(parent),
                                                                 ui(new Ui::CLegalInfoComponent)
diff --git a/src/blackgui/components/legalinfocomponent.h b/src/gui/components/legalinfocomponent.h
similarity index 90%
rename from src/blackgui/components/legalinfocomponent.h
rename to src/gui/components/legalinfocomponent.h
index 0e7788041..fb847ca14 100644
--- a/src/blackgui/components/legalinfocomponent.h
+++ b/src/gui/components/legalinfocomponent.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_LEGALINFOCOMPONENT_H
-#define BLACKGUI_COMPONENTS_LEGALINFOCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_LEGALINFOCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_LEGALINFOCOMPONENT_H
 
-#include "blackgui/overlaymessagesframe.h"
+#include "gui/overlaymessagesframe.h"
 #include "core/application/applicationsettings.h"
 #include <QFrame>
 #include <QScopedPointer>
@@ -16,7 +16,7 @@ namespace Ui
 {
     class CLegalInfoComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * swift legal information
diff --git a/src/blackgui/components/legalinfocomponent.ui b/src/gui/components/legalinfocomponent.ui
similarity index 91%
rename from src/blackgui/components/legalinfocomponent.ui
rename to src/gui/components/legalinfocomponent.ui
index d7d15fe4a..25a6a2dbb 100644
--- a/src/blackgui/components/legalinfocomponent.ui
+++ b/src/gui/components/legalinfocomponent.ui
@@ -38,7 +38,7 @@
     </widget>
    </item>
    <item>
-    <widget class="BlackGui::Components::CAboutHtmlComponent" name="comp_AboutHTML">
+    <widget class="swift::gui::components::CAboutHtmlComponent" name="comp_AboutHTML">
      <property name="minimumSize">
       <size>
        <width>0</width>
@@ -71,9 +71,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CAboutHtmlComponent</class>
+   <class>swift::gui::components::CAboutHtmlComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/abouthtmlcomponent.h</header>
+   <header>gui/components/abouthtmlcomponent.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/logcomponent.cpp b/src/gui/components/logcomponent.cpp
similarity index 90%
rename from src/blackgui/components/logcomponent.cpp
rename to src/gui/components/logcomponent.cpp
index 6c9e7d050..b402e32bf 100644
--- a/src/blackgui/components/logcomponent.cpp
+++ b/src/gui/components/logcomponent.cpp
@@ -1,12 +1,12 @@
 // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/logcomponent.h"
-#include "blackgui/components/statusmessageform.h"
-#include "blackgui/menus/menuaction.h"
-#include "blackgui/views/statusmessageview.h"
-#include "blackgui/views/viewbase.h"
-#include "blackgui/guiutility.h"
+#include "gui/components/logcomponent.h"
+#include "gui/components/statusmessageform.h"
+#include "gui/menus/menuaction.h"
+#include "gui/views/statusmessageview.h"
+#include "gui/views/viewbase.h"
+#include "gui/guiutility.h"
 #include "core/application.h"
 #include "misc/icons.h"
 #include "misc/logpattern.h"
@@ -21,11 +21,11 @@
 
 using namespace swift::misc;
 using namespace swift::core;
-using namespace BlackGui;
-using namespace BlackGui::Views;
-using namespace BlackGui::Menus;
+using namespace swift::gui;
+using namespace swift::gui::views;
+using namespace swift::gui::menus;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CConsoleTextEdit::CConsoleTextEdit(QWidget *parent) : QPlainTextEdit(parent)
     {
diff --git a/src/blackgui/components/logcomponent.h b/src/gui/components/logcomponent.h
similarity index 64%
rename from src/blackgui/components/logcomponent.h
rename to src/gui/components/logcomponent.h
index fdcb20e74..9c3a87c9d 100644
--- a/src/blackgui/components/logcomponent.h
+++ b/src/gui/components/logcomponent.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_LOGCOMPONENT_H
-#define BLACKGUI_LOGCOMPONENT_H
+#ifndef SWIFT_GUI_LOGCOMPONENT_H
+#define SWIFT_GUI_LOGCOMPONENT_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include "misc/loghistory.h"
 #include "misc/statusmessagelist.h"
 
@@ -24,10 +24,10 @@ namespace Ui
 {
     class CLogComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! Text edit for our log component
-    class BLACKGUI_EXPORT CConsoleTextEdit : public QPlainTextEdit
+    class SWIFT_GUI_EXPORT CConsoleTextEdit : public QPlainTextEdit
     {
         Q_OBJECT
 
@@ -41,7 +41,7 @@ namespace BlackGui::Components
     };
 
     //! GUI displaying log and status messages
-    class BLACKGUI_EXPORT CLogComponent : public QFrame
+    class SWIFT_GUI_EXPORT CLogComponent : public QFrame
     {
         Q_OBJECT
 
@@ -55,28 +55,28 @@ namespace BlackGui::Components
         //! Display log
         void displayLog(bool attention = false);
 
-        //! \copydoc BlackGui::Components::CStatusMessagesDetail::filterUseRadioButtonDescriptiveIcons
+        //! \copydoc swift::gui::components::CStatusMessagesDetail::filterUseRadioButtonDescriptiveIcons
         void filterUseRadioButtonDescriptiveIcons(bool oneLetterText);
 
-        //! \copydoc BlackGui::Components::CStatusMessagesDetail::showFilterDialog
+        //! \copydoc swift::gui::components::CStatusMessagesDetail::showFilterDialog
         void showFilterDialog();
 
-        //! \copydoc BlackGui::Components::CStatusMessagesDetail::showFilterBar
+        //! \copydoc swift::gui::components::CStatusMessagesDetail::showFilterBar
         void showFilterBar();
 
-        //! \copydoc BlackGui::Components::CStatusMessagesDetail::hideFilterBar
+        //! \copydoc swift::gui::components::CStatusMessagesDetail::hideFilterBar
         void hideFilterBar();
 
-        //! \copydoc BlackGui::Components::CStatusMessagesDetail::showDetails
+        //! \copydoc swift::gui::components::CStatusMessagesDetail::showDetails
         void showDetails(bool details);
 
-        //! \copydoc BlackGui::Components::CStatusMessagesDetail::setMaxLogMessages
+        //! \copydoc swift::gui::components::CStatusMessagesDetail::setMaxLogMessages
         void setMaxLogMessages(int max);
 
-        //! \copydoc BlackGui::Components::CStatusMessagesDetail::setNoSorting
+        //! \copydoc swift::gui::components::CStatusMessagesDetail::setNoSorting
         void setNoSorting();
 
-        //! \copydoc BlackGui::Components::CStatusMessagesDetail::setSorting
+        //! \copydoc swift::gui::components::CStatusMessagesDetail::setSorting
         void setSorting(const swift::misc::CPropertyIndex &propertyIndex, Qt::SortOrder order);
 
         //! Clear
diff --git a/src/blackgui/components/logcomponent.ui b/src/gui/components/logcomponent.ui
similarity index 82%
rename from src/blackgui/components/logcomponent.ui
rename to src/gui/components/logcomponent.ui
index 31c84035b..ee38f463c 100644
--- a/src/blackgui/components/logcomponent.ui
+++ b/src/gui/components/logcomponent.ui
@@ -43,7 +43,7 @@
         <number>0</number>
        </property>
        <item>
-        <widget class="BlackGui::Components::CStatusMessagesDetail" name="comp_StatusMessages"/>
+        <widget class="swift::gui::components::CStatusMessagesDetail" name="comp_StatusMessages"/>
        </item>
       </layout>
      </widget>
@@ -52,14 +52,14 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CConsoleTextEdit</class>
+   <class>swift::gui::components::CConsoleTextEdit</class>
    <extends>QPlainTextEdit</extends>
-   <header>blackgui/components/logcomponent.h</header>
+   <header>gui/components/logcomponent.h</header>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CStatusMessagesDetail</class>
+   <class>swift::gui::components::CStatusMessagesDetail</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/statusmessagesdetail.h</header>
+   <header>gui/components/statusmessagesdetail.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/logincomponent.cpp b/src/gui/components/logincomponent.cpp
similarity index 98%
rename from src/blackgui/components/logincomponent.cpp
rename to src/gui/components/logincomponent.cpp
index 9a47ecd0c..5b011981f 100644
--- a/src/blackgui/components/logincomponent.cpp
+++ b/src/gui/components/logincomponent.cpp
@@ -3,13 +3,13 @@
 
 #include "ui_logincomponent.h"
 #include "logincomponent.h"
-#include "blackgui/components/serverlistselector.h"
-#include "blackgui/editors/serverform.h"
-#include "blackgui/editors/pilotform.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/loginmodebuttons.h"
-#include "blackgui/ticklabel.h"
-#include "blackgui/uppercasevalidator.h"
+#include "gui/components/serverlistselector.h"
+#include "gui/editors/serverform.h"
+#include "gui/editors/pilotform.h"
+#include "gui/guiapplication.h"
+#include "gui/loginmodebuttons.h"
+#include "gui/ticklabel.h"
+#include "gui/uppercasevalidator.h"
 #include "core/context/contextaudio.h"
 #include "core/context/contextnetwork.h"
 #include "core/context/contextownaircraft.h"
@@ -55,9 +55,9 @@ using namespace swift::misc::simulation;
 using namespace swift::core;
 using namespace swift::core::data;
 using namespace swift::core::context;
-using namespace BlackGui;
+using namespace swift::gui;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     const QStringList &CLoginComponent::getLogCategories()
     {
diff --git a/src/blackgui/components/logincomponent.h b/src/gui/components/logincomponent.h
similarity index 95%
rename from src/blackgui/components/logincomponent.h
rename to src/gui/components/logincomponent.h
index 2b03c62db..cb30cbc49 100644
--- a/src/blackgui/components/logincomponent.h
+++ b/src/gui/components/logincomponent.h
@@ -3,14 +3,14 @@
 
 //! \file
 
-#ifndef BLACKGUI_LOGINCOMPONENT_H
-#define BLACKGUI_LOGINCOMPONENT_H
+#ifndef SWIFT_GUI_LOGINCOMPONENT_H
+#define SWIFT_GUI_LOGINCOMPONENT_H
 
 #include "core/vatsim/vatsimsettings.h"
 #include "core/data/networksetup.h"
-#include "blackgui/settings/guisettings.h"
-#include "blackgui/overlaymessagesframe.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/settings/guisettings.h"
+#include "gui/overlaymessagesframe.h"
+#include "gui/swiftguiexport.h"
 #include "misc/simulation/data/lastmodel.h"
 #include "misc/simulation/simulatedaircraft.h"
 #include "misc/aviation/callsign.h"
@@ -39,12 +39,12 @@ namespace swift::misc::simulation
     class CAircraftModel;
     class CSimulatedAircraft;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Login component to flight network
      */
-    class BLACKGUI_EXPORT CLoginComponent : public COverlayMessagesFrame
+    class SWIFT_GUI_EXPORT CLoginComponent : public COverlayMessagesFrame
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/logincomponent.ui b/src/gui/components/logincomponent.ui
similarity index 89%
rename from src/blackgui/components/logincomponent.ui
rename to src/gui/components/logincomponent.ui
index eeb2ca52d..bfbf5a4aa 100644
--- a/src/blackgui/components/logincomponent.ui
+++ b/src/gui/components/logincomponent.ui
@@ -66,7 +66,7 @@
           <number>3</number>
          </property>
          <item>
-          <widget class="BlackGui::Components::CNetworkDetailsComponent" name="comp_NetworkDetails">
+          <widget class="swift::gui::components::CNetworkDetailsComponent" name="comp_NetworkDetails">
            <property name="frameShape">
             <enum>QFrame::Panel</enum>
            </property>
@@ -94,7 +94,7 @@
           <number>2</number>
          </property>
          <item alignment="Qt::AlignTop">
-          <widget class="BlackGui::Editors::CPilotForm" name="form_Pilot">
+          <widget class="swift::gui::editors::CPilotForm" name="form_Pilot">
            <property name="minimumSize">
             <size>
              <width>0</width>
@@ -137,7 +137,7 @@
           <number>2</number>
          </property>
          <item>
-          <widget class="BlackGui::Components::COwnAircraftComponent" name="comp_OwnAircraft">
+          <widget class="swift::gui::components::COwnAircraftComponent" name="comp_OwnAircraft">
            <property name="frameShape">
             <enum>QFrame::StyledPanel</enum>
            </property>
@@ -195,7 +195,7 @@
           <number>2</number>
          </property>
          <item>
-          <widget class="BlackGui::Editors::CServerForm" name="frp_CurrentServer">
+          <widget class="swift::gui::editors::CServerForm" name="frp_CurrentServer">
            <property name="minimumSize">
             <size>
              <width>0</width>
@@ -370,61 +370,61 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Editors::CFsdSetupForm</class>
+   <class>swift::gui::editors::CFsdSetupForm</class>
    <extends>QFrame</extends>
-   <header>blackgui/editors/fsdsetupform.h</header>
+   <header>gui/editors/fsdsetupform.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CServerListSelector</class>
+   <class>swift::gui::components::CServerListSelector</class>
    <extends>QComboBox</extends>
-   <header>blackgui/components/serverlistselector.h</header>
+   <header>gui/components/serverlistselector.h</header>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CNetworkDetailsComponent</class>
+   <class>swift::gui::components::CNetworkDetailsComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/networkdetailscomponent.h</header>
+   <header>gui/components/networkdetailscomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::COwnAircraftComponent</class>
+   <class>swift::gui::components::COwnAircraftComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/ownaircraftcomponent.h</header>
+   <header>gui/components/ownaircraftcomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::CLoginModeButtons</class>
+   <class>swift::gui::CLoginModeButtons</class>
    <extends>QFrame</extends>
-   <header>blackgui/loginmodebuttons.h</header>
+   <header>gui/loginmodebuttons.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::CTickLabel</class>
+   <class>swift::gui::CTickLabel</class>
    <extends>QLabel</extends>
-   <header>blackgui/ticklabel.h</header>
+   <header>gui/ticklabel.h</header>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Editors::CServerForm</class>
+   <class>swift::gui::editors::CServerForm</class>
    <extends>QFrame</extends>
-   <header>blackgui/editors/serverform.h</header>
+   <header>gui/editors/serverform.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CDbAircraftIcaoSelectorComponent</class>
+   <class>swift::gui::components::CDbAircraftIcaoSelectorComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/dbaircrafticaoselectorcomponent.h</header>
+   <header>gui/components/dbaircrafticaoselectorcomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CDbAirlineIcaoSelectorComponent</class>
+   <class>swift::gui::components::CDbAirlineIcaoSelectorComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/dbairlineicaoselectorcomponent.h</header>
+   <header>gui/components/dbairlineicaoselectorcomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Editors::CPilotForm</class>
+   <class>swift::gui::editors::CPilotForm</class>
    <extends>QFrame</extends>
-   <header>blackgui/editors/pilotform.h</header>
+   <header>gui/editors/pilotform.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/maininfoareacomponent.cpp b/src/gui/components/maininfoareacomponent.cpp
similarity index 96%
rename from src/blackgui/components/maininfoareacomponent.cpp
rename to src/gui/components/maininfoareacomponent.cpp
index 42876c621..0677295bb 100644
--- a/src/blackgui/components/maininfoareacomponent.cpp
+++ b/src/gui/components/maininfoareacomponent.cpp
@@ -1,9 +1,9 @@
 // SPDX-FileCopyrightText: Copyright (C) 2014 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/logcomponent.h"
-#include "blackgui/components/maininfoareacomponent.h"
-#include "blackgui/components/settingscomponent.h"
+#include "gui/components/logcomponent.h"
+#include "gui/components/maininfoareacomponent.h"
+#include "gui/components/settingscomponent.h"
 #include "misc/icons.h"
 #include "ui_maininfoareacomponent.h"
 
@@ -11,9 +11,9 @@
 #include <QGuiApplication>
 
 using namespace swift::misc;
-using namespace BlackGui;
+using namespace swift::gui;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CMainInfoAreaComponent::CMainInfoAreaComponent(QWidget *parent) : CInfoArea(parent),
                                                                       ui(new Ui::CMainInfoAreaComponent)
diff --git a/src/blackgui/components/maininfoareacomponent.h b/src/gui/components/maininfoareacomponent.h
similarity index 92%
rename from src/blackgui/components/maininfoareacomponent.h
rename to src/gui/components/maininfoareacomponent.h
index 2728cc4d6..f1255166b 100644
--- a/src/blackgui/components/maininfoareacomponent.h
+++ b/src/gui/components/maininfoareacomponent.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_MAININFOAREACOMPONENT_H
-#define BLACKGUI_MAININFOAREACOMPONENT_H
+#ifndef SWIFT_GUI_MAININFOAREACOMPONENT_H
+#define SWIFT_GUI_MAININFOAREACOMPONENT_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/infoarea.h"
+#include "gui/swiftguiexport.h"
+#include "gui/infoarea.h"
 #include <QObject>
 #include <QScopedPointer>
 #include <QSize>
@@ -19,7 +19,7 @@ namespace Ui
 {
     class CMainInfoAreaComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     // forward declaration to break compile dependency from all components
     class CAircraftComponent;
@@ -36,7 +36,7 @@ namespace BlackGui::Components
     class CUserComponent;
 
     //! Main info area of pilot client
-    class BLACKGUI_EXPORT CMainInfoAreaComponent : public BlackGui::CInfoArea
+    class SWIFT_GUI_EXPORT CMainInfoAreaComponent : public swift::gui::CInfoArea
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/maininfoareacomponent.ui b/src/gui/components/maininfoareacomponent.ui
similarity index 86%
rename from src/blackgui/components/maininfoareacomponent.ui
rename to src/gui/components/maininfoareacomponent.ui
index 92bbcbc39..801bde31c 100644
--- a/src/blackgui/components/maininfoareacomponent.ui
+++ b/src/gui/components/maininfoareacomponent.ui
@@ -16,7 +16,7 @@
     </size>
    </property>
   </widget>
-  <widget class="BlackGui::CDockWidgetInfoArea" name="dwp_Cockpit">
+  <widget class="swift::gui::CDockWidgetInfoArea" name="dwp_Cockpit">
    <property name="minimumSize">
     <size>
      <width>125</width>
@@ -80,7 +80,7 @@
          <number>0</number>
         </property>
         <item>
-         <widget class="BlackGui::Components::CCockpitComponent" name="comp_Cockpit" native="true"/>
+         <widget class="swift::gui::components::CCockpitComponent" name="comp_Cockpit" native="true"/>
         </item>
        </layout>
       </widget>
@@ -88,7 +88,7 @@
     </layout>
    </widget>
   </widget>
-  <widget class="BlackGui::CDockWidgetInfoArea" name="dwp_Aircraft">
+  <widget class="swift::gui::CDockWidgetInfoArea" name="dwp_Aircraft">
    <property name="minimumSize">
     <size>
      <width>165</width>
@@ -152,7 +152,7 @@
          <number>0</number>
         </property>
         <item>
-         <widget class="BlackGui::Components::CAircraftComponent" name="comp_Aircraft"/>
+         <widget class="swift::gui::components::CAircraftComponent" name="comp_Aircraft"/>
         </item>
        </layout>
       </widget>
@@ -160,7 +160,7 @@
     </layout>
    </widget>
   </widget>
-  <widget class="BlackGui::CDockWidgetInfoArea" name="dwp_AtcStations">
+  <widget class="swift::gui::CDockWidgetInfoArea" name="dwp_AtcStations">
    <property name="minimumSize">
     <size>
      <width>165</width>
@@ -230,7 +230,7 @@
          <number>0</number>
         </property>
         <item>
-         <widget class="BlackGui::Components::CAtcStationComponent" name="comp_AtcStations"/>
+         <widget class="swift::gui::components::CAtcStationComponent" name="comp_AtcStations"/>
         </item>
        </layout>
       </widget>
@@ -238,7 +238,7 @@
     </layout>
    </widget>
   </widget>
-  <widget class="BlackGui::CDockWidgetInfoArea" name="dwp_Users">
+  <widget class="swift::gui::CDockWidgetInfoArea" name="dwp_Users">
    <property name="minimumSize">
     <size>
      <width>163</width>
@@ -299,7 +299,7 @@
          <number>0</number>
         </property>
         <item>
-         <widget class="BlackGui::Components::CUserComponent" name="comp_Users"/>
+         <widget class="swift::gui::components::CUserComponent" name="comp_Users"/>
         </item>
        </layout>
       </widget>
@@ -307,7 +307,7 @@
     </layout>
    </widget>
   </widget>
-  <widget class="BlackGui::CDockWidgetInfoArea" name="dwp_TextMessages">
+  <widget class="swift::gui::CDockWidgetInfoArea" name="dwp_TextMessages">
    <property name="minimumSize">
     <size>
      <width>127</width>
@@ -341,7 +341,7 @@
       <number>0</number>
      </property>
      <item>
-      <widget class="BlackGui::Components::CTextMessageComponent" name="comp_TextMessages">
+      <widget class="swift::gui::components::CTextMessageComponent" name="comp_TextMessages">
        <property name="frameShape">
         <enum>QFrame::NoFrame</enum>
        </property>
@@ -356,7 +356,7 @@
     </layout>
    </widget>
   </widget>
-  <widget class="BlackGui::CDockWidgetInfoArea" name="dwp_Simulator">
+  <widget class="swift::gui::CDockWidgetInfoArea" name="dwp_Simulator">
    <property name="minimumSize">
     <size>
      <width>165</width>
@@ -417,7 +417,7 @@
          <number>0</number>
         </property>
         <item>
-         <widget class="BlackGui::Components::CSimulatorComponent" name="comp_Simulator"/>
+         <widget class="swift::gui::components::CSimulatorComponent" name="comp_Simulator"/>
         </item>
        </layout>
       </widget>
@@ -425,7 +425,7 @@
     </layout>
    </widget>
   </widget>
-  <widget class="BlackGui::CDockWidgetInfoArea" name="dwp_FlightPlan">
+  <widget class="swift::gui::CDockWidgetInfoArea" name="dwp_FlightPlan">
    <property name="minimumSize">
     <size>
      <width>165</width>
@@ -474,7 +474,7 @@
          <number>0</number>
         </property>
         <item>
-         <widget class="BlackGui::Components::CFlightPlanComponent" name="comp_FlightPlan"/>
+         <widget class="swift::gui::components::CFlightPlanComponent" name="comp_FlightPlan"/>
         </item>
        </layout>
       </widget>
@@ -482,7 +482,7 @@
     </layout>
    </widget>
   </widget>
-  <widget class="BlackGui::CDockWidgetInfoArea" name="dwp_Rendering">
+  <widget class="swift::gui::CDockWidgetInfoArea" name="dwp_Rendering">
    <property name="allowedAreas">
     <set>Qt::NoDockWidgetArea</set>
    </property>
@@ -528,7 +528,7 @@
          <number>0</number>
         </property>
         <item>
-         <widget class="BlackGui::Components::CMappingComponent" name="comp_Mappings"/>
+         <widget class="swift::gui::components::CMappingComponent" name="comp_Mappings"/>
         </item>
        </layout>
       </widget>
@@ -536,7 +536,7 @@
     </layout>
    </widget>
   </widget>
-  <widget class="BlackGui::CDockWidgetInfoArea" name="dwp_Interpolation">
+  <widget class="swift::gui::CDockWidgetInfoArea" name="dwp_Interpolation">
    <property name="allowedAreas">
     <set>Qt::NoDockWidgetArea</set>
    </property>
@@ -576,7 +576,7 @@
          <number>0</number>
         </property>
         <item>
-         <widget class="BlackGui::Components::CInterpolationComponent" name="comp_Interpolation">
+         <widget class="swift::gui::components::CInterpolationComponent" name="comp_Interpolation">
           <property name="minimumSize">
            <size>
             <width>125</width>
@@ -591,7 +591,7 @@
     </layout>
    </widget>
   </widget>
-  <widget class="BlackGui::CDockWidgetInfoArea" name="dwp_Settings">
+  <widget class="swift::gui::CDockWidgetInfoArea" name="dwp_Settings">
    <property name="minimumSize">
     <size>
      <width>165</width>
@@ -652,7 +652,7 @@
          <number>0</number>
         </property>
         <item>
-         <widget class="BlackGui::Components::CSettingsComponent" name="comp_Settings"/>
+         <widget class="swift::gui::components::CSettingsComponent" name="comp_Settings"/>
         </item>
        </layout>
       </widget>
@@ -660,7 +660,7 @@
     </layout>
    </widget>
   </widget>
-  <widget class="BlackGui::CDockWidgetInfoArea" name="dwp_Log">
+  <widget class="swift::gui::CDockWidgetInfoArea" name="dwp_Log">
    <property name="minimumSize">
     <size>
      <width>125</width>
@@ -712,7 +712,7 @@
          <number>0</number>
         </property>
         <item>
-         <widget class="BlackGui::Components::CLogComponent" name="comp_Log"/>
+         <widget class="swift::gui::components::CLogComponent" name="comp_Log"/>
         </item>
        </layout>
       </widget>
@@ -720,7 +720,7 @@
     </layout>
    </widget>
   </widget>
-  <widget class="BlackGui::CDockWidgetInfoArea" name="dwp_Radar">
+  <widget class="swift::gui::CDockWidgetInfoArea" name="dwp_Radar">
    <property name="minimumSize">
     <size>
      <width>165</width>
@@ -772,7 +772,7 @@
          <number>0</number>
         </property>
         <item>
-         <widget class="BlackGui::Components::CRadarComponent" name="comp_Radar"/>
+         <widget class="swift::gui::components::CRadarComponent" name="comp_Radar"/>
         </item>
        </layout>
       </widget>
@@ -783,81 +783,81 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::CDockWidgetInfoArea</class>
+   <class>swift::gui::CDockWidgetInfoArea</class>
    <extends>QDockWidget</extends>
-   <header>blackgui/dockwidgetinfoarea.h</header>
+   <header>gui/dockwidgetinfoarea.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CAtcStationComponent</class>
+   <class>swift::gui::components::CAtcStationComponent</class>
    <extends>QTabWidget</extends>
-   <header>blackgui/components/atcstationcomponent.h</header>
+   <header>gui/components/atcstationcomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CAircraftComponent</class>
+   <class>swift::gui::components::CAircraftComponent</class>
    <extends>QTabWidget</extends>
-   <header>blackgui/components/aircraftcomponent.h</header>
+   <header>gui/components/aircraftcomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CFlightPlanComponent</class>
+   <class>swift::gui::components::CFlightPlanComponent</class>
    <extends>QTabWidget</extends>
-   <header>blackgui/components/flightplancomponent.h</header>
+   <header>gui/components/flightplancomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CUserComponent</class>
+   <class>swift::gui::components::CUserComponent</class>
    <extends>QTabWidget</extends>
-   <header>blackgui/components/usercomponent.h</header>
+   <header>gui/components/usercomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CSettingsComponent</class>
+   <class>swift::gui::components::CSettingsComponent</class>
    <extends>QTabWidget</extends>
-   <header>blackgui/components/settingscomponent.h</header>
+   <header>gui/components/settingscomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CLogComponent</class>
+   <class>swift::gui::components::CLogComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/logcomponent.h</header>
+   <header>gui/components/logcomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CSimulatorComponent</class>
+   <class>swift::gui::components::CSimulatorComponent</class>
    <extends>QTabWidget</extends>
-   <header>blackgui/components/simulatorcomponent.h</header>
+   <header>gui/components/simulatorcomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CCockpitComponent</class>
+   <class>swift::gui::components::CCockpitComponent</class>
    <extends>QWidget</extends>
-   <header>blackgui/components/cockpitcomponent.h</header>
+   <header>gui/components/cockpitcomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CTextMessageComponent</class>
+   <class>swift::gui::components::CTextMessageComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/textmessagecomponent.h</header>
+   <header>gui/components/textmessagecomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CMappingComponent</class>
+   <class>swift::gui::components::CMappingComponent</class>
    <extends>QTabWidget</extends>
-   <header>blackgui/components/mappingcomponent.h</header>
+   <header>gui/components/mappingcomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CInterpolationComponent</class>
+   <class>swift::gui::components::CInterpolationComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/interpolationcomponent.h</header>
+   <header>gui/components/interpolationcomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CRadarComponent</class>
+   <class>swift::gui::components::CRadarComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/radarcomponent.h</header>
+   <header>gui/components/radarcomponent.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/mainkeypadareacomponent.cpp b/src/gui/components/mainkeypadareacomponent.cpp
similarity index 99%
rename from src/blackgui/components/mainkeypadareacomponent.cpp
rename to src/gui/components/mainkeypadareacomponent.cpp
index 35faa7f10..53b096aa8 100644
--- a/src/blackgui/components/mainkeypadareacomponent.cpp
+++ b/src/gui/components/mainkeypadareacomponent.cpp
@@ -6,8 +6,8 @@
 #include "core/context/contextnetwork.h"
 #include "core/context/contextownaircraft.h"
 #include "core/corefacade.h"
-#include "blackgui/components/mainkeypadareacomponent.h"
-#include "blackgui/guiapplication.h"
+#include "gui/components/mainkeypadareacomponent.h"
+#include "gui/guiapplication.h"
 #include "misc/aviation/transponder.h"
 #include "misc/simulation/simulatedaircraft.h"
 #include "ui_mainkeypadareacomponent.h"
@@ -24,7 +24,7 @@ using namespace swift::misc::simulation;
 using namespace swift::core;
 using namespace swift::core::context;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CMainKeypadAreaComponent::CMainKeypadAreaComponent(QWidget *parent) : QFrame(parent),
                                                                           ui(new Ui::CMainKeypadAreaComponent)
diff --git a/src/blackgui/components/mainkeypadareacomponent.h b/src/gui/components/mainkeypadareacomponent.h
similarity index 91%
rename from src/blackgui/components/mainkeypadareacomponent.h
rename to src/gui/components/mainkeypadareacomponent.h
index a69d35792..9a4d50e49 100644
--- a/src/blackgui/components/mainkeypadareacomponent.h
+++ b/src/gui/components/mainkeypadareacomponent.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_MAINKEYPADAREACOMPONENT_H
-#define BLACKGUI_MAINKEYPADAREACOMPONENT_H
+#ifndef SWIFT_GUI_MAINKEYPADAREACOMPONENT_H
+#define SWIFT_GUI_MAINKEYPADAREACOMPONENT_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/components/maininfoareacomponent.h"
+#include "gui/swiftguiexport.h"
+#include "gui/components/maininfoareacomponent.h"
 #include "misc/identifier.h"
 #include "misc/network/connectionstatus.h"
 
@@ -27,11 +27,11 @@ namespace Ui
 {
     class CMainKeypadAreaComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! Main keypad area as used with main info area
     //! \sa CMainInfoAreaComponent
-    class BLACKGUI_EXPORT CMainKeypadAreaComponent : public QFrame
+    class SWIFT_GUI_EXPORT CMainKeypadAreaComponent : public QFrame
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/mainkeypadareacomponent.ui b/src/gui/components/mainkeypadareacomponent.ui
similarity index 98%
rename from src/blackgui/components/mainkeypadareacomponent.ui
rename to src/gui/components/mainkeypadareacomponent.ui
index 5e56c5f9c..477d26ab9 100644
--- a/src/blackgui/components/mainkeypadareacomponent.ui
+++ b/src/gui/components/mainkeypadareacomponent.ui
@@ -57,7 +57,7 @@
        <number>2</number>
       </property>
       <item row="0" column="0" colspan="5">
-       <widget class="BlackGui::Components::CCommandInput" name="lep_CommandLineInput">
+       <widget class="swift::gui::components::CCommandInput" name="lep_CommandLineInput">
         <property name="minimumSize">
          <size>
           <width>0</width>
@@ -389,9 +389,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CCommandInput</class>
+   <class>swift::gui::components::CCommandInput</class>
    <extends>QLineEdit</extends>
-   <header>blackgui/components/commandinput.h</header>
+   <header>gui/components/commandinput.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/mappingcomponent.cpp b/src/gui/components/mappingcomponent.cpp
similarity index 97%
rename from src/blackgui/components/mappingcomponent.cpp
rename to src/gui/components/mappingcomponent.cpp
index 67d5aadc7..b3b57c092 100644
--- a/src/blackgui/components/mappingcomponent.cpp
+++ b/src/gui/components/mappingcomponent.cpp
@@ -1,15 +1,15 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/mappingcomponent.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/guiutility.h"
-#include "blackgui/models/aircraftmodellistmodel.h"
-#include "blackgui/models/simulatedaircraftlistmodel.h"
-#include "blackgui/views/aircraftmodelview.h"
-#include "blackgui/views/checkboxdelegate.h"
-#include "blackgui/views/simulatedaircraftview.h"
-#include "blackgui/views/viewbase.h"
+#include "gui/components/mappingcomponent.h"
+#include "gui/guiapplication.h"
+#include "gui/guiutility.h"
+#include "gui/models/aircraftmodellistmodel.h"
+#include "gui/models/simulatedaircraftlistmodel.h"
+#include "gui/views/aircraftmodelview.h"
+#include "gui/views/checkboxdelegate.h"
+#include "gui/views/simulatedaircraftview.h"
+#include "gui/views/viewbase.h"
 #include "core/context/contextnetwork.h"
 #include "core/context/contextsimulator.h"
 #include "misc/network/connectionstatus.h"
@@ -42,12 +42,12 @@ using namespace swift::misc::aviation;
 using namespace swift::misc::physical_quantities;
 using namespace swift::core;
 using namespace swift::core::context;
-using namespace BlackGui::Views;
-using namespace BlackGui::Models;
-using namespace BlackGui::Filters;
-using namespace BlackGui::Settings;
+using namespace swift::gui::views;
+using namespace swift::gui::models;
+using namespace swift::gui::filters;
+using namespace swift::gui::settings;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     const QStringList &CMappingComponent::getLogCategories()
     {
diff --git a/src/blackgui/components/mappingcomponent.h b/src/gui/components/mappingcomponent.h
similarity index 92%
rename from src/blackgui/components/mappingcomponent.h
rename to src/gui/components/mappingcomponent.h
index d9c2e13d5..e623c27b9 100644
--- a/src/blackgui/components/mappingcomponent.h
+++ b/src/gui/components/mappingcomponent.h
@@ -3,13 +3,13 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_MAPPINGCOMPONENT_H
-#define BLACKGUI_COMPONENTS_MAPPINGCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_MAPPINGCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_MAPPINGCOMPONENT_H
 
-#include "blackgui/settings/viewupdatesettings.h"
-#include "blackgui/overlaymessagesframe.h"
-#include "blackgui/enablefordockwidgetinfoarea.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/settings/viewupdatesettings.h"
+#include "gui/overlaymessagesframe.h"
+#include "gui/enablefordockwidgetinfoarea.h"
+#include "gui/swiftguiexport.h"
 #include "misc/tokenbucket.h"
 #include "misc/identifiable.h"
 #include "misc/identifier.h"
@@ -43,16 +43,16 @@ namespace swift::misc
         class CSimulatedAircraft;
     }
 }
-namespace BlackGui
+namespace swift::gui
 {
-    namespace Views
+    namespace views
     {
         class CCheckBoxDelegate;
     }
-    namespace Components
+    namespace components
     {
         //! Mappings, models etc.
-        class BLACKGUI_EXPORT CMappingComponent :
+        class SWIFT_GUI_EXPORT CMappingComponent :
             public COverlayMessagesFrame,
             public CEnableForDockWidgetInfoArea,
             public swift::misc::CIdentifiable
@@ -188,8 +188,8 @@ namespace BlackGui
             QTimer m_updateTimer;
             bool m_missedRenderedAircraftUpdate = true; //! Rendered aircraft need update
             swift::misc::CTokenBucket m_bucket { 3, 5000, 1 };
-            swift::misc::CSettingReadOnly<Settings::TViewUpdateSettings> m_settings { this, &CMappingComponent::settingsChanged }; //!< settings changed
-            Views::CCheckBoxDelegate *m_currentMappingsViewDelegate = nullptr; //! checkbox in view
+            swift::misc::CSettingReadOnly<settings::TViewUpdateSettings> m_settings { this, &CMappingComponent::settingsChanged }; //!< settings changed
+            views::CCheckBoxDelegate *m_currentMappingsViewDelegate = nullptr; //! checkbox in view
         };
     } // namespace
 } // namespace
diff --git a/src/blackgui/components/mappingcomponent.ui b/src/gui/components/mappingcomponent.ui
similarity index 88%
rename from src/blackgui/components/mappingcomponent.ui
rename to src/gui/components/mappingcomponent.ui
index 572f0281d..f06bb5f7d 100644
--- a/src/blackgui/components/mappingcomponent.ui
+++ b/src/gui/components/mappingcomponent.ui
@@ -53,7 +53,7 @@
          <number>0</number>
         </property>
         <item>
-         <widget class="BlackGui::Views::CSimulatedAircraftView" name="tvp_RenderedAircraft">
+         <widget class="swift::gui::views::CSimulatedAircraftView" name="tvp_RenderedAircraft">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
             <horstretch>0</horstretch>
@@ -91,7 +91,7 @@
          <number>0</number>
         </property>
         <item>
-         <widget class="BlackGui::Views::CAircraftModelView" name="tvp_AircraftModels">
+         <widget class="swift::gui::views::CAircraftModelView" name="tvp_AircraftModels">
           <property name="selectionMode">
            <enum>QAbstractItemView::SingleSelection</enum>
           </property>
@@ -123,7 +123,7 @@
          <number>0</number>
         </property>
         <item>
-         <widget class="BlackGui::Components::CMatchingStatisticsComponent" name="comp_Statistics"/>
+         <widget class="swift::gui::components::CMatchingStatisticsComponent" name="comp_Statistics"/>
         </item>
        </layout>
       </widget>
@@ -145,7 +145,7 @@
          <number>0</number>
         </property>
         <item>
-         <widget class="BlackGui::Components::CModelMatcherLogComponent" name="comp_MatchingLog"/>
+         <widget class="swift::gui::components::CModelMatcherLogComponent" name="comp_MatchingLog"/>
         </item>
        </layout>
       </widget>
@@ -255,7 +255,7 @@
         </widget>
        </item>
        <item row="0" column="2">
-        <widget class="BlackGui::Components::CSimulatorSelector" name="comp_SimulatorSelector">
+        <widget class="swift::gui::components::CSimulatorSelector" name="comp_SimulatorSelector">
          <property name="minimumSize">
           <size>
            <width>50</width>
@@ -265,7 +265,7 @@
         </widget>
        </item>
        <item row="2" column="0" colspan="6">
-        <widget class="BlackGui::Components::CAircraftModelStringCompleter" name="completer_ModelStrings">
+        <widget class="swift::gui::components::CAircraftModelStringCompleter" name="completer_ModelStrings">
          <property name="minimumSize">
           <size>
            <width>0</width>
@@ -305,37 +305,37 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Views::CAircraftModelView</class>
+   <class>swift::gui::views::CAircraftModelView</class>
    <extends>QTableView</extends>
-   <header>blackgui/views/aircraftmodelview.h</header>
+   <header>gui/views/aircraftmodelview.h</header>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CSimulatorSelector</class>
+   <class>swift::gui::components::CSimulatorSelector</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/simulatorselector.h</header>
+   <header>gui/components/simulatorselector.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Views::CSimulatedAircraftView</class>
+   <class>swift::gui::views::CSimulatedAircraftView</class>
    <extends>QTableView</extends>
-   <header>blackgui/views/simulatedaircraftview.h</header>
+   <header>gui/views/simulatedaircraftview.h</header>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CModelMatcherLogComponent</class>
+   <class>swift::gui::components::CModelMatcherLogComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/modelmatcherlogcomponent.h</header>
+   <header>gui/components/modelmatcherlogcomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CAircraftModelStringCompleter</class>
+   <class>swift::gui::components::CAircraftModelStringCompleter</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/aircraftmodelstringcompleter.h</header>
+   <header>gui/components/aircraftmodelstringcompleter.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CMatchingStatisticsComponent</class>
+   <class>swift::gui::components::CMatchingStatisticsComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/matchingstatisticscomponent.h</header>
+   <header>gui/components/matchingstatisticscomponent.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/marginsinput.cpp b/src/gui/components/marginsinput.cpp
similarity index 96%
rename from src/blackgui/components/marginsinput.cpp
rename to src/gui/components/marginsinput.cpp
index 5b593af9c..99e488b45 100644
--- a/src/blackgui/components/marginsinput.cpp
+++ b/src/gui/components/marginsinput.cpp
@@ -3,10 +3,10 @@
 
 #include "marginsinput.h"
 #include "ui_marginsinput.h"
-#include "blackgui/stylesheetutility.h"
+#include "gui/stylesheetutility.h"
 #include <QIntValidator>
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CMarginsInput::CMarginsInput(QWidget *parent) : QFrame(parent),
                                                     ui(new Ui::CMarginsInput)
diff --git a/src/blackgui/components/marginsinput.h b/src/gui/components/marginsinput.h
similarity index 88%
rename from src/blackgui/components/marginsinput.h
rename to src/gui/components/marginsinput.h
index 4da2661bd..8a28b6b68 100644
--- a/src/blackgui/components/marginsinput.h
+++ b/src/gui/components/marginsinput.h
@@ -3,8 +3,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_MARGINSINPUT_H
-#define BLACKGUI_COMPONENTS_MARGINSINPUT_H
+#ifndef SWIFT_GUI_COMPONENTS_MARGINSINPUT_H
+#define SWIFT_GUI_COMPONENTS_MARGINSINPUT_H
 
 #include <QFrame>
 #include <QMargins>
@@ -15,7 +15,7 @@ namespace Ui
     class CMarginsInput;
 }
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Widget alows to enter margins
diff --git a/src/blackgui/components/marginsinput.ui b/src/gui/components/marginsinput.ui
similarity index 100%
rename from src/blackgui/components/marginsinput.ui
rename to src/gui/components/marginsinput.ui
diff --git a/src/blackgui/components/matchingstatisticscomponent.cpp b/src/gui/components/matchingstatisticscomponent.cpp
similarity index 94%
rename from src/blackgui/components/matchingstatisticscomponent.cpp
rename to src/gui/components/matchingstatisticscomponent.cpp
index e0925ae8f..8d2f7e91d 100644
--- a/src/blackgui/components/matchingstatisticscomponent.cpp
+++ b/src/gui/components/matchingstatisticscomponent.cpp
@@ -3,14 +3,14 @@
 
 #include "matchingstatisticscomponent.h"
 #include "ui_matchingstatisticscomponent.h"
-#include "blackgui/guiapplication.h"
+#include "gui/guiapplication.h"
 #include "core/context/contextsimulator.h"
 
 using namespace swift::misc::simulation;
 using namespace swift::core::context;
-using namespace BlackGui::Views;
+using namespace swift::gui::views;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CMatchingStatisticsComponent::CMatchingStatisticsComponent(QWidget *parent) : QFrame(parent),
                                                                                   ui(new Ui::CMatchingStatisticsComponent)
diff --git a/src/blackgui/components/matchingstatisticscomponent.h b/src/gui/components/matchingstatisticscomponent.h
similarity index 83%
rename from src/blackgui/components/matchingstatisticscomponent.h
rename to src/gui/components/matchingstatisticscomponent.h
index 9c89a67fa..7afdf2bc7 100644
--- a/src/blackgui/components/matchingstatisticscomponent.h
+++ b/src/gui/components/matchingstatisticscomponent.h
@@ -3,8 +3,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_MATCHINGSTATISTICSCOMPONENT_H
-#define BLACKGUI_COMPONENTS_MATCHINGSTATISTICSCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_MATCHINGSTATISTICSCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_MATCHINGSTATISTICSCOMPONENT_H
 
 #include <QFrame>
 #include <QScopedPointer>
@@ -13,7 +13,7 @@ namespace Ui
 {
     class CMatchingStatisticsComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Show statistics about matching results
diff --git a/src/blackgui/components/matchingstatisticscomponent.ui b/src/gui/components/matchingstatisticscomponent.ui
similarity index 92%
rename from src/blackgui/components/matchingstatisticscomponent.ui
rename to src/gui/components/matchingstatisticscomponent.ui
index e8464aee3..75bfa4fab 100644
--- a/src/blackgui/components/matchingstatisticscomponent.ui
+++ b/src/gui/components/matchingstatisticscomponent.ui
@@ -27,7 +27,7 @@
     <number>0</number>
    </property>
    <item>
-    <widget class="BlackGui::Views::CMatchingStatisticsView" name="tvp_MatchingStatistics">
+    <widget class="swift::gui::views::CMatchingStatisticsView" name="tvp_MatchingStatistics">
      <property name="selectionMode">
       <enum>QAbstractItemView::NoSelection</enum>
      </property>
@@ -101,9 +101,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Views::CMatchingStatisticsView</class>
+   <class>swift::gui::views::CMatchingStatisticsView</class>
    <extends>QTableView</extends>
-   <header>blackgui/views/matchingstatisticsview.h</header>
+   <header>gui/views/matchingstatisticsview.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/src/blackgui/components/modelbrowsercomponent.cpp b/src/gui/components/modelbrowsercomponent.cpp
similarity index 98%
rename from src/blackgui/components/modelbrowsercomponent.cpp
rename to src/gui/components/modelbrowsercomponent.cpp
index d35aa74c3..d70a84d7b 100644
--- a/src/blackgui/components/modelbrowsercomponent.cpp
+++ b/src/gui/components/modelbrowsercomponent.cpp
@@ -3,7 +3,7 @@
 
 #include "modelbrowsercomponent.h"
 #include "ui_modelbrowsercomponent.h"
-#include "blackgui/guiapplication.h"
+#include "gui/guiapplication.h"
 #include "core/context/contextownaircraft.h"
 #include "core/context/contextsimulator.h"
 #include "misc/aviation/heading.h"
@@ -15,12 +15,12 @@ using namespace swift::misc::aviation;
 using namespace swift::misc::simulation;
 using namespace swift::misc::physical_quantities;
 using namespace swift::misc::geo;
-using namespace BlackGui::Editors;
-using namespace BlackGui::Views;
+using namespace swift::gui::editors;
+using namespace swift::gui::views;
 using namespace swift::core;
 using namespace swift::core::context;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CModelBrowserComponent::CModelBrowserComponent(QWidget *parent) : QFrame(parent),
                                                                       ui(new Ui::CModelBrowserComponent)
diff --git a/src/blackgui/components/modelbrowsercomponent.h b/src/gui/components/modelbrowsercomponent.h
similarity index 91%
rename from src/blackgui/components/modelbrowsercomponent.h
rename to src/gui/components/modelbrowsercomponent.h
index 6ed033930..d66f08423 100644
--- a/src/blackgui/components/modelbrowsercomponent.h
+++ b/src/gui/components/modelbrowsercomponent.h
@@ -3,8 +3,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_MODELBROWSERCOMPONENT_H
-#define BLACKGUI_COMPONENTS_MODELBROWSERCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_MODELBROWSERCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_MODELBROWSERCOMPONENT_H
 
 #include <QFrame>
 #include <QScopedPointer>
@@ -17,7 +17,7 @@ namespace Ui
 {
     class CModelBrowserComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! Allow to browse thru the model set
     class CModelBrowserComponent : public QFrame
diff --git a/src/blackgui/components/modelbrowsercomponent.ui b/src/gui/components/modelbrowsercomponent.ui
similarity index 90%
rename from src/blackgui/components/modelbrowsercomponent.ui
rename to src/gui/components/modelbrowsercomponent.ui
index b6fd5f3e3..c5d21c398 100644
--- a/src/blackgui/components/modelbrowsercomponent.ui
+++ b/src/gui/components/modelbrowsercomponent.ui
@@ -55,7 +55,7 @@
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_4">
           <item>
-           <widget class="BlackGui::Views::CAircraftModelView" name="tvp_AircraftModels">
+           <widget class="swift::gui::views::CAircraftModelView" name="tvp_AircraftModels">
             <property name="selectionMode">
              <enum>QAbstractItemView::SingleSelection</enum>
             </property>
@@ -139,7 +139,7 @@
          </property>
          <layout class="QHBoxLayout" name="horizontalLayout">
           <item>
-           <widget class="BlackGui::Editors::CRelativeAircraftPosition" name="editor_RelativePosition"/>
+           <widget class="swift::gui::editors::CRelativeAircraftPosition" name="editor_RelativePosition"/>
           </item>
           <item alignment="Qt::AlignRight">
            <widget class="QPushButton" name="pb_SetRelativePosition">
@@ -158,7 +158,7 @@
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_2">
           <item>
-           <widget class="BlackGui::Editors::CCoordinateForm" name="editor_Coordinate">
+           <widget class="swift::gui::editors::CCoordinateForm" name="editor_Coordinate">
             <property name="minimumSize">
              <size>
               <width>0</width>
@@ -196,7 +196,7 @@
            <number>3</number>
           </property>
           <item>
-           <widget class="BlackGui::Editors::CPbhsForm" name="editor_Pbh">
+           <widget class="swift::gui::editors::CPbhsForm" name="editor_Pbh">
             <property name="frameShape">
              <enum>QFrame::StyledPanel</enum>
             </property>
@@ -215,7 +215,7 @@
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_5">
           <item>
-           <widget class="BlackGui::Editors::CAircraftPartsForm" name="editor_AircraftParts">
+           <widget class="swift::gui::editors::CAircraftPartsForm" name="editor_AircraftParts">
             <property name="minimumSize">
              <size>
               <width>0</width>
@@ -288,32 +288,32 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Editors::CRelativeAircraftPosition</class>
+   <class>swift::gui::editors::CRelativeAircraftPosition</class>
    <extends>QFrame</extends>
-   <header>blackgui/editors/relativeaircraftposition.h</header>
+   <header>gui/editors/relativeaircraftposition.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Editors::CCoordinateForm</class>
+   <class>swift::gui::editors::CCoordinateForm</class>
    <extends>QFrame</extends>
-   <header>blackgui/editors/coordinateform.h</header>
+   <header>gui/editors/coordinateform.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Views::CAircraftModelView</class>
+   <class>swift::gui::views::CAircraftModelView</class>
    <extends>QTableView</extends>
-   <header>blackgui/views/aircraftmodelview.h</header>
+   <header>gui/views/aircraftmodelview.h</header>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Editors::CAircraftPartsForm</class>
+   <class>swift::gui::editors::CAircraftPartsForm</class>
    <extends>QFrame</extends>
-   <header>blackgui/editors/aircraftpartsform.h</header>
+   <header>gui/editors/aircraftpartsform.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Editors::CPbhsForm</class>
+   <class>swift::gui::editors::CPbhsForm</class>
    <extends>QFrame</extends>
-   <header>blackgui/editors/pbhsform.h</header>
+   <header>gui/editors/pbhsform.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/modelbrowserdialog.cpp b/src/gui/components/modelbrowserdialog.cpp
similarity index 92%
rename from src/blackgui/components/modelbrowserdialog.cpp
rename to src/gui/components/modelbrowserdialog.cpp
index f4771ad8f..4d0f33851 100644
--- a/src/blackgui/components/modelbrowserdialog.cpp
+++ b/src/gui/components/modelbrowserdialog.cpp
@@ -3,9 +3,9 @@
 
 #include "modelbrowserdialog.h"
 #include "ui_modelbrowserdialog.h"
-#include "blackgui/guiapplication.h"
+#include "gui/guiapplication.h"
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CModelBrowserDialog::CModelBrowserDialog(QWidget *parent) : QDialog(parent),
                                                                 ui(new Ui::CModelBrowserDialog)
diff --git a/src/blackgui/components/modelbrowserdialog.h b/src/gui/components/modelbrowserdialog.h
similarity index 77%
rename from src/blackgui/components/modelbrowserdialog.h
rename to src/gui/components/modelbrowserdialog.h
index de462b666..c2458d657 100644
--- a/src/blackgui/components/modelbrowserdialog.h
+++ b/src/gui/components/modelbrowserdialog.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_MODELBROWSERDIALOG_H
-#define BLACKGUI_COMPONENTS_MODELBROWSERDIALOG_H
+#ifndef SWIFT_GUI_COMPONENTS_MODELBROWSERDIALOG_H
+#define SWIFT_GUI_COMPONENTS_MODELBROWSERDIALOG_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include <QDialog>
 #include <QScopedPointer>
 
@@ -14,10 +14,10 @@ namespace Ui
 {
     class CModelBrowserDialog;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! Model browser as dialog
-    class BLACKGUI_EXPORT CModelBrowserDialog : public QDialog
+    class SWIFT_GUI_EXPORT CModelBrowserDialog : public QDialog
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/modelbrowserdialog.ui b/src/gui/components/modelbrowserdialog.ui
similarity index 90%
rename from src/blackgui/components/modelbrowserdialog.ui
rename to src/gui/components/modelbrowserdialog.ui
index b4ca3b9d4..5f69d6305 100644
--- a/src/blackgui/components/modelbrowserdialog.ui
+++ b/src/gui/components/modelbrowserdialog.ui
@@ -33,7 +33,7 @@
     <number>4</number>
    </property>
    <item>
-    <widget class="BlackGui::Components::CModelBrowserComponent" name="comp_ModelBrowser"/>
+    <widget class="swift::gui::components::CModelBrowserComponent" name="comp_ModelBrowser"/>
    </item>
    <item>
     <widget class="QDialogButtonBox" name="bb_ModelBrowserDialog">
@@ -49,9 +49,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CModelBrowserComponent</class>
+   <class>swift::gui::components::CModelBrowserComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/modelbrowsercomponent.h</header>
+   <header>gui/components/modelbrowsercomponent.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/modelconverterxsetupcomponent.cpp b/src/gui/components/modelconverterxsetupcomponent.cpp
similarity index 98%
rename from src/blackgui/components/modelconverterxsetupcomponent.cpp
rename to src/gui/components/modelconverterxsetupcomponent.cpp
index 14f8daca8..e357e140e 100644
--- a/src/blackgui/components/modelconverterxsetupcomponent.cpp
+++ b/src/gui/components/modelconverterxsetupcomponent.cpp
@@ -9,7 +9,7 @@
 
 using namespace swift::misc;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CModelConverterXSetupComponent::CModelConverterXSetupComponent(QWidget *parent) : QFrame(parent),
                                                                                       ui(new Ui::CModelConverterXSetupComponent)
diff --git a/src/blackgui/components/modelconverterxsetupcomponent.h b/src/gui/components/modelconverterxsetupcomponent.h
similarity index 85%
rename from src/blackgui/components/modelconverterxsetupcomponent.h
rename to src/gui/components/modelconverterxsetupcomponent.h
index ae0cfe9f2..6b4a1a3e7 100644
--- a/src/blackgui/components/modelconverterxsetupcomponent.h
+++ b/src/gui/components/modelconverterxsetupcomponent.h
@@ -3,8 +3,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_MODELCONVERTERXSETUPCOMPONENT_H
-#define BLACKGUI_COMPONENTS_MODELCONVERTERXSETUPCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_MODELCONVERTERXSETUPCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_MODELCONVERTERXSETUPCOMPONENT_H
 
 #include "misc/simulation/modelconverterx.h"
 #include <QFrame>
@@ -13,7 +13,7 @@ namespace Ui
 {
     class CModelConverterXSetupComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Setup to start ModelConverterX
diff --git a/src/blackgui/components/modelconverterxsetupcomponent.ui b/src/gui/components/modelconverterxsetupcomponent.ui
similarity index 100%
rename from src/blackgui/components/modelconverterxsetupcomponent.ui
rename to src/gui/components/modelconverterxsetupcomponent.ui
diff --git a/src/blackgui/components/modelmatchercomponent.cpp b/src/gui/components/modelmatchercomponent.cpp
similarity index 93%
rename from src/blackgui/components/modelmatchercomponent.cpp
rename to src/gui/components/modelmatchercomponent.cpp
index 3ff74c379..b0db71757 100644
--- a/src/blackgui/components/modelmatchercomponent.cpp
+++ b/src/gui/components/modelmatchercomponent.cpp
@@ -1,19 +1,19 @@
 // SPDX-FileCopyrightText: Copyright (C) 2016 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/aircraftcombinedtypeselector.h"
-#include "blackgui/components/dbaircrafticaoselectorcomponent.h"
-#include "blackgui/components/dbairlineicaoselectorcomponent.h"
-#include "blackgui/components/dbliveryselectorcomponent.h"
-#include "blackgui/components/modelmatchercomponent.h"
-#include "blackgui/components/settingsmatchingdialog.h"
-#include "blackgui/components/simulatorselector.h"
-#include "blackgui/models/statusmessagelistmodel.h"
-#include "blackgui/views/statusmessageview.h"
-#include "blackgui/views/aircraftmodelview.h"
-#include "blackgui/uppercasevalidator.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/guiutility.h"
+#include "gui/components/aircraftcombinedtypeselector.h"
+#include "gui/components/dbaircrafticaoselectorcomponent.h"
+#include "gui/components/dbairlineicaoselectorcomponent.h"
+#include "gui/components/dbliveryselectorcomponent.h"
+#include "gui/components/modelmatchercomponent.h"
+#include "gui/components/settingsmatchingdialog.h"
+#include "gui/components/simulatorselector.h"
+#include "gui/models/statusmessagelistmodel.h"
+#include "gui/views/statusmessageview.h"
+#include "gui/views/aircraftmodelview.h"
+#include "gui/uppercasevalidator.h"
+#include "gui/guiapplication.h"
+#include "gui/guiutility.h"
 #include "core/webdataservices.h"
 #include "misc/simulation/data/modelcaches.h"
 #include "misc/simulation/matchingutils.h"
@@ -40,11 +40,11 @@ using namespace swift::misc::aviation;
 using namespace swift::misc::simulation;
 using namespace swift::misc::simulation::data;
 using namespace swift::misc::network;
-using namespace BlackGui::Models;
-using namespace BlackGui::Views;
+using namespace swift::gui::models;
+using namespace swift::gui::views;
 using namespace swift::core;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CModelMatcherComponent::CModelMatcherComponent(QWidget *parent) : QFrame(parent),
                                                                       ui(new Ui::CModelMatcherComponent)
@@ -96,7 +96,7 @@ namespace BlackGui::Components
         this->redisplay();
     }
 
-    void CModelMatcherComponent::setWorkbenchView(Views::CAircraftModelView *workbenchView)
+    void CModelMatcherComponent::setWorkbenchView(views::CAircraftModelView *workbenchView)
     {
         if (workbenchView)
         {
diff --git a/src/blackgui/components/modelmatchercomponent.h b/src/gui/components/modelmatchercomponent.h
similarity index 89%
rename from src/blackgui/components/modelmatchercomponent.h
rename to src/gui/components/modelmatchercomponent.h
index 833aa7fd3..cbdde568c 100644
--- a/src/blackgui/components/modelmatchercomponent.h
+++ b/src/gui/components/modelmatchercomponent.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENT_MODELMATCHERCOMPONENT_H
-#define BLACKGUI_COMPONENT_MODELMATCHERCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENT_MODELMATCHERCOMPONENT_H
+#define SWIFT_GUI_COMPONENT_MODELMATCHERCOMPONENT_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include "core/aircraftmatcher.h"
 #include "misc/simulation/settings/modelmatchersettings.h"
 #include "misc/simulation/aircraftmodel.h"
@@ -24,20 +24,20 @@ namespace Ui
 {
     class CModelMatcherComponent;
 }
-namespace BlackGui
+namespace swift::gui
 {
-    namespace Views
+    namespace views
     {
         class CAircraftModelView;
     }
-    namespace Components
+    namespace components
     {
         class CSettingsMatchingDialog;
 
         /*!
          * Model matcher testing and configuration
          */
-        class BLACKGUI_EXPORT CModelMatcherComponent : public QFrame
+        class SWIFT_GUI_EXPORT CModelMatcherComponent : public QFrame
         {
             Q_OBJECT
 
@@ -52,7 +52,7 @@ namespace BlackGui
             void tabIndexChanged(int index);
 
             //! Set an external
-            void setWorkbenchView(Views::CAircraftModelView *workbenchView);
+            void setWorkbenchView(views::CAircraftModelView *workbenchView);
 
         private:
             //! Simulator switched
@@ -99,7 +99,7 @@ namespace BlackGui
             static swift::misc::simulation::MatchingScriptReturnValues matchingScript(const swift::misc::simulation::CAircraftModel &inModel, const swift::misc::simulation::CAircraftMatcherSetup &setup, const swift::misc::simulation::CAircraftModelList &modelSet, swift::misc::CStatusMessageList &msgs);
 
             QScopedPointer<Ui::CModelMatcherComponent> ui;
-            QPointer<Views::CAircraftModelView> m_workbenchView; //!< an external workbenc
+            QPointer<views::CAircraftModelView> m_workbenchView; //!< an external workbenc
             CSettingsMatchingDialog *m_settingsDialog = nullptr; //!< matching settings as dialog
             swift::core::CAircraftMatcher m_matcher { this }; //!< used matcher
             swift::misc::CSettingReadOnly<swift::misc::simulation::settings::TModelMatching> m_matchingSettings { this }; //!< settings
diff --git a/src/blackgui/components/modelmatchercomponent.ui b/src/gui/components/modelmatchercomponent.ui
similarity index 87%
rename from src/blackgui/components/modelmatchercomponent.ui
rename to src/gui/components/modelmatchercomponent.ui
index f86f111a9..8e76bcd91 100644
--- a/src/blackgui/components/modelmatchercomponent.ui
+++ b/src/gui/components/modelmatchercomponent.ui
@@ -33,7 +33,7 @@
     <number>0</number>
    </property>
    <item row="2" column="1">
-    <widget class="BlackGui::Components::CAircraftCombinedTypeSelector" name="comp_CombinedCode">
+    <widget class="swift::gui::components::CAircraftCombinedTypeSelector" name="comp_CombinedCode">
      <property name="focusPolicy">
       <enum>Qt::StrongFocus</enum>
      </property>
@@ -47,7 +47,7 @@
     </widget>
    </item>
    <item row="1" column="1">
-    <widget class="BlackGui::Components::CDbAircraftIcaoSelectorComponent" name="comp_AircraftSelector">
+    <widget class="swift::gui::components::CDbAircraftIcaoSelectorComponent" name="comp_AircraftSelector">
      <property name="minimumSize">
       <size>
        <width>100</width>
@@ -148,7 +148,7 @@
        </widget>
       </item>
       <item>
-       <widget class="BlackGui::Views::CStatusMessageView" name="tvp_ResultMessages">
+       <widget class="swift::gui::views::CStatusMessageView" name="tvp_ResultMessages">
         <property name="selectionMode">
          <enum>QAbstractItemView::SingleSelection</enum>
         </property>
@@ -220,14 +220,14 @@
     </widget>
    </item>
    <item row="2" column="3">
-    <widget class="BlackGui::Components::CDbLiverySelectorComponent" name="comp_LiverySelector">
+    <widget class="swift::gui::components::CDbLiverySelectorComponent" name="comp_LiverySelector">
      <property name="focusPolicy">
       <enum>Qt::StrongFocus</enum>
      </property>
     </widget>
    </item>
    <item row="0" column="1" alignment="Qt::AlignLeft">
-    <widget class="BlackGui::Components::CSimulatorSelector" name="comp_SimulatorSelector">
+    <widget class="swift::gui::components::CSimulatorSelector" name="comp_SimulatorSelector">
      <property name="minimumSize">
       <size>
        <width>100</width>
@@ -278,7 +278,7 @@
     </widget>
    </item>
    <item row="1" column="3">
-    <widget class="BlackGui::Components::CDbAirlineIcaoSelectorComponent" name="comp_AirlineSelector">
+    <widget class="swift::gui::components::CDbAirlineIcaoSelectorComponent" name="comp_AirlineSelector">
      <property name="minimumSize">
       <size>
        <width>100</width>
@@ -308,39 +308,39 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CSimulatorSelector</class>
+   <class>swift::gui::components::CSimulatorSelector</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/simulatorselector.h</header>
+   <header>gui/components/simulatorselector.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CDbAirlineIcaoSelectorComponent</class>
+   <class>swift::gui::components::CDbAirlineIcaoSelectorComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/dbairlineicaoselectorcomponent.h</header>
+   <header>gui/components/dbairlineicaoselectorcomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CDbLiverySelectorComponent</class>
+   <class>swift::gui::components::CDbLiverySelectorComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/dbliveryselectorcomponent.h</header>
+   <header>gui/components/dbliveryselectorcomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CAircraftCombinedTypeSelector</class>
+   <class>swift::gui::components::CAircraftCombinedTypeSelector</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/aircraftcombinedtypeselector.h</header>
+   <header>gui/components/aircraftcombinedtypeselector.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CDbAircraftIcaoSelectorComponent</class>
+   <class>swift::gui::components::CDbAircraftIcaoSelectorComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/dbaircrafticaoselectorcomponent.h</header>
+   <header>gui/components/dbaircrafticaoselectorcomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Views::CStatusMessageView</class>
+   <class>swift::gui::views::CStatusMessageView</class>
    <extends>QTableView</extends>
-   <header>blackgui/views/statusmessageview.h</header>
+   <header>gui/views/statusmessageview.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/blackgui/components/modelmatcherlogcomponent.cpp b/src/gui/components/modelmatcherlogcomponent.cpp
similarity index 95%
rename from src/blackgui/components/modelmatcherlogcomponent.cpp
rename to src/gui/components/modelmatcherlogcomponent.cpp
index 6d82a4628..86846fcab 100644
--- a/src/blackgui/components/modelmatcherlogcomponent.cpp
+++ b/src/gui/components/modelmatcherlogcomponent.cpp
@@ -4,8 +4,8 @@
 #include "modelmatcherlogcomponent.h"
 #include "ui_modelmatcherlogcomponent.h"
 
-#include "blackgui/guiapplication.h"
-#include "blackgui/uppercasevalidator.h"
+#include "gui/guiapplication.h"
+#include "gui/uppercasevalidator.h"
 #include "core/context/contextnetwork.h"
 #include "core/context/contextsimulator.h"
 #include "misc/propertyindexlist.h"
@@ -19,7 +19,7 @@ using namespace swift::misc::aviation;
 using namespace swift::core;
 using namespace swift::core::context;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CModelMatcherLogComponent::CModelMatcherLogComponent(QWidget *parent) : QFrame(parent),
                                                                             ui(new Ui::CModelMatcherLogComponent)
diff --git a/src/blackgui/components/modelmatcherlogcomponent.h b/src/gui/components/modelmatcherlogcomponent.h
similarity index 87%
rename from src/blackgui/components/modelmatcherlogcomponent.h
rename to src/gui/components/modelmatcherlogcomponent.h
index 66f0cbb06..7bcb4b1ce 100644
--- a/src/blackgui/components/modelmatcherlogcomponent.h
+++ b/src/gui/components/modelmatcherlogcomponent.h
@@ -3,8 +3,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENT_MODELMATCHERLOGCOMPONENT_H
-#define BLACKGUI_COMPONENT_MODELMATCHERLOGCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENT_MODELMATCHERLOGCOMPONENT_H
+#define SWIFT_GUI_COMPONENT_MODELMATCHERLOGCOMPONENT_H
 
 #include <QFrame>
 #include <QTabWidget>
@@ -15,7 +15,7 @@ namespace Ui
 {
     class CModelMatcherLogComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Special logs for matching and reverse lookup
diff --git a/src/blackgui/components/modelmatcherlogcomponent.ui b/src/gui/components/modelmatcherlogcomponent.ui
similarity index 84%
rename from src/blackgui/components/modelmatcherlogcomponent.ui
rename to src/gui/components/modelmatcherlogcomponent.ui
index 9341bf16b..0b11d31db 100644
--- a/src/blackgui/components/modelmatcherlogcomponent.ui
+++ b/src/gui/components/modelmatcherlogcomponent.ui
@@ -55,10 +55,10 @@
        </widget>
       </item>
       <item row="0" column="1">
-       <widget class="BlackGui::Components::CCallsignCompleter" name="comp_CallsignCompleter"/>
+       <widget class="swift::gui::components::CCallsignCompleter" name="comp_CallsignCompleter"/>
       </item>
       <item row="2" column="0" colspan="2">
-       <widget class="BlackGui::Components::CModelMatcherLogEnable" name="comp_EnableLog">
+       <widget class="swift::gui::components::CModelMatcherLogEnable" name="comp_EnableLog">
         <property name="minimumSize">
          <size>
           <width>0</width>
@@ -87,15 +87,15 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CModelMatcherLogEnable</class>
+   <class>swift::gui::components::CModelMatcherLogEnable</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/modelmatcherlogenable.h</header>
+   <header>gui/components/modelmatcherlogenable.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CCallsignCompleter</class>
+   <class>swift::gui::components::CCallsignCompleter</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/callsigncompleter.h</header>
+   <header>gui/components/callsigncompleter.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/modelmatcherlogenable.cpp b/src/gui/components/modelmatcherlogenable.cpp
similarity index 98%
rename from src/blackgui/components/modelmatcherlogenable.cpp
rename to src/gui/components/modelmatcherlogenable.cpp
index 05f4cab65..1404590a0 100644
--- a/src/blackgui/components/modelmatcherlogenable.cpp
+++ b/src/gui/components/modelmatcherlogenable.cpp
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "modelmatcherlogenable.h"
-#include "blackgui/guiapplication.h"
+#include "gui/guiapplication.h"
 #include "ui_modelmatcherlogenable.h"
 #include "core/context/contextnetwork.h"
 #include "core/context/contextsimulator.h"
@@ -15,7 +15,7 @@ using namespace swift::core::context;
 using namespace swift::misc::network;
 using namespace swift::misc::simulation;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CModelMatcherLogEnable::CModelMatcherLogEnable(QWidget *parent) : QFrame(parent),
                                                                       ui(new Ui::CModelMatcherLogEnable)
diff --git a/src/blackgui/components/modelmatcherlogenable.h b/src/gui/components/modelmatcherlogenable.h
similarity index 90%
rename from src/blackgui/components/modelmatcherlogenable.h
rename to src/gui/components/modelmatcherlogenable.h
index 9afdb5853..36e0c5d28 100644
--- a/src/blackgui/components/modelmatcherlogenable.h
+++ b/src/gui/components/modelmatcherlogenable.h
@@ -3,8 +3,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_MODELMATCHERLOGENABLE_H
-#define BLACKGUI_COMPONENTS_MODELMATCHERLOGENABLE_H
+#ifndef SWIFT_GUI_COMPONENTS_MODELMATCHERLOGENABLE_H
+#define SWIFT_GUI_COMPONENTS_MODELMATCHERLOGENABLE_H
 
 #include "misc/network/connectionstatus.h"
 #include <QFrame>
@@ -14,7 +14,7 @@ namespace Ui
 {
     class CModelMatcherLogEnable;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! Enable/disable matching logs
     class CModelMatcherLogEnable : public QFrame
diff --git a/src/blackgui/components/modelmatcherlogenable.ui b/src/gui/components/modelmatcherlogenable.ui
similarity index 100%
rename from src/blackgui/components/modelmatcherlogenable.ui
rename to src/gui/components/modelmatcherlogenable.ui
diff --git a/src/blackgui/components/modelmodeselector.cpp b/src/gui/components/modelmodeselector.cpp
similarity index 94%
rename from src/blackgui/components/modelmodeselector.cpp
rename to src/gui/components/modelmodeselector.cpp
index 5ae7cf40d..7205644f2 100644
--- a/src/blackgui/components/modelmodeselector.cpp
+++ b/src/gui/components/modelmodeselector.cpp
@@ -1,14 +1,14 @@
 // SPDX-FileCopyrightText: Copyright (C) 2016 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/modelmodeselector.h"
+#include "gui/components/modelmodeselector.h"
 #include "ui_modelmodeselector.h"
 
 #include <QRadioButton>
 
 using namespace swift::misc::simulation;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CModelModeSelector::CModelModeSelector(QWidget *parent) : QFrame(parent),
                                                               ui(new Ui::CModelModeSelector)
diff --git a/src/blackgui/components/modelmodeselector.h b/src/gui/components/modelmodeselector.h
similarity index 82%
rename from src/blackgui/components/modelmodeselector.h
rename to src/gui/components/modelmodeselector.h
index 010e9134a..896e0c16d 100644
--- a/src/blackgui/components/modelmodeselector.h
+++ b/src/gui/components/modelmodeselector.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_MODELMODESELECTOR_H
-#define BLACKGUI_COMPONENTS_MODELMODESELECTOR_H
+#ifndef SWIFT_GUI_COMPONENTS_MODELMODESELECTOR_H
+#define SWIFT_GUI_COMPONENTS_MODELMODESELECTOR_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include "misc/simulation/aircraftmodel.h"
 
 #include <QFrame>
@@ -20,12 +20,12 @@ namespace Ui
     class CModelModeSelector;
 }
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Select the mode
      */
-    class BLACKGUI_EXPORT CModelModeSelector : public QFrame
+    class SWIFT_GUI_EXPORT CModelModeSelector : public QFrame
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/modelmodeselector.ui b/src/gui/components/modelmodeselector.ui
similarity index 100%
rename from src/blackgui/components/modelmodeselector.ui
rename to src/gui/components/modelmodeselector.ui
diff --git a/src/blackgui/components/navigatordialog.cpp b/src/gui/components/navigatordialog.cpp
similarity index 97%
rename from src/blackgui/components/navigatordialog.cpp
rename to src/gui/components/navigatordialog.cpp
index 979705124..de5ea081a 100644
--- a/src/blackgui/components/navigatordialog.cpp
+++ b/src/gui/components/navigatordialog.cpp
@@ -1,11 +1,11 @@
 // SPDX-FileCopyrightText: Copyright (C) 2016 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/navigatordialog.h"
-#include "blackgui/components/marginsinput.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/guiutility.h"
-#include "blackgui/stylesheetutility.h"
+#include "gui/components/navigatordialog.h"
+#include "gui/components/marginsinput.h"
+#include "gui/guiapplication.h"
+#include "gui/guiutility.h"
+#include "gui/stylesheetutility.h"
 #include "misc/logmessage.h"
 #include "misc/icons.h"
 #include "ui_navigatordialog.h"
@@ -30,11 +30,11 @@
 #include <QGuiApplication>
 #include <QtGlobal>
 
-using namespace BlackGui;
-using namespace BlackGui::Settings;
+using namespace swift::gui;
+using namespace swift::gui::settings;
 using namespace swift::misc;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     // If the dialog is a normal window, it stays open when the parent is minimized
     // (and the parent is null for the dialog). If the dialog is a tool winow it is always
diff --git a/src/blackgui/components/navigatordialog.h b/src/gui/components/navigatordialog.h
similarity index 89%
rename from src/blackgui/components/navigatordialog.h
rename to src/gui/components/navigatordialog.h
index f2b7bf466..904a0bae2 100644
--- a/src/blackgui/components/navigatordialog.h
+++ b/src/gui/components/navigatordialog.h
@@ -3,12 +3,12 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_NAVIGATORDIALOG_H
-#define BLACKGUI_COMPONENTS_NAVIGATORDIALOG_H
+#ifndef SWIFT_GUI_COMPONENTS_NAVIGATORDIALOG_H
+#define SWIFT_GUI_COMPONENTS_NAVIGATORDIALOG_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/enableforframelesswindow.h"
-#include "blackgui/settings/navigatorsettings.h"
+#include "gui/swiftguiexport.h"
+#include "gui/enableforframelesswindow.h"
+#include "gui/settings/navigatorsettings.h"
 
 #include <QDialog>
 #include <QObject>
@@ -28,14 +28,14 @@ namespace Ui
 {
     class CNavigatorDialog;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     class CMarginsInput;
 
     /*!
      * Navigator dialog
      */
-    class BLACKGUI_EXPORT CNavigatorDialog :
+    class SWIFT_GUI_EXPORT CNavigatorDialog :
         public QDialog,
         public CEnableForFramelessWindow
     {
@@ -147,7 +147,7 @@ namespace BlackGui::Components
         QWidgetAction *m_marginMenuAction = nullptr; //!< menu widget(!) action for margin widget
         CMarginsInput *m_input = nullptr; //!< margins widget
         QTimer m_watchdog; //!< navigator watchdog
-        swift::misc::CSetting<BlackGui::Settings::TNavigator> m_settings { this, &CNavigatorDialog::onSettingsChanged };
+        swift::misc::CSetting<swift::gui::settings::TNavigator> m_settings { this, &CNavigatorDialog::onSettingsChanged };
     };
 } // ns
 
diff --git a/src/blackgui/components/navigatordialog.ui b/src/gui/components/navigatordialog.ui
similarity index 100%
rename from src/blackgui/components/navigatordialog.ui
rename to src/gui/components/navigatordialog.ui
diff --git a/src/blackgui/components/networkaircraftvaluescomponent.cpp b/src/gui/components/networkaircraftvaluescomponent.cpp
similarity index 95%
rename from src/blackgui/components/networkaircraftvaluescomponent.cpp
rename to src/gui/components/networkaircraftvaluescomponent.cpp
index bd712ddd7..a1c6f5d96 100644
--- a/src/blackgui/components/networkaircraftvaluescomponent.cpp
+++ b/src/gui/components/networkaircraftvaluescomponent.cpp
@@ -4,13 +4,13 @@
 #include "networkaircraftvaluescomponent.h"
 #include "ui_networkaircraftvaluescomponent.h"
 
-#include "blackgui/guiapplication.h"
+#include "gui/guiapplication.h"
 #include "core/context/contextownaircraft.h"
 #include "core/context/contextnetwork.h"
 
 using namespace swift::core::context;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CNetworkAircraftValuesComponent::CNetworkAircraftValuesComponent(QWidget *parent) : QFrame(parent),
                                                                                         ui(new Ui::CNetworkAircraftValuesComponent)
diff --git a/src/blackgui/components/networkaircraftvaluescomponent.h b/src/gui/components/networkaircraftvaluescomponent.h
similarity index 83%
rename from src/blackgui/components/networkaircraftvaluescomponent.h
rename to src/gui/components/networkaircraftvaluescomponent.h
index 3d1defa16..fc93cf682 100644
--- a/src/blackgui/components/networkaircraftvaluescomponent.h
+++ b/src/gui/components/networkaircraftvaluescomponent.h
@@ -3,8 +3,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_NETWORKAIRCRAFTVALUESCOMPONENT_H
-#define BLACKGUI_COMPONENTS_NETWORKAIRCRAFTVALUESCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_NETWORKAIRCRAFTVALUESCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_NETWORKAIRCRAFTVALUESCOMPONENT_H
 
 #include <QFrame>
 #include <QScopedPointer>
@@ -13,7 +13,7 @@ namespace Ui
 {
     class CNetworkAircraftValuesComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! Display the network aircraft values as sent
     class CNetworkAircraftValuesComponent : public QFrame
diff --git a/src/blackgui/components/networkaircraftvaluescomponent.ui b/src/gui/components/networkaircraftvaluescomponent.ui
similarity index 100%
rename from src/blackgui/components/networkaircraftvaluescomponent.ui
rename to src/gui/components/networkaircraftvaluescomponent.ui
diff --git a/src/blackgui/components/networkdetailscomponent.cpp b/src/gui/components/networkdetailscomponent.cpp
similarity index 98%
rename from src/blackgui/components/networkdetailscomponent.cpp
rename to src/gui/components/networkdetailscomponent.cpp
index b624f27ac..81295ae5d 100644
--- a/src/blackgui/components/networkdetailscomponent.cpp
+++ b/src/gui/components/networkdetailscomponent.cpp
@@ -3,8 +3,8 @@
 
 #include "networkdetailscomponent.h"
 #include "ui_networkdetailscomponent.h"
-#include "blackgui/uppercasevalidator.h"
-#include "blackgui/guiapplication.h"
+#include "gui/uppercasevalidator.h"
+#include "gui/guiapplication.h"
 #include "core/context/contextnetwork.h"
 #include "core/webdataservices.h"
 
@@ -16,7 +16,7 @@ using namespace swift::misc::aviation;
 using namespace swift::core;
 using namespace swift::core::data;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CNetworkDetailsComponent::CNetworkDetailsComponent(QWidget *parent) : QFrame(parent),
                                                                           ui(new Ui::CNetworkDetailsComponent)
diff --git a/src/blackgui/components/networkdetailscomponent.h b/src/gui/components/networkdetailscomponent.h
similarity index 95%
rename from src/blackgui/components/networkdetailscomponent.h
rename to src/gui/components/networkdetailscomponent.h
index 997bde2ef..3171bd3f0 100644
--- a/src/blackgui/components/networkdetailscomponent.h
+++ b/src/gui/components/networkdetailscomponent.h
@@ -3,8 +3,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_NETWORKDETAILSCOMPONENT_H
-#define BLACKGUI_COMPONENTS_NETWORKDETAILSCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_NETWORKDETAILSCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_NETWORKDETAILSCOMPONENT_H
 
 #include <QFrame>
 #include <QScopedPointer>
@@ -22,7 +22,7 @@ namespace Ui
 {
     class CNetworkDetailsComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! FSD details
     class CNetworkDetailsComponent : public QFrame
diff --git a/src/blackgui/components/networkdetailscomponent.ui b/src/gui/components/networkdetailscomponent.ui
similarity index 93%
rename from src/blackgui/components/networkdetailscomponent.ui
rename to src/gui/components/networkdetailscomponent.ui
index aff4d99f8..3606d8d63 100644
--- a/src/blackgui/components/networkdetailscomponent.ui
+++ b/src/gui/components/networkdetailscomponent.ui
@@ -107,7 +107,7 @@
             </widget>
            </item>
            <item row="0" column="0">
-            <widget class="BlackGui::Components::CServerListSelector" name="comp_VatsimServers"/>
+            <widget class="swift::gui::components::CServerListSelector" name="comp_VatsimServers"/>
            </item>
           </layout>
          </widget>
@@ -132,7 +132,7 @@
             <number>3</number>
            </property>
            <item row="0" column="0">
-            <widget class="BlackGui::Components::CServerListSelector" name="comp_OtherServers"/>
+            <widget class="swift::gui::components::CServerListSelector" name="comp_OtherServers"/>
            </item>
            <item row="1" column="0">
             <widget class="QWidget" name="wi_OtherServersButtons" native="true">
@@ -223,7 +223,7 @@
            </widget>
           </item>
           <item row="0" column="1">
-           <widget class="BlackGui::CLoginModeButtons" name="frp_LoginMode">
+           <widget class="swift::gui::CLoginModeButtons" name="frp_LoginMode">
             <property name="minimumSize">
              <size>
               <width>0</width>
@@ -249,20 +249,20 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Editors::CFsdSetupForm</class>
+   <class>swift::gui::editors::CFsdSetupForm</class>
    <extends>QFrame</extends>
-   <header>blackgui/editors/fsdsetupform.h</header>
+   <header>gui/editors/fsdsetupform.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CServerListSelector</class>
+   <class>swift::gui::components::CServerListSelector</class>
    <extends>QComboBox</extends>
-   <header>blackgui/components/serverlistselector.h</header>
+   <header>gui/components/serverlistselector.h</header>
   </customwidget>
   <customwidget>
-   <class>BlackGui::CLoginModeButtons</class>
+   <class>swift::gui::CLoginModeButtons</class>
    <extends>QFrame</extends>
-   <header>blackgui/loginmodebuttons.h</header>
+   <header>gui/loginmodebuttons.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/otherswiftversionscomponent.cpp b/src/gui/components/otherswiftversionscomponent.cpp
similarity index 96%
rename from src/blackgui/components/otherswiftversionscomponent.cpp
rename to src/gui/components/otherswiftversionscomponent.cpp
index 9c24dfbed..591fd7595 100644
--- a/src/blackgui/components/otherswiftversionscomponent.cpp
+++ b/src/gui/components/otherswiftversionscomponent.cpp
@@ -5,14 +5,14 @@
 #include "ui_otherswiftversionscomponent.h"
 #include "misc/swiftdirectories.h"
 #include "misc/directoryutils.h"
-#include "blackgui/guiapplication.h"
+#include "gui/guiapplication.h"
 #include <QUrl>
 #include <QDesktopServices>
 
 using namespace swift::misc;
-using namespace BlackGui::Views;
+using namespace swift::gui::views;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     COtherSwiftVersionsComponent::COtherSwiftVersionsComponent(QWidget *parent) : QFrame(parent),
                                                                                   ui(new Ui::COtherSwiftVersionsComponent)
diff --git a/src/blackgui/components/otherswiftversionscomponent.h b/src/gui/components/otherswiftversionscomponent.h
similarity index 91%
rename from src/blackgui/components/otherswiftversionscomponent.h
rename to src/gui/components/otherswiftversionscomponent.h
index 5cc564f9b..02bc4a9da 100644
--- a/src/blackgui/components/otherswiftversionscomponent.h
+++ b/src/gui/components/otherswiftversionscomponent.h
@@ -3,8 +3,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_OTHERSWIFTVERSIONS_H
-#define BLACKGUI_COMPONENTS_OTHERSWIFTVERSIONS_H
+#ifndef SWIFT_GUI_COMPONENTS_OTHERSWIFTVERSIONS_H
+#define SWIFT_GUI_COMPONENTS_OTHERSWIFTVERSIONS_H
 
 #include "misc/applicationinfo.h"
 #include <QFrame>
@@ -14,7 +14,7 @@ namespace Ui
 {
     class COtherSwiftVersionsComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Overview about other "swift" versions
diff --git a/src/blackgui/components/otherswiftversionscomponent.ui b/src/gui/components/otherswiftversionscomponent.ui
similarity index 93%
rename from src/blackgui/components/otherswiftversionscomponent.ui
rename to src/gui/components/otherswiftversionscomponent.ui
index d83a04a40..e74d2a8c2 100644
--- a/src/blackgui/components/otherswiftversionscomponent.ui
+++ b/src/gui/components/otherswiftversionscomponent.ui
@@ -81,7 +81,7 @@
     </widget>
    </item>
    <item row="1" column="1">
-    <widget class="BlackGui::Views::CApplicationInfoView" name="tvp_ApplicationInfo">
+    <widget class="swift::gui::views::CApplicationInfoView" name="tvp_ApplicationInfo">
      <property name="selectionMode">
       <enum>QAbstractItemView::SingleSelection</enum>
      </property>
@@ -97,9 +97,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Views::CApplicationInfoView</class>
+   <class>swift::gui::views::CApplicationInfoView</class>
    <extends>QTableView</extends>
-   <header>blackgui/views/applicationinfoview.h</header>
+   <header>gui/views/applicationinfoview.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/blackgui/components/otherswiftversionsdialog.cpp b/src/gui/components/otherswiftversionsdialog.cpp
similarity index 94%
rename from src/blackgui/components/otherswiftversionsdialog.cpp
rename to src/gui/components/otherswiftversionsdialog.cpp
index 795d279b3..6986a803a 100644
--- a/src/blackgui/components/otherswiftversionsdialog.cpp
+++ b/src/gui/components/otherswiftversionsdialog.cpp
@@ -4,7 +4,7 @@
 #include "otherswiftversionsdialog.h"
 #include "ui_otherswiftversionsdialog.h"
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     COtherSwiftVersionsDialog::COtherSwiftVersionsDialog(QWidget *parent) : QDialog(parent),
                                                                             ui(new Ui::COtherSwiftVersionsDialog)
diff --git a/src/blackgui/components/otherswiftversionsdialog.h b/src/gui/components/otherswiftversionsdialog.h
similarity index 82%
rename from src/blackgui/components/otherswiftversionsdialog.h
rename to src/gui/components/otherswiftversionsdialog.h
index 0d86122c6..eaf6a4081 100644
--- a/src/blackgui/components/otherswiftversionsdialog.h
+++ b/src/gui/components/otherswiftversionsdialog.h
@@ -3,8 +3,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_OTHERSWIFTVERSIONSDIALOG_H
-#define BLACKGUI_COMPONENTS_OTHERSWIFTVERSIONSDIALOG_H
+#ifndef SWIFT_GUI_COMPONENTS_OTHERSWIFTVERSIONSDIALOG_H
+#define SWIFT_GUI_COMPONENTS_OTHERSWIFTVERSIONSDIALOG_H
 
 #include <QDialog>
 #include <QScopedPointer>
@@ -13,7 +13,7 @@ namespace Ui
 {
     class COtherSwiftVersionsDialog;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * COtherVersionsComponent as dialog
diff --git a/src/blackgui/components/otherswiftversionsdialog.ui b/src/gui/components/otherswiftversionsdialog.ui
similarity index 88%
rename from src/blackgui/components/otherswiftversionsdialog.ui
rename to src/gui/components/otherswiftversionsdialog.ui
index daceed615..cf5ee635e 100644
--- a/src/blackgui/components/otherswiftversionsdialog.ui
+++ b/src/gui/components/otherswiftversionsdialog.ui
@@ -15,7 +15,7 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <widget class="BlackGui::Components::COtherSwiftVersionsComponent" name="comp_OtherSwiftVersions">
+    <widget class="swift::gui::components::COtherSwiftVersionsComponent" name="comp_OtherSwiftVersions">
      <property name="frameShape">
       <enum>QFrame::StyledPanel</enum>
      </property>
@@ -38,9 +38,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::COtherSwiftVersionsComponent</class>
+   <class>swift::gui::components::COtherSwiftVersionsComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/otherswiftversionscomponent.h</header>
+   <header>gui/components/otherswiftversionscomponent.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/ownaircraftcomponent.cpp b/src/gui/components/ownaircraftcomponent.cpp
similarity index 99%
rename from src/blackgui/components/ownaircraftcomponent.cpp
rename to src/gui/components/ownaircraftcomponent.cpp
index 077b052b4..9f46f72ae 100644
--- a/src/blackgui/components/ownaircraftcomponent.cpp
+++ b/src/gui/components/ownaircraftcomponent.cpp
@@ -4,8 +4,8 @@
 #include "ownaircraftcomponent.h"
 #include "ui_ownaircraftcomponent.h"
 
-#include "blackgui/uppercasevalidator.h"
-#include "blackgui/guiapplication.h"
+#include "gui/uppercasevalidator.h"
+#include "gui/guiapplication.h"
 #include "core/context/contextsimulator.h"
 #include "core/context/contextownaircraft.h"
 #include "core/context/contextnetwork.h"
@@ -26,7 +26,7 @@ using namespace swift::misc::network;
 using namespace swift::core;
 using namespace swift::core::context;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     COwnAircraftComponent::COwnAircraftComponent(QWidget *parent) : QFrame(parent),
                                                                     ui(new Ui::COwnAircraftComponent)
diff --git a/src/blackgui/components/ownaircraftcomponent.h b/src/gui/components/ownaircraftcomponent.h
similarity index 96%
rename from src/blackgui/components/ownaircraftcomponent.h
rename to src/gui/components/ownaircraftcomponent.h
index d5720a208..ceaabde12 100644
--- a/src/blackgui/components/ownaircraftcomponent.h
+++ b/src/gui/components/ownaircraftcomponent.h
@@ -3,8 +3,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_OWNAIRCRAFTCOMPONENT_H
-#define BLACKGUI_COMPONENTS_OWNAIRCRAFTCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_OWNAIRCRAFTCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_OWNAIRCRAFTCOMPONENT_H
 
 #include "misc/simulation/data/lastmodel.h"
 #include "misc/simulation/aircraftmodel.h"
@@ -20,7 +20,7 @@ namespace Ui
 {
     class COwnAircraftComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! Own aircraft
     class COwnAircraftComponent : public QFrame
diff --git a/src/blackgui/components/ownaircraftcomponent.ui b/src/gui/components/ownaircraftcomponent.ui
similarity index 91%
rename from src/blackgui/components/ownaircraftcomponent.ui
rename to src/gui/components/ownaircraftcomponent.ui
index db815b177..e1df54b16 100644
--- a/src/blackgui/components/ownaircraftcomponent.ui
+++ b/src/gui/components/ownaircraftcomponent.ui
@@ -58,7 +58,7 @@
          </attribute>
          <layout class="QGridLayout" name="gl_general">
           <item row="1" column="3">
-           <widget class="BlackGui::CTickLabel" name="lblp_AircraftCombinedType">
+           <widget class="swift::gui::CTickLabel" name="lblp_AircraftCombinedType">
             <property name="minimumSize">
              <size>
               <width>0</width>
@@ -71,7 +71,7 @@
            </widget>
           </item>
           <item row="0" column="7">
-           <widget class="BlackGui::CTickLabel" name="lblp_AircraftIcao">
+           <widget class="swift::gui::CTickLabel" name="lblp_AircraftIcao">
             <property name="text">
              <string/>
             </property>
@@ -110,7 +110,7 @@
            </widget>
           </item>
           <item row="1" column="6">
-           <widget class="BlackGui::Components::CDbAirlineIcaoSelectorComponent" name="selector_AirlineIcao">
+           <widget class="swift::gui::components::CDbAirlineIcaoSelectorComponent" name="selector_AirlineIcao">
             <property name="minimumSize">
              <size>
               <width>75</width>
@@ -123,7 +123,7 @@
            </widget>
           </item>
           <item row="0" column="6">
-           <widget class="BlackGui::Components::CDbAircraftIcaoSelectorComponent" name="selector_AircraftIcao">
+           <widget class="swift::gui::components::CDbAircraftIcaoSelectorComponent" name="selector_AircraftIcao">
             <property name="minimumSize">
              <size>
               <width>75</width>
@@ -136,7 +136,7 @@
            </widget>
           </item>
           <item row="1" column="7">
-           <widget class="BlackGui::CTickLabel" name="lblp_AirlineIcao">
+           <widget class="swift::gui::CTickLabel" name="lblp_AirlineIcao">
             <property name="text">
              <string/>
             </property>
@@ -207,7 +207,7 @@
            </widget>
           </item>
           <item row="0" column="3">
-           <widget class="BlackGui::CTickLabel" name="lblp_Callsign">
+           <widget class="swift::gui::CTickLabel" name="lblp_Callsign">
             <property name="text">
              <string/>
             </property>
@@ -254,7 +254,7 @@
            </widget>
           </item>
           <item row="2" column="2">
-           <widget class="BlackGui::Components::CAircraftModelStringCompleter" name="comp_ModelStringCompleter">
+           <widget class="swift::gui::components::CAircraftModelStringCompleter" name="comp_ModelStringCompleter">
             <property name="minimumSize">
              <size>
               <width>0</width>
@@ -334,26 +334,26 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::CTickLabel</class>
+   <class>swift::gui::CTickLabel</class>
    <extends>QLabel</extends>
-   <header>blackgui/ticklabel.h</header>
+   <header>gui/ticklabel.h</header>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CDbAircraftIcaoSelectorComponent</class>
+   <class>swift::gui::components::CDbAircraftIcaoSelectorComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/dbaircrafticaoselectorcomponent.h</header>
+   <header>gui/components/dbaircrafticaoselectorcomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CDbAirlineIcaoSelectorComponent</class>
+   <class>swift::gui::components::CDbAirlineIcaoSelectorComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/dbairlineicaoselectorcomponent.h</header>
+   <header>gui/components/dbairlineicaoselectorcomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CAircraftModelStringCompleter</class>
+   <class>swift::gui::components::CAircraftModelStringCompleter</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/aircraftmodelstringcompleter.h</header>
+   <header>gui/components/aircraftmodelstringcompleter.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/radarcomponent.cpp b/src/gui/components/radarcomponent.cpp
similarity index 98%
rename from src/blackgui/components/radarcomponent.cpp
rename to src/gui/components/radarcomponent.cpp
index 3c002ccc8..f7fc8d5c1 100644
--- a/src/blackgui/components/radarcomponent.cpp
+++ b/src/gui/components/radarcomponent.cpp
@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "ui_radarcomponent.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/infoarea.h"
-#include "blackgui/components/radarcomponent.h"
+#include "gui/guiapplication.h"
+#include "gui/infoarea.h"
+#include "gui/components/radarcomponent.h"
 #include "core/context/contextnetwork.h"
 #include "core/context/contextownaircraft.h"
 #include "misc/simulation/simulatedaircraft.h"
@@ -17,9 +17,9 @@ using namespace swift::misc::aviation;
 using namespace swift::misc::simulation;
 using namespace swift::misc::geo;
 using namespace swift::misc::physical_quantities;
-using namespace BlackGui::Views;
+using namespace swift::gui::views;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CRadarComponent::CRadarComponent(QWidget *parent) : QFrame(parent),
                                                         ui(new Ui::CRadarComponent), m_tagFont(QApplication::font())
diff --git a/src/blackgui/components/radarcomponent.h b/src/gui/components/radarcomponent.h
similarity index 87%
rename from src/blackgui/components/radarcomponent.h
rename to src/gui/components/radarcomponent.h
index 672aace4c..b0b28f623 100644
--- a/src/blackgui/components/radarcomponent.h
+++ b/src/gui/components/radarcomponent.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_RADARCOMPONENT_H
-#define BLACKGUI_COMPONENTS_RADARCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_RADARCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_RADARCOMPONENT_H
 
-#include "blackgui/enablefordockwidgetinfoarea.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/enablefordockwidgetinfoarea.h"
+#include "gui/swiftguiexport.h"
 #include "core/actionbind.h"
 #include "misc/input/actionhotkeydefs.h"
 
@@ -21,10 +21,10 @@ namespace Ui
 {
     class CRadarComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! GUI displaying a radar like view with aircrafts nearby
-    class BLACKGUI_EXPORT CRadarComponent :
+    class SWIFT_GUI_EXPORT CRadarComponent :
         public QFrame,
         public CEnableForDockWidgetInfoArea
     {
@@ -38,7 +38,7 @@ namespace BlackGui::Components
         virtual ~CRadarComponent() override;
 
         //! \copydoc CEnableForDockWidgetInfoArea::setParentDockWidgetInfoArea
-        virtual bool setParentDockWidgetInfoArea(BlackGui::CDockWidgetInfoArea *parentDockableWidget) override;
+        virtual bool setParentDockWidgetInfoArea(swift::gui::CDockWidgetInfoArea *parentDockableWidget) override;
 
     private:
         void prepareScene();
diff --git a/src/blackgui/components/radarcomponent.ui b/src/gui/components/radarcomponent.ui
similarity index 96%
rename from src/blackgui/components/radarcomponent.ui
rename to src/gui/components/radarcomponent.ui
index 29ab46f2f..d3b43ffcd 100644
--- a/src/blackgui/components/radarcomponent.ui
+++ b/src/gui/components/radarcomponent.ui
@@ -27,7 +27,7 @@
     <number>3</number>
    </property>
    <item>
-    <widget class="BlackGui::Views::CRadarView" name="gv_RadarView"/>
+    <widget class="swift::gui::views::CRadarView" name="gv_RadarView"/>
    </item>
    <item>
     <widget class="QFrame" name="fr_RadarSettings">
@@ -150,9 +150,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Views::CRadarView</class>
+   <class>swift::gui::views::CRadarView</class>
    <extends>QGraphicsView</extends>
-   <header>blackgui/views/radarview.h</header>
+   <header>gui/views/radarview.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/blackgui/components/rawfsdmessagescomponent.cpp b/src/gui/components/rawfsdmessagescomponent.cpp
similarity index 98%
rename from src/blackgui/components/rawfsdmessagescomponent.cpp
rename to src/gui/components/rawfsdmessagescomponent.cpp
index 7edb58259..f10a2f7c6 100644
--- a/src/blackgui/components/rawfsdmessagescomponent.cpp
+++ b/src/gui/components/rawfsdmessagescomponent.cpp
@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "ui_rawfsdmessagescomponent.h"
-#include "blackgui/components/rawfsdmessagescomponent.h"
-#include "blackgui/guiapplication.h"
+#include "gui/components/rawfsdmessagescomponent.h"
+#include "gui/guiapplication.h"
 #include "core/context/contextnetwork.h"
 #include "misc/directoryutils.h"
 
@@ -17,7 +17,7 @@ using namespace swift::misc::network;
 using namespace swift::core;
 using namespace swift::core::vatsim;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CRawFsdMessagesComponent::CRawFsdMessagesComponent(QWidget *parent) : QFrame(parent), ui(new Ui::CRawFsdMessagesComponent)
     {
diff --git a/src/blackgui/components/rawfsdmessagescomponent.h b/src/gui/components/rawfsdmessagescomponent.h
similarity index 88%
rename from src/blackgui/components/rawfsdmessagescomponent.h
rename to src/gui/components/rawfsdmessagescomponent.h
index 500f8e93e..8d1b43291 100644
--- a/src/blackgui/components/rawfsdmessagescomponent.h
+++ b/src/gui/components/rawfsdmessagescomponent.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_RAWFSDMESSAGESCOMPONENT_H
-#define BLACKGUI_RAWFSDMESSAGESCOMPONENT_H
+#ifndef SWIFT_GUI_RAWFSDMESSAGESCOMPONENT_H
+#define SWIFT_GUI_RAWFSDMESSAGESCOMPONENT_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include "core/vatsim/vatsimsettings.h"
 #include "misc/network/rawfsdmessagelist.h"
 #include "misc/connectionguard.h"
@@ -17,10 +17,10 @@ namespace Ui
 {
     class CRawFsdMessagesComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! GUI displaying raw FSD messages
-    class BLACKGUI_EXPORT CRawFsdMessagesComponent : public QFrame
+    class SWIFT_GUI_EXPORT CRawFsdMessagesComponent : public QFrame
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/rawfsdmessagescomponent.ui b/src/gui/components/rawfsdmessagescomponent.ui
similarity index 100%
rename from src/blackgui/components/rawfsdmessagescomponent.ui
rename to src/gui/components/rawfsdmessagescomponent.ui
diff --git a/src/blackgui/components/rawfsdmessagesdialog.cpp b/src/gui/components/rawfsdmessagesdialog.cpp
similarity index 94%
rename from src/blackgui/components/rawfsdmessagesdialog.cpp
rename to src/gui/components/rawfsdmessagesdialog.cpp
index f0d97757b..995d49e47 100644
--- a/src/blackgui/components/rawfsdmessagesdialog.cpp
+++ b/src/gui/components/rawfsdmessagesdialog.cpp
@@ -4,7 +4,7 @@
 #include "rawfsdmessagesdialog.h"
 #include "ui_rawfsdmessagesdialog.h"
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CRawFsdMessagesDialog::CRawFsdMessagesDialog(QWidget *parent) : QDialog(parent),
                                                                     ui(new Ui::CRawFsdMessagesDialog)
diff --git a/src/blackgui/components/rawfsdmessagesdialog.h b/src/gui/components/rawfsdmessagesdialog.h
similarity index 67%
rename from src/blackgui/components/rawfsdmessagesdialog.h
rename to src/gui/components/rawfsdmessagesdialog.h
index cf2cd2d14..75af4fe49 100644
--- a/src/blackgui/components/rawfsdmessagesdialog.h
+++ b/src/gui/components/rawfsdmessagesdialog.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_RAWFSDMESSAGESDIALOG_H
-#define BLACKGUI_COMPONENTS_RAWFSDMESSAGESDIALOG_H
+#ifndef SWIFT_GUI_COMPONENTS_RAWFSDMESSAGESDIALOG_H
+#define SWIFT_GUI_COMPONENTS_RAWFSDMESSAGESDIALOG_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/components/rawfsdmessagescomponent.h"
+#include "gui/swiftguiexport.h"
+#include "gui/components/rawfsdmessagescomponent.h"
 
 #include <QDialog>
 #include <QScopedPointer>
@@ -16,10 +16,10 @@ namespace Ui
 {
     class CRawFsdMessagesDialog;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! CRawFsdMessageComponent as dialog
-    class BLACKGUI_EXPORT CRawFsdMessagesDialog : public QDialog
+    class SWIFT_GUI_EXPORT CRawFsdMessagesDialog : public QDialog
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/rawfsdmessagesdialog.ui b/src/gui/components/rawfsdmessagesdialog.ui
similarity index 84%
rename from src/blackgui/components/rawfsdmessagesdialog.ui
rename to src/gui/components/rawfsdmessagesdialog.ui
index 8d95b01d3..8acc093fe 100644
--- a/src/blackgui/components/rawfsdmessagesdialog.ui
+++ b/src/gui/components/rawfsdmessagesdialog.ui
@@ -33,7 +33,7 @@
     <number>6</number>
    </property>
    <item>
-    <widget class="BlackGui::Components::CRawFsdMessagesComponent" name="comp_RawFsdMessages">
+    <widget class="swift::gui::components::CRawFsdMessagesComponent" name="comp_RawFsdMessages">
      <property name="frameShape">
       <enum>QFrame::StyledPanel</enum>
      </property>
@@ -46,9 +46,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CRawFsdMessagesComponent</class>
+   <class>swift::gui::components::CRawFsdMessagesComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/rawfsdmessagescomponent.h</header>
+   <header>gui/components/rawfsdmessagescomponent.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/registercomponent.cpp b/src/gui/components/registercomponent.cpp
similarity index 89%
rename from src/blackgui/components/registercomponent.cpp
rename to src/gui/components/registercomponent.cpp
index 4660e5e8d..8b50c69ac 100644
--- a/src/blackgui/components/registercomponent.cpp
+++ b/src/gui/components/registercomponent.cpp
@@ -2,18 +2,18 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "core/context/contextapplication.h"
-#include "blackgui/components/registercomponent.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/views/identifierview.h"
+#include "gui/components/registercomponent.h"
+#include "gui/guiapplication.h"
+#include "gui/views/identifierview.h"
 #include "ui_registercomponent.h"
 
 #include <QtGlobal>
 
 using namespace swift::core;
 using namespace swift::core::context;
-using namespace BlackGui::Views;
+using namespace swift::gui::views;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CRegisterComponent::CRegisterComponent(QWidget *parent) : QFrame(parent),
                                                               ui(new Ui::CRegisterComponent)
diff --git a/src/blackgui/components/registercomponent.h b/src/gui/components/registercomponent.h
similarity index 78%
rename from src/blackgui/components/registercomponent.h
rename to src/gui/components/registercomponent.h
index 28c3f43bd..3f1b3b3dc 100644
--- a/src/blackgui/components/registercomponent.h
+++ b/src/gui/components/registercomponent.h
@@ -1,10 +1,10 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#ifndef BLACKGUI_COMPONENTS_REGISTERCOMPONENT_H
-#define BLACKGUI_COMPONENTS_REGISTERCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_REGISTERCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_REGISTERCOMPONENT_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 
 #include <QFrame>
 #include <QObject>
@@ -15,11 +15,11 @@ namespace Ui
 {
     class CRegisterComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! Show registered applications (registered with core) in the GUI
     //! \sa swift::core::context::IContextApplication::getRegisteredApplications
-    class BLACKGUI_EXPORT CRegisterComponent : public QFrame
+    class SWIFT_GUI_EXPORT CRegisterComponent : public QFrame
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/registercomponent.ui b/src/gui/components/registercomponent.ui
similarity index 86%
rename from src/blackgui/components/registercomponent.ui
rename to src/gui/components/registercomponent.ui
index 412ba2e8d..5385f0048 100644
--- a/src/blackgui/components/registercomponent.ui
+++ b/src/gui/components/registercomponent.ui
@@ -33,7 +33,7 @@
     <number>0</number>
    </property>
    <item>
-    <widget class="BlackGui::Views::CIdentifierView" name="tvp_RegisteredComponents">
+    <widget class="swift::gui::views::CIdentifierView" name="tvp_RegisteredComponents">
      <property name="selectionMode">
       <enum>QAbstractItemView::NoSelection</enum>
      </property>
@@ -46,9 +46,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Views::CIdentifierView</class>
+   <class>swift::gui::views::CIdentifierView</class>
    <extends>QTableView</extends>
-   <header>blackgui/views/identifierview.h</header>
+   <header>gui/views/identifierview.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/src/blackgui/components/registermetadatacomponents.cpp b/src/gui/components/registermetadatacomponents.cpp
similarity index 78%
rename from src/blackgui/components/registermetadatacomponents.cpp
rename to src/gui/components/registermetadatacomponents.cpp
index 8ae5056e1..33855bfb8 100644
--- a/src/blackgui/components/registermetadatacomponents.cpp
+++ b/src/gui/components/registermetadatacomponents.cpp
@@ -2,11 +2,11 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "registermetadatacomponents.h"
-#include "blackgui/components/textmessagecomponenttab.h"
+#include "gui/components/textmessagecomponenttab.h"
 
 #include <QMetaType>
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     void registerMetadata()
     {
diff --git a/src/blackgui/components/registermetadatacomponents.h b/src/gui/components/registermetadatacomponents.h
similarity index 51%
rename from src/blackgui/components/registermetadatacomponents.h
rename to src/gui/components/registermetadatacomponents.h
index ce48174d3..2154cc0a9 100644
--- a/src/blackgui/components/registermetadatacomponents.h
+++ b/src/gui/components/registermetadatacomponents.h
@@ -3,15 +3,15 @@
 
 //! \file
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 
-#ifndef BLACKGUI_COMPONENTS_REGISTERMETADATASIMULATION_H
-#    define BLACKGUI_COMPONENTS_REGISTERMETADATASIMULATION_H
+#ifndef SWIFT_GUI_COMPONENTS_REGISTERMETADATASIMULATION_H
+#    define SWIFT_GUI_COMPONENTS_REGISTERMETADATASIMULATION_H
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! Register metadata for components
-    BLACKGUI_EXPORT void registerMetadata();
+    SWIFT_GUI_EXPORT void registerMetadata();
 } // ns
 
 #endif // guard
diff --git a/src/blackgui/components/remoteaircraftselector.cpp b/src/gui/components/remoteaircraftselector.cpp
similarity index 97%
rename from src/blackgui/components/remoteaircraftselector.cpp
rename to src/gui/components/remoteaircraftselector.cpp
index 0bc5fc11c..be5d672ff 100644
--- a/src/blackgui/components/remoteaircraftselector.cpp
+++ b/src/gui/components/remoteaircraftselector.cpp
@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "core/context/contextnetwork.h"
-#include "blackgui/components/remoteaircraftselector.h"
-#include "blackgui/guiapplication.h"
+#include "gui/components/remoteaircraftselector.h"
+#include "gui/guiapplication.h"
 #include "misc/aviation/aircrafticaocode.h"
 #include "misc/sequence.h"
 #include "misc/simulation/simulatedaircraft.h"
@@ -22,7 +22,7 @@ using namespace swift::misc::simulation;
 using namespace swift::core;
 using namespace swift::core::context;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CRemoteAircraftSelector::CRemoteAircraftSelector(QWidget *parent) : QFrame(parent),
                                                                         ui(new Ui::CRemoteAircraftSelector)
diff --git a/src/blackgui/components/remoteaircraftselector.h b/src/gui/components/remoteaircraftselector.h
similarity index 90%
rename from src/blackgui/components/remoteaircraftselector.h
rename to src/gui/components/remoteaircraftselector.h
index c07fd7517..af466095f 100644
--- a/src/blackgui/components/remoteaircraftselector.h
+++ b/src/gui/components/remoteaircraftselector.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_REMOTEAIRCRAFTSELECTOR_H
-#define BLACKGUI_REMOTEAIRCRAFTSELECTOR_H
+#ifndef SWIFT_GUI_REMOTEAIRCRAFTSELECTOR_H
+#define SWIFT_GUI_REMOTEAIRCRAFTSELECTOR_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include "misc/simulation/simulatedaircraftlist.h"
 #include "misc/aviation/callsign.h"
 #include "misc/digestsignal.h"
@@ -26,12 +26,12 @@ namespace Ui
 {
     class CRemoteAircraftSelector;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! Select a remote aircraft
     //! \deprecated list gets too long with many aircraft
     //! \remark CCallsignCompleter as a better alternative
-    class BLACKGUI_EXPORT CRemoteAircraftSelector : public QFrame
+    class SWIFT_GUI_EXPORT CRemoteAircraftSelector : public QFrame
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/remoteaircraftselector.ui b/src/gui/components/remoteaircraftselector.ui
similarity index 100%
rename from src/blackgui/components/remoteaircraftselector.ui
rename to src/gui/components/remoteaircraftselector.ui
diff --git a/src/blackgui/components/scalescreenfactor.cpp b/src/gui/components/scalescreenfactor.cpp
similarity index 97%
rename from src/blackgui/components/scalescreenfactor.cpp
rename to src/gui/components/scalescreenfactor.cpp
index 7d30ac465..726a29f78 100644
--- a/src/blackgui/components/scalescreenfactor.cpp
+++ b/src/gui/components/scalescreenfactor.cpp
@@ -3,12 +3,12 @@
 
 #include "scalescreenfactor.h"
 #include "ui_scalescreenfactor.h"
-#include "blackgui/guiutility.h"
+#include "gui/guiutility.h"
 
 #include <QScreen>
 #include <QIntValidator>
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CScaleScreenFactor::CScaleScreenFactor(QWidget *parent) : QFrame(parent),
                                                               ui(new Ui::CScaleScreenFactor)
diff --git a/src/blackgui/components/scalescreenfactor.h b/src/gui/components/scalescreenfactor.h
similarity index 81%
rename from src/blackgui/components/scalescreenfactor.h
rename to src/gui/components/scalescreenfactor.h
index 68becade5..a70bfe42d 100644
--- a/src/blackgui/components/scalescreenfactor.h
+++ b/src/gui/components/scalescreenfactor.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_SCALESCREENFACTOR_H
-#define BLACKGUI_COMPONENTS_SCALESCREENFACTOR_H
+#ifndef SWIFT_GUI_COMPONENTS_SCALESCREENFACTOR_H
+#define SWIFT_GUI_COMPONENTS_SCALESCREENFACTOR_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include <QFrame>
 #include <QScopedPointer>
 
@@ -14,12 +14,12 @@ namespace Ui
 {
     class CScaleScreenFactor;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * UI to scale screen factor
      */
-    class BLACKGUI_EXPORT CScaleScreenFactor : public QFrame
+    class SWIFT_GUI_EXPORT CScaleScreenFactor : public QFrame
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/scalescreenfactor.ui b/src/gui/components/scalescreenfactor.ui
similarity index 100%
rename from src/blackgui/components/scalescreenfactor.ui
rename to src/gui/components/scalescreenfactor.ui
diff --git a/src/blackgui/components/selcalcodeselector.cpp b/src/gui/components/selcalcodeselector.cpp
similarity index 97%
rename from src/blackgui/components/selcalcodeselector.cpp
rename to src/gui/components/selcalcodeselector.cpp
index a5a500d64..5319ace77 100644
--- a/src/blackgui/components/selcalcodeselector.cpp
+++ b/src/gui/components/selcalcodeselector.cpp
@@ -1,8 +1,8 @@
 // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/selcalcodeselector.h"
-#include "blackgui/ticklabel.h"
+#include "gui/components/selcalcodeselector.h"
+#include "gui/ticklabel.h"
 #include "misc/aviation/selcal.h"
 #include "ui_selcalcodeselector.h"
 
@@ -13,7 +13,7 @@
 using namespace swift::misc;
 using namespace swift::misc::aviation;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CSelcalCodeSelector::CSelcalCodeSelector(QWidget *parent) : QFrame(parent), ui(new Ui::CSelcalCodeSelector)
     {
diff --git a/src/blackgui/components/selcalcodeselector.h b/src/gui/components/selcalcodeselector.h
similarity index 88%
rename from src/blackgui/components/selcalcodeselector.h
rename to src/gui/components/selcalcodeselector.h
index 02b1cd6d4..701c8351e 100644
--- a/src/blackgui/components/selcalcodeselector.h
+++ b/src/gui/components/selcalcodeselector.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_SELCALCODESELECTOR_H
-#define BLACKGUI_SELCALCODESELECTOR_H
+#ifndef SWIFT_GUI_SELCALCODESELECTOR_H
+#define SWIFT_GUI_SELCALCODESELECTOR_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include "misc/aviation/selcal.h"
 
 #include <QFrame>
@@ -20,10 +20,10 @@ namespace Ui
 {
     class CSelcalCodeSelector;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! SELCAL mode selector
-    class BLACKGUI_EXPORT CSelcalCodeSelector : public QFrame
+    class SWIFT_GUI_EXPORT CSelcalCodeSelector : public QFrame
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/selcalcodeselector.ui b/src/gui/components/selcalcodeselector.ui
similarity index 91%
rename from src/blackgui/components/selcalcodeselector.ui
rename to src/gui/components/selcalcodeselector.ui
index 90e35de84..5bacf89e9 100644
--- a/src/blackgui/components/selcalcodeselector.ui
+++ b/src/gui/components/selcalcodeselector.ui
@@ -36,7 +36,7 @@
     <widget class="QComboBox" name="cb_SelcalPairs2"/>
    </item>
    <item>
-    <widget class="BlackGui::CTickLabel" name="lblp_ValidCodeIcon">
+    <widget class="swift::gui::CTickLabel" name="lblp_ValidCodeIcon">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
        <horstretch>0</horstretch>
@@ -55,9 +55,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::CTickLabel</class>
+   <class>swift::gui::CTickLabel</class>
    <extends>QLabel</extends>
-   <header>blackgui/ticklabel.h</header>
+   <header>gui/ticklabel.h</header>
   </customwidget>
  </customwidgets>
  <resources>
diff --git a/src/blackgui/components/serverlistselector.cpp b/src/gui/components/serverlistselector.cpp
similarity index 95%
rename from src/blackgui/components/serverlistselector.cpp
rename to src/gui/components/serverlistselector.cpp
index 0acf4c868..a7419a5cf 100644
--- a/src/blackgui/components/serverlistselector.cpp
+++ b/src/gui/components/serverlistselector.cpp
@@ -1,8 +1,8 @@
 // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/serverlistselector.h"
-#include "blackgui/guiapplication.h"
+#include "gui/components/serverlistselector.h"
+#include "gui/guiapplication.h"
 #include "misc/sequence.h"
 #include "core/webdataservices.h"
 #include "core/db/icaodatareader.h"
@@ -11,11 +11,11 @@
 
 using namespace swift::misc;
 using namespace swift::misc::network;
-using namespace BlackGui;
+using namespace swift::gui;
 using namespace swift::core;
 using namespace swift::core::db;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CServerListSelector::CServerListSelector(QWidget *parent) : QComboBox(parent)
     {
diff --git a/src/blackgui/components/serverlistselector.h b/src/gui/components/serverlistselector.h
similarity index 86%
rename from src/blackgui/components/serverlistselector.h
rename to src/gui/components/serverlistselector.h
index 1539a58a7..3c797084a 100644
--- a/src/blackgui/components/serverlistselector.h
+++ b/src/gui/components/serverlistselector.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_SERVERLISTSELECTOR_H
-#define BLACKGUI_COMPONENTS_SERVERLISTSELECTOR_H
+#ifndef SWIFT_GUI_COMPONENTS_SERVERLISTSELECTOR_H
+#define SWIFT_GUI_COMPONENTS_SERVERLISTSELECTOR_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include "misc/network/data/lastserver.h"
 #include "misc/network/serverlist.h"
 #include "misc/datacache.h"
@@ -15,10 +15,10 @@
 #include <QObject>
 #include <QStringList>
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! List of servers
-    class BLACKGUI_EXPORT CServerListSelector : public QComboBox
+    class SWIFT_GUI_EXPORT CServerListSelector : public QComboBox
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/settingsadvancedcomponent.cpp b/src/gui/components/settingsadvancedcomponent.cpp
similarity index 93%
rename from src/blackgui/components/settingsadvancedcomponent.cpp
rename to src/gui/components/settingsadvancedcomponent.cpp
index e7027a5bc..05c2ff36f 100644
--- a/src/blackgui/components/settingsadvancedcomponent.cpp
+++ b/src/gui/components/settingsadvancedcomponent.cpp
@@ -2,11 +2,11 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "ui_settingsadvancedcomponent.h"
-#include "blackgui/components/settingsadvancedcomponent.h"
+#include "gui/components/settingsadvancedcomponent.h"
 
 using namespace swift::misc;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CSettingsAdvancedComponent::CSettingsAdvancedComponent(QWidget *parent) : QFrame(parent),
                                                                               ui(new Ui::CSettingsAdvancedComponent)
diff --git a/src/blackgui/components/settingsadvancedcomponent.h b/src/gui/components/settingsadvancedcomponent.h
similarity index 78%
rename from src/blackgui/components/settingsadvancedcomponent.h
rename to src/gui/components/settingsadvancedcomponent.h
index 8983e9610..de3ad3840 100644
--- a/src/blackgui/components/settingsadvancedcomponent.h
+++ b/src/gui/components/settingsadvancedcomponent.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_SETTINGSGENERALCOMPONENT_H
-#define BLACKGUI_COMPONENTS_SETTINGSGENERALCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_SETTINGSGENERALCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_SETTINGSGENERALCOMPONENT_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include "core/application/applicationsettings.h"
 #include "misc/settingscache.h"
 
@@ -18,10 +18,10 @@ namespace Ui
 {
     class CSettingsAdvancedComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! Configure general settings
-    class BLACKGUI_EXPORT CSettingsAdvancedComponent : public QFrame
+    class SWIFT_GUI_EXPORT CSettingsAdvancedComponent : public QFrame
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/settingsadvancedcomponent.ui b/src/gui/components/settingsadvancedcomponent.ui
similarity index 100%
rename from src/blackgui/components/settingsadvancedcomponent.ui
rename to src/gui/components/settingsadvancedcomponent.ui
diff --git a/src/blackgui/components/settingscomponent.cpp b/src/gui/components/settingscomponent.cpp
similarity index 96%
rename from src/blackgui/components/settingscomponent.cpp
rename to src/gui/components/settingscomponent.cpp
index c166b0334..4bfc5e2ab 100644
--- a/src/blackgui/components/settingscomponent.cpp
+++ b/src/gui/components/settingscomponent.cpp
@@ -1,9 +1,9 @@
 // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/audionotificationcomponent.h"
-#include "blackgui/components/settingscomponent.h"
-#include "blackgui/guiapplication.h"
+#include "gui/components/audionotificationcomponent.h"
+#include "gui/components/settingscomponent.h"
+#include "gui/guiapplication.h"
 #include "config/buildconfig.h"
 #include "ui_settingscomponent.h"
 
@@ -23,10 +23,10 @@ using namespace swift::misc::input;
 using namespace swift::misc::simulation;
 using namespace swift::misc::simulation::settings;
 using namespace swift::core;
-using namespace BlackGui;
+using namespace swift::gui;
 using namespace swift::config;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CSettingsComponent::CSettingsComponent(QWidget *parent) : QTabWidget(parent),
                                                               ui(new Ui::CSettingsComponent)
diff --git a/src/blackgui/components/settingscomponent.h b/src/gui/components/settingscomponent.h
similarity index 88%
rename from src/blackgui/components/settingscomponent.h
rename to src/gui/components/settingscomponent.h
index 29038b4eb..b5b9f4685 100644
--- a/src/blackgui/components/settingscomponent.h
+++ b/src/gui/components/settingscomponent.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_SETTINGSCOMPONENT_H
-#define BLACKGUI_COMPONENTS_SETTINGSCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_SETTINGSCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_SETTINGSCOMPONENT_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include "misc/simulation/settings/simulatorsettings.h"
 #include <QColor>
 #include <QObject>
@@ -19,10 +19,10 @@ namespace Ui
 {
     class CSettingsComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! Settings component
-    class BLACKGUI_EXPORT CSettingsComponent : public QTabWidget
+    class SWIFT_GUI_EXPORT CSettingsComponent : public QTabWidget
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/settingscomponent.ui b/src/gui/components/settingscomponent.ui
similarity index 86%
rename from src/blackgui/components/settingscomponent.ui
rename to src/gui/components/settingscomponent.ui
index 643dc228d..2ca64f7c7 100644
--- a/src/blackgui/components/settingscomponent.ui
+++ b/src/gui/components/settingscomponent.ui
@@ -225,7 +225,7 @@
      <number>1</number>
     </property>
     <item>
-     <widget class="BlackGui::Components::CSettingsNetworkServersComponent" name="comp_SettingsServersComponent">
+     <widget class="swift::gui::components::CSettingsNetworkServersComponent" name="comp_SettingsServersComponent">
       <property name="frameShape">
        <enum>QFrame::StyledPanel</enum>
       </property>
@@ -270,10 +270,10 @@
      <number>1</number>
     </property>
     <item>
-     <widget class="BlackGui::Components::CSettingsGuiComponent" name="comp_SettingsGuiGeneral"/>
+     <widget class="swift::gui::components::CSettingsGuiComponent" name="comp_SettingsGuiGeneral"/>
     </item>
     <item>
-     <widget class="BlackGui::Components::CSettingsViewUpdateTimes" name="comp_SettingsGuiRefreshTimes"/>
+     <widget class="swift::gui::components::CSettingsViewUpdateTimes" name="comp_SettingsGuiRefreshTimes"/>
     </item>
     <item>
      <widget class="QWidget" name="qw_SettingsGuiFont" native="true">
@@ -319,7 +319,7 @@
      <number>1</number>
     </property>
     <item>
-     <widget class="BlackGui::Components::CSettingsNetworkComponent" name="comp_SettingsNetwork">
+     <widget class="swift::gui::components::CSettingsNetworkComponent" name="comp_SettingsNetwork">
       <property name="frameShape">
        <enum>QFrame::StyledPanel</enum>
       </property>
@@ -351,7 +351,7 @@
      <number>1</number>
     </property>
     <item alignment="Qt::AlignTop">
-     <widget class="BlackGui::Components::CSettingsHotkeyComponent" name="comp_SettingsHotkeys">
+     <widget class="swift::gui::components::CSettingsHotkeyComponent" name="comp_SettingsHotkeys">
       <property name="minimumSize">
        <size>
         <width>0</width>
@@ -383,7 +383,7 @@
      <number>1</number>
     </property>
     <item alignment="Qt::AlignTop">
-     <widget class="BlackGui::Components::CAudioNotificationComponent" name="comp_AudioNotification">
+     <widget class="swift::gui::components::CAudioNotificationComponent" name="comp_AudioNotification">
       <property name="minimumSize">
        <size>
         <width>0</width>
@@ -445,7 +445,7 @@
          <number>1</number>
         </property>
         <item alignment="Qt::AlignTop">
-         <widget class="BlackGui::Components::CDbLoadOverviewComponent" name="comp_DataLoadOverview">
+         <widget class="swift::gui::components::CDbLoadOverviewComponent" name="comp_DataLoadOverview">
           <property name="minimumSize">
            <size>
             <width>0</width>
@@ -481,7 +481,7 @@
      <number>1</number>
     </property>
     <item>
-     <widget class="BlackGui::Components::CSettingsSimulatorComponent" name="comp_SettingsSimulator">
+     <widget class="swift::gui::components::CSettingsSimulatorComponent" name="comp_SettingsSimulator">
       <property name="minimumSize">
        <size>
         <width>0</width>
@@ -513,7 +513,7 @@
      <number>1</number>
     </property>
     <item>
-     <widget class="BlackGui::Components::CSettingsSimulatorBasicsComponent" name="comp_SettingsSimulatorBasics">
+     <widget class="swift::gui::components::CSettingsSimulatorBasicsComponent" name="comp_SettingsSimulatorBasics">
       <property name="frameShape">
        <enum>QFrame::StyledPanel</enum>
       </property>
@@ -558,7 +558,7 @@
      <number>1</number>
     </property>
     <item>
-     <widget class="BlackGui::Components::CSettingsSimulatorMessagesComponent" name="comp_SettingsSimulatorMessages"/>
+     <widget class="swift::gui::components::CSettingsSimulatorMessagesComponent" name="comp_SettingsSimulatorMessages"/>
     </item>
     <item>
      <spacer name="vs_SettingsSimulatorMessages">
@@ -593,7 +593,7 @@
      <number>1</number>
     </property>
     <item>
-     <widget class="BlackGui::Components::CSettingsMatchingComponent" name="comp_SettingsMatching">
+     <widget class="swift::gui::components::CSettingsMatchingComponent" name="comp_SettingsMatching">
       <property name="minimumSize">
        <size>
         <width>0</width>
@@ -625,7 +625,7 @@
      <number>1</number>
     </property>
     <item>
-     <widget class="BlackGui::Components::CSettingsAdvancedComponent" name="comp_SettingsAdvanced">
+     <widget class="swift::gui::components::CSettingsAdvancedComponent" name="comp_SettingsAdvanced">
       <property name="frameShape">
        <enum>QFrame::StyledPanel</enum>
       </property>
@@ -639,75 +639,75 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CDbLoadOverviewComponent</class>
+   <class>swift::gui::components::CDbLoadOverviewComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/dbloadoverviewcomponent.h</header>
+   <header>gui/components/dbloadoverviewcomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CSettingsSimulatorBasicsComponent</class>
+   <class>swift::gui::components::CSettingsSimulatorBasicsComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/settingssimulatorbasicscomponent.h</header>
+   <header>gui/components/settingssimulatorbasicscomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CSettingsGuiComponent</class>
+   <class>swift::gui::components::CSettingsGuiComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/settingsguicomponent.h</header>
+   <header>gui/components/settingsguicomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CSettingsAdvancedComponent</class>
+   <class>swift::gui::components::CSettingsAdvancedComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/settingsadvancedcomponent.h</header>
+   <header>gui/components/settingsadvancedcomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CSettingsSimulatorComponent</class>
+   <class>swift::gui::components::CSettingsSimulatorComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/settingssimulatorcomponent.h</header>
+   <header>gui/components/settingssimulatorcomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CSettingsNetworkServersComponent</class>
+   <class>swift::gui::components::CSettingsNetworkServersComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/settingsnetworkserverscomponent.h</header>
+   <header>gui/components/settingsnetworkserverscomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CSettingsNetworkComponent</class>
+   <class>swift::gui::components::CSettingsNetworkComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/settingsnetworkcomponent.h</header>
+   <header>gui/components/settingsnetworkcomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CSettingsHotkeyComponent</class>
+   <class>swift::gui::components::CSettingsHotkeyComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/settingshotkeycomponent.h</header>
+   <header>gui/components/settingshotkeycomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CSettingsSimulatorMessagesComponent</class>
+   <class>swift::gui::components::CSettingsSimulatorMessagesComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/settingssimulatormessagescomponent.h</header>
+   <header>gui/components/settingssimulatormessagescomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CSettingsViewUpdateTimes</class>
+   <class>swift::gui::components::CSettingsViewUpdateTimes</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/settingsviewupdatetimes.h</header>
+   <header>gui/components/settingsviewupdatetimes.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CSettingsMatchingComponent</class>
+   <class>swift::gui::components::CSettingsMatchingComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/settingsmatchingcomponent.h</header>
+   <header>gui/components/settingsmatchingcomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CAudioNotificationComponent</class>
+   <class>swift::gui::components::CAudioNotificationComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/audionotificationcomponent.h</header>
+   <header>gui/components/audionotificationcomponent.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/settingsfontcomponent.cpp b/src/gui/components/settingsfontcomponent.cpp
similarity index 98%
rename from src/blackgui/components/settingsfontcomponent.cpp
rename to src/gui/components/settingsfontcomponent.cpp
index bbb4a49ad..51d5eec46 100644
--- a/src/blackgui/components/settingsfontcomponent.cpp
+++ b/src/gui/components/settingsfontcomponent.cpp
@@ -1,8 +1,8 @@
 // SPDX-FileCopyrightText: Copyright (C) 2017 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/guiapplication.h"
-#include "blackgui/guiutility.h"
+#include "gui/guiapplication.h"
+#include "gui/guiutility.h"
 #include "misc/logmessage.h"
 #include "settingsfontcomponent.h"
 #include "ui_settingsfontcomponent.h"
@@ -13,7 +13,7 @@
 
 using namespace swift::misc;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CSettingsFontComponent::CSettingsFontComponent(QWidget *parent) : QFrame(parent),
                                                                       ui(new Ui::CSettingsFontComponent)
diff --git a/src/blackgui/components/settingsfontcomponent.h b/src/gui/components/settingsfontcomponent.h
similarity index 93%
rename from src/blackgui/components/settingsfontcomponent.h
rename to src/gui/components/settingsfontcomponent.h
index 2d6dcc52d..b9924a13c 100644
--- a/src/blackgui/components/settingsfontcomponent.h
+++ b/src/gui/components/settingsfontcomponent.h
@@ -3,8 +3,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_SETTINGSFONTCOMPONENT_H
-#define BLACKGUI_COMPONENTS_SETTINGSFONTCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_SETTINGSFONTCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_SETTINGSFONTCOMPONENT_H
 
 #include <QFrame>
 
@@ -12,7 +12,7 @@ namespace Ui
 {
     class CSettingsFontComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Font settings
diff --git a/src/blackgui/components/settingsfontcomponent.ui b/src/gui/components/settingsfontcomponent.ui
similarity index 100%
rename from src/blackgui/components/settingsfontcomponent.ui
rename to src/gui/components/settingsfontcomponent.ui
diff --git a/src/blackgui/components/settingsfontdialog.cpp b/src/gui/components/settingsfontdialog.cpp
similarity index 97%
rename from src/blackgui/components/settingsfontdialog.cpp
rename to src/gui/components/settingsfontdialog.cpp
index 6e775c177..ba5700473 100644
--- a/src/blackgui/components/settingsfontdialog.cpp
+++ b/src/gui/components/settingsfontdialog.cpp
@@ -4,7 +4,7 @@
 #include "settingsfontdialog.h"
 #include "ui_settingsfontdialog.h"
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CSettingsFontDialog::CSettingsFontDialog(QWidget *parent) : QDialog(parent),
                                                                 ui(new Ui::CSettingsFontDialog)
diff --git a/src/blackgui/components/settingsfontdialog.h b/src/gui/components/settingsfontdialog.h
similarity index 84%
rename from src/blackgui/components/settingsfontdialog.h
rename to src/gui/components/settingsfontdialog.h
index 2c29636c0..897035661 100644
--- a/src/blackgui/components/settingsfontdialog.h
+++ b/src/gui/components/settingsfontdialog.h
@@ -3,8 +3,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_SETTINGSFONTDIALOG_H
-#define BLACKGUI_COMPONENTS_SETTINGSFONTDIALOG_H
+#ifndef SWIFT_GUI_COMPONENTS_SETTINGSFONTDIALOG_H
+#define SWIFT_GUI_COMPONENTS_SETTINGSFONTDIALOG_H
 
 #include <QDialog>
 #include <QFont>
@@ -14,11 +14,11 @@ namespace Ui
 {
     class CSettingsFontDialog;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Dialog to edit fonts
-     * \see swift::misc::Components::CSettingsFontComponent
+     * \see swift::misc::components::CSettingsFontComponent
      */
     class CSettingsFontDialog : public QDialog
     {
diff --git a/src/blackgui/components/settingsfontdialog.ui b/src/gui/components/settingsfontdialog.ui
similarity index 81%
rename from src/blackgui/components/settingsfontdialog.ui
rename to src/gui/components/settingsfontdialog.ui
index db25a4eb0..66de886df 100644
--- a/src/blackgui/components/settingsfontdialog.ui
+++ b/src/gui/components/settingsfontdialog.ui
@@ -21,7 +21,7 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <widget class="BlackGui::Components::CSettingsFontComponent" name="comp_FontSettings">
+    <widget class="swift::gui::components::CSettingsFontComponent" name="comp_FontSettings">
      <property name="frameShape">
       <enum>QFrame::StyledPanel</enum>
      </property>
@@ -34,9 +34,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CSettingsFontComponent</class>
+   <class>swift::gui::components::CSettingsFontComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/settingsfontcomponent.h</header>
+   <header>gui/components/settingsfontcomponent.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/settingsguicomponent.cpp b/src/gui/components/settingsguicomponent.cpp
similarity index 97%
rename from src/blackgui/components/settingsguicomponent.cpp
rename to src/gui/components/settingsguicomponent.cpp
index b96544c0f..e56bdbe7b 100644
--- a/src/blackgui/components/settingsguicomponent.cpp
+++ b/src/gui/components/settingsguicomponent.cpp
@@ -3,7 +3,7 @@
 
 #include "settingsguicomponent.h"
 #include "core/context/contextnetwork.h"
-#include "blackgui/guiapplication.h"
+#include "gui/guiapplication.h"
 #include "misc/logmessage.h"
 #include "ui_settingsguicomponent.h"
 #include <QColorDialog>
@@ -13,13 +13,13 @@
 #include <QMessageBox>
 
 using namespace swift::misc;
-using namespace BlackGui::Settings;
+using namespace swift::gui::settings;
 using namespace swift::core::context;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CSettingsGuiComponent::CSettingsGuiComponent(QWidget *parent) : QFrame(parent),
-                                                                    BlackGui::CSingleApplicationUi(this),
+                                                                    swift::gui::CSingleApplicationUi(this),
                                                                     ui(new Ui::CSettingsGuiComponent)
     {
         ui->setupUi(this);
diff --git a/src/blackgui/components/settingsguicomponent.h b/src/gui/components/settingsguicomponent.h
similarity index 78%
rename from src/blackgui/components/settingsguicomponent.h
rename to src/gui/components/settingsguicomponent.h
index ed02244d6..ba261fe64 100644
--- a/src/blackgui/components/settingsguicomponent.h
+++ b/src/gui/components/settingsguicomponent.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_SETTINGSGUICOMPONENT_H
-#define BLACKGUI_COMPONENTS_SETTINGSGUICOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_SETTINGSGUICOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_SETTINGSGUICOMPONENT_H
 
-#include "blackgui/singleapplicationui.h"
-#include "blackgui/settings/guisettings.h"
+#include "gui/singleapplicationui.h"
+#include "gui/settings/guisettings.h"
 #include <QFrame>
 #include <QScopedPointer>
 
@@ -15,14 +15,14 @@ namespace Ui
 {
     class CSettingsGuiComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * General GUI settings
      */
     class CSettingsGuiComponent :
         public QFrame,
-        public BlackGui::CSingleApplicationUi
+        public swift::gui::CSingleApplicationUi
     {
         Q_OBJECT
 
@@ -54,7 +54,7 @@ namespace BlackGui::Components
         void widgetStyleChanged(int index);
 
         QScopedPointer<Ui::CSettingsGuiComponent> ui;
-        swift::misc::CSetting<Settings::TGeneralGui> m_guiSettings { this, &CSettingsGuiComponent::guiSettingsChanged };
+        swift::misc::CSetting<settings::TGeneralGui> m_guiSettings { this, &CSettingsGuiComponent::guiSettingsChanged };
     };
 } // ns
 #endif // guard
diff --git a/src/blackgui/components/settingsguicomponent.ui b/src/gui/components/settingsguicomponent.ui
similarity index 96%
rename from src/blackgui/components/settingsguicomponent.ui
rename to src/gui/components/settingsguicomponent.ui
index 1a0f02dae..56cb219ab 100644
--- a/src/blackgui/components/settingsguicomponent.ui
+++ b/src/gui/components/settingsguicomponent.ui
@@ -51,7 +51,7 @@
        <number>3</number>
       </property>
       <item>
-       <widget class="BlackGui::Components::CSettingsFontComponent" name="comp_SettingsFonts">
+       <widget class="swift::gui::components::CSettingsFontComponent" name="comp_SettingsFonts">
         <property name="minimumSize">
          <size>
           <width>0</width>
@@ -200,9 +200,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CSettingsFontComponent</class>
+   <class>swift::gui::components::CSettingsFontComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/settingsfontcomponent.h</header>
+   <header>gui/components/settingsfontcomponent.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/settingshotkeycomponent.cpp b/src/gui/components/settingshotkeycomponent.cpp
similarity index 97%
rename from src/blackgui/components/settingshotkeycomponent.cpp
rename to src/gui/components/settingshotkeycomponent.cpp
index 8525395d3..86582a9c6 100644
--- a/src/blackgui/components/settingshotkeycomponent.cpp
+++ b/src/gui/components/settingshotkeycomponent.cpp
@@ -1,10 +1,10 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/configurationwizard.h"
-#include "blackgui/components/settingshotkeycomponent.h"
-#include "blackgui/components/hotkeydialog.h"
-#include "blackgui/guiapplication.h"
+#include "gui/components/configurationwizard.h"
+#include "gui/components/settingshotkeycomponent.h"
+#include "gui/components/hotkeydialog.h"
+#include "gui/guiapplication.h"
 #include "core/context/contextapplication.h"
 #include "core/context/contextaudio.h"
 #include "core/inputmanager.h"
@@ -27,11 +27,11 @@
 
 using namespace swift::misc;
 using namespace swift::misc::input;
-using namespace BlackGui::Models;
+using namespace swift::gui::models;
 using namespace swift::core;
 using namespace swift::core::context;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CSettingsHotkeyComponent::CSettingsHotkeyComponent(QWidget *parent) : QFrame(parent),
                                                                           ui(new Ui::CSettingsHotkeyComponent)
diff --git a/src/blackgui/components/settingshotkeycomponent.h b/src/gui/components/settingshotkeycomponent.h
similarity index 88%
rename from src/blackgui/components/settingshotkeycomponent.h
rename to src/gui/components/settingshotkeycomponent.h
index 8c5886214..4b041db35 100644
--- a/src/blackgui/components/settingshotkeycomponent.h
+++ b/src/gui/components/settingshotkeycomponent.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_SETTINGSHOTKEYCOMPONENT_H
-#define BLACKGUI_COMPONENTS_SETTINGSHOTKEYCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_SETTINGSHOTKEYCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_SETTINGSHOTKEYCOMPONENT_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/models/actionhotkeylistmodel.h"
+#include "gui/swiftguiexport.h"
+#include "gui/models/actionhotkeylistmodel.h"
 #include "core/actionbind.h"
 #include "core/application/applicationsettings.h"
 #include "misc/identifierlist.h"
@@ -23,10 +23,10 @@ namespace Ui
 {
     class CSettingsHotkeyComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! Configure hotkeys
-    class BLACKGUI_EXPORT CSettingsHotkeyComponent : public QFrame
+    class SWIFT_GUI_EXPORT CSettingsHotkeyComponent : public QFrame
     {
         Q_OBJECT
 
@@ -59,7 +59,7 @@ namespace BlackGui::Components
         void resizeView();
 
         QScopedPointer<Ui::CSettingsHotkeyComponent> ui;
-        Models::CActionHotkeyListModel m_model; //!< hotkeys model
+        models::CActionHotkeyListModel m_model; //!< hotkeys model
         swift::misc::CSetting<swift::core::application::TActionHotkeys> m_actionHotkeys { this, &CSettingsHotkeyComponent::reloadHotkeysFromSettings };
         swift::core::CActionBind m_action { "/Test/Message", swift::misc::CIcons::StandardIconWrench16, this, &CSettingsHotkeyComponent::hotkeySlot };
     };
diff --git a/src/blackgui/components/settingshotkeycomponent.ui b/src/gui/components/settingshotkeycomponent.ui
similarity index 100%
rename from src/blackgui/components/settingshotkeycomponent.ui
rename to src/gui/components/settingshotkeycomponent.ui
diff --git a/src/blackgui/components/settingsmatchingcomponent.cpp b/src/gui/components/settingsmatchingcomponent.cpp
similarity index 98%
rename from src/blackgui/components/settingsmatchingcomponent.cpp
rename to src/gui/components/settingsmatchingcomponent.cpp
index 1ef30cfac..4e9d3827b 100644
--- a/src/blackgui/components/settingsmatchingcomponent.cpp
+++ b/src/gui/components/settingsmatchingcomponent.cpp
@@ -3,7 +3,7 @@
 
 #include "settingsmatchingcomponent.h"
 #include "ui_settingsmatchingcomponent.h"
-#include "blackgui/guiapplication.h"
+#include "gui/guiapplication.h"
 #include "core/context/contextsimulator.h"
 #include "misc/simulation/aircraftmatchersetup.h"
 #include "misc/logmessage.h"
@@ -13,7 +13,7 @@ using namespace swift::misc;
 using namespace swift::misc::simulation;
 using namespace swift::core::context;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CSettingsMatchingComponent::CSettingsMatchingComponent(QWidget *parent) : QFrame(parent),
                                                                               ui(new Ui::CSettingsMatchingComponent)
diff --git a/src/blackgui/components/settingsmatchingcomponent.h b/src/gui/components/settingsmatchingcomponent.h
similarity index 91%
rename from src/blackgui/components/settingsmatchingcomponent.h
rename to src/gui/components/settingsmatchingcomponent.h
index 917449e50..a320d1f09 100644
--- a/src/blackgui/components/settingsmatchingcomponent.h
+++ b/src/gui/components/settingsmatchingcomponent.h
@@ -3,8 +3,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_SETTINGSMATCHINGCOMPONENT_H
-#define BLACKGUI_COMPONENTS_SETTINGSMATCHINGCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_SETTINGSMATCHINGCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_SETTINGSMATCHINGCOMPONENT_H
 
 #include "misc/simulation/aircraftmatchersetup.h"
 #include <QFrame>
@@ -18,7 +18,7 @@ namespace Ui
 {
     class CSettingsMatchingComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! Settings for matching component
     class CSettingsMatchingComponent : public QFrame
diff --git a/src/blackgui/components/settingsmatchingcomponent.ui b/src/gui/components/settingsmatchingcomponent.ui
similarity index 94%
rename from src/blackgui/components/settingsmatchingcomponent.ui
rename to src/gui/components/settingsmatchingcomponent.ui
index 4a0091c32..e910ccc9d 100644
--- a/src/blackgui/components/settingsmatchingcomponent.ui
+++ b/src/gui/components/settingsmatchingcomponent.ui
@@ -54,7 +54,7 @@
         <number>0</number>
        </property>
        <item>
-        <widget class="BlackGui::Editors::CMatchingForm" name="form_Matching">
+        <widget class="swift::gui::editors::CMatchingForm" name="form_Matching">
          <property name="minimumSize">
           <size>
            <width>0</width>
@@ -114,9 +114,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Editors::CMatchingForm</class>
+   <class>swift::gui::editors::CMatchingForm</class>
    <extends>QFrame</extends>
-   <header>blackgui/editors/matchingform.h</header>
+   <header>gui/editors/matchingform.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/settingsmatchingdialog.cpp b/src/gui/components/settingsmatchingdialog.cpp
similarity index 96%
rename from src/blackgui/components/settingsmatchingdialog.cpp
rename to src/gui/components/settingsmatchingdialog.cpp
index 883915770..fad3a99ed 100644
--- a/src/blackgui/components/settingsmatchingdialog.cpp
+++ b/src/gui/components/settingsmatchingdialog.cpp
@@ -6,7 +6,7 @@
 
 using namespace swift::misc::simulation;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CSettingsMatchingDialog::CSettingsMatchingDialog(QWidget *parent) : QDialog(parent),
                                                                         ui(new Ui::CSettingsMatchingDialog)
diff --git a/src/blackgui/components/settingsmatchingdialog.h b/src/gui/components/settingsmatchingdialog.h
similarity index 87%
rename from src/blackgui/components/settingsmatchingdialog.h
rename to src/gui/components/settingsmatchingdialog.h
index 2d1ca328e..a71508910 100644
--- a/src/blackgui/components/settingsmatchingdialog.h
+++ b/src/gui/components/settingsmatchingdialog.h
@@ -3,8 +3,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_SETTINGSMATCHINGDIALOG_H
-#define BLACKGUI_COMPONENTS_SETTINGSMATCHINGDIALOG_H
+#ifndef SWIFT_GUI_COMPONENTS_SETTINGSMATCHINGDIALOG_H
+#define SWIFT_GUI_COMPONENTS_SETTINGSMATCHINGDIALOG_H
 
 #include "misc/simulation/aircraftmatchersetup.h"
 #include <QDialog>
@@ -14,7 +14,7 @@ namespace Ui
 {
     class CSettingsMatchingDialog;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! Matching settings as dialog
     class CSettingsMatchingDialog : public QDialog
diff --git a/src/blackgui/components/settingsmatchingdialog.ui b/src/gui/components/settingsmatchingdialog.ui
similarity index 89%
rename from src/blackgui/components/settingsmatchingdialog.ui
rename to src/gui/components/settingsmatchingdialog.ui
index 1fe8dca7d..7150ddc5a 100644
--- a/src/blackgui/components/settingsmatchingdialog.ui
+++ b/src/gui/components/settingsmatchingdialog.ui
@@ -15,7 +15,7 @@
   </property>
   <layout class="QVBoxLayout" name="vl_MatchingDialog">
    <item>
-    <widget class="BlackGui::Components::CSettingsMatchingComponent" name="comp_Settings">
+    <widget class="swift::gui::components::CSettingsMatchingComponent" name="comp_Settings">
      <property name="frameShape">
       <enum>QFrame::StyledPanel</enum>
      </property>
@@ -38,9 +38,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CSettingsMatchingComponent</class>
+   <class>swift::gui::components::CSettingsMatchingComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/settingsmatchingcomponent.h</header>
+   <header>gui/components/settingsmatchingcomponent.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/settingsmodelcomponent.cpp b/src/gui/components/settingsmodelcomponent.cpp
similarity index 97%
rename from src/blackgui/components/settingsmodelcomponent.cpp
rename to src/gui/components/settingsmodelcomponent.cpp
index 39bf5f357..8a09b87fb 100644
--- a/src/blackgui/components/settingsmodelcomponent.cpp
+++ b/src/gui/components/settingsmodelcomponent.cpp
@@ -3,7 +3,7 @@
 
 #include "settingsmodelcomponent.h"
 #include "ui_settingsmodelcomponent.h"
-#include "blackgui/guiapplication.h"
+#include "gui/guiapplication.h"
 #include "core/db/backgrounddataupdater.h"
 #include "misc/logmessage.h"
 
@@ -11,10 +11,10 @@
 
 using namespace swift::misc;
 using namespace swift::misc::simulation::settings;
-using namespace BlackGui::Settings;
+using namespace swift::gui::settings;
 using namespace swift::core::db;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CSettingsModelComponent::CSettingsModelComponent(QWidget *parent) : QFrame(parent),
                                                                         ui(new Ui::CSettingsModelComponent)
diff --git a/src/blackgui/components/settingsmodelcomponent.h b/src/gui/components/settingsmodelcomponent.h
similarity index 87%
rename from src/blackgui/components/settingsmodelcomponent.h
rename to src/gui/components/settingsmodelcomponent.h
index 635d8a5be..371cc611f 100644
--- a/src/blackgui/components/settingsmodelcomponent.h
+++ b/src/gui/components/settingsmodelcomponent.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_SETTINGSMODELCOMPONENT_H
-#define BLACKGUI_COMPONENTS_SETTINGSMODELCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_SETTINGSMODELCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_SETTINGSMODELCOMPONENT_H
 
-#include "blackgui/settings/guisettings.h"
+#include "gui/settings/guisettings.h"
 #include "misc/simulation/settings/modelsettings.h"
 #include <QFrame>
 
@@ -18,7 +18,7 @@ namespace swift::core::db
 {
     class CBackgroundDataUpdater;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Settings UI for model matching/mapping
@@ -42,7 +42,7 @@ namespace BlackGui::Components
 
     private:
         QScopedPointer<Ui::CSettingsModelComponent> ui;
-        swift::misc::CSetting<Settings::TBackgroundConsolidation> m_consolidationSetting { this, &CSettingsModelComponent::cacheChanged }; //!< consolidation time
+        swift::misc::CSetting<settings::TBackgroundConsolidation> m_consolidationSetting { this, &CSettingsModelComponent::cacheChanged }; //!< consolidation time
         swift::misc::CSetting<swift::misc::simulation::settings::TModel> m_modelSettings { this, &CSettingsModelComponent::cacheChanged }; //!< model setting
         const swift::core::db::CBackgroundDataUpdater *m_updater = nullptr; //!< externally (i.e. other component) provided existing updater
 
diff --git a/src/blackgui/components/settingsmodelcomponent.ui b/src/gui/components/settingsmodelcomponent.ui
similarity index 93%
rename from src/blackgui/components/settingsmodelcomponent.ui
rename to src/gui/components/settingsmodelcomponent.ui
index c3e47d8dc..0d0ebd702 100644
--- a/src/blackgui/components/settingsmodelcomponent.ui
+++ b/src/gui/components/settingsmodelcomponent.ui
@@ -73,15 +73,15 @@
     </widget>
    </item>
    <item>
-    <widget class="BlackGui::CLedWidget" name="comp_Led" native="true"/>
+    <widget class="swift::gui::CLedWidget" name="comp_Led" native="true"/>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::CLedWidget</class>
+   <class>swift::gui::CLedWidget</class>
    <extends>QWidget</extends>
-   <header>blackgui/led.h</header>
+   <header>gui/led.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/settingsnetworkcomponent.cpp b/src/gui/components/settingsnetworkcomponent.cpp
similarity index 83%
rename from src/blackgui/components/settingsnetworkcomponent.cpp
rename to src/gui/components/settingsnetworkcomponent.cpp
index dcae10981..ebc117705 100644
--- a/src/blackgui/components/settingsnetworkcomponent.cpp
+++ b/src/gui/components/settingsnetworkcomponent.cpp
@@ -2,15 +2,15 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "core/context/contextnetwork.h"
-#include "blackgui/components/settingsnetworkcomponent.h"
-#include "blackgui/guiapplication.h"
+#include "gui/components/settingsnetworkcomponent.h"
+#include "gui/guiapplication.h"
 #include "ui_settingsnetworkcomponent.h"
 
 #include <QCheckBox>
 
 using namespace swift::core;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CSettingsNetworkComponent::CSettingsNetworkComponent(QWidget *parent) : QFrame(parent),
                                                                             ui(new Ui::CSettingsNetworkComponent)
diff --git a/src/blackgui/components/settingsnetworkcomponent.h b/src/gui/components/settingsnetworkcomponent.h
similarity index 73%
rename from src/blackgui/components/settingsnetworkcomponent.h
rename to src/gui/components/settingsnetworkcomponent.h
index 7d5941ba9..b24404f40 100644
--- a/src/blackgui/components/settingsnetworkcomponent.h
+++ b/src/gui/components/settingsnetworkcomponent.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_SETTINGSNETWORKCOMPONENT_H
-#define BLACKGUI_COMPONENTS_SETTINGSNETWORKCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_SETTINGSNETWORKCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_SETTINGSNETWORKCOMPONENT_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include "core/vatsim/vatsimsettings.h"
 
 #include <QFrame>
@@ -17,10 +17,10 @@ namespace Ui
 {
     class CSettingsNetworkComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! General settings for network
-    class BLACKGUI_EXPORT CSettingsNetworkComponent : public QFrame
+    class SWIFT_GUI_EXPORT CSettingsNetworkComponent : public QFrame
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/settingsnetworkcomponent.ui b/src/gui/components/settingsnetworkcomponent.ui
similarity index 86%
rename from src/blackgui/components/settingsnetworkcomponent.ui
rename to src/gui/components/settingsnetworkcomponent.ui
index 6909a37b9..f0607c881 100644
--- a/src/blackgui/components/settingsnetworkcomponent.ui
+++ b/src/gui/components/settingsnetworkcomponent.ui
@@ -21,7 +21,7 @@
      </property>
      <layout class="QVBoxLayout" name="vl_NetworkServices">
       <item>
-       <widget class="BlackGui::Components::CSettingsVatsimReadersComponent" name="comp_ReaderSettings">
+       <widget class="swift::gui::components::CSettingsVatsimReadersComponent" name="comp_ReaderSettings">
         <property name="minimumSize">
          <size>
           <width>0</width>
@@ -56,9 +56,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CSettingsVatsimReadersComponent</class>
+   <class>swift::gui::components::CSettingsVatsimReadersComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/settingsvatsimreaderscomponent.h</header>
+   <header>gui/components/settingsvatsimreaderscomponent.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/settingsnetworkserverscomponent.cpp b/src/gui/components/settingsnetworkserverscomponent.cpp
similarity index 93%
rename from src/blackgui/components/settingsnetworkserverscomponent.cpp
rename to src/gui/components/settingsnetworkserverscomponent.cpp
index c8cd3fb34..41dc8df75 100644
--- a/src/blackgui/components/settingsnetworkserverscomponent.cpp
+++ b/src/gui/components/settingsnetworkserverscomponent.cpp
@@ -4,10 +4,10 @@
 #include "config/buildconfig.h"
 #include "core/context/contextapplication.h"
 #include "core/data/globalsetup.h"
-#include "blackgui/editors/serverform.h"
-#include "blackgui/components/settingsnetworkserverscomponent.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/views/serverview.h"
+#include "gui/editors/serverform.h"
+#include "gui/components/settingsnetworkserverscomponent.h"
+#include "gui/guiapplication.h"
+#include "gui/views/serverview.h"
 #include "misc/logmessage.h"
 #include "misc/network/server.h"
 #include "misc/network/serverlist.h"
@@ -22,13 +22,13 @@
 using namespace swift::config;
 using namespace swift::core;
 using namespace swift::core::data;
-using namespace BlackGui;
+using namespace swift::gui;
 using namespace swift::misc;
 using namespace swift::misc::network;
 using namespace swift::misc::aviation;
 using namespace swift::misc::audio;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CSettingsNetworkServersComponent::CSettingsNetworkServersComponent(QWidget *parent) : QFrame(parent),
                                                                                           ui(new Ui::CSettingsNetworkServersComponent)
diff --git a/src/blackgui/components/settingsnetworkserverscomponent.h b/src/gui/components/settingsnetworkserverscomponent.h
similarity index 78%
rename from src/blackgui/components/settingsnetworkserverscomponent.h
rename to src/gui/components/settingsnetworkserverscomponent.h
index d82a41813..8f72ab3fe 100644
--- a/src/blackgui/components/settingsnetworkserverscomponent.h
+++ b/src/gui/components/settingsnetworkserverscomponent.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_SETTINGSNETWORKSERVERSCOMPONENT_H
-#define BLACKGUI_COMPONENTS_SETTINGSNETWORKSERVERSCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_SETTINGSNETWORKSERVERSCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_SETTINGSNETWORKSERVERSCOMPONENT_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
+#include "gui/swiftguiexport.h"
 #include "misc/network/settings/serversettings.h"
 #include <QFrame>
 #include <QObject>
@@ -17,10 +17,10 @@ namespace Ui
 {
     class CSettingsNetworkServersComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! Settings for network servers
-    class BLACKGUI_EXPORT CSettingsNetworkServersComponent : public QFrame
+    class SWIFT_GUI_EXPORT CSettingsNetworkServersComponent : public QFrame
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/settingsnetworkserverscomponent.ui b/src/gui/components/settingsnetworkserverscomponent.ui
similarity index 92%
rename from src/blackgui/components/settingsnetworkserverscomponent.ui
rename to src/gui/components/settingsnetworkserverscomponent.ui
index e998c8200..f8356c25d 100644
--- a/src/blackgui/components/settingsnetworkserverscomponent.ui
+++ b/src/gui/components/settingsnetworkserverscomponent.ui
@@ -42,7 +42,7 @@
     <number>1</number>
    </property>
    <item>
-    <widget class="BlackGui::Views::CServerView" name="tvp_Servers">
+    <widget class="swift::gui::views::CServerView" name="tvp_Servers">
      <property name="editTriggers">
       <set>QAbstractItemView::AnyKeyPressed|QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed</set>
      </property>
@@ -58,7 +58,7 @@
     </widget>
    </item>
    <item>
-    <widget class="BlackGui::Editors::CServerForm" name="form_Server">
+    <widget class="swift::gui::editors::CServerForm" name="form_Server">
      <property name="minimumSize">
       <size>
        <width>0</width>
@@ -140,14 +140,14 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Views::CServerView</class>
+   <class>swift::gui::views::CServerView</class>
    <extends>QTableView</extends>
-   <header>blackgui/views/serverview.h</header>
+   <header>gui/views/serverview.h</header>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Editors::CServerForm</class>
+   <class>swift::gui::editors::CServerForm</class>
    <extends>QFrame</extends>
-   <header>blackgui/editors/serverform.h</header>
+   <header>gui/editors/serverform.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/settingssimulatorbasicscomponent.cpp b/src/gui/components/settingssimulatorbasicscomponent.cpp
similarity index 99%
rename from src/blackgui/components/settingssimulatorbasicscomponent.cpp
rename to src/gui/components/settingssimulatorbasicscomponent.cpp
index 1d1e139ea..f2bef47c5 100644
--- a/src/blackgui/components/settingssimulatorbasicscomponent.cpp
+++ b/src/gui/components/settingssimulatorbasicscomponent.cpp
@@ -20,7 +20,7 @@ using namespace swift::misc::simulation::settings;
 using namespace swift::misc::simulation::xplane;
 using namespace swift::config;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     const QStringList &CSettingsSimulatorBasicsComponent::getLogCategories()
     {
diff --git a/src/blackgui/components/settingssimulatorbasicscomponent.h b/src/gui/components/settingssimulatorbasicscomponent.h
similarity index 95%
rename from src/blackgui/components/settingssimulatorbasicscomponent.h
rename to src/gui/components/settingssimulatorbasicscomponent.h
index 3568d9fc7..a0ed6f557 100644
--- a/src/blackgui/components/settingssimulatorbasicscomponent.h
+++ b/src/gui/components/settingssimulatorbasicscomponent.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_SETTINGSSIMULATORBASICSCOMPONENT_H
-#define BLACKGUI_COMPONENTS_SETTINGSSIMULATORBASICSCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_SETTINGSSIMULATORBASICSCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_SETTINGSSIMULATORBASICSCOMPONENT_H
 
-#include "blackgui/overlaymessagesframe.h"
+#include "gui/overlaymessagesframe.h"
 #include "misc/simulation/settings/simulatorsettings.h"
 #include "misc/simulation/fscommon/fscommonutil.h"
 #include "misc/logcategories.h"
@@ -18,7 +18,7 @@ namespace Ui
 {
     class CSettingsSimulatorBasicsComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Driver independent parts of simulator settings, ie those one are also used independent of the driver.
diff --git a/src/blackgui/components/settingssimulatorbasicscomponent.ui b/src/gui/components/settingssimulatorbasicscomponent.ui
similarity index 96%
rename from src/blackgui/components/settingssimulatorbasicscomponent.ui
rename to src/gui/components/settingssimulatorbasicscomponent.ui
index f238ba1a4..a34d86d8b 100644
--- a/src/blackgui/components/settingssimulatorbasicscomponent.ui
+++ b/src/gui/components/settingssimulatorbasicscomponent.ui
@@ -61,7 +61,7 @@
     </widget>
    </item>
    <item row="0" column="1" colspan="2" alignment="Qt::AlignLeft">
-    <widget class="BlackGui::Components::CSimulatorSelector" name="comp_SimulatorSelector">
+    <widget class="swift::gui::components::CSimulatorSelector" name="comp_SimulatorSelector">
      <property name="minimumSize">
       <size>
        <width>150</width>
@@ -179,9 +179,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CSimulatorSelector</class>
+   <class>swift::gui::components::CSimulatorSelector</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/simulatorselector.h</header>
+   <header>gui/components/simulatorselector.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/settingssimulatorcomponent.cpp b/src/gui/components/settingssimulatorcomponent.cpp
similarity index 98%
rename from src/blackgui/components/settingssimulatorcomponent.cpp
rename to src/gui/components/settingssimulatorcomponent.cpp
index 24d3a81d0..8af81d594 100644
--- a/src/blackgui/components/settingssimulatorcomponent.cpp
+++ b/src/gui/components/settingssimulatorcomponent.cpp
@@ -4,13 +4,13 @@
 #include "core/context/contextapplication.h"
 #include "core/context/contextsimulator.h"
 #include "core/pluginmanagersimulator.h"
-#include "blackgui/components/settingssimulatorcomponent.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/led.h"
-#include "blackgui/pluginconfig.h"
-#include "blackgui/pluginconfigwindow.h"
-#include "blackgui/plugindetailswindow.h"
-#include "blackgui/pluginselector.h"
+#include "gui/components/settingssimulatorcomponent.h"
+#include "gui/guiapplication.h"
+#include "gui/led.h"
+#include "gui/pluginconfig.h"
+#include "gui/pluginconfigwindow.h"
+#include "gui/plugindetailswindow.h"
+#include "gui/pluginselector.h"
 #include "misc/simulation/simulatorplugininfo.h"
 #include "misc/simulation/simulatorplugininfolist.h"
 #include "misc/pq/length.h"
@@ -41,7 +41,7 @@ using namespace swift::misc::simulation::settings;
 using namespace swift::core;
 using namespace swift::core::context;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CSettingsSimulatorComponent::CSettingsSimulatorComponent(QWidget *parent) : QFrame(parent),
                                                                                 ui(new Ui::CSettingsSimulatorComponent),
diff --git a/src/blackgui/components/settingssimulatorcomponent.h b/src/gui/components/settingssimulatorcomponent.h
similarity index 92%
rename from src/blackgui/components/settingssimulatorcomponent.h
rename to src/gui/components/settingssimulatorcomponent.h
index 826bf0f62..c232d0fac 100644
--- a/src/blackgui/components/settingssimulatorcomponent.h
+++ b/src/gui/components/settingssimulatorcomponent.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_SETTINGSSIMULATORCOMPONENT_H
-#define BLACKGUI_COMPONENTS_SETTINGSSIMULATORCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_SETTINGSSIMULATORCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_SETTINGSSIMULATORCOMPONENT_H
 
 #include "core/application/applicationsettings.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include "misc/simulation/settings/simulatorsettings.h"
 #include "misc/simulation/simulatorplugininfolist.h"
 #include "misc/settingscache.h"
@@ -29,10 +29,10 @@ namespace swift::misc::simulation
 {
     class CSimulatorPluginInfo;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! All simulator settings component (GUI)
-    class BLACKGUI_EXPORT CSettingsSimulatorComponent : public QFrame
+    class SWIFT_GUI_EXPORT CSettingsSimulatorComponent : public QFrame
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/settingssimulatorcomponent.ui b/src/gui/components/settingssimulatorcomponent.ui
similarity index 95%
rename from src/blackgui/components/settingssimulatorcomponent.ui
rename to src/gui/components/settingssimulatorcomponent.ui
index 240715691..5d493c2d0 100644
--- a/src/blackgui/components/settingssimulatorcomponent.ui
+++ b/src/gui/components/settingssimulatorcomponent.ui
@@ -27,7 +27,7 @@
     <number>2</number>
    </property>
    <item row="0" column="0" colspan="3">
-    <widget class="BlackGui::CPluginSelector" name="pluginSelector_EnabledSimulators" native="true">
+    <widget class="swift::gui::CPluginSelector" name="pluginSelector_EnabledSimulators" native="true">
      <property name="minimumSize">
       <size>
        <width>0</width>
@@ -324,7 +324,7 @@
         </spacer>
        </item>
        <item row="4" column="1">
-        <widget class="BlackGui::CLedWidget" name="led_RenderingEnabled" native="true">
+        <widget class="swift::gui::CLedWidget" name="led_RenderingEnabled" native="true">
          <property name="minimumSize">
           <size>
            <width>10</width>
@@ -334,7 +334,7 @@
         </widget>
        </item>
        <item row="1" column="1">
-        <widget class="BlackGui::Components::CCGSourceSelector" name="comp_CGSourceSelector"/>
+        <widget class="swift::gui::components::CCGSourceSelector" name="comp_CGSourceSelector"/>
        </item>
        <item row="6" column="0">
         <widget class="QLabel" name="lbl_RestrictedRendering">
@@ -398,7 +398,7 @@
           <number>4</number>
          </property>
          <item>
-          <widget class="BlackGui::CLedWidget" name="led_RestrictedRendering" native="true"/>
+          <widget class="swift::gui::CLedWidget" name="led_RestrictedRendering" native="true"/>
          </item>
          <item alignment="Qt::AlignLeft">
           <widget class="QLabel" name="lbl_RestrictionText">
@@ -467,21 +467,21 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::CLedWidget</class>
+   <class>swift::gui::CLedWidget</class>
    <extends>QWidget</extends>
-   <header>blackgui/led.h</header>
+   <header>gui/led.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::CPluginSelector</class>
+   <class>swift::gui::CPluginSelector</class>
    <extends>QWidget</extends>
-   <header>blackgui/pluginselector.h</header>
+   <header>gui/pluginselector.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CCGSourceSelector</class>
+   <class>swift::gui::components::CCGSourceSelector</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/cgsourceselector.h</header>
+   <header>gui/components/cgsourceselector.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/settingssimulatormessagescomponent.cpp b/src/gui/components/settingssimulatormessagescomponent.cpp
similarity index 99%
rename from src/blackgui/components/settingssimulatormessagescomponent.cpp
rename to src/gui/components/settingssimulatormessagescomponent.cpp
index 5506d85fe..602316e4e 100644
--- a/src/blackgui/components/settingssimulatormessagescomponent.cpp
+++ b/src/gui/components/settingssimulatormessagescomponent.cpp
@@ -9,7 +9,7 @@ using namespace swift::misc;
 using namespace swift::misc::simulation;
 using namespace swift::misc::simulation::settings;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CSettingsSimulatorMessagesComponent::CSettingsSimulatorMessagesComponent(QWidget *parent) : QFrame(parent),
                                                                                                 ui(new Ui::CSettingsSimulatorMessagesComponent)
diff --git a/src/blackgui/components/settingssimulatormessagescomponent.h b/src/gui/components/settingssimulatormessagescomponent.h
similarity index 86%
rename from src/blackgui/components/settingssimulatormessagescomponent.h
rename to src/gui/components/settingssimulatormessagescomponent.h
index e6d322de3..0c68f5f91 100644
--- a/src/blackgui/components/settingssimulatormessagescomponent.h
+++ b/src/gui/components/settingssimulatormessagescomponent.h
@@ -3,8 +3,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_SETTINGSSIMULATORMESSAGESCOMPONENT_H
-#define BLACKGUI_COMPONENTS_SETTINGSSIMULATORMESSAGESCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_SETTINGSSIMULATORMESSAGESCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_SETTINGSSIMULATORMESSAGESCOMPONENT_H
 
 #include "misc/simulation/settings/simulatorsettings.h"
 #include <QFrame>
@@ -14,7 +14,7 @@ namespace Ui
 {
     class CSettingsSimulatorMessagesComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Configure what messages are sent to simulator
diff --git a/src/blackgui/components/settingssimulatormessagescomponent.ui b/src/gui/components/settingssimulatormessagescomponent.ui
similarity index 100%
rename from src/blackgui/components/settingssimulatormessagescomponent.ui
rename to src/gui/components/settingssimulatormessagescomponent.ui
diff --git a/src/blackgui/components/settingsswiftplugin.cpp b/src/gui/components/settingsswiftplugin.cpp
similarity index 98%
rename from src/blackgui/components/settingsswiftplugin.cpp
rename to src/gui/components/settingsswiftplugin.cpp
index d9376291f..6fd5ef710 100644
--- a/src/blackgui/components/settingsswiftplugin.cpp
+++ b/src/gui/components/settingsswiftplugin.cpp
@@ -9,7 +9,7 @@ using namespace swift::misc;
 using namespace swift::misc::simulation;
 using namespace swift::misc::simulation::settings;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CSettingsSwiftPlugin::CSettingsSwiftPlugin(QWidget *parent) : QFrame(parent),
                                                                   ui(new Ui::CSettingsSwiftPlugin)
diff --git a/src/blackgui/components/settingsswiftplugin.h b/src/gui/components/settingsswiftplugin.h
similarity index 82%
rename from src/blackgui/components/settingsswiftplugin.h
rename to src/gui/components/settingsswiftplugin.h
index 21af212c8..af9d8670f 100644
--- a/src/blackgui/components/settingsswiftplugin.h
+++ b/src/gui/components/settingsswiftplugin.h
@@ -3,23 +3,23 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_SETTINGSSWIFTPLUGIN_H
-#define BLACKGUI_COMPONENTS_SETTINGSSWIFTPLUGIN_H
+#ifndef SWIFT_GUI_COMPONENTS_SETTINGSSWIFTPLUGIN_H
+#define SWIFT_GUI_COMPONENTS_SETTINGSSWIFTPLUGIN_H
 
 #include <QFrame>
 #include "misc/simulation/settings/swiftpluginsettings.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 
 namespace Ui
 {
     class CSettingsSwiftPlugin;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Settings for the swift pseudo driver
      */
-    class BLACKGUI_EXPORT CSettingsSwiftPlugin : public QFrame
+    class SWIFT_GUI_EXPORT CSettingsSwiftPlugin : public QFrame
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/settingsswiftplugin.ui b/src/gui/components/settingsswiftplugin.ui
similarity index 87%
rename from src/blackgui/components/settingsswiftplugin.ui
rename to src/gui/components/settingsswiftplugin.ui
index 33fd76a55..f80d18a70 100644
--- a/src/blackgui/components/settingsswiftplugin.ui
+++ b/src/gui/components/settingsswiftplugin.ui
@@ -29,7 +29,7 @@
     </widget>
    </item>
    <item row="3" column="1">
-    <widget class="BlackGui::Components::CDbModelKeyCompleter" name="lep_DefaultModel"/>
+    <widget class="swift::gui::components::CDbModelKeyCompleter" name="lep_DefaultModel"/>
    </item>
    <item row="6" column="0" colspan="2">
     <widget class="QWidget" name="wi_Buttons" native="true">
@@ -79,7 +79,7 @@
     </widget>
    </item>
    <item row="2" column="1">
-    <widget class="BlackGui::Components::CDbModelKeyCompleter" name="lep_OwnModel"/>
+    <widget class="swift::gui::components::CDbModelKeyCompleter" name="lep_OwnModel"/>
    </item>
    <item row="0" column="1">
     <widget class="QWidget" name="wi_EmulatedSimulator" native="true">
@@ -97,7 +97,7 @@
        <number>0</number>
       </property>
       <item>
-       <widget class="BlackGui::Components::CSimulatorSelector" name="comp_EmulatedSimulatorSelector">
+       <widget class="swift::gui::components::CSimulatorSelector" name="comp_EmulatedSimulatorSelector">
         <property name="minimumSize">
          <size>
           <width>125</width>
@@ -126,15 +126,15 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CSimulatorSelector</class>
+   <class>swift::gui::components::CSimulatorSelector</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/simulatorselector.h</header>
+   <header>gui/components/simulatorselector.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CDbModelKeyCompleter</class>
+   <class>swift::gui::components::CDbModelKeyCompleter</class>
    <extends>QLineEdit</extends>
-   <header>blackgui/components/dbmodelkeycompleter.h</header>
+   <header>gui/components/dbmodelkeycompleter.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/blackgui/components/settingstextmessageinlinecomponent.cpp b/src/gui/components/settingstextmessageinlinecomponent.cpp
similarity index 98%
rename from src/blackgui/components/settingstextmessageinlinecomponent.cpp
rename to src/gui/components/settingstextmessageinlinecomponent.cpp
index ba7c25142..cce926eb1 100644
--- a/src/blackgui/components/settingstextmessageinlinecomponent.cpp
+++ b/src/gui/components/settingstextmessageinlinecomponent.cpp
@@ -11,10 +11,10 @@
 #include <QTimer>
 #include <QPointer>
 
-using namespace BlackGui::Settings;
+using namespace swift::gui::settings;
 using namespace swift::misc;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CSettingsTextMessageInlineComponent::CSettingsTextMessageInlineComponent(QWidget *parent) : QFrame(parent),
                                                                                                 ui(new Ui::CSettingsTextMessageInlineComponent)
diff --git a/src/blackgui/components/settingstextmessageinlinecomponent.h b/src/gui/components/settingstextmessageinlinecomponent.h
similarity index 73%
rename from src/blackgui/components/settingstextmessageinlinecomponent.h
rename to src/gui/components/settingstextmessageinlinecomponent.h
index 01d8c99a4..a74619162 100644
--- a/src/blackgui/components/settingstextmessageinlinecomponent.h
+++ b/src/gui/components/settingstextmessageinlinecomponent.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_SETTINGSTEXTMESSAGEINLINECOMPONENT_H
-#define BLACKGUI_COMPONENTS_SETTINGSTEXTMESSAGEINLINECOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_SETTINGSTEXTMESSAGEINLINECOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_SETTINGSTEXTMESSAGEINLINECOMPONENT_H
 
-#include "blackgui/settings/textmessagesettings.h"
+#include "gui/settings/textmessagesettings.h"
 #include <QScopedPointer>
 #include <QFrame>
 
@@ -14,7 +14,7 @@ namespace Ui
 {
     class CSettingsTextMessageInlineComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Settings for text messages
@@ -44,7 +44,7 @@ namespace BlackGui::Components
         void resetOverlayMessages();
 
         QScopedPointer<Ui::CSettingsTextMessageInlineComponent> ui;
-        swift::misc::CSetting<BlackGui::Settings::TextMessageSettings> m_settings { this, &CSettingsTextMessageInlineComponent::settingsChanged }; //!< settings changed
+        swift::misc::CSetting<swift::gui::settings::TextMessageSettings> m_settings { this, &CSettingsTextMessageInlineComponent::settingsChanged }; //!< settings changed
     };
 } // ns
 
diff --git a/src/blackgui/components/settingstextmessageinlinecomponent.ui b/src/gui/components/settingstextmessageinlinecomponent.ui
similarity index 100%
rename from src/blackgui/components/settingstextmessageinlinecomponent.ui
rename to src/gui/components/settingstextmessageinlinecomponent.ui
diff --git a/src/blackgui/components/settingstextmessagestyle.cpp b/src/gui/components/settingstextmessagestyle.cpp
similarity index 96%
rename from src/blackgui/components/settingstextmessagestyle.cpp
rename to src/gui/components/settingstextmessagestyle.cpp
index 93ec131e3..9ce0ae5b3 100644
--- a/src/blackgui/components/settingstextmessagestyle.cpp
+++ b/src/gui/components/settingstextmessagestyle.cpp
@@ -3,9 +3,9 @@
 
 #include "settingstextmessagestyle.h"
 #include "ui_settingstextmessagestyle.h"
-#include "blackgui/components/settingsfontdialog.h"
-#include "blackgui/components/texteditdialog.h"
-#include "blackgui/shortcut.h"
+#include "gui/components/settingsfontdialog.h"
+#include "gui/components/texteditdialog.h"
+#include "gui/shortcut.h"
 
 #include <QTextEdit>
 #include <QPushButton>
@@ -16,7 +16,7 @@
 
 #include <QShortcut>
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CSettingsTextMessageStyle::CSettingsTextMessageStyle(QWidget *parent) : QFrame(parent),
                                                                             ui(new Ui::CSettingsTextMessageStyle)
diff --git a/src/blackgui/components/settingstextmessagestyle.h b/src/gui/components/settingstextmessagestyle.h
similarity index 92%
rename from src/blackgui/components/settingstextmessagestyle.h
rename to src/gui/components/settingstextmessagestyle.h
index 12905caee..8c771e346 100644
--- a/src/blackgui/components/settingstextmessagestyle.h
+++ b/src/gui/components/settingstextmessagestyle.h
@@ -3,8 +3,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_SETTINGSTEXTMESSAGESTYLE_H
-#define BLACKGUI_COMPONENTS_SETTINGSTEXTMESSAGESTYLE_H
+#ifndef SWIFT_GUI_COMPONENTS_SETTINGSTEXTMESSAGESTYLE_H
+#define SWIFT_GUI_COMPONENTS_SETTINGSTEXTMESSAGESTYLE_H
 
 #include <QFrame>
 #include <QStringList>
@@ -14,7 +14,7 @@ namespace Ui
 {
     class CSettingsTextMessageStyle;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     class CSettingsFontDialog;
     class CTextEditDialog;
diff --git a/src/blackgui/components/settingstextmessagestyle.ui b/src/gui/components/settingstextmessagestyle.ui
similarity index 100%
rename from src/blackgui/components/settingstextmessagestyle.ui
rename to src/gui/components/settingstextmessagestyle.ui
diff --git a/src/blackgui/components/settingsvatsimreaderscomponent.cpp b/src/gui/components/settingsvatsimreaderscomponent.cpp
similarity index 98%
rename from src/blackgui/components/settingsvatsimreaderscomponent.cpp
rename to src/gui/components/settingsvatsimreaderscomponent.cpp
index 799531aee..760a23374 100644
--- a/src/blackgui/components/settingsvatsimreaderscomponent.cpp
+++ b/src/gui/components/settingsvatsimreaderscomponent.cpp
@@ -9,7 +9,7 @@ using namespace swift::misc::physical_quantities;
 using namespace swift::core;
 using namespace swift::core::vatsim;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CSettingsVatsimReadersComponent::CSettingsVatsimReadersComponent(QWidget *parent) : QFrame(parent),
                                                                                         ui(new Ui::CSettingsVatsimReadersComponent)
diff --git a/src/blackgui/components/settingsvatsimreaderscomponent.h b/src/gui/components/settingsvatsimreaderscomponent.h
similarity index 88%
rename from src/blackgui/components/settingsvatsimreaderscomponent.h
rename to src/gui/components/settingsvatsimreaderscomponent.h
index 177267788..00bd82360 100644
--- a/src/blackgui/components/settingsvatsimreaderscomponent.h
+++ b/src/gui/components/settingsvatsimreaderscomponent.h
@@ -3,8 +3,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_SETTINGSVATSIMREADERSCOMPONENT_H
-#define BLACKGUI_COMPONENTS_SETTINGSVATSIMREADERSCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_SETTINGSVATSIMREADERSCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_SETTINGSVATSIMREADERSCOMPONENT_H
 
 #include "core/vatsim/vatsimsettings.h"
 #include <QFrame>
@@ -15,7 +15,7 @@ namespace Ui
     class CSettingsVatsimReadersComponent;
 }
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Settings for readers
diff --git a/src/blackgui/components/settingsvatsimreaderscomponent.ui b/src/gui/components/settingsvatsimreaderscomponent.ui
similarity index 100%
rename from src/blackgui/components/settingsvatsimreaderscomponent.ui
rename to src/gui/components/settingsvatsimreaderscomponent.ui
diff --git a/src/blackgui/components/settingsviewupdatetimes.cpp b/src/gui/components/settingsviewupdatetimes.cpp
similarity index 97%
rename from src/blackgui/components/settingsviewupdatetimes.cpp
rename to src/gui/components/settingsviewupdatetimes.cpp
index 50b4a2168..50ede6878 100644
--- a/src/blackgui/components/settingsviewupdatetimes.cpp
+++ b/src/gui/components/settingsviewupdatetimes.cpp
@@ -4,10 +4,10 @@
 #include "settingsviewupdatetimes.h"
 #include "ui_settingsviewupdatetimes.h"
 
-using namespace BlackGui::Settings;
+using namespace swift::gui::settings;
 using namespace swift::misc::physical_quantities;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CSettingsViewUpdateTimes::CSettingsViewUpdateTimes(QWidget *parent) : QFrame(parent),
                                                                           ui(new Ui::CSettingsViewUpdateTimes)
diff --git a/src/blackgui/components/settingsviewupdatetimes.h b/src/gui/components/settingsviewupdatetimes.h
similarity index 71%
rename from src/blackgui/components/settingsviewupdatetimes.h
rename to src/gui/components/settingsviewupdatetimes.h
index 70fff0822..6fef6f9b1 100644
--- a/src/blackgui/components/settingsviewupdatetimes.h
+++ b/src/gui/components/settingsviewupdatetimes.h
@@ -3,17 +3,17 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_SETTINGSVIEWUPDATETIMES_H
-#define BLACKGUI_COMPONENTS_SETTINGSVIEWUPDATETIMES_H
+#ifndef SWIFT_GUI_COMPONENTS_SETTINGSVIEWUPDATETIMES_H
+#define SWIFT_GUI_COMPONENTS_SETTINGSVIEWUPDATETIMES_H
 
-#include "blackgui/settings/viewupdatesettings.h"
+#include "gui/settings/viewupdatesettings.h"
 #include <QFrame>
 
 namespace Ui
 {
     class CSettingsViewUpdateTimes;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Update rates / times
@@ -41,7 +41,7 @@ namespace BlackGui::Components
 
     private:
         QScopedPointer<Ui::CSettingsViewUpdateTimes> ui;
-        swift::misc::CSetting<BlackGui::Settings::TViewUpdateSettings> m_settings { this, &CSettingsViewUpdateTimes::ps_settingsChanged }; //!< settings changed
+        swift::misc::CSetting<swift::gui::settings::TViewUpdateSettings> m_settings { this, &CSettingsViewUpdateTimes::ps_settingsChanged }; //!< settings changed
     };
 } // ns
 
diff --git a/src/blackgui/components/settingsviewupdatetimes.ui b/src/gui/components/settingsviewupdatetimes.ui
similarity index 100%
rename from src/blackgui/components/settingsviewupdatetimes.ui
rename to src/gui/components/settingsviewupdatetimes.ui
diff --git a/src/blackgui/components/settingsxswiftbuscomponent.cpp b/src/gui/components/settingsxswiftbuscomponent.cpp
similarity index 98%
rename from src/blackgui/components/settingsxswiftbuscomponent.cpp
rename to src/gui/components/settingsxswiftbuscomponent.cpp
index 8921ff537..e4ad5669a 100644
--- a/src/blackgui/components/settingsxswiftbuscomponent.cpp
+++ b/src/gui/components/settingsxswiftbuscomponent.cpp
@@ -13,7 +13,7 @@ using namespace swift::misc;
 using namespace swift::misc::simulation::settings;
 using namespace swift::misc::simulation::xplane;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     const QStringList &CSettingsXSwiftBusComponent::getLogCategories()
     {
diff --git a/src/blackgui/components/settingsxswiftbuscomponent.h b/src/gui/components/settingsxswiftbuscomponent.h
similarity index 79%
rename from src/blackgui/components/settingsxswiftbuscomponent.h
rename to src/gui/components/settingsxswiftbuscomponent.h
index cd692e9d2..e0f468fca 100644
--- a/src/blackgui/components/settingsxswiftbuscomponent.h
+++ b/src/gui/components/settingsxswiftbuscomponent.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_SETTINGSXSWIFTBUSCOMPONENT_H
-#define BLACKGUI_COMPONENTS_SETTINGSXSWIFTBUSCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_SETTINGSXSWIFTBUSCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_SETTINGSXSWIFTBUSCOMPONENT_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include "misc/simulation/settings/xswiftbussettings.h"
 #include "misc/settingscache.h"
 #include "misc/logcategories.h"
@@ -17,12 +17,12 @@ namespace Ui
 {
     class CSettingsXSwiftBusComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * xswiftbus setup
      */
-    class BLACKGUI_EXPORT CSettingsXSwiftBusComponent : public QFrame
+    class SWIFT_GUI_EXPORT CSettingsXSwiftBusComponent : public QFrame
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/settingsxswiftbuscomponent.ui b/src/gui/components/settingsxswiftbuscomponent.ui
similarity index 90%
rename from src/blackgui/components/settingsxswiftbuscomponent.ui
rename to src/gui/components/settingsxswiftbuscomponent.ui
index 0bbd53f24..760067adc 100644
--- a/src/blackgui/components/settingsxswiftbuscomponent.ui
+++ b/src/gui/components/settingsxswiftbuscomponent.ui
@@ -15,7 +15,7 @@
   </property>
   <layout class="QHBoxLayout" name="hl_SettingsXSwiftBus">
    <item>
-    <widget class="BlackGui::Components::CDBusServerAddressSelector" name="comp_DBusServer">
+    <widget class="swift::gui::components::CDBusServerAddressSelector" name="comp_DBusServer">
      <property name="minimumSize">
       <size>
        <width>200</width>
@@ -73,9 +73,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CDBusServerAddressSelector</class>
+   <class>swift::gui::components::CDBusServerAddressSelector</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/dbusserveraddressselector.h</header>
+   <header>gui/components/dbusserveraddressselector.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/setuploadingdialog.cpp b/src/gui/components/setuploadingdialog.cpp
similarity index 90%
rename from src/blackgui/components/setuploadingdialog.cpp
rename to src/gui/components/setuploadingdialog.cpp
index a8bb82ffe..1e644a06f 100644
--- a/src/blackgui/components/setuploadingdialog.cpp
+++ b/src/gui/components/setuploadingdialog.cpp
@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "setuploadingdialog.h"
-#include "blackgui/components/copymodelsfromotherswiftversionsdialog.h"
+#include "gui/components/copymodelsfromotherswiftversionsdialog.h"
 #include "ui_setuploadingdialog.h"
-#include "blackgui/guiapplication.h"
+#include "gui/guiapplication.h"
 #include "core/setupreader.h"
 #include "misc/swiftdirectories.h"
 
@@ -16,7 +16,7 @@ using namespace swift::misc::network;
 using namespace swift::core;
 using namespace swift::core::data;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CSetupLoadingDialog::CSetupLoadingDialog(QWidget *parent) : QDialog(parent),
                                                                 ui(new Ui::CSetupLoadingDialog)
diff --git a/src/blackgui/components/setuploadingdialog.h b/src/gui/components/setuploadingdialog.h
similarity index 85%
rename from src/blackgui/components/setuploadingdialog.h
rename to src/gui/components/setuploadingdialog.h
index c03e39a6c..07a0a17d4 100644
--- a/src/blackgui/components/setuploadingdialog.h
+++ b/src/gui/components/setuploadingdialog.h
@@ -3,8 +3,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_SETUPLOADINGDIALOG_H
-#define BLACKGUI_COMPONENTS_SETUPLOADINGDIALOG_H
+#ifndef SWIFT_GUI_COMPONENTS_SETUPLOADINGDIALOG_H
+#define SWIFT_GUI_COMPONENTS_SETUPLOADINGDIALOG_H
 
 #include "misc/statusmessagelist.h"
 #include <QDialog>
@@ -13,7 +13,7 @@ namespace Ui
 {
     class CSetupLoadingDialog;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Setup dialog, if loading the boostrap file fails
diff --git a/src/blackgui/components/setuploadingdialog.ui b/src/gui/components/setuploadingdialog.ui
similarity index 94%
rename from src/blackgui/components/setuploadingdialog.ui
rename to src/gui/components/setuploadingdialog.ui
index 298f28505..7cdfd143e 100644
--- a/src/blackgui/components/setuploadingdialog.ui
+++ b/src/gui/components/setuploadingdialog.ui
@@ -68,7 +68,7 @@
      </property>
      <layout class="QVBoxLayout" name="vl_LogMessages">
       <item>
-       <widget class="BlackGui::Components::CStatusMessagesDetail" name="comp_Messages">
+       <widget class="swift::gui::components::CStatusMessagesDetail" name="comp_Messages">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
           <horstretch>0</horstretch>
@@ -100,9 +100,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CStatusMessagesDetail</class>
+   <class>swift::gui::components::CStatusMessagesDetail</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/statusmessagesdetail.h</header>
+   <header>gui/components/statusmessagesdetail.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/simbriefdownloaddialog.cpp b/src/gui/components/simbriefdownloaddialog.cpp
similarity index 97%
rename from src/blackgui/components/simbriefdownloaddialog.cpp
rename to src/gui/components/simbriefdownloaddialog.cpp
index 50e6a6e82..bc3091ab8 100644
--- a/src/blackgui/components/simbriefdownloaddialog.cpp
+++ b/src/gui/components/simbriefdownloaddialog.cpp
@@ -6,7 +6,7 @@
 
 using namespace swift::misc::aviation;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CSimBriefDownloadDialog::CSimBriefDownloadDialog(QWidget *parent) : QDialog(parent),
                                                                         ui(new Ui::CSimBriefDownloadDialog)
diff --git a/src/blackgui/components/simbriefdownloaddialog.h b/src/gui/components/simbriefdownloaddialog.h
similarity index 88%
rename from src/blackgui/components/simbriefdownloaddialog.h
rename to src/gui/components/simbriefdownloaddialog.h
index e4d710398..3842181d7 100644
--- a/src/blackgui/components/simbriefdownloaddialog.h
+++ b/src/gui/components/simbriefdownloaddialog.h
@@ -3,8 +3,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_SIMBRIEFDOWNLOADDIALOG_H
-#define BLACKGUI_COMPONENTS_SIMBRIEFDOWNLOADDIALOG_H
+#ifndef SWIFT_GUI_COMPONENTS_SIMBRIEFDOWNLOADDIALOG_H
+#define SWIFT_GUI_COMPONENTS_SIMBRIEFDOWNLOADDIALOG_H
 
 #include "misc/aviation/simbriefdata.h"
 #include <QDialog>
@@ -14,7 +14,7 @@ namespace Ui
 {
     class CSimBriefDownloadDialog;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! Download from SimBrief
     class CSimBriefDownloadDialog : public QDialog
diff --git a/src/blackgui/components/simbriefdownloaddialog.ui b/src/gui/components/simbriefdownloaddialog.ui
similarity index 100%
rename from src/blackgui/components/simbriefdownloaddialog.ui
rename to src/gui/components/simbriefdownloaddialog.ui
diff --git a/src/blackgui/components/simulatorcomponent.cpp b/src/gui/components/simulatorcomponent.cpp
similarity index 98%
rename from src/blackgui/components/simulatorcomponent.cpp
rename to src/gui/components/simulatorcomponent.cpp
index 69528f9e8..9d026925f 100644
--- a/src/blackgui/components/simulatorcomponent.cpp
+++ b/src/gui/components/simulatorcomponent.cpp
@@ -3,11 +3,11 @@
 
 #include "ui_simulatorcomponent.h"
 #include "core/simulator.h"
-#include "blackgui/components/simulatorcomponent.h"
-#include "blackgui/views/namevariantpairview.h"
+#include "gui/components/simulatorcomponent.h"
+#include "gui/views/namevariantpairview.h"
 #include "core/context/contextownaircraft.h"
 #include "core/context/contextsimulator.h"
-#include "blackgui/guiapplication.h"
+#include "gui/guiapplication.h"
 #include "misc/simulation/simulatedaircraft.h"
 #include "misc/simulation/simulatorplugininfo.h"
 #include "misc/aviation/aircraftsituation.h"
@@ -29,7 +29,7 @@ using namespace swift::misc::simulation;
 using namespace swift::core;
 using namespace swift::core::context;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     const QStringList &CSimulatorComponent::getLogCategories()
     {
diff --git a/src/blackgui/components/simulatorcomponent.h b/src/gui/components/simulatorcomponent.h
similarity index 90%
rename from src/blackgui/components/simulatorcomponent.h
rename to src/gui/components/simulatorcomponent.h
index 977ac295f..36a6c108b 100644
--- a/src/blackgui/components/simulatorcomponent.h
+++ b/src/gui/components/simulatorcomponent.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_SIMULATORCOMPONENT_H
-#define BLACKGUI_SIMULATORCOMPONENT_H
+#ifndef SWIFT_GUI_SIMULATORCOMPONENT_H
+#define SWIFT_GUI_SIMULATORCOMPONENT_H
 
-#include "blackgui/enablefordockwidgetinfoarea.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/enablefordockwidgetinfoarea.h"
+#include "gui/swiftguiexport.h"
 #include "misc/simulation/simulatorinfo.h"
 #include "misc/logcategories.h"
 #include "misc/icons.h"
@@ -32,10 +32,10 @@ namespace swift::misc
         class CSimulatedAircraft;
     }
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! Simulator component
-    class BLACKGUI_EXPORT CSimulatorComponent :
+    class SWIFT_GUI_EXPORT CSimulatorComponent :
         public QTabWidget,
         public CEnableForDockWidgetInfoArea
     {
diff --git a/src/blackgui/components/simulatorcomponent.ui b/src/gui/components/simulatorcomponent.ui
similarity index 87%
rename from src/blackgui/components/simulatorcomponent.ui
rename to src/gui/components/simulatorcomponent.ui
index 9b0b7f79d..2ad6c4dc8 100644
--- a/src/blackgui/components/simulatorcomponent.ui
+++ b/src/gui/components/simulatorcomponent.ui
@@ -37,7 +37,7 @@
      <number>0</number>
     </property>
     <item>
-     <widget class="BlackGui::Views::CNameVariantPairView" name="tvp_LiveData">
+     <widget class="swift::gui::views::CNameVariantPairView" name="tvp_LiveData">
       <property name="selectionMode">
        <enum>QAbstractItemView::NoSelection</enum>
       </property>
@@ -72,7 +72,7 @@
      <number>0</number>
     </property>
     <item>
-     <widget class="BlackGui::Views::CNameVariantPairView" name="tvp_Internals">
+     <widget class="swift::gui::views::CNameVariantPairView" name="tvp_Internals">
       <property name="selectionMode">
        <enum>QAbstractItemView::NoSelection</enum>
       </property>
@@ -111,7 +111,7 @@
      <number>0</number>
     </property>
     <item>
-     <widget class="BlackGui::Components::CStatusMessagesDetail" name="comp_StatusMessages">
+     <widget class="swift::gui::components::CStatusMessagesDetail" name="comp_StatusMessages">
       <property name="frameShape">
        <enum>QFrame::StyledPanel</enum>
       </property>
@@ -125,14 +125,14 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Views::CNameVariantPairView</class>
+   <class>swift::gui::views::CNameVariantPairView</class>
    <extends>QTableView</extends>
-   <header>blackgui/views/namevariantpairview.h</header>
+   <header>gui/views/namevariantpairview.h</header>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CStatusMessagesDetail</class>
+   <class>swift::gui::components::CStatusMessagesDetail</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/statusmessagesdetail.h</header>
+   <header>gui/components/statusmessagesdetail.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/simulatorselector.cpp b/src/gui/components/simulatorselector.cpp
similarity index 98%
rename from src/blackgui/components/simulatorselector.cpp
rename to src/gui/components/simulatorselector.cpp
index 72972a05d..4297e9a02 100644
--- a/src/blackgui/components/simulatorselector.cpp
+++ b/src/gui/components/simulatorselector.cpp
@@ -1,9 +1,9 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/simulatorselector.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/guiutility.h"
+#include "gui/components/simulatorselector.h"
+#include "gui/guiapplication.h"
+#include "gui/guiutility.h"
 #include "core/context/contextsimulator.h"
 #include "misc/icons.h"
 #include "misc/mixin/mixincompare.h"
@@ -21,7 +21,7 @@ using namespace swift::misc;
 using namespace swift::misc::simulation;
 using namespace swift::core::context;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CSimulatorSelector::CSimulatorSelector(QWidget *parent) : QFrame(parent),
                                                               ui(new Ui::CSimulatorSelector)
diff --git a/src/blackgui/components/simulatorselector.h b/src/gui/components/simulatorselector.h
similarity index 95%
rename from src/blackgui/components/simulatorselector.h
rename to src/gui/components/simulatorselector.h
index bb9350a5a..5e0d2211a 100644
--- a/src/blackgui/components/simulatorselector.h
+++ b/src/gui/components/simulatorselector.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_SIMULATORSELECTOR_H
-#define BLACKGUI_COMPONENTS_SIMULATORSELECTOR_H
+#ifndef SWIFT_GUI_COMPONENTS_SIMULATORSELECTOR_H
+#define SWIFT_GUI_COMPONENTS_SIMULATORSELECTOR_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include "misc/simulation/simulatorinfo.h"
 #include "misc/simulation/data/modelcaches.h"
 #include "misc/digestsignal.h"
@@ -19,12 +19,12 @@ namespace Ui
 {
     class CSimulatorSelector;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Select simulator (as radio buttons or checkboxes)
      */
-    class BLACKGUI_EXPORT CSimulatorSelector : public QFrame
+    class SWIFT_GUI_EXPORT CSimulatorSelector : public QFrame
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/simulatorselector.ui b/src/gui/components/simulatorselector.ui
similarity index 100%
rename from src/blackgui/components/simulatorselector.ui
rename to src/gui/components/simulatorselector.ui
diff --git a/src/blackgui/components/statusmessageform.cpp b/src/gui/components/statusmessageform.cpp
similarity index 96%
rename from src/blackgui/components/statusmessageform.cpp
rename to src/gui/components/statusmessageform.cpp
index 87f947874..3c6de8e34 100644
--- a/src/blackgui/components/statusmessageform.cpp
+++ b/src/gui/components/statusmessageform.cpp
@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright (C) 2014 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/statusmessageform.h"
+#include "gui/components/statusmessageform.h"
 #include "misc/logpattern.h"
 #include "ui_statusmessageform.h"
 
@@ -12,7 +12,7 @@
 
 using namespace swift::misc;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CStatusMessageForm::CStatusMessageForm(QWidget *parent) : QFrame(parent),
                                                               ui(new Ui::CStatusMessageForm)
diff --git a/src/blackgui/components/statusmessageform.h b/src/gui/components/statusmessageform.h
similarity index 82%
rename from src/blackgui/components/statusmessageform.h
rename to src/gui/components/statusmessageform.h
index 811c5826f..382dc8e12 100644
--- a/src/blackgui/components/statusmessageform.h
+++ b/src/gui/components/statusmessageform.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_STATUSMESSAGEFORM_H
-#define BLACKGUI_COMPONENTS_STATUSMESSAGEFORM_H
+#ifndef SWIFT_GUI_COMPONENTS_STATUSMESSAGEFORM_H
+#define SWIFT_GUI_COMPONENTS_STATUSMESSAGEFORM_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include "misc/statusmessage.h"
 #include "misc/variant.h"
 
@@ -20,12 +20,12 @@ namespace Ui
 {
     class CStatusMessageForm;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Display details about a single status message
      */
-    class BLACKGUI_EXPORT CStatusMessageForm : public QFrame
+    class SWIFT_GUI_EXPORT CStatusMessageForm : public QFrame
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/statusmessageform.ui b/src/gui/components/statusmessageform.ui
similarity index 100%
rename from src/blackgui/components/statusmessageform.ui
rename to src/gui/components/statusmessageform.ui
diff --git a/src/blackgui/components/statusmessageformsmall.cpp b/src/gui/components/statusmessageformsmall.cpp
similarity index 95%
rename from src/blackgui/components/statusmessageformsmall.cpp
rename to src/gui/components/statusmessageformsmall.cpp
index 44b28f06a..758d7a1f4 100644
--- a/src/blackgui/components/statusmessageformsmall.cpp
+++ b/src/gui/components/statusmessageformsmall.cpp
@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/statusmessageformsmall.h"
+#include "gui/components/statusmessageformsmall.h"
 #include "misc/logpattern.h"
 #include "ui_statusmessageformsmall.h"
 
@@ -11,7 +11,7 @@
 
 using namespace swift::misc;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CStatusMessageFormSmall::CStatusMessageFormSmall(QWidget *parent) : QFrame(parent),
                                                                         ui(new Ui::CStatusMessageFormSmall)
diff --git a/src/blackgui/components/statusmessageformsmall.h b/src/gui/components/statusmessageformsmall.h
similarity index 81%
rename from src/blackgui/components/statusmessageformsmall.h
rename to src/gui/components/statusmessageformsmall.h
index 9b0b888f9..f69f4f525 100644
--- a/src/blackgui/components/statusmessageformsmall.h
+++ b/src/gui/components/statusmessageformsmall.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_STATUSMESSAGEFORMSMALL_H
-#define BLACKGUI_COMPONENTS_STATUSMESSAGEFORMSMALL_H
+#ifndef SWIFT_GUI_COMPONENTS_STATUSMESSAGEFORMSMALL_H
+#define SWIFT_GUI_COMPONENTS_STATUSMESSAGEFORMSMALL_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include "misc/statusmessage.h"
 #include "misc/variant.h"
 
@@ -18,12 +18,12 @@ namespace Ui
 {
     class CStatusMessageFormSmall;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Display details about a single status message
      */
-    class BLACKGUI_EXPORT CStatusMessageFormSmall : public QFrame
+    class SWIFT_GUI_EXPORT CStatusMessageFormSmall : public QFrame
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/statusmessageformsmall.ui b/src/gui/components/statusmessageformsmall.ui
similarity index 100%
rename from src/blackgui/components/statusmessageformsmall.ui
rename to src/gui/components/statusmessageformsmall.ui
diff --git a/src/blackgui/components/statusmessagesdetail.cpp b/src/gui/components/statusmessagesdetail.cpp
similarity index 93%
rename from src/blackgui/components/statusmessagesdetail.cpp
rename to src/gui/components/statusmessagesdetail.cpp
index e517bafd6..9446dc572 100644
--- a/src/blackgui/components/statusmessagesdetail.cpp
+++ b/src/gui/components/statusmessagesdetail.cpp
@@ -3,15 +3,15 @@
 
 #include "statusmessagesdetail.h"
 #include "ui_statusmessagesdetail.h"
-#include "blackgui/filters/statusmessagefilterbar.h"
-#include "blackgui/filters/statusmessagefilterdialog.h"
+#include "gui/filters/statusmessagefilterbar.h"
+#include "gui/filters/statusmessagefilterdialog.h"
 
 using namespace swift::misc;
-using namespace BlackGui::Menus;
-using namespace BlackGui::Views;
-using namespace BlackGui::Filters;
+using namespace swift::gui::menus;
+using namespace swift::gui::views;
+using namespace swift::gui::filters;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CStatusMessagesDetail::CStatusMessagesDetail(QWidget *parent) : QFrame(parent),
                                                                     ui(new Ui::CStatusMessagesDetail)
@@ -50,7 +50,7 @@ namespace BlackGui::Components
     void CStatusMessagesDetail::showDetails(bool details)
     {
         ui->form_StatusMessage->setVisible(details);
-        ui->tvp_StatusMessages->setMode(details ? Models::CStatusMessageListModel::Detailed : Models::CStatusMessageListModel::Simplified);
+        ui->tvp_StatusMessages->setMode(details ? models::CStatusMessageListModel::Detailed : models::CStatusMessageListModel::Simplified);
     }
 
     void CStatusMessagesDetail::showFilterDialog()
diff --git a/src/blackgui/components/statusmessagesdetail.h b/src/gui/components/statusmessagesdetail.h
similarity index 82%
rename from src/blackgui/components/statusmessagesdetail.h
rename to src/gui/components/statusmessagesdetail.h
index 0c681b7d1..68421a72d 100644
--- a/src/blackgui/components/statusmessagesdetail.h
+++ b/src/gui/components/statusmessagesdetail.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_STATUSMESSAGESDETAIL_H
-#define BLACKGUI_COMPONENTS_STATUSMESSAGESDETAIL_H
+#ifndef SWIFT_GUI_COMPONENTS_STATUSMESSAGESDETAIL_H
+#define SWIFT_GUI_COMPONENTS_STATUSMESSAGESDETAIL_H
 
-#include "blackgui/menus/menudelegate.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/menus/menudelegate.h"
+#include "gui/swiftguiexport.h"
 #include "misc/statusmessagelist.h"
 #include "misc/digestsignal.h"
 #include "misc/variant.h"
@@ -20,10 +20,10 @@ namespace Ui
 {
     class CStatusMessagesDetail;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! Status messages plus detail
-    class BLACKGUI_EXPORT CStatusMessagesDetail : public QFrame
+    class SWIFT_GUI_EXPORT CStatusMessagesDetail : public QFrame
     {
         Q_OBJECT
 
@@ -61,7 +61,7 @@ namespace BlackGui::Components
         //! Set max.log messages
         void setMaxLogMessages(int desiredNumber) { m_maxLogMessages = desiredNumber; }
 
-        //! \copydoc BlackGui::Filters::CStatusMessageFilterBar::useRadioButtonDescriptiveIcons
+        //! \copydoc swift::gui::filters::CStatusMessageFilterBar::useRadioButtonDescriptiveIcons
         void filterUseRadioButtonDescriptiveIcons(bool oneCharacterText);
 
         //! Sorting for view
@@ -71,7 +71,7 @@ namespace BlackGui::Components
         void setNoSorting();
 
     signals:
-        //! \copydoc BlackGui::Views::CStatusMessageView::modelDataChangedDigest
+        //! \copydoc swift::gui::views::CStatusMessageView::modelDataChangedDigest
         void modelDataChangedDigest(int count, bool withFilter);
 
         //! The user changed their message filter
@@ -88,14 +88,14 @@ namespace BlackGui::Components
 
         //! Custom menu for the log component
         //! \fixme Move to namespace scope and add Q_OBJECT
-        class CMessageMenu : public Menus::IMenuDelegate
+        class CMessageMenu : public menus::IMenuDelegate
         {
         public:
             //! Constructor
             CMessageMenu(CStatusMessagesDetail *parent) : IMenuDelegate(parent) {}
 
             //! \copydoc IMenuDelegate::customMenu
-            virtual void customMenu(Menus::CMenuActions &menuActions) override;
+            virtual void customMenu(menus::CMenuActions &menuActions) override;
 
         private:
             QAction *m_action = nullptr;
diff --git a/src/blackgui/components/statusmessagesdetail.ui b/src/gui/components/statusmessagesdetail.ui
similarity index 79%
rename from src/blackgui/components/statusmessagesdetail.ui
rename to src/gui/components/statusmessagesdetail.ui
index 2bd09cbcd..3cf22fa82 100644
--- a/src/blackgui/components/statusmessagesdetail.ui
+++ b/src/gui/components/statusmessagesdetail.ui
@@ -19,7 +19,7 @@
     <number>0</number>
    </property>
    <item>
-    <widget class="BlackGui::Filters::CStatusMessageFilterBar" name="filter_LogMessages">
+    <widget class="swift::gui::filters::CStatusMessageFilterBar" name="filter_LogMessages">
      <property name="minimumSize">
       <size>
        <width>0</width>
@@ -29,7 +29,7 @@
     </widget>
    </item>
    <item>
-    <widget class="BlackGui::Views::CStatusMessageView" name="tvp_StatusMessages">
+    <widget class="swift::gui::views::CStatusMessageView" name="tvp_StatusMessages">
      <property name="whatsThis">
       <string>Status message log view</string>
      </property>
@@ -48,7 +48,7 @@
     </widget>
    </item>
    <item>
-    <widget class="BlackGui::Components::CStatusMessageForm" name="form_StatusMessage">
+    <widget class="swift::gui::components::CStatusMessageForm" name="form_StatusMessage">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
        <horstretch>0</horstretch>
@@ -79,20 +79,20 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Views::CStatusMessageView</class>
+   <class>swift::gui::views::CStatusMessageView</class>
    <extends>QTableView</extends>
-   <header>blackgui/views/statusmessageview.h</header>
+   <header>gui/views/statusmessageview.h</header>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CStatusMessageForm</class>
+   <class>swift::gui::components::CStatusMessageForm</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/statusmessageform.h</header>
+   <header>gui/components/statusmessageform.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Filters::CStatusMessageFilterBar</class>
+   <class>swift::gui::filters::CStatusMessageFilterBar</class>
    <extends>QFrame</extends>
-   <header>blackgui/filters/statusmessagefilterbar.h</header>
+   <header>gui/filters/statusmessagefilterbar.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/stringlistdialog.cpp b/src/gui/components/stringlistdialog.cpp
similarity index 97%
rename from src/blackgui/components/stringlistdialog.cpp
rename to src/gui/components/stringlistdialog.cpp
index a90082b1d..ede441f0e 100644
--- a/src/blackgui/components/stringlistdialog.cpp
+++ b/src/gui/components/stringlistdialog.cpp
@@ -4,7 +4,7 @@
 #include "stringlistdialog.h"
 #include "ui_stringlistdialog.h"
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CStringListDialog::CStringListDialog(QWidget *parent) : QDialog(parent),
                                                             ui(new Ui::CStringListDialog)
diff --git a/src/blackgui/components/stringlistdialog.h b/src/gui/components/stringlistdialog.h
similarity index 86%
rename from src/blackgui/components/stringlistdialog.h
rename to src/gui/components/stringlistdialog.h
index e23d7b14b..133379004 100644
--- a/src/blackgui/components/stringlistdialog.h
+++ b/src/gui/components/stringlistdialog.h
@@ -3,8 +3,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_STRINGLISTDIALOG_H
-#define BLACKGUI_COMPONENTS_STRINGLISTDIALOG_H
+#ifndef SWIFT_GUI_COMPONENTS_STRINGLISTDIALOG_H
+#define SWIFT_GUI_COMPONENTS_STRINGLISTDIALOG_H
 
 #include <QDialog>
 #include <QScopedPointer>
@@ -13,7 +13,7 @@ namespace Ui
 {
     class CStringListDialog;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Select from a list of string
diff --git a/src/blackgui/components/stringlistdialog.ui b/src/gui/components/stringlistdialog.ui
similarity index 100%
rename from src/blackgui/components/stringlistdialog.ui
rename to src/gui/components/stringlistdialog.ui
diff --git a/src/blackgui/components/texteditdialog.cpp b/src/gui/components/texteditdialog.cpp
similarity index 95%
rename from src/blackgui/components/texteditdialog.cpp
rename to src/gui/components/texteditdialog.cpp
index 38b4ce4a4..df1c50dca 100644
--- a/src/blackgui/components/texteditdialog.cpp
+++ b/src/gui/components/texteditdialog.cpp
@@ -4,7 +4,7 @@
 #include "texteditdialog.h"
 #include "ui_texteditdialog.h"
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CTextEditDialog::CTextEditDialog(QWidget *parent) : QDialog(parent),
                                                         ui(new Ui::CTextEditDialog)
diff --git a/src/blackgui/components/texteditdialog.h b/src/gui/components/texteditdialog.h
similarity index 76%
rename from src/blackgui/components/texteditdialog.h
rename to src/gui/components/texteditdialog.h
index 8f1cfd72e..dd904ff68 100644
--- a/src/blackgui/components/texteditdialog.h
+++ b/src/gui/components/texteditdialog.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_TEXTEDITDIALOG_H
-#define BLACKGUI_COMPONENTS_TEXTEDITDIALOG_H
+#ifndef SWIFT_GUI_COMPONENTS_TEXTEDITDIALOG_H
+#define SWIFT_GUI_COMPONENTS_TEXTEDITDIALOG_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 
 #include <QDialog>
 #include <QScopedPointer>
@@ -17,10 +17,10 @@ namespace Ui
 {
     class CTextEditDialog;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! Text edit as dialog
-    class BLACKGUI_EXPORT CTextEditDialog : public QDialog
+    class SWIFT_GUI_EXPORT CTextEditDialog : public QDialog
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/texteditdialog.ui b/src/gui/components/texteditdialog.ui
similarity index 100%
rename from src/blackgui/components/texteditdialog.ui
rename to src/gui/components/texteditdialog.ui
diff --git a/src/blackgui/components/textmessagecomponent.cpp b/src/gui/components/textmessagecomponent.cpp
similarity index 99%
rename from src/blackgui/components/textmessagecomponent.cpp
rename to src/gui/components/textmessagecomponent.cpp
index 950badeaf..0c97461a6 100644
--- a/src/blackgui/components/textmessagecomponent.cpp
+++ b/src/gui/components/textmessagecomponent.cpp
@@ -2,11 +2,11 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "ui_textmessagecomponent.h"
-#include "blackgui/components/textmessagecomponent.h"
-#include "blackgui/views/textmessageview.h"
-#include "blackgui/dockwidgetinfoarea.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/textmessagetextedit.h"
+#include "gui/components/textmessagecomponent.h"
+#include "gui/views/textmessageview.h"
+#include "gui/dockwidgetinfoarea.h"
+#include "gui/guiapplication.h"
+#include "gui/textmessagetextedit.h"
 #include "core/context/contextaudio.h"
 #include "core/context/contextnetwork.h"
 #include "core/context/contextownaircraft.h"
@@ -42,16 +42,16 @@
 using namespace swift::core;
 using namespace swift::core::context;
 using namespace swift::misc;
-using namespace BlackGui;
-using namespace BlackGui::Settings;
-using namespace BlackGui::Views;
+using namespace swift::gui;
+using namespace swift::gui::settings;
+using namespace swift::gui::views;
 using namespace swift::misc::network;
 using namespace swift::misc::audio;
 using namespace swift::misc::aviation;
 using namespace swift::misc::physical_quantities;
 using namespace swift::misc::simulation;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CTextMessageComponent::CTextMessageComponent(QWidget *parent) : QFrame(parent),
                                                                     ui(new Ui::CTextMessageComponent)
diff --git a/src/blackgui/components/textmessagecomponent.h b/src/gui/components/textmessagecomponent.h
similarity index 95%
rename from src/blackgui/components/textmessagecomponent.h
rename to src/gui/components/textmessagecomponent.h
index 455a43ba4..f58be9dd3 100644
--- a/src/blackgui/components/textmessagecomponent.h
+++ b/src/gui/components/textmessagecomponent.h
@@ -3,13 +3,13 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_TEXTMESSAGECOMPONENT_H
-#define BLACKGUI_COMPONENTS_TEXTMESSAGECOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_TEXTMESSAGECOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_TEXTMESSAGECOMPONENT_H
 
-#include "blackgui/components/textmessagecomponenttab.h"
-#include "blackgui/settings/textmessagesettings.h"
-#include "blackgui/enablefordockwidgetinfoarea.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/components/textmessagecomponenttab.h"
+#include "gui/settings/textmessagesettings.h"
+#include "gui/enablefordockwidgetinfoarea.h"
+#include "gui/swiftguiexport.h"
 #include "misc/simulation/simulatedaircraft.h"
 #include "misc/network/textmessagelist.h"
 #include "misc/aviation/atcstation.h"
@@ -26,15 +26,15 @@ namespace Ui
 {
     class CTextMessageComponent;
 }
-namespace BlackGui
+namespace swift::gui
 {
     class CDockWidgetInfoArea;
     class CTextMessageTextEdit;
 
-    namespace Components
+    namespace components
     {
         //! Text message widget
-        class BLACKGUI_EXPORT CTextMessageComponent :
+        class SWIFT_GUI_EXPORT CTextMessageComponent :
             public QFrame,
             public CEnableForDockWidgetInfoArea
         {
@@ -124,7 +124,7 @@ namespace BlackGui
         private:
             QScopedPointer<Ui::CTextMessageComponent> ui;
             swift::misc::CIdentifier m_identifier { "TextMessageComponent", this };
-            swift::misc::CSetting<Settings::TextMessageSettings> m_messageSettings { this, &CTextMessageComponent::onSettingsChanged };
+            swift::misc::CSetting<settings::TextMessageSettings> m_messageSettings { this, &CTextMessageComponent::onSettingsChanged };
             swift::misc::CSetting<swift::misc::audio::TSettings> m_audioSettings { this };
             bool m_usedAsOverlayWidget = false; //!< disables dockwidget parts if used as overlay widget
             bool m_activeSend = true; //!< ignore sent messages
diff --git a/src/blackgui/components/textmessagecomponent.ui b/src/gui/components/textmessagecomponent.ui
similarity index 86%
rename from src/blackgui/components/textmessagecomponent.ui
rename to src/gui/components/textmessagecomponent.ui
index 7c00fc82d..43f300e85 100644
--- a/src/blackgui/components/textmessagecomponent.ui
+++ b/src/gui/components/textmessagecomponent.ui
@@ -47,7 +47,7 @@
         <number>0</number>
        </property>
        <item>
-        <widget class="BlackGui::Views::CTextMessageView" name="tvp_TextMessagesAll">
+        <widget class="swift::gui::views::CTextMessageView" name="tvp_TextMessagesAll">
          <property name="verticalScrollBarPolicy">
           <enum>Qt::ScrollBarAsNeeded</enum>
          </property>
@@ -97,7 +97,7 @@
         <number>0</number>
        </property>
        <item>
-        <widget class="BlackGui::CTextMessageTextEdit" name="tep_TextMessagesUnicom">
+        <widget class="swift::gui::CTextMessageTextEdit" name="tep_TextMessagesUnicom">
          <property name="documentTitle">
           <string>UNICOM</string>
          </property>
@@ -132,7 +132,7 @@
         <number>0</number>
        </property>
        <item>
-        <widget class="BlackGui::CTextMessageTextEdit" name="tep_TextMessagesCOM1">
+        <widget class="swift::gui::CTextMessageTextEdit" name="tep_TextMessagesCOM1">
          <property name="documentTitle">
           <string>COM1</string>
          </property>
@@ -167,7 +167,7 @@
         <number>0</number>
        </property>
        <item>
-        <widget class="BlackGui::CTextMessageTextEdit" name="tep_TextMessagesCOM2">
+        <widget class="swift::gui::CTextMessageTextEdit" name="tep_TextMessagesCOM2">
          <property name="autoFormatting">
           <set>QTextEdit::AutoNone</set>
          </property>
@@ -208,7 +208,7 @@
        <number>2</number>
       </property>
       <item>
-       <widget class="BlackGui::Components::CAtcButtonComponent" name="comp_AtcStations">
+       <widget class="swift::gui::components::CAtcButtonComponent" name="comp_AtcStations">
         <property name="minimumSize">
          <size>
           <width>0</width>
@@ -248,7 +248,7 @@
        <number>1</number>
       </property>
       <item row="1" column="1">
-       <widget class="BlackGui::Components::CSettingsTextMessageStyle" name="comp_SettingsStyle">
+       <widget class="swift::gui::components::CSettingsTextMessageStyle" name="comp_SettingsStyle">
         <property name="minimumSize">
          <size>
           <width>200</width>
@@ -265,7 +265,7 @@
        </widget>
       </item>
       <item row="0" column="0" colspan="2">
-       <widget class="BlackGui::Components::CSettingsTextMessageInlineComponent" name="comp_SettingsOverlay">
+       <widget class="swift::gui::components::CSettingsTextMessageInlineComponent" name="comp_SettingsOverlay">
         <property name="minimumSize">
          <size>
           <width>200</width>
@@ -287,7 +287,7 @@
      </property>
      <layout class="QHBoxLayout" name="hl_TextMessage">
       <item>
-       <widget class="BlackGui::CLineEditHistory" name="lep_TextMessages">
+       <widget class="swift::gui::CLineEditHistory" name="lep_TextMessages">
         <property name="toolTip">
          <string>command line (e.g. &quot;.com1&quot;, &quot;.x&quot;, &quot;.msg com1&quot;)</string>
         </property>
@@ -303,36 +303,36 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Views::CTextMessageView</class>
+   <class>swift::gui::views::CTextMessageView</class>
    <extends>QTableView</extends>
-   <header>blackgui/views/textmessageview.h</header>
+   <header>gui/views/textmessageview.h</header>
   </customwidget>
   <customwidget>
-   <class>BlackGui::CTextMessageTextEdit</class>
+   <class>swift::gui::CTextMessageTextEdit</class>
    <extends>QTextEdit</extends>
-   <header>blackgui/textmessagetextedit.h</header>
+   <header>gui/textmessagetextedit.h</header>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CSettingsTextMessageInlineComponent</class>
+   <class>swift::gui::components::CSettingsTextMessageInlineComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/settingstextmessageinlinecomponent.h</header>
+   <header>gui/components/settingstextmessageinlinecomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::CLineEditHistory</class>
+   <class>swift::gui::CLineEditHistory</class>
    <extends>QLineEdit</extends>
-   <header>blackgui/lineedithistory.h</header>
+   <header>gui/lineedithistory.h</header>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CSettingsTextMessageStyle</class>
+   <class>swift::gui::components::CSettingsTextMessageStyle</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/settingstextmessagestyle.h</header>
+   <header>gui/components/settingstextmessagestyle.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CAtcButtonComponent</class>
+   <class>swift::gui::components::CAtcButtonComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/atcbuttoncomponent.h</header>
+   <header>gui/components/atcbuttoncomponent.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/textmessagecomponenttab.h b/src/gui/components/textmessagecomponenttab.h
similarity index 65%
rename from src/blackgui/components/textmessagecomponenttab.h
rename to src/gui/components/textmessagecomponenttab.h
index 69b59b5e4..da2d06dca 100644
--- a/src/blackgui/components/textmessagecomponenttab.h
+++ b/src/gui/components/textmessagecomponenttab.h
@@ -3,12 +3,12 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_TEXTMESSAGECOMPONENT_TAB_H
-#define BLACKGUI_COMPONENTS_TEXTMESSAGECOMPONENT_TAB_H
+#ifndef SWIFT_GUI_COMPONENTS_TEXTMESSAGECOMPONENT_TAB_H
+#define SWIFT_GUI_COMPONENTS_TEXTMESSAGECOMPONENT_TAB_H
 
 #include <QMetaType>
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! Tabs
     enum TextMessageTab
@@ -20,6 +20,6 @@ namespace BlackGui::Components
     };
 } // ns
 
-Q_DECLARE_METATYPE(BlackGui::Components::TextMessageTab)
+Q_DECLARE_METATYPE(swift::gui::components::TextMessageTab)
 
 #endif // guard
diff --git a/src/blackgui/components/transpondercodespinbox.cpp b/src/gui/components/transpondercodespinbox.cpp
similarity index 85%
rename from src/blackgui/components/transpondercodespinbox.cpp
rename to src/gui/components/transpondercodespinbox.cpp
index 7fc4838b7..b31740f94 100644
--- a/src/blackgui/components/transpondercodespinbox.cpp
+++ b/src/gui/components/transpondercodespinbox.cpp
@@ -1,10 +1,10 @@
 // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/transpondercodespinbox.h"
+#include "gui/components/transpondercodespinbox.h"
 #include <QChar>
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CTransponderCodeSpinBox::CTransponderCodeSpinBox(QWidget *parent) : QSpinBox(parent)
     {}
diff --git a/src/blackgui/components/transpondercodespinbox.h b/src/gui/components/transpondercodespinbox.h
similarity index 70%
rename from src/blackgui/components/transpondercodespinbox.h
rename to src/gui/components/transpondercodespinbox.h
index 4f63b1136..8f84b6b0a 100644
--- a/src/blackgui/components/transpondercodespinbox.h
+++ b/src/gui/components/transpondercodespinbox.h
@@ -3,19 +3,19 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_TRANSPONDERCODESPINBOX_H
-#define BLACKGUI_COMPONENTS_TRANSPONDERCODESPINBOX_H
+#ifndef SWIFT_GUI_COMPONENTS_TRANSPONDERCODESPINBOX_H
+#define SWIFT_GUI_COMPONENTS_TRANSPONDERCODESPINBOX_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 
 #include <QObject>
 #include <QSpinBox>
 #include <QString>
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! Specialized spin box for Transponder codes
-    class BLACKGUI_EXPORT CTransponderCodeSpinBox : public QSpinBox
+    class SWIFT_GUI_EXPORT CTransponderCodeSpinBox : public QSpinBox
     {
         Q_OBJECT
     public:
diff --git a/src/blackgui/components/transpondermodecomponent.cpp b/src/gui/components/transpondermodecomponent.cpp
similarity index 97%
rename from src/blackgui/components/transpondermodecomponent.cpp
rename to src/gui/components/transpondermodecomponent.cpp
index 71dc0733a..e3035284f 100644
--- a/src/blackgui/components/transpondermodecomponent.cpp
+++ b/src/gui/components/transpondermodecomponent.cpp
@@ -3,7 +3,7 @@
 
 #include "transpondermodecomponent.h"
 #include "ui_transpondermodecomponent.h"
-#include "blackgui/guiapplication.h"
+#include "gui/guiapplication.h"
 #include "core/context/contextownaircraft.h"
 #include "misc/aviation/transponder.h"
 
@@ -15,7 +15,7 @@ using namespace swift::misc::aviation;
 using namespace swift::misc::simulation;
 using namespace swift::core::context;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CTransponderModeComponent::CTransponderModeComponent(QWidget *parent) : QFrame(parent), CIdentifiable(this),
                                                                             ui(new Ui::CTransponderModeComponent)
diff --git a/src/blackgui/components/transpondermodecomponent.h b/src/gui/components/transpondermodecomponent.h
similarity index 90%
rename from src/blackgui/components/transpondermodecomponent.h
rename to src/gui/components/transpondermodecomponent.h
index 10e86b659..dae93197a 100644
--- a/src/blackgui/components/transpondermodecomponent.h
+++ b/src/gui/components/transpondermodecomponent.h
@@ -3,8 +3,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_TRANSPONDERMODECOMPONENT_H
-#define BLACKGUI_COMPONENTS_TRANSPONDERMODECOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_TRANSPONDERMODECOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_TRANSPONDERMODECOMPONENT_H
 
 #include "misc/aviation/transponder.h"
 #include "misc/identifiable.h"
@@ -23,7 +23,7 @@ namespace swift::misc
         class CSimulatedAircraft;
     }
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Small component to display XPDR mode
diff --git a/src/blackgui/components/transpondermodecomponent.ui b/src/gui/components/transpondermodecomponent.ui
similarity index 100%
rename from src/blackgui/components/transpondermodecomponent.ui
rename to src/gui/components/transpondermodecomponent.ui
diff --git a/src/blackgui/components/transpondermodeselector.cpp b/src/gui/components/transpondermodeselector.cpp
similarity index 97%
rename from src/blackgui/components/transpondermodeselector.cpp
rename to src/gui/components/transpondermodeselector.cpp
index b309f2b45..3277d4557 100644
--- a/src/blackgui/components/transpondermodeselector.cpp
+++ b/src/gui/components/transpondermodeselector.cpp
@@ -1,13 +1,13 @@
 // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/transpondermodeselector.h"
+#include "gui/components/transpondermodeselector.h"
 
 #include <QStringList>
 
 using namespace swift::misc::aviation;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CTransponderModeSelector::CTransponderModeSelector(QWidget *parent) : QComboBox(parent)
     {
diff --git a/src/blackgui/components/transpondermodeselector.h b/src/gui/components/transpondermodeselector.h
similarity index 89%
rename from src/blackgui/components/transpondermodeselector.h
rename to src/gui/components/transpondermodeselector.h
index f0c3ca755..96522892f 100644
--- a/src/blackgui/components/transpondermodeselector.h
+++ b/src/gui/components/transpondermodeselector.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_TRANSPONDERMODESELECTOR_H
-#define BLACKGUI_COMPONENTS_TRANSPONDERMODESELECTOR_H
+#ifndef SWIFT_GUI_COMPONENTS_TRANSPONDERMODESELECTOR_H
+#define SWIFT_GUI_COMPONENTS_TRANSPONDERMODESELECTOR_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include "misc/aviation/transponder.h"
 
 #include <QComboBox>
@@ -14,11 +14,11 @@
 #include <QString>
 #include <QTimer>
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! Selector for the transponder mode
     //! \remarks features ident reset
-    class BLACKGUI_EXPORT CTransponderModeSelector : public QComboBox
+    class SWIFT_GUI_EXPORT CTransponderModeSelector : public QComboBox
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/updateinfocomponent.cpp b/src/gui/components/updateinfocomponent.cpp
similarity index 98%
rename from src/blackgui/components/updateinfocomponent.cpp
rename to src/gui/components/updateinfocomponent.cpp
index 7083e0612..92fadafd0 100644
--- a/src/blackgui/components/updateinfocomponent.cpp
+++ b/src/gui/components/updateinfocomponent.cpp
@@ -1,11 +1,11 @@
 // SPDX-FileCopyrightText: Copyright (C) 2017 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/updateinfocomponent.h"
+#include "gui/components/updateinfocomponent.h"
 #include "ui_updateinfocomponent.h"
-#include "blackgui/components/installxswiftbusdialog.h"
-#include "blackgui/components/downloaddialog.h"
-#include "blackgui/guiapplication.h"
+#include "gui/components/installxswiftbusdialog.h"
+#include "gui/components/downloaddialog.h"
+#include "gui/guiapplication.h"
 #include "misc/network/networkutils.h"
 #include "misc/db/distributionlist.h"
 #include "misc/logmessage.h"
@@ -21,7 +21,7 @@ using namespace swift::misc;
 using namespace swift::misc::db;
 using namespace swift::misc::network;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CUpdateInfoComponent::CUpdateInfoComponent(QWidget *parent) : QFrame(parent),
                                                                   ui(new Ui::CUpdateInfoComponent)
diff --git a/src/blackgui/components/updateinfocomponent.h b/src/gui/components/updateinfocomponent.h
similarity index 92%
rename from src/blackgui/components/updateinfocomponent.h
rename to src/gui/components/updateinfocomponent.h
index efa0cf700..c38960270 100644
--- a/src/blackgui/components/updateinfocomponent.h
+++ b/src/gui/components/updateinfocomponent.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_UPDATEINFOCOMPONENT_H
-#define BLACKGUI_COMPONENTS_UPDATEINFOCOMPONENT_H
+#ifndef SWIFT_GUI_COMPONENTS_UPDATEINFOCOMPONENT_H
+#define SWIFT_GUI_COMPONENTS_UPDATEINFOCOMPONENT_H
 
 #include "core/application/updatesettings.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include "misc/db/updateinfo.h"
 #include "misc/db/artifact.h"
 #include "misc/settingscache.h"
@@ -18,7 +18,7 @@ namespace Ui
 {
     class CUpdateInfoComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     class CInstallXSwiftBusDialog;
     class CDownloadDialog;
@@ -26,7 +26,7 @@ namespace BlackGui::Components
     /*!
      * Update info (distributions, artifacts etc.)
      */
-    class BLACKGUI_EXPORT CUpdateInfoComponent : public QFrame
+    class SWIFT_GUI_EXPORT CUpdateInfoComponent : public QFrame
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/updateinfocomponent.ui b/src/gui/components/updateinfocomponent.ui
similarity index 100%
rename from src/blackgui/components/updateinfocomponent.ui
rename to src/gui/components/updateinfocomponent.ui
diff --git a/src/blackgui/components/updateinfodialog.cpp b/src/gui/components/updateinfodialog.cpp
similarity index 96%
rename from src/blackgui/components/updateinfodialog.cpp
rename to src/gui/components/updateinfodialog.cpp
index f75095155..2ec680590 100644
--- a/src/blackgui/components/updateinfodialog.cpp
+++ b/src/gui/components/updateinfodialog.cpp
@@ -3,13 +3,13 @@
 
 #include "updateinfodialog.h"
 #include "ui_updateinfodialog.h"
-#include "blackgui/guiapplication.h"
+#include "gui/guiapplication.h"
 #include <QPushButton>
 #include <QDesktopServices>
 
 using namespace swift::misc::db;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CUpdateInfoDialog::CUpdateInfoDialog(QWidget *parent) : QDialog(parent),
                                                             ui(new Ui::CUpdateInfoDialog)
diff --git a/src/blackgui/components/updateinfodialog.h b/src/gui/components/updateinfodialog.h
similarity index 72%
rename from src/blackgui/components/updateinfodialog.h
rename to src/gui/components/updateinfodialog.h
index 5f0661ac4..87f2c6404 100644
--- a/src/blackgui/components/updateinfodialog.h
+++ b/src/gui/components/updateinfodialog.h
@@ -3,23 +3,23 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_UPDATEINFODIALOG_H
-#define BLACKGUI_COMPONENTS_UPDATEINFODIALOG_H
+#ifndef SWIFT_GUI_COMPONENTS_UPDATEINFODIALOG_H
+#define SWIFT_GUI_COMPONENTS_UPDATEINFODIALOG_H
 
-#include "blackgui/settings/updatenotification.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/settings/updatenotification.h"
+#include "gui/swiftguiexport.h"
 #include <QDialog>
 
 namespace Ui
 {
     class CUpdateInfoDialog;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     /*!
      * Download and install swift
      */
-    class BLACKGUI_EXPORT CUpdateInfoDialog : public QDialog
+    class SWIFT_GUI_EXPORT CUpdateInfoDialog : public QDialog
     {
         Q_OBJECT
 
@@ -42,7 +42,7 @@ namespace BlackGui::Components
 
     private:
         QScopedPointer<Ui::CUpdateInfoDialog> ui;
-        swift::misc::CSetting<BlackGui::Settings::TUpdateNotificationSettings> m_setting { this }; //!< show again?
+        swift::misc::CSetting<swift::gui::settings::TUpdateNotificationSettings> m_setting { this }; //!< show again?
 
         //! Toggled checkbox
         void onDontShowAgain(bool dontShowAgain);
diff --git a/src/blackgui/components/updateinfodialog.ui b/src/gui/components/updateinfodialog.ui
similarity index 93%
rename from src/blackgui/components/updateinfodialog.ui
rename to src/gui/components/updateinfodialog.ui
index d5e0f1f2e..0dad853d7 100644
--- a/src/blackgui/components/updateinfodialog.ui
+++ b/src/gui/components/updateinfodialog.ui
@@ -36,7 +36,7 @@
     <number>4</number>
    </property>
    <item>
-    <widget class="BlackGui::Components::CUpdateInfoComponent" name="comp_UpdateInfo">
+    <widget class="swift::gui::components::CUpdateInfoComponent" name="comp_UpdateInfo">
      <property name="minimumSize">
       <size>
        <width>0</width>
@@ -84,9 +84,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CUpdateInfoComponent</class>
+   <class>swift::gui::components::CUpdateInfoComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/updateinfocomponent.h</header>
+   <header>gui/components/updateinfocomponent.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/components/usercomponent.cpp b/src/gui/components/usercomponent.cpp
similarity index 92%
rename from src/blackgui/components/usercomponent.cpp
rename to src/gui/components/usercomponent.cpp
index fb8c5fc1e..f6dcf19d3 100644
--- a/src/blackgui/components/usercomponent.cpp
+++ b/src/gui/components/usercomponent.cpp
@@ -1,11 +1,11 @@
 // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/usercomponent.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/guiutility.h"
-#include "blackgui/views/clientview.h"
-#include "blackgui/views/userview.h"
+#include "gui/components/usercomponent.h"
+#include "gui/guiapplication.h"
+#include "gui/guiutility.h"
+#include "gui/views/clientview.h"
+#include "gui/views/userview.h"
 #include "core/context/contextnetwork.h"
 #include "misc/network/connectionstatus.h"
 #include "misc/network/userlist.h"
@@ -15,13 +15,13 @@
 #include <QTabBar>
 
 using namespace swift::misc::network;
-using namespace BlackGui;
-using namespace BlackGui::Views;
-using namespace BlackGui::Settings;
+using namespace swift::gui;
+using namespace swift::gui::views;
+using namespace swift::gui::settings;
 using namespace swift::core;
 using namespace swift::core::context;
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     CUserComponent::CUserComponent(QWidget *parent) : QTabWidget(parent),
                                                       CEnableForDockWidgetInfoArea(),
diff --git a/src/blackgui/components/usercomponent.h b/src/gui/components/usercomponent.h
similarity index 78%
rename from src/blackgui/components/usercomponent.h
rename to src/gui/components/usercomponent.h
index 783923765..7778dbea8 100644
--- a/src/blackgui/components/usercomponent.h
+++ b/src/gui/components/usercomponent.h
@@ -3,12 +3,12 @@
 
 //! \file
 
-#ifndef BLACKGUI_USERCOMPONENT_H
-#define BLACKGUI_USERCOMPONENT_H
+#ifndef SWIFT_GUI_USERCOMPONENT_H
+#define SWIFT_GUI_USERCOMPONENT_H
 
-#include "blackgui/enablefordockwidgetinfoarea.h"
-#include "blackgui/blackguiexport.h"
-#include "blackgui/settings/viewupdatesettings.h"
+#include "gui/enablefordockwidgetinfoarea.h"
+#include "gui/swiftguiexport.h"
+#include "gui/settings/viewupdatesettings.h"
 #include "misc/aviation/callsign.h"
 #include "misc/network/connectionstatus.h"
 
@@ -22,10 +22,10 @@ namespace Ui
 {
     class CUserComponent;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     //! User componenet (users, clients)
-    class BLACKGUI_EXPORT CUserComponent :
+    class SWIFT_GUI_EXPORT CUserComponent :
         public QTabWidget,
         public CEnableForDockWidgetInfoArea
     {
@@ -63,7 +63,7 @@ namespace BlackGui::Components
 
         QScopedPointer<Ui::CUserComponent> ui;
         QTimer m_updateTimer;
-        swift::misc::CSettingReadOnly<BlackGui::Settings::TViewUpdateSettings> m_settings { this, &CUserComponent::onSettingsChanged };
+        swift::misc::CSettingReadOnly<swift::gui::settings::TViewUpdateSettings> m_settings { this, &CUserComponent::onSettingsChanged };
     };
 } // ns
 #endif // guard
diff --git a/src/blackgui/components/usercomponent.ui b/src/gui/components/usercomponent.ui
similarity index 85%
rename from src/blackgui/components/usercomponent.ui
rename to src/gui/components/usercomponent.ui
index c2e8161ff..5f169e5a4 100644
--- a/src/blackgui/components/usercomponent.ui
+++ b/src/gui/components/usercomponent.ui
@@ -40,7 +40,7 @@
      <number>0</number>
     </property>
     <item>
-     <widget class="BlackGui::Views::CUserView" name="tvp_AllUsers">
+     <widget class="swift::gui::views::CUserView" name="tvp_AllUsers">
       <property name="selectionMode">
        <enum>QAbstractItemView::SingleSelection</enum>
       </property>
@@ -72,7 +72,7 @@
      <number>0</number>
     </property>
     <item>
-     <widget class="BlackGui::Views::CClientView" name="tvp_Clients">
+     <widget class="swift::gui::views::CClientView" name="tvp_Clients">
       <property name="selectionMode">
        <enum>QAbstractItemView::SingleSelection</enum>
       </property>
@@ -104,7 +104,7 @@
      <number>0</number>
     </property>
     <item>
-     <widget class="BlackGui::Components::CModelMatcherLogComponent" name="comp_MatchingLog">
+     <widget class="swift::gui::components::CModelMatcherLogComponent" name="comp_MatchingLog">
       <property name="frameShape">
        <enum>QFrame::StyledPanel</enum>
       </property>
@@ -118,19 +118,19 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Views::CUserView</class>
+   <class>swift::gui::views::CUserView</class>
    <extends>QTableView</extends>
-   <header>blackgui/views/userview.h</header>
+   <header>gui/views/userview.h</header>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Views::CClientView</class>
+   <class>swift::gui::views::CClientView</class>
    <extends>QTableView</extends>
-   <header>blackgui/views/clientview.h</header>
+   <header>gui/views/clientview.h</header>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CModelMatcherLogComponent</class>
+   <class>swift::gui::components::CModelMatcherLogComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/modelmatcherlogcomponent.h</header>
+   <header>gui/components/modelmatcherlogcomponent.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/copyxswiftbusdialog.cpp b/src/gui/copyxswiftbusdialog.cpp
similarity index 97%
rename from src/blackgui/copyxswiftbusdialog.cpp
rename to src/gui/copyxswiftbusdialog.cpp
index 31c6985bc..7dcb46c5e 100644
--- a/src/blackgui/copyxswiftbusdialog.cpp
+++ b/src/gui/copyxswiftbusdialog.cpp
@@ -3,7 +3,7 @@
 
 #include <QMessageBox>
 #include "copyxswiftbusdialog.h"
-#include "blackgui/guiapplication.h"
+#include "gui/guiapplication.h"
 #include "core/context/contextsimulator.h"
 #include "misc/simulation/xplane/xplaneutil.h"
 #include "misc/swiftdirectories.h"
@@ -15,7 +15,7 @@ using namespace swift::misc;
 using namespace swift::misc::simulation::xplane;
 using namespace swift::core::context;
 
-namespace BlackGui
+namespace swift::gui
 {
     int CCopyXSwiftBusDialog::displayDialogAndCopyBuildFiles(const QString &xplaneRootDir, bool checkLatestFile, QWidget *parent)
     {
diff --git a/src/blackgui/copyxswiftbusdialog.h b/src/gui/copyxswiftbusdialog.h
similarity index 75%
rename from src/blackgui/copyxswiftbusdialog.h
rename to src/gui/copyxswiftbusdialog.h
index d9b2ac7bf..b51567291 100644
--- a/src/blackgui/copyxswiftbusdialog.h
+++ b/src/gui/copyxswiftbusdialog.h
@@ -3,16 +3,16 @@
 
 //! \file
 
-#ifndef BLACKGUI_COPYXSWIFTBUSDIALOG_H
-#define BLACKGUI_COPYXSWIFTBUSDIALOG_H
+#ifndef SWIFT_GUI_COPYXSWIFTBUSDIALOG_H
+#define SWIFT_GUI_COPYXSWIFTBUSDIALOG_H
 
 #include <QWidget>
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 
-namespace BlackGui
+namespace swift::gui
 {
     //! Show dialog about to copy xswiftbus build files
-    class BLACKGUI_EXPORT CCopyXSwiftBusDialog
+    class SWIFT_GUI_EXPORT CCopyXSwiftBusDialog
     {
     public:
         //! Display a dialog to copy the latest xswiftbus files
diff --git a/src/blackgui/dockwidget.cpp b/src/gui/dockwidget.cpp
similarity index 98%
rename from src/blackgui/dockwidget.cpp
rename to src/gui/dockwidget.cpp
index 7ca40add9..89803d540 100644
--- a/src/blackgui/dockwidget.cpp
+++ b/src/gui/dockwidget.cpp
@@ -1,12 +1,12 @@
 // SPDX-FileCopyrightText: Copyright (C) 2014 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/marginsinput.h"
-#include "blackgui/menus/fontmenus.h"
-#include "blackgui/dockwidget.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/guiutility.h"
-#include "blackgui/stylesheetutility.h"
+#include "gui/components/marginsinput.h"
+#include "gui/menus/fontmenus.h"
+#include "gui/dockwidget.h"
+#include "gui/guiapplication.h"
+#include "gui/guiutility.h"
+#include "gui/stylesheetutility.h"
 #include "misc/icons.h"
 #include "misc/logmessage.h"
 #include "misc/verify.h"
@@ -33,11 +33,11 @@
 #include <QApplication>
 
 using namespace swift::misc;
-using namespace BlackGui::Components;
-using namespace BlackGui::Settings;
-using namespace BlackGui::Menus;
+using namespace swift::gui::components;
+using namespace swift::gui::settings;
+using namespace swift::gui::menus;
 
-namespace BlackGui
+namespace swift::gui
 {
     CDockWidget::CDockWidget(bool allowStatusBar, QWidget *parent) : COverlayMessagesDockWidget(parent),
                                                                      CEnableForFramelessWindow(CEnableForFramelessWindow::WindowTool, false, "framelessDockWidget", this),
@@ -551,7 +551,7 @@ namespace BlackGui
         //    QDockWidget (CDockWidget/CDockWidgetInfoArea) -> QWidget (outer widget) -> QFrame (inner widget)
         //    Structure used for frameless floating windows
         // 2) Check if the "floating" flag is accidentally set for the dock widget in the GUI builder
-        // 3) Is the dock widget promoted BlackGui::CDockWidgetInfoArea?
+        // 3) Is the dock widget promoted swift::gui::CDockWidgetInfoArea?
         QWidget *outerWidget = this->widget(); // the outer widget containing the layout
         Q_ASSERT_X(outerWidget, "CDockWidget::initStatusBar", "No outer widget");
         if (!outerWidget) { return; }
diff --git a/src/blackgui/dockwidget.h b/src/gui/dockwidget.h
similarity index 92%
rename from src/blackgui/dockwidget.h
rename to src/gui/dockwidget.h
index f309ac673..561deed51 100644
--- a/src/blackgui/dockwidget.h
+++ b/src/gui/dockwidget.h
@@ -3,14 +3,14 @@
 
 //! \file
 
-#ifndef BLACKGUI_DOCKWIDGET_H
-#define BLACKGUI_DOCKWIDGET_H
+#ifndef SWIFT_GUI_DOCKWIDGET_H
+#define SWIFT_GUI_DOCKWIDGET_H
 
-#include "blackgui/overlaymessagesframe.h"
-#include "blackgui/enableforframelesswindow.h"
-#include "blackgui/managedstatusbar.h"
-#include "blackgui/settings/dockwidgetsettings.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/overlaymessagesframe.h"
+#include "gui/enableforframelesswindow.h"
+#include "gui/managedstatusbar.h"
+#include "gui/settings/dockwidgetsettings.h"
+#include "gui/swiftguiexport.h"
 #include "misc/statusmessagelist.h"
 #include "misc/statusmessage.h"
 
@@ -28,13 +28,13 @@ class QPaintEvent;
 class QWidget;
 class QWidgetAction;
 
-namespace BlackGui
+namespace swift::gui
 {
-    namespace Components
+    namespace components
     {
         class CMarginsInput;
     }
-    namespace Menus
+    namespace menus
     {
         class CFontMenu;
     }
@@ -47,7 +47,7 @@ namespace BlackGui
     //! \sa CInfoArea
     //! \sa CDockWidgetInfoArea
     //! \sa CDockWidgetInfoBar
-    class BLACKGUI_EXPORT CDockWidget :
+    class SWIFT_GUI_EXPORT CDockWidget :
         public COverlayMessagesDockWidget,
         public CEnableForFramelessWindow
     {
@@ -228,8 +228,8 @@ namespace BlackGui
         QWidget *m_titleBarWidgetEmpty = nullptr; //!< replacing default title bar
         QWidget *m_titleBarWidgetOriginal = nullptr; //!< the original title bar
         QWidgetAction *m_marginMenuAction = nullptr; //!< menu widget(!) action for margin widget
-        Components::CMarginsInput *m_input = nullptr; //!< margins widget
-        Menus::CFontMenu *m_fontMenu = nullptr; //!< Font menu
+        components::CMarginsInput *m_input = nullptr; //!< margins widget
+        menus::CFontMenu *m_fontMenu = nullptr; //!< Font menu
         bool m_allowStatusBar = true;
         bool m_windowTitleWhenDocked = true;
         bool m_wasAlreadyFloating = false; //!< flag if widget was at least once in floating state
@@ -246,7 +246,7 @@ namespace BlackGui
         QPoint m_lastFloatingPosition; //!< last floating position
         Qt::DockWidgetAreas m_originalAreas; //!< areas before floating
 
-        swift::misc::CSetting<BlackGui::Settings::TDockWidget> m_settings { this, &CDockWidget::settingsChanged };
+        swift::misc::CSetting<swift::gui::settings::TDockWidget> m_settings { this, &CDockWidget::settingsChanged };
 
         //! Top level has been chaged
         void onTopLevelChanged(bool topLevel);
@@ -285,10 +285,10 @@ namespace BlackGui
         void restoreFloatingSizeAndPositionDeferred();
 
         //! This widget`s settings
-        Settings::CDockWidgetSettings getSettings() const;
+        settings::CDockWidgetSettings getSettings() const;
 
         //! Save settings
-        void saveSettings(const BlackGui::Settings::CDockWidgetSettings &settings);
+        void saveSettings(const swift::gui::settings::CDockWidgetSettings &settings);
     };
 } // namespace
 
diff --git a/src/blackgui/dockwidgetinfoarea.cpp b/src/gui/dockwidgetinfoarea.cpp
similarity index 96%
rename from src/blackgui/dockwidgetinfoarea.cpp
rename to src/gui/dockwidgetinfoarea.cpp
index b0bf372d7..bceb1bb47 100644
--- a/src/blackgui/dockwidgetinfoarea.cpp
+++ b/src/gui/dockwidgetinfoarea.cpp
@@ -1,18 +1,18 @@
 // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/dockwidgetinfoarea.h"
-#include "blackgui/enablefordockwidgetinfoarea.h"
-#include "blackgui/infoarea.h"
+#include "gui/dockwidgetinfoarea.h"
+#include "gui/enablefordockwidgetinfoarea.h"
+#include "gui/infoarea.h"
 
 #include <QMenu>
 #include <QString>
 #include <QWidget>
 #include <QtGlobal>
 
-using namespace BlackGui::Components;
+using namespace swift::gui::components;
 
-namespace BlackGui
+namespace swift::gui
 {
     CDockWidgetInfoArea::CDockWidgetInfoArea(QWidget *parent) : CDockWidget(parent)
     {
diff --git a/src/blackgui/dockwidgetinfoarea.h b/src/gui/dockwidgetinfoarea.h
similarity index 88%
rename from src/blackgui/dockwidgetinfoarea.h
rename to src/gui/dockwidgetinfoarea.h
index 7576407a2..5dd9441db 100644
--- a/src/blackgui/dockwidgetinfoarea.h
+++ b/src/gui/dockwidgetinfoarea.h
@@ -3,18 +3,18 @@
 
 //! \file
 
-#ifndef BLACKGUI_DOCKWIDGETINFOAREA_H
-#define BLACKGUI_DOCKWIDGETINFOAREA_H
+#ifndef SWIFT_GUI_DOCKWIDGETINFOAREA_H
+#define SWIFT_GUI_DOCKWIDGETINFOAREA_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/dockwidget.h"
+#include "gui/swiftguiexport.h"
+#include "gui/dockwidget.h"
 
 #include <QList>
 #include <QObject>
 
 class QMenu;
 
-namespace BlackGui
+namespace swift::gui
 {
     //! Forward declarations
     class CInfoArea;
@@ -23,7 +23,7 @@ namespace BlackGui
     //! Specialized class for dock widgets serving as info area.
     //! \sa CDockWidgetInfoBar
     //! \sa CInfoArea
-    class BLACKGUI_EXPORT CDockWidgetInfoArea : public CDockWidget
+    class SWIFT_GUI_EXPORT CDockWidgetInfoArea : public CDockWidget
     {
         Q_OBJECT
 
diff --git a/src/blackgui/dockwidgetinfobar.cpp b/src/gui/dockwidgetinfobar.cpp
similarity index 86%
rename from src/blackgui/dockwidgetinfobar.cpp
rename to src/gui/dockwidgetinfobar.cpp
index 32203c0e9..e8c6b4359 100644
--- a/src/blackgui/dockwidgetinfobar.cpp
+++ b/src/gui/dockwidgetinfobar.cpp
@@ -1,18 +1,18 @@
 // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/dockwidgetinfobar.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/stylesheetutility.h"
+#include "gui/dockwidgetinfobar.h"
+#include "gui/guiapplication.h"
+#include "gui/stylesheetutility.h"
 #include "misc/icons.h"
 
 #include <QIcon>
 #include <QString>
 
 using namespace swift::misc;
-using namespace BlackGui::Components;
+using namespace swift::gui::components;
 
-namespace BlackGui
+namespace swift::gui
 {
     CDockWidgetInfoBar::CDockWidgetInfoBar(QWidget *parent) : CDockWidget(false, parent)
     {
diff --git a/src/blackgui/dockwidgetinfobar.h b/src/gui/dockwidgetinfobar.h
similarity index 82%
rename from src/blackgui/dockwidgetinfobar.h
rename to src/gui/dockwidgetinfobar.h
index f9a1b5eff..4c22e9dd2 100644
--- a/src/blackgui/dockwidgetinfobar.h
+++ b/src/gui/dockwidgetinfobar.h
@@ -3,22 +3,22 @@
 
 //! \file
 
-#ifndef BLACKGUI_DOCKWIDGETINFOBAR_H
-#define BLACKGUI_DOCKWIDGETINFOBAR_H
+#ifndef SWIFT_GUI_DOCKWIDGETINFOBAR_H
+#define SWIFT_GUI_DOCKWIDGETINFOBAR_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/dockwidget.h"
+#include "gui/swiftguiexport.h"
+#include "gui/dockwidget.h"
 
 #include <QObject>
 
 class QMenu;
 
-namespace BlackGui
+namespace swift::gui
 {
     //! Class for dock widgets in the info area, containing some specialized functionality
     //! \sa CDockWidgetInfoArea
     //! \sa CInfoArea
-    class BLACKGUI_EXPORT CDockWidgetInfoBar : public CDockWidget
+    class SWIFT_GUI_EXPORT CDockWidgetInfoBar : public CDockWidget
     {
         Q_OBJECT
 
diff --git a/src/blackgui/dropbase.cpp b/src/gui/dropbase.cpp
similarity index 94%
rename from src/blackgui/dropbase.cpp
rename to src/gui/dropbase.cpp
index 7e8d4bcb4..4eb566f67 100644
--- a/src/blackgui/dropbase.cpp
+++ b/src/gui/dropbase.cpp
@@ -1,8 +1,8 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/dropbase.h"
-#include "blackgui/guiutility.h"
+#include "gui/dropbase.h"
+#include "gui/guiutility.h"
 
 #include <QMetaType>
 #include <QtGlobal>
@@ -10,7 +10,7 @@
 
 using namespace swift::misc;
 
-namespace BlackGui
+namespace swift::gui
 {
     CDropBase::CDropBase()
     {}
diff --git a/src/blackgui/dropbase.h b/src/gui/dropbase.h
similarity index 90%
rename from src/blackgui/dropbase.h
rename to src/gui/dropbase.h
index 77f9ccb43..78fd48367 100644
--- a/src/blackgui/dropbase.h
+++ b/src/gui/dropbase.h
@@ -1,21 +1,21 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#ifndef BLACKGUI_DROPBASE_H
-#define BLACKGUI_DROPBASE_H
+#ifndef SWIFT_GUI_DROPBASE_H
+#define SWIFT_GUI_DROPBASE_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include "misc/variant.h"
 #include <QList>
 #include <QFileInfo>
 #include <QMimeData>
 
-namespace BlackGui
+namespace swift::gui
 {
     /*!
      * Utilities for dropping swift value objects
      */
-    class BLACKGUI_EXPORT CDropBase
+    class SWIFT_GUI_EXPORT CDropBase
     {
     public:
         //! Dtor
diff --git a/src/blackgui/dropsite.cpp b/src/gui/dropsite.cpp
similarity index 94%
rename from src/blackgui/dropsite.cpp
rename to src/gui/dropsite.cpp
index 9a483708f..c8e0b3b41 100644
--- a/src/blackgui/dropsite.cpp
+++ b/src/gui/dropsite.cpp
@@ -1,9 +1,9 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/dropsite.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/stylesheetutility.h"
+#include "gui/dropsite.h"
+#include "gui/guiapplication.h"
+#include "gui/stylesheetutility.h"
 
 #include <QDragEnterEvent>
 #include <QDragLeaveEvent>
@@ -17,7 +17,7 @@
 
 using namespace swift::misc;
 
-namespace BlackGui
+namespace swift::gui
 {
     CDropSite::CDropSite(QWidget *parent) : QLabel(parent)
     {
diff --git a/src/blackgui/dropsite.h b/src/gui/dropsite.h
similarity index 90%
rename from src/blackgui/dropsite.h
rename to src/gui/dropsite.h
index 2ce0ba609..30ab8ed31 100644
--- a/src/blackgui/dropsite.h
+++ b/src/gui/dropsite.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_DROPSITE_H
-#define BLACKGUI_DROPSITE_H
+#ifndef SWIFT_GUI_DROPSITE_H
+#define SWIFT_GUI_DROPSITE_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/dropbase.h"
+#include "gui/swiftguiexport.h"
+#include "gui/dropbase.h"
 #include "misc/variant.h"
 
 #include <QLabel>
@@ -22,13 +22,13 @@ class QDropEvent;
 class QPaintEvent;
 class QWidget;
 
-namespace BlackGui
+namespace swift::gui
 {
     /*!
      * Area where items can be dropped
      * \remark inspired by Qt example: http://doc.qt.io/qt-4.8/qt-draganddrop-dropsite-example.html
      */
-    class BLACKGUI_EXPORT CDropSite :
+    class SWIFT_GUI_EXPORT CDropSite :
         public QLabel,
         public CDropBase
     {
diff --git a/src/blackgui/ecosystemcombobox.cpp b/src/gui/ecosystemcombobox.cpp
similarity index 98%
rename from src/blackgui/ecosystemcombobox.cpp
rename to src/gui/ecosystemcombobox.cpp
index a5544476c..a7621a103 100644
--- a/src/blackgui/ecosystemcombobox.cpp
+++ b/src/gui/ecosystemcombobox.cpp
@@ -6,7 +6,7 @@
 
 using namespace swift::misc::network;
 
-namespace BlackGui
+namespace swift::gui
 {
     CEcosystemComboBox::CEcosystemComboBox(QWidget *parent) : QComboBox(parent)
     {
diff --git a/src/blackgui/ecosystemcombobox.h b/src/gui/ecosystemcombobox.h
similarity index 92%
rename from src/blackgui/ecosystemcombobox.h
rename to src/gui/ecosystemcombobox.h
index dbbdfe21a..6319cf56b 100644
--- a/src/blackgui/ecosystemcombobox.h
+++ b/src/gui/ecosystemcombobox.h
@@ -3,13 +3,13 @@
 
 //! \file
 
-#ifndef BLACKGUI_ECOSYSTEMCOMBOBOX_H
-#define BLACKGUI_ECOSYSTEMCOMBOBOX_H
+#ifndef SWIFT_GUI_ECOSYSTEMCOMBOBOX_H
+#define SWIFT_GUI_ECOSYSTEMCOMBOBOX_H
 
 #include "misc/network/ecosystemlist.h"
 #include <QComboBox>
 
-namespace BlackGui
+namespace swift::gui
 {
     //! Combo box widget for ecosystems
     class CEcosystemComboBox : public QComboBox
diff --git a/src/blackgui/editors/aircrafticaoform.cpp b/src/gui/editors/aircrafticaoform.cpp
similarity index 95%
rename from src/blackgui/editors/aircrafticaoform.cpp
rename to src/gui/editors/aircrafticaoform.cpp
index 9dff435f0..c164e419b 100644
--- a/src/blackgui/editors/aircrafticaoform.cpp
+++ b/src/gui/editors/aircrafticaoform.cpp
@@ -4,14 +4,14 @@
 #include "ui_aircrafticaoform.h"
 #include "aircrafticaoform.h"
 
-#include "blackgui/components/aircraftcombinedtypeselector.h"
-#include "blackgui/components/dbaircrafticaoselectorcomponent.h"
-#include "blackgui/dropsite.h"
-#include "blackgui/editors/aircrafticaoform.h"
-#include "blackgui/editors/validationindicator.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/guiutility.h"
-#include "blackgui/labelandicon.h"
+#include "gui/components/aircraftcombinedtypeselector.h"
+#include "gui/components/dbaircrafticaoselectorcomponent.h"
+#include "gui/dropsite.h"
+#include "gui/editors/aircrafticaoform.h"
+#include "gui/editors/validationindicator.h"
+#include "gui/guiapplication.h"
+#include "gui/guiutility.h"
+#include "gui/labelandicon.h"
 #include "core/webdataservices.h"
 #include "misc/aviation/aircrafticaocodelist.h"
 #include "misc/db/datastore.h"
@@ -27,9 +27,9 @@
 using namespace swift::misc;
 using namespace swift::misc::aviation;
 using namespace swift::misc::db;
-using namespace BlackGui::Components;
+using namespace swift::gui::components;
 
-namespace BlackGui::Editors
+namespace swift::gui::editors
 {
     CAircraftIcaoForm::CAircraftIcaoForm(QWidget *parent) : CForm(parent),
                                                             ui(new Ui::CAircraftIcaoForm)
diff --git a/src/blackgui/editors/aircrafticaoform.h b/src/gui/editors/aircrafticaoform.h
similarity index 88%
rename from src/blackgui/editors/aircrafticaoform.h
rename to src/gui/editors/aircrafticaoform.h
index a43ac3efc..965062d3c 100644
--- a/src/blackgui/editors/aircrafticaoform.h
+++ b/src/gui/editors/aircrafticaoform.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_EDITORS_AIRCRAFTICAOFORM_H
-#define BLACKGUI_EDITORS_AIRCRAFTICAOFORM_H
+#ifndef SWIFT_GUI_EDITORS_AIRCRAFTICAOFORM_H
+#define SWIFT_GUI_EDITORS_AIRCRAFTICAOFORM_H
 
-#include "blackgui/editors/form.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/editors/form.h"
+#include "gui/swiftguiexport.h"
 #include "misc/aviation/aircrafticaocode.h"
 #include "misc/statusmessagelist.h"
 #include "misc/variant.h"
@@ -19,12 +19,12 @@ namespace Ui
 {
     class CAircraftIcaoForm;
 }
-namespace BlackGui::Editors
+namespace swift::gui::editors
 {
     /*!
      * Aircraft ICAO form
      */
-    class BLACKGUI_EXPORT CAircraftIcaoForm : public CForm
+    class SWIFT_GUI_EXPORT CAircraftIcaoForm : public CForm
     {
         Q_OBJECT
 
diff --git a/src/blackgui/editors/aircrafticaoform.ui b/src/gui/editors/aircrafticaoform.ui
similarity index 93%
rename from src/blackgui/editors/aircrafticaoform.ui
rename to src/gui/editors/aircrafticaoform.ui
index c49838a19..abb7eb648 100644
--- a/src/blackgui/editors/aircrafticaoform.ui
+++ b/src/gui/editors/aircrafticaoform.ui
@@ -42,7 +42,7 @@
      </property>
      <layout class="QGridLayout" name="gl_AircraftIcao" columnstretch="0,1,0">
       <item row="0" column="2" rowspan="9">
-       <widget class="BlackGui::Editors::CValidationIndicator" name="val_Indicator">
+       <widget class="swift::gui::editors::CValidationIndicator" name="val_Indicator">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
           <horstretch>0</horstretch>
@@ -64,7 +64,7 @@
        </widget>
       </item>
       <item row="0" column="0">
-       <widget class="BlackGui::CLabelAndIcon" name="lai_Id">
+       <widget class="swift::gui::CLabelAndIcon" name="lai_Id">
         <property name="minimumSize">
          <size>
           <width>20</width>
@@ -224,7 +224,7 @@
           <number>0</number>
          </property>
          <item>
-          <widget class="BlackGui::Components::CDbAircraftIcaoSelectorComponent" name="aircraft_Selector">
+          <widget class="swift::gui::components::CDbAircraftIcaoSelectorComponent" name="aircraft_Selector">
            <property name="focusPolicy">
             <enum>Qt::StrongFocus</enum>
            </property>
@@ -293,7 +293,7 @@
        </widget>
       </item>
       <item row="5" column="1">
-       <widget class="BlackGui::Components::CAircraftCombinedTypeSelector" name="combined_TypeSelector">
+       <widget class="swift::gui::components::CAircraftCombinedTypeSelector" name="combined_TypeSelector">
         <property name="focusPolicy">
          <enum>Qt::StrongFocus</enum>
         </property>
@@ -443,7 +443,7 @@
        </widget>
       </item>
       <item row="8" column="0" colspan="2">
-       <widget class="BlackGui::CDropSite" name="drop_DropData">
+       <widget class="swift::gui::CDropSite" name="drop_DropData">
         <property name="text">
          <string>Drop data here</string>
         </property>
@@ -456,32 +456,32 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CDbAircraftIcaoSelectorComponent</class>
+   <class>swift::gui::components::CDbAircraftIcaoSelectorComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/dbaircrafticaoselectorcomponent.h</header>
+   <header>gui/components/dbaircrafticaoselectorcomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::CLabelAndIcon</class>
+   <class>swift::gui::CLabelAndIcon</class>
    <extends>QFrame</extends>
-   <header>blackgui/labelandicon.h</header>
+   <header>gui/labelandicon.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Editors::CValidationIndicator</class>
+   <class>swift::gui::editors::CValidationIndicator</class>
    <extends>QFrame</extends>
-   <header>blackgui/editors/validationindicator.h</header>
+   <header>gui/editors/validationindicator.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::CDropSite</class>
+   <class>swift::gui::CDropSite</class>
    <extends>QLabel</extends>
-   <header>blackgui/dropsite.h</header>
+   <header>gui/dropsite.h</header>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CAircraftCombinedTypeSelector</class>
+   <class>swift::gui::components::CAircraftCombinedTypeSelector</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/aircraftcombinedtypeselector.h</header>
+   <header>gui/components/aircraftcombinedtypeselector.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/editors/aircraftmodelform.cpp b/src/gui/editors/aircraftmodelform.cpp
similarity index 99%
rename from src/blackgui/editors/aircraftmodelform.cpp
rename to src/gui/editors/aircraftmodelform.cpp
index 72281ed3e..488fad053 100644
--- a/src/blackgui/editors/aircraftmodelform.cpp
+++ b/src/gui/editors/aircraftmodelform.cpp
@@ -6,7 +6,7 @@
 
 using namespace swift::misc;
 
-namespace BlackGui::Editors
+namespace swift::gui::editors
 {
     CAircraftModelForm::CAircraftModelForm(QWidget *parent) : CForm(parent),
                                                               ui(new Ui::CAircraftModelForm)
diff --git a/src/blackgui/editors/aircraftmodelform.h b/src/gui/editors/aircraftmodelform.h
similarity index 74%
rename from src/blackgui/editors/aircraftmodelform.h
rename to src/gui/editors/aircraftmodelform.h
index b399660f4..03aca11b5 100644
--- a/src/blackgui/editors/aircraftmodelform.h
+++ b/src/gui/editors/aircraftmodelform.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_EDITORS_AIRCRAFTMODELFORM_H
-#define BLACKGUI_EDITORS_AIRCRAFTMODELFORM_H
+#ifndef SWIFT_GUI_EDITORS_AIRCRAFTMODELFORM_H
+#define SWIFT_GUI_EDITORS_AIRCRAFTMODELFORM_H
 
-#include "blackgui/editors/form.h"
+#include "gui/editors/form.h"
 #include "misc/aviation/livery.h"
 #include "misc/aviation/aircrafticaocode.h"
 #include "misc/simulation/distributor.h"
@@ -15,7 +15,7 @@ namespace Ui
 {
     class CAircraftModelForm;
 }
-namespace BlackGui::Editors
+namespace swift::gui::editors
 {
     /*!
      * Combined form of Livery, ICAOs, distributor
@@ -34,22 +34,22 @@ namespace BlackGui::Editors
         //! Allow to drop data
         void allowDrop(bool allowDrop);
 
-        //! \copydoc BlackGui::Editors::CForm::setReadOnly
+        //! \copydoc swift::gui::editors::CForm::setReadOnly
         virtual void setReadOnly(bool readOnly) override;
 
-        //! \copydoc BlackGui::Editors::CForm::setSelectOnly
+        //! \copydoc swift::gui::editors::CForm::setSelectOnly
         virtual void setSelectOnly() override;
 
-        //! \copydoc BlackGui::Editors::CForm::validate
+        //! \copydoc swift::gui::editors::CForm::validate
         virtual swift::misc::CStatusMessageList validate(bool withNestedForms = true) const override;
 
-        //! \copydoc BlackGui::Editors::CForm::validate
+        //! \copydoc swift::gui::editors::CForm::validate
         virtual swift::misc::CStatusMessageList validateLivery(bool withNestedForms = true) const;
 
-        //! \copydoc BlackGui::Editors::CForm::validate
+        //! \copydoc swift::gui::editors::CForm::validate
         virtual swift::misc::CStatusMessageList validateAircraftIcao(bool withNestedForms = true) const;
 
-        //! \copydoc BlackGui::Editors::CForm::validate
+        //! \copydoc swift::gui::editors::CForm::validate
         virtual swift::misc::CStatusMessageList validateDistributor(bool withNestedForms = true) const;
 
         //! Livery
@@ -73,13 +73,13 @@ namespace BlackGui::Editors
         //! Clear entire form
         void clear();
 
-        //! \copydoc BlackGui::Editors::CLiveryForm::clear
+        //! \copydoc swift::gui::editors::CLiveryForm::clear
         void clearLivery();
 
-        //! \copydoc BlackGui::Editors::CAircraftIcaoForm::clear
+        //! \copydoc swift::gui::editors::CAircraftIcaoForm::clear
         void clearAircraftIcao();
 
-        //! \copydoc BlackGui::Editors::CDistributorForm::clear
+        //! \copydoc swift::gui::editors::CDistributorForm::clear
         void clearDistributor();
 
     private:
diff --git a/src/blackgui/editors/aircraftmodelform.ui b/src/gui/editors/aircraftmodelform.ui
similarity index 86%
rename from src/blackgui/editors/aircraftmodelform.ui
rename to src/gui/editors/aircraftmodelform.ui
index e81195af1..78225fa17 100644
--- a/src/blackgui/editors/aircraftmodelform.ui
+++ b/src/gui/editors/aircraftmodelform.ui
@@ -42,7 +42,7 @@
        <number>0</number>
       </property>
       <item>
-       <widget class="BlackGui::Editors::CDistributorForm" name="editor_Distributor">
+       <widget class="swift::gui::editors::CDistributorForm" name="editor_Distributor">
         <property name="minimumSize">
          <size>
           <width>100</width>
@@ -55,7 +55,7 @@
        </widget>
       </item>
       <item>
-       <widget class="BlackGui::Editors::CAircraftIcaoForm" name="editor_AircraftIcao">
+       <widget class="swift::gui::editors::CAircraftIcaoForm" name="editor_AircraftIcao">
         <property name="minimumSize">
          <size>
           <width>0</width>
@@ -96,7 +96,7 @@
        <number>0</number>
       </property>
       <item>
-       <widget class="BlackGui::Editors::CLiveryForm" name="editor_Livery">
+       <widget class="swift::gui::editors::CLiveryForm" name="editor_Livery">
         <property name="minimumSize">
          <size>
           <width>0</width>
@@ -128,21 +128,21 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Editors::CAircraftIcaoForm</class>
+   <class>swift::gui::editors::CAircraftIcaoForm</class>
    <extends>QFrame</extends>
-   <header>blackgui/editors/aircrafticaoform.h</header>
+   <header>gui/editors/aircrafticaoform.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Editors::CLiveryForm</class>
+   <class>swift::gui::editors::CLiveryForm</class>
    <extends>QFrame</extends>
-   <header>blackgui/editors/liveryform.h</header>
+   <header>gui/editors/liveryform.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Editors::CDistributorForm</class>
+   <class>swift::gui::editors::CDistributorForm</class>
    <extends>QFrame</extends>
-   <header>blackgui/editors/distributorform.h</header>
+   <header>gui/editors/distributorform.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/editors/aircraftpartsform.cpp b/src/gui/editors/aircraftpartsform.cpp
similarity index 99%
rename from src/blackgui/editors/aircraftpartsform.cpp
rename to src/gui/editors/aircraftpartsform.cpp
index 9c011a0a3..68fd082c0 100644
--- a/src/blackgui/editors/aircraftpartsform.cpp
+++ b/src/gui/editors/aircraftpartsform.cpp
@@ -3,7 +3,7 @@
 
 #include "aircraftpartsform.h"
 #include "ui_aircraftpartsform.h"
-#include "blackgui/guiutility.h"
+#include "gui/guiutility.h"
 #include "misc/aviation/aircraftenginelist.h"
 #include "misc/aviation/aircraftlights.h"
 #include "misc/logmessage.h"
@@ -16,7 +16,7 @@
 using namespace swift::misc;
 using namespace swift::misc::aviation;
 
-namespace BlackGui::Editors
+namespace swift::gui::editors
 {
     CAircraftPartsForm::CAircraftPartsForm(QWidget *parent) : CForm(parent),
                                                               ui(new Ui::CAircraftPartsForm)
diff --git a/src/blackgui/editors/aircraftpartsform.h b/src/gui/editors/aircraftpartsform.h
similarity index 88%
rename from src/blackgui/editors/aircraftpartsform.h
rename to src/gui/editors/aircraftpartsform.h
index a7c226dba..af56701cc 100644
--- a/src/blackgui/editors/aircraftpartsform.h
+++ b/src/gui/editors/aircraftpartsform.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_EDITORS_AIRCRAFTPARTSFORM_H
-#define BLACKGUI_EDITORS_AIRCRAFTPARTSFORM_H
+#ifndef SWIFT_GUI_EDITORS_AIRCRAFTPARTSFORM_H
+#define SWIFT_GUI_EDITORS_AIRCRAFTPARTSFORM_H
 
-#include "blackgui/editors/form.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/editors/form.h"
+#include "gui/swiftguiexport.h"
 #include "misc/aviation/aircraftparts.h"
 #include "misc/statusmessagelist.h"
 
@@ -17,12 +17,12 @@ namespace Ui
 {
     class CAircraftPartsForm;
 }
-namespace BlackGui::Editors
+namespace swift::gui::editors
 {
     /*!
      * Edit and set aircraft parts
      */
-    class BLACKGUI_EXPORT CAircraftPartsForm : public CForm
+    class SWIFT_GUI_EXPORT CAircraftPartsForm : public CForm
     {
         Q_OBJECT
 
diff --git a/src/blackgui/editors/aircraftpartsform.ui b/src/gui/editors/aircraftpartsform.ui
similarity index 100%
rename from src/blackgui/editors/aircraftpartsform.ui
rename to src/gui/editors/aircraftpartsform.ui
diff --git a/src/blackgui/editors/airlineicaoform.cpp b/src/gui/editors/airlineicaoform.cpp
similarity index 93%
rename from src/blackgui/editors/airlineicaoform.cpp
rename to src/gui/editors/airlineicaoform.cpp
index 241bb96e1..f632aec69 100644
--- a/src/blackgui/editors/airlineicaoform.cpp
+++ b/src/gui/editors/airlineicaoform.cpp
@@ -1,15 +1,15 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/dbairlineicaoselectorcomponent.h"
-#include "blackgui/components/dbairlinenameselectorcomponent.h"
-#include "blackgui/components/dbcountryselectorcomponent.h"
-#include "blackgui/dropsite.h"
-#include "blackgui/editors/airlineicaoform.h"
-#include "blackgui/editors/validationindicator.h"
-#include "blackgui/guiutility.h"
-#include "blackgui/labelandicon.h"
-#include "blackgui/guiapplication.h"
+#include "gui/components/dbairlineicaoselectorcomponent.h"
+#include "gui/components/dbairlinenameselectorcomponent.h"
+#include "gui/components/dbcountryselectorcomponent.h"
+#include "gui/dropsite.h"
+#include "gui/editors/airlineicaoform.h"
+#include "gui/editors/validationindicator.h"
+#include "gui/guiutility.h"
+#include "gui/labelandicon.h"
+#include "gui/guiapplication.h"
 #include "core/webdataservices.h"
 #include "misc/aviation/airlineicaocodelist.h"
 #include "misc/mixin/mixincompare.h"
@@ -23,9 +23,9 @@
 
 using namespace swift::misc;
 using namespace swift::misc::aviation;
-using namespace BlackGui::Components;
+using namespace swift::gui::components;
 
-namespace BlackGui::Editors
+namespace swift::gui::editors
 {
     CAirlineIcaoForm::CAirlineIcaoForm(QWidget *parent) : CForm(parent),
                                                           ui(new Ui::CAirlineIcaoForm)
diff --git a/src/blackgui/editors/airlineicaoform.h b/src/gui/editors/airlineicaoform.h
similarity index 90%
rename from src/blackgui/editors/airlineicaoform.h
rename to src/gui/editors/airlineicaoform.h
index 19fdefec3..7ba1f9e77 100644
--- a/src/blackgui/editors/airlineicaoform.h
+++ b/src/gui/editors/airlineicaoform.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_EDITORS_AIRLINEICAOFORM_H
-#define BLACKGUI_EDITORS_AIRLINEICAOFORM_H
+#ifndef SWIFT_GUI_EDITORS_AIRLINEICAOFORM_H
+#define SWIFT_GUI_EDITORS_AIRLINEICAOFORM_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/editors/form.h"
+#include "gui/swiftguiexport.h"
+#include "gui/editors/form.h"
 #include "misc/aviation/airlineicaocode.h"
 #include "misc/digestsignal.h"
 #include "misc/statusmessagelist.h"
@@ -20,12 +20,12 @@ namespace Ui
 {
     class CAirlineIcaoForm;
 }
-namespace BlackGui::Editors
+namespace swift::gui::editors
 {
     /*!
      * Airline ICAO code form
      */
-    class BLACKGUI_EXPORT CAirlineIcaoForm : public CForm
+    class SWIFT_GUI_EXPORT CAirlineIcaoForm : public CForm
     {
         Q_OBJECT
 
diff --git a/src/blackgui/editors/airlineicaoform.ui b/src/gui/editors/airlineicaoform.ui
similarity index 87%
rename from src/blackgui/editors/airlineicaoform.ui
rename to src/gui/editors/airlineicaoform.ui
index af7c6f19a..77da5beb6 100644
--- a/src/blackgui/editors/airlineicaoform.ui
+++ b/src/gui/editors/airlineicaoform.ui
@@ -67,7 +67,7 @@
        </widget>
       </item>
       <item row="4" column="1">
-       <widget class="BlackGui::Components::CDbCountrySelectorComponent" name="country_Selector">
+       <widget class="swift::gui::components::CDbCountrySelectorComponent" name="country_Selector">
         <property name="focusPolicy">
          <enum>Qt::StrongFocus</enum>
         </property>
@@ -129,7 +129,7 @@
        </widget>
       </item>
       <item row="0" column="0">
-       <widget class="BlackGui::CLabelAndIcon" name="lai_Id">
+       <widget class="swift::gui::CLabelAndIcon" name="lai_Id">
         <property name="minimumSize">
          <size>
           <width>20</width>
@@ -160,7 +160,7 @@
           <number>0</number>
          </property>
          <item>
-          <widget class="BlackGui::Components::CDbAirlineIcaoSelectorComponent" name="selector_AirlineDesignator">
+          <widget class="swift::gui::components::CDbAirlineIcaoSelectorComponent" name="selector_AirlineDesignator">
            <property name="frameShape">
             <enum>QFrame::StyledPanel</enum>
            </property>
@@ -241,14 +241,14 @@
        </widget>
       </item>
       <item row="6" column="0" colspan="2">
-       <widget class="BlackGui::CDropSite" name="drop_DropData">
+       <widget class="swift::gui::CDropSite" name="drop_DropData">
         <property name="text">
          <string>Drop data here</string>
         </property>
        </widget>
       </item>
       <item row="0" column="2" rowspan="7">
-       <widget class="BlackGui::Editors::CValidationIndicator" name="val_Indicator">
+       <widget class="swift::gui::editors::CValidationIndicator" name="val_Indicator">
         <property name="minimumSize">
          <size>
           <width>16</width>
@@ -264,7 +264,7 @@
        </widget>
       </item>
       <item row="3" column="1">
-       <widget class="BlackGui::Components::CDbAirlineNameSelectorComponent" name="selector_AirlineName">
+       <widget class="swift::gui::components::CDbAirlineNameSelectorComponent" name="selector_AirlineName">
         <property name="focusPolicy">
          <enum>Qt::StrongFocus</enum>
         </property>
@@ -277,38 +277,38 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::CLabelAndIcon</class>
+   <class>swift::gui::CLabelAndIcon</class>
    <extends>QFrame</extends>
-   <header>blackgui/labelandicon.h</header>
+   <header>gui/labelandicon.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Editors::CValidationIndicator</class>
+   <class>swift::gui::editors::CValidationIndicator</class>
    <extends>QFrame</extends>
-   <header>blackgui/editors/validationindicator.h</header>
+   <header>gui/editors/validationindicator.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::CDropSite</class>
+   <class>swift::gui::CDropSite</class>
    <extends>QLabel</extends>
-   <header>blackgui/dropsite.h</header>
+   <header>gui/dropsite.h</header>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CDbAirlineIcaoSelectorComponent</class>
+   <class>swift::gui::components::CDbAirlineIcaoSelectorComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/dbairlineicaoselectorcomponent.h</header>
+   <header>gui/components/dbairlineicaoselectorcomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CDbAirlineNameSelectorComponent</class>
+   <class>swift::gui::components::CDbAirlineNameSelectorComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/dbairlinenameselectorcomponent.h</header>
+   <header>gui/components/dbairlinenameselectorcomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CDbCountrySelectorComponent</class>
+   <class>swift::gui::components::CDbCountrySelectorComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/dbcountryselectorcomponent.h</header>
+   <header>gui/components/dbcountryselectorcomponent.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/editors/cockpitcomform.cpp b/src/gui/editors/cockpitcomform.cpp
similarity index 99%
rename from src/blackgui/editors/cockpitcomform.cpp
rename to src/gui/editors/cockpitcomform.cpp
index 0243aea0e..cc39f86ad 100644
--- a/src/blackgui/editors/cockpitcomform.cpp
+++ b/src/gui/editors/cockpitcomform.cpp
@@ -3,7 +3,7 @@
 
 #include "cockpitcomform.h"
 #include "ui_cockpitcomform.h"
-#include "blackgui/guiapplication.h"
+#include "gui/guiapplication.h"
 #include "core/context/contextsimulator.h"
 #include "misc/math/mathutils.h"
 #include "misc/logmessage.h"
@@ -18,9 +18,9 @@ using namespace swift::misc::physical_quantities;
 using namespace swift::misc::math;
 using namespace swift::misc::simulation;
 using namespace swift::core::context;
-using namespace BlackGui::Components;
+using namespace swift::gui::components;
 
-namespace BlackGui::Editors
+namespace swift::gui::editors
 {
     CCockpitComForm::CCockpitComForm(QWidget *parent) : CForm(parent),
                                                         ui(new Ui::CCockpitComForm)
diff --git a/src/blackgui/editors/cockpitcomform.h b/src/gui/editors/cockpitcomform.h
similarity index 87%
rename from src/blackgui/editors/cockpitcomform.h
rename to src/gui/editors/cockpitcomform.h
index d84dfa822..06525f7f8 100644
--- a/src/blackgui/editors/cockpitcomform.h
+++ b/src/gui/editors/cockpitcomform.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_EDITORS_COCKPITCOMFORM_H
-#define BLACKGUI_EDITORS_COCKPITCOMFORM_H
+#ifndef SWIFT_GUI_EDITORS_COCKPITCOMFORM_H
+#define SWIFT_GUI_EDITORS_COCKPITCOMFORM_H
 
-#include "blackgui/editors/form.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/editors/form.h"
+#include "gui/swiftguiexport.h"
 #include "misc/simulation/simulatedaircraft.h"
 #include "misc/aviation/atcstationlist.h"
 #include <QFrame>
@@ -17,12 +17,12 @@ namespace Ui
 {
     class CCockpitComForm;
 }
-namespace BlackGui::Editors
+namespace swift::gui::editors
 {
     /*!
      * COM elements
      */
-    class BLACKGUI_EXPORT CCockpitComForm : public CForm
+    class SWIFT_GUI_EXPORT CCockpitComForm : public CForm
     {
         Q_OBJECT
 
@@ -59,10 +59,10 @@ namespace BlackGui::Editors
         //! @}
 
     signals:
-        //! \copydoc BlackGui::Components::CTransponderModeSelector::transponderModeChanged
+        //! \copydoc swift::gui::components::CTransponderModeSelector::transponderModeChanged
         void transponderModeChanged(swift::misc::aviation::CTransponder::TransponderMode newMode);
 
-        //! \copydoc BlackGui::Components::CTransponderModeSelector::transponderStateIdentEnded
+        //! \copydoc swift::gui::components::CTransponderModeSelector::transponderStateIdentEnded
         void transponderStateIdentEnded();
 
         //! Request to test SELCAL
diff --git a/src/blackgui/editors/cockpitcomform.ui b/src/gui/editors/cockpitcomform.ui
similarity index 91%
rename from src/blackgui/editors/cockpitcomform.ui
rename to src/gui/editors/cockpitcomform.ui
index 6f453011d..b4257a7da 100644
--- a/src/blackgui/editors/cockpitcomform.ui
+++ b/src/gui/editors/cockpitcomform.ui
@@ -74,7 +74,7 @@
        </widget>
       </item>
       <item alignment="Qt::AlignLeft">
-       <widget class="BlackGui::Components::CCockpitTransponderModeLedsComponent" name="comp_TransponderLeds"/>
+       <widget class="swift::gui::components::CCockpitTransponderModeLedsComponent" name="comp_TransponderLeds"/>
       </item>
      </layout>
     </widget>
@@ -133,10 +133,10 @@
        </widget>
       </item>
       <item>
-       <widget class="BlackGui::CLedWidget" name="led_ComPanelCom2T" native="true"/>
+       <widget class="swift::gui::CLedWidget" name="led_ComPanelCom2T" native="true"/>
       </item>
       <item>
-       <widget class="BlackGui::CLedWidget" name="led_ComPanelCom2R" native="true"/>
+       <widget class="swift::gui::CLedWidget" name="led_ComPanelCom2R" native="true"/>
       </item>
      </layout>
     </widget>
@@ -201,7 +201,7 @@
        <number>0</number>
       </property>
       <item>
-       <widget class="BlackGui::Components::CTransponderCodeSpinBox" name="sbp_ComPanelTransponder">
+       <widget class="swift::gui::components::CTransponderCodeSpinBox" name="sbp_ComPanelTransponder">
         <property name="minimumSize">
          <size>
           <width>0</width>
@@ -217,7 +217,7 @@
        </widget>
       </item>
       <item>
-       <widget class="BlackGui::Components::CTransponderModeSelector" name="cbp_ComPanelTransponderMode"/>
+       <widget class="swift::gui::components::CTransponderModeSelector" name="cbp_ComPanelTransponderMode"/>
       </item>
      </layout>
     </widget>
@@ -257,10 +257,10 @@
        </widget>
       </item>
       <item>
-       <widget class="BlackGui::CLedWidget" name="led_ComPanelCom1T" native="true"/>
+       <widget class="swift::gui::CLedWidget" name="led_ComPanelCom1T" native="true"/>
       </item>
       <item>
-       <widget class="BlackGui::CLedWidget" name="led_ComPanelCom1R" native="true"/>
+       <widget class="swift::gui::CLedWidget" name="led_ComPanelCom1R" native="true"/>
       </item>
      </layout>
     </widget>
@@ -382,7 +382,7 @@
     </widget>
    </item>
    <item row="3" column="2">
-    <widget class="BlackGui::Components::CSelcalCodeSelector" name="frp_ComPanelSelcalSelector">
+    <widget class="swift::gui::components::CSelcalCodeSelector" name="frp_ComPanelSelcalSelector">
      <property name="frameShape">
       <enum>QFrame::StyledPanel</enum>
      </property>
@@ -446,31 +446,31 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CSelcalCodeSelector</class>
+   <class>swift::gui::components::CSelcalCodeSelector</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/selcalcodeselector.h</header>
+   <header>gui/components/selcalcodeselector.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::CLedWidget</class>
+   <class>swift::gui::CLedWidget</class>
    <extends>QWidget</extends>
-   <header>blackgui/led.h</header>
+   <header>gui/led.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CTransponderModeSelector</class>
+   <class>swift::gui::components::CTransponderModeSelector</class>
    <extends>QComboBox</extends>
-   <header>blackgui/components/transpondermodeselector.h</header>
+   <header>gui/components/transpondermodeselector.h</header>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CTransponderCodeSpinBox</class>
+   <class>swift::gui::components::CTransponderCodeSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>blackgui/components/transpondercodespinbox.h</header>
+   <header>gui/components/transpondercodespinbox.h</header>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CCockpitTransponderModeLedsComponent</class>
+   <class>swift::gui::components::CCockpitTransponderModeLedsComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/cockpittranspondermodeledscomponent.h</header>
+   <header>gui/components/cockpittranspondermodeledscomponent.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/editors/coordinateform.cpp b/src/gui/editors/coordinateform.cpp
similarity index 99%
rename from src/blackgui/editors/coordinateform.cpp
rename to src/gui/editors/coordinateform.cpp
index f9895bdcb..b4e6bcfa7 100644
--- a/src/blackgui/editors/coordinateform.cpp
+++ b/src/gui/editors/coordinateform.cpp
@@ -5,19 +5,19 @@
 #include "core/context/contextownaircraft.h"
 #include "core/db/airportdatareader.h"
 #include "core/webdataservices.h"
-#include "blackgui/guiapplication.h"
+#include "gui/guiapplication.h"
 #include "misc/aviation/airport.h"
 #include "ui_coordinateform.h"
 
 #include <QIntValidator>
 
-using namespace BlackGui;
+using namespace swift::gui;
 using namespace swift::misc;
 using namespace swift::misc::geo;
 using namespace swift::misc::aviation;
 using namespace swift::misc::physical_quantities;
 
-namespace BlackGui::Editors
+namespace swift::gui::editors
 {
     CCoordinateForm::CCoordinateForm(QWidget *parent) : CForm(parent),
                                                         ui(new Ui::CCoordinateForm)
diff --git a/src/blackgui/editors/coordinateform.h b/src/gui/editors/coordinateform.h
similarity index 86%
rename from src/blackgui/editors/coordinateform.h
rename to src/gui/editors/coordinateform.h
index 2da4734aa..9ced6009e 100644
--- a/src/blackgui/editors/coordinateform.h
+++ b/src/gui/editors/coordinateform.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_EDITORS_COORDINATEFORM_H
-#define BLACKGUI_EDITORS_COORDINATEFORM_H
+#ifndef SWIFT_GUI_EDITORS_COORDINATEFORM_H
+#define SWIFT_GUI_EDITORS_COORDINATEFORM_H
 
-#include "blackgui/editors/form.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/editors/form.h"
+#include "gui/swiftguiexport.h"
 #include "misc/geo/coordinategeodetic.h"
 #include "misc/statusmessagelist.h"
 
@@ -15,12 +15,12 @@ namespace Ui
 {
     class CCoordinateForm;
 }
-namespace BlackGui::Editors
+namespace swift::gui::editors
 {
     /*!
      * Select / enter a geo position
      */
-    class BLACKGUI_EXPORT CCoordinateForm : public CForm
+    class SWIFT_GUI_EXPORT CCoordinateForm : public CForm
     {
         Q_OBJECT
 
diff --git a/src/blackgui/editors/coordinateform.ui b/src/gui/editors/coordinateform.ui
similarity index 97%
rename from src/blackgui/editors/coordinateform.ui
rename to src/gui/editors/coordinateform.ui
index a9cf68197..3ad765f67 100644
--- a/src/blackgui/editors/coordinateform.ui
+++ b/src/gui/editors/coordinateform.ui
@@ -15,14 +15,14 @@
   </property>
   <layout class="QGridLayout" name="gl_CoordinateSelector">
    <item row="1" column="2">
-    <widget class="BlackGui::CTickLabel" name="lblp_LatCheck">
+    <widget class="swift::gui::CTickLabel" name="lblp_LatCheck">
      <property name="text">
       <string/>
      </property>
     </widget>
    </item>
    <item row="4" column="2">
-    <widget class="BlackGui::CTickLabel" name="lblp_ElvCheck">
+    <widget class="swift::gui::CTickLabel" name="lblp_ElvCheck">
      <property name="minimumSize">
       <size>
        <width>20</width>
@@ -308,7 +308,7 @@
     </widget>
    </item>
    <item row="2" column="2">
-    <widget class="BlackGui::CTickLabel" name="lblp_LngCheck">
+    <widget class="swift::gui::CTickLabel" name="lblp_LngCheck">
      <property name="text">
       <string/>
      </property>
@@ -325,9 +325,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::CTickLabel</class>
+   <class>swift::gui::CTickLabel</class>
    <extends>QLabel</extends>
-   <header>blackgui/ticklabel.h</header>
+   <header>gui/ticklabel.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/blackgui/editors/distributorform.cpp b/src/gui/editors/distributorform.cpp
similarity index 94%
rename from src/blackgui/editors/distributorform.cpp
rename to src/gui/editors/distributorform.cpp
index 0911745d0..4ce151fe9 100644
--- a/src/blackgui/editors/distributorform.cpp
+++ b/src/gui/editors/distributorform.cpp
@@ -1,11 +1,11 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/dbdistributorselectorcomponent.h"
-#include "blackgui/editors/distributorform.h"
-#include "blackgui/editors/validationindicator.h"
-#include "blackgui/labelandicon.h"
-#include "blackgui/dropsite.h"
+#include "gui/components/dbdistributorselectorcomponent.h"
+#include "gui/editors/distributorform.h"
+#include "gui/editors/validationindicator.h"
+#include "gui/labelandicon.h"
+#include "gui/dropsite.h"
 #include "misc/mixin/mixincompare.h"
 #include "misc/icons.h"
 #include "misc/simulation/distributorlist.h"
@@ -17,9 +17,9 @@
 
 using namespace swift::misc;
 using namespace swift::misc::simulation;
-using namespace BlackGui::Components;
+using namespace swift::gui::components;
 
-namespace BlackGui::Editors
+namespace swift::gui::editors
 {
     CDistributorForm::CDistributorForm(QWidget *parent) : CForm(parent),
                                                           ui(new Ui::CDistributorForm)
diff --git a/src/blackgui/editors/distributorform.h b/src/gui/editors/distributorform.h
similarity index 87%
rename from src/blackgui/editors/distributorform.h
rename to src/gui/editors/distributorform.h
index 1fa249eab..f214f70e4 100644
--- a/src/blackgui/editors/distributorform.h
+++ b/src/gui/editors/distributorform.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_EDITORS_DISTRIBUTORFORM_H
-#define BLACKGUI_EDITORS_DISTRIBUTORFORM_H
+#ifndef SWIFT_GUI_EDITORS_DISTRIBUTORFORM_H
+#define SWIFT_GUI_EDITORS_DISTRIBUTORFORM_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/editors/form.h"
+#include "gui/swiftguiexport.h"
+#include "gui/editors/form.h"
 #include "misc/simulation/distributor.h"
 #include "misc/statusmessagelist.h"
 #include "misc/variant.h"
@@ -19,12 +19,12 @@ namespace Ui
 {
     class CDistributorForm;
 }
-namespace BlackGui::Editors
+namespace swift::gui::editors
 {
     /*!
      * Distributor form
      */
-    class BLACKGUI_EXPORT CDistributorForm : public CForm
+    class SWIFT_GUI_EXPORT CDistributorForm : public CForm
     {
         Q_OBJECT
 
diff --git a/src/blackgui/editors/distributorform.ui b/src/gui/editors/distributorform.ui
similarity index 86%
rename from src/blackgui/editors/distributorform.ui
rename to src/gui/editors/distributorform.ui
index 180500b56..6dadc9081 100644
--- a/src/blackgui/editors/distributorform.ui
+++ b/src/gui/editors/distributorform.ui
@@ -84,7 +84,7 @@
        </widget>
       </item>
       <item row="4" column="0" colspan="3">
-       <widget class="BlackGui::CDropSite" name="drop_DropData">
+       <widget class="swift::gui::CDropSite" name="drop_DropData">
         <property name="text">
          <string>Drop data here</string>
         </property>
@@ -98,7 +98,7 @@
        </widget>
       </item>
       <item row="0" column="3" rowspan="5">
-       <widget class="BlackGui::Editors::CValidationIndicator" name="val_Indicator">
+       <widget class="swift::gui::editors::CValidationIndicator" name="val_Indicator">
         <property name="minimumSize">
          <size>
           <width>16</width>
@@ -114,7 +114,7 @@
        </widget>
       </item>
       <item row="0" column="1" colspan="2">
-       <widget class="BlackGui::Components::CDbDistributorSelectorComponent" name="comp_DistributorSelector">
+       <widget class="swift::gui::components::CDbDistributorSelectorComponent" name="comp_DistributorSelector">
         <property name="minimumSize">
          <size>
           <width>0</width>
@@ -127,7 +127,7 @@
        </widget>
       </item>
       <item row="0" column="0">
-       <widget class="BlackGui::CLabelAndIcon" name="lai_Id">
+       <widget class="swift::gui::CLabelAndIcon" name="lai_Id">
         <property name="minimumSize">
          <size>
           <width>20</width>
@@ -149,26 +149,26 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::CLabelAndIcon</class>
+   <class>swift::gui::CLabelAndIcon</class>
    <extends>QFrame</extends>
-   <header>blackgui/labelandicon.h</header>
+   <header>gui/labelandicon.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Editors::CValidationIndicator</class>
+   <class>swift::gui::editors::CValidationIndicator</class>
    <extends>QFrame</extends>
-   <header>blackgui/editors/validationindicator.h</header>
+   <header>gui/editors/validationindicator.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::CDropSite</class>
+   <class>swift::gui::CDropSite</class>
    <extends>QLabel</extends>
-   <header>blackgui/dropsite.h</header>
+   <header>gui/dropsite.h</header>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CDbDistributorSelectorComponent</class>
+   <class>swift::gui::components::CDbDistributorSelectorComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/dbdistributorselectorcomponent.h</header>
+   <header>gui/components/dbdistributorselectorcomponent.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/editors/form.cpp b/src/gui/editors/form.cpp
similarity index 94%
rename from src/blackgui/editors/form.cpp
rename to src/gui/editors/form.cpp
index aa99a8709..30feda5ab 100644
--- a/src/blackgui/editors/form.cpp
+++ b/src/gui/editors/form.cpp
@@ -1,8 +1,8 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/editors/form.h"
-#include "blackgui/guiutility.h"
+#include "gui/editors/form.h"
+#include "gui/guiutility.h"
 #include <QApplication>
 #include <QClipboard>
 #include <QShortcut>
@@ -10,7 +10,7 @@
 using namespace swift::misc;
 using namespace swift::misc::network;
 
-namespace BlackGui::Editors
+namespace swift::gui::editors
 {
     CForm::CForm(QWidget *parent) : COverlayMessagesFrame(parent)
     {}
diff --git a/src/blackgui/editors/form.h b/src/gui/editors/form.h
similarity index 86%
rename from src/blackgui/editors/form.h
rename to src/gui/editors/form.h
index a785e17e0..35153bc32 100644
--- a/src/blackgui/editors/form.h
+++ b/src/gui/editors/form.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_EDITORS_FORM_H
-#define BLACKGUI_EDITORS_FORM_H
+#ifndef SWIFT_GUI_EDITORS_FORM_H
+#define SWIFT_GUI_EDITORS_FORM_H
 
-#include "blackgui/overlaymessagesframe.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/overlaymessagesframe.h"
+#include "gui/swiftguiexport.h"
 #include "core/data/authenticateduser.h"
 #include "misc/datacache.h"
 #include <QFrame>
@@ -19,10 +19,10 @@ namespace swift::misc::network
 {
     class CAuthenticatedUser;
 }
-namespace BlackGui::Editors
+namespace swift::gui::editors
 {
     //! Form base class
-    class BLACKGUI_EXPORT CForm : public COverlayMessagesFrame
+    class SWIFT_GUI_EXPORT CForm : public COverlayMessagesFrame
     {
         Q_OBJECT
 
@@ -58,14 +58,14 @@ namespace BlackGui::Editors
         //! Pasted from clipboard
         void pasted();
 
-        //! \copydoc BlackGui::CGuiUtility::forceStyleSheetUpdate
+        //! \copydoc swift::gui::CGuiUtility::forceStyleSheetUpdate
         void forceStyleSheetUpdate();
 
         bool m_readOnly = false; //!< read only
     };
 
     //! Form base class
-    class BLACKGUI_EXPORT CFormDbUser : public CForm
+    class SWIFT_GUI_EXPORT CFormDbUser : public CForm
     {
         Q_OBJECT
 
diff --git a/src/blackgui/editors/fsdsetupform.cpp b/src/gui/editors/fsdsetupform.cpp
similarity index 98%
rename from src/blackgui/editors/fsdsetupform.cpp
rename to src/gui/editors/fsdsetupform.cpp
index 1dfea9e5e..22dd68e6c 100644
--- a/src/blackgui/editors/fsdsetupform.cpp
+++ b/src/gui/editors/fsdsetupform.cpp
@@ -4,13 +4,13 @@
 #include "fsdsetupform.h"
 #include "ui_fsdsetupform.h"
 #include "misc/stringutils.h"
-#include "blackgui/guiutility.h"
+#include "gui/guiutility.h"
 #include <QCompleter>
 
 using namespace swift::misc;
 using namespace swift::misc::network;
 
-namespace BlackGui::Editors
+namespace swift::gui::editors
 {
     CFsdSetupForm::CFsdSetupForm(QWidget *parent) : CForm(parent),
                                                     ui(new Ui::CFsdSetupForm)
diff --git a/src/blackgui/editors/fsdsetupform.h b/src/gui/editors/fsdsetupform.h
similarity index 92%
rename from src/blackgui/editors/fsdsetupform.h
rename to src/gui/editors/fsdsetupform.h
index cba482ea4..1f6073b99 100644
--- a/src/blackgui/editors/fsdsetupform.h
+++ b/src/gui/editors/fsdsetupform.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_EDITORS_FSDSETUPCOMPONENT_H
-#define BLACKGUI_EDITORS_FSDSETUPCOMPONENT_H
+#ifndef SWIFT_GUI_EDITORS_FSDSETUPCOMPONENT_H
+#define SWIFT_GUI_EDITORS_FSDSETUPCOMPONENT_H
 
-#include "blackgui/editors/form.h"
+#include "gui/editors/form.h"
 #include <QFrame>
 #include <QScopedPointer>
 #include "misc/network/fsdsetup.h"
@@ -15,7 +15,7 @@ namespace Ui
 {
     class CFsdSetupForm;
 }
-namespace BlackGui::Editors
+namespace swift::gui::editors
 {
     /*!
      * Setup for FSD
diff --git a/src/blackgui/editors/fsdsetupform.ui b/src/gui/editors/fsdsetupform.ui
similarity index 100%
rename from src/blackgui/editors/fsdsetupform.ui
rename to src/gui/editors/fsdsetupform.ui
diff --git a/src/blackgui/editors/interpolationsetupform.cpp b/src/gui/editors/interpolationsetupform.cpp
similarity index 98%
rename from src/blackgui/editors/interpolationsetupform.cpp
rename to src/gui/editors/interpolationsetupform.cpp
index 83ff10f9d..c246d3808 100644
--- a/src/blackgui/editors/interpolationsetupform.cpp
+++ b/src/gui/editors/interpolationsetupform.cpp
@@ -3,13 +3,13 @@
 
 #include "interpolationsetupform.h"
 #include "ui_interpolationsetupform.h"
-#include "blackgui/guiutility.h"
+#include "gui/guiutility.h"
 
 using namespace swift::misc;
 using namespace swift::misc::physical_quantities;
 using namespace swift::misc::simulation;
 
-namespace BlackGui::Editors
+namespace swift::gui::editors
 {
     CInterpolationSetupForm::CInterpolationSetupForm(QWidget *parent) : CForm(parent),
                                                                         ui(new Ui::CInterpolationSetupForm)
diff --git a/src/blackgui/editors/interpolationsetupform.h b/src/gui/editors/interpolationsetupform.h
similarity index 92%
rename from src/blackgui/editors/interpolationsetupform.h
rename to src/gui/editors/interpolationsetupform.h
index c980a6b56..2dad6c3db 100644
--- a/src/blackgui/editors/interpolationsetupform.h
+++ b/src/gui/editors/interpolationsetupform.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_EDITORS_INTERPOLATIONSETUPFORM_H
-#define BLACKGUI_EDITORS_INTERPOLATIONSETUPFORM_H
+#ifndef SWIFT_GUI_EDITORS_INTERPOLATIONSETUPFORM_H
+#define SWIFT_GUI_EDITORS_INTERPOLATIONSETUPFORM_H
 
-#include "blackgui/editors/form.h"
+#include "gui/editors/form.h"
 #include "misc/simulation/interpolation/interpolationrenderingsetup.h"
 #include "misc/pq/angle.h"
 #include "misc/statusmessagelist.h"
@@ -18,7 +18,7 @@ namespace Ui
 {
     class CInterpolationSetupForm;
 }
-namespace BlackGui::Editors
+namespace swift::gui::editors
 {
     //! Setup of interpolation and rendering
     class CInterpolationSetupForm : public CForm
diff --git a/src/blackgui/editors/interpolationsetupform.ui b/src/gui/editors/interpolationsetupform.ui
similarity index 100%
rename from src/blackgui/editors/interpolationsetupform.ui
rename to src/gui/editors/interpolationsetupform.ui
diff --git a/src/blackgui/editors/liveryform.cpp b/src/gui/editors/liveryform.cpp
similarity index 95%
rename from src/blackgui/editors/liveryform.cpp
rename to src/gui/editors/liveryform.cpp
index e12831365..2adb01f6d 100644
--- a/src/blackgui/editors/liveryform.cpp
+++ b/src/gui/editors/liveryform.cpp
@@ -3,15 +3,15 @@
 
 #include "liveryform.h"
 #include "ui_liveryform.h"
-#include "blackgui/components/colorselector.h"
-#include "blackgui/components/dbliveryselectorcomponent.h"
-#include "blackgui/dropsite.h"
-#include "blackgui/editors/airlineicaoform.h"
-#include "blackgui/editors/liveryform.h"
-#include "blackgui/editors/validationindicator.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/guiutility.h"
-#include "blackgui/labelandicon.h"
+#include "gui/components/colorselector.h"
+#include "gui/components/dbliveryselectorcomponent.h"
+#include "gui/dropsite.h"
+#include "gui/editors/airlineicaoform.h"
+#include "gui/editors/liveryform.h"
+#include "gui/editors/validationindicator.h"
+#include "gui/guiapplication.h"
+#include "gui/guiutility.h"
+#include "gui/labelandicon.h"
 #include "core/webdataservices.h"
 #include "misc/aviation/liverylist.h"
 #include "misc/mixin/mixincompare.h"
@@ -23,10 +23,10 @@
 
 using namespace swift::misc;
 using namespace swift::misc::aviation;
-using namespace BlackGui;
-using namespace BlackGui::Components;
+using namespace swift::gui;
+using namespace swift::gui::components;
 
-namespace BlackGui::Editors
+namespace swift::gui::editors
 {
     CLiveryForm::CLiveryForm(QWidget *parent) : CForm(parent),
                                                 ui(new Ui::CLiveryForm)
diff --git a/src/blackgui/editors/liveryform.h b/src/gui/editors/liveryform.h
similarity index 85%
rename from src/blackgui/editors/liveryform.h
rename to src/gui/editors/liveryform.h
index 9be03454f..1ac160d2b 100644
--- a/src/blackgui/editors/liveryform.h
+++ b/src/gui/editors/liveryform.h
@@ -3,12 +3,12 @@
 
 //! \file
 
-#ifndef BLACKGUI_EDITORS_LIVERYFORM_H
-#define BLACKGUI_EDITORS_LIVERYFORM_H
+#ifndef SWIFT_GUI_EDITORS_LIVERYFORM_H
+#define SWIFT_GUI_EDITORS_LIVERYFORM_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/editors/form.h"
-#include "blackgui/components/dbliverycolorsearchdialog.h"
+#include "gui/swiftguiexport.h"
+#include "gui/editors/form.h"
+#include "gui/components/dbliverycolorsearchdialog.h"
 #include "misc/aviation/airlineicaocode.h"
 #include "misc/aviation/livery.h"
 #include "misc/statusmessagelist.h"
@@ -23,12 +23,12 @@ namespace Ui
 {
     class CLiveryForm;
 }
-namespace BlackGui::Editors
+namespace swift::gui::editors
 {
     /*!
      * Livery form class
      */
-    class BLACKGUI_EXPORT CLiveryForm : public CForm
+    class SWIFT_GUI_EXPORT CLiveryForm : public CForm
     {
         Q_OBJECT
 
@@ -92,7 +92,7 @@ namespace BlackGui::Editors
 
         QScopedPointer<Ui::CLiveryForm> ui;
         swift::misc::aviation::CLivery m_originalLivery; //!< object allowing to override values
-        BlackGui::Components::CDbLiveryColorSearchDialog *m_colorSearch = nullptr; //!< search for color
+        swift::gui::components::CDbLiveryColorSearchDialog *m_colorSearch = nullptr; //!< search for color
     };
 } // ns
 
diff --git a/src/blackgui/editors/liveryform.ui b/src/gui/editors/liveryform.ui
similarity index 87%
rename from src/blackgui/editors/liveryform.ui
rename to src/gui/editors/liveryform.ui
index b97487338..979fc0061 100644
--- a/src/blackgui/editors/liveryform.ui
+++ b/src/gui/editors/liveryform.ui
@@ -100,7 +100,7 @@
        </widget>
       </item>
       <item row="5" column="0" colspan="5">
-       <widget class="BlackGui::CDropSite" name="drop_DropData">
+       <widget class="swift::gui::CDropSite" name="drop_DropData">
         <property name="text">
          <string>Drop data here</string>
         </property>
@@ -134,7 +134,7 @@
        </widget>
       </item>
       <item row="6" column="0" colspan="5">
-       <widget class="BlackGui::Editors::CAirlineIcaoForm" name="editor_AirlineIcao">
+       <widget class="swift::gui::editors::CAirlineIcaoForm" name="editor_AirlineIcao">
         <property name="minimumSize">
          <size>
           <width>0</width>
@@ -147,10 +147,10 @@
        </widget>
       </item>
       <item row="0" column="0">
-       <widget class="BlackGui::CLabelAndIcon" name="lai_Id"/>
+       <widget class="swift::gui::CLabelAndIcon" name="lai_Id"/>
       </item>
       <item row="0" column="5" rowspan="7">
-       <widget class="BlackGui::Editors::CValidationIndicator" name="val_Indicator">
+       <widget class="swift::gui::editors::CValidationIndicator" name="val_Indicator">
         <property name="minimumSize">
          <size>
           <width>16</width>
@@ -184,7 +184,7 @@
           <number>0</number>
          </property>
          <item alignment="Qt::AlignLeft">
-          <widget class="BlackGui::Components::CColorSelector" name="color_Fuselage">
+          <widget class="swift::gui::components::CColorSelector" name="color_Fuselage">
            <property name="minimumSize">
             <size>
              <width>75</width>
@@ -197,7 +197,7 @@
           </widget>
          </item>
          <item alignment="Qt::AlignLeft">
-          <widget class="BlackGui::Components::CColorSelector" name="color_Tail">
+          <widget class="swift::gui::components::CColorSelector" name="color_Tail">
            <property name="minimumSize">
             <size>
              <width>75</width>
@@ -226,7 +226,7 @@
        </widget>
       </item>
       <item row="1" column="1" colspan="3">
-       <widget class="BlackGui::Components::CDbLiverySelectorComponent" name="comp_LiverySelector">
+       <widget class="swift::gui::components::CDbLiverySelectorComponent" name="comp_LiverySelector">
         <property name="focusPolicy">
          <enum>Qt::StrongFocus</enum>
         </property>
@@ -250,38 +250,38 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CColorSelector</class>
+   <class>swift::gui::components::CColorSelector</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/colorselector.h</header>
+   <header>gui/components/colorselector.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::CLabelAndIcon</class>
+   <class>swift::gui::CLabelAndIcon</class>
    <extends>QFrame</extends>
-   <header>blackgui/labelandicon.h</header>
+   <header>gui/labelandicon.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Editors::CValidationIndicator</class>
+   <class>swift::gui::editors::CValidationIndicator</class>
    <extends>QFrame</extends>
-   <header>blackgui/editors/validationindicator.h</header>
+   <header>gui/editors/validationindicator.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::CDropSite</class>
+   <class>swift::gui::CDropSite</class>
    <extends>QLabel</extends>
-   <header>blackgui/dropsite.h</header>
+   <header>gui/dropsite.h</header>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Editors::CAirlineIcaoForm</class>
+   <class>swift::gui::editors::CAirlineIcaoForm</class>
    <extends>QFrame</extends>
-   <header>blackgui/editors/airlineicaoform.h</header>
+   <header>gui/editors/airlineicaoform.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CDbLiverySelectorComponent</class>
+   <class>swift::gui::components::CDbLiverySelectorComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/dbliveryselectorcomponent.h</header>
+   <header>gui/components/dbliveryselectorcomponent.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/editors/matchingform.cpp b/src/gui/editors/matchingform.cpp
similarity index 99%
rename from src/blackgui/editors/matchingform.cpp
rename to src/gui/editors/matchingform.cpp
index a43f2f919..bef329546 100644
--- a/src/blackgui/editors/matchingform.cpp
+++ b/src/gui/editors/matchingform.cpp
@@ -3,7 +3,7 @@
 
 #include "ui_matchingform.h"
 #include "matchingform.h"
-#include "blackgui/guiutility.h"
+#include "gui/guiutility.h"
 
 #include <QPushButton>
 #include <QFileDialog>
@@ -12,7 +12,7 @@ using namespace swift::misc;
 using namespace swift::misc::simulation;
 using namespace swift::core;
 
-namespace BlackGui::Editors
+namespace swift::gui::editors
 {
     CMatchingForm::CMatchingForm(QWidget *parent) : CForm(parent),
                                                     ui(new Ui::CMatchingForm)
diff --git a/src/blackgui/editors/matchingform.h b/src/gui/editors/matchingform.h
similarity index 93%
rename from src/blackgui/editors/matchingform.h
rename to src/gui/editors/matchingform.h
index 1bc309503..f788493ee 100644
--- a/src/blackgui/editors/matchingform.h
+++ b/src/gui/editors/matchingform.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_EDITORS_MATCHINGFORM_H
-#define BLACKGUI_EDITORS_MATCHINGFORM_H
+#ifndef SWIFT_GUI_EDITORS_MATCHINGFORM_H
+#define SWIFT_GUI_EDITORS_MATCHINGFORM_H
 
-#include "blackgui/editors/form.h"
+#include "gui/editors/form.h"
 #include "misc/simulation/aircraftmatchersetup.h"
 #include "misc/directories.h"
 
@@ -16,7 +16,7 @@ namespace Ui
 {
     class CMatchingForm;
 }
-namespace BlackGui::Editors
+namespace swift::gui::editors
 {
     //! Matching form
     class CMatchingForm : public CForm
diff --git a/src/blackgui/editors/matchingform.ui b/src/gui/editors/matchingform.ui
similarity index 100%
rename from src/blackgui/editors/matchingform.ui
rename to src/gui/editors/matchingform.ui
diff --git a/src/blackgui/editors/modelmappingform.cpp b/src/gui/editors/modelmappingform.cpp
similarity index 93%
rename from src/blackgui/editors/modelmappingform.cpp
rename to src/gui/editors/modelmappingform.cpp
index dd259f54f..55d918e8d 100644
--- a/src/blackgui/editors/modelmappingform.cpp
+++ b/src/gui/editors/modelmappingform.cpp
@@ -1,12 +1,12 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/modelmodeselector.h"
-#include "blackgui/components/simulatorselector.h"
-#include "blackgui/editors/modelmappingform.h"
-#include "blackgui/editors/validationindicator.h"
-#include "blackgui/labelandicon.h"
-#include "blackgui/uppercasevalidator.h"
+#include "gui/components/modelmodeselector.h"
+#include "gui/components/simulatorselector.h"
+#include "gui/editors/modelmappingform.h"
+#include "gui/editors/validationindicator.h"
+#include "gui/labelandicon.h"
+#include "gui/uppercasevalidator.h"
 #include "misc/icons.h"
 #include "misc/network/authenticateduser.h"
 #include "misc/stringutils.h"
@@ -19,9 +19,9 @@ using namespace swift::misc;
 using namespace swift::misc::network;
 using namespace swift::misc::physical_quantities;
 using namespace swift::misc::simulation;
-using namespace BlackGui::Components;
+using namespace swift::gui::components;
 
-namespace BlackGui::Editors
+namespace swift::gui::editors
 {
     CModelMappingForm::CModelMappingForm(QWidget *parent) : CFormDbUser(parent),
                                                             ui(new Ui::CModelMappingForm)
diff --git a/src/blackgui/editors/modelmappingform.h b/src/gui/editors/modelmappingform.h
similarity index 87%
rename from src/blackgui/editors/modelmappingform.h
rename to src/gui/editors/modelmappingform.h
index a434baeb6..2a68efba5 100644
--- a/src/blackgui/editors/modelmappingform.h
+++ b/src/gui/editors/modelmappingform.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_EDITORS_MODELMAPPINGFORM_H
-#define BLACKGUI_EDITORS_MODELMAPPINGFORM_H
+#ifndef SWIFT_GUI_EDITORS_MODELMAPPINGFORM_H
+#define SWIFT_GUI_EDITORS_MODELMAPPINGFORM_H
 
-#include "blackgui/editors/form.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/editors/form.h"
+#include "gui/swiftguiexport.h"
 #include "misc/simulation/aircraftmodel.h"
 #include "misc/statusmessagelist.h"
 
@@ -18,12 +18,12 @@ namespace Ui
 {
     class CModelMappingForm;
 }
-namespace BlackGui::Editors
+namespace swift::gui::editors
 {
     /*!
      * Model mapping form
      */
-    class BLACKGUI_EXPORT CModelMappingForm : public CFormDbUser
+    class SWIFT_GUI_EXPORT CModelMappingForm : public CFormDbUser
     {
         Q_OBJECT
 
diff --git a/src/blackgui/editors/modelmappingform.ui b/src/gui/editors/modelmappingform.ui
similarity index 90%
rename from src/blackgui/editors/modelmappingform.ui
rename to src/gui/editors/modelmappingform.ui
index 86899adbb..0fe57647b 100644
--- a/src/blackgui/editors/modelmappingform.ui
+++ b/src/gui/editors/modelmappingform.ui
@@ -81,7 +81,7 @@
        </widget>
       </item>
       <item row="0" column="8" rowspan="3">
-       <widget class="BlackGui::Editors::CValidationIndicator" name="val_Indicator">
+       <widget class="swift::gui::editors::CValidationIndicator" name="val_Indicator">
         <property name="minimumSize">
          <size>
           <width>10</width>
@@ -149,7 +149,7 @@
        </widget>
       </item>
       <item row="1" column="7">
-       <widget class="BlackGui::Components::CModelModeSelector" name="selector_ModelMode">
+       <widget class="swift::gui::components::CModelModeSelector" name="selector_ModelMode">
         <property name="minimumSize">
          <size>
           <width>50</width>
@@ -162,10 +162,10 @@
        </widget>
       </item>
       <item row="0" column="0">
-       <widget class="BlackGui::CLabelAndIcon" name="lai_Id"/>
+       <widget class="swift::gui::CLabelAndIcon" name="lai_Id"/>
       </item>
       <item row="0" column="7">
-       <widget class="BlackGui::Components::CSimulatorSelector" name="selector_Simulator">
+       <widget class="swift::gui::components::CSimulatorSelector" name="selector_Simulator">
         <property name="minimumSize">
          <size>
           <width>0</width>
@@ -228,27 +228,27 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CSimulatorSelector</class>
+   <class>swift::gui::components::CSimulatorSelector</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/simulatorselector.h</header>
+   <header>gui/components/simulatorselector.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CModelModeSelector</class>
+   <class>swift::gui::components::CModelModeSelector</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/modelmodeselector.h</header>
+   <header>gui/components/modelmodeselector.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::CLabelAndIcon</class>
+   <class>swift::gui::CLabelAndIcon</class>
    <extends>QFrame</extends>
-   <header>blackgui/labelandicon.h</header>
+   <header>gui/labelandicon.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Editors::CValidationIndicator</class>
+   <class>swift::gui::editors::CValidationIndicator</class>
    <extends>QFrame</extends>
-   <header>blackgui/editors/validationindicator.h</header>
+   <header>gui/editors/validationindicator.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/editors/modelmappingmodifyform.cpp b/src/gui/editors/modelmappingmodifyform.cpp
similarity index 95%
rename from src/blackgui/editors/modelmappingmodifyform.cpp
rename to src/gui/editors/modelmappingmodifyform.cpp
index e97440805..35e45d4cb 100644
--- a/src/blackgui/editors/modelmappingmodifyform.cpp
+++ b/src/gui/editors/modelmappingmodifyform.cpp
@@ -1,10 +1,10 @@
 // SPDX-FileCopyrightText: Copyright (C) 2016 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/modelmodeselector.h"
-#include "blackgui/components/simulatorselector.h"
-#include "blackgui/editors/modelmappingmodifyform.h"
-#include "blackgui/uppercasevalidator.h"
+#include "gui/components/modelmodeselector.h"
+#include "gui/components/simulatorselector.h"
+#include "gui/editors/modelmappingmodifyform.h"
+#include "gui/uppercasevalidator.h"
 #include "misc/simulation/aircraftmodel.h"
 #include "misc/simulation/simulatorinfo.h"
 #include "misc/network/authenticateduser.h"
@@ -19,9 +19,9 @@ using namespace swift::misc;
 using namespace swift::misc::network;
 using namespace swift::misc::physical_quantities;
 using namespace swift::misc::simulation;
-using namespace BlackGui::Components;
+using namespace swift::gui::components;
 
-namespace BlackGui::Editors
+namespace swift::gui::editors
 {
     CModelMappingModifyForm::CModelMappingModifyForm(QWidget *parent) : CFormDbUser(parent),
                                                                         ui(new Ui::CModelMappingModifyForm)
diff --git a/src/blackgui/editors/modelmappingmodifyform.h b/src/gui/editors/modelmappingmodifyform.h
similarity index 84%
rename from src/blackgui/editors/modelmappingmodifyform.h
rename to src/gui/editors/modelmappingmodifyform.h
index 5caffb2e8..228ac7ef4 100644
--- a/src/blackgui/editors/modelmappingmodifyform.h
+++ b/src/gui/editors/modelmappingmodifyform.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_EDITORS_MODELMAPPINGMODIFYFORM_H
-#define BLACKGUI_EDITORS_MODELMAPPINGMODIFYFORM_H
+#ifndef SWIFT_GUI_EDITORS_MODELMAPPINGMODIFYFORM_H
+#define SWIFT_GUI_EDITORS_MODELMAPPINGMODIFYFORM_H
 
-#include "blackgui/editors/form.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/editors/form.h"
+#include "gui/swiftguiexport.h"
 #include "misc/propertyindexvariantmap.h"
 #include <QFrame>
 #include <QObject>
@@ -23,12 +23,12 @@ namespace swift::misc::simulation
 {
     class CAircraftModel;
 }
-namespace BlackGui::Editors
+namespace swift::gui::editors
 {
     /*!
      * Allows to modify individual fields of the model form
      */
-    class BLACKGUI_EXPORT CModelMappingModifyForm : public CFormDbUser
+    class SWIFT_GUI_EXPORT CModelMappingModifyForm : public CFormDbUser
     {
         Q_OBJECT
 
diff --git a/src/blackgui/editors/modelmappingmodifyform.ui b/src/gui/editors/modelmappingmodifyform.ui
similarity index 91%
rename from src/blackgui/editors/modelmappingmodifyform.ui
rename to src/gui/editors/modelmappingmodifyform.ui
index 96e457521..2408515ee 100644
--- a/src/blackgui/editors/modelmappingmodifyform.ui
+++ b/src/gui/editors/modelmappingmodifyform.ui
@@ -96,7 +96,7 @@
     </widget>
    </item>
    <item row="5" column="3" alignment="Qt::AlignLeft">
-    <widget class="BlackGui::Components::CModelModeSelector" name="selector_ModeSelector">
+    <widget class="swift::gui::components::CModelModeSelector" name="selector_ModeSelector">
      <property name="minimumSize">
       <size>
        <width>100</width>
@@ -106,7 +106,7 @@
     </widget>
    </item>
    <item row="4" column="3" alignment="Qt::AlignLeft">
-    <widget class="BlackGui::Components::CSimulatorSelector" name="selector_SimulatorSelector">
+    <widget class="swift::gui::components::CSimulatorSelector" name="selector_SimulatorSelector">
      <property name="minimumSize">
       <size>
        <width>100</width>
@@ -174,15 +174,15 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CSimulatorSelector</class>
+   <class>swift::gui::components::CSimulatorSelector</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/simulatorselector.h</header>
+   <header>gui/components/simulatorselector.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CModelModeSelector</class>
+   <class>swift::gui::components::CModelModeSelector</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/modelmodeselector.h</header>
+   <header>gui/components/modelmodeselector.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/editors/ownmodelsetform.cpp b/src/gui/editors/ownmodelsetform.cpp
similarity index 95%
rename from src/blackgui/editors/ownmodelsetform.cpp
rename to src/gui/editors/ownmodelsetform.cpp
index f8afabd0d..bc8ae8f0c 100644
--- a/src/blackgui/editors/ownmodelsetform.cpp
+++ b/src/gui/editors/ownmodelsetform.cpp
@@ -2,11 +2,11 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "core/webdataservices.h"
-#include "blackgui/editors/ownmodelsetform.h"
-#include "blackgui/models/distributorlistmodel.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/guiutility.h"
-#include "blackgui/views/distributorview.h"
+#include "gui/editors/ownmodelsetform.h"
+#include "gui/models/distributorlistmodel.h"
+#include "gui/guiapplication.h"
+#include "gui/guiutility.h"
+#include "gui/views/distributorview.h"
 #include "misc/simulation/distributorlist.h"
 #include "ui_ownmodelsetform.h"
 
@@ -16,10 +16,10 @@
 
 using namespace swift::misc;
 using namespace swift::misc::simulation;
-using namespace BlackGui::Models;
-using namespace BlackGui::Components;
+using namespace swift::gui::models;
+using namespace swift::gui::components;
 
-namespace BlackGui::Editors
+namespace swift::gui::editors
 {
     COwnModelSetForm::COwnModelSetForm(QWidget *parent) : CForm(parent),
                                                           ui(new Ui::COwnModelSetForm)
diff --git a/src/blackgui/editors/ownmodelsetform.h b/src/gui/editors/ownmodelsetform.h
similarity index 95%
rename from src/blackgui/editors/ownmodelsetform.h
rename to src/gui/editors/ownmodelsetform.h
index 3d58cd41b..120adcc59 100644
--- a/src/blackgui/editors/ownmodelsetform.h
+++ b/src/gui/editors/ownmodelsetform.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_EDITORS_OWNMODELSETFORM_H
-#define BLACKGUI_EDITORS_OWNMODELSETFORM_H
+#ifndef SWIFT_GUI_EDITORS_OWNMODELSETFORM_H
+#define SWIFT_GUI_EDITORS_OWNMODELSETFORM_H
 
-#include "blackgui/editors/form.h"
+#include "gui/editors/form.h"
 #include "misc/simulation/settings/modelsettings.h"
 #include <QObject>
 #include <QScopedPointer>
@@ -15,7 +15,7 @@ namespace Ui
 {
     class COwnModelSetForm;
 }
-namespace BlackGui::Editors
+namespace swift::gui::editors
 {
     /*!
      * Selection for own model set
diff --git a/src/blackgui/editors/ownmodelsetform.ui b/src/gui/editors/ownmodelsetform.ui
similarity index 96%
rename from src/blackgui/editors/ownmodelsetform.ui
rename to src/gui/editors/ownmodelsetform.ui
index 75b34a7af..c075c493d 100644
--- a/src/blackgui/editors/ownmodelsetform.ui
+++ b/src/gui/editors/ownmodelsetform.ui
@@ -39,7 +39,7 @@
      </property>
      <layout class="QGridLayout" name="gl_Selection" columnstretch="0,1,1,1">
       <item row="0" column="1" colspan="3" alignment="Qt::AlignLeft">
-       <widget class="BlackGui::Components::CSimulatorSelector" name="comp_SimulatorSelector">
+       <widget class="swift::gui::components::CSimulatorSelector" name="comp_SimulatorSelector">
         <property name="minimumSize">
          <size>
           <width>100</width>
@@ -263,7 +263,7 @@
        </widget>
       </item>
       <item>
-       <widget class="BlackGui::Views::CDistributorView" name="tvp_Distributors">
+       <widget class="swift::gui::views::CDistributorView" name="tvp_Distributors">
         <property name="selectionBehavior">
          <enum>QAbstractItemView::SelectRows</enum>
         </property>
@@ -282,15 +282,15 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CSimulatorSelector</class>
+   <class>swift::gui::components::CSimulatorSelector</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/simulatorselector.h</header>
+   <header>gui/components/simulatorselector.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Views::CDistributorView</class>
+   <class>swift::gui::views::CDistributorView</class>
    <extends>QTableView</extends>
-   <header>blackgui/views/distributorview.h</header>
+   <header>gui/views/distributorview.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/blackgui/editors/pbhsform.cpp b/src/gui/editors/pbhsform.cpp
similarity index 99%
rename from src/blackgui/editors/pbhsform.cpp
rename to src/gui/editors/pbhsform.cpp
index 2dd2e2622..f0c5f21b5 100644
--- a/src/blackgui/editors/pbhsform.cpp
+++ b/src/gui/editors/pbhsform.cpp
@@ -10,7 +10,7 @@ using namespace swift::misc;
 using namespace swift::misc::aviation;
 using namespace swift::misc::physical_quantities;
 
-namespace BlackGui::Editors
+namespace swift::gui::editors
 {
     CPbhsForm::CPbhsForm(QWidget *parent) : CForm(parent),
                                             ui(new Ui::CPbhsForm)
diff --git a/src/blackgui/editors/pbhsform.h b/src/gui/editors/pbhsform.h
similarity index 95%
rename from src/blackgui/editors/pbhsform.h
rename to src/gui/editors/pbhsform.h
index ef5d382de..48d7f8ecf 100644
--- a/src/blackgui/editors/pbhsform.h
+++ b/src/gui/editors/pbhsform.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_EDITORS_PBHSFORM_H
-#define BLACKGUI_EDITORS_PBHSFORM_H
+#ifndef SWIFT_GUI_EDITORS_PBHSFORM_H
+#define SWIFT_GUI_EDITORS_PBHSFORM_H
 
-#include "blackgui/editors/form.h"
+#include "gui/editors/form.h"
 #include "misc/aviation/aircraftsituation.h"
 #include "misc/aviation/heading.h"
 #include "misc/pq/angle.h"
@@ -18,7 +18,7 @@ namespace Ui
 {
     class CPbhsForm;
 }
-namespace BlackGui::Editors
+namespace swift::gui::editors
 {
     //! Pitch, bank, heading and speed form
     class CPbhsForm : public CForm
diff --git a/src/blackgui/editors/pbhsform.ui b/src/gui/editors/pbhsform.ui
similarity index 100%
rename from src/blackgui/editors/pbhsform.ui
rename to src/gui/editors/pbhsform.ui
diff --git a/src/blackgui/editors/pilotform.cpp b/src/gui/editors/pilotform.cpp
similarity index 95%
rename from src/blackgui/editors/pilotform.cpp
rename to src/gui/editors/pilotform.cpp
index e300b3d98..427fecd1d 100644
--- a/src/blackgui/editors/pilotform.cpp
+++ b/src/gui/editors/pilotform.cpp
@@ -3,10 +3,10 @@
 
 #include "pilotform.h"
 #include "ui_pilotform.h"
-#include "blackgui/components/airportsmallcompleter.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/uppercasevalidator.h"
-#include "blackgui/guiutility.h"
+#include "gui/components/airportsmallcompleter.h"
+#include "gui/guiapplication.h"
+#include "gui/uppercasevalidator.h"
+#include "gui/guiutility.h"
 #include "misc/aviation/aircrafticaocode.h"
 #include "misc/network/user.h"
 #include "config/buildconfig.h"
@@ -17,9 +17,9 @@ using namespace swift::config;
 using namespace swift::misc;
 using namespace swift::misc::aviation;
 using namespace swift::misc::network;
-using namespace BlackGui::Components;
+using namespace swift::gui::components;
 
-namespace BlackGui::Editors
+namespace swift::gui::editors
 {
     CPilotForm::CPilotForm(QWidget *parent) : CForm(parent),
                                               ui(new Ui::CPilotForm)
diff --git a/src/blackgui/editors/pilotform.h b/src/gui/editors/pilotform.h
similarity index 86%
rename from src/blackgui/editors/pilotform.h
rename to src/gui/editors/pilotform.h
index 0e71de10a..907fb509d 100644
--- a/src/blackgui/editors/pilotform.h
+++ b/src/gui/editors/pilotform.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_EDITORS_PILOTFORM_H
-#define BLACKGUI_EDITORS_PILOTFORM_H
+#ifndef SWIFT_GUI_EDITORS_PILOTFORM_H
+#define SWIFT_GUI_EDITORS_PILOTFORM_H
 
-#include "blackgui/editors/form.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/editors/form.h"
+#include "gui/swiftguiexport.h"
 #include "misc/network/user.h"
 #include "misc/network/entityflags.h"
 #include <QFrame>
@@ -18,10 +18,10 @@ namespace Ui
 {
     class CPilotForm;
 }
-namespace BlackGui::Editors
+namespace swift::gui::editors
 {
     //! Pilot form (name, homebase)
-    class BLACKGUI_EXPORT CPilotForm : public CForm
+    class SWIFT_GUI_EXPORT CPilotForm : public CForm
     {
         Q_OBJECT
 
diff --git a/src/blackgui/editors/pilotform.ui b/src/gui/editors/pilotform.ui
similarity index 87%
rename from src/blackgui/editors/pilotform.ui
rename to src/gui/editors/pilotform.ui
index 150e45c76..499c69ce9 100644
--- a/src/blackgui/editors/pilotform.ui
+++ b/src/gui/editors/pilotform.ui
@@ -37,7 +37,7 @@
     <widget class="QLineEdit" name="le_Id"/>
    </item>
    <item row="0" column="2">
-    <widget class="BlackGui::CTickLabel" name="lblp_Id">
+    <widget class="swift::gui::CTickLabel" name="lblp_Id">
      <property name="text">
       <string/>
      </property>
@@ -54,7 +54,7 @@
     </widget>
    </item>
    <item row="0" column="7">
-    <widget class="BlackGui::CTickLabel" name="lblp_Password">
+    <widget class="swift::gui::CTickLabel" name="lblp_Password">
      <property name="text">
       <string/>
      </property>
@@ -68,7 +68,7 @@
     </widget>
    </item>
    <item row="1" column="2">
-    <widget class="BlackGui::CTickLabel" name="lblp_RealName">
+    <widget class="swift::gui::CTickLabel" name="lblp_RealName">
      <property name="text">
       <string/>
      </property>
@@ -102,14 +102,14 @@
     </widget>
    </item>
    <item row="1" column="7">
-    <widget class="BlackGui::CTickLabel" name="lblp_HomeAirport">
+    <widget class="swift::gui::CTickLabel" name="lblp_HomeAirport">
      <property name="text">
       <string/>
      </property>
     </widget>
    </item>
    <item row="1" column="5" colspan="2">
-    <widget class="BlackGui::Components::CAirportSmallCompleter" name="comp_HomeAirport">
+    <widget class="swift::gui::components::CAirportSmallCompleter" name="comp_HomeAirport">
      <property name="focusPolicy">
       <enum>Qt::StrongFocus</enum>
      </property>
@@ -133,14 +133,14 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::CTickLabel</class>
+   <class>swift::gui::CTickLabel</class>
    <extends>QLabel</extends>
-   <header>blackgui/ticklabel.h</header>
+   <header>gui/ticklabel.h</header>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CAirportSmallCompleter</class>
+   <class>swift::gui::components::CAirportSmallCompleter</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/airportsmallcompleter.h</header>
+   <header>gui/components/airportsmallcompleter.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/editors/relativeaircraftposition.cpp b/src/gui/editors/relativeaircraftposition.cpp
similarity index 98%
rename from src/blackgui/editors/relativeaircraftposition.cpp
rename to src/gui/editors/relativeaircraftposition.cpp
index 5aec8713e..fa95f418e 100644
--- a/src/blackgui/editors/relativeaircraftposition.cpp
+++ b/src/gui/editors/relativeaircraftposition.cpp
@@ -7,7 +7,7 @@
 using namespace swift::misc::geo;
 using namespace swift::misc::physical_quantities;
 
-namespace BlackGui::Editors
+namespace swift::gui::editors
 {
     CRelativeAircraftPosition::CRelativeAircraftPosition(QWidget *parent) : CForm(parent),
                                                                             ui(new Ui::CRelativeAircraftPosition)
diff --git a/src/blackgui/editors/relativeaircraftposition.h b/src/gui/editors/relativeaircraftposition.h
similarity index 90%
rename from src/blackgui/editors/relativeaircraftposition.h
rename to src/gui/editors/relativeaircraftposition.h
index 01540f973..0490316f9 100644
--- a/src/blackgui/editors/relativeaircraftposition.h
+++ b/src/gui/editors/relativeaircraftposition.h
@@ -3,20 +3,20 @@
 
 //! \file
 
-#ifndef BLACKGUI_EDITORS_RELATIVEAIRCRAFTPOSITION_H
-#define BLACKGUI_EDITORS_RELATIVEAIRCRAFTPOSITION_H
+#ifndef SWIFT_GUI_EDITORS_RELATIVEAIRCRAFTPOSITION_H
+#define SWIFT_GUI_EDITORS_RELATIVEAIRCRAFTPOSITION_H
 
 #include <QFrame>
 #include <QScopedPointer>
 
 #include "misc/geo/coordinategeodetic.h"
-#include "blackgui/editors/form.h"
+#include "gui/editors/form.h"
 
 namespace Ui
 {
     class CRelativeAircraftPosition;
 }
-namespace BlackGui::Editors
+namespace swift::gui::editors
 {
     //! Position relative to other aircraft
     class CRelativeAircraftPosition : public CForm
diff --git a/src/blackgui/editors/relativeaircraftposition.ui b/src/gui/editors/relativeaircraftposition.ui
similarity index 100%
rename from src/blackgui/editors/relativeaircraftposition.ui
rename to src/gui/editors/relativeaircraftposition.ui
diff --git a/src/blackgui/editors/serverform.cpp b/src/gui/editors/serverform.cpp
similarity index 98%
rename from src/blackgui/editors/serverform.cpp
rename to src/gui/editors/serverform.cpp
index 7cd3c80d8..9e9ae09ed 100644
--- a/src/blackgui/editors/serverform.cpp
+++ b/src/gui/editors/serverform.cpp
@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright (C) 2014 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/editors/serverform.h"
+#include "gui/editors/serverform.h"
 #include "misc/network/user.h"
 #include "ui_serverform.h"
 
@@ -14,7 +14,7 @@ using namespace swift::misc;
 using namespace swift::misc::audio;
 using namespace swift::misc::network;
 
-namespace BlackGui::Editors
+namespace swift::gui::editors
 {
     CServerForm::CServerForm(QWidget *parent) : CForm(parent),
                                                 ui(new Ui::CNetworkServerForm)
diff --git a/src/blackgui/editors/serverform.h b/src/gui/editors/serverform.h
similarity index 86%
rename from src/blackgui/editors/serverform.h
rename to src/gui/editors/serverform.h
index 013a4f78f..484b53364 100644
--- a/src/blackgui/editors/serverform.h
+++ b/src/gui/editors/serverform.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_NETWORKSERVERFORM_H
-#define BLACKGUI_COMPONENTS_NETWORKSERVERFORM_H
+#ifndef SWIFT_GUI_COMPONENTS_NETWORKSERVERFORM_H
+#define SWIFT_GUI_COMPONENTS_NETWORKSERVERFORM_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/editors/form.h"
+#include "gui/swiftguiexport.h"
+#include "gui/editors/form.h"
 #include "misc/network/server.h"
 #include "misc/statusmessagelist.h"
 
@@ -20,10 +20,10 @@ namespace Ui
 {
     class CNetworkServerForm;
 }
-namespace BlackGui::Editors
+namespace swift::gui::editors
 {
     //! Server form
-    class BLACKGUI_EXPORT CServerForm : public CForm
+    class SWIFT_GUI_EXPORT CServerForm : public CForm
     {
         Q_OBJECT
 
diff --git a/src/blackgui/editors/serverform.ui b/src/gui/editors/serverform.ui
similarity index 96%
rename from src/blackgui/editors/serverform.ui
rename to src/gui/editors/serverform.ui
index 62b902119..ff3bea057 100644
--- a/src/blackgui/editors/serverform.ui
+++ b/src/gui/editors/serverform.ui
@@ -131,7 +131,7 @@
               <number>0</number>
              </property>
              <item>
-              <widget class="BlackGui::CEcosystemComboBox" name="cbp_Ecosystem"/>
+              <widget class="swift::gui::CEcosystemComboBox" name="cbp_Ecosystem"/>
              </item>
              <item>
               <widget class="QComboBox" name="cb_ServerType"/>
@@ -301,7 +301,7 @@
         <number>3</number>
        </property>
        <item alignment="Qt::AlignTop">
-        <widget class="BlackGui::Editors::CFsdSetupForm" name="form_ServerFsd">
+        <widget class="swift::gui::editors::CFsdSetupForm" name="form_ServerFsd">
          <property name="minimumSize">
           <size>
            <width>0</width>
@@ -324,15 +324,15 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Editors::CFsdSetupForm</class>
+   <class>swift::gui::editors::CFsdSetupForm</class>
    <extends>QFrame</extends>
-   <header>blackgui/editors/fsdsetupform.h</header>
+   <header>gui/editors/fsdsetupform.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::CEcosystemComboBox</class>
+   <class>swift::gui::CEcosystemComboBox</class>
    <extends>QComboBox</extends>
-   <header>blackgui/ecosystemcombobox.h</header>
+   <header>gui/ecosystemcombobox.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/blackgui/editors/situationform.cpp b/src/gui/editors/situationform.cpp
similarity index 99%
rename from src/blackgui/editors/situationform.cpp
rename to src/gui/editors/situationform.cpp
index 15032116d..6c4bb0905 100644
--- a/src/blackgui/editors/situationform.cpp
+++ b/src/gui/editors/situationform.cpp
@@ -3,7 +3,7 @@
 
 #include "situationform.h"
 #include "ui_situationform.h"
-#include "blackgui/guiapplication.h"
+#include "gui/guiapplication.h"
 #include "core/context/contextownaircraft.h"
 #include "misc/pq/pressure.h"
 #include "misc/pq/angle.h"
@@ -16,7 +16,7 @@ using namespace swift::misc::aviation;
 using namespace swift::misc::geo;
 using namespace swift::misc::physical_quantities;
 
-namespace BlackGui::Editors
+namespace swift::gui::editors
 {
     CSituationForm::CSituationForm(QWidget *parent) : CForm(parent),
                                                       ui(new Ui::CSituationForm)
diff --git a/src/blackgui/editors/situationform.h b/src/gui/editors/situationform.h
similarity index 92%
rename from src/blackgui/editors/situationform.h
rename to src/gui/editors/situationform.h
index da156904d..e9e796e0e 100644
--- a/src/blackgui/editors/situationform.h
+++ b/src/gui/editors/situationform.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_EDITORS_SITUATIONSFORM_H
-#define BLACKGUI_EDITORS_SITUATIONSFORM_H
+#ifndef SWIFT_GUI_EDITORS_SITUATIONSFORM_H
+#define SWIFT_GUI_EDITORS_SITUATIONSFORM_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/editors/form.h"
+#include "gui/swiftguiexport.h"
+#include "gui/editors/form.h"
 #include "misc/aviation/aircraftsituation.h"
 #include "misc/statusmessagelist.h"
 #include <QScopedPointer>
@@ -16,12 +16,12 @@ namespace Ui
 {
     class CSituationForm;
 }
-namespace BlackGui::Editors
+namespace swift::gui::editors
 {
     /*!
      * Selector / entry
      */
-    class BLACKGUI_EXPORT CSituationForm : public CForm
+    class SWIFT_GUI_EXPORT CSituationForm : public CForm
     {
         Q_OBJECT
 
diff --git a/src/blackgui/editors/situationform.ui b/src/gui/editors/situationform.ui
similarity index 98%
rename from src/blackgui/editors/situationform.ui
rename to src/gui/editors/situationform.ui
index c072fab5a..eaed9ec97 100644
--- a/src/blackgui/editors/situationform.ui
+++ b/src/gui/editors/situationform.ui
@@ -228,7 +228,7 @@
        <number>4</number>
       </property>
       <item>
-       <widget class="BlackGui::Editors::CCoordinateForm" name="comp_Coordinate">
+       <widget class="swift::gui::editors::CCoordinateForm" name="comp_Coordinate">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
           <horstretch>0</horstretch>
@@ -356,9 +356,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Editors::CCoordinateForm</class>
+   <class>swift::gui::editors::CCoordinateForm</class>
    <extends>QFrame</extends>
-   <header>blackgui/editors/coordinateform.h</header>
+   <header>gui/editors/coordinateform.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/editors/validationindicator.cpp b/src/gui/editors/validationindicator.cpp
similarity index 96%
rename from src/blackgui/editors/validationindicator.cpp
rename to src/gui/editors/validationindicator.cpp
index bd3500472..6a0973f19 100644
--- a/src/blackgui/editors/validationindicator.cpp
+++ b/src/gui/editors/validationindicator.cpp
@@ -1,8 +1,8 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/editors/validationindicator.h"
-#include "blackgui/stylesheetutility.h"
+#include "gui/editors/validationindicator.h"
+#include "gui/stylesheetutility.h"
 #include "misc/icon.h"
 #include "misc/icons.h"
 #include "misc/statusmessage.h"
@@ -13,7 +13,7 @@
 
 using namespace swift::misc;
 
-namespace BlackGui::Editors
+namespace swift::gui::editors
 {
     CValidationIndicator::CValidationIndicator(QWidget *parent) : QFrame(parent),
                                                                   ui(new Ui::CValidationIndicator)
diff --git a/src/blackgui/editors/validationindicator.h b/src/gui/editors/validationindicator.h
similarity index 87%
rename from src/blackgui/editors/validationindicator.h
rename to src/gui/editors/validationindicator.h
index 82d8fea7e..898af9f42 100644
--- a/src/blackgui/editors/validationindicator.h
+++ b/src/gui/editors/validationindicator.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_EDITOR_VALIDATIONINDICATOR_H
-#define BLACKGUI_EDITOR_VALIDATIONINDICATOR_H
+#ifndef SWIFT_GUI_EDITOR_VALIDATIONINDICATOR_H
+#define SWIFT_GUI_EDITOR_VALIDATIONINDICATOR_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include "misc/statusmessagelist.h"
 
 #include <QFrame>
@@ -23,12 +23,12 @@ namespace Ui
     class CValidationIndicator;
 }
 
-namespace BlackGui::Editors
+namespace swift::gui::editors
 {
     /*!
      * Indication state of validation
      */
-    class BLACKGUI_EXPORT CValidationIndicator : public QFrame
+    class SWIFT_GUI_EXPORT CValidationIndicator : public QFrame
     {
         Q_OBJECT
 
diff --git a/src/blackgui/editors/validationindicator.ui b/src/gui/editors/validationindicator.ui
similarity index 100%
rename from src/blackgui/editors/validationindicator.ui
rename to src/gui/editors/validationindicator.ui
diff --git a/src/blackgui/elidedpushbutton.cpp b/src/gui/elidedpushbutton.cpp
similarity index 98%
rename from src/blackgui/elidedpushbutton.cpp
rename to src/gui/elidedpushbutton.cpp
index 1c2e1f58c..b0b884868 100644
--- a/src/blackgui/elidedpushbutton.cpp
+++ b/src/gui/elidedpushbutton.cpp
@@ -7,7 +7,7 @@
 #include <QTextLine>
 #include <QFontMetrics>
 
-namespace BlackGui
+namespace swift::gui
 {
     CElidedPushButton::CElidedPushButton(QWidget *parent) : QPushButton(parent)
     {}
diff --git a/src/blackgui/elidedpushbutton.h b/src/gui/elidedpushbutton.h
similarity index 91%
rename from src/blackgui/elidedpushbutton.h
rename to src/gui/elidedpushbutton.h
index dffe54471..f9d46884e 100644
--- a/src/blackgui/elidedpushbutton.h
+++ b/src/gui/elidedpushbutton.h
@@ -3,12 +3,12 @@
 
 //! \file
 
-#ifndef BLACKGUI_ELIDEDPUSHBUTTON_H
-#define BLACKGUI_ELIDEDPUSHBUTTON_H
+#ifndef SWIFT_GUI_ELIDEDPUSHBUTTON_H
+#define SWIFT_GUI_ELIDEDPUSHBUTTON_H
 
 #include <QPushButton>
 
-namespace BlackGui
+namespace swift::gui
 {
     /*!
      * Push button with elided text
diff --git a/src/blackgui/enablefordockwidgetinfoarea.cpp b/src/gui/enablefordockwidgetinfoarea.cpp
similarity index 92%
rename from src/blackgui/enablefordockwidgetinfoarea.cpp
rename to src/gui/enablefordockwidgetinfoarea.cpp
index 065655514..a0c8fbddd 100644
--- a/src/blackgui/enablefordockwidgetinfoarea.cpp
+++ b/src/gui/enablefordockwidgetinfoarea.cpp
@@ -1,11 +1,11 @@
 // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/enablefordockwidgetinfoarea.h"
-#include "blackgui/dockwidgetinfoarea.h"
-#include "blackgui/enableforframelesswindow.h"
-#include "blackgui/guiutility.h"
-#include "blackgui/infoarea.h"
+#include "gui/enablefordockwidgetinfoarea.h"
+#include "gui/dockwidgetinfoarea.h"
+#include "gui/enableforframelesswindow.h"
+#include "gui/guiutility.h"
+#include "gui/infoarea.h"
 
 #include <QDockWidget>
 #include <QMetaObject>
@@ -15,9 +15,9 @@
 #include <QPointer>
 
 using namespace swift::misc::aviation;
-using namespace BlackGui;
+using namespace swift::gui;
 
-namespace BlackGui
+namespace swift::gui
 {
     CEnableForDockWidgetInfoArea::CEnableForDockWidgetInfoArea(CDockWidgetInfoArea *parentInfoArea)
     {
diff --git a/src/blackgui/enablefordockwidgetinfoarea.h b/src/gui/enablefordockwidgetinfoarea.h
similarity index 90%
rename from src/blackgui/enablefordockwidgetinfoarea.h
rename to src/gui/enablefordockwidgetinfoarea.h
index 6378af058..60c2860c5 100644
--- a/src/blackgui/enablefordockwidgetinfoarea.h
+++ b/src/gui/enablefordockwidgetinfoarea.h
@@ -3,15 +3,15 @@
 
 //! \file
 
-#ifndef BLACKGUI_ENABLEFORDOCKWIDGETINFOAREA_H
-#define BLACKGUI_ENABLEFORDOCKWIDGETINFOAREA_H
+#ifndef SWIFT_GUI_ENABLEFORDOCKWIDGETINFOAREA_H
+#define SWIFT_GUI_ENABLEFORDOCKWIDGETINFOAREA_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include "misc/connectionguard.h"
 
 class QWidget;
 
-namespace BlackGui
+namespace swift::gui
 {
     class CDockWidgetInfoArea;
     class CEnableForFramelessWindow;
@@ -19,7 +19,7 @@ namespace BlackGui
 
     //! Helper class: If a component is residing in an dockable widget.
     //! This class provides access to its info area and dockable widget.
-    class BLACKGUI_EXPORT CEnableForDockWidgetInfoArea
+    class SWIFT_GUI_EXPORT CEnableForDockWidgetInfoArea
     {
     public:
         //! Corresponding dockable widget in info area
diff --git a/src/blackgui/enableforframelesswindow.cpp b/src/gui/enableforframelesswindow.cpp
similarity index 98%
rename from src/blackgui/enableforframelesswindow.cpp
rename to src/gui/enableforframelesswindow.cpp
index ddf69f48f..f73ee5d97 100644
--- a/src/blackgui/enableforframelesswindow.cpp
+++ b/src/gui/enableforframelesswindow.cpp
@@ -1,9 +1,9 @@
 // SPDX-FileCopyrightText: Copyright (C) 2014 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/enableforframelesswindow.h"
-#include "blackgui/guiutility.h"
-#include "blackgui/foreignwindows.h"
+#include "gui/enableforframelesswindow.h"
+#include "gui/guiutility.h"
+#include "gui/foreignwindows.h"
 #include "misc/icons.h"
 #include "misc/stringutils.h"
 #include "misc/worker.h"
@@ -28,7 +28,7 @@
 
 using namespace swift::misc;
 
-namespace BlackGui
+namespace swift::gui
 {
     CEnableForFramelessWindow::CEnableForFramelessWindow(CEnableForFramelessWindow::WindowMode mode, bool isMainApplicationWindow, const char *framelessPropertyName, QWidget *correspondingWidget) : m_windowMode(mode), m_isMainApplicationWindow(isMainApplicationWindow), m_widget(correspondingWidget), m_framelessPropertyName(framelessPropertyName)
     {
diff --git a/src/blackgui/enableforframelesswindow.h b/src/gui/enableforframelesswindow.h
similarity index 96%
rename from src/blackgui/enableforframelesswindow.h
rename to src/gui/enableforframelesswindow.h
index e784e589b..a2702859b 100644
--- a/src/blackgui/enableforframelesswindow.h
+++ b/src/gui/enableforframelesswindow.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_ENABLEFORFRAMLESSWINDOW_H
-#define BLACKGUI_ENABLEFORFRAMLESSWINDOW_H
+#ifndef SWIFT_GUI_ENABLEFORFRAMLESSWINDOW_H
+#define SWIFT_GUI_ENABLEFORFRAMLESSWINDOW_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 
 #include <QByteArray>
 #include <QPoint>
@@ -23,12 +23,12 @@ class QSizeGrip;
 class QStatusBar;
 class QWidget;
 
-namespace BlackGui
+namespace swift::gui
 {
     //! Main window which can be frameless
     //! \details QMainWindows cannot be promoted. Hence a derived class does not work properly here.
     //!          Furthermore frameless functionality is also required for CDockWidgets as well.
-    class BLACKGUI_EXPORT CEnableForFramelessWindow
+    class SWIFT_GUI_EXPORT CEnableForFramelessWindow
     {
     public:
         //! Window modes
diff --git a/src/blackgui/enableforviewbasedindicator.cpp b/src/gui/enableforviewbasedindicator.cpp
similarity index 78%
rename from src/blackgui/enableforviewbasedindicator.cpp
rename to src/gui/enableforviewbasedindicator.cpp
index a9a6845ae..7c4a2d4b4 100644
--- a/src/blackgui/enableforviewbasedindicator.cpp
+++ b/src/gui/enableforviewbasedindicator.cpp
@@ -1,16 +1,16 @@
 // SPDX-FileCopyrightText: Copyright (C) 2014 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/enableforviewbasedindicator.h"
-#include "blackgui/views/viewbase.h"
+#include "gui/enableforviewbasedindicator.h"
+#include "gui/views/viewbase.h"
 
 #include <QtGlobal>
 
 using namespace swift::misc;
-using namespace BlackGui;
-using namespace BlackGui::Views;
+using namespace swift::gui;
+using namespace swift::gui::views;
 
-namespace BlackGui
+namespace swift::gui
 {
     void CEnableForViewBasedIndicator::enableLoadIndicator(bool enable)
     {
@@ -38,13 +38,13 @@ namespace BlackGui
         if (m_viewWithIndicator) { m_viewWithIndicator->hideLoadIndicator(); }
     }
 
-    CEnableForViewBasedIndicator::CEnableForViewBasedIndicator(BlackGui::Views::CViewBaseNonTemplate *viewWithIndicator)
+    CEnableForViewBasedIndicator::CEnableForViewBasedIndicator(swift::gui::views::CViewBaseNonTemplate *viewWithIndicator)
         : m_viewWithIndicator(viewWithIndicator)
     {
         // void
     }
 
-    void CEnableForViewBasedIndicator::setViewWithIndicator(BlackGui::Views::CViewBaseNonTemplate *viewWithIndicator)
+    void CEnableForViewBasedIndicator::setViewWithIndicator(swift::gui::views::CViewBaseNonTemplate *viewWithIndicator)
     {
         this->m_viewWithIndicator = viewWithIndicator;
     }
diff --git a/src/blackgui/enableforviewbasedindicator.h b/src/gui/enableforviewbasedindicator.h
similarity index 63%
rename from src/blackgui/enableforviewbasedindicator.h
rename to src/gui/enableforviewbasedindicator.h
index c62e96427..2cd3e32a9 100644
--- a/src/blackgui/enableforviewbasedindicator.h
+++ b/src/gui/enableforviewbasedindicator.h
@@ -3,19 +3,19 @@
 
 //! \file
 
-#ifndef BLACKGUI_ENABLEFORVIEWBASEDINDICATOR_H
-#define BLACKGUI_ENABLEFORVIEWBASEDINDICATOR_H
+#ifndef SWIFT_GUI_ENABLEFORVIEWBASEDINDICATOR_H
+#define SWIFT_GUI_ENABLEFORVIEWBASEDINDICATOR_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     class CViewBaseNonTemplate;
 }
-namespace BlackGui
+namespace swift::gui
 {
     //! Hand over indication task to an embedded view
-    class BLACKGUI_EXPORT CEnableForViewBasedIndicator
+    class SWIFT_GUI_EXPORT CEnableForViewBasedIndicator
     {
     public:
         //! Enable loading indicator
@@ -32,13 +32,13 @@ namespace BlackGui
 
     protected:
         //! Constructor
-        CEnableForViewBasedIndicator(Views::CViewBaseNonTemplate *viewWithIndicator = nullptr);
+        CEnableForViewBasedIndicator(views::CViewBaseNonTemplate *viewWithIndicator = nullptr);
 
         //! Set the corresponding view
-        void setViewWithIndicator(BlackGui::Views::CViewBaseNonTemplate *viewWithIndicator);
+        void setViewWithIndicator(swift::gui::views::CViewBaseNonTemplate *viewWithIndicator);
 
     private:
-        Views::CViewBaseNonTemplate *m_viewWithIndicator = nullptr;
+        views::CViewBaseNonTemplate *m_viewWithIndicator = nullptr;
     };
 
 } // namespace
diff --git a/src/blackgui/eventfilter.cpp b/src/gui/eventfilter.cpp
similarity index 98%
rename from src/blackgui/eventfilter.cpp
rename to src/gui/eventfilter.cpp
index d0267e9f8..65db10c95 100644
--- a/src/blackgui/eventfilter.cpp
+++ b/src/gui/eventfilter.cpp
@@ -7,7 +7,7 @@
 #include <QKeyEvent>
 #include <QPlainTextEdit>
 
-namespace BlackGui
+namespace swift::gui
 {
     bool CUpperCaseEventFilter::eventFilter(QObject *object, QEvent *event)
     {
diff --git a/src/blackgui/eventfilter.h b/src/gui/eventfilter.h
similarity index 90%
rename from src/blackgui/eventfilter.h
rename to src/gui/eventfilter.h
index 267646e78..565bf2387 100644
--- a/src/blackgui/eventfilter.h
+++ b/src/gui/eventfilter.h
@@ -3,12 +3,12 @@
 
 //! \file
 
-#ifndef BLACKGUI_EVENTFILTER_H
-#define BLACKGUI_EVENTFILTER_H
+#ifndef SWIFT_GUI_EVENTFILTER_H
+#define SWIFT_GUI_EVENTFILTER_H
 
 #include <QObject>
 
-namespace BlackGui
+namespace swift::gui
 {
     //! Uppercase key press
     class CUpperCaseEventFilter : public QObject
diff --git a/src/blackgui/filters/aircrafticaofilterbar.cpp b/src/gui/filters/aircrafticaofilterbar.cpp
similarity index 89%
rename from src/blackgui/filters/aircrafticaofilterbar.cpp
rename to src/gui/filters/aircrafticaofilterbar.cpp
index 026da21c8..fece245d7 100644
--- a/src/blackgui/filters/aircrafticaofilterbar.cpp
+++ b/src/gui/filters/aircrafticaofilterbar.cpp
@@ -1,12 +1,12 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/aircraftcombinedtypeselector.h"
-#include "blackgui/filters/aircrafticaofilterbar.h"
-#include "blackgui/filters/filterbarbuttons.h"
-#include "blackgui/models/aircrafticaofilter.h"
-#include "blackgui/uppercasevalidator.h"
-#include "blackgui/guiapplication.h"
+#include "gui/components/aircraftcombinedtypeselector.h"
+#include "gui/filters/aircrafticaofilterbar.h"
+#include "gui/filters/filterbarbuttons.h"
+#include "gui/models/aircrafticaofilter.h"
+#include "gui/uppercasevalidator.h"
+#include "gui/guiapplication.h"
 #include "core/webdataservices.h"
 #include "misc/aviation/aircrafticaocode.h"
 #include "misc/aviation/aircrafticaocodelist.h"
@@ -17,11 +17,11 @@
 #include <QCompleter>
 
 using namespace swift::misc::aviation;
-using namespace BlackGui;
-using namespace BlackGui::Models;
+using namespace swift::gui;
+using namespace swift::gui::models;
 using namespace swift::core;
 
-namespace BlackGui::Filters
+namespace swift::gui::filters
 {
     CAircraftIcaoFilterBar::CAircraftIcaoFilterBar(QWidget *parent) : CFilterWidget(parent),
                                                                       ui(new Ui::CAircraftIcaoFilterBar)
@@ -52,7 +52,7 @@ namespace BlackGui::Filters
     CAircraftIcaoFilterBar::~CAircraftIcaoFilterBar()
     {}
 
-    std::unique_ptr<BlackGui::Models::IModelFilter<CAircraftIcaoCodeList>> CAircraftIcaoFilterBar::createModelFilter() const
+    std::unique_ptr<swift::gui::models::IModelFilter<CAircraftIcaoCodeList>> CAircraftIcaoFilterBar::createModelFilter() const
     {
         return std::make_unique<CAircraftIcaoFilter>(
             convertDbId(ui->le_Id->text()),
diff --git a/src/blackgui/filters/aircrafticaofilterbar.h b/src/gui/filters/aircrafticaofilterbar.h
similarity index 70%
rename from src/blackgui/filters/aircrafticaofilterbar.h
rename to src/gui/filters/aircrafticaofilterbar.h
index 18df5e57a..be0916b1a 100644
--- a/src/blackgui/filters/aircrafticaofilterbar.h
+++ b/src/gui/filters/aircrafticaofilterbar.h
@@ -3,12 +3,12 @@
 
 //! \file
 
-#ifndef BLACKGUI_FILTERS_AIRCRAFTICAOFILTERBAR_H
-#define BLACKGUI_FILTERS_AIRCRAFTICAOFILTERBAR_H
+#ifndef SWIFT_GUI_FILTERS_AIRCRAFTICAOFILTERBAR_H
+#define SWIFT_GUI_FILTERS_AIRCRAFTICAOFILTERBAR_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/filters/filterwidget.h"
-#include "blackgui/models/modelfilter.h"
+#include "gui/swiftguiexport.h"
+#include "gui/filters/filterwidget.h"
+#include "gui/models/modelfilter.h"
 
 #include <QObject>
 #include <QScopedPointer>
@@ -23,14 +23,14 @@ namespace swift::misc::aviation
     class CAircraftIcaoCode;
     class CAircraftIcaoCodeList;
 }
-namespace BlackGui::Filters
+namespace swift::gui::filters
 {
     /*!
      * Aircraft ICAO filter bar
      */
-    class BLACKGUI_EXPORT CAircraftIcaoFilterBar :
+    class SWIFT_GUI_EXPORT CAircraftIcaoFilterBar :
         public CFilterWidget,
-        public Models::IModelFilterProvider<swift::misc::aviation::CAircraftIcaoCodeList>
+        public models::IModelFilterProvider<swift::misc::aviation::CAircraftIcaoCodeList>
     {
         Q_OBJECT
 
@@ -41,8 +41,8 @@ namespace BlackGui::Filters
         //! Destructor
         virtual ~CAircraftIcaoFilterBar() override;
 
-        //! \copydoc Models::IModelFilterProvider::createModelFilter
-        std::unique_ptr<BlackGui::Models::IModelFilter<swift::misc::aviation::CAircraftIcaoCodeList>> createModelFilter() const override;
+        //! \copydoc models::IModelFilterProvider::createModelFilter
+        std::unique_ptr<swift::gui::models::IModelFilter<swift::misc::aviation::CAircraftIcaoCodeList>> createModelFilter() const override;
 
         //! Filter by ICAO object as default values
         void filter(const swift::misc::aviation::CAircraftIcaoCode &icao);
diff --git a/src/blackgui/filters/aircrafticaofilterbar.ui b/src/gui/filters/aircrafticaofilterbar.ui
similarity index 93%
rename from src/blackgui/filters/aircrafticaofilterbar.ui
rename to src/gui/filters/aircrafticaofilterbar.ui
index bac9ea7bc..a61cab47d 100644
--- a/src/blackgui/filters/aircrafticaofilterbar.ui
+++ b/src/gui/filters/aircrafticaofilterbar.ui
@@ -98,7 +98,7 @@
     </widget>
    </item>
    <item row="0" column="0">
-    <widget class="BlackGui::Filters::CFilterBarButtons" name="filter_Buttons">
+    <widget class="swift::gui::filters::CFilterBarButtons" name="filter_Buttons">
      <property name="frameShape">
       <enum>QFrame::StyledPanel</enum>
      </property>
@@ -173,7 +173,7 @@
     </widget>
    </item>
    <item row="1" column="4" colspan="3">
-    <widget class="BlackGui::Components::CAircraftCombinedTypeSelector" name="combinedType_Selector">
+    <widget class="swift::gui::components::CAircraftCombinedTypeSelector" name="combinedType_Selector">
      <property name="minimumSize">
       <size>
        <width>0</width>
@@ -222,15 +222,15 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Filters::CFilterBarButtons</class>
+   <class>swift::gui::filters::CFilterBarButtons</class>
    <extends>QFrame</extends>
-   <header>blackgui/filters/filterbarbuttons.h</header>
+   <header>gui/filters/filterbarbuttons.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CAircraftCombinedTypeSelector</class>
+   <class>swift::gui::components::CAircraftCombinedTypeSelector</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/aircraftcombinedtypeselector.h</header>
+   <header>gui/components/aircraftcombinedtypeselector.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/filters/aircraftmodelfilterbar.cpp b/src/gui/filters/aircraftmodelfilterbar.cpp
similarity index 94%
rename from src/blackgui/filters/aircraftmodelfilterbar.cpp
rename to src/gui/filters/aircraftmodelfilterbar.cpp
index dc6928207..b7fb39de8 100644
--- a/src/blackgui/filters/aircraftmodelfilterbar.cpp
+++ b/src/gui/filters/aircraftmodelfilterbar.cpp
@@ -1,12 +1,12 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/dbdistributorselectorcomponent.h"
-#include "blackgui/components/simulatorselector.h"
-#include "blackgui/filters/aircraftmodelfilterbar.h"
-#include "blackgui/filters/filterbarbuttons.h"
-#include "blackgui/models/aircraftmodelfilter.h"
-#include "blackgui/uppercasevalidator.h"
+#include "gui/components/dbdistributorselectorcomponent.h"
+#include "gui/components/simulatorselector.h"
+#include "gui/filters/aircraftmodelfilterbar.h"
+#include "gui/filters/filterbarbuttons.h"
+#include "gui/models/aircraftmodelfilter.h"
+#include "gui/uppercasevalidator.h"
 #include "misc/simulation/aircraftmodel.h"
 #include "misc/simulation/aircraftmodellist.h"
 #include "misc/db/datastore.h"
@@ -20,11 +20,11 @@
 
 using namespace swift::misc::simulation;
 using namespace swift::misc::db;
-using namespace BlackGui;
-using namespace BlackGui::Models;
-using namespace BlackGui::Components;
+using namespace swift::gui;
+using namespace swift::gui::models;
+using namespace swift::gui::components;
 
-namespace BlackGui::Filters
+namespace swift::gui::filters
 {
     CAircraftModelFilterBar::CAircraftModelFilterBar(QWidget *parent) : CFilterWidget(parent),
                                                                         ui(new Ui::CAircraftModelFilterBar)
diff --git a/src/blackgui/filters/aircraftmodelfilterbar.h b/src/gui/filters/aircraftmodelfilterbar.h
similarity index 78%
rename from src/blackgui/filters/aircraftmodelfilterbar.h
rename to src/gui/filters/aircraftmodelfilterbar.h
index 716a0f53c..8813fb565 100644
--- a/src/blackgui/filters/aircraftmodelfilterbar.h
+++ b/src/gui/filters/aircraftmodelfilterbar.h
@@ -3,12 +3,12 @@
 
 //! \file
 
-#ifndef BLACKGUI_FILTERS_FILTERBARAIRCRAFTMODEL_H
-#define BLACKGUI_FILTERS_FILTERBARAIRCRAFTMODEL_H
+#ifndef SWIFT_GUI_FILTERS_FILTERBARAIRCRAFTMODEL_H
+#define SWIFT_GUI_FILTERS_FILTERBARAIRCRAFTMODEL_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/filters/filterwidget.h"
-#include "blackgui/models/modelfilter.h"
+#include "gui/swiftguiexport.h"
+#include "gui/filters/filterwidget.h"
+#include "gui/models/modelfilter.h"
 #include "misc/simulation/distributor.h"
 #include "misc/simulation/simulatorinfo.h"
 
@@ -24,14 +24,14 @@ namespace swift::misc::simulation
 {
     class CAircraftModelList;
 }
-namespace BlackGui::Filters
+namespace swift::gui::filters
 {
     /*!
      * Filter bar for aircraft models
      */
-    class BLACKGUI_EXPORT CAircraftModelFilterBar :
+    class SWIFT_GUI_EXPORT CAircraftModelFilterBar :
         public CFilterWidget,
-        public Models::IModelFilterProvider<swift::misc::simulation::CAircraftModelList>
+        public models::IModelFilterProvider<swift::misc::simulation::CAircraftModelList>
     {
         Q_OBJECT
 
@@ -45,8 +45,8 @@ namespace BlackGui::Filters
         //! Show count
         void displayCount(bool show);
 
-        //! \copydoc Models::IModelFilterProvider::createModelFilter
-        virtual std::unique_ptr<Models::IModelFilter<swift::misc::simulation::CAircraftModelList>> createModelFilter() const override;
+        //! \copydoc models::IModelFilterProvider::createModelFilter
+        virtual std::unique_ptr<models::IModelFilter<swift::misc::simulation::CAircraftModelList>> createModelFilter() const override;
 
         //! \copydoc CFilterWidget::onRowCountChanged
         virtual void onRowCountChanged(int count, bool withFilter) override;
diff --git a/src/blackgui/filters/aircraftmodelfilterbar.ui b/src/gui/filters/aircraftmodelfilterbar.ui
similarity index 90%
rename from src/blackgui/filters/aircraftmodelfilterbar.ui
rename to src/gui/filters/aircraftmodelfilterbar.ui
index fb03c574c..0dac4f97f 100644
--- a/src/blackgui/filters/aircraftmodelfilterbar.ui
+++ b/src/gui/filters/aircraftmodelfilterbar.ui
@@ -167,7 +167,7 @@
     </widget>
    </item>
    <item row="0" column="0" colspan="4">
-    <widget class="BlackGui::Filters::CFilterBarButtons" name="filter_Buttons">
+    <widget class="swift::gui::filters::CFilterBarButtons" name="filter_Buttons">
      <property name="minimumSize">
       <size>
        <width>50</width>
@@ -191,7 +191,7 @@
     </widget>
    </item>
    <item row="2" column="10" colspan="2">
-    <widget class="BlackGui::Components::CDbDistributorSelectorComponent" name="comp_DistributorSelector">
+    <widget class="swift::gui::components::CDbDistributorSelectorComponent" name="comp_DistributorSelector">
      <property name="frameShape">
       <enum>QFrame::StyledPanel</enum>
      </property>
@@ -281,7 +281,7 @@
     </widget>
    </item>
    <item row="3" column="0" colspan="6" alignment="Qt::AlignLeft">
-    <widget class="BlackGui::Components::CSimulatorSelector" name="comp_SimulatorSelector">
+    <widget class="swift::gui::components::CSimulatorSelector" name="comp_SimulatorSelector">
      <property name="minimumSize">
       <size>
        <width>125</width>
@@ -298,7 +298,7 @@
     </widget>
    </item>
    <item row="3" column="7" colspan="2">
-    <widget class="BlackGui::Components::CAircraftCombinedTypeSelector" name="comp_CombinedType">
+    <widget class="swift::gui::components::CAircraftCombinedTypeSelector" name="comp_CombinedType">
      <property name="frameShape">
       <enum>QFrame::StyledPanel</enum>
      </property>
@@ -311,27 +311,27 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CSimulatorSelector</class>
+   <class>swift::gui::components::CSimulatorSelector</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/simulatorselector.h</header>
+   <header>gui/components/simulatorselector.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Filters::CFilterBarButtons</class>
+   <class>swift::gui::filters::CFilterBarButtons</class>
    <extends>QFrame</extends>
-   <header>blackgui/filters/filterbarbuttons.h</header>
+   <header>gui/filters/filterbarbuttons.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CDbDistributorSelectorComponent</class>
+   <class>swift::gui::components::CDbDistributorSelectorComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/dbdistributorselectorcomponent.h</header>
+   <header>gui/components/dbdistributorselectorcomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CAircraftCombinedTypeSelector</class>
+   <class>swift::gui::components::CAircraftCombinedTypeSelector</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/aircraftcombinedtypeselector.h</header>
+   <header>gui/components/aircraftcombinedtypeselector.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/filters/aircraftmodelfilterdialog.cpp b/src/gui/filters/aircraftmodelfilterdialog.cpp
similarity index 84%
rename from src/blackgui/filters/aircraftmodelfilterdialog.cpp
rename to src/gui/filters/aircraftmodelfilterdialog.cpp
index 77d844c4e..ec18e3af2 100644
--- a/src/blackgui/filters/aircraftmodelfilterdialog.cpp
+++ b/src/gui/filters/aircraftmodelfilterdialog.cpp
@@ -1,17 +1,17 @@
 // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/filters/aircraftmodelfilterbar.h"
-#include "blackgui/filters/aircraftmodelfilterdialog.h"
+#include "gui/filters/aircraftmodelfilterbar.h"
+#include "gui/filters/aircraftmodelfilterdialog.h"
 #include "misc/simulation/aircraftmodellist.h"
 #include "ui_aircraftmodelfilterdialog.h"
 
-using namespace BlackGui::Models;
-using namespace BlackGui::Filters;
+using namespace swift::gui::models;
+using namespace swift::gui::filters;
 using namespace swift::misc::simulation;
 using namespace swift::misc::network;
 
-namespace BlackGui::Filters
+namespace swift::gui::filters
 {
     CAircraftModelFilterDialog::CAircraftModelFilterDialog(QWidget *parent) : CFilterDialog(parent),
                                                                               ui(new Ui::CAircraftModelFilterDialog)
diff --git a/src/blackgui/filters/aircraftmodelfilterdialog.h b/src/gui/filters/aircraftmodelfilterdialog.h
similarity index 58%
rename from src/blackgui/filters/aircraftmodelfilterdialog.h
rename to src/gui/filters/aircraftmodelfilterdialog.h
index 5bea2bdbb..8d0fde6bb 100644
--- a/src/blackgui/filters/aircraftmodelfilterdialog.h
+++ b/src/gui/filters/aircraftmodelfilterdialog.h
@@ -3,12 +3,12 @@
 
 //! \file
 
-#ifndef BLACKGUI_FILTERS_AIRCRAFTMODELFILTERFORM_H
-#define BLACKGUI_FILTERS_AIRCRAFTMODELFILTERFORM_H
+#ifndef SWIFT_GUI_FILTERS_AIRCRAFTMODELFILTERFORM_H
+#define SWIFT_GUI_FILTERS_AIRCRAFTMODELFILTERFORM_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/filters/filterdialog.h"
-#include "blackgui/models/modelfilter.h"
+#include "gui/swiftguiexport.h"
+#include "gui/filters/filterdialog.h"
+#include "gui/models/modelfilter.h"
 
 #include <QObject>
 #include <QScopedPointer>
@@ -25,12 +25,12 @@ namespace Ui
     class CAircraftModelFilterDialog;
 }
 
-namespace BlackGui::Filters
+namespace swift::gui::filters
 {
     //! Form for a aircraft model filter
-    class BLACKGUI_EXPORT CAircraftModelFilterDialog :
+    class SWIFT_GUI_EXPORT CAircraftModelFilterDialog :
         public CFilterDialog,
-        public Models::IModelFilterProvider<swift::misc::simulation::CAircraftModelList>
+        public models::IModelFilterProvider<swift::misc::simulation::CAircraftModelList>
     {
         Q_OBJECT
 
@@ -41,8 +41,8 @@ namespace BlackGui::Filters
         //! Destructor
         virtual ~CAircraftModelFilterDialog() override;
 
-        //! \copydoc Models::IModelFilterProvider::createModelFilter
-        virtual std::unique_ptr<BlackGui::Models::IModelFilter<swift::misc::simulation::CAircraftModelList>> createModelFilter() const override;
+        //! \copydoc models::IModelFilterProvider::createModelFilter
+        virtual std::unique_ptr<swift::gui::models::IModelFilter<swift::misc::simulation::CAircraftModelList>> createModelFilter() const override;
 
     private:
         QScopedPointer<Ui::CAircraftModelFilterDialog> ui;
diff --git a/src/blackgui/filters/aircraftmodelfilterdialog.ui b/src/gui/filters/aircraftmodelfilterdialog.ui
similarity index 90%
rename from src/blackgui/filters/aircraftmodelfilterdialog.ui
rename to src/gui/filters/aircraftmodelfilterdialog.ui
index eab7d3ad5..b91577c7d 100644
--- a/src/blackgui/filters/aircraftmodelfilterdialog.ui
+++ b/src/gui/filters/aircraftmodelfilterdialog.ui
@@ -21,7 +21,7 @@
   </property>
   <layout class="QVBoxLayout" name="vl_AircraftModelFilterForm">
    <item>
-    <widget class="BlackGui::Filters::CAircraftModelFilterBar" name="filter_Models">
+    <widget class="swift::gui::filters::CAircraftModelFilterBar" name="filter_Models">
      <property name="frameShape">
       <enum>QFrame::StyledPanel</enum>
      </property>
@@ -44,9 +44,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Filters::CAircraftModelFilterBar</class>
+   <class>swift::gui::filters::CAircraftModelFilterBar</class>
    <extends>QFrame</extends>
-   <header>blackgui/filters/aircraftmodelfilterbar.h</header>
+   <header>gui/filters/aircraftmodelfilterbar.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/filters/airlineicaofilterbar.cpp b/src/gui/filters/airlineicaofilterbar.cpp
similarity index 89%
rename from src/blackgui/filters/airlineicaofilterbar.cpp
rename to src/gui/filters/airlineicaofilterbar.cpp
index a6fd7ce9b..a2ae8f7b5 100644
--- a/src/blackgui/filters/airlineicaofilterbar.cpp
+++ b/src/gui/filters/airlineicaofilterbar.cpp
@@ -1,11 +1,11 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/dbcountryselectorcomponent.h"
-#include "blackgui/filters/airlineicaofilterbar.h"
-#include "blackgui/filters/filterbarbuttons.h"
-#include "blackgui/models/airlineicaofilter.h"
-#include "blackgui/uppercasevalidator.h"
+#include "gui/components/dbcountryselectorcomponent.h"
+#include "gui/filters/airlineicaofilterbar.h"
+#include "gui/filters/filterbarbuttons.h"
+#include "gui/models/airlineicaofilter.h"
+#include "gui/uppercasevalidator.h"
 #include "misc/aviation/airlineicaocodelist.h"
 #include "misc/country.h"
 #include "ui_airlineicaofilterbar.h"
@@ -17,10 +17,10 @@
 
 using namespace swift::misc;
 using namespace swift::misc::aviation;
-using namespace BlackGui::Models;
-using namespace BlackGui::Components;
+using namespace swift::gui::models;
+using namespace swift::gui::components;
 
-namespace BlackGui::Filters
+namespace swift::gui::filters
 {
     CAirlineIcaoFilterBar::CAirlineIcaoFilterBar(QWidget *parent) : CFilterWidget(parent),
                                                                     ui(new Ui::CAirlineIcaoFilterBar)
diff --git a/src/blackgui/filters/airlineicaofilterbar.h b/src/gui/filters/airlineicaofilterbar.h
similarity index 70%
rename from src/blackgui/filters/airlineicaofilterbar.h
rename to src/gui/filters/airlineicaofilterbar.h
index 20d43b26a..43ad1cf36 100644
--- a/src/blackgui/filters/airlineicaofilterbar.h
+++ b/src/gui/filters/airlineicaofilterbar.h
@@ -3,12 +3,12 @@
 
 //! \file
 
-#ifndef BLACKGUI_FILTERS_AIRLINEICAOFILTERBAR_H
-#define BLACKGUI_FILTERS_AIRLINEICAOFILTERBAR_H
+#ifndef SWIFT_GUI_FILTERS_AIRLINEICAOFILTERBAR_H
+#define SWIFT_GUI_FILTERS_AIRLINEICAOFILTERBAR_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/filters/filterwidget.h"
-#include "blackgui/models/modelfilter.h"
+#include "gui/swiftguiexport.h"
+#include "gui/filters/filterwidget.h"
+#include "gui/models/modelfilter.h"
 #include "misc/aviation/airlineicaocode.h"
 
 #include <QObject>
@@ -27,14 +27,14 @@ namespace swift::misc
         class CAirlineIcaoCodeList;
     }
 }
-namespace BlackGui::Filters
+namespace swift::gui::filters
 {
     /*!
      * Airline ICAO filter bar
      */
-    class BLACKGUI_EXPORT CAirlineIcaoFilterBar :
+    class SWIFT_GUI_EXPORT CAirlineIcaoFilterBar :
         public CFilterWidget,
-        public Models::IModelFilterProvider<swift::misc::aviation::CAirlineIcaoCodeList>
+        public models::IModelFilterProvider<swift::misc::aviation::CAirlineIcaoCodeList>
     {
         Q_OBJECT
 
@@ -45,8 +45,8 @@ namespace BlackGui::Filters
         //! Destructor
         virtual ~CAirlineIcaoFilterBar() override;
 
-        //! \copydoc Models::IModelFilterProvider::createModelFilter
-        virtual std::unique_ptr<BlackGui::Models::IModelFilter<swift::misc::aviation::CAirlineIcaoCodeList>> createModelFilter() const override;
+        //! \copydoc models::IModelFilterProvider::createModelFilter
+        virtual std::unique_ptr<swift::gui::models::IModelFilter<swift::misc::aviation::CAirlineIcaoCodeList>> createModelFilter() const override;
 
         //! Filter default values by ICAO code
         void filter(const swift::misc::aviation::CAirlineIcaoCode &icao);
diff --git a/src/blackgui/filters/airlineicaofilterbar.ui b/src/gui/filters/airlineicaofilterbar.ui
similarity index 90%
rename from src/blackgui/filters/airlineicaofilterbar.ui
rename to src/gui/filters/airlineicaofilterbar.ui
index 7f0570e00..88e7ff799 100644
--- a/src/blackgui/filters/airlineicaofilterbar.ui
+++ b/src/gui/filters/airlineicaofilterbar.ui
@@ -123,10 +123,10 @@
     </widget>
    </item>
    <item row="0" column="1">
-    <widget class="BlackGui::Filters::CFilterBarButtons" name="filter_Buttons"/>
+    <widget class="swift::gui::filters::CFilterBarButtons" name="filter_Buttons"/>
    </item>
    <item row="0" column="9">
-    <widget class="BlackGui::Components::CDbCountrySelectorComponent" name="country_Selector">
+    <widget class="swift::gui::components::CDbCountrySelectorComponent" name="country_Selector">
      <property name="frameShape">
       <enum>QFrame::StyledPanel</enum>
      </property>
@@ -152,15 +152,15 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Filters::CFilterBarButtons</class>
+   <class>swift::gui::filters::CFilterBarButtons</class>
    <extends>QFrame</extends>
-   <header>blackgui/filters/filterbarbuttons.h</header>
+   <header>gui/filters/filterbarbuttons.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CDbCountrySelectorComponent</class>
+   <class>swift::gui::components::CDbCountrySelectorComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/dbcountryselectorcomponent.h</header>
+   <header>gui/components/dbcountryselectorcomponent.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/filters/countryfilterbar.cpp b/src/gui/filters/countryfilterbar.cpp
similarity index 78%
rename from src/blackgui/filters/countryfilterbar.cpp
rename to src/gui/filters/countryfilterbar.cpp
index c197e55db..94aaeb0b3 100644
--- a/src/blackgui/filters/countryfilterbar.cpp
+++ b/src/gui/filters/countryfilterbar.cpp
@@ -1,21 +1,21 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/filters/countryfilterbar.h"
-#include "blackgui/filters/filterbarbuttons.h"
-#include "blackgui/models/countryfilter.h"
-#include "blackgui/uppercasevalidator.h"
+#include "gui/filters/countryfilterbar.h"
+#include "gui/filters/filterbarbuttons.h"
+#include "gui/models/countryfilter.h"
+#include "gui/uppercasevalidator.h"
 #include "misc/countrylist.h"
 #include "ui_countryfilterbar.h"
 
 #include <QLineEdit>
 
-using namespace BlackGui;
-using namespace BlackGui::Models;
+using namespace swift::gui;
+using namespace swift::gui::models;
 using namespace swift::misc;
 using namespace swift::misc::network;
 
-namespace BlackGui::Filters
+namespace swift::gui::filters
 {
     CCountryFilterBar::CCountryFilterBar(QWidget *parent) : CFilterWidget(parent),
                                                             ui(new Ui::CCountryFilterBar)
@@ -35,7 +35,7 @@ namespace BlackGui::Filters
     CCountryFilterBar::~CCountryFilterBar()
     {}
 
-    std::unique_ptr<BlackGui::Models::IModelFilter<CCountryList>> CCountryFilterBar::createModelFilter() const
+    std::unique_ptr<swift::gui::models::IModelFilter<CCountryList>> CCountryFilterBar::createModelFilter() const
     {
         return std::make_unique<CCountryFilter>(
             ui->le_IsoCode->text(),
diff --git a/src/blackgui/filters/countryfilterbar.h b/src/gui/filters/countryfilterbar.h
similarity index 64%
rename from src/blackgui/filters/countryfilterbar.h
rename to src/gui/filters/countryfilterbar.h
index 2a1bbc5a3..566141352 100644
--- a/src/blackgui/filters/countryfilterbar.h
+++ b/src/gui/filters/countryfilterbar.h
@@ -3,12 +3,12 @@
 
 //! \file
 
-#ifndef BLACKGUI_FILTERS_COUNTRYFILTERBAR_H
-#define BLACKGUI_FILTERS_COUNTRYFILTERBAR_H
+#ifndef SWIFT_GUI_FILTERS_COUNTRYFILTERBAR_H
+#define SWIFT_GUI_FILTERS_COUNTRYFILTERBAR_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/filters/filterwidget.h"
-#include "blackgui/models/modelfilter.h"
+#include "gui/swiftguiexport.h"
+#include "gui/filters/filterwidget.h"
+#include "gui/models/modelfilter.h"
 
 #include <QObject>
 #include <QScopedPointer>
@@ -24,14 +24,14 @@ namespace Ui
 {
     class CCountryFilterBar;
 }
-namespace BlackGui::Filters
+namespace swift::gui::filters
 {
     /*!
      * Country filter bar
      */
-    class BLACKGUI_EXPORT CCountryFilterBar :
+    class SWIFT_GUI_EXPORT CCountryFilterBar :
         public CFilterWidget,
-        public Models::IModelFilterProvider<swift::misc::CCountryList>
+        public models::IModelFilterProvider<swift::misc::CCountryList>
     {
         Q_OBJECT
 
@@ -42,8 +42,8 @@ namespace BlackGui::Filters
         //! Destructor
         virtual ~CCountryFilterBar() override;
 
-        //! \copydoc Models::IModelFilterProvider::createModelFilter
-        virtual std::unique_ptr<BlackGui::Models::IModelFilter<swift::misc::CCountryList>> createModelFilter() const override;
+        //! \copydoc models::IModelFilterProvider::createModelFilter
+        virtual std::unique_ptr<swift::gui::models::IModelFilter<swift::misc::CCountryList>> createModelFilter() const override;
 
     public slots:
         //! \copydoc CFilterWidget::onRowCountChanged
diff --git a/src/blackgui/filters/countryfilterbar.ui b/src/gui/filters/countryfilterbar.ui
similarity index 93%
rename from src/blackgui/filters/countryfilterbar.ui
rename to src/gui/filters/countryfilterbar.ui
index 6cd698fe5..fb3f90533 100644
--- a/src/blackgui/filters/countryfilterbar.ui
+++ b/src/gui/filters/countryfilterbar.ui
@@ -46,7 +46,7 @@
     </widget>
    </item>
    <item row="0" column="0">
-    <widget class="BlackGui::Filters::CFilterBarButtons" name="filter_Buttons">
+    <widget class="swift::gui::filters::CFilterBarButtons" name="filter_Buttons">
      <property name="frameShape">
       <enum>QFrame::StyledPanel</enum>
      </property>
@@ -96,9 +96,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Filters::CFilterBarButtons</class>
+   <class>swift::gui::filters::CFilterBarButtons</class>
    <extends>QFrame</extends>
-   <header>blackgui/filters/filterbarbuttons.h</header>
+   <header>gui/filters/filterbarbuttons.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/filters/distributorfilterbar.cpp b/src/gui/filters/distributorfilterbar.cpp
similarity index 82%
rename from src/blackgui/filters/distributorfilterbar.cpp
rename to src/gui/filters/distributorfilterbar.cpp
index ea515f83d..df460aa2b 100644
--- a/src/blackgui/filters/distributorfilterbar.cpp
+++ b/src/gui/filters/distributorfilterbar.cpp
@@ -1,21 +1,21 @@
 // SPDX-FileCopyrightText: Copyright (C) 2018 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/filters/distributorfilterbar.h"
-#include "blackgui/filters/filterbarbuttons.h"
-#include "blackgui/models/distributorfilter.h"
-#include "blackgui/uppercasevalidator.h"
+#include "gui/filters/distributorfilterbar.h"
+#include "gui/filters/filterbarbuttons.h"
+#include "gui/models/distributorfilter.h"
+#include "gui/uppercasevalidator.h"
 #include "misc/simulation/distributorlist.h"
 #include "ui_distributorfilterbar.h"
 
 #include <QLineEdit>
 
-using namespace BlackGui::Models;
-using namespace BlackGui::Components;
+using namespace swift::gui::models;
+using namespace swift::gui::components;
 using namespace swift::misc;
 using namespace swift::misc::simulation;
 
-namespace BlackGui::Filters
+namespace swift::gui::filters
 {
     CDistributorFilterBar::CDistributorFilterBar(QWidget *parent) : CFilterWidget(parent),
                                                                     ui(new Ui::CDistributorFilterBar)
@@ -42,7 +42,7 @@ namespace BlackGui::Filters
     CDistributorFilterBar::~CDistributorFilterBar()
     {}
 
-    std::unique_ptr<BlackGui::Models::IModelFilter<CDistributorList>> CDistributorFilterBar::createModelFilter() const
+    std::unique_ptr<swift::gui::models::IModelFilter<CDistributorList>> CDistributorFilterBar::createModelFilter() const
     {
         return std::make_unique<CDistributorFilter>(ui->comp_Simulator->getValue());
     }
diff --git a/src/blackgui/filters/distributorfilterbar.h b/src/gui/filters/distributorfilterbar.h
similarity index 72%
rename from src/blackgui/filters/distributorfilterbar.h
rename to src/gui/filters/distributorfilterbar.h
index 622f685ba..8fef9230f 100644
--- a/src/blackgui/filters/distributorfilterbar.h
+++ b/src/gui/filters/distributorfilterbar.h
@@ -3,12 +3,12 @@
 
 //! \file
 
-#ifndef BLACKGUI_FILTERS_DISTRIBUTORFILTERBAR_H
-#define BLACKGUI_FILTERS_DISTRIBUTORFILTERBAR_H
+#ifndef SWIFT_GUI_FILTERS_DISTRIBUTORFILTERBAR_H
+#define SWIFT_GUI_FILTERS_DISTRIBUTORFILTERBAR_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/filters/filterwidget.h"
-#include "blackgui/models/modelfilter.h"
+#include "gui/swiftguiexport.h"
+#include "gui/filters/filterwidget.h"
+#include "gui/models/modelfilter.h"
 
 #include <QObject>
 #include <QScopedPointer>
@@ -23,14 +23,14 @@ namespace swift::misc::simulation
     class CDistributorList;
     class CSimulatorInfo;
 }
-namespace BlackGui::Filters
+namespace swift::gui::filters
 {
     /*!
      * Distributor filter bar
      */
-    class BLACKGUI_EXPORT CDistributorFilterBar :
+    class SWIFT_GUI_EXPORT CDistributorFilterBar :
         public CFilterWidget,
-        public Models::IModelFilterProvider<swift::misc::simulation::CDistributorList>
+        public models::IModelFilterProvider<swift::misc::simulation::CDistributorList>
     {
         Q_OBJECT
 
@@ -44,8 +44,8 @@ namespace BlackGui::Filters
         //! Set simulator
         void setSimulator(const swift::misc::simulation::CSimulatorInfo &simulator);
 
-        //! \copydoc Models::IModelFilterProvider::createModelFilter
-        virtual std::unique_ptr<Models::IModelFilter<swift::misc::simulation::CDistributorList>> createModelFilter() const override;
+        //! \copydoc models::IModelFilterProvider::createModelFilter
+        virtual std::unique_ptr<models::IModelFilter<swift::misc::simulation::CDistributorList>> createModelFilter() const override;
 
         //! \copydoc CFilterWidget::onRowCountChanged
         virtual void onRowCountChanged(int count, bool withFilter) override;
diff --git a/src/blackgui/filters/distributorfilterbar.ui b/src/gui/filters/distributorfilterbar.ui
similarity index 78%
rename from src/blackgui/filters/distributorfilterbar.ui
rename to src/gui/filters/distributorfilterbar.ui
index d87e511cc..56275ada7 100644
--- a/src/blackgui/filters/distributorfilterbar.ui
+++ b/src/gui/filters/distributorfilterbar.ui
@@ -27,7 +27,7 @@
     <number>4</number>
    </property>
    <item row="1" column="0" alignment="Qt::AlignRight">
-    <widget class="BlackGui::Filters::CFilterBarButtons" name="filter_Buttons">
+    <widget class="swift::gui::filters::CFilterBarButtons" name="filter_Buttons">
      <property name="frameShape">
       <enum>QFrame::StyledPanel</enum>
      </property>
@@ -37,7 +37,7 @@
     </widget>
    </item>
    <item row="1" column="1">
-    <widget class="BlackGui::Components::CSimulatorSelector" name="comp_Simulator">
+    <widget class="swift::gui::components::CSimulatorSelector" name="comp_Simulator">
      <property name="minimumSize">
       <size>
        <width>200</width>
@@ -50,15 +50,15 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CSimulatorSelector</class>
+   <class>swift::gui::components::CSimulatorSelector</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/simulatorselector.h</header>
+   <header>gui/components/simulatorselector.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Filters::CFilterBarButtons</class>
+   <class>swift::gui::filters::CFilterBarButtons</class>
    <extends>QFrame</extends>
-   <header>blackgui/filters/filterbarbuttons.h</header>
+   <header>gui/filters/filterbarbuttons.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/filters/filterbarbuttons.cpp b/src/gui/filters/filterbarbuttons.cpp
similarity index 96%
rename from src/blackgui/filters/filterbarbuttons.cpp
rename to src/gui/filters/filterbarbuttons.cpp
index 4aed0c3e4..6f2b0302a 100644
--- a/src/blackgui/filters/filterbarbuttons.cpp
+++ b/src/gui/filters/filterbarbuttons.cpp
@@ -1,14 +1,14 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/filters/filterbarbuttons.h"
+#include "gui/filters/filterbarbuttons.h"
 #include "ui_filterbarbuttons.h"
 
 #include <QLineEdit>
 #include <QString>
 #include <QToolButton>
 
-namespace BlackGui::Filters
+namespace swift::gui::filters
 {
     CFilterBarButtons::CFilterBarButtons(QWidget *parent) : QFrame(parent),
                                                             ui(new Ui::CFilterBarButtons)
diff --git a/src/blackgui/filters/filterbarbuttons.h b/src/gui/filters/filterbarbuttons.h
similarity index 72%
rename from src/blackgui/filters/filterbarbuttons.h
rename to src/gui/filters/filterbarbuttons.h
index 939fa0e30..1733b74ef 100644
--- a/src/blackgui/filters/filterbarbuttons.h
+++ b/src/gui/filters/filterbarbuttons.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_FILTERS_FILTERBARBUTTONS_H
-#define BLACKGUI_FILTERS_FILTERBARBUTTONS_H
+#ifndef SWIFT_GUI_FILTERS_FILTERBARBUTTONS_H
+#define SWIFT_GUI_FILTERS_FILTERBARBUTTONS_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 
 #include <QFrame>
 #include <QMetaType>
@@ -19,12 +19,12 @@ namespace Ui
 {
     class CFilterBarButtons;
 }
-namespace BlackGui::Filters
+namespace swift::gui::filters
 {
     /*!
      * Filter bar buttons
      */
-    class BLACKGUI_EXPORT CFilterBarButtons : public QFrame
+    class SWIFT_GUI_EXPORT CFilterBarButtons : public QFrame
     {
         Q_OBJECT
 
@@ -48,14 +48,14 @@ namespace BlackGui::Filters
 
     signals:
         //! Filter button clicked
-        void buttonClicked(BlackGui::Filters::CFilterBarButtons::FilterButton filterButton);
+        void buttonClicked(swift::gui::filters::CFilterBarButtons::FilterButton filterButton);
 
     public slots:
         //! Row count has been changed
         void onRowCountChanged(int count, bool withFilter);
 
         //! Trigger button
-        void clickButton(BlackGui::Filters::CFilterBarButtons::FilterButton filterButton);
+        void clickButton(swift::gui::filters::CFilterBarButtons::FilterButton filterButton);
 
     private slots:
         //! Button was clicked
@@ -66,6 +66,6 @@ namespace BlackGui::Filters
     };
 } // ns
 
-Q_DECLARE_METATYPE(BlackGui::Filters::CFilterBarButtons::FilterButton)
+Q_DECLARE_METATYPE(swift::gui::filters::CFilterBarButtons::FilterButton)
 
 #endif // guard
diff --git a/src/blackgui/filters/filterbarbuttons.ui b/src/gui/filters/filterbarbuttons.ui
similarity index 100%
rename from src/blackgui/filters/filterbarbuttons.ui
rename to src/gui/filters/filterbarbuttons.ui
diff --git a/src/blackgui/filters/filterdialog.cpp b/src/gui/filters/filterdialog.cpp
similarity index 83%
rename from src/blackgui/filters/filterdialog.cpp
rename to src/gui/filters/filterdialog.cpp
index 2f93a6b04..77237b2eb 100644
--- a/src/blackgui/filters/filterdialog.cpp
+++ b/src/gui/filters/filterdialog.cpp
@@ -1,14 +1,14 @@
 // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/filters/filterdialog.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/stylesheetutility.h"
+#include "gui/filters/filterdialog.h"
+#include "gui/guiapplication.h"
+#include "gui/stylesheetutility.h"
 
 #include <QString>
 #include <Qt>
 
-namespace BlackGui::Filters
+namespace swift::gui::filters
 {
     CFilterDialog::CFilterDialog(QWidget *parent) : QDialog(parent, Qt::Tool)
     {
diff --git a/src/blackgui/filters/filterdialog.h b/src/gui/filters/filterdialog.h
similarity index 73%
rename from src/blackgui/filters/filterdialog.h
rename to src/gui/filters/filterdialog.h
index 64f09ae47..c485d4b8a 100644
--- a/src/blackgui/filters/filterdialog.h
+++ b/src/gui/filters/filterdialog.h
@@ -3,20 +3,20 @@
 
 //! \file
 
-#ifndef BLACKGUI_FILTERS_FILTERDIALOG_H
-#define BLACKGUI_FILTERS_FILTERDIALOG_H
+#ifndef SWIFT_GUI_FILTERS_FILTERDIALOG_H
+#define SWIFT_GUI_FILTERS_FILTERDIALOG_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 
 #include <QDialog>
 #include <QObject>
 
 class QWidget;
 
-namespace BlackGui::Filters
+namespace swift::gui::filters
 {
     //! Base for filter dialog
-    class BLACKGUI_EXPORT CFilterDialog : public QDialog
+    class SWIFT_GUI_EXPORT CFilterDialog : public QDialog
     {
         Q_OBJECT
 
diff --git a/src/blackgui/filters/filterwidget.cpp b/src/gui/filters/filterwidget.cpp
similarity index 93%
rename from src/blackgui/filters/filterwidget.cpp
rename to src/gui/filters/filterwidget.cpp
index d09069c2f..f2c96dfc6 100644
--- a/src/blackgui/filters/filterwidget.cpp
+++ b/src/gui/filters/filterwidget.cpp
@@ -1,14 +1,14 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/filters/filterwidget.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/stylesheetutility.h"
+#include "gui/filters/filterwidget.h"
+#include "gui/guiapplication.h"
+#include "gui/stylesheetutility.h"
 
 #include <QString>
 #include <QtGlobal>
 
-namespace BlackGui::Filters
+namespace swift::gui::filters
 {
     CFilterWidget::CFilterWidget(QWidget *parent) : QFrame(parent)
     {
diff --git a/src/blackgui/filters/filterwidget.h b/src/gui/filters/filterwidget.h
similarity index 84%
rename from src/blackgui/filters/filterwidget.h
rename to src/gui/filters/filterwidget.h
index 64fba55aa..d4735bace 100644
--- a/src/blackgui/filters/filterwidget.h
+++ b/src/gui/filters/filterwidget.h
@@ -3,21 +3,21 @@
 
 //! \file
 
-#ifndef BLACKGUI_FILTERS_FILTERWIDGET_H
-#define BLACKGUI_FILTERS_FILTERWIDGET_H
+#ifndef SWIFT_GUI_FILTERS_FILTERWIDGET_H
+#define SWIFT_GUI_FILTERS_FILTERWIDGET_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/filters/filterbarbuttons.h"
+#include "gui/swiftguiexport.h"
+#include "gui/filters/filterbarbuttons.h"
 
 #include <QFrame>
 #include <QObject>
 
 class QWidget;
 
-namespace BlackGui::Filters
+namespace swift::gui::filters
 {
     //! Base for filter dialog
-    class BLACKGUI_EXPORT CFilterWidget : public QFrame
+    class SWIFT_GUI_EXPORT CFilterWidget : public QFrame
     {
         Q_OBJECT
 
diff --git a/src/blackgui/filters/liveryfilterbar.cpp b/src/gui/filters/liveryfilterbar.cpp
similarity index 92%
rename from src/blackgui/filters/liveryfilterbar.cpp
rename to src/gui/filters/liveryfilterbar.cpp
index 5b5221d78..50de05564 100644
--- a/src/blackgui/filters/liveryfilterbar.cpp
+++ b/src/gui/filters/liveryfilterbar.cpp
@@ -1,11 +1,11 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/colorselector.h"
-#include "blackgui/filters/filterbarbuttons.h"
-#include "blackgui/filters/liveryfilterbar.h"
-#include "blackgui/models/liveryfilter.h"
-#include "blackgui/uppercasevalidator.h"
+#include "gui/components/colorselector.h"
+#include "gui/filters/filterbarbuttons.h"
+#include "gui/filters/liveryfilterbar.h"
+#include "gui/models/liveryfilter.h"
+#include "gui/uppercasevalidator.h"
 #include "misc/aviation/livery.h"
 #include "misc/aviation/liverylist.h"
 #include "ui_liveryfilterbar.h"
@@ -16,10 +16,10 @@
 #include <QtGlobal>
 
 using namespace swift::misc::aviation;
-using namespace BlackGui::Models;
-using namespace BlackGui::Components;
+using namespace swift::gui::models;
+using namespace swift::gui::components;
 
-namespace BlackGui::Filters
+namespace swift::gui::filters
 {
     CLiveryFilterBar::CLiveryFilterBar(QWidget *parent) : CFilterWidget(parent),
                                                           ui(new Ui::CLiveryFilterBar)
@@ -48,7 +48,7 @@ namespace BlackGui::Filters
     CLiveryFilterBar::~CLiveryFilterBar()
     {}
 
-    std::unique_ptr<Models::IModelFilter<CLiveryList>> CLiveryFilterBar::createModelFilter() const
+    std::unique_ptr<models::IModelFilter<CLiveryList>> CLiveryFilterBar::createModelFilter() const
     {
         const double maxColorDistance = ui->hs_ColorDistance->value() / 100.0;
         return std::make_unique<CLiveryFilter>(
diff --git a/src/blackgui/filters/liveryfilterbar.h b/src/gui/filters/liveryfilterbar.h
similarity index 72%
rename from src/blackgui/filters/liveryfilterbar.h
rename to src/gui/filters/liveryfilterbar.h
index 4f553ea17..948d33d45 100644
--- a/src/blackgui/filters/liveryfilterbar.h
+++ b/src/gui/filters/liveryfilterbar.h
@@ -3,12 +3,12 @@
 
 //! \file
 
-#ifndef BLACKGUI_FILTERS_LIVERYFILTERBAR_H
-#define BLACKGUI_FILTERS_LIVERYFILTERBAR_H
+#ifndef SWIFT_GUI_FILTERS_LIVERYFILTERBAR_H
+#define SWIFT_GUI_FILTERS_LIVERYFILTERBAR_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/filters/filterwidget.h"
-#include "blackgui/models/modelfilter.h"
+#include "gui/swiftguiexport.h"
+#include "gui/filters/filterwidget.h"
+#include "gui/models/modelfilter.h"
 #include "misc/rgbcolor.h"
 
 #include <QObject>
@@ -24,14 +24,14 @@ namespace swift::misc::aviation
     class CLivery;
     class CLiveryList;
 }
-namespace BlackGui::Filters
+namespace swift::gui::filters
 {
     /*!
      * Livery filter bar
      */
-    class BLACKGUI_EXPORT CLiveryFilterBar :
+    class SWIFT_GUI_EXPORT CLiveryFilterBar :
         public CFilterWidget,
-        public Models::IModelFilterProvider<swift::misc::aviation::CLiveryList>
+        public models::IModelFilterProvider<swift::misc::aviation::CLiveryList>
     {
         Q_OBJECT
 
@@ -42,8 +42,8 @@ namespace BlackGui::Filters
         //! Destructor
         virtual ~CLiveryFilterBar() override;
 
-        //! \copydoc Models::IModelFilterProvider::createModelFilter
-        virtual std::unique_ptr<BlackGui::Models::IModelFilter<swift::misc::aviation::CLiveryList>> createModelFilter() const override;
+        //! \copydoc models::IModelFilterProvider::createModelFilter
+        virtual std::unique_ptr<swift::gui::models::IModelFilter<swift::misc::aviation::CLiveryList>> createModelFilter() const override;
 
         //! Filter by livery values
         void filter(const swift::misc::aviation::CLivery &livery);
diff --git a/src/blackgui/filters/liveryfilterbar.ui b/src/gui/filters/liveryfilterbar.ui
similarity index 92%
rename from src/blackgui/filters/liveryfilterbar.ui
rename to src/gui/filters/liveryfilterbar.ui
index e21071a7b..90b8eb729 100644
--- a/src/blackgui/filters/liveryfilterbar.ui
+++ b/src/gui/filters/liveryfilterbar.ui
@@ -48,7 +48,7 @@
        <number>0</number>
       </property>
       <item>
-       <widget class="BlackGui::Filters::CFilterBarButtons" name="filter_Buttons">
+       <widget class="swift::gui::filters::CFilterBarButtons" name="filter_Buttons">
         <property name="minimumSize">
          <size>
           <width>50</width>
@@ -170,7 +170,7 @@
        </widget>
       </item>
       <item>
-       <widget class="BlackGui::Components::CColorSelector" name="color_Fuselage">
+       <widget class="swift::gui::components::CColorSelector" name="color_Fuselage">
         <property name="frameShape">
          <enum>QFrame::StyledPanel</enum>
         </property>
@@ -180,7 +180,7 @@
        </widget>
       </item>
       <item>
-       <widget class="BlackGui::Components::CColorSelector" name="color_Tail">
+       <widget class="swift::gui::components::CColorSelector" name="color_Tail">
         <property name="frameShape">
          <enum>QFrame::StyledPanel</enum>
         </property>
@@ -221,15 +221,15 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Filters::CFilterBarButtons</class>
+   <class>swift::gui::filters::CFilterBarButtons</class>
    <extends>QFrame</extends>
-   <header>blackgui/filters/filterbarbuttons.h</header>
+   <header>gui/filters/filterbarbuttons.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CColorSelector</class>
+   <class>swift::gui::components::CColorSelector</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/colorselector.h</header>
+   <header>gui/components/colorselector.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/filters/statusmessagefilterbar.cpp b/src/gui/filters/statusmessagefilterbar.cpp
similarity index 93%
rename from src/blackgui/filters/statusmessagefilterbar.cpp
rename to src/gui/filters/statusmessagefilterbar.cpp
index 6e9baeb17..0970b22cd 100644
--- a/src/blackgui/filters/statusmessagefilterbar.cpp
+++ b/src/gui/filters/statusmessagefilterbar.cpp
@@ -4,13 +4,13 @@
 #include "statusmessagefilterbar.h"
 #include "misc/logpattern.h"
 #include "ui_statusmessagefilterbar.h"
-#include "blackgui/models/statusmessagefilter.h"
+#include "gui/models/statusmessagefilter.h"
 #include <QCompleter>
 
 using namespace swift::misc;
-using namespace BlackGui::Models;
+using namespace swift::gui::models;
 
-namespace BlackGui::Filters
+namespace swift::gui::filters
 {
     CStatusMessageFilterBar::CStatusMessageFilterBar(QWidget *parent) : CFilterWidget(parent),
                                                                         ui(new Ui::CStatusMessageFilterBar)
@@ -57,7 +57,7 @@ namespace BlackGui::Filters
         ui->rb_Info->setText(oneCharacterText ? msg.getSeverityAsString().left(1) : "");
     }
 
-    std::unique_ptr<BlackGui::Models::IModelFilter<swift::misc::CStatusMessageList>> CStatusMessageFilterBar::createModelFilter() const
+    std::unique_ptr<swift::gui::models::IModelFilter<swift::misc::CStatusMessageList>> CStatusMessageFilterBar::createModelFilter() const
     {
         return std::make_unique<CStatusMessageFilter>(
             this->getSelectedSeverity(),
diff --git a/src/blackgui/filters/statusmessagefilterbar.h b/src/gui/filters/statusmessagefilterbar.h
similarity index 72%
rename from src/blackgui/filters/statusmessagefilterbar.h
rename to src/gui/filters/statusmessagefilterbar.h
index 4e48f53ea..6b895a1ff 100644
--- a/src/blackgui/filters/statusmessagefilterbar.h
+++ b/src/gui/filters/statusmessagefilterbar.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_FILTERS_STATUSMESSAGEFILTERBAR_H
-#define BLACKGUI_FILTERS_STATUSMESSAGEFILTERBAR_H
+#ifndef SWIFT_GUI_FILTERS_STATUSMESSAGEFILTERBAR_H
+#define SWIFT_GUI_FILTERS_STATUSMESSAGEFILTERBAR_H
 
-#include "blackgui/filters/filterwidget.h"
-#include "blackgui/models/modelfilter.h"
+#include "gui/filters/filterwidget.h"
+#include "gui/models/modelfilter.h"
 #include "misc/statusmessagelist.h"
 #include <QFrame>
 
@@ -15,14 +15,14 @@ namespace Ui
 {
     class CStatusMessageFilterBar;
 }
-namespace BlackGui::Filters
+namespace swift::gui::filters
 {
     /*!
      * Filter status messages
      */
     class CStatusMessageFilterBar :
         public CFilterWidget,
-        public BlackGui::Models::IModelFilterProvider<swift::misc::CStatusMessageList>
+        public swift::gui::models::IModelFilterProvider<swift::misc::CStatusMessageList>
     {
         Q_OBJECT
 
@@ -39,8 +39,8 @@ namespace BlackGui::Filters
         //! Use icons with radio buttons
         void useRadioButtonDescriptiveIcons(bool oneCharacterText);
 
-        //! \copydoc Models::IModelFilterProvider::createModelFilter
-        virtual std::unique_ptr<BlackGui::Models::IModelFilter<swift::misc::CStatusMessageList>> createModelFilter() const override;
+        //! \copydoc models::IModelFilterProvider::createModelFilter
+        virtual std::unique_ptr<swift::gui::models::IModelFilter<swift::misc::CStatusMessageList>> createModelFilter() const override;
 
     public slots:
         //! \copydoc CFilterWidget::onRowCountChanged
diff --git a/src/blackgui/filters/statusmessagefilterbar.ui b/src/gui/filters/statusmessagefilterbar.ui
similarity index 93%
rename from src/blackgui/filters/statusmessagefilterbar.ui
rename to src/gui/filters/statusmessagefilterbar.ui
index 5c3bb6764..9cd8ef2c8 100644
--- a/src/blackgui/filters/statusmessagefilterbar.ui
+++ b/src/gui/filters/statusmessagefilterbar.ui
@@ -72,7 +72,7 @@
     </widget>
    </item>
    <item row="0" column="0">
-    <widget class="BlackGui::Filters::CFilterBarButtons" name="filter_Buttons">
+    <widget class="swift::gui::filters::CFilterBarButtons" name="filter_Buttons">
      <property name="minimumSize">
       <size>
        <width>75</width>
@@ -99,9 +99,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Filters::CFilterBarButtons</class>
+   <class>swift::gui::filters::CFilterBarButtons</class>
    <extends>QFrame</extends>
-   <header>blackgui/filters/filterbarbuttons.h</header>
+   <header>gui/filters/filterbarbuttons.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/filters/statusmessagefilterdialog.cpp b/src/gui/filters/statusmessagefilterdialog.cpp
similarity index 83%
rename from src/blackgui/filters/statusmessagefilterdialog.cpp
rename to src/gui/filters/statusmessagefilterdialog.cpp
index b4fe29301..af844cbb7 100644
--- a/src/blackgui/filters/statusmessagefilterdialog.cpp
+++ b/src/gui/filters/statusmessagefilterdialog.cpp
@@ -1,16 +1,16 @@
 // SPDX-FileCopyrightText: Copyright (C) 2016 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/filters/statusmessagefilterdialog.h"
-#include "blackgui/filters/statusmessagefilterbar.h"
+#include "gui/filters/statusmessagefilterdialog.h"
+#include "gui/filters/statusmessagefilterbar.h"
 #include "misc/statusmessagelist.h"
 #include "ui_statusmessagefilterdialog.h"
 
-using namespace BlackGui::Models;
-using namespace BlackGui::Filters;
+using namespace swift::gui::models;
+using namespace swift::gui::filters;
 using namespace swift::misc;
 
-namespace BlackGui::Filters
+namespace swift::gui::filters
 {
     CStatusMessageFilterDialog::CStatusMessageFilterDialog(QWidget *parent) : CFilterDialog(parent),
                                                                               ui(new Ui::CStatusMessageFilterDialog)
diff --git a/src/blackgui/filters/statusmessagefilterdialog.h b/src/gui/filters/statusmessagefilterdialog.h
similarity index 56%
rename from src/blackgui/filters/statusmessagefilterdialog.h
rename to src/gui/filters/statusmessagefilterdialog.h
index b3070b007..394a7f4e2 100644
--- a/src/blackgui/filters/statusmessagefilterdialog.h
+++ b/src/gui/filters/statusmessagefilterdialog.h
@@ -3,12 +3,12 @@
 
 //! \file
 
-#ifndef BLACKGUI_FILTERS_STATUSMESSAGEFILTERDIALOG_H
-#define BLACKGUI_FILTERS_STATUSMESSAGEFILTERDIALOG_H
+#ifndef SWIFT_GUI_FILTERS_STATUSMESSAGEFILTERDIALOG_H
+#define SWIFT_GUI_FILTERS_STATUSMESSAGEFILTERDIALOG_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/filters/filterdialog.h"
-#include "blackgui/models/modelfilter.h"
+#include "gui/swiftguiexport.h"
+#include "gui/filters/filterdialog.h"
+#include "gui/models/modelfilter.h"
 
 #include <QObject>
 #include <QScopedPointer>
@@ -25,12 +25,12 @@ namespace Ui
     class CStatusMessageFilterDialog;
 }
 
-namespace BlackGui::Filters
+namespace swift::gui::filters
 {
     //! Form for a status message filter
-    class BLACKGUI_EXPORT CStatusMessageFilterDialog :
+    class SWIFT_GUI_EXPORT CStatusMessageFilterDialog :
         public CFilterDialog,
-        public BlackGui::Models::IModelFilterProvider<swift::misc::CStatusMessageList>
+        public swift::gui::models::IModelFilterProvider<swift::misc::CStatusMessageList>
     {
         Q_OBJECT
 
@@ -41,8 +41,8 @@ namespace BlackGui::Filters
         //! Destructor
         virtual ~CStatusMessageFilterDialog() override;
 
-        //! \copydoc Models::IModelFilterProvider::createModelFilter
-        virtual std::unique_ptr<BlackGui::Models::IModelFilter<swift::misc::CStatusMessageList>> createModelFilter() const override;
+        //! \copydoc models::IModelFilterProvider::createModelFilter
+        virtual std::unique_ptr<swift::gui::models::IModelFilter<swift::misc::CStatusMessageList>> createModelFilter() const override;
 
     private:
         QScopedPointer<Ui::CStatusMessageFilterDialog> ui;
diff --git a/src/blackgui/filters/statusmessagefilterdialog.ui b/src/gui/filters/statusmessagefilterdialog.ui
similarity index 90%
rename from src/blackgui/filters/statusmessagefilterdialog.ui
rename to src/gui/filters/statusmessagefilterdialog.ui
index 9e4ca72e2..cf0c3156d 100644
--- a/src/blackgui/filters/statusmessagefilterdialog.ui
+++ b/src/gui/filters/statusmessagefilterdialog.ui
@@ -21,7 +21,7 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item alignment="Qt::AlignTop">
-    <widget class="BlackGui::Filters::CStatusMessageFilterBar" name="filter_Messages">
+    <widget class="swift::gui::filters::CStatusMessageFilterBar" name="filter_Messages">
      <property name="minimumSize">
       <size>
        <width>0</width>
@@ -44,9 +44,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Filters::CStatusMessageFilterBar</class>
+   <class>swift::gui::filters::CStatusMessageFilterBar</class>
    <extends>QFrame</extends>
-   <header>blackgui/filters/statusmessagefilterbar.h</header>
+   <header>gui/filters/statusmessagefilterbar.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/foreignwindows.cpp b/src/gui/foreignwindows.cpp
similarity index 97%
rename from src/blackgui/foreignwindows.cpp
rename to src/gui/foreignwindows.cpp
index 07a4d975c..18c1922e9 100644
--- a/src/blackgui/foreignwindows.cpp
+++ b/src/gui/foreignwindows.cpp
@@ -1,8 +1,8 @@
 // SPDX-FileCopyrightText: Copyright (C) 2014 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/foreignwindows.h"
-#include "blackgui/windowfinder.h"
+#include "gui/foreignwindows.h"
+#include "gui/windowfinder.h"
 
 #include <QWidget>
 #include <QWindow>
@@ -10,7 +10,7 @@
 
 using namespace swift::misc::simulation;
 
-namespace BlackGui
+namespace swift::gui
 {
     QScopedPointer<IWindowFinder> CForeignWindows::m_windowFinder(IWindowFinder::create());
 
diff --git a/src/blackgui/foreignwindows.h b/src/gui/foreignwindows.h
similarity index 88%
rename from src/blackgui/foreignwindows.h
rename to src/gui/foreignwindows.h
index 406f52942..75a28af0a 100644
--- a/src/blackgui/foreignwindows.h
+++ b/src/gui/foreignwindows.h
@@ -3,22 +3,22 @@
 
 //! \file
 
-#ifndef BLACKGUI_FOREIGNWINDOWS_H
-#define BLACKGUI_FOREIGNWINDOWS_H
+#ifndef SWIFT_GUI_FOREIGNWINDOWS_H
+#define SWIFT_GUI_FOREIGNWINDOWS_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include "misc/simulation/simulatorinfo.h"
 #include <QScopedPointer>
 
 class QWidget;
 class QWindow;
 
-namespace BlackGui
+namespace swift::gui
 {
     class IWindowFinder;
 
     //! Foreign windows
-    class BLACKGUI_EXPORT CForeignWindows
+    class SWIFT_GUI_EXPORT CForeignWindows
     {
     public:
         //! FS9 window
diff --git a/src/blackgui/guiactionbind.cpp b/src/gui/guiactionbind.cpp
similarity index 99%
rename from src/blackgui/guiactionbind.cpp
rename to src/gui/guiactionbind.cpp
index d01394b9f..4f5b53488 100644
--- a/src/blackgui/guiactionbind.cpp
+++ b/src/gui/guiactionbind.cpp
@@ -8,7 +8,7 @@
 using namespace swift::misc;
 using namespace swift::core;
 
-namespace BlackGui
+namespace swift::gui
 {
     CGuiActionBindHandler::CGuiActionBindHandler(QAction *action) : QObject(action), m_action(action)
     {
diff --git a/src/blackgui/guiactionbind.h b/src/gui/guiactionbind.h
similarity index 91%
rename from src/blackgui/guiactionbind.h
rename to src/gui/guiactionbind.h
index d7fe0af62..84b2cdcfa 100644
--- a/src/blackgui/guiactionbind.h
+++ b/src/gui/guiactionbind.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_GUIACTIONBIND_H
-#define BLACKGUI_GUIACTIONBIND_H
+#ifndef SWIFT_GUI_GUIACTIONBIND_H
+#define SWIFT_GUI_GUIACTIONBIND_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include "core/actionbind.h"
 
 #include <QMenu>
@@ -15,10 +15,10 @@
 #include <QToolButton>
 #include <QScopedPointer>
 
-namespace BlackGui
+namespace swift::gui
 {
     //! QObject derived handler to be registered with swift::core::CActionBind
-    class BLACKGUI_EXPORT CGuiActionBindHandler : public QObject
+    class SWIFT_GUI_EXPORT CGuiActionBindHandler : public QObject
     {
         Q_OBJECT
 
diff --git a/src/blackgui/guiapplication.cpp b/src/gui/guiapplication.cpp
similarity index 98%
rename from src/blackgui/guiapplication.cpp
rename to src/gui/guiapplication.cpp
index 0634c3591..c6865b633 100644
--- a/src/blackgui/guiapplication.cpp
+++ b/src/gui/guiapplication.cpp
@@ -1,14 +1,14 @@
 // SPDX-FileCopyrightText: Copyright (C) 2016 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/applicationclosedialog.h"
-#include "blackgui/components/updateinfodialog.h"
-#include "blackgui/components/aboutdialog.h"
-#include "blackgui/components/setuploadingdialog.h"
-#include "blackgui/splashscreen.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/guiutility.h"
-#include "blackgui/registermetadata.h"
+#include "gui/components/applicationclosedialog.h"
+#include "gui/components/updateinfodialog.h"
+#include "gui/components/aboutdialog.h"
+#include "gui/components/setuploadingdialog.h"
+#include "gui/splashscreen.h"
+#include "gui/guiapplication.h"
+#include "gui/guiutility.h"
+#include "gui/registermetadata.h"
 #include "core/context/contextnetwork.h"
 #include "core/data/globalsetup.h"
 #include "core/db/infodatareader.h"
@@ -56,14 +56,14 @@ using namespace swift::config;
 using namespace swift::misc;
 using namespace swift::misc::db;
 using namespace swift::misc::network;
-using namespace BlackGui::Components;
+using namespace swift::gui::components;
 using namespace swift::core;
 using namespace swift::core::data;
 using namespace swift::core::context;
 
-BlackGui::CGuiApplication *sGui = nullptr; // set by constructor
+swift::gui::CGuiApplication *sGui = nullptr; // set by constructor
 
-namespace BlackGui
+namespace swift::gui
 {
     CGuiApplication *CGuiApplication::instance()
     {
@@ -133,7 +133,7 @@ namespace BlackGui
     void CGuiApplication::registerMetadata()
     {
         CApplication::registerMetadata();
-        BlackGui::registerMetadata();
+        swift::gui::registerMetadata();
     }
 
     void CGuiApplication::addWindowModeOption()
@@ -254,7 +254,7 @@ namespace BlackGui
 
     void CGuiApplication::addWindowFlags(Qt::WindowFlags flags)
     {
-        QWidget *maw = BlackGui::CGuiApplication::mainApplicationWidget();
+        QWidget *maw = swift::gui::CGuiApplication::mainApplicationWidget();
         if (maw)
         {
             Qt::WindowFlags windowFlags = maw->windowFlags();
@@ -965,7 +965,7 @@ namespace BlackGui
     {
         if (msgs.hasErrorMessages())
         {
-            CSetupLoadingDialog dialog(msgs, BlackGui::CGuiApplication::mainApplicationWidget());
+            CSetupLoadingDialog dialog(msgs, swift::gui::CGuiApplication::mainApplicationWidget());
             if (sGui)
             {
                 static const QString style = sGui->getStyleSheetUtility().styles(
diff --git a/src/blackgui/guiapplication.h b/src/gui/guiapplication.h
similarity index 91%
rename from src/blackgui/guiapplication.h
rename to src/gui/guiapplication.h
index 88b5ec1e6..ce0f17669 100644
--- a/src/blackgui/guiapplication.h
+++ b/src/gui/guiapplication.h
@@ -3,16 +3,16 @@
 
 //! \file
 
-#ifndef BLACKGUI_GUIAPPLICATION_H
-#define BLACKGUI_GUIAPPLICATION_H
+#ifndef SWIFT_GUI_GUIAPPLICATION_H
+#define SWIFT_GUI_GUIAPPLICATION_H
 
-#include "blackgui/settings/guisettings.h"
-#include "blackgui/settings/updatenotification.h"
-#include "blackgui/enableforframelesswindow.h"
-#include "blackgui/mainwindowaccess.h"
-#include "blackgui/splashscreen.h"
-#include "blackgui/stylesheetutility.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/settings/guisettings.h"
+#include "gui/settings/updatenotification.h"
+#include "gui/enableforframelesswindow.h"
+#include "gui/mainwindowaccess.h"
+#include "gui/splashscreen.h"
+#include "gui/stylesheetutility.h"
+#include "gui/swiftguiexport.h"
 #include "core/application.h"
 #include "misc/network/networkutils.h"
 #include "misc/icons.h"
@@ -36,12 +36,12 @@ namespace swift::misc
 {
     class CLogCategoryList;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     class CApplicationCloseDialog;
     class CUpdateInfoDialog;
 }
-namespace BlackGui
+namespace swift::gui
 {
     /*!
      * \brief GUI application, a specialized version of swift::core::CApplication for GUI applications.
@@ -55,12 +55,12 @@ namespace BlackGui
      *  - splash screen support
      *
      */
-    class BLACKGUI_EXPORT CGuiApplication :
+    class SWIFT_GUI_EXPORT CGuiApplication :
         public swift::core::CApplication,
         public IMainWindowAccess
     {
         Q_OBJECT
-        Q_INTERFACES(BlackGui::IMainWindowAccess)
+        Q_INTERFACES(swift::gui::IMainWindowAccess)
 
     public:
         //! Similar to \sa QCoreApplication::instance() returns the single instance
@@ -238,10 +238,10 @@ namespace BlackGui
         //! \note Pixmap requires a valid QApplication, so it cannot be passed as constructor parameter
         static void setWindowIcon(const QPixmap &icon);
 
-        //! \copydoc BlackGui::CGuiUtility::mainApplicationWidget
+        //! \copydoc swift::gui::CGuiUtility::mainApplicationWidget
         static QWidget *mainApplicationWidget();
 
-        //! \copydoc BlackGui::CGuiUtility::registerMainApplicationWidget
+        //! \copydoc swift::gui::CGuiUtility::registerMainApplicationWidget
         void registerMainApplicationWidget(QWidget *mainWidget);
 
         //! \copydoc swift::core::CApplication::hasMinimumMappingVersion
@@ -251,7 +251,7 @@ namespace BlackGui
         static QMainWindow *mainApplicationWindow();
 
         //! Main window access interface
-        static BlackGui::IMainWindowAccess *mainWindowAccess();
+        static swift::gui::IMainWindowAccess *mainWindowAccess();
 
         //! Exit application, perform graceful shutdown and exit
         static void exit(int retcode = 0);
@@ -331,10 +331,10 @@ namespace BlackGui
         bool m_frontBack = true; //!< for front/back toggle
         bool m_normalizeMinimize = true; //!< for normalize/minimize toggle
         QScopedPointer<CSplashScreen> m_splashScreen; //!< splash screen
-        Components::CUpdateInfoDialog *m_updateDialog = nullptr; //!< software installation dialog
-        Components::CApplicationCloseDialog *m_closeDialog = nullptr; //!< close dialog (no QScopedPointer because I need to set parent)
-        swift::misc::CSettingReadOnly<Settings::TGeneralGui> m_guiSettings { this, &CGuiApplication::settingsChanged };
-        swift::misc::CSettingReadOnly<Settings::TUpdateNotificationSettings> m_updateSetting { this }; //!< update notification settings
+        components::CUpdateInfoDialog *m_updateDialog = nullptr; //!< software installation dialog
+        components::CApplicationCloseDialog *m_closeDialog = nullptr; //!< close dialog (no QScopedPointer because I need to set parent)
+        swift::misc::CSettingReadOnly<settings::TGeneralGui> m_guiSettings { this, &CGuiApplication::settingsChanged };
+        swift::misc::CSettingReadOnly<settings::TUpdateNotificationSettings> m_updateSetting { this }; //!< update notification settings
 
         //! Reload widget style from settings
         void settingsChanged();
@@ -351,7 +351,7 @@ namespace BlackGui
         //! Set current font values
         void setCurrentFontValues();
 
-        //! \copydoc BlackGui::CGuiUtility::superviseMainWindowMinSizes
+        //! \copydoc swift::gui::CGuiUtility::superviseMainWindowMinSizes
         void superviseWindowMinSizes();
 
         //! Settings ini filename
@@ -363,6 +363,6 @@ namespace BlackGui
 } // ns
 
 //! Single instance of GUI application object
-extern BLACKGUI_EXPORT BlackGui::CGuiApplication *sGui;
+extern SWIFT_GUI_EXPORT swift::gui::CGuiApplication *sGui;
 
 #endif // guard
diff --git a/src/blackgui/guiutility.cpp b/src/gui/guiutility.cpp
similarity index 99%
rename from src/blackgui/guiutility.cpp
rename to src/gui/guiutility.cpp
index 3ed9fc238..1496158d0 100644
--- a/src/blackgui/guiutility.cpp
+++ b/src/gui/guiutility.cpp
@@ -1,9 +1,9 @@
 // SPDX-FileCopyrightText: Copyright (C) 2014 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/enableforframelesswindow.h"
-#include "blackgui/guiutility.h"
-#include "blackgui/overlaymessagesframe.h"
+#include "gui/enableforframelesswindow.h"
+#include "gui/guiutility.h"
+#include "gui/overlaymessagesframe.h"
 #include "misc/icon.h"
 #include "misc/verify.h"
 
@@ -46,7 +46,7 @@
 
 using namespace swift::misc;
 
-namespace BlackGui
+namespace swift::gui
 {
     QWidget *CGuiUtility::s_mainApplicationWidget = nullptr;
 
diff --git a/src/blackgui/guiutility.h b/src/gui/guiutility.h
similarity index 97%
rename from src/blackgui/guiutility.h
rename to src/gui/guiutility.h
index 0f69bb540..79b22120a 100644
--- a/src/blackgui/guiutility.h
+++ b/src/gui/guiutility.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_GUIUTILITY_H
-#define BLACKGUI_GUIUTILITY_H
+#ifndef SWIFT_GUI_GUIUTILITY_H
+#define SWIFT_GUI_GUIUTILITY_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include "misc/variant.h"
 
 #include <QByteArray>
@@ -38,7 +38,7 @@ namespace swift::misc
 {
     class CIcon;
 }
-namespace BlackGui
+namespace swift::gui
 {
     class CEnableForFramelessWindow;
     class COverlayMessagesFrame;
@@ -46,7 +46,7 @@ namespace BlackGui
     class COverlayMessagesTabWidget;
 
     //! GUI utilities
-    class BLACKGUI_EXPORT CGuiUtility
+    class SWIFT_GUI_EXPORT CGuiUtility
     {
     public:
         //! Main (frameless enabled) application window
@@ -129,7 +129,7 @@ namespace BlackGui
         //! Is representing existing JSON file
         static bool isMimeRepresentingReadableJsonFile(const QMimeData *mime);
 
-        //! Find next BlackGui::COverlayMessages QFrame or other implementing widget
+        //! Find next swift::gui::COverlayMessages QFrame or other implementing widget
         template <class OverlayWidget>
         static OverlayWidget *nextOverlayMessageWidget(QWidget *widget, int maxLevels = 10)
         {
diff --git a/src/blackgui/horizontalcombobox.cpp b/src/gui/horizontalcombobox.cpp
similarity index 98%
rename from src/blackgui/horizontalcombobox.cpp
rename to src/gui/horizontalcombobox.cpp
index 4194d3661..776817580 100644
--- a/src/blackgui/horizontalcombobox.cpp
+++ b/src/gui/horizontalcombobox.cpp
@@ -3,7 +3,7 @@
 
 #include "horizontalcombobox.h"
 
-namespace BlackGui
+namespace swift::gui
 {
     CHorizontalComboBox::CHorizontalComboBox(QWidget *parent) : QComboBox(parent)
     {
diff --git a/src/blackgui/horizontalcombobox.h b/src/gui/horizontalcombobox.h
similarity index 88%
rename from src/blackgui/horizontalcombobox.h
rename to src/gui/horizontalcombobox.h
index 4800603f9..093fb45f7 100644
--- a/src/blackgui/horizontalcombobox.h
+++ b/src/gui/horizontalcombobox.h
@@ -3,13 +3,13 @@
 
 //! \file
 
-#ifndef BLACKGUI_HORIZONTALCOMBOBOX_H
-#define BLACKGUI_HORIZONTALCOMBOBOX_H
+#ifndef SWIFT_GUI_HORIZONTALCOMBOBOX_H
+#define SWIFT_GUI_HORIZONTALCOMBOBOX_H
 
 #include <QComboBox>
 #include <QListView>
 
-namespace BlackGui
+namespace swift::gui
 {
     //! A combobox where the dropdown is horizontally and not vertically
     class CHorizontalComboBox : public QComboBox
diff --git a/src/blackgui/infoarea.cpp b/src/gui/infoarea.cpp
similarity index 99%
rename from src/blackgui/infoarea.cpp
rename to src/gui/infoarea.cpp
index 49c3ba4f2..fc5e3d080 100644
--- a/src/blackgui/infoarea.cpp
+++ b/src/gui/infoarea.cpp
@@ -1,12 +1,12 @@
 // SPDX-FileCopyrightText: Copyright (C) 2014 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/dockwidget.h"
-#include "blackgui/dockwidgetinfoarea.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/guiutility.h"
-#include "blackgui/infoarea.h"
-#include "blackgui/stylesheetutility.h"
+#include "gui/dockwidget.h"
+#include "gui/dockwidgetinfoarea.h"
+#include "gui/guiapplication.h"
+#include "gui/guiutility.h"
+#include "gui/infoarea.h"
+#include "gui/stylesheetutility.h"
 #include "misc/icons.h"
 #include "misc/logmessage.h"
 #include "misc/verify.h"
@@ -32,7 +32,7 @@
 
 using namespace swift::misc;
 
-namespace BlackGui
+namespace swift::gui
 {
     CInfoArea::CInfoArea(QWidget *parent) : QMainWindow(parent),
                                             CEnableForFramelessWindow(CEnableForFramelessWindow::WindowTool, false, "framelessInfoArea", this)
diff --git a/src/blackgui/infoarea.h b/src/gui/infoarea.h
similarity index 97%
rename from src/blackgui/infoarea.h
rename to src/gui/infoarea.h
index d3f915b79..ae274b24e 100644
--- a/src/blackgui/infoarea.h
+++ b/src/gui/infoarea.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_INFOAREA_H
-#define BLACKGUI_INFOAREA_H
+#ifndef SWIFT_GUI_INFOAREA_H
+#define SWIFT_GUI_INFOAREA_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/enableforframelesswindow.h"
+#include "gui/swiftguiexport.h"
+#include "gui/enableforframelesswindow.h"
 #include "misc/statusmessage.h"
 #include "misc/statusmessagelist.h"
 
@@ -30,14 +30,14 @@ class QPoint;
 class QTabBar;
 class QWidget;
 
-namespace BlackGui
+namespace swift::gui
 {
     class CDockWidget;
     class CDockWidgetInfoArea;
 
     //! Info area, hosting dockable widgets
     //! \sa CDockWidgetInfoArea
-    class BLACKGUI_EXPORT CInfoArea : public QMainWindow, CEnableForFramelessWindow
+    class SWIFT_GUI_EXPORT CInfoArea : public QMainWindow, CEnableForFramelessWindow
     {
         Q_OBJECT
 
diff --git a/src/blackgui/labelandicon.cpp b/src/gui/labelandicon.cpp
similarity index 93%
rename from src/blackgui/labelandicon.cpp
rename to src/gui/labelandicon.cpp
index 2dd7cab22..c3b2aa308 100644
--- a/src/blackgui/labelandicon.cpp
+++ b/src/gui/labelandicon.cpp
@@ -1,12 +1,12 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/labelandicon.h"
+#include "gui/labelandicon.h"
 #include "ui_labelandicon.h"
 
 #include <QLabel>
 
-namespace BlackGui
+namespace swift::gui
 {
     CLabelAndIcon::CLabelAndIcon(QWidget *parent) : QFrame(parent),
                                                     ui(new Ui::CLabelAndIcon)
diff --git a/src/blackgui/labelandicon.h b/src/gui/labelandicon.h
similarity index 82%
rename from src/blackgui/labelandicon.h
rename to src/gui/labelandicon.h
index d9ea7f605..8ba8a2b75 100644
--- a/src/blackgui/labelandicon.h
+++ b/src/gui/labelandicon.h
@@ -1,10 +1,10 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#ifndef BLACKGUI_LABELANDICON_H
-#define BLACKGUI_LABELANDICON_H
+#ifndef SWIFT_GUI_LABELANDICON_H
+#define SWIFT_GUI_LABELANDICON_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 
 #include <QFrame>
 #include <QObject>
@@ -19,12 +19,12 @@ namespace Ui
     class CLabelAndIcon;
 }
 
-namespace BlackGui
+namespace swift::gui
 {
     /*!
      * Label and icon frame
      */
-    class BLACKGUI_EXPORT CLabelAndIcon : public QFrame
+    class SWIFT_GUI_EXPORT CLabelAndIcon : public QFrame
     {
         Q_OBJECT
 
diff --git a/src/blackgui/labelandicon.ui b/src/gui/labelandicon.ui
similarity index 100%
rename from src/blackgui/labelandicon.ui
rename to src/gui/labelandicon.ui
diff --git a/src/blackgui/led.cpp b/src/gui/led.cpp
similarity index 99%
rename from src/blackgui/led.cpp
rename to src/gui/led.cpp
index f39a72987..8de649b81 100644
--- a/src/blackgui/led.cpp
+++ b/src/gui/led.cpp
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 // Class based on qLed: Copyright (C) 2010 by P. Sereno, http://www.sereno-online.com
 
-#include "blackgui/led.h"
+#include "gui/led.h"
 
 #include <QImage>
 #include <QList>
@@ -17,7 +17,7 @@
 #include <Qt>
 #include <QtGlobal>
 
-namespace BlackGui
+namespace swift::gui
 {
     CLedWidget::CLedWidget(QWidget *parent) : QWidget(parent), m_renderer(new QSvgRenderer)
     {
diff --git a/src/blackgui/led.h b/src/gui/led.h
similarity index 97%
rename from src/blackgui/led.h
rename to src/gui/led.h
index f26ab51c1..1fc59fd6c 100644
--- a/src/blackgui/led.h
+++ b/src/gui/led.h
@@ -4,10 +4,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_LEDWIDGET_H
-#define BLACKGUI_LEDWIDGET_H
+#ifndef SWIFT_GUI_LEDWIDGET_H
+#define SWIFT_GUI_LEDWIDGET_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 
 #include <QList>
 #include <QObject>
@@ -21,11 +21,11 @@ class QMouseEvent;
 class QPaintEvent;
 class QSvgRenderer;
 
-namespace BlackGui
+namespace swift::gui
 {
     //! Displaying an LED as widget. Non copyable.
     //! \remarks Based on qLed
-    class BLACKGUI_EXPORT CLedWidget : public QWidget
+    class SWIFT_GUI_EXPORT CLedWidget : public QWidget
     {
         Q_OBJECT
 
diff --git a/src/blackgui/levelmeter.cpp b/src/gui/levelmeter.cpp
similarity index 97%
rename from src/blackgui/levelmeter.cpp
rename to src/gui/levelmeter.cpp
index 7eed2f70e..e7e9e9b32 100644
--- a/src/blackgui/levelmeter.cpp
+++ b/src/gui/levelmeter.cpp
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 // Class based on qt example: Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies)
 
-#include "blackgui/levelmeter.h"
+#include "gui/levelmeter.h"
 
 #include <math.h>
 #include <QPainter>
@@ -12,7 +12,7 @@
 #include <Qt>
 #include <QtGlobal>
 
-namespace BlackGui
+namespace swift::gui
 {
     CLevelMeter::CLevelMeter(QWidget *parent)
         : QFrame(parent),
diff --git a/src/blackgui/levelmeter.h b/src/gui/levelmeter.h
similarity index 93%
rename from src/blackgui/levelmeter.h
rename to src/gui/levelmeter.h
index 55ad2a04d..664d240dc 100644
--- a/src/blackgui/levelmeter.h
+++ b/src/gui/levelmeter.h
@@ -4,10 +4,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_LEVELMETER_H
-#define BLACKGUI_LEVELMETER_H
+#ifndef SWIFT_GUI_LEVELMETER_H
+#define SWIFT_GUI_LEVELMETER_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 
 #include <QColor>
 #include <QObject>
@@ -17,11 +17,11 @@
 class QPaintEvent;
 class QTimer;
 
-namespace BlackGui
+namespace swift::gui
 {
     //! Widget which displays a audio level meter, indicating the
     //! level and peak levels of the window of audio samples most recently analyzed
-    class BLACKGUI_EXPORT CLevelMeter : public QFrame
+    class SWIFT_GUI_EXPORT CLevelMeter : public QFrame
     {
         Q_OBJECT
 
diff --git a/src/blackgui/lineedithistory.cpp b/src/gui/lineedithistory.cpp
similarity index 99%
rename from src/blackgui/lineedithistory.cpp
rename to src/gui/lineedithistory.cpp
index 651439978..6f926c9d8 100644
--- a/src/blackgui/lineedithistory.cpp
+++ b/src/gui/lineedithistory.cpp
@@ -5,7 +5,7 @@
 #include <QKeyEvent>
 #include <QMenu>
 
-namespace BlackGui
+namespace swift::gui
 {
     QString CLineEditHistory::getLastEnteredLine() const
     {
diff --git a/src/blackgui/lineedithistory.h b/src/gui/lineedithistory.h
similarity index 87%
rename from src/blackgui/lineedithistory.h
rename to src/gui/lineedithistory.h
index 1ab336edf..975dba279 100644
--- a/src/blackgui/lineedithistory.h
+++ b/src/gui/lineedithistory.h
@@ -3,20 +3,20 @@
 
 //! \file
 
-#ifndef BLACKGUI_LINEEDITHISTORY_H
-#define BLACKGUI_LINEEDITHISTORY_H
+#ifndef SWIFT_GUI_LINEEDITHISTORY_H
+#define SWIFT_GUI_LINEEDITHISTORY_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include <QLineEdit>
 #include <QStringList>
 
-namespace BlackGui
+namespace swift::gui
 {
     /*!
      * Line edit with history
      * \details lines are trimmed and empty lines are ignored
      */
-    class BLACKGUI_EXPORT CLineEditHistory : public QLineEdit
+    class SWIFT_GUI_EXPORT CLineEditHistory : public QLineEdit
     {
         Q_OBJECT
 
diff --git a/src/blackgui/loadindicator.cpp b/src/gui/loadindicator.cpp
similarity index 99%
rename from src/blackgui/loadindicator.cpp
rename to src/gui/loadindicator.cpp
index 9d85889e6..a05ea0d2b 100644
--- a/src/blackgui/loadindicator.cpp
+++ b/src/gui/loadindicator.cpp
@@ -3,7 +3,7 @@
 // Class based on qLed: Copyright (C) 2010 by P. Sereno, http://www.sereno-online.com
 
 #include "loadindicator.h"
-#include "blackgui/guiapplication.h"
+#include "gui/guiapplication.h"
 #include "misc/verify.h"
 #include "misc/threadutils.h"
 
@@ -16,7 +16,7 @@
 
 using namespace swift::misc;
 
-namespace BlackGui
+namespace swift::gui
 {
     CLoadIndicator::CLoadIndicator(int width, int height, QWidget *parent)
         : QWidget(parent)
diff --git a/src/blackgui/loadindicator.h b/src/gui/loadindicator.h
similarity index 95%
rename from src/blackgui/loadindicator.h
rename to src/gui/loadindicator.h
index 197bc29d2..f66226e6c 100644
--- a/src/blackgui/loadindicator.h
+++ b/src/gui/loadindicator.h
@@ -4,10 +4,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_LOADINDICATOR_H
-#define BLACKGUI_LOADINDICATOR_H
+#ifndef SWIFT_GUI_LOADINDICATOR_H
+#define SWIFT_GUI_LOADINDICATOR_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 
 #include <QColor>
 #include <QObject>
@@ -20,14 +20,14 @@ class QPaintEvent;
 class QPainter;
 class QTimerEvent;
 
-namespace BlackGui
+namespace swift::gui
 {
     /*!
      * The QProgressIndicator class lets an application display a progress indicator to show that a lengthy task is under way.
      * Progress indicators are indeterminate and do nothing more than spin to show that the application is busy.
      * \note based on https://github.com/mojocorp/QProgressIndicator under MIT license
      */
-    class BLACKGUI_EXPORT CLoadIndicator : public QWidget
+    class SWIFT_GUI_EXPORT CLoadIndicator : public QWidget
     {
         Q_OBJECT
 
@@ -117,7 +117,7 @@ namespace BlackGui
     /*!
      * Enable widget class for load indicator
      */
-    class BLACKGUI_EXPORT CLoadIndicatorEnabled
+    class SWIFT_GUI_EXPORT CLoadIndicatorEnabled
     {
     public:
         //! Ctor
diff --git a/src/blackgui/loginmodebuttons.cpp b/src/gui/loginmodebuttons.cpp
similarity index 95%
rename from src/blackgui/loginmodebuttons.cpp
rename to src/gui/loginmodebuttons.cpp
index 5c7444bc6..6dd4a3aad 100644
--- a/src/blackgui/loginmodebuttons.cpp
+++ b/src/gui/loginmodebuttons.cpp
@@ -4,8 +4,8 @@
 #include "ui_loginmodebuttons.h"
 
 #include "config/buildconfig.h"
-#include "blackgui/loginmodebuttons.h"
-#include "blackgui/guiapplication.h"
+#include "gui/loginmodebuttons.h"
+#include "gui/guiapplication.h"
 #include "core/context/contextsimulator.h"
 #include "misc/verify.h"
 
@@ -16,7 +16,7 @@ using namespace swift::core;
 using namespace swift::core::context;
 using namespace swift::misc::network;
 
-namespace BlackGui
+namespace swift::gui
 {
     CLoginModeButtons::CLoginModeButtons(QWidget *parent) : QFrame(parent),
                                                             ui(new Ui::CLoginModeButtons)
@@ -30,7 +30,7 @@ namespace BlackGui
     CLoginModeButtons::~CLoginModeButtons()
     {}
 
-    CLoginMode BlackGui::CLoginModeButtons::getLoginMode() const
+    CLoginMode swift::gui::CLoginModeButtons::getLoginMode() const
     {
         CLoginMode mode = CLoginMode::Pilot;
         if (ui->rb_LoginObserver->isChecked())
diff --git a/src/blackgui/loginmodebuttons.h b/src/gui/loginmodebuttons.h
similarity index 84%
rename from src/blackgui/loginmodebuttons.h
rename to src/gui/loginmodebuttons.h
index 549da81e0..9b5ebab55 100644
--- a/src/blackgui/loginmodebuttons.h
+++ b/src/gui/loginmodebuttons.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_LOGINMODEBUTTONS_H
-#define BLACKGUI_LOGINMODEBUTTONS_H
+#ifndef SWIFT_GUI_LOGINMODEBUTTONS_H
+#define SWIFT_GUI_LOGINMODEBUTTONS_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include "misc/network/connectionstatus.h"
 #include "misc/network/loginmode.h"
 
@@ -18,10 +18,10 @@ namespace Ui
 {
     class CLoginModeButtons;
 }
-namespace BlackGui
+namespace swift::gui
 {
     //! Display login modes (normal, stealth, ...)
-    class BLACKGUI_EXPORT CLoginModeButtons : public QFrame
+    class SWIFT_GUI_EXPORT CLoginModeButtons : public QFrame
     {
         Q_OBJECT
 
diff --git a/src/blackgui/loginmodebuttons.ui b/src/gui/loginmodebuttons.ui
similarity index 100%
rename from src/blackgui/loginmodebuttons.ui
rename to src/gui/loginmodebuttons.ui
diff --git a/src/blackgui/mainwindowaccess.cpp b/src/gui/mainwindowaccess.cpp
similarity index 88%
rename from src/blackgui/mainwindowaccess.cpp
rename to src/gui/mainwindowaccess.cpp
index 0b02b0631..8dfd6e223 100644
--- a/src/blackgui/mainwindowaccess.cpp
+++ b/src/gui/mainwindowaccess.cpp
@@ -1,14 +1,14 @@
 // SPDX-FileCopyrightText: Copyright (C) 2016 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/logcomponent.h"
-#include "blackgui/mainwindowaccess.h"
-#include "blackgui/managedstatusbar.h"
-#include "blackgui/overlaymessagesframe.h"
+#include "gui/components/logcomponent.h"
+#include "gui/mainwindowaccess.h"
+#include "gui/managedstatusbar.h"
+#include "gui/overlaymessagesframe.h"
 
 using namespace swift::misc;
 
-namespace BlackGui
+namespace swift::gui
 {
     IMainWindowAccess::~IMainWindowAccess()
     {
diff --git a/src/blackgui/mainwindowaccess.h b/src/gui/mainwindowaccess.h
similarity index 81%
rename from src/blackgui/mainwindowaccess.h
rename to src/gui/mainwindowaccess.h
index d953e7112..ee22306cd 100644
--- a/src/blackgui/mainwindowaccess.h
+++ b/src/gui/mainwindowaccess.h
@@ -1,20 +1,20 @@
 // SPDX-FileCopyrightText: Copyright (C) 2016 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#ifndef BLACKGUI_MAINWINDOWACCESS_H
-#define BLACKGUI_MAINWINDOWACCESS_H
+#ifndef SWIFT_GUI_MAINWINDOWACCESS_H
+#define SWIFT_GUI_MAINWINDOWACCESS_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include "misc/statusmessagelist.h"
 
 #include <QObject>
 #include <QString>
 
-namespace BlackGui
+namespace swift::gui
 {
     class CManagedStatusBar;
     class COverlayMessagesFrame;
-    namespace Components
+    namespace components
     {
         class CLogComponent;
     }
@@ -22,7 +22,7 @@ namespace BlackGui
     /*!
      * Direct acccess to main window`s status bar, info bar and such
      */
-    class BLACKGUI_EXPORT IMainWindowAccess
+    class SWIFT_GUI_EXPORT IMainWindowAccess
     {
     public:
         //! Destructor
@@ -50,12 +50,12 @@ namespace BlackGui
         virtual bool displayInOverlayWindow(const QString &html, int timeOutMs = -1);
 
     protected:
-        Components::CLogComponent *m_mwaLogComponent = nullptr; //!< the log component if any
+        components::CLogComponent *m_mwaLogComponent = nullptr; //!< the log component if any
         CManagedStatusBar *m_mwaStatusBar = nullptr; //!< status bar if any
         COverlayMessagesFrame *m_mwaOverlayFrame = nullptr; //!< overlay messages if any
     };
 } // ns
 
-Q_DECLARE_INTERFACE(BlackGui::IMainWindowAccess, "org.swift-project.blackgui.mainwindowaccess")
+Q_DECLARE_INTERFACE(swift::gui::IMainWindowAccess, "org.swift-project.swiftgui.mainwindowaccess")
 
 #endif // guard
diff --git a/src/blackgui/managedstatusbar.cpp b/src/gui/managedstatusbar.cpp
similarity index 99%
rename from src/blackgui/managedstatusbar.cpp
rename to src/gui/managedstatusbar.cpp
index b89b44fd0..fa9f9cf60 100644
--- a/src/blackgui/managedstatusbar.cpp
+++ b/src/gui/managedstatusbar.cpp
@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright (C) 2014 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/managedstatusbar.h"
+#include "gui/managedstatusbar.h"
 #include "misc/iterator.h"
 #include "misc/sequence.h"
 
@@ -17,7 +17,7 @@
 
 using namespace swift::misc;
 
-namespace BlackGui
+namespace swift::gui
 {
     CManagedStatusBar::CManagedStatusBar(QObject *parent) : QObject(parent)
     {
diff --git a/src/blackgui/managedstatusbar.h b/src/gui/managedstatusbar.h
similarity index 93%
rename from src/blackgui/managedstatusbar.h
rename to src/gui/managedstatusbar.h
index 1720a77ca..5795c192e 100644
--- a/src/blackgui/managedstatusbar.h
+++ b/src/gui/managedstatusbar.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_MANAGEDSTATUSBAR_H
-#define BLACKGUI_MANAGEDSTATUSBAR_H
+#ifndef SWIFT_GUI_MANAGEDSTATUSBAR_H
+#define SWIFT_GUI_MANAGEDSTATUSBAR_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include "misc/statusmessage.h"
 #include "misc/statusmessagelist.h"
 #include <QObject>
@@ -16,10 +16,10 @@
 class QLabel;
 class QStatusBar;
 
-namespace BlackGui
+namespace swift::gui
 {
     //! Managed status bar
-    class BLACKGUI_EXPORT CManagedStatusBar : public QObject
+    class SWIFT_GUI_EXPORT CManagedStatusBar : public QObject
     {
         Q_OBJECT
 
diff --git a/src/blackgui/menus/aircraftmodelmenus.cpp b/src/gui/menus/aircraftmodelmenus.cpp
similarity index 98%
rename from src/blackgui/menus/aircraftmodelmenus.cpp
rename to src/gui/menus/aircraftmodelmenus.cpp
index a6a378e1f..d6ee2a5e0 100644
--- a/src/blackgui/menus/aircraftmodelmenus.cpp
+++ b/src/gui/menus/aircraftmodelmenus.cpp
@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "aircraftmodelmenus.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/components/dbmappingcomponent.h"
-#include "blackgui/components/dbmappingcomponentaware.h"
+#include "gui/guiapplication.h"
+#include "gui/components/dbmappingcomponent.h"
+#include "gui/components/dbmappingcomponentaware.h"
 #include "core/webdataservices.h"
 #include "core/db/databaseutils.h"
 #include "misc/verify.h"
@@ -18,13 +18,13 @@
 using namespace swift::config;
 using namespace swift::misc;
 using namespace swift::misc::simulation;
-using namespace BlackGui;
-using namespace BlackGui::Views;
-using namespace BlackGui::Models;
-using namespace BlackGui::Components;
+using namespace swift::gui;
+using namespace swift::gui::views;
+using namespace swift::gui::models;
+using namespace swift::gui::components;
 using namespace swift::core::db;
 
-namespace BlackGui::Menus
+namespace swift::gui::menus
 {
     void IAircraftModelViewMenu::anchor()
     {}
@@ -460,7 +460,7 @@ namespace BlackGui::Menus
         return qobject_cast<ISimulatorSelectable *>(m_modelsTarget);
     }
 
-    Components::CDbMappingComponent *CConsolidateWithSimulatorModels::getMappingComponent() const
+    components::CDbMappingComponent *CConsolidateWithSimulatorModels::getMappingComponent() const
     {
         // try to cast target
         CDbMappingComponent *mc = nullptr;
diff --git a/src/blackgui/menus/aircraftmodelmenus.h b/src/gui/menus/aircraftmodelmenus.h
similarity index 85%
rename from src/blackgui/menus/aircraftmodelmenus.h
rename to src/gui/menus/aircraftmodelmenus.h
index 18a2571da..57b5d6c7d 100644
--- a/src/blackgui/menus/aircraftmodelmenus.h
+++ b/src/gui/menus/aircraftmodelmenus.h
@@ -1,12 +1,12 @@
 // SPDX-FileCopyrightText: Copyright (C) 2016 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#ifndef BLACKGUI_MENUS_AIRCRAFTMODELMENUS_H
-#define BLACKGUI_MENUS_AIRCRAFTMODELMENUS_H
+#ifndef SWIFT_GUI_MENUS_AIRCRAFTMODELMENUS_H
+#define SWIFT_GUI_MENUS_AIRCRAFTMODELMENUS_H
 
-#include "blackgui/menus/menudelegate.h"
-#include "blackgui/overlaymessagesframe.h"
-#include "blackgui/views/aircraftmodelview.h"
+#include "gui/menus/menudelegate.h"
+#include "gui/overlaymessagesframe.h"
+#include "gui/views/aircraftmodelview.h"
 #include "misc/simulation/aircraftmodelinterfaces.h"
 
 #include <QMenu>
@@ -14,13 +14,13 @@
 
 class QAction;
 
-namespace BlackGui
+namespace swift::gui
 {
-    namespace Components
+    namespace components
     {
         class CDbMappingComponent;
     }
-    namespace Menus
+    namespace menus
     {
         //! Menu base class for aircraft model view menus
         class IAircraftModelViewMenu : public IMenuDelegate
@@ -31,7 +31,7 @@ namespace BlackGui
 
         public:
             //! Constructor
-            IAircraftModelViewMenu(BlackGui::Views::CAircraftModelView *modelView) : IMenuDelegate(modelView)
+            IAircraftModelViewMenu(swift::gui::views::CAircraftModelView *modelView) : IMenuDelegate(modelView)
             {}
 
             //! Log.categories
@@ -39,7 +39,7 @@ namespace BlackGui
 
         protected:
             //! Model view
-            BlackGui::Views::CAircraftModelView *modelView() const;
+            swift::gui::views::CAircraftModelView *modelView() const;
 
             //! Get aircraft models
             const swift::misc::simulation::CAircraftModelList &getAircraftModels() const;
@@ -58,7 +58,7 @@ namespace BlackGui
 
         public:
             //! Constructor
-            CShowSimulatorFileMenu(Views::CAircraftModelView *modelView, COverlayMessagesFrame *messageFrame);
+            CShowSimulatorFileMenu(views::CAircraftModelView *modelView, COverlayMessagesFrame *messageFrame);
 
             //! Log.categories
             static const QStringList &getLogCategories();
@@ -71,7 +71,7 @@ namespace BlackGui
             void displayIcon(); //!< aircraft icon if any
             void startModelConverterX(); //!< show in model converter X
 
-            BlackGui::COverlayMessagesFrame *m_messageFrame = nullptr;
+            swift::gui::COverlayMessagesFrame *m_messageFrame = nullptr;
             QAction *m_fileAction = nullptr;
             QAction *m_iconAction = nullptr;
             QAction *m_modelConverterX = nullptr;
@@ -87,7 +87,7 @@ namespace BlackGui
             using IAircraftModelViewMenu::IAircraftModelViewMenu;
 
             //! Constructor
-            CConsolidateWithDbDataMenu(BlackGui::Views::CAircraftModelView *modelView, QObject *modelsTarget);
+            CConsolidateWithDbDataMenu(swift::gui::views::CAircraftModelView *modelView, QObject *modelsTarget);
 
             //! Log.categories
             static const QStringList &getLogCategories();
@@ -119,7 +119,7 @@ namespace BlackGui
             using IAircraftModelViewMenu::IAircraftModelViewMenu;
 
             //! Constructor
-            CConsolidateWithSimulatorModels(Views::CAircraftModelView *modelView, QObject *modelsTarget);
+            CConsolidateWithSimulatorModels(views::CAircraftModelView *modelView, QObject *modelsTarget);
 
             //! Log.categories
             static const QStringList &getLogCategories();
@@ -145,7 +145,7 @@ namespace BlackGui
             swift::misc::simulation::IModelsForSimulatorSetable *modelsTargetSetable() const;
             swift::misc::simulation::IModelsForSimulatorUpdatable *modelsTargetUpdatable() const;
             swift::misc::simulation::ISimulatorSelectable *simulatorSelectable() const;
-            BlackGui::Components::CDbMappingComponent *getMappingComponent() const;
+            swift::gui::components::CDbMappingComponent *getMappingComponent() const;
 
             QObject *m_modelsTarget = nullptr; //!< optional target for setting/updating the models
             QAction *m_consolidateAll = nullptr; //!< consolidate data with DB (all)
diff --git a/src/blackgui/menus/fontmenus.cpp b/src/gui/menus/fontmenus.cpp
similarity index 96%
rename from src/blackgui/menus/fontmenus.cpp
rename to src/gui/menus/fontmenus.cpp
index 4ba3ddccb..1c5ec8ca5 100644
--- a/src/blackgui/menus/fontmenus.cpp
+++ b/src/gui/menus/fontmenus.cpp
@@ -2,15 +2,15 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "fontmenus.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/shortcut.h"
+#include "gui/guiapplication.h"
+#include "gui/shortcut.h"
 #include "misc/verify.h"
 #include <QShortcut>
 
 using namespace swift::misc;
-using namespace BlackGui::Components;
+using namespace swift::gui::components;
 
-namespace BlackGui::Menus
+namespace swift::gui::menus
 {
     const QStringList &CFontMenu::getLogCategories()
     {
diff --git a/src/blackgui/menus/fontmenus.h b/src/gui/menus/fontmenus.h
similarity index 81%
rename from src/blackgui/menus/fontmenus.h
rename to src/gui/menus/fontmenus.h
index 2e37ccfdb..3e5de91aa 100644
--- a/src/blackgui/menus/fontmenus.h
+++ b/src/gui/menus/fontmenus.h
@@ -1,13 +1,13 @@
 // SPDX-FileCopyrightText: Copyright (C) 2017 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#ifndef BLACKGUI_MENUS_FONTMENUS_H
-#define BLACKGUI_MENUS_FONTMENUS_H
+#ifndef SWIFT_GUI_MENUS_FONTMENUS_H
+#define SWIFT_GUI_MENUS_FONTMENUS_H
 
-#include "blackgui/components/settingsfontdialog.h"
-#include "blackgui/menus/menudelegate.h"
-#include "blackgui/views/aircraftmodelview.h"
-#include "blackgui/overlaymessagesframe.h"
+#include "gui/components/settingsfontdialog.h"
+#include "gui/menus/menudelegate.h"
+#include "gui/views/aircraftmodelview.h"
+#include "gui/overlaymessagesframe.h"
 #include "misc/simulation/aircraftmodelinterfaces.h"
 
 #include <QObject>
@@ -15,7 +15,7 @@
 class QAction;
 class QShortcut;
 
-namespace BlackGui::Menus
+namespace swift::gui::menus
 {
     //! Standard font (size, style) menus.
     //! Can be used as nested menu or via getActions added manually
@@ -57,7 +57,7 @@ namespace BlackGui::Menus
         QShortcut *m_fontSizeMinusShortcut = nullptr; //! owned by widget
         QShortcut *m_fontResetShortcut = nullptr; //! owned by widget
         QScopedPointer<QAction> m_fontDialogAction;
-        QScopedPointer<BlackGui::Components::CSettingsFontDialog> m_dialog;
+        QScopedPointer<swift::gui::components::CSettingsFontDialog> m_dialog;
     };
 } // ns
 
diff --git a/src/blackgui/menus/menuaction.cpp b/src/gui/menus/menuaction.cpp
similarity index 99%
rename from src/blackgui/menus/menuaction.cpp
rename to src/gui/menus/menuaction.cpp
index 7bff23b37..392eff57d 100644
--- a/src/blackgui/menus/menuaction.cpp
+++ b/src/gui/menus/menuaction.cpp
@@ -1,8 +1,8 @@
 // SPDX-FileCopyrightText: Copyright (C) 2016 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/menus/menuaction.h"
-#include "blackgui/guiapplication.h"
+#include "gui/menus/menuaction.h"
+#include "gui/guiapplication.h"
 #include "core/webdataservices.h"
 #include "misc/icons.h"
 #include "misc/slot.h"
@@ -17,7 +17,7 @@
 
 using namespace swift::misc;
 
-namespace BlackGui::Menus
+namespace swift::gui::menus
 {
     CMenuAction::CMenuAction(const QIcon &icon, const QString &title, const QString &path, bool separator) : m_icon(icon), m_title(title), m_path(path.trimmed()), m_separator(separator)
     {}
diff --git a/src/blackgui/menus/menuaction.h b/src/gui/menus/menuaction.h
similarity index 99%
rename from src/blackgui/menus/menuaction.h
rename to src/gui/menus/menuaction.h
index c3c40be79..ada8a396b 100644
--- a/src/blackgui/menus/menuaction.h
+++ b/src/gui/menus/menuaction.h
@@ -1,8 +1,8 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#ifndef BLACKGUI_MENUS_MENUACTION_H
-#define BLACKGUI_MENUS_MENUACTION_H
+#ifndef SWIFT_GUI_MENUS_MENUACTION_H
+#define SWIFT_GUI_MENUS_MENUACTION_H
 
 #include "misc/slot.h"
 
@@ -17,7 +17,7 @@ class QAction;
 class QMenu;
 class QObject;
 
-namespace BlackGui::Menus
+namespace swift::gui::menus
 {
     /*!
      * Wraps a QAction with extra metadata to allow proper sorting for a QMenu
diff --git a/src/blackgui/menus/menudelegate.h b/src/gui/menus/menudelegate.h
similarity index 92%
rename from src/blackgui/menus/menudelegate.h
rename to src/gui/menus/menudelegate.h
index c14eb93b9..e08079d80 100644
--- a/src/blackgui/menus/menudelegate.h
+++ b/src/gui/menus/menudelegate.h
@@ -1,18 +1,18 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#ifndef BLACKGUI_MENUS_MENUDELEGATE_H
-#define BLACKGUI_MENUS_MENUDELEGATE_H
+#ifndef SWIFT_GUI_MENUS_MENUDELEGATE_H
+#define SWIFT_GUI_MENUS_MENUDELEGATE_H
 
 #include "misc/logcategories.h"
-#include "blackgui/menus/menuaction.h"
+#include "gui/menus/menuaction.h"
 
 #include <QMenu>
 #include <QObject>
 
 class QWidget;
 
-namespace BlackGui::Menus
+namespace swift::gui::menus
 {
     /*!
      * Interface to implement a custom menu
diff --git a/src/blackgui/models/actionhotkeylistmodel.cpp b/src/gui/models/actionhotkeylistmodel.cpp
similarity index 97%
rename from src/blackgui/models/actionhotkeylistmodel.cpp
rename to src/gui/models/actionhotkeylistmodel.cpp
index 8587e8760..d5aa7ba4c 100644
--- a/src/blackgui/models/actionhotkeylistmodel.cpp
+++ b/src/gui/models/actionhotkeylistmodel.cpp
@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/models/actionhotkeylistmodel.h"
+#include "gui/models/actionhotkeylistmodel.h"
 #include "misc/identifier.h"
 #include "misc/input/actionhotkey.h"
 #include "misc/input/hotkeycombination.h"
@@ -13,7 +13,7 @@
 using namespace swift::misc;
 using namespace swift::misc::input;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     CActionHotkeyListModel::CActionHotkeyListModel(QObject *parent) : QAbstractTableModel(parent)
     {}
diff --git a/src/blackgui/models/actionhotkeylistmodel.h b/src/gui/models/actionhotkeylistmodel.h
similarity index 88%
rename from src/blackgui/models/actionhotkeylistmodel.h
rename to src/gui/models/actionhotkeylistmodel.h
index a5459532d..e5308c0b1 100644
--- a/src/blackgui/models/actionhotkeylistmodel.h
+++ b/src/gui/models/actionhotkeylistmodel.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_MODELS_ACTIONHOTKEYLISTMODEL_H
-#define BLACKGUI_MODELS_ACTIONHOTKEYLISTMODEL_H
+#ifndef SWIFT_GUI_MODELS_ACTIONHOTKEYLISTMODEL_H
+#define SWIFT_GUI_MODELS_ACTIONHOTKEYLISTMODEL_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include "misc/input/actionhotkeylist.h"
 
 #include <QAbstractTableModel>
@@ -17,10 +17,10 @@
 
 class QModelIndex;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     //! Hotkey list model
-    class BLACKGUI_EXPORT CActionHotkeyListModel : public QAbstractTableModel
+    class SWIFT_GUI_EXPORT CActionHotkeyListModel : public QAbstractTableModel
     {
         Q_OBJECT
 
diff --git a/src/blackgui/models/actionitem.cpp b/src/gui/models/actionitem.cpp
similarity index 96%
rename from src/blackgui/models/actionitem.cpp
rename to src/gui/models/actionitem.cpp
index be4b70013..ea2a3701b 100644
--- a/src/blackgui/models/actionitem.cpp
+++ b/src/gui/models/actionitem.cpp
@@ -1,12 +1,12 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/models/actionitem.h"
+#include "gui/models/actionitem.h"
 #include <QtAlgorithms>
 
 using namespace swift::misc;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     CActionItem::CActionItem(const QString &action, const QString &name, CActionItem *parentItem) : m_action(action), m_actionName(name), m_parentItem(parentItem)
     {}
diff --git a/src/blackgui/models/actionitem.h b/src/gui/models/actionitem.h
similarity index 95%
rename from src/blackgui/models/actionitem.h
rename to src/gui/models/actionitem.h
index f2a278272..92fb326f7 100644
--- a/src/blackgui/models/actionitem.h
+++ b/src/gui/models/actionitem.h
@@ -3,15 +3,15 @@
 
 //! \file
 
-#ifndef BLACKGUI_MODELS_ACTIONITEM_H
-#define BLACKGUI_MODELS_ACTIONITEM_H
+#ifndef SWIFT_GUI_MODELS_ACTIONITEM_H
+#define SWIFT_GUI_MODELS_ACTIONITEM_H
 
 #include "misc/icons.h"
 #include <QList>
 #include <QString>
 #include <QPixmap>
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     //! One single action item in a tree
     class CActionItem
diff --git a/src/blackgui/models/actionmodel.cpp b/src/gui/models/actionmodel.cpp
similarity index 97%
rename from src/blackgui/models/actionmodel.cpp
rename to src/gui/models/actionmodel.cpp
index cb802dfcd..a6c49b635 100644
--- a/src/blackgui/models/actionmodel.cpp
+++ b/src/gui/models/actionmodel.cpp
@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "core/application.h"
-#include "blackgui/models/actionitem.h"
-#include "blackgui/models/actionmodel.h"
+#include "gui/models/actionitem.h"
+#include "gui/models/actionmodel.h"
 #include "misc/icons.h"
 
 #include <QString>
@@ -14,7 +14,7 @@
 using namespace swift::misc;
 using namespace swift::core;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     CActionModel::CActionModel(QObject *parent) : QAbstractItemModel(parent),
                                                   m_rootItem(new CActionItem(QString(), QString()))
diff --git a/src/blackgui/models/actionmodel.h b/src/gui/models/actionmodel.h
similarity index 88%
rename from src/blackgui/models/actionmodel.h
rename to src/gui/models/actionmodel.h
index 04cef3120..1ed3b6263 100644
--- a/src/blackgui/models/actionmodel.h
+++ b/src/gui/models/actionmodel.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_MODELS_ACTIONMODEL_H
-#define BLACKGUI_MODELS_ACTIONMODEL_H
+#ifndef SWIFT_GUI_MODELS_ACTIONMODEL_H
+#define SWIFT_GUI_MODELS_ACTIONMODEL_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 
 #include <QAbstractItemModel>
 #include <QModelIndex>
@@ -15,7 +15,7 @@
 #include <QVariant>
 #include <Qt>
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     class CActionItem;
 
@@ -23,7 +23,7 @@ namespace BlackGui::Models
      * Action tree model, used with hotkey actions
      * \remark data from CInputManager
      */
-    class BLACKGUI_EXPORT CActionModel : public QAbstractItemModel
+    class SWIFT_GUI_EXPORT CActionModel : public QAbstractItemModel
     {
         Q_OBJECT
 
diff --git a/src/blackgui/models/aircraftcategorylistmodel.cpp b/src/gui/models/aircraftcategorylistmodel.cpp
similarity index 88%
rename from src/blackgui/models/aircraftcategorylistmodel.cpp
rename to src/gui/models/aircraftcategorylistmodel.cpp
index 16cfd59a0..b1080a8e0 100644
--- a/src/blackgui/models/aircraftcategorylistmodel.cpp
+++ b/src/gui/models/aircraftcategorylistmodel.cpp
@@ -1,9 +1,9 @@
 // SPDX-FileCopyrightText: Copyright (C) 2019 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/models/aircraftcategorylistmodel.h"
-#include "blackgui/models/columnformatters.h"
-#include "blackgui/models/columns.h"
+#include "gui/models/aircraftcategorylistmodel.h"
+#include "gui/models/columnformatters.h"
+#include "gui/models/columns.h"
 #include "misc/db/datastore.h"
 #include "misc/timestampbased.h"
 
@@ -12,7 +12,7 @@
 
 using namespace swift::misc::aviation;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     CAircraftCategoryListModel::CAircraftCategoryListModel(QObject *parent) : CListModelDbObjects("AircraftCategoryListModel", parent)
     {
diff --git a/src/blackgui/models/aircraftcategorylistmodel.h b/src/gui/models/aircraftcategorylistmodel.h
similarity index 69%
rename from src/blackgui/models/aircraftcategorylistmodel.h
rename to src/gui/models/aircraftcategorylistmodel.h
index 1bab430fe..42fd49018 100644
--- a/src/blackgui/models/aircraftcategorylistmodel.h
+++ b/src/gui/models/aircraftcategorylistmodel.h
@@ -3,18 +3,18 @@
 
 //! \file
 
-#ifndef BLACKGUI_MODELS_AIRCRAFTCATEGORYLISTMODEL_H
-#define BLACKGUI_MODELS_AIRCRAFTCATEGORYLISTMODEL_H
+#ifndef SWIFT_GUI_MODELS_AIRCRAFTCATEGORYLISTMODEL_H
+#define SWIFT_GUI_MODELS_AIRCRAFTCATEGORYLISTMODEL_H
 
 #include "misc/aviation/aircraftcategorylist.h"
 #include "misc/aviation/aircraftcategory.h"
-#include "blackgui/models/listmodeldbobjects.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/models/listmodeldbobjects.h"
+#include "gui/swiftguiexport.h"
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     //! Airport list model
-    class BLACKGUI_EXPORT CAircraftCategoryListModel :
+    class SWIFT_GUI_EXPORT CAircraftCategoryListModel :
         public CListModelDbObjects<swift::misc::aviation::CAircraftCategoryList, int, true>
     {
         Q_OBJECT
diff --git a/src/blackgui/models/aircraftcategorytreemodel.cpp b/src/gui/models/aircraftcategorytreemodel.cpp
similarity index 94%
rename from src/blackgui/models/aircraftcategorytreemodel.cpp
rename to src/gui/models/aircraftcategorytreemodel.cpp
index e7414d899..cb3393ba3 100644
--- a/src/blackgui/models/aircraftcategorytreemodel.cpp
+++ b/src/gui/models/aircraftcategorytreemodel.cpp
@@ -1,9 +1,9 @@
 // SPDX-FileCopyrightText: Copyright (C) 2019 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/models/aircraftcategorytreemodel.h"
-#include "blackgui/models/columnformatters.h"
-#include "blackgui/models/columns.h"
+#include "gui/models/aircraftcategorytreemodel.h"
+#include "gui/models/columnformatters.h"
+#include "gui/models/columns.h"
 #include "misc/mixin/mixincompare.h"
 #include "misc/icon.h"
 #include "misc/threadutils.h"
@@ -23,7 +23,7 @@ using namespace swift::misc;
 using namespace swift::misc::physical_quantities;
 using namespace swift::misc::aviation;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     CAircraftCategoryTreeModel::CAircraftCategoryTreeModel(QObject *parent) : QStandardItemModel(parent)
     {
diff --git a/src/blackgui/models/aircraftcategorytreemodel.h b/src/gui/models/aircraftcategorytreemodel.h
similarity index 79%
rename from src/blackgui/models/aircraftcategorytreemodel.h
rename to src/gui/models/aircraftcategorytreemodel.h
index 521a82486..5def8c620 100644
--- a/src/blackgui/models/aircraftcategorytreemodel.h
+++ b/src/gui/models/aircraftcategorytreemodel.h
@@ -3,19 +3,19 @@
 
 //! \file
 
-#ifndef BLACKGUI_MODELS_AIRCRAFTCATEGORYTREEMODEL_H
-#define BLACKGUI_MODELS_AIRCRAFTCATEGORYTREEMODEL_H
+#ifndef SWIFT_GUI_MODELS_AIRCRAFTCATEGORYTREEMODEL_H
+#define SWIFT_GUI_MODELS_AIRCRAFTCATEGORYTREEMODEL_H
 
-#include "blackgui/models/columns.h"
+#include "gui/models/columns.h"
 #include "misc/aviation/aircraftcategorylist.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 
 #include <QStandardItemModel>
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     //! ATC list model
-    class BLACKGUI_EXPORT CAircraftCategoryTreeModel : public QStandardItemModel
+    class SWIFT_GUI_EXPORT CAircraftCategoryTreeModel : public QStandardItemModel
     {
         Q_OBJECT
 
diff --git a/src/blackgui/models/aircrafticaofilter.cpp b/src/gui/models/aircrafticaofilter.cpp
similarity index 97%
rename from src/blackgui/models/aircrafticaofilter.cpp
rename to src/gui/models/aircrafticaofilter.cpp
index f027eeec2..0d1e869ec 100644
--- a/src/blackgui/models/aircrafticaofilter.cpp
+++ b/src/gui/models/aircrafticaofilter.cpp
@@ -1,12 +1,12 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/models/aircrafticaofilter.h"
+#include "gui/models/aircrafticaofilter.h"
 #include "misc/aviation/aircrafticaocode.h"
 
 using namespace swift::misc::aviation;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     CAircraftIcaoFilter::CAircraftIcaoFilter(
         int id,
diff --git a/src/blackgui/models/aircrafticaofilter.h b/src/gui/models/aircrafticaofilter.h
similarity index 83%
rename from src/blackgui/models/aircrafticaofilter.h
rename to src/gui/models/aircrafticaofilter.h
index 2343ab8e7..97156351e 100644
--- a/src/blackgui/models/aircrafticaofilter.h
+++ b/src/gui/models/aircrafticaofilter.h
@@ -3,19 +3,19 @@
 
 //! \file
 
-#ifndef BLACKGUI_AIRCRAFTICAOFILTER_H
-#define BLACKGUI_AIRCRAFTICAOFILTER_H
+#ifndef SWIFT_GUI_AIRCRAFTICAOFILTER_H
+#define SWIFT_GUI_AIRCRAFTICAOFILTER_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/models/modelfilter.h"
+#include "gui/swiftguiexport.h"
+#include "gui/models/modelfilter.h"
 #include "misc/aviation/aircrafticaocodelist.h"
 
 #include <QString>
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     //! Filter for aircraft ICAO data
-    class BLACKGUI_EXPORT CAircraftIcaoFilter :
+    class SWIFT_GUI_EXPORT CAircraftIcaoFilter :
         public IModelFilter<swift::misc::aviation::CAircraftIcaoCodeList>
     {
     public:
diff --git a/src/blackgui/models/aircrafticaolistmodel.cpp b/src/gui/models/aircrafticaolistmodel.cpp
similarity index 94%
rename from src/blackgui/models/aircrafticaolistmodel.cpp
rename to src/gui/models/aircrafticaolistmodel.cpp
index 1c2257896..3fcf4c596 100644
--- a/src/blackgui/models/aircrafticaolistmodel.cpp
+++ b/src/gui/models/aircrafticaolistmodel.cpp
@@ -1,9 +1,9 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/models/aircrafticaolistmodel.h"
-#include "blackgui/models/columnformatters.h"
-#include "blackgui/models/columns.h"
+#include "gui/models/aircrafticaolistmodel.h"
+#include "gui/models/columnformatters.h"
+#include "gui/models/columns.h"
 #include "misc/aviation/aircrafticaocode.h"
 #include "misc/db/datastore.h"
 #include "misc/timestampbased.h"
@@ -13,7 +13,7 @@
 
 using namespace swift::misc::aviation;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     CAircraftIcaoCodeListModel::CAircraftIcaoCodeListModel(QObject *parent) : CListModelDbObjects("AircraftIcaoListModel", parent)
     {
diff --git a/src/blackgui/models/aircrafticaolistmodel.h b/src/gui/models/aircrafticaolistmodel.h
similarity index 70%
rename from src/blackgui/models/aircrafticaolistmodel.h
rename to src/gui/models/aircrafticaolistmodel.h
index 595ae906e..24cc950c0 100644
--- a/src/blackgui/models/aircrafticaolistmodel.h
+++ b/src/gui/models/aircrafticaolistmodel.h
@@ -3,18 +3,18 @@
 
 //! \file
 
-#ifndef BLACKGUI_MODELS_AIRCRAFTICAOLISTMODEL_H
-#define BLACKGUI_MODELS_AIRCRAFTICAOLISTMODEL_H
+#ifndef SWIFT_GUI_MODELS_AIRCRAFTICAOLISTMODEL_H
+#define SWIFT_GUI_MODELS_AIRCRAFTICAOLISTMODEL_H
 
 #include "misc/aviation/aircrafticaocodelist.h"
 #include "misc/aviation/aircrafticaocode.h"
-#include "blackgui/models/listmodeldbobjects.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/models/listmodeldbobjects.h"
+#include "gui/swiftguiexport.h"
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     //! Airport list model
-    class BLACKGUI_EXPORT CAircraftIcaoCodeListModel :
+    class SWIFT_GUI_EXPORT CAircraftIcaoCodeListModel :
         public CListModelDbObjects<swift::misc::aviation::CAircraftIcaoCodeList, int, true>
     {
         Q_OBJECT
diff --git a/src/blackgui/models/aircraftmodelfilter.cpp b/src/gui/models/aircraftmodelfilter.cpp
similarity index 99%
rename from src/blackgui/models/aircraftmodelfilter.cpp
rename to src/gui/models/aircraftmodelfilter.cpp
index 25ad91f6e..076783715 100644
--- a/src/blackgui/models/aircraftmodelfilter.cpp
+++ b/src/gui/models/aircraftmodelfilter.cpp
@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/models/aircraftmodelfilter.h"
+#include "gui/models/aircraftmodelfilter.h"
 #include "misc/aviation/aircrafticaocode.h"
 #include "misc/aviation/airlineicaocode.h"
 #include "misc/aviation/livery.h"
@@ -9,7 +9,7 @@
 
 using namespace swift::misc::simulation;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     CAircraftModelFilter::CAircraftModelFilter(int id, const QString &modelKey, const QString &description,
                                                CAircraftModel::ModelModeFilter modelMode, swift::misc::db::DbKeyStateFilter dbKeyFilter,
diff --git a/src/blackgui/models/aircraftmodelfilter.h b/src/gui/models/aircraftmodelfilter.h
similarity index 88%
rename from src/blackgui/models/aircraftmodelfilter.h
rename to src/gui/models/aircraftmodelfilter.h
index 230583f0f..f2e064b91 100644
--- a/src/blackgui/models/aircraftmodelfilter.h
+++ b/src/gui/models/aircraftmodelfilter.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_MODELS_AIRCRAFTMODELFILTER_H
-#define BLACKGUI_MODELS_AIRCRAFTMODELFILTER_H
+#ifndef SWIFT_GUI_MODELS_AIRCRAFTMODELFILTER_H
+#define SWIFT_GUI_MODELS_AIRCRAFTMODELFILTER_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/models/modelfilter.h"
+#include "gui/swiftguiexport.h"
+#include "gui/models/modelfilter.h"
 #include "misc/simulation/aircraftmodel.h"
 #include "misc/simulation/aircraftmodellist.h"
 #include "misc/simulation/distributor.h"
@@ -16,10 +16,10 @@
 
 #include <QString>
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     //! Filter for aircraft models
-    class BLACKGUI_EXPORT CAircraftModelFilter : public IModelFilter<swift::misc::simulation::CAircraftModelList>
+    class SWIFT_GUI_EXPORT CAircraftModelFilter : public IModelFilter<swift::misc::simulation::CAircraftModelList>
     {
     public:
         //! Constructor
diff --git a/src/blackgui/models/aircraftmodellistmodel.cpp b/src/gui/models/aircraftmodellistmodel.cpp
similarity index 98%
rename from src/blackgui/models/aircraftmodellistmodel.cpp
rename to src/gui/models/aircraftmodellistmodel.cpp
index 0de2d98f5..33f8a1d2e 100644
--- a/src/blackgui/models/aircraftmodellistmodel.cpp
+++ b/src/gui/models/aircraftmodellistmodel.cpp
@@ -1,9 +1,9 @@
 // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/models/aircraftmodellistmodel.h"
-#include "blackgui/models/columnformatters.h"
-#include "blackgui/models/columns.h"
+#include "gui/models/aircraftmodellistmodel.h"
+#include "gui/models/columnformatters.h"
+#include "gui/models/columns.h"
 #include "misc/aviation/aircrafticaocode.h"
 #include "misc/aviation/airlineicaocode.h"
 #include "misc/aviation/livery.h"
@@ -22,7 +22,7 @@ using namespace swift::misc::aviation;
 using namespace swift::misc::network;
 using namespace swift::misc::physical_quantities;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     CAircraftModelListModel::CAircraftModelListModel(AircraftModelMode mode, QObject *parent) : COrderableListModelDbObjects("CAircraftModelListModel", parent)
     {
diff --git a/src/blackgui/models/aircraftmodellistmodel.h b/src/gui/models/aircraftmodellistmodel.h
similarity index 89%
rename from src/blackgui/models/aircraftmodellistmodel.h
rename to src/gui/models/aircraftmodellistmodel.h
index 39cecceaa..332cfb585 100644
--- a/src/blackgui/models/aircraftmodellistmodel.h
+++ b/src/gui/models/aircraftmodellistmodel.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_MODELS_AIRCRAFTMODELLISTMODEL_H
-#define BLACKGUI_MODELS_AIRCRAFTMODELLISTMODEL_H
+#ifndef SWIFT_GUI_MODELS_AIRCRAFTMODELLISTMODEL_H
+#define SWIFT_GUI_MODELS_AIRCRAFTMODELLISTMODEL_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/models/listmodeldbobjects.h"
+#include "gui/swiftguiexport.h"
+#include "gui/models/listmodeldbobjects.h"
 #include "misc/simulation/aircraftmodellist.h"
 
 #include <QBrush>
@@ -21,10 +21,10 @@ namespace swift::misc::simulation
 {
     class CAircraftModel;
 }
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     //! Aircraft model list model
-    class BLACKGUI_EXPORT CAircraftModelListModel :
+    class SWIFT_GUI_EXPORT CAircraftModelListModel :
         public COrderableListModelDbObjects<swift::misc::simulation::CAircraftModelList, int, true>
     {
         Q_OBJECT
@@ -85,7 +85,7 @@ namespace BlackGui::Models
         //! \copydoc QAbstractItemModel::data
         virtual QVariant data(const QModelIndex &index, int role) const override;
 
-        //! \copydoc BlackGui::Models::CListModelBaseNonTemplate::isOrderable
+        //! \copydoc swift::gui::models::CListModelBaseNonTemplate::isOrderable
         virtual bool isOrderable() const override { return true; }
 
     private:
diff --git a/src/blackgui/models/aircraftpartslistmodel.cpp b/src/gui/models/aircraftpartslistmodel.cpp
similarity index 89%
rename from src/blackgui/models/aircraftpartslistmodel.cpp
rename to src/gui/models/aircraftpartslistmodel.cpp
index 78f3d53a6..614a02217 100644
--- a/src/blackgui/models/aircraftpartslistmodel.cpp
+++ b/src/gui/models/aircraftpartslistmodel.cpp
@@ -1,9 +1,9 @@
 // SPDX-FileCopyrightText: Copyright (C) 2018 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/models/aircraftpartslistmodel.h"
-#include "blackgui/models/columnformatters.h"
-#include "blackgui/models/columns.h"
+#include "gui/models/aircraftpartslistmodel.h"
+#include "gui/models/columnformatters.h"
+#include "gui/models/columns.h"
 #include "misc/aviation/aircraftpartslist.h"
 #include "misc/propertyindex.h"
 
@@ -13,7 +13,7 @@
 using namespace swift::misc;
 using namespace swift::misc::aviation;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     CAircraftPartsListModel::CAircraftPartsListModel(QObject *parent) : CListModelTimestampWithOffsetObjects<CAircraftPartsList, true>("ViewAircraftPartsList", parent)
     {
diff --git a/src/blackgui/models/aircraftpartslistmodel.h b/src/gui/models/aircraftpartslistmodel.h
similarity index 60%
rename from src/blackgui/models/aircraftpartslistmodel.h
rename to src/gui/models/aircraftpartslistmodel.h
index 32de4a4ee..44135e4d9 100644
--- a/src/blackgui/models/aircraftpartslistmodel.h
+++ b/src/gui/models/aircraftpartslistmodel.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_MODELS_AIRCRAFTPARTSLISTMODEL_H
-#define BLACKGUI_MODELS_AIRCRAFTPARTSLISTMODEL_H
+#ifndef SWIFT_GUI_MODELS_AIRCRAFTPARTSLISTMODEL_H
+#define SWIFT_GUI_MODELS_AIRCRAFTPARTSLISTMODEL_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/models/listmodeltimestampobjects.h"
+#include "gui/swiftguiexport.h"
+#include "gui/models/listmodeltimestampobjects.h"
 #include "misc/aviation/aircraftpartslist.h"
 
 #include <QVariant>
@@ -15,10 +15,10 @@
 class QModelIndex;
 class QObject;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     //! Aircraft parts list model
-    class BLACKGUI_EXPORT CAircraftPartsListModel : public CListModelTimestampWithOffsetObjects<swift::misc::aviation::CAircraftPartsList, true>
+    class SWIFT_GUI_EXPORT CAircraftPartsListModel : public CListModelTimestampWithOffsetObjects<swift::misc::aviation::CAircraftPartsList, true>
     {
         Q_OBJECT
 
diff --git a/src/blackgui/models/aircraftsituationchangelistmodel.cpp b/src/gui/models/aircraftsituationchangelistmodel.cpp
similarity index 93%
rename from src/blackgui/models/aircraftsituationchangelistmodel.cpp
rename to src/gui/models/aircraftsituationchangelistmodel.cpp
index 171c3f431..3796dd25b 100644
--- a/src/blackgui/models/aircraftsituationchangelistmodel.cpp
+++ b/src/gui/models/aircraftsituationchangelistmodel.cpp
@@ -1,9 +1,9 @@
 // SPDX-FileCopyrightText: Copyright (C) 2018 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/models/aircraftsituationchangelistmodel.h"
-#include "blackgui/models/columnformatters.h"
-#include "blackgui/models/columns.h"
+#include "gui/models/aircraftsituationchangelistmodel.h"
+#include "gui/models/columnformatters.h"
+#include "gui/models/columns.h"
 #include "misc/aviation/aircraftsituationchangelist.h"
 #include "misc/propertyindex.h"
 
@@ -13,7 +13,7 @@
 using namespace swift::misc;
 using namespace swift::misc::aviation;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     CAircraftSituationChangeListModel::CAircraftSituationChangeListModel(QObject *parent) : CListModelTimestampWithOffsetObjects<CAircraftSituationChangeList, true>("ViewAircraftPartsList", parent)
     {
diff --git a/src/blackgui/models/aircraftsituationchangelistmodel.h b/src/gui/models/aircraftsituationchangelistmodel.h
similarity index 59%
rename from src/blackgui/models/aircraftsituationchangelistmodel.h
rename to src/gui/models/aircraftsituationchangelistmodel.h
index 3004c4679..f298b6e9a 100644
--- a/src/blackgui/models/aircraftsituationchangelistmodel.h
+++ b/src/gui/models/aircraftsituationchangelistmodel.h
@@ -3,21 +3,21 @@
 
 //! \file
 
-#ifndef BLACKGUI_MODELS_AIRCRAFTSITUATIONCHANGELISTMODEL_H
-#define BLACKGUI_MODELS_AIRCRAFTSITUATIONCHANGELISTMODEL_H
+#ifndef SWIFT_GUI_MODELS_AIRCRAFTSITUATIONCHANGELISTMODEL_H
+#define SWIFT_GUI_MODELS_AIRCRAFTSITUATIONCHANGELISTMODEL_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/models/listmodeltimestampobjects.h"
+#include "gui/swiftguiexport.h"
+#include "gui/models/listmodeltimestampobjects.h"
 #include "misc/aviation/aircraftsituationchangelist.h"
 #include <QVariant>
 
 class QModelIndex;
 class QObject;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     //! Aircraft situation changes list model
-    class BLACKGUI_EXPORT CAircraftSituationChangeListModel : public CListModelTimestampWithOffsetObjects<swift::misc::aviation::CAircraftSituationChangeList, true>
+    class SWIFT_GUI_EXPORT CAircraftSituationChangeListModel : public CListModelTimestampWithOffsetObjects<swift::misc::aviation::CAircraftSituationChangeList, true>
     {
         Q_OBJECT
 
diff --git a/src/blackgui/models/aircraftsituationlistmodel.cpp b/src/gui/models/aircraftsituationlistmodel.cpp
similarity index 92%
rename from src/blackgui/models/aircraftsituationlistmodel.cpp
rename to src/gui/models/aircraftsituationlistmodel.cpp
index 934b9e39c..ec243500c 100644
--- a/src/blackgui/models/aircraftsituationlistmodel.cpp
+++ b/src/gui/models/aircraftsituationlistmodel.cpp
@@ -1,9 +1,9 @@
 // SPDX-FileCopyrightText: Copyright (C) 2018 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/models/aircraftsituationlistmodel.h"
-#include "blackgui/models/columnformatters.h"
-#include "blackgui/models/columns.h"
+#include "gui/models/aircraftsituationlistmodel.h"
+#include "gui/models/columnformatters.h"
+#include "gui/models/columns.h"
 #include "misc/aviation/aircraftsituationlist.h"
 #include "misc/propertyindex.h"
 
@@ -15,7 +15,7 @@ using namespace swift::misc::aviation;
 using namespace swift::misc::geo;
 using namespace swift::misc::physical_quantities;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     CAircraftSituationListModel::CAircraftSituationListModel(QObject *parent) : CListModelTimestampWithOffsetObjects<CAircraftSituationList, true>("ViewAircraftPartsList", parent)
     {
diff --git a/src/blackgui/models/aircraftsituationlistmodel.h b/src/gui/models/aircraftsituationlistmodel.h
similarity index 58%
rename from src/blackgui/models/aircraftsituationlistmodel.h
rename to src/gui/models/aircraftsituationlistmodel.h
index 4d45d1908..e56fd75ee 100644
--- a/src/blackgui/models/aircraftsituationlistmodel.h
+++ b/src/gui/models/aircraftsituationlistmodel.h
@@ -3,19 +3,19 @@
 
 //! \file
 
-#ifndef BLACKGUI_MODELS_AIRCRAFTSITUATIONLISTMODEL_H
-#define BLACKGUI_MODELS_AIRCRAFTSITUATIONLISTMODEL_H
+#ifndef SWIFT_GUI_MODELS_AIRCRAFTSITUATIONLISTMODEL_H
+#define SWIFT_GUI_MODELS_AIRCRAFTSITUATIONLISTMODEL_H
 
-#include "blackgui/models/listmodeltimestampobjects.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/models/listmodeltimestampobjects.h"
+#include "gui/swiftguiexport.h"
 #include "misc/aviation/aircraftsituationlist.h"
 
 #include <QVariant>
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     //! Client list model
-    class BLACKGUI_EXPORT CAircraftSituationListModel : public CListModelTimestampWithOffsetObjects<swift::misc::aviation::CAircraftSituationList, true>
+    class SWIFT_GUI_EXPORT CAircraftSituationListModel : public CListModelTimestampWithOffsetObjects<swift::misc::aviation::CAircraftSituationList, true>
     {
         Q_OBJECT
 
diff --git a/src/blackgui/models/airlineicaofilter.cpp b/src/gui/models/airlineicaofilter.cpp
similarity index 97%
rename from src/blackgui/models/airlineicaofilter.cpp
rename to src/gui/models/airlineicaofilter.cpp
index 4416d03c0..c2c05a7f8 100644
--- a/src/blackgui/models/airlineicaofilter.cpp
+++ b/src/gui/models/airlineicaofilter.cpp
@@ -1,12 +1,12 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/models/airlineicaofilter.h"
+#include "gui/models/airlineicaofilter.h"
 #include "misc/aviation/airlineicaocode.h"
 
 using namespace swift::misc::aviation;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     CAirlineIcaoFilter::CAirlineIcaoFilter(int id, const QString &vDesignator, const QString &name,
                                            const QString &countryIso, bool isReal, bool isVa) : m_id(id), m_vDesignator(vDesignator.trimmed().toUpper()), m_name(name.trimmed()),
diff --git a/src/blackgui/models/airlineicaofilter.h b/src/gui/models/airlineicaofilter.h
similarity index 75%
rename from src/blackgui/models/airlineicaofilter.h
rename to src/gui/models/airlineicaofilter.h
index fe47669f5..45e58642e 100644
--- a/src/blackgui/models/airlineicaofilter.h
+++ b/src/gui/models/airlineicaofilter.h
@@ -3,18 +3,18 @@
 
 //! \file
 
-#ifndef BLACKGUI_AIRLINEICAOFILTER_H
-#define BLACKGUI_AIRLINEICAOFILTER_H
+#ifndef SWIFT_GUI_AIRLINEICAOFILTER_H
+#define SWIFT_GUI_AIRLINEICAOFILTER_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/models/modelfilter.h"
+#include "gui/swiftguiexport.h"
+#include "gui/models/modelfilter.h"
 #include "misc/aviation/airlineicaocodelist.h"
 #include <QString>
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     //! Filter for airline ICAO data
-    class BLACKGUI_EXPORT CAirlineIcaoFilter : public IModelFilter<swift::misc::aviation::CAirlineIcaoCodeList>
+    class SWIFT_GUI_EXPORT CAirlineIcaoFilter : public IModelFilter<swift::misc::aviation::CAirlineIcaoCodeList>
     {
     public:
         //! Constructor
diff --git a/src/blackgui/models/airlineicaolistmodel.cpp b/src/gui/models/airlineicaolistmodel.cpp
similarity index 94%
rename from src/blackgui/models/airlineicaolistmodel.cpp
rename to src/gui/models/airlineicaolistmodel.cpp
index 879e3f754..ab4c3cb45 100644
--- a/src/blackgui/models/airlineicaolistmodel.cpp
+++ b/src/gui/models/airlineicaolistmodel.cpp
@@ -1,9 +1,9 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/models/airlineicaolistmodel.h"
-#include "blackgui/models/columnformatters.h"
-#include "blackgui/models/columns.h"
+#include "gui/models/airlineicaolistmodel.h"
+#include "gui/models/columnformatters.h"
+#include "gui/models/columns.h"
 #include "misc/db/datastore.h"
 #include "misc/aviation/airlineicaocode.h"
 #include "misc/country.h"
@@ -16,7 +16,7 @@
 using namespace swift::misc;
 using namespace swift::misc::aviation;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     CAirlineIcaoCodeListModel::CAirlineIcaoCodeListModel(QObject *parent) : CListModelDbObjects("AircraftIcaoListModel", parent)
     {
diff --git a/src/blackgui/models/airlineicaolistmodel.h b/src/gui/models/airlineicaolistmodel.h
similarity index 72%
rename from src/blackgui/models/airlineicaolistmodel.h
rename to src/gui/models/airlineicaolistmodel.h
index 9a479e0bf..5b690943c 100644
--- a/src/blackgui/models/airlineicaolistmodel.h
+++ b/src/gui/models/airlineicaolistmodel.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_AIRLINEICAOLISTMODEL_H
-#define BLACKGUI_AIRLINEICAOLISTMODEL_H
+#ifndef SWIFT_GUI_AIRLINEICAOLISTMODEL_H
+#define SWIFT_GUI_AIRLINEICAOLISTMODEL_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/models/listmodeldbobjects.h"
+#include "gui/swiftguiexport.h"
+#include "gui/models/listmodeldbobjects.h"
 
 class QObject;
 
@@ -17,10 +17,10 @@ namespace swift::misc::aviation
     class CAirlineIcaoCodeList;
 }
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     //! Airport list model
-    class BLACKGUI_EXPORT CAirlineIcaoCodeListModel :
+    class SWIFT_GUI_EXPORT CAirlineIcaoCodeListModel :
         public CListModelDbObjects<swift::misc::aviation::CAirlineIcaoCodeList, int, true>
     {
         Q_OBJECT
diff --git a/src/blackgui/models/airportlistmodel.cpp b/src/gui/models/airportlistmodel.cpp
similarity index 91%
rename from src/blackgui/models/airportlistmodel.cpp
rename to src/gui/models/airportlistmodel.cpp
index 400448d2d..d77b5b033 100644
--- a/src/blackgui/models/airportlistmodel.cpp
+++ b/src/gui/models/airportlistmodel.cpp
@@ -1,9 +1,9 @@
 // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/models/airportlistmodel.h"
-#include "blackgui/models/columnformatters.h"
-#include "blackgui/models/columns.h"
+#include "gui/models/airportlistmodel.h"
+#include "gui/models/columnformatters.h"
+#include "gui/models/columns.h"
 #include "misc/geo/coordinategeodetic.h"
 #include "misc/pq/length.h"
 #include "misc/pq/units.h"
@@ -15,7 +15,7 @@ using namespace swift::misc::aviation;
 using namespace swift::misc::geo;
 using namespace swift::misc::physical_quantities;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     CAirportListModel::CAirportListModel(QObject *parent) : CListModelBase("AirportListModel", parent)
     {
diff --git a/src/blackgui/models/airportlistmodel.h b/src/gui/models/airportlistmodel.h
similarity index 71%
rename from src/blackgui/models/airportlistmodel.h
rename to src/gui/models/airportlistmodel.h
index 7c12b8312..a5df7473e 100644
--- a/src/blackgui/models/airportlistmodel.h
+++ b/src/gui/models/airportlistmodel.h
@@ -3,20 +3,20 @@
 
 //! \file
 
-#ifndef BLACKGUI_MODELS_AIRPORTLISTMODEL_H
-#define BLACKGUI_MODELS_AIRPORTLISTMODEL_H
+#ifndef SWIFT_GUI_MODELS_AIRPORTLISTMODEL_H
+#define SWIFT_GUI_MODELS_AIRPORTLISTMODEL_H
 
-#include "blackgui/models/listmodelbase.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/models/listmodelbase.h"
+#include "gui/swiftguiexport.h"
 #include "misc/aviation/airportlist.h"
 #include "misc/aviation/airport.h"
 
 class QObject;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     //! Airport list model
-    class BLACKGUI_EXPORT CAirportListModel :
+    class SWIFT_GUI_EXPORT CAirportListModel :
         public CListModelBase<swift::misc::aviation::CAirportList, true>
     {
         Q_OBJECT
diff --git a/src/blackgui/models/allmodelcontainers.h b/src/gui/models/allmodelcontainers.h
similarity index 93%
rename from src/blackgui/models/allmodelcontainers.h
rename to src/gui/models/allmodelcontainers.h
index ae2905f5e..21722441d 100644
--- a/src/blackgui/models/allmodelcontainers.h
+++ b/src/gui/models/allmodelcontainers.h
@@ -1,8 +1,8 @@
 // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#ifndef BLACKGUI_MODELS_ALLMODELCONTAINERS_H
-#define BLACKGUI_MODELS_ALLMODELCONTAINERS_H
+#ifndef SWIFT_GUI_MODELS_ALLMODELCONTAINERS_H
+#define SWIFT_GUI_MODELS_ALLMODELCONTAINERS_H
 
 #include "misc/simulation/aircraftmodellist.h"
 #include "misc/simulation/distributorlist.h"
diff --git a/src/gui/models/allmodels.h b/src/gui/models/allmodels.h
new file mode 100644
index 000000000..2cbe006a5
--- /dev/null
+++ b/src/gui/models/allmodels.h
@@ -0,0 +1,35 @@
+// SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
+// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
+
+#ifndef SWIFT_GUI_MODELS_ALLMODELS_H
+#define SWIFT_GUI_MODELS_ALLMODELS_H
+
+#include "gui/models/actionhotkeylistmodel.h"
+#include "gui/models/aircrafticaolistmodel.h"
+#include "gui/models/aircraftcategorylistmodel.h"
+#include "gui/models/aircraftmodellistmodel.h"
+#include "gui/models/aircraftpartslistmodel.h"
+#include "gui/models/aircraftsituationlistmodel.h"
+#include "gui/models/aircraftsituationchangelistmodel.h"
+#include "gui/models/airlineicaolistmodel.h"
+#include "gui/models/airportlistmodel.h"
+#include "gui/models/applicationinfolistmodel.h"
+#include "gui/models/atcstationlistmodel.h"
+#include "gui/models/audiodeviceinfolistmodel.h"
+#include "gui/models/clientlistmodel.h"
+#include "gui/models/cloudlayerlistmodel.h"
+#include "gui/models/countrylistmodel.h"
+#include "gui/models/distributorlistmodel.h"
+#include "gui/models/identifierlistmodel.h"
+#include "gui/models/interpolationsetupmodel.h"
+#include "gui/models/liverylistmodel.h"
+#include "gui/models/matchingstatisticsmodel.h"
+#include "gui/models/namevariantpairlistmodel.h"
+#include "gui/models/serverlistmodel.h"
+#include "gui/models/simulatedaircraftlistmodel.h"
+#include "gui/models/statusmessagelistmodel.h"
+#include "gui/models/textmessagelistmodel.h"
+#include "gui/models/userlistmodel.h"
+#include "gui/models/windlayerlistmodel.h"
+
+#endif
diff --git a/src/blackgui/models/applicationinfolistmodel.cpp b/src/gui/models/applicationinfolistmodel.cpp
similarity index 90%
rename from src/blackgui/models/applicationinfolistmodel.cpp
rename to src/gui/models/applicationinfolistmodel.cpp
index 7ebb9d745..af7986bd2 100644
--- a/src/blackgui/models/applicationinfolistmodel.cpp
+++ b/src/gui/models/applicationinfolistmodel.cpp
@@ -1,9 +1,9 @@
 // SPDX-FileCopyrightText: Copyright (C) 2018 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/models/applicationinfolistmodel.h"
-#include "blackgui/models/columnformatters.h"
-#include "blackgui/models/columns.h"
+#include "gui/models/applicationinfolistmodel.h"
+#include "gui/models/columnformatters.h"
+#include "gui/models/columns.h"
 
 #include <QModelIndex>
 #include <QStandardItem>
@@ -15,7 +15,7 @@
 
 using namespace swift::misc;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     CApplicationInfoListModel::CApplicationInfoListModel(QObject *parent) : CListModelBase("ModelApplicationInfoListModel", parent)
     {
diff --git a/src/blackgui/models/applicationinfolistmodel.h b/src/gui/models/applicationinfolistmodel.h
similarity index 68%
rename from src/blackgui/models/applicationinfolistmodel.h
rename to src/gui/models/applicationinfolistmodel.h
index fae769a49..b93242e25 100644
--- a/src/blackgui/models/applicationinfolistmodel.h
+++ b/src/gui/models/applicationinfolistmodel.h
@@ -3,20 +3,20 @@
 
 //! \file
 
-#ifndef BLACKGUI_MODELS_APPLICATIONINFOLISTMODEL_H
-#define BLACKGUI_MODELS_APPLICATIONINFOLISTMODEL_H
+#ifndef SWIFT_GUI_MODELS_APPLICATIONINFOLISTMODEL_H
+#define SWIFT_GUI_MODELS_APPLICATIONINFOLISTMODEL_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/models/listmodelbase.h"
+#include "gui/swiftguiexport.h"
+#include "gui/models/listmodelbase.h"
 #include "misc/applicationinfolist.h"
 #include <QObject>
 
 class QStandardItemModel;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     //! Application info list model
-    class BLACKGUI_EXPORT CApplicationInfoListModel : public CListModelBase<swift::misc::CApplicationInfoList, true>
+    class SWIFT_GUI_EXPORT CApplicationInfoListModel : public CListModelBase<swift::misc::CApplicationInfoList, true>
     {
         Q_OBJECT
 
diff --git a/src/blackgui/models/atcstationlistmodel.cpp b/src/gui/models/atcstationlistmodel.cpp
similarity index 95%
rename from src/blackgui/models/atcstationlistmodel.cpp
rename to src/gui/models/atcstationlistmodel.cpp
index 136d12a0e..e403715d9 100644
--- a/src/blackgui/models/atcstationlistmodel.cpp
+++ b/src/gui/models/atcstationlistmodel.cpp
@@ -1,10 +1,10 @@
 // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/models/atcstationlistmodel.h"
-#include "blackgui/models/atcstationtreemodel.h"
-#include "blackgui/models/columnformatters.h"
-#include "blackgui/models/columns.h"
+#include "gui/models/atcstationlistmodel.h"
+#include "gui/models/atcstationtreemodel.h"
+#include "gui/models/columnformatters.h"
+#include "gui/models/columns.h"
 #include "misc/aviation/callsign.h"
 #include "misc/mixin/mixincompare.h"
 #include "misc/icon.h"
@@ -28,7 +28,7 @@ using namespace swift::misc::audio;
 using namespace swift::misc::aviation;
 using namespace swift::misc::network;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     CAtcStationListModel::CAtcStationListModel(AtcStationMode stationMode, QObject *parent) : CListModelCallsignObjects("ModelAtcList", parent)
     {
diff --git a/src/blackgui/models/atcstationlistmodel.h b/src/gui/models/atcstationlistmodel.h
similarity index 80%
rename from src/blackgui/models/atcstationlistmodel.h
rename to src/gui/models/atcstationlistmodel.h
index a977b02e9..08123be87 100644
--- a/src/blackgui/models/atcstationlistmodel.h
+++ b/src/gui/models/atcstationlistmodel.h
@@ -3,22 +3,22 @@
 
 //! \file
 
-#ifndef BLACKGUI_MODELS_ATCLISTMODEL_H
-#define BLACKGUI_MODELS_ATCLISTMODEL_H
+#ifndef SWIFT_GUI_MODELS_ATCLISTMODEL_H
+#define SWIFT_GUI_MODELS_ATCLISTMODEL_H
 
-#include "blackgui/models/listmodelcallsignobjects.h"
+#include "gui/models/listmodelcallsignobjects.h"
 #include "misc/aviation/atcstation.h"
 #include "misc/aviation/atcstationlist.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 
 #include <QObject>
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     class CAtcStationTreeModel;
 
     //! ATC list model
-    class BLACKGUI_EXPORT CAtcStationListModel : public CListModelCallsignObjects<swift::misc::aviation::CAtcStationList, true>
+    class SWIFT_GUI_EXPORT CAtcStationListModel : public CListModelCallsignObjects<swift::misc::aviation::CAtcStationList, true>
     {
         Q_OBJECT
 
diff --git a/src/blackgui/models/atcstationtreemodel.cpp b/src/gui/models/atcstationtreemodel.cpp
similarity index 95%
rename from src/blackgui/models/atcstationtreemodel.cpp
rename to src/gui/models/atcstationtreemodel.cpp
index 2149c0b4d..d24cba1db 100644
--- a/src/blackgui/models/atcstationtreemodel.cpp
+++ b/src/gui/models/atcstationtreemodel.cpp
@@ -1,9 +1,9 @@
 // SPDX-FileCopyrightText: Copyright (C) 2018 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/models/atcstationtreemodel.h"
-#include "blackgui/models/columnformatters.h"
-#include "blackgui/models/columns.h"
+#include "gui/models/atcstationtreemodel.h"
+#include "gui/models/columnformatters.h"
+#include "gui/models/columns.h"
 #include "misc/aviation/callsign.h"
 #include "misc/mixin/mixincompare.h"
 #include "misc/icon.h"
@@ -30,7 +30,7 @@ using namespace swift::misc::physical_quantities;
 using namespace swift::misc::aviation;
 using namespace swift::misc::network;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     CAtcStationTreeModel::CAtcStationTreeModel(QObject *parent) : QStandardItemModel(parent)
     {}
diff --git a/src/blackgui/models/atcstationtreemodel.h b/src/gui/models/atcstationtreemodel.h
similarity index 84%
rename from src/blackgui/models/atcstationtreemodel.h
rename to src/gui/models/atcstationtreemodel.h
index 9c9cb8553..c1d906714 100644
--- a/src/blackgui/models/atcstationtreemodel.h
+++ b/src/gui/models/atcstationtreemodel.h
@@ -3,20 +3,20 @@
 
 //! \file
 
-#ifndef BLACKGUI_MODELS_ATCTREEMODEL_H
-#define BLACKGUI_MODELS_ATCTREEMODEL_H
+#ifndef SWIFT_GUI_MODELS_ATCTREEMODEL_H
+#define SWIFT_GUI_MODELS_ATCTREEMODEL_H
 
-#include "blackgui/models/columns.h"
+#include "gui/models/columns.h"
 #include "misc/aviation/atcstationlist.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 
 #include <QStandardItemModel>
 #include <QHash>
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     //! ATC list model
-    class BLACKGUI_EXPORT CAtcStationTreeModel : public QStandardItemModel
+    class SWIFT_GUI_EXPORT CAtcStationTreeModel : public QStandardItemModel
     {
         Q_OBJECT
 
diff --git a/src/blackgui/models/audiodeviceinfolistmodel.cpp b/src/gui/models/audiodeviceinfolistmodel.cpp
similarity index 86%
rename from src/blackgui/models/audiodeviceinfolistmodel.cpp
rename to src/gui/models/audiodeviceinfolistmodel.cpp
index a1a0ce301..ee5431565 100644
--- a/src/blackgui/models/audiodeviceinfolistmodel.cpp
+++ b/src/gui/models/audiodeviceinfolistmodel.cpp
@@ -1,9 +1,9 @@
 // SPDX-FileCopyrightText: Copyright (C) 2019 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/models/audiodeviceinfolistmodel.h"
-#include "blackgui/models/columnformatters.h"
-#include "blackgui/models/columns.h"
+#include "gui/models/audiodeviceinfolistmodel.h"
+#include "gui/models/columnformatters.h"
+#include "gui/models/columns.h"
 
 #include <Qt>
 #include <QtGlobal>
@@ -11,7 +11,7 @@
 using namespace swift::misc;
 using namespace swift::misc::audio;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     CAudioDeviceInfoListModel::CAudioDeviceInfoListModel(QObject *parent) : CListModelBase("AudioDeviceInfoListModel", parent)
     {
diff --git a/src/blackgui/models/audiodeviceinfolistmodel.h b/src/gui/models/audiodeviceinfolistmodel.h
similarity index 68%
rename from src/blackgui/models/audiodeviceinfolistmodel.h
rename to src/gui/models/audiodeviceinfolistmodel.h
index 8aefe2e74..eeb51446e 100644
--- a/src/blackgui/models/audiodeviceinfolistmodel.h
+++ b/src/gui/models/audiodeviceinfolistmodel.h
@@ -3,17 +3,17 @@
 
 //! \file
 
-#ifndef BLACKGUI_MODELS_AUDIODEVICEINFOLISTMODEL_H
-#define BLACKGUI_MODELS_AUDIODEVICEINFOLISTMODEL_H
+#ifndef SWIFT_GUI_MODELS_AUDIODEVICEINFOLISTMODEL_H
+#define SWIFT_GUI_MODELS_AUDIODEVICEINFOLISTMODEL_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/models/listmodelbase.h"
+#include "gui/swiftguiexport.h"
+#include "gui/models/listmodelbase.h"
 #include "misc/audio/audiodeviceinfolist.h"
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     //! Audio device list model
-    class BLACKGUI_EXPORT CAudioDeviceInfoListModel :
+    class SWIFT_GUI_EXPORT CAudioDeviceInfoListModel :
         public CListModelBase<swift::misc::audio::CAudioDeviceInfoList, true>
     {
         Q_OBJECT
diff --git a/src/blackgui/models/clientlistmodel.cpp b/src/gui/models/clientlistmodel.cpp
similarity index 95%
rename from src/blackgui/models/clientlistmodel.cpp
rename to src/gui/models/clientlistmodel.cpp
index f51d69575..290fee6d5 100644
--- a/src/blackgui/models/clientlistmodel.cpp
+++ b/src/gui/models/clientlistmodel.cpp
@@ -1,9 +1,9 @@
 // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/models/clientlistmodel.h"
-#include "blackgui/models/columnformatters.h"
-#include "blackgui/models/columns.h"
+#include "gui/models/clientlistmodel.h"
+#include "gui/models/columnformatters.h"
+#include "gui/models/columns.h"
 #include "misc/simulation/aircraftmodel.h"
 #include "misc/network/user.h"
 #include "misc/mixin/mixincompare.h"
@@ -17,7 +17,7 @@ using namespace swift::misc;
 using namespace swift::misc::simulation;
 using namespace swift::misc::network;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     CClientListModel::CClientListModel(QObject *parent) : CListModelBase<CClientList>("ViewClientList", parent)
     {
diff --git a/src/blackgui/models/clientlistmodel.h b/src/gui/models/clientlistmodel.h
similarity index 69%
rename from src/blackgui/models/clientlistmodel.h
rename to src/gui/models/clientlistmodel.h
index 82cd13eea..848002d01 100644
--- a/src/blackgui/models/clientlistmodel.h
+++ b/src/gui/models/clientlistmodel.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_MODELS_CLIENTLISTMODEL_H
-#define BLACKGUI_MODELS_CLIENTLISTMODEL_H
+#ifndef SWIFT_GUI_MODELS_CLIENTLISTMODEL_H
+#define SWIFT_GUI_MODELS_CLIENTLISTMODEL_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/models/listmodelbase.h"
+#include "gui/swiftguiexport.h"
+#include "gui/models/listmodelbase.h"
 #include "misc/network/clientlist.h"
 
 #include <QVariant>
@@ -15,10 +15,10 @@
 class QModelIndex;
 class QObject;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     //! Client list model
-    class BLACKGUI_EXPORT CClientListModel : public CListModelBase<swift::misc::network::CClientList>
+    class SWIFT_GUI_EXPORT CClientListModel : public CListModelBase<swift::misc::network::CClientList>
     {
         Q_OBJECT
 
diff --git a/src/blackgui/models/cloudlayerlistmodel.cpp b/src/gui/models/cloudlayerlistmodel.cpp
similarity index 97%
rename from src/blackgui/models/cloudlayerlistmodel.cpp
rename to src/gui/models/cloudlayerlistmodel.cpp
index 240bc87ef..e2c573f47 100644
--- a/src/blackgui/models/cloudlayerlistmodel.cpp
+++ b/src/gui/models/cloudlayerlistmodel.cpp
@@ -1,8 +1,8 @@
 // SPDX-FileCopyrightText: Copyright (C) 2016 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/models/cloudlayerlistmodel.h"
-#include "blackgui/models/columnformatters.h"
+#include "gui/models/cloudlayerlistmodel.h"
+#include "gui/models/columnformatters.h"
 
 #include <Qt>
 #include <QtGlobal>
@@ -11,7 +11,7 @@ using namespace swift::misc;
 using namespace swift::misc::physical_quantities;
 using namespace swift::misc::weather;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
 
     //! Relative Humidity
diff --git a/src/blackgui/models/cloudlayerlistmodel.h b/src/gui/models/cloudlayerlistmodel.h
similarity index 70%
rename from src/blackgui/models/cloudlayerlistmodel.h
rename to src/gui/models/cloudlayerlistmodel.h
index faa08d0f5..1b697026a 100644
--- a/src/blackgui/models/cloudlayerlistmodel.h
+++ b/src/gui/models/cloudlayerlistmodel.h
@@ -3,20 +3,20 @@
 
 //! \file
 
-#ifndef BLACKGUI_MODELS_CLOUDLAYERLISTMODEL_H
-#define BLACKGUI_MODELS_CLOUDLAYERLISTMODEL_H
+#ifndef SWIFT_GUI_MODELS_CLOUDLAYERLISTMODEL_H
+#define SWIFT_GUI_MODELS_CLOUDLAYERLISTMODEL_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/models/listmodelbase.h"
+#include "gui/swiftguiexport.h"
+#include "gui/models/listmodelbase.h"
 #include "misc/weather/cloudlayer.h"
 #include "misc/weather/cloudlayerlist.h"
 
 class QObject;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     //! Cloud layer list model
-    class BLACKGUI_EXPORT CCloudLayerListModel :
+    class SWIFT_GUI_EXPORT CCloudLayerListModel :
         public CListModelBase<swift::misc::weather::CCloudLayerList, false>
     {
         Q_OBJECT
diff --git a/src/blackgui/models/columnformatters.cpp b/src/gui/models/columnformatters.cpp
similarity index 99%
rename from src/blackgui/models/columnformatters.cpp
rename to src/gui/models/columnformatters.cpp
index 5b3c23c17..657fcf086 100644
--- a/src/blackgui/models/columnformatters.cpp
+++ b/src/gui/models/columnformatters.cpp
@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/models/columnformatters.h"
+#include "gui/models/columnformatters.h"
 #include "misc/aviation/altitude.h"
 #include "misc/aviation/comsystem.h"
 #include "misc/iconlist.h"
@@ -21,7 +21,7 @@ using namespace swift::misc;
 using namespace swift::misc::aviation;
 using namespace swift::misc::physical_quantities;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     Qt::ItemFlags CDefaultFormatter::flags(Qt::ItemFlags flags, bool editable) const
     {
diff --git a/src/blackgui/models/columnformatters.h b/src/gui/models/columnformatters.h
similarity index 98%
rename from src/blackgui/models/columnformatters.h
rename to src/gui/models/columnformatters.h
index 7aa2f1b88..9367486ca 100644
--- a/src/blackgui/models/columnformatters.h
+++ b/src/gui/models/columnformatters.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_MODELS_COLUMNFORMATTERS_H
-#define BLACKGUI_MODELS_COLUMNFORMATTERS_H
+#ifndef SWIFT_GUI_MODELS_COLUMNFORMATTERS_H
+#define SWIFT_GUI_MODELS_COLUMNFORMATTERS_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/led.h"
+#include "gui/swiftguiexport.h"
+#include "gui/led.h"
 #include "misc/icon.h"
 #include "misc/icons.h"
 #include "misc/pq/angle.h"
@@ -24,10 +24,10 @@
 #include <Qt>
 #include <QtGlobal>
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     //! Column formatter default implementation, also serving as interface
-    class BLACKGUI_EXPORT CDefaultFormatter
+    class SWIFT_GUI_EXPORT CDefaultFormatter
     {
     public:
         //! Constructor
@@ -419,7 +419,7 @@ namespace BlackGui::Models
         //! Constructor
         CPhysiqalQuantiyFormatter(MU unit = MU::defaultUnit(), int digits = 2, int alignment = alignRightVCenter(), bool withUnit = true, bool i18n = true, const QList<int> &supportedRoles = roleDisplay()) : CValueObjectFormatter(alignment, i18n, supportedRoles), m_unit(unit), m_digits(digits), m_withUnit(withUnit) {}
 
-        //! \copydoc BlackGui::Models::CDefaultFormatter::displayRole
+        //! \copydoc swift::gui::models::CDefaultFormatter::displayRole
         virtual swift::misc::CVariant displayRole(const swift::misc::CVariant &physicalQuantity) const override
         {
             if (physicalQuantity.canConvert<PQ>())
diff --git a/src/blackgui/models/columns.cpp b/src/gui/models/columns.cpp
similarity index 98%
rename from src/blackgui/models/columns.cpp
rename to src/gui/models/columns.cpp
index 076de4d89..7a16edafa 100644
--- a/src/blackgui/models/columns.cpp
+++ b/src/gui/models/columns.cpp
@@ -1,8 +1,8 @@
 // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/models/columns.h"
-#include "blackgui/guiapplication.h"
+#include "gui/models/columns.h"
+#include "gui/guiapplication.h"
 #include "misc/mixin/mixincompare.h"
 
 #include <QByteArray>
@@ -11,7 +11,7 @@
 
 using namespace swift::misc;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     CColumn::CColumn(const QString &headerName, const QString &toolTip, const CPropertyIndex &propertyIndex, CDefaultFormatter *formatter, bool editable) : m_columnName(headerName), m_columnToolTip(toolTip), m_formatter(formatter ? formatter : new CDefaultFormatter()), m_propertyIndex(propertyIndex),
                                                                                                                                                             m_editable(editable)
diff --git a/src/blackgui/models/columns.h b/src/gui/models/columns.h
similarity index 97%
rename from src/blackgui/models/columns.h
rename to src/gui/models/columns.h
index 9cce80700..ed2aafa96 100644
--- a/src/blackgui/models/columns.h
+++ b/src/gui/models/columns.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_MODELS_COLUMNS_H
-#define BLACKGUI_MODELS_COLUMNS_H
+#ifndef SWIFT_GUI_MODELS_COLUMNS_H
+#define SWIFT_GUI_MODELS_COLUMNS_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/models/columnformatters.h"
+#include "gui/swiftguiexport.h"
+#include "gui/models/columnformatters.h"
 #include "misc/propertyindex.h"
 #include "misc/variant.h"
 
@@ -19,10 +19,10 @@
 
 class QModelIndex;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     //! Single column
-    class BLACKGUI_EXPORT CColumn
+    class SWIFT_GUI_EXPORT CColumn
     {
     public:
         //! Constructor
@@ -143,7 +143,7 @@ namespace BlackGui::Models
     /*!
      * Header data for a table
      */
-    class BLACKGUI_EXPORT CColumns : public QObject
+    class SWIFT_GUI_EXPORT CColumns : public QObject
     {
         Q_OBJECT
 
diff --git a/src/blackgui/models/countryfilter.cpp b/src/gui/models/countryfilter.cpp
similarity index 94%
rename from src/blackgui/models/countryfilter.cpp
rename to src/gui/models/countryfilter.cpp
index d306188a6..b79d775ae 100644
--- a/src/blackgui/models/countryfilter.cpp
+++ b/src/gui/models/countryfilter.cpp
@@ -1,12 +1,12 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/models/countryfilter.h"
+#include "gui/models/countryfilter.h"
 #include "misc/country.h"
 
 using namespace swift::misc;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     CCountryFilter::CCountryFilter(const QString &isoCode, const QString &name) : m_isoCode(isoCode.trimmed().toUpper()), m_name(name.trimmed())
     {
diff --git a/src/blackgui/models/countryfilter.h b/src/gui/models/countryfilter.h
similarity index 69%
rename from src/blackgui/models/countryfilter.h
rename to src/gui/models/countryfilter.h
index 4da95f4b1..bd917a665 100644
--- a/src/blackgui/models/countryfilter.h
+++ b/src/gui/models/countryfilter.h
@@ -3,19 +3,19 @@
 
 //! \file
 
-#ifndef BLACKGUI_MODELS_COUNTRYFILTER_H
-#define BLACKGUI_MODELS_COUNTRYFILTER_H
+#ifndef SWIFT_GUI_MODELS_COUNTRYFILTER_H
+#define SWIFT_GUI_MODELS_COUNTRYFILTER_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/models/modelfilter.h"
+#include "gui/swiftguiexport.h"
+#include "gui/models/modelfilter.h"
 #include "misc/countrylist.h"
 
 #include <QString>
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     //! Country filter
-    class BLACKGUI_EXPORT CCountryFilter : public IModelFilter<swift::misc::CCountryList>
+    class SWIFT_GUI_EXPORT CCountryFilter : public IModelFilter<swift::misc::CCountryList>
     {
     public:
         //! Constructor
diff --git a/src/blackgui/models/countrylistmodel.cpp b/src/gui/models/countrylistmodel.cpp
similarity index 93%
rename from src/blackgui/models/countrylistmodel.cpp
rename to src/gui/models/countrylistmodel.cpp
index 7bbd251aa..58d7b556c 100644
--- a/src/blackgui/models/countrylistmodel.cpp
+++ b/src/gui/models/countrylistmodel.cpp
@@ -1,8 +1,8 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/models/columns.h"
-#include "blackgui/models/countrylistmodel.h"
+#include "gui/models/columns.h"
+#include "gui/models/countrylistmodel.h"
 #include "misc/country.h"
 #include "misc/propertyindexvariantmap.h"
 #include "misc/timestampbased.h"
@@ -12,7 +12,7 @@
 
 using namespace swift::misc;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     CCountryListModel::CCountryListModel(QObject *parent) : CListModelDbObjects("CountryListModel", parent)
     {
diff --git a/src/blackgui/models/countrylistmodel.h b/src/gui/models/countrylistmodel.h
similarity index 71%
rename from src/blackgui/models/countrylistmodel.h
rename to src/gui/models/countrylistmodel.h
index 1bbe9e5ca..2720f419f 100644
--- a/src/blackgui/models/countrylistmodel.h
+++ b/src/gui/models/countrylistmodel.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_MODELS_COUNTRYLISTMODEL_H
-#define BLACKGUI_MODELS_COUNTRYLISTMODEL_H
+#ifndef SWIFT_GUI_MODELS_COUNTRYLISTMODEL_H
+#define SWIFT_GUI_MODELS_COUNTRYLISTMODEL_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/models/listmodeldbobjects.h"
+#include "gui/swiftguiexport.h"
+#include "gui/models/listmodeldbobjects.h"
 #include <QString>
 
 class QObject;
@@ -18,10 +18,10 @@ namespace swift::misc
     class CCountryList;
 }
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     //! Country list model
-    class BLACKGUI_EXPORT CCountryListModel :
+    class SWIFT_GUI_EXPORT CCountryListModel :
         public CListModelDbObjects<swift::misc::CCountryList, QString, true>
     {
         Q_OBJECT
diff --git a/src/blackgui/models/distributorfilter.cpp b/src/gui/models/distributorfilter.cpp
similarity index 93%
rename from src/blackgui/models/distributorfilter.cpp
rename to src/gui/models/distributorfilter.cpp
index 188a3351d..d784b2d47 100644
--- a/src/blackgui/models/distributorfilter.cpp
+++ b/src/gui/models/distributorfilter.cpp
@@ -1,13 +1,13 @@
 // SPDX-FileCopyrightText: Copyright (C) 2018 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/models/distributorfilter.h"
+#include "gui/models/distributorfilter.h"
 #include "misc/simulation/distributor.h"
 
 using namespace swift::misc;
 using namespace swift::misc::simulation;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     CDistributorFilter::CDistributorFilter(const CSimulatorInfo &simulator) : m_simulator(simulator)
     {
diff --git a/src/blackgui/models/distributorfilter.h b/src/gui/models/distributorfilter.h
similarity index 73%
rename from src/blackgui/models/distributorfilter.h
rename to src/gui/models/distributorfilter.h
index bd4046ef0..c51c7d9cc 100644
--- a/src/blackgui/models/distributorfilter.h
+++ b/src/gui/models/distributorfilter.h
@@ -3,20 +3,20 @@
 
 //! \file
 
-#ifndef BLACKGUI_MODELS_DISTRIBUTORFILTER_H
-#define BLACKGUI_MODELS_DISTRIBUTORFILTER_H
+#ifndef SWIFT_GUI_MODELS_DISTRIBUTORFILTER_H
+#define SWIFT_GUI_MODELS_DISTRIBUTORFILTER_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/models/modelfilter.h"
+#include "gui/swiftguiexport.h"
+#include "gui/models/modelfilter.h"
 #include "misc/simulation/simulatorinfo.h"
 #include "misc/simulation/distributorlist.h"
 
 #include <QString>
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     //! Country filter
-    class BLACKGUI_EXPORT CDistributorFilter : public IModelFilter<swift::misc::simulation::CDistributorList>
+    class SWIFT_GUI_EXPORT CDistributorFilter : public IModelFilter<swift::misc::simulation::CDistributorList>
     {
     public:
         //! Constructor
diff --git a/src/blackgui/models/distributorlistmodel.cpp b/src/gui/models/distributorlistmodel.cpp
similarity index 96%
rename from src/blackgui/models/distributorlistmodel.cpp
rename to src/gui/models/distributorlistmodel.cpp
index e8ba7e22e..67a0def32 100644
--- a/src/blackgui/models/distributorlistmodel.cpp
+++ b/src/gui/models/distributorlistmodel.cpp
@@ -1,8 +1,8 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/models/columns.h"
-#include "blackgui/models/distributorlistmodel.h"
+#include "gui/models/columns.h"
+#include "gui/models/distributorlistmodel.h"
 #include "misc/db/datastore.h"
 #include "misc/propertyindexvariantmap.h"
 #include "misc/simulation/distributor.h"
@@ -15,7 +15,7 @@
 
 using namespace swift::misc::simulation;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     CDistributorListModel::CDistributorListModel(QObject *parent) : COrderableListModelDbObjects("ModelDistributorList", parent)
     {
diff --git a/src/blackgui/models/distributorlistmodel.h b/src/gui/models/distributorlistmodel.h
similarity index 78%
rename from src/blackgui/models/distributorlistmodel.h
rename to src/gui/models/distributorlistmodel.h
index b5075e90e..3a3c61da3 100644
--- a/src/blackgui/models/distributorlistmodel.h
+++ b/src/gui/models/distributorlistmodel.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_MODELS_DISTRIBUTORLISTMODEL_H
-#define BLACKGUI_MODELS_DISTRIBUTORLISTMODEL_H
+#ifndef SWIFT_GUI_MODELS_DISTRIBUTORLISTMODEL_H
+#define SWIFT_GUI_MODELS_DISTRIBUTORLISTMODEL_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/models/listmodeldbobjects.h"
+#include "gui/swiftguiexport.h"
+#include "gui/models/listmodeldbobjects.h"
 #include "misc/simulation/distributorlist.h"
 
 #include <QString>
@@ -16,10 +16,10 @@ namespace swift::misc::simulation
 {
     class CDistributor;
 }
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     //! Distributor list model
-    class BLACKGUI_EXPORT CDistributorListModel :
+    class SWIFT_GUI_EXPORT CDistributorListModel :
         public COrderableListModelDbObjects<swift::misc::simulation::CDistributorList, QString, true>
     {
         Q_OBJECT
@@ -47,7 +47,7 @@ namespace BlackGui::Models
         //! Mode
         DistributorMode getDistributorMode() const { return this->m_distributorMode; }
 
-        //! \copydoc BlackGui::Models::CListModelBaseNonTemplate::isOrderable
+        //! \copydoc swift::gui::models::CListModelBaseNonTemplate::isOrderable
         virtual bool isOrderable() const override { return true; }
 
     private:
diff --git a/src/blackgui/models/identifierlistmodel.cpp b/src/gui/models/identifierlistmodel.cpp
similarity index 91%
rename from src/blackgui/models/identifierlistmodel.cpp
rename to src/gui/models/identifierlistmodel.cpp
index da60c5990..6234f21d2 100644
--- a/src/blackgui/models/identifierlistmodel.cpp
+++ b/src/gui/models/identifierlistmodel.cpp
@@ -1,16 +1,16 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/models/columnformatters.h"
-#include "blackgui/models/columns.h"
-#include "blackgui/models/identifierlistmodel.h"
+#include "gui/models/columnformatters.h"
+#include "gui/models/columns.h"
+#include "gui/models/identifierlistmodel.h"
 #include "misc/timestampbased.h"
 
 #include <QtGlobal>
 
 using namespace swift::misc;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     CIdentifierListModel::CIdentifierListModel(QObject *parent) : CListModelBase("ModelIdentifierList", parent)
     {
diff --git a/src/blackgui/models/identifierlistmodel.h b/src/gui/models/identifierlistmodel.h
similarity index 62%
rename from src/blackgui/models/identifierlistmodel.h
rename to src/gui/models/identifierlistmodel.h
index 9c02b3aae..2434188ac 100644
--- a/src/blackgui/models/identifierlistmodel.h
+++ b/src/gui/models/identifierlistmodel.h
@@ -3,18 +3,18 @@
 
 //! \file
 
-#ifndef BLACKGUI_MODELS_IDENTIFIERLISTMODEL_H
-#define BLACKGUI_MODELS_IDENTIFIERLISTMODEL_H
+#ifndef SWIFT_GUI_MODELS_IDENTIFIERLISTMODEL_H
+#define SWIFT_GUI_MODELS_IDENTIFIERLISTMODEL_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/models/listmodelbase.h"
+#include "gui/swiftguiexport.h"
+#include "gui/models/listmodelbase.h"
 #include "misc/identifier.h"
 #include "misc/identifierlist.h"
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     //! Originator list model
-    class BLACKGUI_EXPORT CIdentifierListModel : public CListModelBase<swift::misc::CIdentifierList>
+    class SWIFT_GUI_EXPORT CIdentifierListModel : public CListModelBase<swift::misc::CIdentifierList>
     {
         Q_OBJECT
 
diff --git a/src/blackgui/models/interpolationsetupmodel.cpp b/src/gui/models/interpolationsetupmodel.cpp
similarity index 95%
rename from src/blackgui/models/interpolationsetupmodel.cpp
rename to src/gui/models/interpolationsetupmodel.cpp
index 70a41fb9c..33c577551 100644
--- a/src/blackgui/models/interpolationsetupmodel.cpp
+++ b/src/gui/models/interpolationsetupmodel.cpp
@@ -1,8 +1,8 @@
 // SPDX-FileCopyrightText: Copyright (C) 2018 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/models/columns.h"
-#include "blackgui/models/interpolationsetupmodel.h"
+#include "gui/models/columns.h"
+#include "gui/models/interpolationsetupmodel.h"
 
 #include <Qt>
 #include <QtGlobal>
@@ -12,7 +12,7 @@ using namespace swift::misc::physical_quantities;
 using namespace swift::misc::aviation;
 using namespace swift::misc::simulation;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     CInterpolationSetupListModel::CInterpolationSetupListModel(QObject *parent) : CListModelCallsignObjects("CInterpolationSetupListModel", parent)
     {
diff --git a/src/blackgui/models/interpolationsetupmodel.h b/src/gui/models/interpolationsetupmodel.h
similarity index 69%
rename from src/blackgui/models/interpolationsetupmodel.h
rename to src/gui/models/interpolationsetupmodel.h
index f2aa9bfa6..c0adc69d7 100644
--- a/src/blackgui/models/interpolationsetupmodel.h
+++ b/src/gui/models/interpolationsetupmodel.h
@@ -3,18 +3,18 @@
 
 //! \file
 
-#ifndef BLACKGUI_MODELS_INTERPOLATIONSETUPMODEL_H
-#define BLACKGUI_MODELS_INTERPOLATIONSETUPMODEL_H
+#ifndef SWIFT_GUI_MODELS_INTERPOLATIONSETUPMODEL_H
+#define SWIFT_GUI_MODELS_INTERPOLATIONSETUPMODEL_H
 
 #include "misc/simulation/interpolation/interpolationsetuplist.h"
-#include "blackgui/models/listmodelcallsignobjects.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/models/listmodelcallsignobjects.h"
+#include "gui/swiftguiexport.h"
 #include <QString>
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     //! Country list model
-    class BLACKGUI_EXPORT CInterpolationSetupListModel :
+    class SWIFT_GUI_EXPORT CInterpolationSetupListModel :
         public CListModelCallsignObjects<swift::misc::simulation::CInterpolationSetupList, false>
     {
         Q_OBJECT
diff --git a/src/blackgui/models/listmodelbase.cpp b/src/gui/models/listmodelbase.cpp
similarity index 99%
rename from src/blackgui/models/listmodelbase.cpp
rename to src/gui/models/listmodelbase.cpp
index 87f5921be..eebeed331 100644
--- a/src/blackgui/models/listmodelbase.cpp
+++ b/src/gui/models/listmodelbase.cpp
@@ -4,9 +4,9 @@
 // Drag and drop docu:
 // http://doc.qt.io/qt-5/model-view-programming.html#using-drag-and-drop-with-item-views
 
-#include "blackgui/models/listmodelbase.h"
-#include "blackgui/models/allmodelcontainers.h"
-#include "blackgui/guiutility.h"
+#include "gui/models/listmodelbase.h"
+#include "gui/models/allmodelcontainers.h"
+#include "gui/guiutility.h"
 #include "misc/variant.h"
 #include "misc/worker.h"
 
@@ -18,7 +18,7 @@
 using namespace swift::misc;
 using namespace swift::misc::aviation;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     template <typename T, bool UseCompare>
     CListModelBase<T, UseCompare>::CListModelBase(const QString &translationContext, QObject *parent)
diff --git a/src/blackgui/models/listmodelbase.h b/src/gui/models/listmodelbase.h
similarity index 91%
rename from src/blackgui/models/listmodelbase.h
rename to src/gui/models/listmodelbase.h
index 320c48f03..97e49a089 100644
--- a/src/blackgui/models/listmodelbase.h
+++ b/src/gui/models/listmodelbase.h
@@ -3,12 +3,12 @@
 
 //! \file
 
-#ifndef BLACKGUI_MODELS_LISTMODELBASE_H
-#define BLACKGUI_MODELS_LISTMODELBASE_H
+#ifndef SWIFT_GUI_MODELS_LISTMODELBASE_H
+#define SWIFT_GUI_MODELS_LISTMODELBASE_H
 
-#include "blackgui/models/listmodelbasenontemplate.h"
-#include "blackgui/models/modelfilter.h"
-#include "blackgui/models/selectionmodel.h"
+#include "gui/models/listmodelbasenontemplate.h"
+#include "gui/models/modelfilter.h"
+#include "gui/models/selectionmodel.h"
 
 #include <QJsonDocument>
 #include <QJsonObject>
@@ -26,7 +26,7 @@ namespace swift::misc
 {
     class CWorker;
 }
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     //! List model
     template <typename T, bool UseCompare = false>
@@ -70,13 +70,13 @@ namespace BlackGui::Models
         //! \name Functions from CListModelBaseNonTemplate
         //! @{
 
-        //! \copydoc BlackGui::Models::CListModelBaseNonTemplate::toJson
+        //! \copydoc swift::gui::models::CListModelBaseNonTemplate::toJson
         virtual QJsonObject toJson(bool selectedOnly = false) const override;
 
-        //! \copydoc BlackGui::Models::CListModelBaseNonTemplate::toJsonString
+        //! \copydoc swift::gui::models::CListModelBaseNonTemplate::toJsonString
         virtual QString toJsonString(QJsonDocument::JsonFormat format = QJsonDocument::Indented, bool selectedOnly = false) const override;
 
-        //! \copydoc BlackGui::Models::CListModelBaseNonTemplate::isOrderable
+        //! \copydoc swift::gui::models::CListModelBaseNonTemplate::isOrderable
         virtual bool isOrderable() const override;
         //! @}
 
@@ -179,7 +179,7 @@ namespace BlackGui::Models
         void takeFilterOwnership(std::unique_ptr<IModelFilter<ContainerType>> &filter);
 
         //! Set the selection model
-        void setSelectionModel(BlackGui::Models::ISelectionModel<ContainerType> *selectionModel) { m_selectionModel = selectionModel; }
+        void setSelectionModel(swift::gui::models::ISelectionModel<ContainerType> *selectionModel) { m_selectionModel = selectionModel; }
 
     protected:
         //! Constructor
@@ -188,10 +188,10 @@ namespace BlackGui::Models
         //! \name Base class overrides
         //! @{
 
-        //! \copydoc BlackGui::Models::CListModelBaseNonTemplate::onDataChanged
+        //! \copydoc swift::gui::models::CListModelBaseNonTemplate::onDataChanged
         virtual void onDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomLeft, const QVector<int> &roles) override;
 
-        //! \copydoc BlackGui::Models::CListModelBaseNonTemplate::onDataChanged
+        //! \copydoc swift::gui::models::CListModelBaseNonTemplate::onDataChanged
         virtual void onChangedDigest() override;
         //! @}
 
diff --git a/src/blackgui/models/listmodelbaseaviation.cpp b/src/gui/models/listmodelbaseaviation.cpp
similarity index 97%
rename from src/blackgui/models/listmodelbaseaviation.cpp
rename to src/gui/models/listmodelbaseaviation.cpp
index 37f0245c0..c6e776767 100644
--- a/src/blackgui/models/listmodelbaseaviation.cpp
+++ b/src/gui/models/listmodelbaseaviation.cpp
@@ -3,7 +3,7 @@
 
 #include "listmodelbase.cpp"
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     // see here for the reason of thess forward instantiations
     // https://isocpp.org/wiki/faq/templates#separate-template-fn-defn-from-decl
diff --git a/src/blackgui/models/listmodelbasemisc.cpp b/src/gui/models/listmodelbasemisc.cpp
similarity index 96%
rename from src/blackgui/models/listmodelbasemisc.cpp
rename to src/gui/models/listmodelbasemisc.cpp
index b1e07fc42..71e8cbb43 100644
--- a/src/blackgui/models/listmodelbasemisc.cpp
+++ b/src/gui/models/listmodelbasemisc.cpp
@@ -3,7 +3,7 @@
 
 #include "listmodelbase.cpp"
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     // see here for the reason of thess forward instantiations
     // https://isocpp.org/wiki/faq/templates#separate-template-fn-defn-from-decl
diff --git a/src/blackgui/models/listmodelbasenetwork.cpp b/src/gui/models/listmodelbasenetwork.cpp
similarity index 95%
rename from src/blackgui/models/listmodelbasenetwork.cpp
rename to src/gui/models/listmodelbasenetwork.cpp
index e4d4791cd..03fe96c50 100644
--- a/src/blackgui/models/listmodelbasenetwork.cpp
+++ b/src/gui/models/listmodelbasenetwork.cpp
@@ -3,7 +3,7 @@
 
 #include "listmodelbase.cpp"
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     // see here for the reason of thess forward instantiations
     // https://isocpp.org/wiki/faq/templates#separate-template-fn-defn-from-decl
diff --git a/src/blackgui/models/listmodelbasenontemplate.cpp b/src/gui/models/listmodelbasenontemplate.cpp
similarity index 98%
rename from src/blackgui/models/listmodelbasenontemplate.cpp
rename to src/gui/models/listmodelbasenontemplate.cpp
index 5b75bf435..db6e862b0 100644
--- a/src/blackgui/models/listmodelbasenontemplate.cpp
+++ b/src/gui/models/listmodelbasenontemplate.cpp
@@ -4,12 +4,12 @@
 // Drag and drop docu:
 // http://doc.qt.io/qt-5/model-view-programming.html#using-drag-and-drop-with-item-views
 
-#include "blackgui/models/listmodelbasenontemplate.h"
+#include "gui/models/listmodelbasenontemplate.h"
 #include "misc/verify.h"
 
 using namespace swift::misc;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     int CListModelBaseNonTemplate::columnCount(const QModelIndex &modelIndex) const
     {
diff --git a/src/blackgui/models/listmodelbasenontemplate.h b/src/gui/models/listmodelbasenontemplate.h
similarity index 96%
rename from src/blackgui/models/listmodelbasenontemplate.h
rename to src/gui/models/listmodelbasenontemplate.h
index fcca99ea8..58b629c00 100644
--- a/src/blackgui/models/listmodelbasenontemplate.h
+++ b/src/gui/models/listmodelbasenontemplate.h
@@ -3,12 +3,12 @@
 
 //! \file
 
-#ifndef BLACKGUI_MODELS_LISTMODELBASENONTEMPLATE_H
-#define BLACKGUI_MODELS_LISTMODELBASENONTEMPLATE_H
+#ifndef SWIFT_GUI_MODELS_LISTMODELBASENONTEMPLATE_H
+#define SWIFT_GUI_MODELS_LISTMODELBASENONTEMPLATE_H
 
-#include "blackgui/models/columns.h"
-#include "blackgui/dropbase.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/models/columns.h"
+#include "gui/dropbase.h"
+#include "gui/swiftguiexport.h"
 #include "misc/propertyindexlist.h"
 #include "misc/digestsignal.h"
 #include "misc/variant.h"
@@ -30,10 +30,10 @@ namespace swift::misc
 {
     class CWorker;
 }
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     //! Non templated base class, allows Q_OBJECT and signals to be used
-    class BLACKGUI_EXPORT CListModelBaseNonTemplate :
+    class SWIFT_GUI_EXPORT CListModelBaseNonTemplate :
         public QStandardItemModel,
         public CDropBase
     {
diff --git a/src/blackgui/models/listmodelbasesimulation.cpp b/src/gui/models/listmodelbasesimulation.cpp
similarity index 96%
rename from src/blackgui/models/listmodelbasesimulation.cpp
rename to src/gui/models/listmodelbasesimulation.cpp
index 2019aff24..8c97c1bcb 100644
--- a/src/blackgui/models/listmodelbasesimulation.cpp
+++ b/src/gui/models/listmodelbasesimulation.cpp
@@ -3,7 +3,7 @@
 
 #include "listmodelbase.cpp"
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     // see here for the reason of thess forward instantiations
     // https://isocpp.org/wiki/faq/templates#separate-template-fn-defn-from-decl
diff --git a/src/blackgui/models/listmodelbaseweather.cpp b/src/gui/models/listmodelbaseweather.cpp
similarity index 94%
rename from src/blackgui/models/listmodelbaseweather.cpp
rename to src/gui/models/listmodelbaseweather.cpp
index 162762e7e..47c7a8621 100644
--- a/src/blackgui/models/listmodelbaseweather.cpp
+++ b/src/gui/models/listmodelbaseweather.cpp
@@ -3,7 +3,7 @@
 
 #include "listmodelbase.cpp"
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     // see here for the reason of thess forward instantiations
     // https://isocpp.org/wiki/faq/templates#separate-template-fn-defn-from-decl
diff --git a/src/blackgui/models/listmodelcallsignobjects.cpp b/src/gui/models/listmodelcallsignobjects.cpp
similarity index 96%
rename from src/blackgui/models/listmodelcallsignobjects.cpp
rename to src/gui/models/listmodelcallsignobjects.cpp
index 80888c914..50e0258d1 100644
--- a/src/blackgui/models/listmodelcallsignobjects.cpp
+++ b/src/gui/models/listmodelcallsignobjects.cpp
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "listmodelcallsignobjects.h"
-#include "blackgui/models/allmodelcontainers.h"
+#include "gui/models/allmodelcontainers.h"
 #include "misc/orderable.h"
 
 #include <QBrush>
@@ -12,7 +12,7 @@
 using namespace swift::misc;
 using namespace swift::misc::aviation;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     template <typename T, bool UseCompare>
     CListModelCallsignObjects<T, UseCompare>::CListModelCallsignObjects(const QString &translationContext, QObject *parent) : CListModelBase<ContainerType, UseCompare>(translationContext, parent)
diff --git a/src/blackgui/models/listmodelcallsignobjects.h b/src/gui/models/listmodelcallsignobjects.h
similarity index 88%
rename from src/blackgui/models/listmodelcallsignobjects.h
rename to src/gui/models/listmodelcallsignobjects.h
index 0973c5a82..5ba208135 100644
--- a/src/blackgui/models/listmodelcallsignobjects.h
+++ b/src/gui/models/listmodelcallsignobjects.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_MODELS_LISTMODELCALLSIGNOBJECTS_H
-#define BLACKGUI_MODELS_LISTMODELCALLSIGNOBJECTS_H
+#ifndef SWIFT_GUI_MODELS_LISTMODELCALLSIGNOBJECTS_H
+#define SWIFT_GUI_MODELS_LISTMODELCALLSIGNOBJECTS_H
 
-#include "blackgui/models/listmodelbase.h"
+#include "gui/models/listmodelbase.h"
 #include "misc/aviation/callsignset.h"
 
 #include <QColor>
@@ -18,7 +18,7 @@
 class QModelIndex;
 class QObject;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     //! List model for callsign based objects (callsign is unique key)
     template <typename T, bool UseCompare = false>
@@ -41,7 +41,7 @@ namespace BlackGui::Models
         //! Clear the highlighted callsign
         void clearHighlightedCallsigns() { m_highlightCallsigns.clear(); }
 
-        //! \copydoc BlackGui::Models::CListModelBaseNonTemplate::clearHighlighting
+        //! \copydoc swift::gui::models::CListModelBaseNonTemplate::clearHighlighting
         virtual void clearHighlighting() override
         {
             this->clearHighlightedCallsigns();
diff --git a/src/blackgui/models/listmodeldbobjects.cpp b/src/gui/models/listmodeldbobjects.cpp
similarity index 98%
rename from src/blackgui/models/listmodeldbobjects.cpp
rename to src/gui/models/listmodeldbobjects.cpp
index 575c214ad..e4b11385c 100644
--- a/src/blackgui/models/listmodeldbobjects.cpp
+++ b/src/gui/models/listmodeldbobjects.cpp
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "listmodeldbobjects.h"
-#include "blackgui/models/allmodelcontainers.h"
+#include "gui/models/allmodelcontainers.h"
 #include "misc/db/datastoreobjectlist.h"
 #include "misc/simulation/aircraftmodellist.h"
 #include "misc/simulation/aircraftmodel.h"
@@ -28,7 +28,7 @@ using namespace swift::misc;
 using namespace swift::misc::aviation;
 using namespace swift::misc::db;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     template <typename T, typename K, bool UseCompare>
     CListModelDbObjects<T, K, UseCompare>::CListModelDbObjects(const QString &translationContext, QObject *parent) : CListModelBase<ContainerType, UseCompare>(translationContext, parent)
diff --git a/src/blackgui/models/listmodeldbobjects.h b/src/gui/models/listmodeldbobjects.h
similarity index 84%
rename from src/blackgui/models/listmodeldbobjects.h
rename to src/gui/models/listmodeldbobjects.h
index c3ef1c38c..bdd73ae10 100644
--- a/src/blackgui/models/listmodeldbobjects.h
+++ b/src/gui/models/listmodeldbobjects.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_MODELS_LISTMODELDBOBJECTS_H
-#define BLACKGUI_MODELS_LISTMODELDBOBJECTS_H
+#ifndef SWIFT_GUI_MODELS_LISTMODELDBOBJECTS_H
+#define SWIFT_GUI_MODELS_LISTMODELDBOBJECTS_H
 
-#include "blackgui/models/listmodelbase.h"
+#include "gui/models/listmodelbase.h"
 
 #include <QColor>
 #include <QList>
@@ -17,7 +17,7 @@
 class QModelIndex;
 class QObject;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     //! List model for DB objects
     template <typename T, typename K, bool UseCompare = false>
@@ -43,14 +43,14 @@ namespace BlackGui::Models
         //! Clear the highlighted keys
         void clearHighlightedDbKeys() { m_highlightKeys.clear(); }
 
-        //! \copydoc BlackGui::Models::CListModelBaseNonTemplate::clearHighlighting
+        //! \copydoc swift::gui::models::CListModelBaseNonTemplate::clearHighlighting
         virtual void clearHighlighting() override
         {
             this->clearHighlightedDbKeys();
             CListModelBase<ContainerType, UseCompare>::clearHighlighting();
         }
 
-        //! \copydoc BlackGui::Models::CListModelBaseNonTemplate::hasHighlightedRows
+        //! \copydoc swift::gui::models::CListModelBaseNonTemplate::hasHighlightedRows
         virtual bool hasHighlightedRows() const override
         {
             return !m_highlightKeys.isEmpty();
@@ -95,14 +95,14 @@ namespace BlackGui::Models
         //! Destructor
         virtual ~COrderableListModelDbObjects() {}
 
-        //! \name specialized BlackGui::Models::CListModelDbObjects functions for ordering
+        //! \name specialized swift::gui::models::CListModelDbObjects functions for ordering
         //! @{
         using COrderableListModelDbObjects::CListModelDbObjects::update;
 
-        //! \copydoc BlackGui::Models::CListModelDbObjects::update
+        //! \copydoc swift::gui::models::CListModelDbObjects::update
         virtual int update(const ContainerType &container, bool sort) override;
 
-        //! \copydoc BlackGui::Models::CListModelDbObjects::moveItems
+        //! \copydoc swift::gui::models::CListModelDbObjects::moveItems
         virtual void moveItems(const ContainerType &items, int position) override;
         //! @}
 
diff --git a/src/blackgui/models/listmodeltimestampobjects.cpp b/src/gui/models/listmodeltimestampobjects.cpp
similarity index 96%
rename from src/blackgui/models/listmodeltimestampobjects.cpp
rename to src/gui/models/listmodeltimestampobjects.cpp
index 75269fead..cab22d5e9 100644
--- a/src/blackgui/models/listmodeltimestampobjects.cpp
+++ b/src/gui/models/listmodeltimestampobjects.cpp
@@ -1,8 +1,8 @@
 // SPDX-FileCopyrightText: Copyright (C) 2018 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/models/listmodeltimestampobjects.h"
-#include "blackgui/models/allmodelcontainers.h"
+#include "gui/models/listmodeltimestampobjects.h"
+#include "gui/models/allmodelcontainers.h"
 
 #include <QModelIndex>
 #include <type_traits>
@@ -10,7 +10,7 @@
 using namespace swift::misc;
 using namespace swift::misc::aviation;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     template <typename T, bool UseCompare>
     CListModelTimestampObjects<T, UseCompare>::CListModelTimestampObjects(const QString &translationContext, QObject *parent) : CListModelBase<ContainerType, UseCompare>(translationContext, parent)
diff --git a/src/blackgui/models/listmodeltimestampobjects.h b/src/gui/models/listmodeltimestampobjects.h
similarity index 91%
rename from src/blackgui/models/listmodeltimestampobjects.h
rename to src/gui/models/listmodeltimestampobjects.h
index 430e11027..22defe454 100644
--- a/src/blackgui/models/listmodeltimestampobjects.h
+++ b/src/gui/models/listmodeltimestampobjects.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_MODELS_LISTMODELTIMESTAMPOBJECTS_H
-#define BLACKGUI_MODELS_LISTMODELTIMESTAMPOBJECTS_H
+#ifndef SWIFT_GUI_MODELS_LISTMODELTIMESTAMPOBJECTS_H
+#define SWIFT_GUI_MODELS_LISTMODELTIMESTAMPOBJECTS_H
 
-#include "blackgui/models/listmodelbase.h"
+#include "gui/models/listmodelbase.h"
 
 #include <QString>
 #include <QVariant>
@@ -15,7 +15,7 @@
 class QModelIndex;
 class QObject;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     //! List model for timestamp based objects with offset
     template <typename T, bool UseCompare = false>
diff --git a/src/blackgui/models/liveryfilter.cpp b/src/gui/models/liveryfilter.cpp
similarity index 98%
rename from src/blackgui/models/liveryfilter.cpp
rename to src/gui/models/liveryfilter.cpp
index 4f9d25f6a..d9c258dd9 100644
--- a/src/blackgui/models/liveryfilter.cpp
+++ b/src/gui/models/liveryfilter.cpp
@@ -1,13 +1,13 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/models/liveryfilter.h"
+#include "gui/models/liveryfilter.h"
 #include "misc/aviation/airlineicaocode.h"
 #include "misc/aviation/livery.h"
 
 using namespace swift::misc::aviation;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     CLiveryFilter::CLiveryFilter(int id, const QString &combinedCode, const QString &descriptiom,
                                  const QString &airlineDesignator,
diff --git a/src/blackgui/models/liveryfilter.h b/src/gui/models/liveryfilter.h
similarity index 84%
rename from src/blackgui/models/liveryfilter.h
rename to src/gui/models/liveryfilter.h
index 20bfcb7d2..163e2a71c 100644
--- a/src/blackgui/models/liveryfilter.h
+++ b/src/gui/models/liveryfilter.h
@@ -3,20 +3,20 @@
 
 //! \file
 
-#ifndef BLACKGUI_LIVERYFILTER_H
-#define BLACKGUI_LIVERYFILTER_H
+#ifndef SWIFT_GUI_LIVERYFILTER_H
+#define SWIFT_GUI_LIVERYFILTER_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/models/modelfilter.h"
+#include "gui/swiftguiexport.h"
+#include "gui/models/modelfilter.h"
 #include "misc/aviation/liverylist.h"
 #include "misc/rgbcolor.h"
 
 #include <QString>
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     //! Filter for aircraft liveries
-    class BLACKGUI_EXPORT CLiveryFilter : public IModelFilter<swift::misc::aviation::CLiveryList>
+    class SWIFT_GUI_EXPORT CLiveryFilter : public IModelFilter<swift::misc::aviation::CLiveryList>
     {
     public:
         //! Constructor
diff --git a/src/blackgui/models/liverylistmodel.cpp b/src/gui/models/liverylistmodel.cpp
similarity index 94%
rename from src/blackgui/models/liverylistmodel.cpp
rename to src/gui/models/liverylistmodel.cpp
index 67894a674..8923725d6 100644
--- a/src/blackgui/models/liverylistmodel.cpp
+++ b/src/gui/models/liverylistmodel.cpp
@@ -1,9 +1,9 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/models/columnformatters.h"
-#include "blackgui/models/columns.h"
-#include "blackgui/models/liverylistmodel.h"
+#include "gui/models/columnformatters.h"
+#include "gui/models/columns.h"
+#include "gui/models/liverylistmodel.h"
 #include "misc/aviation/airlineicaocode.h"
 #include "misc/aviation/livery.h"
 #include "misc/country.h"
@@ -16,7 +16,7 @@
 using namespace swift::misc;
 using namespace swift::misc::aviation;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     CLiveryListModel::CLiveryListModel(QObject *parent) : CListModelDbObjects("ModelLiveryList", parent)
     {
diff --git a/src/blackgui/models/liverylistmodel.h b/src/gui/models/liverylistmodel.h
similarity index 73%
rename from src/blackgui/models/liverylistmodel.h
rename to src/gui/models/liverylistmodel.h
index 2ee59747e..6a426212c 100644
--- a/src/blackgui/models/liverylistmodel.h
+++ b/src/gui/models/liverylistmodel.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_LIVERYLISTMODEL_H
-#define BLACKGUI_LIVERYLISTMODEL_H
+#ifndef SWIFT_GUI_LIVERYLISTMODEL_H
+#define SWIFT_GUI_LIVERYLISTMODEL_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/models/listmodeldbobjects.h"
+#include "gui/swiftguiexport.h"
+#include "gui/models/listmodeldbobjects.h"
 
 class QObject;
 
@@ -17,10 +17,10 @@ namespace swift::misc::aviation
     class CLiveryList;
 }
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     //! Distributor list model
-    class BLACKGUI_EXPORT CLiveryListModel :
+    class SWIFT_GUI_EXPORT CLiveryListModel :
         public CListModelDbObjects<swift::misc::aviation::CLiveryList, int, true>
     {
         Q_OBJECT
diff --git a/src/blackgui/models/matchingstatisticsmodel.cpp b/src/gui/models/matchingstatisticsmodel.cpp
similarity index 97%
rename from src/blackgui/models/matchingstatisticsmodel.cpp
rename to src/gui/models/matchingstatisticsmodel.cpp
index 75385c045..e870adb63 100644
--- a/src/blackgui/models/matchingstatisticsmodel.cpp
+++ b/src/gui/models/matchingstatisticsmodel.cpp
@@ -2,12 +2,12 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "matchingstatisticsmodel.h"
-#include "blackgui/models/columns.h"
+#include "gui/models/columns.h"
 #include <QtGlobal>
 
 using namespace swift::misc::simulation;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     CMatchingStatisticsModel::CMatchingStatisticsModel(MatchingStatisticsMode mode, QObject *parent) : CListModelBase("MatchingStatisticsModel", parent)
     {
diff --git a/src/blackgui/models/matchingstatisticsmodel.h b/src/gui/models/matchingstatisticsmodel.h
similarity index 72%
rename from src/blackgui/models/matchingstatisticsmodel.h
rename to src/gui/models/matchingstatisticsmodel.h
index fd0f5ac5e..9cbcf9525 100644
--- a/src/blackgui/models/matchingstatisticsmodel.h
+++ b/src/gui/models/matchingstatisticsmodel.h
@@ -3,19 +3,19 @@
 
 //! \file
 
-#ifndef BLACKGUI_MATCHINGSTATISTICSMODEL_H
-#define BLACKGUI_MATCHINGSTATISTICSMODEL_H
+#ifndef SWIFT_GUI_MATCHINGSTATISTICSMODEL_H
+#define SWIFT_GUI_MATCHINGSTATISTICSMODEL_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/models/listmodelbase.h"
+#include "gui/swiftguiexport.h"
+#include "gui/models/listmodelbase.h"
 #include "misc/simulation/matchingstatistics.h"
 
 class QObject;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     //! Matching statistics entry
-    class BLACKGUI_EXPORT CMatchingStatisticsModel : public CListModelBase<swift::misc::simulation::CMatchingStatistics, true>
+    class SWIFT_GUI_EXPORT CMatchingStatisticsModel : public CListModelBase<swift::misc::simulation::CMatchingStatistics, true>
     {
         Q_OBJECT
 
diff --git a/src/blackgui/models/modelfilter.cpp b/src/gui/models/modelfilter.cpp
similarity index 97%
rename from src/blackgui/models/modelfilter.cpp
rename to src/gui/models/modelfilter.cpp
index 4bbcc7447..6f8996ad9 100644
--- a/src/blackgui/models/modelfilter.cpp
+++ b/src/gui/models/modelfilter.cpp
@@ -1,13 +1,13 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/models/modelfilter.h"
+#include "gui/models/modelfilter.h"
 #include "misc/logmessage.h"
 #include <QtGlobal>
 
 using namespace swift::misc;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     template <class ContainerType>
     bool IModelFilter<ContainerType>::stringMatchesFilterExpression(const QString &value, const QString &filter, Qt::CaseSensitivity cs) const
diff --git a/src/blackgui/models/modelfilter.h b/src/gui/models/modelfilter.h
similarity index 95%
rename from src/blackgui/models/modelfilter.h
rename to src/gui/models/modelfilter.h
index 4365ed6c6..a7aafe2d6 100644
--- a/src/blackgui/models/modelfilter.h
+++ b/src/gui/models/modelfilter.h
@@ -3,8 +3,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_MODELS_LISTMODELFILTER_H
-#define BLACKGUI_MODELS_LISTMODELFILTER_H
+#ifndef SWIFT_GUI_MODELS_LISTMODELFILTER_H
+#define SWIFT_GUI_MODELS_LISTMODELFILTER_H
 
 #include "misc/aviation/aircrafticaocodelist.h"
 #include "misc/aviation/airlineicaocodelist.h"
@@ -28,7 +28,7 @@
 #include <Qt>
 #include <memory>
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     //! Model filter interface
     template <class ContainerType>
diff --git a/src/blackgui/models/namevariantpairlistmodel.cpp b/src/gui/models/namevariantpairlistmodel.cpp
similarity index 94%
rename from src/blackgui/models/namevariantpairlistmodel.cpp
rename to src/gui/models/namevariantpairlistmodel.cpp
index 039b85751..175798714 100644
--- a/src/blackgui/models/namevariantpairlistmodel.cpp
+++ b/src/gui/models/namevariantpairlistmodel.cpp
@@ -1,9 +1,9 @@
 // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/models/columnformatters.h"
-#include "blackgui/models/columns.h"
-#include "blackgui/models/namevariantpairlistmodel.h"
+#include "gui/models/columnformatters.h"
+#include "gui/models/columns.h"
+#include "gui/models/namevariantpairlistmodel.h"
 #include "misc/mixin/mixincompare.h"
 #include "misc/namevariantpair.h"
 #include "misc/propertyindexvariantmap.h"
@@ -14,7 +14,7 @@
 
 using namespace swift::misc;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     CNameVariantPairModel::CNameVariantPairModel(bool withIcon, QObject *parent) : CListModelBase("ViewNameVariantPairList", parent)
     {
diff --git a/src/blackgui/models/namevariantpairlistmodel.h b/src/gui/models/namevariantpairlistmodel.h
similarity index 81%
rename from src/blackgui/models/namevariantpairlistmodel.h
rename to src/gui/models/namevariantpairlistmodel.h
index 2f49d369a..3358606a1 100644
--- a/src/blackgui/models/namevariantpairlistmodel.h
+++ b/src/gui/models/namevariantpairlistmodel.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_NAMEVARIANTLISTMODEL_H
-#define BLACKGUI_NAMEVARIANTLISTMODEL_H
+#ifndef SWIFT_GUI_NAMEVARIANTLISTMODEL_H
+#define SWIFT_GUI_NAMEVARIANTLISTMODEL_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/models/listmodelbase.h"
+#include "gui/swiftguiexport.h"
+#include "gui/models/listmodelbase.h"
 #include "misc/namevariantpairlist.h"
 #include "misc/variant.h"
 
@@ -21,11 +21,11 @@ namespace swift::misc
     class CNameVariantPair;
 }
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
 
     //! Simple model displaying name / variant values
-    class BLACKGUI_EXPORT CNameVariantPairModel : public CListModelBase<swift::misc::CNameVariantPairList>
+    class SWIFT_GUI_EXPORT CNameVariantPairModel : public CListModelBase<swift::misc::CNameVariantPairList>
     {
         Q_OBJECT
 
diff --git a/src/blackgui/models/selectionmodel.h b/src/gui/models/selectionmodel.h
similarity index 87%
rename from src/blackgui/models/selectionmodel.h
rename to src/gui/models/selectionmodel.h
index bc99c3d34..7056165d6 100644
--- a/src/blackgui/models/selectionmodel.h
+++ b/src/gui/models/selectionmodel.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_MODELS_SELECTIONMODEL_H
-#define BLACKGUI_MODELS_SELECTIONMODEL_H
+#ifndef SWIFT_GUI_MODELS_SELECTIONMODEL_H
+#define SWIFT_GUI_MODELS_SELECTIONMODEL_H
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     //! Allow to get and select objects
     template <typename ContainerType>
diff --git a/src/blackgui/models/serverlistmodel.cpp b/src/gui/models/serverlistmodel.cpp
similarity index 94%
rename from src/blackgui/models/serverlistmodel.cpp
rename to src/gui/models/serverlistmodel.cpp
index 07d740669..b1843e6e0 100644
--- a/src/blackgui/models/serverlistmodel.cpp
+++ b/src/gui/models/serverlistmodel.cpp
@@ -1,8 +1,8 @@
 // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/models/columns.h"
-#include "blackgui/models/serverlistmodel.h"
+#include "gui/models/columns.h"
+#include "gui/models/serverlistmodel.h"
 #include "misc/network/server.h"
 #include "misc/network/user.h"
 
@@ -10,7 +10,7 @@
 
 using namespace swift::misc::network;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     CServerListModel::CServerListModel(QObject *parent) : CListModelBase("ServerListModel", parent)
     {
diff --git a/src/blackgui/models/serverlistmodel.h b/src/gui/models/serverlistmodel.h
similarity index 61%
rename from src/blackgui/models/serverlistmodel.h
rename to src/gui/models/serverlistmodel.h
index 5e277d489..82681c752 100644
--- a/src/blackgui/models/serverlistmodel.h
+++ b/src/gui/models/serverlistmodel.h
@@ -3,19 +3,19 @@
 
 //! \file
 
-#ifndef BLACKGUI_MODELS_SERVERLISTMODEL_H
-#define BLACKGUI_MODELS_SERVERLISTMODEL_H
+#ifndef SWIFT_GUI_MODELS_SERVERLISTMODEL_H
+#define SWIFT_GUI_MODELS_SERVERLISTMODEL_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/models/listmodelbase.h"
+#include "gui/swiftguiexport.h"
+#include "gui/models/listmodelbase.h"
 #include "misc/network/serverlist.h"
 
 class QObject;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     //! Server list model
-    class BLACKGUI_EXPORT CServerListModel : public CListModelBase<swift::misc::network::CServerList, true>
+    class SWIFT_GUI_EXPORT CServerListModel : public CListModelBase<swift::misc::network::CServerList, true>
     {
         Q_OBJECT
 
diff --git a/src/blackgui/models/simulatedaircraftlistmodel.cpp b/src/gui/models/simulatedaircraftlistmodel.cpp
similarity index 97%
rename from src/blackgui/models/simulatedaircraftlistmodel.cpp
rename to src/gui/models/simulatedaircraftlistmodel.cpp
index 8d1bafdd8..660af30b4 100644
--- a/src/blackgui/models/simulatedaircraftlistmodel.cpp
+++ b/src/gui/models/simulatedaircraftlistmodel.cpp
@@ -1,9 +1,9 @@
 // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/models/columnformatters.h"
-#include "blackgui/models/columns.h"
-#include "blackgui/models/simulatedaircraftlistmodel.h"
+#include "gui/models/columnformatters.h"
+#include "gui/models/columns.h"
+#include "gui/models/simulatedaircraftlistmodel.h"
 #include "misc/aviation/aircraftsituation.h"
 #include "misc/aviation/callsign.h"
 #include "misc/aviation/comsystem.h"
@@ -23,7 +23,7 @@ using namespace swift::misc::network;
 using namespace swift::misc::physical_quantities;
 using namespace swift::misc::simulation;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     CSimulatedAircraftListModel::CSimulatedAircraftListModel(QObject *parent) : CListModelCallsignObjects("ModelSimulatedAircraftList", parent)
     {
diff --git a/src/blackgui/models/simulatedaircraftlistmodel.h b/src/gui/models/simulatedaircraftlistmodel.h
similarity index 77%
rename from src/blackgui/models/simulatedaircraftlistmodel.h
rename to src/gui/models/simulatedaircraftlistmodel.h
index 08dcb980e..562538399 100644
--- a/src/blackgui/models/simulatedaircraftlistmodel.h
+++ b/src/gui/models/simulatedaircraftlistmodel.h
@@ -3,21 +3,21 @@
 
 //! \file
 
-#ifndef BLACKGUI_MODELS_SIMULATEDAIRCRAFTLISTMODEL_H
-#define BLACKGUI_MODELS_SIMULATEDAIRCRAFTLISTMODEL_H
+#ifndef SWIFT_GUI_MODELS_SIMULATEDAIRCRAFTLISTMODEL_H
+#define SWIFT_GUI_MODELS_SIMULATEDAIRCRAFTLISTMODEL_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/models/listmodelcallsignobjects.h"
+#include "gui/swiftguiexport.h"
+#include "gui/models/listmodelcallsignobjects.h"
 #include "misc/simulation/simulatedaircraftlist.h"
 
 namespace swift::misc::simulation
 {
     class CSimulatedAircraft;
 }
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     //! Aircraft list model
-    class BLACKGUI_EXPORT CSimulatedAircraftListModel :
+    class SWIFT_GUI_EXPORT CSimulatedAircraftListModel :
         public CListModelCallsignObjects<swift::misc::simulation::CSimulatedAircraftList, true>
     {
         Q_OBJECT
diff --git a/src/blackgui/models/statusmessagefilter.cpp b/src/gui/models/statusmessagefilter.cpp
similarity index 97%
rename from src/blackgui/models/statusmessagefilter.cpp
rename to src/gui/models/statusmessagefilter.cpp
index 6ffbaf875..d1e687b40 100644
--- a/src/blackgui/models/statusmessagefilter.cpp
+++ b/src/gui/models/statusmessagefilter.cpp
@@ -1,12 +1,12 @@
 // SPDX-FileCopyrightText: Copyright (C) 2016 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/models/statusmessagefilter.h"
+#include "gui/models/statusmessagefilter.h"
 #include "misc/logpattern.h"
 
 using namespace swift::misc;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     CStatusMessageFilter::CStatusMessageFilter(CStatusMessage::StatusSeverity severity, const QString &text, const QString &category) : m_severity(severity), m_msgText(text.trimmed()), m_category(category.trimmed())
     {
diff --git a/src/blackgui/models/statusmessagefilter.h b/src/gui/models/statusmessagefilter.h
similarity index 77%
rename from src/blackgui/models/statusmessagefilter.h
rename to src/gui/models/statusmessagefilter.h
index 62f07acdf..18e0327e3 100644
--- a/src/blackgui/models/statusmessagefilter.h
+++ b/src/gui/models/statusmessagefilter.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_MODELS_STATUSMESSAGEFILTER_H
-#define BLACKGUI_MODELS_STATUSMESSAGEFILTER_H
+#ifndef SWIFT_GUI_MODELS_STATUSMESSAGEFILTER_H
+#define SWIFT_GUI_MODELS_STATUSMESSAGEFILTER_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/models/modelfilter.h"
+#include "gui/swiftguiexport.h"
+#include "gui/models/modelfilter.h"
 #include "misc/statusmessagelist.h"
 #include <QString>
 
@@ -16,10 +16,10 @@ namespace swift::misc
     class CLogPattern;
 }
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     //! Filter for status messages
-    class BLACKGUI_EXPORT CStatusMessageFilter : public IModelFilter<swift::misc::CStatusMessageList>
+    class SWIFT_GUI_EXPORT CStatusMessageFilter : public IModelFilter<swift::misc::CStatusMessageList>
     {
     public:
         //! Constructor
diff --git a/src/blackgui/models/statusmessagelistmodel.cpp b/src/gui/models/statusmessagelistmodel.cpp
similarity index 96%
rename from src/blackgui/models/statusmessagelistmodel.cpp
rename to src/gui/models/statusmessagelistmodel.cpp
index 7f17bc7c9..ba1f0bff7 100644
--- a/src/blackgui/models/statusmessagelistmodel.cpp
+++ b/src/gui/models/statusmessagelistmodel.cpp
@@ -1,9 +1,9 @@
 // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/models/columnformatters.h"
-#include "blackgui/models/columns.h"
-#include "blackgui/models/statusmessagelistmodel.h"
+#include "gui/models/columnformatters.h"
+#include "gui/models/columns.h"
+#include "gui/models/statusmessagelistmodel.h"
 #include "misc/propertyindexvariantmap.h"
 #include "misc/timestampbased.h"
 
@@ -12,7 +12,7 @@
 
 using namespace swift::misc;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     CStatusMessageListModel::CStatusMessageListModel(QObject *parent) : CListModelTimestampObjects<CStatusMessageList, true>("ViewStatusMessageList", parent)
     {
diff --git a/src/blackgui/models/statusmessagelistmodel.h b/src/gui/models/statusmessagelistmodel.h
similarity index 84%
rename from src/blackgui/models/statusmessagelistmodel.h
rename to src/gui/models/statusmessagelistmodel.h
index af48fc2aa..08411e437 100644
--- a/src/blackgui/models/statusmessagelistmodel.h
+++ b/src/gui/models/statusmessagelistmodel.h
@@ -3,19 +3,19 @@
 
 //! \file
 
-#ifndef BLACKGUI_MODELS_STATUSMESSAGELISTMODEL_H
-#define BLACKGUI_MODELS_STATUSMESSAGELISTMODEL_H
+#ifndef SWIFT_GUI_MODELS_STATUSMESSAGELISTMODEL_H
+#define SWIFT_GUI_MODELS_STATUSMESSAGELISTMODEL_H
 
-#include "blackgui/models/listmodeltimestampobjects.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/models/listmodeltimestampobjects.h"
+#include "gui/swiftguiexport.h"
 #include "misc/statusmessagelist.h"
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     /*!
      * Status message list model
      */
-    class BLACKGUI_EXPORT CStatusMessageListModel :
+    class SWIFT_GUI_EXPORT CStatusMessageListModel :
         public CListModelTimestampObjects<swift::misc::CStatusMessageList, true>
     {
         Q_OBJECT
diff --git a/src/blackgui/models/textmessagelistmodel.cpp b/src/gui/models/textmessagelistmodel.cpp
similarity index 95%
rename from src/blackgui/models/textmessagelistmodel.cpp
rename to src/gui/models/textmessagelistmodel.cpp
index 75647eebc..f01899ab0 100644
--- a/src/blackgui/models/textmessagelistmodel.cpp
+++ b/src/gui/models/textmessagelistmodel.cpp
@@ -1,9 +1,9 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/models/columnformatters.h"
-#include "blackgui/models/columns.h"
-#include "blackgui/models/textmessagelistmodel.h"
+#include "gui/models/columnformatters.h"
+#include "gui/models/columns.h"
+#include "gui/models/textmessagelistmodel.h"
 #include "misc/aviation/callsign.h"
 #include "misc/network/textmessage.h"
 #include "misc/propertyindexvariantmap.h"
@@ -17,7 +17,7 @@ using namespace swift::misc::physical_quantities;
 using namespace swift::misc::network;
 using namespace swift::misc::aviation;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     CTextMessageListModel::CTextMessageListModel(TextMessageMode mode, QObject *parent) : CListModelTimestampObjects("ModelTextMessageList", parent), m_textMessageMode(NotSet)
     {
diff --git a/src/blackgui/models/textmessagelistmodel.h b/src/gui/models/textmessagelistmodel.h
similarity index 81%
rename from src/blackgui/models/textmessagelistmodel.h
rename to src/gui/models/textmessagelistmodel.h
index 1c6006452..78a39bcbe 100644
--- a/src/blackgui/models/textmessagelistmodel.h
+++ b/src/gui/models/textmessagelistmodel.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_MODELS_TEXTMESSAGELISTMODEL_H
-#define BLACKGUI_MODELS_TEXTMESSAGELISTMODEL_H
+#ifndef SWIFT_GUI_MODELS_TEXTMESSAGELISTMODEL_H
+#define SWIFT_GUI_MODELS_TEXTMESSAGELISTMODEL_H
 
-#include "blackgui/models/listmodeltimestampobjects.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/models/listmodeltimestampobjects.h"
+#include "gui/swiftguiexport.h"
 #include "misc/network/textmessagelist.h"
 
 class QObject;
@@ -16,10 +16,10 @@ namespace swift::misc::network
 {
     class CTextMessage;
 }
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     //! Text message list model
-    class BLACKGUI_EXPORT CTextMessageListModel :
+    class SWIFT_GUI_EXPORT CTextMessageListModel :
         public CListModelTimestampObjects<swift::misc::network::CTextMessageList, true>
     {
         Q_OBJECT
diff --git a/src/blackgui/models/userlistmodel.cpp b/src/gui/models/userlistmodel.cpp
similarity index 95%
rename from src/blackgui/models/userlistmodel.cpp
rename to src/gui/models/userlistmodel.cpp
index c8858804d..412b29851 100644
--- a/src/blackgui/models/userlistmodel.cpp
+++ b/src/gui/models/userlistmodel.cpp
@@ -1,8 +1,8 @@
 // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/models/columns.h"
-#include "blackgui/models/userlistmodel.h"
+#include "gui/models/columns.h"
+#include "gui/models/userlistmodel.h"
 #include "misc/aviation/airporticaocode.h"
 #include "misc/aviation/callsign.h"
 #include "misc/propertyindexvariantmap.h"
@@ -14,7 +14,7 @@
 using namespace swift::misc::network;
 using namespace swift::misc::aviation;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     CUserListModel::CUserListModel(UserMode userMode, QObject *parent) : CListModelBase("ModelUserList", parent), m_userMode(NotSet)
     {
diff --git a/src/blackgui/models/userlistmodel.h b/src/gui/models/userlistmodel.h
similarity index 78%
rename from src/blackgui/models/userlistmodel.h
rename to src/gui/models/userlistmodel.h
index f29fab4c3..7a812b568 100644
--- a/src/blackgui/models/userlistmodel.h
+++ b/src/gui/models/userlistmodel.h
@@ -3,19 +3,19 @@
 
 //! \file
 
-#ifndef BLACKGUI_MODELS_USERLISTMODEL_H
-#define BLACKGUI_MODELS_USERLISTMODEL_H
+#ifndef SWIFT_GUI_MODELS_USERLISTMODEL_H
+#define SWIFT_GUI_MODELS_USERLISTMODEL_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/models/listmodelbase.h"
+#include "gui/swiftguiexport.h"
+#include "gui/models/listmodelbase.h"
 #include "misc/network/userlist.h"
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     /*!
      * User list model
      */
-    class BLACKGUI_EXPORT CUserListModel :
+    class SWIFT_GUI_EXPORT CUserListModel :
         public CListModelBase<swift::misc::network::CUserList, true>
     {
         Q_OBJECT
diff --git a/src/blackgui/models/windlayerlistmodel.cpp b/src/gui/models/windlayerlistmodel.cpp
similarity index 94%
rename from src/blackgui/models/windlayerlistmodel.cpp
rename to src/gui/models/windlayerlistmodel.cpp
index 9529a3a47..85dde35b2 100644
--- a/src/blackgui/models/windlayerlistmodel.cpp
+++ b/src/gui/models/windlayerlistmodel.cpp
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "windlayerlistmodel.h"
-#include "blackgui/models/columnformatters.h"
+#include "gui/models/columnformatters.h"
 
 #include <Qt>
 #include <QtGlobal>
@@ -11,7 +11,7 @@ using namespace swift::misc;
 using namespace swift::misc::physical_quantities;
 using namespace swift::misc::weather;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     CWindLayerListModel::CWindLayerListModel(QObject *parent) : CListModelBase("WindLayerListModel", parent)
     {
diff --git a/src/blackgui/models/windlayerlistmodel.h b/src/gui/models/windlayerlistmodel.h
similarity index 70%
rename from src/blackgui/models/windlayerlistmodel.h
rename to src/gui/models/windlayerlistmodel.h
index 40c71a557..0da1fc425 100644
--- a/src/blackgui/models/windlayerlistmodel.h
+++ b/src/gui/models/windlayerlistmodel.h
@@ -3,20 +3,20 @@
 
 //! \file
 
-#ifndef BLACKGUI_MODELS_WINDLAYERLISTMODEL_H
-#define BLACKGUI_MODELS_WINDLAYERLISTMODEL_H
+#ifndef SWIFT_GUI_MODELS_WINDLAYERLISTMODEL_H
+#define SWIFT_GUI_MODELS_WINDLAYERLISTMODEL_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/models/listmodelbase.h"
+#include "gui/swiftguiexport.h"
+#include "gui/models/listmodelbase.h"
 #include "misc/weather/windlayer.h"
 #include "misc/weather/windlayerlist.h"
 
 class QObject;
 
-namespace BlackGui::Models
+namespace swift::gui::models
 {
     //! Wind layer list model
-    class BLACKGUI_EXPORT CWindLayerListModel :
+    class SWIFT_GUI_EXPORT CWindLayerListModel :
         public CListModelBase<swift::misc::weather::CWindLayerList, false>
     {
         Q_OBJECT
diff --git a/src/blackgui/overlaymessages.cpp b/src/gui/overlaymessages.cpp
similarity index 97%
rename from src/blackgui/overlaymessages.cpp
rename to src/gui/overlaymessages.cpp
index 720bac26a..d53de6354 100644
--- a/src/blackgui/overlaymessages.cpp
+++ b/src/gui/overlaymessages.cpp
@@ -1,14 +1,14 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/statusmessageform.h"
-#include "blackgui/components/statusmessageformsmall.h"
-#include "blackgui/views/statusmessageview.h"
-#include "blackgui/views/viewbase.h"
-#include "blackgui/models/statusmessagelistmodel.h"
-#include "blackgui/overlaymessages.h"
-#include "blackgui/stylesheetutility.h"
-#include "blackgui/guiapplication.h"
+#include "gui/components/statusmessageform.h"
+#include "gui/components/statusmessageformsmall.h"
+#include "gui/views/statusmessageview.h"
+#include "gui/views/viewbase.h"
+#include "gui/models/statusmessagelistmodel.h"
+#include "gui/overlaymessages.h"
+#include "gui/stylesheetutility.h"
+#include "gui/guiapplication.h"
 #include "misc/aviation/callsign.h"
 #include "misc/simulation/simulatedaircraft.h"
 #include "misc/network/textmessage.h"
@@ -37,12 +37,12 @@ using namespace swift::misc::network;
 using namespace swift::misc::simulation;
 using namespace swift::core;
 using namespace swift::core::context;
-using namespace BlackGui::Models;
-using namespace BlackGui::Views;
-using namespace BlackGui::Settings;
-using namespace BlackGui::Components;
+using namespace swift::gui::models;
+using namespace swift::gui::views;
+using namespace swift::gui::settings;
+using namespace swift::gui::components;
 
-namespace BlackGui
+namespace swift::gui
 {
     COverlayMessages::COverlayMessages(int w, int h, QWidget *parent) : QFrame(parent),
                                                                         ui(new Ui::COverlayMessages)
diff --git a/src/blackgui/overlaymessages.h b/src/gui/overlaymessages.h
similarity index 94%
rename from src/blackgui/overlaymessages.h
rename to src/gui/overlaymessages.h
index 1d4850bd1..3be1b384a 100644
--- a/src/blackgui/overlaymessages.h
+++ b/src/gui/overlaymessages.h
@@ -3,12 +3,12 @@
 
 //! \file
 
-#ifndef BLACKGUI_OVERLAYMESSAGES_H
-#define BLACKGUI_OVERLAYMESSAGES_H
+#ifndef SWIFT_GUI_OVERLAYMESSAGES_H
+#define SWIFT_GUI_OVERLAYMESSAGES_H
 
-#include "blackgui/components/textmessagecomponenttab.h"
-#include "blackgui/settings/textmessagesettings.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/components/textmessagecomponenttab.h"
+#include "gui/settings/textmessagesettings.h"
+#include "gui/swiftguiexport.h"
 #include "misc/aviation/callsign.h"
 #include "misc/statusmessagelist.h"
 #include "misc/statusmessage.h"
@@ -35,12 +35,12 @@ namespace swift::misc::network
 {
     class CTextMessage;
 }
-namespace BlackGui
+namespace swift::gui
 {
     /*!
      * Display status messages (nested in the parent widget)
      */
-    class BLACKGUI_EXPORT COverlayMessages : public QFrame
+    class SWIFT_GUI_EXPORT COverlayMessages : public QFrame
     {
         Q_OBJECT
 
@@ -124,7 +124,7 @@ namespace BlackGui
         void showOverlayTextMessage(const swift::misc::network::CTextMessage &textMessage, int timeOutMs = -1);
 
         //! Inline text message
-        void showOverlayInlineTextMessage(Components::TextMessageTab tab);
+        void showOverlayInlineTextMessage(components::TextMessageTab tab);
 
         //! Inline text message
         void showOverlayInlineTextMessage(const swift::misc::aviation::CCallsign &callsign);
@@ -181,7 +181,7 @@ namespace BlackGui
 
     private:
         QScopedPointer<Ui::COverlayMessages> ui;
-        swift::misc::CSettingReadOnly<Settings::TextMessageSettings> m_messageSettings { this };
+        swift::misc::CSettingReadOnly<settings::TextMessageSettings> m_messageSettings { this };
         QString m_header;
         int m_lastConfirmation = QMessageBox::Cancel;
         bool m_awaitingConfirmation = false;
diff --git a/src/blackgui/overlaymessages.ui b/src/gui/overlaymessages.ui
similarity index 94%
rename from src/blackgui/overlaymessages.ui
rename to src/gui/overlaymessages.ui
index 2ae2490d3..b1fae4af9 100644
--- a/src/blackgui/overlaymessages.ui
+++ b/src/gui/overlaymessages.ui
@@ -133,7 +133,7 @@
            <number>0</number>
           </property>
           <item>
-           <widget class="BlackGui::Views::CStatusMessageView" name="tvp_StatusMessages">
+           <widget class="swift::gui::views::CStatusMessageView" name="tvp_StatusMessages">
             <property name="selectionMode">
              <enum>QAbstractItemView::SingleSelection</enum>
             </property>
@@ -182,7 +182,7 @@
            <number>0</number>
           </property>
           <item>
-           <widget class="BlackGui::Components::CStatusMessageForm" name="form_StatusMessage">
+           <widget class="swift::gui::components::CStatusMessageForm" name="form_StatusMessage">
             <property name="frameShape">
              <enum>QFrame::StyledPanel</enum>
             </property>
@@ -211,7 +211,7 @@
            <number>0</number>
           </property>
           <item>
-           <widget class="BlackGui::Components::CStatusMessageFormSmall" name="form_StatusMessageSmall"/>
+           <widget class="swift::gui::components::CStatusMessageFormSmall" name="form_StatusMessageSmall"/>
           </item>
          </layout>
         </widget>
@@ -310,7 +310,7 @@
            <number>0</number>
           </property>
           <item>
-           <widget class="BlackGui::Components::CTextMessageComponent" name="comp_OverlayTextMessage">
+           <widget class="swift::gui::components::CTextMessageComponent" name="comp_OverlayTextMessage">
             <property name="frameShape">
              <enum>QFrame::StyledPanel</enum>
             </property>
@@ -434,26 +434,26 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Views::CStatusMessageView</class>
+   <class>swift::gui::views::CStatusMessageView</class>
    <extends>QTableView</extends>
-   <header>blackgui/views/statusmessageview.h</header>
+   <header>gui/views/statusmessageview.h</header>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CStatusMessageForm</class>
+   <class>swift::gui::components::CStatusMessageForm</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/statusmessageform.h</header>
+   <header>gui/components/statusmessageform.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CStatusMessageFormSmall</class>
+   <class>swift::gui::components::CStatusMessageFormSmall</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/statusmessageformsmall.h</header>
+   <header>gui/components/statusmessageformsmall.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CTextMessageComponent</class>
+   <class>swift::gui::components::CTextMessageComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/textmessagecomponent.h</header>
+   <header>gui/components/textmessagecomponent.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/overlaymessagesframe.cpp b/src/gui/overlaymessagesframe.cpp
similarity index 87%
rename from src/blackgui/overlaymessagesframe.cpp
rename to src/gui/overlaymessagesframe.cpp
index 9c1bcd962..8ee610fa3 100644
--- a/src/blackgui/overlaymessagesframe.cpp
+++ b/src/gui/overlaymessagesframe.cpp
@@ -1,11 +1,11 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/overlaymessagesframe.h"
-#include "blackgui/overlaymessages.h"
-#include "blackgui/dockwidgetinfoarea.h"
-#include "blackgui/stylesheetutility.h"
-#include "blackgui/guiutility.h"
+#include "gui/overlaymessagesframe.h"
+#include "gui/overlaymessages.h"
+#include "gui/dockwidgetinfoarea.h"
+#include "gui/stylesheetutility.h"
+#include "gui/guiutility.h"
 #include "misc/network/textmessage.h"
 #include "misc/verify.h"
 
@@ -19,7 +19,7 @@
 using namespace swift::misc;
 using namespace swift::misc::network;
 
-namespace BlackGui
+namespace swift::gui
 {
     COverlayMessagesFrame::COverlayMessagesFrame(QWidget *parent, Qt::WindowFlags f) : COverlayMessagesBase(parent, f)
     {}
diff --git a/src/blackgui/overlaymessagesframe.h b/src/gui/overlaymessagesframe.h
similarity index 85%
rename from src/blackgui/overlaymessagesframe.h
rename to src/gui/overlaymessagesframe.h
index ec99e6298..cfe5375ef 100644
--- a/src/blackgui/overlaymessagesframe.h
+++ b/src/gui/overlaymessagesframe.h
@@ -3,14 +3,14 @@
 
 //! \file
 
-#ifndef BLACKGUI_OVERLAYMESSAGES_FRAME_H
-#define BLACKGUI_OVERLAYMESSAGES_FRAME_H
+#ifndef SWIFT_GUI_OVERLAYMESSAGES_FRAME_H
+#define SWIFT_GUI_OVERLAYMESSAGES_FRAME_H
 
-#include "blackgui/components/textmessagecomponenttab.h"
-#include "blackgui/enablefordockwidgetinfoarea.h"
-#include "blackgui/overlaymessages.h"
-#include "blackgui/guiutility.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/components/textmessagecomponenttab.h"
+#include "gui/enablefordockwidgetinfoarea.h"
+#include "gui/overlaymessages.h"
+#include "gui/guiutility.h"
+#include "gui/swiftguiexport.h"
 #include "misc/network/textmessage.h"
 #include "misc/statusmessagelist.h"
 #include "misc/pixmap.h"
@@ -34,12 +34,12 @@
 class QKeyEvent;
 class QPaintEvent;
 
-namespace BlackGui
+namespace swift::gui
 {
     /*!
      * Base class to display overlay messages in different widgets
      * (nested in this widget).
-     * \fixme KB 2017-12 all header version, if someone manages to create a cpp version go ahead, I failed on gcc with "undefined reference to `BlackGui::COverlayMessagesBase<QFrame>::showOverlayMessages`"
+     * \fixme KB 2017-12 all header version, if someone manages to create a cpp version go ahead, I failed on gcc with "undefined reference to `swift::gui::COverlayMessagesBase<QFrame>::showOverlayMessages`"
      */
     template <class WIDGET>
     class COverlayMessagesBase : public WIDGET
@@ -62,7 +62,7 @@ namespace BlackGui
             m_overlayMessages->setReducedInfo(m_reducedInfo);
         }
 
-        //! \copydoc BlackGui::COverlayMessages::activateTextMessages
+        //! \copydoc swift::gui::COverlayMessages::activateTextMessages
         void activateTextMessages(bool activate)
         {
             this->initOverlayMessages();
@@ -83,7 +83,7 @@ namespace BlackGui
             if (middleFactor >= 0) { m_middleFactor = middleFactor; }
         }
 
-        //! \copydoc BlackGui::COverlayMessages::showKillButton
+        //! \copydoc swift::gui::COverlayMessages::showKillButton
         void showKillButton(bool killButton)
         {
             m_showKillButton = killButton;
@@ -93,7 +93,7 @@ namespace BlackGui
             }
         }
 
-        //! \copydoc BlackGui::COverlayMessages::setForceSmall
+        //! \copydoc swift::gui::COverlayMessages::setForceSmall
         void setForceSmall(bool force)
         {
             m_forceSmallMsgs = force;
@@ -103,7 +103,7 @@ namespace BlackGui
             }
         }
 
-        //! \copydoc BlackGui::COverlayMessages::setReducedInfo
+        //! \copydoc swift::gui::COverlayMessages::setReducedInfo
         void setReducedInfo(bool reduced)
         {
             m_reducedInfo = reduced;
@@ -113,7 +113,7 @@ namespace BlackGui
             }
         }
 
-        //! \copydoc BlackGui::COverlayMessages::showOverlayMessagesWithConfirmation
+        //! \copydoc swift::gui::COverlayMessages::showOverlayMessagesWithConfirmation
         void showOverlayMessagesWithConfirmation(
             const swift::misc::CStatusMessageList &messages,
             bool appendOldMessages,
@@ -129,21 +129,21 @@ namespace BlackGui
             WIDGET::repaint();
         }
 
-        //! \copydoc BlackGui::COverlayMessages::clearOverlayMessages
+        //! \copydoc swift::gui::COverlayMessages::clearOverlayMessages
         void clearOverlayMessages()
         {
             if (!m_overlayMessages) { return; }
             m_overlayMessages->clearOverlayMessages();
         }
 
-        //! \copydoc BlackGui::COverlayMessages::close
+        //! \copydoc swift::gui::COverlayMessages::close
         void closeOverlay()
         {
             if (!m_overlayMessages) { return; }
             m_overlayMessages->close();
         }
 
-        //! \copydoc BlackGui::COverlayMessages::showOverlayMessages
+        //! \copydoc swift::gui::COverlayMessages::showOverlayMessages
         void showOverlayMessages(const swift::misc::CStatusMessageList &messages, bool appendOldMessages = false, int timeOutMs = -1)
         {
             if (messages.isEmpty()) { return; }
@@ -152,7 +152,7 @@ namespace BlackGui
             WIDGET::repaint();
         }
 
-        //! \copydoc BlackGui::COverlayMessages::showOverlayMessagesOrSingleMessage
+        //! \copydoc swift::gui::COverlayMessages::showOverlayMessagesOrSingleMessage
         void showOverlayMessagesOrSingleMessage(const swift::misc::CStatusMessageList &messages, bool appendOldMessages = false, int timeOutMs = -1)
         {
             if (messages.isEmpty()) { return; }
@@ -161,7 +161,7 @@ namespace BlackGui
             WIDGET::repaint();
         }
 
-        //! \copydoc BlackGui::COverlayMessages::showOverlayMessagesOrHTMLMessage
+        //! \copydoc swift::gui::COverlayMessages::showOverlayMessagesOrHTMLMessage
         void showOverlayMessagesOrHTMLMessage(const swift::misc::CStatusMessageList &messages, bool appendOldMessages = false, int timeOutMs = -1)
         {
             if (messages.isEmpty()) { return; }
@@ -170,19 +170,19 @@ namespace BlackGui
             WIDGET::repaint();
         }
 
-        //! \copydoc BlackGui::COverlayMessages::sortOverlayMessages
+        //! \copydoc swift::gui::COverlayMessages::sortOverlayMessages
         void sortOverlayMessages(const swift::misc::CPropertyIndex &property, Qt::SortOrder order)
         {
             m_overlayMessages->sortOverlayMessages(property, order);
         }
 
-        //! \copydoc BlackGui::COverlayMessages::setOverlayMessagesSorting
+        //! \copydoc swift::gui::COverlayMessages::setOverlayMessagesSorting
         void setOverlayMessagesSorting(const swift::misc::CPropertyIndex &property, Qt::SortOrder order)
         {
             m_overlayMessages->setOverlayMessagesSorting(property, order);
         }
 
-        //! \copydoc BlackGui::COverlayMessages::showOverlayMessage
+        //! \copydoc swift::gui::COverlayMessages::showOverlayMessage
         bool showOverlayMessage(const swift::misc::CStatusMessage &message, int timeOutMs = -1)
         {
             if (message.isEmpty()) { return false; }
@@ -192,7 +192,7 @@ namespace BlackGui
             return true;
         }
 
-        //! \copydoc BlackGui::COverlayMessages::showOverlayTextMessage
+        //! \copydoc swift::gui::COverlayMessages::showOverlayTextMessage
         bool showOverlayTextMessage(const swift::misc::network::CTextMessage &textMessage, int timeOutMs = -1)
         {
             if (textMessage.isEmpty()) { return false; }
@@ -202,7 +202,7 @@ namespace BlackGui
             return true;
         }
 
-        //! \copydoc BlackGui::COverlayMessages::showOverlayVariant
+        //! \copydoc swift::gui::COverlayMessages::showOverlayVariant
         void showOverlayVariant(const swift::misc::CVariant &variant, int timeOutMs = -1)
         {
             if (m_overlayMessages->isTextMessagesActivated() && variant.canConvert<swift::misc::network::CTextMessage>())
@@ -219,7 +219,7 @@ namespace BlackGui
             WIDGET::repaint();
         }
 
-        //! \copydoc BlackGui::COverlayMessages::showOverlayImage
+        //! \copydoc swift::gui::COverlayMessages::showOverlayImage
         void showOverlayImage(const swift::misc::CPixmap &pixmap, int timeOutMs = -1)
         {
             this->initInnerFrame();
@@ -227,7 +227,7 @@ namespace BlackGui
             WIDGET::repaint();
         }
 
-        //! \copydoc BlackGui::COverlayMessages::showHTMLMessage
+        //! \copydoc swift::gui::COverlayMessages::showHTMLMessage
         bool showOverlayHTMLMessage(const QString &htmlMessage, int timeOutMs = -1)
         {
             this->initMinimalFrame();
@@ -236,7 +236,7 @@ namespace BlackGui
             return true;
         }
 
-        //! \copydoc BlackGui::COverlayMessages::showHTMLMessage
+        //! \copydoc swift::gui::COverlayMessages::showHTMLMessage
         bool showOverlayHTMLMessage(const swift::misc::CStatusMessage &message, int timeOutMs = -1)
         {
             this->initMinimalFrame();
@@ -245,7 +245,7 @@ namespace BlackGui
             return true;
         }
 
-        //! \copydoc BlackGui::COverlayMessages::showDownloadProgress
+        //! \copydoc swift::gui::COverlayMessages::showDownloadProgress
         void showDownloadProgress(int progress, qint64 current, qint64 max, const QUrl &url, int timeOutMs = -1)
         {
             this->initMinimalFrame();
@@ -253,8 +253,8 @@ namespace BlackGui
             WIDGET::repaint();
         }
 
-        //! \copydoc BlackGui::COverlayMessages::showOverlayImage
-        void showOverlayInlineTextMessage(Components::TextMessageTab tab)
+        //! \copydoc swift::gui::COverlayMessages::showOverlayImage
+        void showOverlayInlineTextMessage(components::TextMessageTab tab)
         {
             this->initInnerFrame(0.75, 0.75);
             if (!this->hasMinimumSize(150, 150)) { return; }
@@ -262,7 +262,7 @@ namespace BlackGui
             WIDGET::repaint();
         }
 
-        //! \copydoc BlackGui::COverlayMessages::showOverlayImage
+        //! \copydoc swift::gui::COverlayMessages::showOverlayImage
         void showOverlayInlineTextMessage(const swift::misc::aviation::CCallsign &callsign)
         {
             this->initInnerFrame(0.75, 0.75);
@@ -393,7 +393,7 @@ namespace BlackGui
     /*!
      * Using this class provides a QFrame with the overlay functionality already integrated.
      */
-    class BLACKGUI_EXPORT COverlayMessagesFrame : public COverlayMessagesBase<QFrame>
+    class SWIFT_GUI_EXPORT COverlayMessagesFrame : public COverlayMessagesBase<QFrame>
     {
         Q_OBJECT
 
@@ -403,7 +403,7 @@ namespace BlackGui
 
     signals:
         //! Request an text message entry
-        void requestTextMessageEntryTab(Components::TextMessageTab tab);
+        void requestTextMessageEntryTab(components::TextMessageTab tab);
 
         //! Request an text message entry
         void requestTextMessageEntryCallsign(const swift::misc::aviation::CCallsign &callsign);
@@ -415,7 +415,7 @@ namespace BlackGui
     /*!
      * Using this class provides a QFrame with the overlay and dock widget functionality already integrated.
      */
-    class BLACKGUI_EXPORT COverlayMessagesFrameEnableForDockWidgetInfoArea :
+    class SWIFT_GUI_EXPORT COverlayMessagesFrameEnableForDockWidgetInfoArea :
         public COverlayMessagesFrame,
         public CEnableForDockWidgetInfoArea
     {
@@ -433,7 +433,7 @@ namespace BlackGui
     /*!
      * Using this class provides a QTabWidget with the overlay functionality already integrated.
      */
-    class BLACKGUI_EXPORT COverlayMessagesTabWidget : public COverlayMessagesBase<QTabWidget>
+    class SWIFT_GUI_EXPORT COverlayMessagesTabWidget : public COverlayMessagesBase<QTabWidget>
     {
         Q_OBJECT
 
@@ -445,7 +445,7 @@ namespace BlackGui
     /*!
      * Using this class provides a QWizardPage with the overlay functionality already integrated.
      */
-    class BLACKGUI_EXPORT COverlayMessagesWizardPage : public COverlayMessagesBase<QWizardPage>
+    class SWIFT_GUI_EXPORT COverlayMessagesWizardPage : public COverlayMessagesBase<QWizardPage>
     {
         Q_OBJECT
 
@@ -457,7 +457,7 @@ namespace BlackGui
     /*!
      * Using this class provides a QDockWidget with the overlay functionality already integrated.
      */
-    class BLACKGUI_EXPORT COverlayMessagesDockWidget : public COverlayMessagesBase<QDockWidget>
+    class SWIFT_GUI_EXPORT COverlayMessagesDockWidget : public COverlayMessagesBase<QDockWidget>
     {
         Q_OBJECT
 
@@ -469,7 +469,7 @@ namespace BlackGui
     /*!
      * Using this class provides a QTableView with the overlay functionality already integrated.
      */
-    class BLACKGUI_EXPORT COverlayMessagesTableView : public COverlayMessagesBase<QTableView>
+    class SWIFT_GUI_EXPORT COverlayMessagesTableView : public COverlayMessagesBase<QTableView>
     {
         Q_OBJECT
 
@@ -481,7 +481,7 @@ namespace BlackGui
     /*!
      * Using this class provides a QTableView with the overlay functionality already integrated.
      */
-    class BLACKGUI_EXPORT COverlayMessagesTreeView : public COverlayMessagesBase<QTreeView>
+    class SWIFT_GUI_EXPORT COverlayMessagesTreeView : public COverlayMessagesBase<QTreeView>
     {
         Q_OBJECT
 
diff --git a/src/blackgui/pluginconfig.h b/src/gui/pluginconfig.h
similarity index 73%
rename from src/blackgui/pluginconfig.h
rename to src/gui/pluginconfig.h
index b3d21628e..c67c53e6e 100644
--- a/src/blackgui/pluginconfig.h
+++ b/src/gui/pluginconfig.h
@@ -3,16 +3,16 @@
 
 //! \file
 
-#ifndef BLACKGUI_PLUGINCONFIG_H
-#define BLACKGUI_PLUGINCONFIG_H
+#ifndef SWIFT_GUI_PLUGINCONFIG_H
+#define SWIFT_GUI_PLUGINCONFIG_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 
 #include <QtPlugin>
 
 class QWidget;
 
-namespace BlackGui
+namespace swift::gui
 {
     class CPluginConfigWindow;
 
@@ -23,7 +23,7 @@ namespace BlackGui
      *
      * \sa swift::core::ISimulator.
      */
-    class BLACKGUI_EXPORT IPluginConfig
+    class SWIFT_GUI_EXPORT IPluginConfig
     {
     public:
         //! Dtor.
@@ -34,6 +34,6 @@ namespace BlackGui
     };
 }
 
-Q_DECLARE_INTERFACE(BlackGui::IPluginConfig, "org.swift-project.blackgui.pluginconfiginterface")
+Q_DECLARE_INTERFACE(swift::gui::IPluginConfig, "org.swift-project.swiftgui.pluginconfiginterface")
 
 #endif // guard
diff --git a/src/blackgui/pluginconfigwindow.cpp b/src/gui/pluginconfigwindow.cpp
similarity index 87%
rename from src/blackgui/pluginconfigwindow.cpp
rename to src/gui/pluginconfigwindow.cpp
index fbe1b631a..89959b8ab 100644
--- a/src/blackgui/pluginconfigwindow.cpp
+++ b/src/gui/pluginconfigwindow.cpp
@@ -1,14 +1,14 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/pluginconfigwindow.h"
+#include "gui/pluginconfigwindow.h"
 
 #include <QApplication>
 #include <QStyle>
 #include <Qt>
 #include <QtGlobal>
 
-namespace BlackGui
+namespace swift::gui
 {
     CPluginConfigWindow::CPluginConfigWindow(QWidget *parent) : COverlayMessagesFrame(parent, Qt::Window)
     {
diff --git a/src/blackgui/pluginconfigwindow.h b/src/gui/pluginconfigwindow.h
similarity index 61%
rename from src/blackgui/pluginconfigwindow.h
rename to src/gui/pluginconfigwindow.h
index c5ca1f6fe..71f46edec 100644
--- a/src/blackgui/pluginconfigwindow.h
+++ b/src/gui/pluginconfigwindow.h
@@ -3,20 +3,20 @@
 
 //! \file
 
-#ifndef BLACKGUI_PLUGINCONFIGWINDOW_H
-#define BLACKGUI_PLUGINCONFIGWINDOW_H
+#ifndef SWIFT_GUI_PLUGINCONFIGWINDOW_H
+#define SWIFT_GUI_PLUGINCONFIGWINDOW_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/overlaymessagesframe.h"
+#include "gui/swiftguiexport.h"
+#include "gui/overlaymessagesframe.h"
 
 class QShowEvent;
 
-namespace BlackGui
+namespace swift::gui
 {
     /*!
      * Base class for plugin config window.
      */
-    class BLACKGUI_EXPORT CPluginConfigWindow : public COverlayMessagesFrame
+    class SWIFT_GUI_EXPORT CPluginConfigWindow : public COverlayMessagesFrame
     {
         Q_OBJECT
     public:
diff --git a/src/blackgui/plugindetailswindow.cpp b/src/gui/plugindetailswindow.cpp
similarity index 96%
rename from src/blackgui/plugindetailswindow.cpp
rename to src/gui/plugindetailswindow.cpp
index c98bb0fc7..14c5812c5 100644
--- a/src/blackgui/plugindetailswindow.cpp
+++ b/src/gui/plugindetailswindow.cpp
@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/plugindetailswindow.h"
+#include "gui/plugindetailswindow.h"
 #include "ui_plugindetailswindow.h"
 
 #include <QApplication>
@@ -12,7 +12,7 @@
 #include <Qt>
 #include <QtGlobal>
 
-namespace BlackGui
+namespace swift::gui
 {
     CPluginDetailsWindow::CPluginDetailsWindow(QWidget *parent) : QWidget(parent, Qt::Dialog),
                                                                   ui(new Ui::CPluginDetailsWindow)
diff --git a/src/blackgui/plugindetailswindow.h b/src/gui/plugindetailswindow.h
similarity index 84%
rename from src/blackgui/plugindetailswindow.h
rename to src/gui/plugindetailswindow.h
index cefc0e001..7c4d9b80f 100644
--- a/src/blackgui/plugindetailswindow.h
+++ b/src/gui/plugindetailswindow.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_PLUGINDETAILSWINDOW_H
-#define BLACKGUI_PLUGINDETAILSWINDOW_H
+#ifndef SWIFT_GUI_PLUGINDETAILSWINDOW_H
+#define SWIFT_GUI_PLUGINDETAILSWINDOW_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 
 #include <QObject>
 #include <QScopedPointer>
@@ -19,12 +19,12 @@ namespace Ui
 {
     class CPluginDetailsWindow;
 }
-namespace BlackGui
+namespace swift::gui
 {
     /*!
      * A window that shows plugin details.
      */
-    class BLACKGUI_EXPORT CPluginDetailsWindow : public QWidget
+    class SWIFT_GUI_EXPORT CPluginDetailsWindow : public QWidget
     {
         Q_OBJECT
 
diff --git a/src/blackgui/plugindetailswindow.ui b/src/gui/plugindetailswindow.ui
similarity index 100%
rename from src/blackgui/plugindetailswindow.ui
rename to src/gui/plugindetailswindow.ui
diff --git a/src/blackgui/pluginselector.cpp b/src/gui/pluginselector.cpp
similarity index 98%
rename from src/blackgui/pluginselector.cpp
rename to src/gui/pluginselector.cpp
index ec6aff3c2..696e5f63e 100644
--- a/src/blackgui/pluginselector.cpp
+++ b/src/gui/pluginselector.cpp
@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/pluginselector.h"
+#include "gui/pluginselector.h"
 #include "misc/icons.h"
 #include "misc/verify.h"
 
@@ -14,7 +14,7 @@
 #include <Qt>
 #include <QtGlobal>
 
-namespace BlackGui
+namespace swift::gui
 {
     CPluginSelector::CPluginSelector(QWidget *parent) : QWidget(parent)
     {
diff --git a/src/blackgui/pluginselector.h b/src/gui/pluginselector.h
similarity index 90%
rename from src/blackgui/pluginselector.h
rename to src/gui/pluginselector.h
index d8c0a661a..87cfde62f 100644
--- a/src/blackgui/pluginselector.h
+++ b/src/gui/pluginselector.h
@@ -3,23 +3,23 @@
 
 //! \file
 
-#ifndef BLACKGUI_PLUGINSELECTOR_H
-#define BLACKGUI_PLUGINSELECTOR_H
+#ifndef SWIFT_GUI_PLUGINSELECTOR_H
+#define SWIFT_GUI_PLUGINSELECTOR_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 
 #include <QObject>
 #include <QString>
 #include <QWidget>
 #include <QSignalMapper>
 
-namespace BlackGui
+namespace swift::gui
 {
     /*!
      * Shows all available plugins in a nice list and lets
      * user enable, disable and configure each of them.
      */
-    class BLACKGUI_EXPORT CPluginSelector : public QWidget
+    class SWIFT_GUI_EXPORT CPluginSelector : public QWidget
     {
         Q_OBJECT
 
diff --git a/src/blackgui/qml/AFVMap.qml b/src/gui/qml/AFVMap.qml
similarity index 100%
rename from src/blackgui/qml/AFVMap.qml
rename to src/gui/qml/AFVMap.qml
diff --git a/src/blackgui/qml/AtcRing.qml b/src/gui/qml/AtcRing.qml
similarity index 100%
rename from src/blackgui/qml/AtcRing.qml
rename to src/gui/qml/AtcRing.qml
diff --git a/src/blackgui/qml/Transceiver.qml b/src/gui/qml/Transceiver.qml
similarity index 100%
rename from src/blackgui/qml/Transceiver.qml
rename to src/gui/qml/Transceiver.qml
diff --git a/src/blackgui/qml/qml.qrc b/src/gui/qml/qml.qrc
similarity index 86%
rename from src/blackgui/qml/qml.qrc
rename to src/gui/qml/qml.qrc
index b5c4fa1b7..765f800a4 100644
--- a/src/blackgui/qml/qml.qrc
+++ b/src/gui/qml/qml.qrc
@@ -4,7 +4,7 @@
 -->
 
 <RCC>
-    <qresource prefix="/blackgui/qml">
+    <qresource prefix="/gui/qml">
         <file>AFVMap.qml</file>
         <file>AtcRing.qml</file>
         <file>Transceiver.qml</file>
diff --git a/src/gui/registermetadata.cpp b/src/gui/registermetadata.cpp
new file mode 100644
index 000000000..fba8129e6
--- /dev/null
+++ b/src/gui/registermetadata.cpp
@@ -0,0 +1,23 @@
+// SPDX-FileCopyrightText: Copyright (C) 2016 swift Project Community / Contributors
+// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
+
+#include "gui/registermetadata.h"
+#include "gui/settings/dockwidgetsettings.h"
+#include "gui/settings/navigatorsettings.h"
+#include "gui/settings/viewupdatesettings.h"
+#include "gui/settings/guisettings.h"
+#include "gui/settings/textmessagesettings.h"
+#include "gui/components/registermetadatacomponents.h"
+
+namespace swift::gui
+{
+    void registerMetadata()
+    {
+        swift::gui::settings::CDockWidgetSettings::registerMetadata();
+        swift::gui::settings::CNavigatorSettings::registerMetadata();
+        swift::gui::settings::CViewUpdateSettings::registerMetadata();
+        swift::gui::settings::CGeneralGuiSettings::registerMetadata();
+        swift::gui::settings::CTextMessageSettings::registerMetadata();
+        swift::gui::components::registerMetadata();
+    }
+}
diff --git a/src/blackgui/registermetadata.h b/src/gui/registermetadata.h
similarity index 56%
rename from src/blackgui/registermetadata.h
rename to src/gui/registermetadata.h
index 744fc617a..33695677c 100644
--- a/src/blackgui/registermetadata.h
+++ b/src/gui/registermetadata.h
@@ -1,15 +1,15 @@
 // SPDX-FileCopyrightText: Copyright (C) 2016 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#ifndef BLACKGUI_REGISTERMETADATA_H
-#define BLACKGUI_REGISTERMETADATA_H
+#ifndef SWIFT_GUI_REGISTERMETADATA_H
+#define SWIFT_GUI_REGISTERMETADATA_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 
-namespace BlackGui
+namespace swift::gui
 {
     //! Register metadata for GUI
-    BLACKGUI_EXPORT void registerMetadata();
+    SWIFT_GUI_EXPORT void registerMetadata();
 }
 
 #endif // guard
diff --git a/src/blackgui/settings/dockwidgetsettings.cpp b/src/gui/settings/dockwidgetsettings.cpp
similarity index 96%
rename from src/blackgui/settings/dockwidgetsettings.cpp
rename to src/gui/settings/dockwidgetsettings.cpp
index cb1be13b1..0e63dc4ff 100644
--- a/src/blackgui/settings/dockwidgetsettings.cpp
+++ b/src/gui/settings/dockwidgetsettings.cpp
@@ -2,16 +2,16 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "dockwidgetsettings.h"
-#include "blackgui/guiutility.h"
+#include "gui/guiutility.h"
 #include "misc/stringutils.h"
 #include <QStringList>
 
 using namespace swift::misc;
-using namespace BlackGui;
+using namespace swift::gui;
 
-BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackGui::Settings, CDockWidgetSettings)
+BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::gui::settings, CDockWidgetSettings)
 
-namespace BlackGui::Settings
+namespace swift::gui::settings
 {
     CDockWidgetSettings::CDockWidgetSettings()
     {}
diff --git a/src/blackgui/settings/dockwidgetsettings.h b/src/gui/settings/dockwidgetsettings.h
similarity index 90%
rename from src/blackgui/settings/dockwidgetsettings.h
rename to src/gui/settings/dockwidgetsettings.h
index 687a5fdf0..c6ddb15fe 100644
--- a/src/blackgui/settings/dockwidgetsettings.h
+++ b/src/gui/settings/dockwidgetsettings.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_SETTINGS_DOCKWIDGET_H
-#define BLACKGUI_SETTINGS_DOCKWIDGET_H
+#ifndef SWIFT_GUI_SETTINGS_DOCKWIDGET_H
+#define SWIFT_GUI_SETTINGS_DOCKWIDGET_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include "misc/settingscache.h"
 #include "misc/propertyindex.h"
 #include "misc/dictionary.h"
@@ -16,12 +16,12 @@
 #include <QString>
 #include <QMetaType>
 
-BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackGui::Settings, CDockWidgetSettings)
+BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::gui::settings, CDockWidgetSettings)
 
-namespace BlackGui::Settings
+namespace swift::gui::settings
 {
     //! Settings for dockwidget
-    class BLACKGUI_EXPORT CDockWidgetSettings :
+    class SWIFT_GUI_EXPORT CDockWidgetSettings :
         public swift::misc::CValueObject<CDockWidgetSettings>
     {
     public:
@@ -128,7 +128,7 @@ namespace BlackGui::Settings
     };
 } // ns
 
-Q_DECLARE_METATYPE(BlackGui::Settings::CDockWidgetSettings)
-Q_DECLARE_METATYPE(swift::misc::CCollection<BlackGui::Settings::CDockWidgetSettings>)
+Q_DECLARE_METATYPE(swift::gui::settings::CDockWidgetSettings)
+Q_DECLARE_METATYPE(swift::misc::CCollection<swift::gui::settings::CDockWidgetSettings>)
 
 #endif // guard
diff --git a/src/blackgui/settings/guisettings.cpp b/src/gui/settings/guisettings.cpp
similarity index 96%
rename from src/blackgui/settings/guisettings.cpp
rename to src/gui/settings/guisettings.cpp
index fd3a99d55..97c94f8a1 100644
--- a/src/blackgui/settings/guisettings.cpp
+++ b/src/gui/settings/guisettings.cpp
@@ -6,9 +6,9 @@
 
 using namespace swift::misc;
 
-BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackGui::Settings, CGeneralGuiSettings)
+BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::gui::settings, CGeneralGuiSettings)
 
-namespace BlackGui::Settings
+namespace swift::gui::settings
 {
     CGeneralGuiSettings::CGeneralGuiSettings()
     {}
diff --git a/src/blackgui/settings/guisettings.h b/src/gui/settings/guisettings.h
similarity index 89%
rename from src/blackgui/settings/guisettings.h
rename to src/gui/settings/guisettings.h
index 786333c8b..da1f05141 100644
--- a/src/blackgui/settings/guisettings.h
+++ b/src/gui/settings/guisettings.h
@@ -3,22 +3,22 @@
 
 //! \file
 
-#ifndef BLACKGUI_SETTINGS_GUI_H
-#define BLACKGUI_SETTINGS_GUI_H
+#ifndef SWIFT_GUI_SETTINGS_GUI_H
+#define SWIFT_GUI_SETTINGS_GUI_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include "misc/settingscache.h"
 #include "misc/simulation/aircraftmodel.h"
 
 #include <QString>
 #include <QAbstractItemView>
 
-BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackGui::Settings, CGeneralGuiSettings)
+BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::gui::settings, CGeneralGuiSettings)
 
-namespace BlackGui::Settings
+namespace swift::gui::settings
 {
     //! General GUI settings
-    class BLACKGUI_EXPORT CGeneralGuiSettings :
+    class SWIFT_GUI_EXPORT CGeneralGuiSettings :
         public swift::misc::CValueObject<CGeneralGuiSettings>
     {
     public:
@@ -112,7 +112,7 @@ namespace BlackGui::Settings
     };
 } // ns
 
-Q_DECLARE_METATYPE(BlackGui::Settings::CGeneralGuiSettings)
-Q_DECLARE_METATYPE(swift::misc::CCollection<BlackGui::Settings::CGeneralGuiSettings>)
+Q_DECLARE_METATYPE(swift::gui::settings::CGeneralGuiSettings)
+Q_DECLARE_METATYPE(swift::misc::CCollection<swift::gui::settings::CGeneralGuiSettings>)
 
 #endif // guard
diff --git a/src/blackgui/settings/navigatorsettings.cpp b/src/gui/settings/navigatorsettings.cpp
similarity index 94%
rename from src/blackgui/settings/navigatorsettings.cpp
rename to src/gui/settings/navigatorsettings.cpp
index 06c0327d0..decb71b54 100644
--- a/src/blackgui/settings/navigatorsettings.cpp
+++ b/src/gui/settings/navigatorsettings.cpp
@@ -2,16 +2,16 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "navigatorsettings.h"
-#include "blackgui/guiutility.h"
+#include "gui/guiutility.h"
 #include "misc/stringutils.h"
 #include <QStringList>
 
 using namespace swift::misc;
-using namespace BlackGui;
+using namespace swift::gui;
 
-BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackGui::Settings, CNavigatorSettings)
+BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::gui::settings, CNavigatorSettings)
 
-namespace BlackGui::Settings
+namespace swift::gui::settings
 {
     CNavigatorSettings::CNavigatorSettings()
     {}
diff --git a/src/blackgui/settings/navigatorsettings.h b/src/gui/settings/navigatorsettings.h
similarity index 87%
rename from src/blackgui/settings/navigatorsettings.h
rename to src/gui/settings/navigatorsettings.h
index 057ebeb63..eeda6c66d 100644
--- a/src/blackgui/settings/navigatorsettings.h
+++ b/src/gui/settings/navigatorsettings.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_SETTINGS_NAVIGATOR_H
-#define BLACKGUI_SETTINGS_NAVIGATOR_H
+#ifndef SWIFT_GUI_SETTINGS_NAVIGATOR_H
+#define SWIFT_GUI_SETTINGS_NAVIGATOR_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include "misc/settingscache.h"
 #include "misc/propertyindex.h"
 #include "misc/variant.h"
@@ -15,12 +15,12 @@
 #include <QString>
 #include <QMetaType>
 
-BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackGui::Settings, CNavigatorSettings)
+BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::gui::settings, CNavigatorSettings)
 
-namespace BlackGui::Settings
+namespace swift::gui::settings
 {
     //! Settings for navigator bar
-    class BLACKGUI_EXPORT CNavigatorSettings :
+    class SWIFT_GUI_EXPORT CNavigatorSettings :
         public swift::misc::CValueObject<CNavigatorSettings>
     {
     public:
@@ -107,7 +107,7 @@ namespace BlackGui::Settings
     };
 } // ns
 
-Q_DECLARE_METATYPE(BlackGui::Settings::CNavigatorSettings)
-Q_DECLARE_METATYPE(swift::misc::CCollection<BlackGui::Settings::CNavigatorSettings>)
+Q_DECLARE_METATYPE(swift::gui::settings::CNavigatorSettings)
+Q_DECLARE_METATYPE(swift::misc::CCollection<swift::gui::settings::CNavigatorSettings>)
 
 #endif // guard
diff --git a/src/blackgui/settings/textmessagesettings.cpp b/src/gui/settings/textmessagesettings.cpp
similarity index 97%
rename from src/blackgui/settings/textmessagesettings.cpp
rename to src/gui/settings/textmessagesettings.cpp
index 5c72ef5c2..5d6605373 100644
--- a/src/blackgui/settings/textmessagesettings.cpp
+++ b/src/gui/settings/textmessagesettings.cpp
@@ -9,9 +9,9 @@ using namespace swift::misc;
 using namespace swift::misc::network;
 using namespace swift::misc::simulation;
 
-BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackGui::Settings, CTextMessageSettings)
+BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::gui::settings, CTextMessageSettings)
 
-namespace BlackGui::Settings
+namespace swift::gui::settings
 {
     CTextMessageSettings::CTextMessageSettings()
     {}
diff --git a/src/blackgui/settings/textmessagesettings.h b/src/gui/settings/textmessagesettings.h
similarity index 92%
rename from src/blackgui/settings/textmessagesettings.h
rename to src/gui/settings/textmessagesettings.h
index a63ccc89c..e236650c5 100644
--- a/src/blackgui/settings/textmessagesettings.h
+++ b/src/gui/settings/textmessagesettings.h
@@ -3,14 +3,14 @@
 
 //! \file
 
-#ifndef BLACKGUI_SETTINGS_TEXTMESSAGESETTINGS_H
-#define BLACKGUI_SETTINGS_TEXTMESSAGESETTINGS_H
+#ifndef SWIFT_GUI_SETTINGS_TEXTMESSAGESETTINGS_H
+#define SWIFT_GUI_SETTINGS_TEXTMESSAGESETTINGS_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include "misc/settingscache.h"
 #include <QString>
 
-BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackGui::Settings, CTextMessageSettings)
+BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::gui::settings, CTextMessageSettings)
 
 namespace swift::misc
 {
@@ -23,10 +23,10 @@ namespace swift::misc
         class CTextMessage;
     }
 }
-namespace BlackGui::Settings
+namespace swift::gui::settings
 {
     //! Text message settings
-    class BLACKGUI_EXPORT CTextMessageSettings :
+    class SWIFT_GUI_EXPORT CTextMessageSettings :
         public swift::misc::CValueObject<CTextMessageSettings>
     {
     public:
@@ -165,7 +165,7 @@ namespace BlackGui::Settings
     };
 } // ns
 
-Q_DECLARE_METATYPE(BlackGui::Settings::CTextMessageSettings)
-Q_DECLARE_METATYPE(swift::misc::CCollection<BlackGui::Settings::CTextMessageSettings>)
+Q_DECLARE_METATYPE(swift::gui::settings::CTextMessageSettings)
+Q_DECLARE_METATYPE(swift::misc::CCollection<swift::gui::settings::CTextMessageSettings>)
 
 #endif // guard
diff --git a/src/blackgui/settings/updatenotification.h b/src/gui/settings/updatenotification.h
similarity index 83%
rename from src/blackgui/settings/updatenotification.h
rename to src/gui/settings/updatenotification.h
index 23c113249..fccb25692 100644
--- a/src/blackgui/settings/updatenotification.h
+++ b/src/gui/settings/updatenotification.h
@@ -3,13 +3,13 @@
 
 //! \file
 
-#ifndef BLACKGUI_SETTINGS_UPDATENOTIFICATIONSETTINGS_H
-#define BLACKGUI_SETTINGS_UPDATENOTIFICATIONSETTINGS_H
+#ifndef SWIFT_GUI_SETTINGS_UPDATENOTIFICATIONSETTINGS_H
+#define SWIFT_GUI_SETTINGS_UPDATENOTIFICATIONSETTINGS_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include "misc/settingscache.h"
 
-namespace BlackGui::Settings
+namespace swift::gui::settings
 {
     //! Trait for directory settings
     struct TUpdateNotificationSettings : public swift::misc::TSettingTrait<bool>
diff --git a/src/blackgui/settings/viewupdatesettings.cpp b/src/gui/settings/viewupdatesettings.cpp
similarity index 94%
rename from src/blackgui/settings/viewupdatesettings.cpp
rename to src/gui/settings/viewupdatesettings.cpp
index 3f254e5d1..bad6097e9 100644
--- a/src/blackgui/settings/viewupdatesettings.cpp
+++ b/src/gui/settings/viewupdatesettings.cpp
@@ -2,17 +2,17 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "viewupdatesettings.h"
-#include "blackgui/guiutility.h"
+#include "gui/guiutility.h"
 #include "misc/stringutils.h"
 #include <QStringList>
 
 using namespace swift::misc;
 using namespace swift::misc::physical_quantities;
-using namespace BlackGui;
+using namespace swift::gui;
 
-BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackGui::Settings, CViewUpdateSettings)
+BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::gui::settings, CViewUpdateSettings)
 
-namespace BlackGui::Settings
+namespace swift::gui::settings
 {
     CViewUpdateSettings::CViewUpdateSettings()
     {}
diff --git a/src/blackgui/settings/viewupdatesettings.h b/src/gui/settings/viewupdatesettings.h
similarity index 89%
rename from src/blackgui/settings/viewupdatesettings.h
rename to src/gui/settings/viewupdatesettings.h
index 161f250fc..37420b3e7 100644
--- a/src/blackgui/settings/viewupdatesettings.h
+++ b/src/gui/settings/viewupdatesettings.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_SETTINGS_VIEWUPDATESETTINGS_H
-#define BLACKGUI_SETTINGS_VIEWUPDATESETTINGS_H
+#ifndef SWIFT_GUI_SETTINGS_VIEWUPDATESETTINGS_H
+#define SWIFT_GUI_SETTINGS_VIEWUPDATESETTINGS_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include "misc/settingscache.h"
 #include "misc/pq/time.h"
 #include "misc/propertyindex.h"
@@ -16,12 +16,12 @@
 #include <QString>
 #include <QMetaType>
 
-BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackGui::Settings, CViewUpdateSettings)
+BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::gui::settings, CViewUpdateSettings)
 
-namespace BlackGui::Settings
+namespace swift::gui::settings
 {
     //! Settings about view update rates
-    class BLACKGUI_EXPORT CViewUpdateSettings :
+    class SWIFT_GUI_EXPORT CViewUpdateSettings :
         public swift::misc::CValueObject<CViewUpdateSettings>
     {
     public:
@@ -109,7 +109,7 @@ namespace BlackGui::Settings
     };
 } // ns
 
-Q_DECLARE_METATYPE(BlackGui::Settings::CViewUpdateSettings)
-Q_DECLARE_METATYPE(swift::misc::CCollection<BlackGui::Settings::CViewUpdateSettings>)
+Q_DECLARE_METATYPE(swift::gui::settings::CViewUpdateSettings)
+Q_DECLARE_METATYPE(swift::misc::CCollection<swift::gui::settings::CViewUpdateSettings>)
 
 #endif // guard
diff --git a/src/blackgui/share/qss/dockwidgettab.qss b/src/gui/share/qss/dockwidgettab.qss
similarity index 100%
rename from src/blackgui/share/qss/dockwidgettab.qss
rename to src/gui/share/qss/dockwidgettab.qss
diff --git a/src/blackgui/share/qss/filterdialog.qss b/src/gui/share/qss/filterdialog.qss
similarity index 100%
rename from src/blackgui/share/qss/filterdialog.qss
rename to src/gui/share/qss/filterdialog.qss
diff --git a/src/blackgui/share/qss/fonts.mac.qss b/src/gui/share/qss/fonts.mac.qss
similarity index 100%
rename from src/blackgui/share/qss/fonts.mac.qss
rename to src/gui/share/qss/fonts.mac.qss
diff --git a/src/blackgui/share/qss/fonts.qss b/src/gui/share/qss/fonts.qss
similarity index 100%
rename from src/blackgui/share/qss/fonts.qss
rename to src/gui/share/qss/fonts.qss
diff --git a/src/blackgui/share/qss/infobar.qss b/src/gui/share/qss/infobar.qss
similarity index 86%
rename from src/blackgui/share/qss/infobar.qss
rename to src/gui/share/qss/infobar.qss
index 1129bd768..a07a3a0af 100644
--- a/src/blackgui/share/qss/infobar.qss
+++ b/src/gui/share/qss/infobar.qss
@@ -9,17 +9,17 @@
 /** "xpdrmode", m_transponder.getTransponderMode **/
 /** "xpdrmodeshort", m_transponder.getModeAsShortString **/
 
-BlackGui--CDockWidgetInfoBar {
+swift--gui--CDockWidgetInfoBar {
   background: black; /* background is background color here */
   background-image: url(:/textures/icons/textures/texture-inner.jpg);
   min-height: 1.25em;
 }
 
-BlackGui--CDockWidgetInfoBar[floating="true"] {
+swift--gui--CDockWidgetInfoBar[floating="true"] {
   min-width: 50em;
 }
 
-BlackGui--Components--CTransponderModeComponent {
+swift--gui--Components--CTransponderModeComponent {
   padding: 0px;
   margin:  0px;
 }
@@ -39,7 +39,7 @@ QToolButton[xpdrmodeshort="S"] {
   color: yellow;
 }
 
-BlackGui--Components--CInfoBarStatusComponent {
+swift--gui--Components--CInfoBarStatusComponent {
   padding-left:  1.0em;
   padding-right: 1.0em;
 }
diff --git a/src/blackgui/share/qss/navigator.qss b/src/gui/share/qss/navigator.qss
similarity index 100%
rename from src/blackgui/share/qss/navigator.qss
rename to src/gui/share/qss/navigator.qss
diff --git a/src/blackgui/share/qss/stdwidget.qss b/src/gui/share/qss/stdwidget.qss
similarity index 89%
rename from src/blackgui/share/qss/stdwidget.qss
rename to src/gui/share/qss/stdwidget.qss
index 41d7fec4e..7c7cadf99 100644
--- a/src/blackgui/share/qss/stdwidget.qss
+++ b/src/gui/share/qss/stdwidget.qss
@@ -84,7 +84,7 @@ QDialog::separator:hover {
 
 /* setup load dialog details frame */
 /*
-BlackGui--Components--CSetupLoadingDialog #fr_Details {
+swift--gui--Components--CSetupLoadingDialog #fr_Details {
   background-image: url(:/textures/icons/textures/texture-outer.jpg);
   background-color: darkslategray;
 }
@@ -104,44 +104,44 @@ QFileDialog QToolButton {
   2) seems to have only effect as normal (floating) window
   3) Borders between this widget and the inner child are the margins defined in dockwidget
 */
-BlackGui--CDockWidgetInfoArea {
+swift--gui--CDockWidgetInfoArea {
   background-color: green; /* Use green or red here to adjust the borders */
 }
 
 /* outer widget in dock widget */
-BlackGui--CDockWidgetInfoArea > QWidget[dockwidget="outerwidget"] {
+swift--gui--CDockWidgetInfoArea > QWidget[dockwidget="outerwidget"] {
   background: black; /* background is background color here */
   background-image: url(:/textures/icons/textures/texture-inner.jpg);
 }
 
 /* this is the first widget in the dock area */
 /* all dock widgets shall have this QWidget as container */
-BlackGui--CDockWidgetInfoArea[framelessDockWidget="true"] > QWidget > QFrame[dockwidget="innerwidget"] {
+swift--gui--CDockWidgetInfoArea[framelessDockWidget="true"] > QWidget > QFrame[dockwidget="innerwidget"] {
   margin: 0px;
   padding: 3px;
   border: 2px solid green;
   border-radius: 10px;
 }
 
-BlackGui--CDockWidgetInfoArea[framelessDockWidget="false"] > QWidget > QFrame[dockwidget="innerwidget"] {
+swift--gui--CDockWidgetInfoArea[framelessDockWidget="false"] > QWidget > QFrame[dockwidget="innerwidget"] {
   /* void */
 }
 
 /* required when info area is not floating */
-BlackGui--CInfoArea {
+swift--gui--CInfoArea {
   background: black; /* background is background color here */
   background-image: url(:/textures/icons/textures/texture-inner.jpg);
 }
 
 /* Overlay messages */
-BlackGui--COverlayMessages {
+swift--gui--COverlayMessages {
   background: transparent; /* background is background color here */
   background-image: url(:/textures/icons/textures/texture-inner.jpg);
   border: 5px solid rgba(100, 100, 100, 90%);
   border-radius: 10px;
 }
 
-BlackGui--CDropSite {
+swift--gui--CDropSite {
   color: grey;
   border: 2px dashed grey;
   border-radius: 5px;
@@ -152,51 +152,51 @@ BlackGui--CDropSite {
 }
 
 /* Validator bar */
-BlackGui--Editors--CValidationIndicator {
+swift--gui--Editors--CValidationIndicator {
   background: black; /* background is background color here */
   background-image: url(:/textures/icons/textures/texture-inner.jpg);
 }
 
-BlackGui--CPluginDetailsWindow,
-BlackGui--CPluginConfigWindow {
+swift--gui--CPluginDetailsWindow,
+swift--gui--CPluginConfigWindow {
   background: black;
 }
 
-BlackGui--Components--CDBusServerAddressSelector::disabled {
+swift--gui--Components--CDBusServerAddressSelector::disabled {
   background: rgba(4, 105, 105, 105);
 }
 
-BlackGui--Components--CSimulatorSelector::disabled {
+swift--gui--Components--CSimulatorSelector::disabled {
   background: rgba(4, 105, 105, 105);
 }
 
-BlackGui--Components--CAircraftModelSetValidationDialog,
-BlackGui--Components--CCoreSettingsDialog,
-BlackGui--Views--CAircraftModelValidationDialog,
-BlackGui--Views--CAircraftModelStatisticsDialog,
-BlackGui--Components--CSettingsFontDialog,
-BlackGui--Components--CAirportDialog,
-BlackGui--Components--CTextEditDialog,
-BlackGui--Components--CSetupLoadingDialog,
-BlackGui--Components--CDownloadComponent,
-BlackGui--Components--CDownloadDialog,
-BlackGui--Components--CUpdateInfoDialog,
-BlackGui--Components--CRawFsdMessagesComponent,
-BlackGui--Components--CRawFsdMessagesDialog,
-BlackGui--Components--CDbOwnModelsDialog,
-BlackGui--Components--CDbOwnModelSetDialog,
-BlackGui--Components--CFirstModelSetComponent,
-BlackGui--Components--CDbAircraftIcaoComponent,
-BlackGui--Components--CDbLiveryComponent,
-BlackGui--Components--CDbDistributorComponent,
-BlackGui--Components--CLegalInfoComponent,
-BlackGui--Components--CStringListDialog
+swift--gui--Components--CAircraftModelSetValidationDialog,
+swift--gui--Components--CCoreSettingsDialog,
+swift--gui--Views--CAircraftModelValidationDialog,
+swift--gui--Views--CAircraftModelStatisticsDialog,
+swift--gui--Components--CSettingsFontDialog,
+swift--gui--Components--CAirportDialog,
+swift--gui--Components--CTextEditDialog,
+swift--gui--Components--CSetupLoadingDialog,
+swift--gui--Components--CDownloadComponent,
+swift--gui--Components--CDownloadDialog,
+swift--gui--Components--CUpdateInfoDialog,
+swift--gui--Components--CRawFsdMessagesComponent,
+swift--gui--Components--CRawFsdMessagesDialog,
+swift--gui--Components--CDbOwnModelsDialog,
+swift--gui--Components--CDbOwnModelSetDialog,
+swift--gui--Components--CFirstModelSetComponent,
+swift--gui--Components--CDbAircraftIcaoComponent,
+swift--gui--Components--CDbLiveryComponent,
+swift--gui--Components--CDbDistributorComponent,
+swift--gui--Components--CLegalInfoComponent,
+swift--gui--Components--CStringListDialog
 {
   background: black; /* background is background color here */
   background-image: url(:/textures/icons/textures/texture-inner.jpg);
 }
 
-BlackGui--Components--CCockpitComComponent {
+swift--gui--Components--CCockpitComComponent {
   min-height: 7em;
 }
 
@@ -473,7 +473,7 @@ QMenuBar::item:pressed {
   background: black;
 }
 
-BlackGui--CDockWidgetInfoArea > QMenu > QMenuWidget {
+swift--gui--CDockWidgetInfoArea > QMenu > QMenuWidget {
   border: 0px; /* reserve space for selection border */
 }
 
@@ -495,7 +495,7 @@ QMenu > QFrame {
   color: black;
 }
 
-BlackGui--Components--CMarginsInput QLineEdit {
+swift--gui--Components--CMarginsInput QLineEdit {
   color: black;
 }
 
@@ -734,7 +734,7 @@ QToolTip {
   border: 1px solid white;
 }
 
-BlackGui--CLevelMeter {
+swift--gui--CLevelMeter {
   qproperty-lowColor: lightgray;
   border: 1px solid grey;
   border-radius: 5px;
diff --git a/src/blackgui/share/qss/stylesheetintro.qss b/src/gui/share/qss/stylesheetintro.qss
similarity index 100%
rename from src/blackgui/share/qss/stylesheetintro.qss
rename to src/gui/share/qss/stylesheetintro.qss
diff --git a/src/blackgui/share/qss/swiftcore.qss b/src/gui/share/qss/swiftcore.qss
similarity index 100%
rename from src/blackgui/share/qss/swiftcore.qss
rename to src/gui/share/qss/swiftcore.qss
diff --git a/src/blackgui/share/qss/swiftdata.qss b/src/gui/share/qss/swiftdata.qss
similarity index 100%
rename from src/blackgui/share/qss/swiftdata.qss
rename to src/gui/share/qss/swiftdata.qss
diff --git a/src/blackgui/share/qss/swiftlauncher.qss b/src/gui/share/qss/swiftlauncher.qss
similarity index 100%
rename from src/blackgui/share/qss/swiftlauncher.qss
rename to src/gui/share/qss/swiftlauncher.qss
diff --git a/src/blackgui/share/qss/swiftstdgui.qss b/src/gui/share/qss/swiftstdgui.qss
similarity index 100%
rename from src/blackgui/share/qss/swiftstdgui.qss
rename to src/gui/share/qss/swiftstdgui.qss
diff --git a/src/blackgui/share/qss/textmessage.css b/src/gui/share/qss/textmessage.css
similarity index 100%
rename from src/blackgui/share/qss/textmessage.css
rename to src/gui/share/qss/textmessage.css
diff --git a/src/blackgui/sharedstringlistcompleter.cpp b/src/gui/sharedstringlistcompleter.cpp
similarity index 99%
rename from src/blackgui/sharedstringlistcompleter.cpp
rename to src/gui/sharedstringlistcompleter.cpp
index 7b9e12ee8..68162add5 100644
--- a/src/blackgui/sharedstringlistcompleter.cpp
+++ b/src/gui/sharedstringlistcompleter.cpp
@@ -4,7 +4,7 @@
 #include "sharedstringlistcompleter.h"
 #include <QDateTime>
 
-namespace BlackGui
+namespace swift::gui
 {
     bool CSharedStringListCompleter::updateData(const QStringList &data, int cacheTimeMs)
     {
diff --git a/src/blackgui/sharedstringlistcompleter.h b/src/gui/sharedstringlistcompleter.h
similarity index 86%
rename from src/blackgui/sharedstringlistcompleter.h
rename to src/gui/sharedstringlistcompleter.h
index bdc6a0c18..22f05cb4a 100644
--- a/src/blackgui/sharedstringlistcompleter.h
+++ b/src/gui/sharedstringlistcompleter.h
@@ -3,22 +3,22 @@
 
 //! \file
 
-#ifndef BLACKGUI_SHAREDSTRINGLISTCOMPLETER_H
-#define BLACKGUI_SHAREDSTRINGLISTCOMPLETER_H
+#ifndef SWIFT_GUI_SHAREDSTRINGLISTCOMPLETER_H
+#define SWIFT_GUI_SHAREDSTRINGLISTCOMPLETER_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 
 #include <QCompleter>
 #include <QStringListModel>
 #include <QScopedPointer>
 
-namespace BlackGui
+namespace swift::gui
 {
     /*!
      * Completer shared among multiple UI elements.
      * Normally used as static member
      */
-    class BLACKGUI_EXPORT CSharedStringListCompleter
+    class SWIFT_GUI_EXPORT CSharedStringListCompleter
     {
     public:
         //! Constructor
@@ -54,7 +54,7 @@ namespace BlackGui
     /*!
      * Utility functions
      */
-    class BLACKGUI_EXPORT CompleterUtils
+    class SWIFT_GUI_EXPORT CompleterUtils
     {
     public:
         //! No Ctor
diff --git a/src/blackgui/shortcut.cpp b/src/gui/shortcut.cpp
similarity index 95%
rename from src/blackgui/shortcut.cpp
rename to src/gui/shortcut.cpp
index 484daff7f..e07b9d9e5 100644
--- a/src/blackgui/shortcut.cpp
+++ b/src/gui/shortcut.cpp
@@ -2,12 +2,12 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 // Class based on qLed: Copyright (C) 2010 by P. Sereno, http://www.sereno-online.com
 
-#include "blackgui/shortcut.h"
+#include "gui/shortcut.h"
 
 #include <QKeySequence>
 #include <Qt>
 
-namespace BlackGui
+namespace swift::gui
 {
     const QKeySequence &CShortcut::keyStash()
     {
@@ -33,7 +33,7 @@ namespace BlackGui
         return k;
     }
 
-    const QKeySequence &BlackGui::CShortcut::keyDisplayFilter()
+    const QKeySequence &swift::gui::CShortcut::keyDisplayFilter()
     {
         static const QKeySequence k(static_cast<Qt::Key>(Qt::CTRL) + Qt::Key_F);
         return k;
diff --git a/src/blackgui/shortcut.h b/src/gui/shortcut.h
similarity index 92%
rename from src/blackgui/shortcut.h
rename to src/gui/shortcut.h
index b8d7aacc9..16c70f38a 100644
--- a/src/blackgui/shortcut.h
+++ b/src/gui/shortcut.h
@@ -4,19 +4,19 @@
 
 //! \file
 
-#ifndef BLACKGUI_SHORTCUT_H
-#define BLACKGUI_SHORTCUT_H
+#ifndef SWIFT_GUI_SHORTCUT_H
+#define SWIFT_GUI_SHORTCUT_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 
 class QKeySequence;
 
-namespace BlackGui
+namespace swift::gui
 {
     /*!
      * Shortcut definitions to avoid duplicated shortcut defintions
      */
-    class BLACKGUI_EXPORT CShortcut
+    class SWIFT_GUI_EXPORT CShortcut
     {
     public:
         //! No constructor
diff --git a/src/blackgui/showhidebar.cpp b/src/gui/showhidebar.cpp
similarity index 92%
rename from src/blackgui/showhidebar.cpp
rename to src/gui/showhidebar.cpp
index 1f66ad29f..5094abac9 100644
--- a/src/blackgui/showhidebar.cpp
+++ b/src/gui/showhidebar.cpp
@@ -1,12 +1,12 @@
 // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/showhidebar.h"
+#include "gui/showhidebar.h"
 #include "ui_showhidebar.h"
 
 #include <QPushButton>
 
-namespace BlackGui
+namespace swift::gui
 {
 
     CShowHideBar::CShowHideBar(QWidget *parent) : QFrame(parent),
diff --git a/src/blackgui/showhidebar.h b/src/gui/showhidebar.h
similarity index 81%
rename from src/blackgui/showhidebar.h
rename to src/gui/showhidebar.h
index 335f029ca..c6ed41d7a 100644
--- a/src/blackgui/showhidebar.h
+++ b/src/gui/showhidebar.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_SHOWHIDEBAR_H
-#define BLACKGUI_SHOWHIDEBAR_H
+#ifndef SWIFT_GUI_SHOWHIDEBAR_H
+#define SWIFT_GUI_SHOWHIDEBAR_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include <QFrame>
 #include <QObject>
 #include <QScopedPointer>
@@ -15,10 +15,10 @@ namespace Ui
 {
     class CShowHideBar;
 }
-namespace BlackGui
+namespace swift::gui
 {
     //! Show or hide (expand / collapse) another section
-    class BLACKGUI_EXPORT CShowHideBar : public QFrame
+    class SWIFT_GUI_EXPORT CShowHideBar : public QFrame
     {
         Q_OBJECT
 
diff --git a/src/blackgui/showhidebar.ui b/src/gui/showhidebar.ui
similarity index 100%
rename from src/blackgui/showhidebar.ui
rename to src/gui/showhidebar.ui
diff --git a/src/blackgui/singleapplicationui.cpp b/src/gui/singleapplicationui.cpp
similarity index 93%
rename from src/blackgui/singleapplicationui.cpp
rename to src/gui/singleapplicationui.cpp
index 627c60c22..1693e4cb8 100644
--- a/src/blackgui/singleapplicationui.cpp
+++ b/src/gui/singleapplicationui.cpp
@@ -2,12 +2,12 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "singleapplicationui.h"
-#include "blackgui/guiapplication.h"
+#include "gui/guiapplication.h"
 #include <QWidget>
 
 using namespace swift::misc;
 
-namespace BlackGui
+namespace swift::gui
 {
     CSingleApplicationUi::CSingleApplicationUi(QWidget *ui) : m_ui(ui)
     {
diff --git a/src/blackgui/singleapplicationui.h b/src/gui/singleapplicationui.h
similarity index 87%
rename from src/blackgui/singleapplicationui.h
rename to src/gui/singleapplicationui.h
index 8a657d354..b263f4bbb 100644
--- a/src/blackgui/singleapplicationui.h
+++ b/src/gui/singleapplicationui.h
@@ -3,14 +3,14 @@
 
 //! \file
 
-#ifndef BLACKGUI_SINGLEAPPLICATIONUI_H
-#define BLACKGUI_SINGLEAPPLICATIONUI_H
+#ifndef SWIFT_GUI_SINGLEAPPLICATIONUI_H
+#define SWIFT_GUI_SINGLEAPPLICATIONUI_H
 
 #include <QTimer>
 
 class QWidget;
 
-namespace BlackGui
+namespace swift::gui
 {
     /*!
      * Enable / disable UI depending on how many swift applications are running
diff --git a/src/blackgui/splashscreen.cpp b/src/gui/splashscreen.cpp
similarity index 98%
rename from src/blackgui/splashscreen.cpp
rename to src/gui/splashscreen.cpp
index 8785b3db1..2f572c766 100644
--- a/src/blackgui/splashscreen.cpp
+++ b/src/gui/splashscreen.cpp
@@ -7,7 +7,7 @@
 
 using namespace swift::misc;
 
-namespace BlackGui
+namespace swift::gui
 {
     CSplashScreen::CSplashScreen(const QPixmap &pixmap)
     {
diff --git a/src/blackgui/splashscreen.h b/src/gui/splashscreen.h
similarity index 91%
rename from src/blackgui/splashscreen.h
rename to src/gui/splashscreen.h
index b173cf037..8742876b0 100644
--- a/src/blackgui/splashscreen.h
+++ b/src/gui/splashscreen.h
@@ -3,8 +3,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_SPLASHSCREEN_H
-#define BLACKGUI_SPLASHSCREEN_H
+#ifndef SWIFT_GUI_SPLASHSCREEN_H
+#define SWIFT_GUI_SPLASHSCREEN_H
 
 #include "misc/statusmessage.h"
 #include <QSplashScreen>
@@ -14,7 +14,7 @@
 #include <QFont>
 #include <QTimer>
 
-namespace BlackGui
+namespace swift::gui
 {
     /*!
      * Own splash screen
diff --git a/src/blackgui/stylesheetutility.cpp b/src/gui/stylesheetutility.cpp
similarity index 99%
rename from src/blackgui/stylesheetutility.cpp
rename to src/gui/stylesheetutility.cpp
index f19cd55fe..918152f1e 100644
--- a/src/blackgui/stylesheetutility.cpp
+++ b/src/gui/stylesheetutility.cpp
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "config/buildconfig.h"
-#include "blackgui/stylesheetutility.h"
+#include "gui/stylesheetutility.h"
 #include "misc/fileutils.h"
 #include "misc/logmessage.h"
 #include "misc/swiftdirectories.h"
@@ -28,7 +28,7 @@
 using namespace swift::config;
 using namespace swift::misc;
 
-namespace BlackGui
+namespace swift::gui
 {
     CStyleSheetUtility::CStyleSheetUtility(QObject *parent) : QObject(parent)
     {
diff --git a/src/blackgui/stylesheetutility.h b/src/gui/stylesheetutility.h
similarity index 95%
rename from src/blackgui/stylesheetutility.h
rename to src/gui/stylesheetutility.h
index 7f1869423..7f6f49859 100644
--- a/src/blackgui/stylesheetutility.h
+++ b/src/gui/stylesheetutility.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_STYLESHEETUTILITY_H
-#define BLACKGUI_STYLESHEETUTILITY_H
+#ifndef SWIFT_GUI_STYLESHEETUTILITY_H
+#define SWIFT_GUI_STYLESHEETUTILITY_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include "misc/logcategories.h"
 #include "misc/digestsignal.h"
 
@@ -22,10 +22,10 @@
 class QFont;
 class QWidget;
 
-namespace BlackGui
+namespace swift::gui
 {
     //! Reads and provides style sheets
-    class BLACKGUI_EXPORT CStyleSheetUtility : public QObject
+    class SWIFT_GUI_EXPORT CStyleSheetUtility : public QObject
     {
         Q_OBJECT
 
@@ -154,7 +154,7 @@ namespace BlackGui
 
     signals:
         //! Sheets have been changed
-        //! \deprecated use BlackGui::CGuiApplication::styleSheetsChanged
+        //! \deprecated use swift::gui::CGuiApplication::styleSheetsChanged
         void styleSheetsChanged();
 
     private:
diff --git a/src/blackgui/blackgui.dox b/src/gui/swiftgui.dox
similarity index 71%
rename from src/blackgui/blackgui.dox
rename to src/gui/swiftgui.dox
index ad7c448d2..f5e807e9b 100644
--- a/src/blackgui/blackgui.dox
+++ b/src/gui/swiftgui.dox
@@ -4,41 +4,41 @@
 //! \file
 
 /*!
- * \namespace BlackGui
+ * \namespace swift::gui
  * \brief GUI related classes.
  */
 
 /*!
- * \namespace BlackGui::Components
+ * \namespace swift::gui::components
  * \brief High level reusable GUI components.
  */
 
 /*!
- * \namespace BlackGui::Context
+ * \namespace swift::gui::Context
  * \brief The context classes are high level API classes providing the interface for DBus.
  */
 
 /*!
- * \namespace BlackGui::Filters
+ * \namespace swift::gui::filters
  * \brief Filter to search data sets.
  */
 
 /*!
- * \namespace BlackGui::Models
+ * \namespace swift::gui::models
  * \brief Models to be used with views, mainly QTableView
  */
 
 /*!
- * \namespace BlackGui::Vatsim
+ * \namespace swift::gui::vatsim
  * \brief Specific classes for the VATSIM network
  */
 
 /*!
- * \namespace BlackGui::Views
+ * \namespace swift::gui::views
  * \brief Views, mainly QTableView
  */
 
 /*!
- * \namespace BlackGui::Win
+ * \namespace swift::gui::win
  * \brief Windows specific classes.
  */
diff --git a/src/gui/swiftguiexport.h b/src/gui/swiftguiexport.h
new file mode 100644
index 000000000..73105f0a1
--- /dev/null
+++ b/src/gui/swiftguiexport.h
@@ -0,0 +1,35 @@
+// SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
+// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
+
+//! \file
+
+#ifndef SWIFT_GUI_SWIFT_GUIEXPORT_H
+#define SWIFT_GUI_SWIFT_GUIEXPORT_H
+
+#include <QtGlobal>
+
+/*!
+ * \def SWIFT_GUI_EXPORT
+ * Export a class or function from the library
+ */
+#ifndef WITH_STATIC
+#    if defined(BUILD_SWIFT_GUI_LIB)
+#        define SWIFT_GUI_EXPORT Q_DECL_EXPORT
+#    else
+#        define SWIFT_GUI_EXPORT Q_DECL_IMPORT
+#    endif
+#else
+#    define SWIFT_GUI_EXPORT
+#endif
+
+/*!
+ * \def SWIFT_GUI_EXPORT_DECLARE_TEMPLATE
+ * SWIFT_GUI Export explicit template declaration
+ */
+#if defined(Q_OS_WIN) && defined(Q_CC_GNU)
+#    define SWIFT_GUI_EXPORT_DECLARE_TEMPLATE SWIFT_GUI_EXPORT
+#else
+#    define SWIFT_GUI_EXPORT_DECLARE_TEMPLATE
+#endif
+
+#endif // guard
diff --git a/src/blackgui/systemtraywindow.cpp b/src/gui/systemtraywindow.cpp
similarity index 98%
rename from src/blackgui/systemtraywindow.cpp
rename to src/gui/systemtraywindow.cpp
index 8eecb99bb..45f4edd4b 100644
--- a/src/blackgui/systemtraywindow.cpp
+++ b/src/gui/systemtraywindow.cpp
@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright (C) 2014 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/systemtraywindow.h"
+#include "gui/systemtraywindow.h"
 
 #include <QAction>
 #include <QApplication>
@@ -13,7 +13,7 @@
 #include <QWidget>
 #include <QtGlobal>
 
-namespace BlackGui
+namespace swift::gui
 {
 
     CSystemTrayWindow::CSystemTrayWindow(const QIcon &icon, QWidget *parent) : QMainWindow(parent)
diff --git a/src/blackgui/systemtraywindow.h b/src/gui/systemtraywindow.h
similarity index 88%
rename from src/blackgui/systemtraywindow.h
rename to src/gui/systemtraywindow.h
index 5a810477d..cd5804ec2 100644
--- a/src/blackgui/systemtraywindow.h
+++ b/src/gui/systemtraywindow.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_ENABLEFORSYSTEMTRAY_H
-#define BLACKGUI_ENABLEFORSYSTEMTRAY_H
+#ifndef SWIFT_GUI_ENABLEFORSYSTEMTRAY_H
+#define SWIFT_GUI_ENABLEFORSYSTEMTRAY_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 
 #include <QFlag>
 #include <QFlags>
@@ -22,11 +22,11 @@ class QEvent;
 class QMenu;
 class QWidget;
 
-namespace BlackGui
+namespace swift::gui
 {
 
     //! QDialog which can minimize to system tray
-    class BLACKGUI_EXPORT CSystemTrayWindow : public QMainWindow
+    class SWIFT_GUI_EXPORT CSystemTrayWindow : public QMainWindow
     {
         Q_OBJECT
 
@@ -84,6 +84,6 @@ namespace BlackGui
 
 } // namespace
 
-Q_DECLARE_OPERATORS_FOR_FLAGS(BlackGui::CSystemTrayWindow::SystemTrayMode)
+Q_DECLARE_OPERATORS_FOR_FLAGS(swift::gui::CSystemTrayWindow::SystemTrayMode)
 
 #endif // guard
diff --git a/src/blackgui/textmessagetextedit.cpp b/src/gui/textmessagetextedit.cpp
similarity index 98%
rename from src/blackgui/textmessagetextedit.cpp
rename to src/gui/textmessagetextedit.cpp
index 0bc85bc73..360ee8970 100644
--- a/src/blackgui/textmessagetextedit.cpp
+++ b/src/gui/textmessagetextedit.cpp
@@ -1,8 +1,8 @@
 // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/guiapplication.h"
-#include "blackgui/textmessagetextedit.h"
+#include "gui/guiapplication.h"
+#include "gui/textmessagetextedit.h"
 #include "misc/aviation/callsign.h"
 #include "misc/network/textmessage.h"
 
@@ -18,7 +18,7 @@
 using namespace swift::misc;
 using namespace swift::misc::network;
 
-namespace BlackGui
+namespace swift::gui
 {
     CTextMessageTextEdit::CTextMessageTextEdit(QWidget *parent) : QTextEdit(parent)
     {
diff --git a/src/blackgui/textmessagetextedit.h b/src/gui/textmessagetextedit.h
similarity index 93%
rename from src/blackgui/textmessagetextedit.h
rename to src/gui/textmessagetextedit.h
index d8c57b354..e7a1fb292 100644
--- a/src/blackgui/textmessagetextedit.h
+++ b/src/gui/textmessagetextedit.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_TEXTMESSAGETEXTEDIT_H
-#define BLACKGUI_TEXTMESSAGETEXTEDIT_H
+#ifndef SWIFT_GUI_TEXTMESSAGETEXTEDIT_H
+#define SWIFT_GUI_TEXTMESSAGETEXTEDIT_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include "misc/network/textmessagelist.h"
 
 #include <QObject>
@@ -21,10 +21,10 @@ namespace swift::misc::network
 {
     class CTextMessage;
 }
-namespace BlackGui
+namespace swift::gui
 {
     //! Specialized text edit for displaying text messages
-    class BLACKGUI_EXPORT CTextMessageTextEdit : public QTextEdit
+    class SWIFT_GUI_EXPORT CTextMessageTextEdit : public QTextEdit
     {
         Q_OBJECT
 
diff --git a/src/blackgui/ticklabel.cpp b/src/gui/ticklabel.cpp
similarity index 90%
rename from src/blackgui/ticklabel.cpp
rename to src/gui/ticklabel.cpp
index 692d71347..f75c6372b 100644
--- a/src/blackgui/ticklabel.cpp
+++ b/src/gui/ticklabel.cpp
@@ -1,12 +1,12 @@
 // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/ticklabel.h"
+#include "gui/ticklabel.h"
 #include "misc/icons.h"
 
 using namespace swift::misc;
 
-namespace BlackGui
+namespace swift::gui
 {
     CTickLabel::CTickLabel(QWidget *parent) : QLabel(parent)
     {
@@ -25,7 +25,7 @@ namespace BlackGui
         emit tickChanged(this->m_isPixmapTicked);
     }
 
-    void BlackGui::CTickLabel::setToolTips(const QString &ticked, const QString &unticked)
+    void swift::gui::CTickLabel::setToolTips(const QString &ticked, const QString &unticked)
     {
         m_toolTipTicked = ticked;
         m_toolTipUnticked = unticked;
diff --git a/src/blackgui/ticklabel.h b/src/gui/ticklabel.h
similarity index 88%
rename from src/blackgui/ticklabel.h
rename to src/gui/ticklabel.h
index a6c795542..7f554794c 100644
--- a/src/blackgui/ticklabel.h
+++ b/src/gui/ticklabel.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_TICKLABEL_H
-#define BLACKGUI_TICKLABEL_H
+#ifndef SWIFT_GUI_TICKLABEL_H
+#define SWIFT_GUI_TICKLABEL_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include "misc/icons.h"
 
 #include <QLabel>
@@ -14,10 +14,10 @@
 #include <QPixmap>
 #include <QString>
 
-namespace BlackGui
+namespace swift::gui
 {
     //! Representing a ticked or crossed icon
-    class BLACKGUI_EXPORT CTickLabel : public QLabel
+    class SWIFT_GUI_EXPORT CTickLabel : public QLabel
     {
         Q_OBJECT
 
diff --git a/src/blackgui/uppercasevalidator.cpp b/src/gui/uppercasevalidator.cpp
similarity index 97%
rename from src/blackgui/uppercasevalidator.cpp
rename to src/gui/uppercasevalidator.cpp
index c4bfd692e..c1a14adc2 100644
--- a/src/blackgui/uppercasevalidator.cpp
+++ b/src/gui/uppercasevalidator.cpp
@@ -2,13 +2,13 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "misc/stringutils.h"
-#include "blackgui/uppercasevalidator.h"
+#include "gui/uppercasevalidator.h"
 #include <QString>
 #include <QtGlobal>
 
 using namespace swift::misc;
 
-namespace BlackGui
+namespace swift::gui
 {
     CUpperCaseValidator::CUpperCaseValidator(QObject *parent) : QValidator(parent)
     {}
diff --git a/src/blackgui/uppercasevalidator.h b/src/gui/uppercasevalidator.h
similarity index 88%
rename from src/blackgui/uppercasevalidator.h
rename to src/gui/uppercasevalidator.h
index ede71aac8..6f669e34c 100644
--- a/src/blackgui/uppercasevalidator.h
+++ b/src/gui/uppercasevalidator.h
@@ -3,17 +3,17 @@
 
 //! \file
 
-#ifndef BLACKGUI_UPPERCASEVALIDATOR_H
-#define BLACKGUI_UPPERCASEVALIDATOR_H
+#ifndef SWIFT_GUI_UPPERCASEVALIDATOR_H
+#define SWIFT_GUI_UPPERCASEVALIDATOR_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include <QStringList>
 #include <QValidator>
 
-namespace BlackGui
+namespace swift::gui
 {
     //! Forces uppercase
-    class BLACKGUI_EXPORT CUpperCaseValidator : public QValidator
+    class SWIFT_GUI_EXPORT CUpperCaseValidator : public QValidator
     {
         Q_OBJECT
 
diff --git a/src/blackgui/views/aircraftcategorytreeview.cpp b/src/gui/views/aircraftcategorytreeview.cpp
similarity index 94%
rename from src/blackgui/views/aircraftcategorytreeview.cpp
rename to src/gui/views/aircraftcategorytreeview.cpp
index d98318ee8..e7649efb5 100644
--- a/src/blackgui/views/aircraftcategorytreeview.cpp
+++ b/src/gui/views/aircraftcategorytreeview.cpp
@@ -1,9 +1,9 @@
 // SPDX-FileCopyrightText: Copyright (C) 2018 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/views/aircraftcategorytreeview.h"
-#include "blackgui/models/aircraftcategorytreemodel.h"
-#include "blackgui/menus/menuaction.h"
+#include "gui/views/aircraftcategorytreeview.h"
+#include "gui/models/aircraftcategorytreemodel.h"
+#include "gui/menus/menuaction.h"
 #include "misc/icons.h"
 #include "config/buildconfig.h"
 
@@ -15,9 +15,9 @@
 
 using namespace swift::misc;
 using namespace swift::misc::aviation;
-using namespace BlackGui::Models;
+using namespace swift::gui::models;
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     CAircraftCategoryTreeView::CAircraftCategoryTreeView(QWidget *parent) : QTreeView(parent)
     {
diff --git a/src/blackgui/views/aircraftcategorytreeview.h b/src/gui/views/aircraftcategorytreeview.h
similarity index 77%
rename from src/blackgui/views/aircraftcategorytreeview.h
rename to src/gui/views/aircraftcategorytreeview.h
index b53477120..2b39524da 100644
--- a/src/blackgui/views/aircraftcategorytreeview.h
+++ b/src/gui/views/aircraftcategorytreeview.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_VIEWS_AIRCRAFTCATEGORYTREEVIEW_H
-#define BLACKGUI_VIEWS_AIRCRAFTCATEGORYTREEVIEW_H
+#ifndef SWIFT_GUI_VIEWS_AIRCRAFTCATEGORYTREEVIEW_H
+#define SWIFT_GUI_VIEWS_AIRCRAFTCATEGORYTREEVIEW_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include "misc/aviation/aircraftcategorylist.h"
 #include "misc/digestsignal.h"
 
@@ -16,18 +16,18 @@
 #include <QMap>
 #include <QModelIndex>
 
-namespace BlackGui
+namespace swift::gui
 {
-    namespace Models
+    namespace models
     {
         class CAircraftCategoryTreeModel;
         class CColumns;
     }
 
-    namespace Views
+    namespace views
     {
         //! ATC stations view
-        class BLACKGUI_EXPORT CAircraftCategoryTreeView : public QTreeView
+        class SWIFT_GUI_EXPORT CAircraftCategoryTreeView : public QTreeView
         {
             Q_OBJECT
 
@@ -45,17 +45,17 @@ namespace BlackGui
             void fullResizeToContents();
 
             //! Set columns
-            void setColumns(const Models::CColumns &columns);
+            void setColumns(const models::CColumns &columns);
 
             //! Empty data
             bool isEmpty() const;
 
         private:
             //! Used model
-            const Models::CAircraftCategoryTreeModel *categoryModel() const;
+            const models::CAircraftCategoryTreeModel *categoryModel() const;
 
             //! Used model
-            BlackGui::Models::CAircraftCategoryTreeModel *categoryModel();
+            swift::gui::models::CAircraftCategoryTreeModel *categoryModel();
 
             //! Resize all columns
             void fullResizeToContentsImpl();
diff --git a/src/blackgui/views/aircraftcategoryview.cpp b/src/gui/views/aircraftcategoryview.cpp
similarity index 74%
rename from src/blackgui/views/aircraftcategoryview.cpp
rename to src/gui/views/aircraftcategoryview.cpp
index b776ea6a8..ba5473785 100644
--- a/src/blackgui/views/aircraftcategoryview.cpp
+++ b/src/gui/views/aircraftcategoryview.cpp
@@ -1,13 +1,13 @@
 // SPDX-FileCopyrightText: Copyright (C) 2019 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/views/aircraftcategoryview.h"
-#include "blackgui/views/viewbase.h"
+#include "gui/views/aircraftcategoryview.h"
+#include "gui/views/viewbase.h"
 
 using namespace swift::misc;
-using namespace BlackGui::Models;
+using namespace swift::gui::models;
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     CAircraftCategoryView::CAircraftCategoryView(QWidget *parent) : CViewWithDbObjects(parent)
     {
diff --git a/src/blackgui/views/aircraftcategoryview.h b/src/gui/views/aircraftcategoryview.h
similarity index 50%
rename from src/blackgui/views/aircraftcategoryview.h
rename to src/gui/views/aircraftcategoryview.h
index fe27283d2..e282de000 100644
--- a/src/blackgui/views/aircraftcategoryview.h
+++ b/src/gui/views/aircraftcategoryview.h
@@ -3,18 +3,18 @@
 
 //! \file
 
-#ifndef BLACKGUI_VIEWS_AIRCRAFTCATEGORYVIEW_H
-#define BLACKGUI_VIEWS_AIRCRAFTCATEGORYVIEW_H
+#ifndef SWIFT_GUI_VIEWS_AIRCRAFTCATEGORYVIEW_H
+#define SWIFT_GUI_VIEWS_AIRCRAFTCATEGORYVIEW_H
 
-#include "blackgui/models/aircraftcategorylistmodel.h"
-#include "blackgui/views/viewdbobjects.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/models/aircraftcategorylistmodel.h"
+#include "gui/views/viewdbobjects.h"
+#include "gui/swiftguiexport.h"
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     //! Aircraft ICAO codes view
-    class BLACKGUI_EXPORT CAircraftCategoryView :
-        public CViewWithDbObjects<Models::CAircraftCategoryListModel>
+    class SWIFT_GUI_EXPORT CAircraftCategoryView :
+        public CViewWithDbObjects<models::CAircraftCategoryListModel>
     {
         Q_OBJECT
 
diff --git a/src/blackgui/views/aircrafticaoview.cpp b/src/gui/views/aircrafticaoview.cpp
similarity index 75%
rename from src/blackgui/views/aircrafticaoview.cpp
rename to src/gui/views/aircrafticaoview.cpp
index affaab385..8355a4b7c 100644
--- a/src/blackgui/views/aircrafticaoview.cpp
+++ b/src/gui/views/aircrafticaoview.cpp
@@ -1,13 +1,13 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/views/aircrafticaoview.h"
-#include "blackgui/views/viewbase.h"
+#include "gui/views/aircrafticaoview.h"
+#include "gui/views/viewbase.h"
 
 using namespace swift::misc;
-using namespace BlackGui::Models;
+using namespace swift::gui::models;
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     CAircraftIcaoCodeView::CAircraftIcaoCodeView(QWidget *parent) : CViewWithDbObjects(parent)
     {
diff --git a/src/blackgui/views/aircrafticaoview.h b/src/gui/views/aircrafticaoview.h
similarity index 51%
rename from src/blackgui/views/aircrafticaoview.h
rename to src/gui/views/aircrafticaoview.h
index 963d72e5b..946f91631 100644
--- a/src/blackgui/views/aircrafticaoview.h
+++ b/src/gui/views/aircrafticaoview.h
@@ -3,18 +3,18 @@
 
 //! \file
 
-#ifndef BLACKGUI_VIEWS_AIRCRAFTICAOVIEW_H
-#define BLACKGUI_VIEWS_AIRCRAFTICAOVIEW_H
+#ifndef SWIFT_GUI_VIEWS_AIRCRAFTICAOVIEW_H
+#define SWIFT_GUI_VIEWS_AIRCRAFTICAOVIEW_H
 
-#include "blackgui/models/aircrafticaolistmodel.h"
-#include "blackgui/views/viewdbobjects.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/models/aircrafticaolistmodel.h"
+#include "gui/views/viewdbobjects.h"
+#include "gui/swiftguiexport.h"
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     //! Aircraft ICAO codes view
-    class BLACKGUI_EXPORT CAircraftIcaoCodeView :
-        public CViewWithDbObjects<Models::CAircraftIcaoCodeListModel>
+    class SWIFT_GUI_EXPORT CAircraftIcaoCodeView :
+        public CViewWithDbObjects<models::CAircraftIcaoCodeListModel>
     {
         Q_OBJECT
 
diff --git a/src/blackgui/views/aircraftmodelstatisticsdialog.cpp b/src/gui/views/aircraftmodelstatisticsdialog.cpp
similarity index 96%
rename from src/blackgui/views/aircraftmodelstatisticsdialog.cpp
rename to src/gui/views/aircraftmodelstatisticsdialog.cpp
index f245612bc..5561865f3 100644
--- a/src/blackgui/views/aircraftmodelstatisticsdialog.cpp
+++ b/src/gui/views/aircraftmodelstatisticsdialog.cpp
@@ -3,7 +3,7 @@
 
 #include "aircraftmodelstatisticsdialog.h"
 #include "ui_aircraftmodelstatisticsdialog.h"
-#include "blackgui/guiapplication.h"
+#include "gui/guiapplication.h"
 #include "misc/aviation/aircrafticaocodelist.h"
 #include "misc/simulation/aircraftmodelutils.h"
 
@@ -16,7 +16,7 @@
 using namespace swift::misc::aviation;
 using namespace swift::misc::simulation;
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     CAircraftModelStatisticsDialog::CAircraftModelStatisticsDialog(QWidget *parent) : QDialog(parent),
                                                                                       ui(new Ui::CAircraftModelStatisticsDialog)
diff --git a/src/blackgui/views/aircraftmodelstatisticsdialog.h b/src/gui/views/aircraftmodelstatisticsdialog.h
similarity index 87%
rename from src/blackgui/views/aircraftmodelstatisticsdialog.h
rename to src/gui/views/aircraftmodelstatisticsdialog.h
index b0c196179..58f4c05ee 100644
--- a/src/blackgui/views/aircraftmodelstatisticsdialog.h
+++ b/src/gui/views/aircraftmodelstatisticsdialog.h
@@ -3,8 +3,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_VIEW_AIRCRAFTMODELSTATISTICSDIALOG_H
-#define BLACKGUI_VIEW_AIRCRAFTMODELSTATISTICSDIALOG_H
+#ifndef SWIFT_GUI_VIEW_AIRCRAFTMODELSTATISTICSDIALOG_H
+#define SWIFT_GUI_VIEW_AIRCRAFTMODELSTATISTICSDIALOG_H
 
 #include "misc/simulation/aircraftmodellist.h"
 #include <QDialog>
@@ -14,7 +14,7 @@ namespace Ui
 {
     class CAircraftModelStatisticsDialog;
 }
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     //! Info about the models
     class CAircraftModelStatisticsDialog : public QDialog
diff --git a/src/blackgui/views/aircraftmodelstatisticsdialog.ui b/src/gui/views/aircraftmodelstatisticsdialog.ui
similarity index 100%
rename from src/blackgui/views/aircraftmodelstatisticsdialog.ui
rename to src/gui/views/aircraftmodelstatisticsdialog.ui
diff --git a/src/blackgui/views/aircraftmodelvalidationdialog.cpp b/src/gui/views/aircraftmodelvalidationdialog.cpp
similarity index 98%
rename from src/blackgui/views/aircraftmodelvalidationdialog.cpp
rename to src/gui/views/aircraftmodelvalidationdialog.cpp
index ec5dd9594..3bba8a532 100644
--- a/src/blackgui/views/aircraftmodelvalidationdialog.cpp
+++ b/src/gui/views/aircraftmodelvalidationdialog.cpp
@@ -13,7 +13,7 @@
 using namespace swift::misc;
 using namespace swift::misc::simulation;
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     CAircraftModelValidationDialog::CAircraftModelValidationDialog(QWidget *parent) : QDialog(parent),
                                                                                       ui(new Ui::CAircraftModelValidationDialog)
diff --git a/src/blackgui/views/aircraftmodelvalidationdialog.h b/src/gui/views/aircraftmodelvalidationdialog.h
similarity index 87%
rename from src/blackgui/views/aircraftmodelvalidationdialog.h
rename to src/gui/views/aircraftmodelvalidationdialog.h
index 4f575cb87..5c4a02211 100644
--- a/src/blackgui/views/aircraftmodelvalidationdialog.h
+++ b/src/gui/views/aircraftmodelvalidationdialog.h
@@ -3,8 +3,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_VIEWS_AIRCRAFTMODELVALIDATIONDIALOG_H
-#define BLACKGUI_VIEWS_AIRCRAFTMODELVALIDATIONDIALOG_H
+#ifndef SWIFT_GUI_VIEWS_AIRCRAFTMODELVALIDATIONDIALOG_H
+#define SWIFT_GUI_VIEWS_AIRCRAFTMODELVALIDATIONDIALOG_H
 
 #include <QDialog>
 #include <QScopedPointer>
@@ -14,11 +14,11 @@ namespace Ui
 {
     class CAircraftModelValidationDialog;
 }
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     /*!
      * Model validation
-     * \remark there is also a more specific validation version BlackGui::Components::CAircraftModelSetValidationDialog
+     * \remark there is also a more specific validation version swift::gui::components::CAircraftModelSetValidationDialog
      */
     class CAircraftModelValidationDialog : public QDialog
     {
diff --git a/src/blackgui/views/aircraftmodelvalidationdialog.ui b/src/gui/views/aircraftmodelvalidationdialog.ui
similarity index 88%
rename from src/blackgui/views/aircraftmodelvalidationdialog.ui
rename to src/gui/views/aircraftmodelvalidationdialog.ui
index f885247b9..506c89f67 100644
--- a/src/blackgui/views/aircraftmodelvalidationdialog.ui
+++ b/src/gui/views/aircraftmodelvalidationdialog.ui
@@ -13,7 +13,7 @@
   </property>
   <layout class="QVBoxLayout" name="vl_ValidationDialog">
    <item>
-    <widget class="BlackGui::Components::CStatusMessagesDetail" name="comp_StatusMessage"/>
+    <widget class="swift::gui::components::CStatusMessagesDetail" name="comp_StatusMessage"/>
    </item>
    <item>
     <widget class="QDialogButtonBox" name="bb_ValidationDialog">
@@ -29,9 +29,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CStatusMessagesDetail</class>
+   <class>swift::gui::components::CStatusMessagesDetail</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/statusmessagesdetail.h</header>
+   <header>gui/components/statusmessagesdetail.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/views/aircraftmodelview.cpp b/src/gui/views/aircraftmodelview.cpp
similarity index 97%
rename from src/blackgui/views/aircraftmodelview.cpp
rename to src/gui/views/aircraftmodelview.cpp
index 1edb841c1..dec948655 100644
--- a/src/blackgui/views/aircraftmodelview.cpp
+++ b/src/gui/views/aircraftmodelview.cpp
@@ -2,14 +2,14 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "aircraftmodelview.h"
-#include "blackgui/views/viewbase.h"
-#include "blackgui/views/aircraftmodelstatisticsdialog.h"
-#include "blackgui/views/aircraftmodelvalidationdialog.h"
-#include "blackgui/filters/aircraftmodelfilterdialog.h"
-#include "blackgui/menus/menuaction.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/guiutility.h"
-#include "blackgui/shortcut.h"
+#include "gui/views/viewbase.h"
+#include "gui/views/aircraftmodelstatisticsdialog.h"
+#include "gui/views/aircraftmodelvalidationdialog.h"
+#include "gui/filters/aircraftmodelfilterdialog.h"
+#include "gui/menus/menuaction.h"
+#include "gui/guiapplication.h"
+#include "gui/guiutility.h"
+#include "gui/shortcut.h"
 #include "misc/simulation/aircraftmodel.h"
 #include "misc/simulation/distributorlist.h"
 #include "misc/simulation/simulatorinfolist.h"
@@ -36,11 +36,11 @@
 using namespace swift::misc;
 using namespace swift::misc::simulation;
 using namespace swift::misc::aviation;
-using namespace BlackGui::Models;
-using namespace BlackGui::Filters;
-using namespace BlackGui::Menus;
+using namespace swift::gui::models;
+using namespace swift::gui::filters;
+using namespace swift::gui::menus;
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     CAircraftModelView::CAircraftModelView(QWidget *parent) : COrderableViewWithDbObjects(parent)
     {
diff --git a/src/blackgui/views/aircraftmodelview.h b/src/gui/views/aircraftmodelview.h
similarity index 80%
rename from src/blackgui/views/aircraftmodelview.h
rename to src/gui/views/aircraftmodelview.h
index 57e2000cb..682f840b8 100644
--- a/src/blackgui/views/aircraftmodelview.h
+++ b/src/gui/views/aircraftmodelview.h
@@ -3,12 +3,12 @@
 
 //! \file
 
-#ifndef BLACKGUI_AIRCRAFTMODELVIEW_H
-#define BLACKGUI_AIRCRAFTMODELVIEW_H
+#ifndef SWIFT_GUI_AIRCRAFTMODELVIEW_H
+#define SWIFT_GUI_AIRCRAFTMODELVIEW_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/models/aircraftmodellistmodel.h"
-#include "blackgui/views/viewdbobjects.h"
+#include "gui/swiftguiexport.h"
+#include "gui/models/aircraftmodellistmodel.h"
+#include "gui/views/viewdbobjects.h"
 #include "misc/aviation/airlineicaocode.h"
 #include "misc/propertyindexvariantmap.h"
 #include "misc/simulation/aircraftmodellist.h"
@@ -34,24 +34,24 @@ namespace swift::misc::simulation
 {
     class CAircraftModel;
 }
-namespace BlackGui
+namespace swift::gui
 {
-    namespace Filters
+    namespace filters
     {
         class CAircraftModelFilterDialog;
     }
-    namespace Menus
+    namespace menus
     {
         class CMenuActions;
     }
-    namespace Views
+    namespace views
     {
         class CAircraftModelStatisticsDialog;
         class CAircraftModelValidationDialog;
 
         //! Aircraft view
-        class BLACKGUI_EXPORT CAircraftModelView :
-            public COrderableViewWithDbObjects<Models::CAircraftModelListModel>
+        class SWIFT_GUI_EXPORT CAircraftModelView :
+            public COrderableViewWithDbObjects<models::CAircraftModelListModel>
         {
             Q_OBJECT
 
@@ -60,7 +60,7 @@ namespace BlackGui
             explicit CAircraftModelView(QWidget *parent = nullptr);
 
             //! Set display mode
-            void setAircraftModelMode(Models::CAircraftModelListModel::AircraftModelMode mode);
+            void setAircraftModelMode(models::CAircraftModelListModel::AircraftModelMode mode);
 
             //! Apply to selected objects
             int applyToSelected(const swift::misc::aviation::CLivery &livery);
@@ -84,7 +84,7 @@ namespace BlackGui
             void addFilterDialog();
 
             //! Filter dialog if any
-            BlackGui::Filters::CAircraftModelFilterDialog *getFilterDialog() const;
+            swift::gui::filters::CAircraftModelFilterDialog *getFilterDialog() const;
 
             //! Remove models with model strings
             int removeModelsWithModelString(const QStringList &modelStrings, Qt::CaseSensitivity sensitivity = Qt::CaseInsensitive);
@@ -95,22 +95,22 @@ namespace BlackGui
             //! Replace models with sme model string, otherwise add
             int replaceOrAddModelsWithString(const swift::misc::simulation::CAircraftModelList &models, Qt::CaseSensitivity sensitivity = Qt::CaseInsensitive);
 
-            //! \copydoc BlackGui::Models::CAircraftModelListModel::setHighlightModels
+            //! \copydoc swift::gui::models::CAircraftModelListModel::setHighlightModels
             void setHighlightModels(const swift::misc::simulation::CAircraftModelList &highlightModels);
 
-            //! \copydoc BlackGui::Models::CAircraftModelListModel::setHighlightModelStrings(const QStringList &)
+            //! \copydoc swift::gui::models::CAircraftModelListModel::setHighlightModelStrings(const QStringList &)
             void setHighlightModelStrings(const QStringList &highlightModels);
 
             //! Set the highlight models based on the saved file
             void setHighlightModelsForInvalidModels();
 
-            //! \copydoc BlackGui::Models::CAircraftModelListModel::setHighlight
+            //! \copydoc swift::gui::models::CAircraftModelListModel::setHighlight
             void setHighlight(bool highlight);
 
-            //! \copydoc BlackGui::Models::CAircraftModelListModel::setHighlightColor
+            //! \copydoc swift::gui::models::CAircraftModelListModel::setHighlightColor
             void setHighlightColor(const QBrush &brush);
 
-            //! \copydoc BlackGui::Models::CAircraftModelListModel::highlightModels
+            //! \copydoc swift::gui::models::CAircraftModelListModel::highlightModels
             bool highlightModels() const;
 
             //! Corresponding simulator
@@ -138,22 +138,22 @@ namespace BlackGui
 
         protected:
             //! \copydoc QTableView::dropEvent
-            //! \sa BlackGui::Models::CListModelBase::dropMimeData
+            //! \sa swift::gui::models::CListModelBase::dropMimeData
             virtual void dropEvent(QDropEvent *event) override;
 
             //! \name View base class overrides
             //! @{
 
-            //! \copydoc BlackGui::Views::COrderableViewWithDbObjects::customMenu
-            virtual void customMenu(Menus::CMenuActions &menuActions) override;
+            //! \copydoc swift::gui::views::COrderableViewWithDbObjects::customMenu
+            virtual void customMenu(menus::CMenuActions &menuActions) override;
 
-            //! \copydoc BlackGui::Views::COrderableViewWithDbObjects::modifyLoadedJsonData
+            //! \copydoc swift::gui::views::COrderableViewWithDbObjects::modifyLoadedJsonData
             virtual swift::misc::CStatusMessage modifyLoadedJsonData(swift::misc::simulation::CAircraftModelList &models) const override;
 
-            //! \copydoc BlackGui::Views::COrderableViewWithDbObjects::validateLoadedJsonData
+            //! \copydoc swift::gui::views::COrderableViewWithDbObjects::validateLoadedJsonData
             virtual swift::misc::CStatusMessage validateLoadedJsonData(const swift::misc::simulation::CAircraftModelList &models) const override;
 
-            //! \copydoc BlackGui::Views::COrderableViewWithDbObjects::jsonLoadedAndModelUpdated
+            //! \copydoc swift::gui::views::COrderableViewWithDbObjects::jsonLoadedAndModelUpdated
             virtual void jsonLoadedAndModelUpdated(const swift::misc::simulation::CAircraftModelList &models) override;
             //! @}
 
diff --git a/src/blackgui/views/aircraftpartsview.cpp b/src/gui/views/aircraftpartsview.cpp
similarity index 78%
rename from src/blackgui/views/aircraftpartsview.cpp
rename to src/gui/views/aircraftpartsview.cpp
index f0f050b19..d661591e7 100644
--- a/src/blackgui/views/aircraftpartsview.cpp
+++ b/src/gui/views/aircraftpartsview.cpp
@@ -1,11 +1,11 @@
 // SPDX-FileCopyrightText: Copyright (C) 2018 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/views/aircraftpartsview.h"
+#include "gui/views/aircraftpartsview.h"
 
-using namespace BlackGui::Models;
+using namespace swift::gui::models;
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     CAircraftPartsView::CAircraftPartsView(QWidget *parent) : CViewWithTimestampWithOffsetObjects(parent)
     {
diff --git a/src/gui/views/aircraftpartsview.h b/src/gui/views/aircraftpartsview.h
new file mode 100644
index 000000000..c19b637d9
--- /dev/null
+++ b/src/gui/views/aircraftpartsview.h
@@ -0,0 +1,26 @@
+// SPDX-FileCopyrightText: Copyright (C) 2018 swift Project Community / Contributors
+// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
+
+//! \file
+
+#ifndef SWIFT_GUI_VIEWS_AIRCRAFTPARTSVIEW_H
+#define SWIFT_GUI_VIEWS_AIRCRAFTPARTSVIEW_H
+
+#include "gui/views/viewtimestampobjects.h"
+#include "gui/models/aircraftpartslistmodel.h"
+#include "gui/swiftguiexport.h"
+
+namespace swift::gui::views
+{
+    //! Aircraft parts
+    class SWIFT_GUI_EXPORT CAircraftPartsView : public CViewWithTimestampWithOffsetObjects<models::CAircraftPartsListModel>
+    {
+        Q_OBJECT
+
+    public:
+        //! Constructor
+        explicit CAircraftPartsView(QWidget *parent = nullptr);
+    };
+} // ns
+
+#endif // guard
diff --git a/src/blackgui/views/aircraftsituationchangeview.cpp b/src/gui/views/aircraftsituationchangeview.cpp
similarity index 78%
rename from src/blackgui/views/aircraftsituationchangeview.cpp
rename to src/gui/views/aircraftsituationchangeview.cpp
index f013c3d46..a0a535ee5 100644
--- a/src/blackgui/views/aircraftsituationchangeview.cpp
+++ b/src/gui/views/aircraftsituationchangeview.cpp
@@ -1,11 +1,11 @@
 // SPDX-FileCopyrightText: Copyright (C) 2018 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/views/aircraftsituationchangeview.h"
+#include "gui/views/aircraftsituationchangeview.h"
 
-using namespace BlackGui::Models;
+using namespace swift::gui::models;
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     CAircraftSituationChangeView::CAircraftSituationChangeView(QWidget *parent) : CViewWithTimestampWithOffsetObjects(parent)
     {
diff --git a/src/blackgui/views/aircraftsituationchangeview.h b/src/gui/views/aircraftsituationchangeview.h
similarity index 51%
rename from src/blackgui/views/aircraftsituationchangeview.h
rename to src/gui/views/aircraftsituationchangeview.h
index cb6da009d..1ea78786b 100644
--- a/src/blackgui/views/aircraftsituationchangeview.h
+++ b/src/gui/views/aircraftsituationchangeview.h
@@ -3,20 +3,20 @@
 
 //! \file
 
-#ifndef BLACKGUI_VIEWS_AIRCRAFTSITUATIONCHANGEVIEW_H
-#define BLACKGUI_VIEWS_AIRCRAFTSITUATIONCHANGEVIEW_H
+#ifndef SWIFT_GUI_VIEWS_AIRCRAFTSITUATIONCHANGEVIEW_H
+#define SWIFT_GUI_VIEWS_AIRCRAFTSITUATIONCHANGEVIEW_H
 
-#include "blackgui/views/viewtimestampobjects.h"
-#include "blackgui/models/aircraftsituationchangelistmodel.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/views/viewtimestampobjects.h"
+#include "gui/models/aircraftsituationchangelistmodel.h"
+#include "gui/swiftguiexport.h"
 #include "misc/aviation/aircraftsituationchangelist.h"
 
 class QWidget;
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     //! Aircraft situation change view
-    class BLACKGUI_EXPORT CAircraftSituationChangeView : public CViewWithTimestampWithOffsetObjects<Models::CAircraftSituationChangeListModel>
+    class SWIFT_GUI_EXPORT CAircraftSituationChangeView : public CViewWithTimestampWithOffsetObjects<models::CAircraftSituationChangeListModel>
     {
         Q_OBJECT
 
diff --git a/src/blackgui/views/aircraftsituationview.cpp b/src/gui/views/aircraftsituationview.cpp
similarity index 89%
rename from src/blackgui/views/aircraftsituationview.cpp
rename to src/gui/views/aircraftsituationview.cpp
index d8b62704a..2fa798e70 100644
--- a/src/blackgui/views/aircraftsituationview.cpp
+++ b/src/gui/views/aircraftsituationview.cpp
@@ -1,14 +1,14 @@
 // SPDX-FileCopyrightText: Copyright (C) 2018 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/views/aircraftsituationview.h"
+#include "gui/views/aircraftsituationview.h"
 
 using namespace swift::misc;
 using namespace swift::misc::aviation;
-using namespace BlackGui::Models;
-using namespace BlackGui::Menus;
+using namespace swift::gui::models;
+using namespace swift::gui::menus;
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     CAircraftSituationView::CAircraftSituationView(QWidget *parent) : CViewWithTimestampWithOffsetObjects(parent)
     {
diff --git a/src/blackgui/views/aircraftsituationview.h b/src/gui/views/aircraftsituationview.h
similarity index 63%
rename from src/blackgui/views/aircraftsituationview.h
rename to src/gui/views/aircraftsituationview.h
index 2a685f5bf..a956a2f2f 100644
--- a/src/blackgui/views/aircraftsituationview.h
+++ b/src/gui/views/aircraftsituationview.h
@@ -3,17 +3,17 @@
 
 //! \file
 
-#ifndef BLACKGUI_VIEWS_AIRCRAFTSITUATIONVIEW_H
-#define BLACKGUI_VIEWS_AIRCRAFTSITUATIONVIEW_H
+#ifndef SWIFT_GUI_VIEWS_AIRCRAFTSITUATIONVIEW_H
+#define SWIFT_GUI_VIEWS_AIRCRAFTSITUATIONVIEW_H
 
-#include "blackgui/views/viewtimestampobjects.h"
-#include "blackgui/models/aircraftsituationlistmodel.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/views/viewtimestampobjects.h"
+#include "gui/models/aircraftsituationlistmodel.h"
+#include "gui/swiftguiexport.h"
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     //! Aircraft situations view
-    class BLACKGUI_EXPORT CAircraftSituationView : public CViewWithTimestampWithOffsetObjects<Models::CAircraftSituationListModel>
+    class SWIFT_GUI_EXPORT CAircraftSituationView : public CViewWithTimestampWithOffsetObjects<models::CAircraftSituationListModel>
     {
         Q_OBJECT
 
@@ -30,7 +30,7 @@ namespace BlackGui::Views
 
     protected:
         //! \copydoc CViewBase::customMenu
-        virtual void customMenu(Menus::CMenuActions &menuActions) override;
+        virtual void customMenu(menus::CMenuActions &menuActions) override;
 
     private:
         //! Request elevation
diff --git a/src/blackgui/views/airlineicaoview.cpp b/src/gui/views/airlineicaoview.cpp
similarity index 69%
rename from src/blackgui/views/airlineicaoview.cpp
rename to src/gui/views/airlineicaoview.cpp
index 3f94b7454..a119fe0d5 100644
--- a/src/blackgui/views/airlineicaoview.cpp
+++ b/src/gui/views/airlineicaoview.cpp
@@ -1,14 +1,14 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/models/airlineicaolistmodel.h"
-#include "blackgui/views/airlineicaoview.h"
-#include "blackgui/views/viewbase.h"
+#include "gui/models/airlineicaolistmodel.h"
+#include "gui/views/airlineicaoview.h"
+#include "gui/views/viewbase.h"
 
 using namespace swift::misc;
-using namespace BlackGui::Models;
+using namespace swift::gui::models;
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     CAirlineIcaoCodeView::CAirlineIcaoCodeView(QWidget *parent) : CViewWithDbObjects(parent)
     {
diff --git a/src/blackgui/views/airlineicaoview.h b/src/gui/views/airlineicaoview.h
similarity index 58%
rename from src/blackgui/views/airlineicaoview.h
rename to src/gui/views/airlineicaoview.h
index c211cfd1a..9647b31c2 100644
--- a/src/blackgui/views/airlineicaoview.h
+++ b/src/gui/views/airlineicaoview.h
@@ -3,12 +3,12 @@
 
 //! \file
 
-#ifndef BLACKGUI_AIRLINEICAOVIEW_H
-#define BLACKGUI_AIRLINEICAOVIEW_H
+#ifndef SWIFT_GUI_AIRLINEICAOVIEW_H
+#define SWIFT_GUI_AIRLINEICAOVIEW_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/models/airlineicaolistmodel.h"
-#include "blackgui/views/viewdbobjects.h"
+#include "gui/swiftguiexport.h"
+#include "gui/models/airlineicaolistmodel.h"
+#include "gui/views/viewdbobjects.h"
 
 class QWidget;
 
@@ -18,11 +18,11 @@ namespace swift::misc::aviation
     class CAirlineIcaoCodeList;
 }
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     //! Aircraft ICAO codes view
-    class BLACKGUI_EXPORT CAirlineIcaoCodeView :
-        public CViewWithDbObjects<Models::CAirlineIcaoCodeListModel>
+    class SWIFT_GUI_EXPORT CAirlineIcaoCodeView :
+        public CViewWithDbObjects<models::CAirlineIcaoCodeListModel>
     {
         Q_OBJECT
 
diff --git a/src/blackgui/views/airportview.cpp b/src/gui/views/airportview.cpp
similarity index 70%
rename from src/blackgui/views/airportview.cpp
rename to src/gui/views/airportview.cpp
index 9e08cf4fc..169072e15 100644
--- a/src/blackgui/views/airportview.cpp
+++ b/src/gui/views/airportview.cpp
@@ -1,13 +1,13 @@
 // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/models/airportlistmodel.h"
-#include "blackgui/views/airportview.h"
+#include "gui/models/airportlistmodel.h"
+#include "gui/views/airportview.h"
 
 using namespace swift::misc;
-using namespace BlackGui::Models;
+using namespace swift::gui::models;
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     CAirportView::CAirportView(QWidget *parent) : CViewBase(parent)
     {
diff --git a/src/blackgui/views/airportview.h b/src/gui/views/airportview.h
similarity index 53%
rename from src/blackgui/views/airportview.h
rename to src/gui/views/airportview.h
index 127a94365..8580e12a1 100644
--- a/src/blackgui/views/airportview.h
+++ b/src/gui/views/airportview.h
@@ -3,17 +3,17 @@
 
 //! \file
 
-#ifndef BLACKGUI_VIEWS_AIRPORTVIEW_H
-#define BLACKGUI_VIEWS_AIRPORTVIEW_H
+#ifndef SWIFT_GUI_VIEWS_AIRPORTVIEW_H
+#define SWIFT_GUI_VIEWS_AIRPORTVIEW_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/models/airportlistmodel.h"
-#include "blackgui/views/viewbase.h"
+#include "gui/swiftguiexport.h"
+#include "gui/models/airportlistmodel.h"
+#include "gui/views/viewbase.h"
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     //! Airports view
-    class BLACKGUI_EXPORT CAirportView : public CViewBase<Models::CAirportListModel>
+    class SWIFT_GUI_EXPORT CAirportView : public CViewBase<models::CAirportListModel>
     {
         Q_OBJECT
 
diff --git a/src/blackgui/views/applicationinfoview.cpp b/src/gui/views/applicationinfoview.cpp
similarity index 96%
rename from src/blackgui/views/applicationinfoview.cpp
rename to src/gui/views/applicationinfoview.cpp
index ef3576904..ed98507f3 100644
--- a/src/blackgui/views/applicationinfoview.cpp
+++ b/src/gui/views/applicationinfoview.cpp
@@ -8,10 +8,10 @@
 #include <QDir>
 
 using namespace swift::misc;
-using namespace BlackGui::Models;
-using namespace BlackGui::Menus;
+using namespace swift::gui::models;
+using namespace swift::gui::menus;
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     CApplicationInfoView::CApplicationInfoView(QWidget *parent) : CViewBase(parent)
     {
diff --git a/src/blackgui/views/applicationinfoview.h b/src/gui/views/applicationinfoview.h
similarity index 65%
rename from src/blackgui/views/applicationinfoview.h
rename to src/gui/views/applicationinfoview.h
index 94e6b2bc4..dce7d8c10 100644
--- a/src/blackgui/views/applicationinfoview.h
+++ b/src/gui/views/applicationinfoview.h
@@ -3,20 +3,20 @@
 
 //! \file
 
-#ifndef BLACKGUI_VIEWS_APPLICATIONINFOVIEW_H
-#define BLACKGUI_VIEWS_APPLICATIONINFOVIEW_H
+#ifndef SWIFT_GUI_VIEWS_APPLICATIONINFOVIEW_H
+#define SWIFT_GUI_VIEWS_APPLICATIONINFOVIEW_H
 
-#include "blackgui/views/viewbase.h"
-#include "blackgui/models/applicationinfolistmodel.h"
-#include "blackgui/menus/menudelegate.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/views/viewbase.h"
+#include "gui/models/applicationinfolistmodel.h"
+#include "gui/menus/menudelegate.h"
+#include "gui/swiftguiexport.h"
 
 #include <QAction>
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     //! Network servers
-    class BLACKGUI_EXPORT CApplicationInfoView : public CViewBase<Models::CApplicationInfoListModel>
+    class SWIFT_GUI_EXPORT CApplicationInfoView : public CViewBase<models::CApplicationInfoListModel>
     {
         Q_OBJECT
 
@@ -35,17 +35,17 @@ namespace BlackGui::Views
     };
 
     //! Menu base class for aircraft model view menus
-    class CApplicationInfoMenu : public Menus::IMenuDelegate
+    class CApplicationInfoMenu : public menus::IMenuDelegate
     {
         Q_OBJECT
 
     public:
         //! Constructor
-        CApplicationInfoMenu(CApplicationInfoView *modelView) : Menus::IMenuDelegate(modelView)
+        CApplicationInfoMenu(CApplicationInfoView *modelView) : menus::IMenuDelegate(modelView)
         {}
 
-        //! \copydoc Menus::IMenuDelegate::customMenu
-        virtual void customMenu(Menus::CMenuActions &menuActions) override;
+        //! \copydoc menus::IMenuDelegate::customMenu
+        virtual void customMenu(menus::CMenuActions &menuActions) override;
 
     private:
         //! Model view
diff --git a/src/blackgui/views/atcstationtreeview.cpp b/src/gui/views/atcstationtreeview.cpp
similarity index 97%
rename from src/blackgui/views/atcstationtreeview.cpp
rename to src/gui/views/atcstationtreeview.cpp
index 46c7f711c..9dfe58584 100644
--- a/src/blackgui/views/atcstationtreeview.cpp
+++ b/src/gui/views/atcstationtreeview.cpp
@@ -1,9 +1,9 @@
 // SPDX-FileCopyrightText: Copyright (C) 2018 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/views/atcstationtreeview.h"
-#include "blackgui/models/atcstationtreemodel.h"
-#include "blackgui/menus/menuaction.h"
+#include "gui/views/atcstationtreeview.h"
+#include "gui/models/atcstationtreemodel.h"
+#include "gui/menus/menuaction.h"
 #include "misc/aviation/atcstationlist.h"
 #include "misc/aviation/callsign.h"
 #include "misc/icons.h"
@@ -17,9 +17,9 @@
 
 using namespace swift::misc;
 using namespace swift::misc::aviation;
-using namespace BlackGui::Models;
+using namespace swift::gui::models;
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     CAtcStationTreeView::CAtcStationTreeView(QWidget *parent) : COverlayMessagesTreeView(parent)
     {
diff --git a/src/blackgui/views/atcstationtreeview.h b/src/gui/views/atcstationtreeview.h
similarity index 84%
rename from src/blackgui/views/atcstationtreeview.h
rename to src/gui/views/atcstationtreeview.h
index d885e5b54..a8fa16432 100644
--- a/src/blackgui/views/atcstationtreeview.h
+++ b/src/gui/views/atcstationtreeview.h
@@ -3,11 +3,11 @@
 
 //! \file
 
-#ifndef BLACKGUI_VIEWS_ATCSTATIONTREEVIEW_H
-#define BLACKGUI_VIEWS_ATCSTATIONTREEVIEW_H
+#ifndef SWIFT_GUI_VIEWS_ATCSTATIONTREEVIEW_H
+#define SWIFT_GUI_VIEWS_ATCSTATIONTREEVIEW_H
 
-#include "blackgui/overlaymessagesframe.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/overlaymessagesframe.h"
+#include "gui/swiftguiexport.h"
 #include "misc/aviation/atcstationlist.h"
 #include "misc/aviation/comsystem.h"
 #include "misc/pq/frequency.h"
@@ -20,18 +20,18 @@
 #include <QMap>
 #include <QModelIndex>
 
-namespace BlackGui
+namespace swift::gui
 {
-    namespace Models
+    namespace models
     {
         class CAtcStationTreeModel;
         class CColumns;
     }
 
-    namespace Views
+    namespace views
     {
         //! ATC stations view
-        class BLACKGUI_EXPORT CAtcStationTreeView : public COverlayMessagesTreeView
+        class SWIFT_GUI_EXPORT CAtcStationTreeView : public COverlayMessagesTreeView
         {
             Q_OBJECT
 
@@ -39,7 +39,7 @@ namespace BlackGui
             //! Constructor
             explicit CAtcStationTreeView(QWidget *parent = nullptr);
 
-            //! \copydoc Models::CAtcStationListModel::changedAtcStationConnectionStatus
+            //! \copydoc models::CAtcStationListModel::changedAtcStationConnectionStatus
             void changedAtcStationConnectionStatus(const swift::misc::aviation::CAtcStation &station, bool added);
 
             //! Update container
@@ -52,7 +52,7 @@ namespace BlackGui
             bool isEmpty() const;
 
             //! Set columns
-            void setColumns(const Models::CColumns &columns);
+            void setColumns(const models::CColumns &columns);
 
             //! Resize all columns
             void fullResizeToContents();
@@ -72,10 +72,10 @@ namespace BlackGui
 
         private:
             //! Used model
-            const Models::CAtcStationTreeModel *stationModel() const;
+            const models::CAtcStationTreeModel *stationModel() const;
 
             //! Used model
-            Models::CAtcStationTreeModel *stationModel();
+            models::CAtcStationTreeModel *stationModel();
 
             //! Resize all columns
             void fullResizeToContentsImpl();
diff --git a/src/blackgui/views/atcstationview.cpp b/src/gui/views/atcstationview.cpp
similarity index 93%
rename from src/blackgui/views/atcstationview.cpp
rename to src/gui/views/atcstationview.cpp
index 7f668ef6f..a82aa8666 100644
--- a/src/blackgui/views/atcstationview.cpp
+++ b/src/gui/views/atcstationview.cpp
@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "config/buildconfig.h"
-#include "blackgui/menus/menuaction.h"
-#include "blackgui/models/atcstationlistmodel.h"
-#include "blackgui/views/atcstationview.h"
+#include "gui/menus/menuaction.h"
+#include "gui/models/atcstationlistmodel.h"
+#include "gui/views/atcstationview.h"
 #include "misc/aviation/atcstationlist.h"
 #include "misc/aviation/callsign.h"
 #include "misc/icons.h"
@@ -15,10 +15,10 @@
 using namespace swift::config;
 using namespace swift::misc;
 using namespace swift::misc::aviation;
-using namespace BlackGui::Models;
-using namespace BlackGui::Menus;
+using namespace swift::gui::models;
+using namespace swift::gui::menus;
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     CAtcStationView::CAtcStationView(QWidget *parent) : CViewWithCallsignObjects(parent)
     {
diff --git a/src/blackgui/views/atcstationview.h b/src/gui/views/atcstationview.h
similarity index 74%
rename from src/blackgui/views/atcstationview.h
rename to src/gui/views/atcstationview.h
index 927e8b8f9..1c74999a4 100644
--- a/src/blackgui/views/atcstationview.h
+++ b/src/gui/views/atcstationview.h
@@ -3,12 +3,12 @@
 
 //! \file
 
-#ifndef BLACKGUI_ATCSTATIONVIEW_H
-#define BLACKGUI_ATCSTATIONVIEW_H
+#ifndef SWIFT_GUI_ATCSTATIONVIEW_H
+#define SWIFT_GUI_ATCSTATIONVIEW_H
 
-#include "blackgui/views/viewcallsignobjects.h"
-#include "blackgui/models/atcstationlistmodel.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/views/viewcallsignobjects.h"
+#include "gui/models/atcstationlistmodel.h"
+#include "gui/swiftguiexport.h"
 #include "misc/aviation/atcstation.h"
 #include "misc/aviation/atcstationlist.h"
 #include "misc/aviation/comsystem.h"
@@ -23,16 +23,16 @@ namespace swift::misc::aviation
 {
     class CCallsign;
 }
-namespace BlackGui
+namespace swift::gui
 {
-    namespace Menus
+    namespace menus
     {
         class CMenuActions;
     }
-    namespace Views
+    namespace views
     {
         //! ATC stations view
-        class BLACKGUI_EXPORT CAtcStationView : public CViewWithCallsignObjects<BlackGui::Models::CAtcStationListModel>
+        class SWIFT_GUI_EXPORT CAtcStationView : public CViewWithCallsignObjects<swift::gui::models::CAtcStationListModel>
         {
             Q_OBJECT
 
@@ -41,9 +41,9 @@ namespace BlackGui
             explicit CAtcStationView(QWidget *parent = nullptr);
 
             //! Set station mode
-            void setStationMode(BlackGui::Models::CAtcStationListModel::AtcStationMode stationMode);
+            void setStationMode(swift::gui::models::CAtcStationListModel::AtcStationMode stationMode);
 
-            //! \copydoc Models::CAtcStationListModel::changedAtcStationConnectionStatus
+            //! \copydoc models::CAtcStationListModel::changedAtcStationConnectionStatus
             void changedAtcStationConnectionStatus(const swift::misc::aviation::CAtcStation &station, bool added);
 
         signals:
@@ -58,7 +58,7 @@ namespace BlackGui
 
         protected:
             //! \copydoc CViewBase::customMenu
-            virtual void customMenu(BlackGui::Menus::CMenuActions &menuActions) override;
+            virtual void customMenu(swift::gui::menus::CMenuActions &menuActions) override;
 
         private:
             void emitTestRequest1kAtcOnlineDummies() { emit this->testRequestDummyAtcOnlineStations(1000); }
diff --git a/src/blackgui/views/audiodeviceinfoview.cpp b/src/gui/views/audiodeviceinfoview.cpp
similarity index 69%
rename from src/blackgui/views/audiodeviceinfoview.cpp
rename to src/gui/views/audiodeviceinfoview.cpp
index 0c8ce032d..b994306b7 100644
--- a/src/blackgui/views/audiodeviceinfoview.cpp
+++ b/src/gui/views/audiodeviceinfoview.cpp
@@ -1,13 +1,13 @@
 // SPDX-FileCopyrightText: Copyright (C) 2019 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/models/audiodeviceinfolistmodel.h"
-#include "blackgui/views/audiodeviceinfoview.h"
+#include "gui/models/audiodeviceinfolistmodel.h"
+#include "gui/views/audiodeviceinfoview.h"
 
 using namespace swift::misc;
-using namespace BlackGui::Models;
+using namespace swift::gui::models;
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     CAudioDeviceInfoView::CAudioDeviceInfoView(QWidget *parent) : CViewBase(parent)
     {
diff --git a/src/blackgui/views/audiodeviceinfoview.h b/src/gui/views/audiodeviceinfoview.h
similarity index 51%
rename from src/blackgui/views/audiodeviceinfoview.h
rename to src/gui/views/audiodeviceinfoview.h
index 09f2540a2..359e5be54 100644
--- a/src/blackgui/views/audiodeviceinfoview.h
+++ b/src/gui/views/audiodeviceinfoview.h
@@ -3,17 +3,17 @@
 
 //! \file
 
-#ifndef BLACKGUI_VIEWS_AUDIODEVICEINFOVIEW_H
-#define BLACKGUI_VIEWS_AUDIODEVICEINFOVIEW_H
+#ifndef SWIFT_GUI_VIEWS_AUDIODEVICEINFOVIEW_H
+#define SWIFT_GUI_VIEWS_AUDIODEVICEINFOVIEW_H
 
-#include "blackgui/models/audiodeviceinfolistmodel.h"
-#include "blackgui/views/viewbase.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/models/audiodeviceinfolistmodel.h"
+#include "gui/views/viewbase.h"
+#include "gui/swiftguiexport.h"
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     //! Audio device view
-    class BLACKGUI_EXPORT CAudioDeviceInfoView : public CViewBase<Models::CAudioDeviceInfoListModel>
+    class SWIFT_GUI_EXPORT CAudioDeviceInfoView : public CViewBase<models::CAudioDeviceInfoListModel>
     {
         Q_OBJECT
 
diff --git a/src/blackgui/views/checkboxdelegate.cpp b/src/gui/views/checkboxdelegate.cpp
similarity index 93%
rename from src/blackgui/views/checkboxdelegate.cpp
rename to src/gui/views/checkboxdelegate.cpp
index 950c4d185..820a6b12a 100644
--- a/src/blackgui/views/checkboxdelegate.cpp
+++ b/src/gui/views/checkboxdelegate.cpp
@@ -1,8 +1,8 @@
 // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/stylesheetutility.h"
-#include "blackgui/views/checkboxdelegate.h"
+#include "gui/stylesheetutility.h"
+#include "gui/views/checkboxdelegate.h"
 
 #include <QAbstractItemModel>
 #include <QCheckBox>
@@ -12,9 +12,9 @@
 #include <Qt>
 #include <QtGlobal>
 
-using namespace BlackGui;
+using namespace swift::gui;
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
 
     CCheckBoxDelegate::CCheckBoxDelegate(QObject *parent) : QItemDelegate(parent)
diff --git a/src/blackgui/views/checkboxdelegate.h b/src/gui/views/checkboxdelegate.h
similarity index 87%
rename from src/blackgui/views/checkboxdelegate.h
rename to src/gui/views/checkboxdelegate.h
index abbd29fd3..53e57576a 100644
--- a/src/blackgui/views/checkboxdelegate.h
+++ b/src/gui/views/checkboxdelegate.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_CCOLUMNCHECKBOXDELEGATE_H
-#define BLACKGUI_CCOLUMNCHECKBOXDELEGATE_H
+#ifndef SWIFT_GUI_CCOLUMNCHECKBOXDELEGATE_H
+#define SWIFT_GUI_CCOLUMNCHECKBOXDELEGATE_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 
 #include <QItemDelegate>
 #include <QObject>
@@ -18,10 +18,10 @@ class QModelIndex;
 class QStyleOptionViewItem;
 class QWidget;
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     //! CheckBox for single column
-    class BLACKGUI_EXPORT CCheckBoxDelegate : public QItemDelegate
+    class SWIFT_GUI_EXPORT CCheckBoxDelegate : public QItemDelegate
     {
         Q_OBJECT
 
diff --git a/src/blackgui/views/clientview.cpp b/src/gui/views/clientview.cpp
similarity index 70%
rename from src/blackgui/views/clientview.cpp
rename to src/gui/views/clientview.cpp
index e669762fb..bd2d485d7 100644
--- a/src/blackgui/views/clientview.cpp
+++ b/src/gui/views/clientview.cpp
@@ -1,13 +1,13 @@
 // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/models/clientlistmodel.h"
-#include "blackgui/views/clientview.h"
+#include "gui/models/clientlistmodel.h"
+#include "gui/views/clientview.h"
 
 using namespace swift::misc;
-using namespace BlackGui::Models;
+using namespace swift::gui::models;
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     CClientView::CClientView(QWidget *parent) : CViewBase(parent)
     {
diff --git a/src/blackgui/views/clientview.h b/src/gui/views/clientview.h
similarity index 59%
rename from src/blackgui/views/clientview.h
rename to src/gui/views/clientview.h
index 0e17c1c4c..7c644b519 100644
--- a/src/blackgui/views/clientview.h
+++ b/src/gui/views/clientview.h
@@ -3,22 +3,22 @@
 
 //! \file
 
-#ifndef BLACKGUI_VIEWS_CLIENTVIEW_H
-#define BLACKGUI_VIEWS_CLIENTVIEW_H
+#ifndef SWIFT_GUI_VIEWS_CLIENTVIEW_H
+#define SWIFT_GUI_VIEWS_CLIENTVIEW_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/models/clientlistmodel.h"
-#include "blackgui/views/viewbase.h"
+#include "gui/swiftguiexport.h"
+#include "gui/models/clientlistmodel.h"
+#include "gui/views/viewbase.h"
 #include "misc/network/clientlist.h"
 
 namespace swift::misc::network
 {
     class CClient;
 }
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     //! Client view
-    class BLACKGUI_EXPORT CClientView : public CViewBase<Models::CClientListModel>
+    class SWIFT_GUI_EXPORT CClientView : public CViewBase<models::CClientListModel>
     {
         Q_OBJECT
 
diff --git a/src/blackgui/views/cloudlayerview.cpp b/src/gui/views/cloudlayerview.cpp
similarity index 70%
rename from src/blackgui/views/cloudlayerview.cpp
rename to src/gui/views/cloudlayerview.cpp
index 7128dbc11..429fddd92 100644
--- a/src/blackgui/views/cloudlayerview.cpp
+++ b/src/gui/views/cloudlayerview.cpp
@@ -1,13 +1,13 @@
 // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/models/cloudlayerlistmodel.h"
-#include "blackgui/views/cloudlayerview.h"
+#include "gui/models/cloudlayerlistmodel.h"
+#include "gui/views/cloudlayerview.h"
 
 using namespace swift::misc;
-using namespace BlackGui::Models;
+using namespace swift::gui::models;
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     CCloudLayerView::CCloudLayerView(QWidget *parent) : CViewBase(parent)
     {
diff --git a/src/blackgui/views/cloudlayerview.h b/src/gui/views/cloudlayerview.h
similarity index 57%
rename from src/blackgui/views/cloudlayerview.h
rename to src/gui/views/cloudlayerview.h
index e401625c1..31f3806c7 100644
--- a/src/blackgui/views/cloudlayerview.h
+++ b/src/gui/views/cloudlayerview.h
@@ -3,12 +3,12 @@
 
 //! \file
 
-#ifndef BLACKGUI_CLOUDLAYERVIEW_H
-#define BLACKGUI_CLOUDLAYERVIEW_H
+#ifndef SWIFT_GUI_CLOUDLAYERVIEW_H
+#define SWIFT_GUI_CLOUDLAYERVIEW_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/models/cloudlayerlistmodel.h"
-#include "blackgui/views/viewbase.h"
+#include "gui/swiftguiexport.h"
+#include "gui/models/cloudlayerlistmodel.h"
+#include "gui/views/viewbase.h"
 
 class QWidget;
 
@@ -17,10 +17,10 @@ namespace swift::misc::weather
     class CCloudLayer;
 }
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     //! Airports view
-    class BLACKGUI_EXPORT CCloudLayerView : public CViewBase<Models::CCloudLayerListModel>
+    class SWIFT_GUI_EXPORT CCloudLayerView : public CViewBase<models::CCloudLayerListModel>
     {
         Q_OBJECT
 
diff --git a/src/blackgui/views/countryview.cpp b/src/gui/views/countryview.cpp
similarity index 78%
rename from src/blackgui/views/countryview.cpp
rename to src/gui/views/countryview.cpp
index 49b8ad067..c54a70101 100644
--- a/src/blackgui/views/countryview.cpp
+++ b/src/gui/views/countryview.cpp
@@ -1,11 +1,11 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/views/countryview.h"
+#include "gui/views/countryview.h"
 
-using namespace BlackGui::Models;
+using namespace swift::gui::models;
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     CCountryView::CCountryView(QWidget *parent) : CViewBase(parent)
     {
diff --git a/src/blackgui/views/countryview.h b/src/gui/views/countryview.h
similarity index 55%
rename from src/blackgui/views/countryview.h
rename to src/gui/views/countryview.h
index b8fa23c37..3a811ad29 100644
--- a/src/blackgui/views/countryview.h
+++ b/src/gui/views/countryview.h
@@ -3,18 +3,18 @@
 
 //! \file
 
-#ifndef BLACKGUI_VIEWS_COUNTRYVIEW_H
-#define BLACKGUI_VIEWS_COUNTRYVIEW_H
+#ifndef SWIFT_GUI_VIEWS_COUNTRYVIEW_H
+#define SWIFT_GUI_VIEWS_COUNTRYVIEW_H
 
-#include "blackgui/views/viewbase.h"
-#include "blackgui/models/countrylistmodel.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/views/viewbase.h"
+#include "gui/models/countrylistmodel.h"
+#include "gui/swiftguiexport.h"
 #include "misc/countrylist.h"
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     //! Countries
-    class BLACKGUI_EXPORT CCountryView : public CViewBase<Models::CCountryListModel>
+    class SWIFT_GUI_EXPORT CCountryView : public CViewBase<models::CCountryListModel>
     {
         Q_OBJECT
 
diff --git a/src/blackgui/views/distributorview.cpp b/src/gui/views/distributorview.cpp
similarity index 79%
rename from src/blackgui/views/distributorview.cpp
rename to src/gui/views/distributorview.cpp
index 056b3f2e6..766acf2b9 100644
--- a/src/blackgui/views/distributorview.cpp
+++ b/src/gui/views/distributorview.cpp
@@ -1,13 +1,13 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/models/distributorlistmodel.h"
-#include "blackgui/views/distributorview.h"
-#include "blackgui/views/viewbase.h"
+#include "gui/models/distributorlistmodel.h"
+#include "gui/views/distributorview.h"
+#include "gui/views/viewbase.h"
 
-using namespace BlackGui::Models;
+using namespace swift::gui::models;
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     CDistributorView::CDistributorView(QWidget *parent) : COrderableViewWithDbObjects(parent)
     {
diff --git a/src/gui/views/distributorview.h b/src/gui/views/distributorview.h
new file mode 100644
index 000000000..2d99b0871
--- /dev/null
+++ b/src/gui/views/distributorview.h
@@ -0,0 +1,41 @@
+// SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
+// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
+
+//! \file
+
+#ifndef SWIFT_GUI_VIEWS_DISTRIBUTORVIEW_H
+#define SWIFT_GUI_VIEWS_DISTRIBUTORVIEW_H
+
+#include "gui/swiftguiexport.h"
+#include "gui/models/distributorlistmodel.h"
+#include "gui/views/viewdbobjects.h"
+
+class QString;
+class QWidget;
+
+namespace swift::misc::simulation
+{
+    class CDistributor;
+    class CDistributorList;
+}
+
+namespace swift::gui::views
+{
+    //! Distributors
+    class SWIFT_GUI_EXPORT CDistributorView :
+        public COrderableViewWithDbObjects<swift::gui::models::CDistributorListModel>
+    {
+        Q_OBJECT
+
+    public:
+        //! Constructor
+        explicit CDistributorView(QWidget *parent = nullptr);
+
+        //! Set mode
+        void setDistributorMode(swift::gui::models::CDistributorListModel::DistributorMode distributorMode);
+
+        //! Mode
+        swift::gui::models::CDistributorListModel::DistributorMode getDistributorMode() const;
+    };
+} // ns
+#endif // guard
diff --git a/src/blackgui/views/flightplandialog.cpp b/src/gui/views/flightplandialog.cpp
similarity index 94%
rename from src/blackgui/views/flightplandialog.cpp
rename to src/gui/views/flightplandialog.cpp
index 10f952f3f..3834b60d1 100644
--- a/src/blackgui/views/flightplandialog.cpp
+++ b/src/gui/views/flightplandialog.cpp
@@ -4,15 +4,15 @@
 #include "flightplandialog.h"
 #include "ui_flightplandialog.h"
 
-#include "blackgui/guiapplication.h"
+#include "gui/guiapplication.h"
 #include "core/context/contextnetwork.h"
 #include "misc/aviation/flightplan.h"
 
 using namespace swift::misc::aviation;
 using namespace swift::core::context;
-using namespace BlackGui::Components;
+using namespace swift::gui::components;
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     CFlightPlanDialog::CFlightPlanDialog(QWidget *parent) : QDialog(parent),
                                                             ui(new Ui::CFlightPlanDialog)
diff --git a/src/blackgui/views/flightplandialog.h b/src/gui/views/flightplandialog.h
similarity index 89%
rename from src/blackgui/views/flightplandialog.h
rename to src/gui/views/flightplandialog.h
index fe44e367f..9569dd447 100644
--- a/src/blackgui/views/flightplandialog.h
+++ b/src/gui/views/flightplandialog.h
@@ -3,8 +3,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_VIEWS_FLIGHTPLANDIALOG_H
-#define BLACKGUI_VIEWS_FLIGHTPLANDIALOG_H
+#ifndef SWIFT_GUI_VIEWS_FLIGHTPLANDIALOG_H
+#define SWIFT_GUI_VIEWS_FLIGHTPLANDIALOG_H
 
 #include "misc/aviation/callsign.h"
 
@@ -15,7 +15,7 @@ namespace Ui
 {
     class CFlightPlanDialog;
 }
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     //! Flight plan as dialog, also meant for other callsigns
     class CFlightPlanDialog : public QDialog
diff --git a/src/blackgui/views/flightplandialog.ui b/src/gui/views/flightplandialog.ui
similarity index 92%
rename from src/blackgui/views/flightplandialog.ui
rename to src/gui/views/flightplandialog.ui
index 48f3bdcaf..ab4950079 100644
--- a/src/blackgui/views/flightplandialog.ui
+++ b/src/gui/views/flightplandialog.ui
@@ -21,7 +21,7 @@
     <widget class="QWidget" name="wi_Buttons" native="true">
      <layout class="QHBoxLayout" name="hl_Buttons">
       <item>
-       <widget class="BlackGui::Components::CCallsignCompleter" name="comp_CallsignCompleter">
+       <widget class="swift::gui::components::CCallsignCompleter" name="comp_CallsignCompleter">
         <property name="sizePolicy">
          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
           <horstretch>0</horstretch>
@@ -60,9 +60,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CCallsignCompleter</class>
+   <class>swift::gui::components::CCallsignCompleter</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/callsigncompleter.h</header>
+   <header>gui/components/callsigncompleter.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/blackgui/views/identifierview.cpp b/src/gui/views/identifierview.cpp
similarity index 70%
rename from src/blackgui/views/identifierview.cpp
rename to src/gui/views/identifierview.cpp
index 84304955c..7dfd9f9f8 100644
--- a/src/blackgui/views/identifierview.cpp
+++ b/src/gui/views/identifierview.cpp
@@ -1,13 +1,13 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/models/identifierlistmodel.h"
-#include "blackgui/views/identifierview.h"
+#include "gui/models/identifierlistmodel.h"
+#include "gui/views/identifierview.h"
 
 using namespace swift::misc;
-using namespace BlackGui::Models;
+using namespace swift::gui::models;
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     CIdentifierView::CIdentifierView(QWidget *parent) : CViewBase(parent)
     {
diff --git a/src/blackgui/views/identifierview.h b/src/gui/views/identifierview.h
similarity index 58%
rename from src/blackgui/views/identifierview.h
rename to src/gui/views/identifierview.h
index b2cf9e2c8..1c375ed0c 100644
--- a/src/blackgui/views/identifierview.h
+++ b/src/gui/views/identifierview.h
@@ -3,22 +3,22 @@
 
 //! \file
 
-#ifndef BLACKGUI_IDENTIFIERVIEW_H
-#define BLACKGUI_IDENTIFIERVIEW_H
+#ifndef SWIFT_GUI_IDENTIFIERVIEW_H
+#define SWIFT_GUI_IDENTIFIERVIEW_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/models/identifierlistmodel.h"
-#include "blackgui/views/viewbase.h"
+#include "gui/swiftguiexport.h"
+#include "gui/models/identifierlistmodel.h"
+#include "gui/views/viewbase.h"
 #include "misc/identifierlist.h"
 
 namespace swift::misc
 {
     class CIdentifier;
 }
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     //! Originator servers
-    class BLACKGUI_EXPORT CIdentifierView : public CViewBase<Models::CIdentifierListModel>
+    class SWIFT_GUI_EXPORT CIdentifierView : public CViewBase<models::CIdentifierListModel>
     {
         Q_OBJECT
 
diff --git a/src/blackgui/views/interpolationsetupview.cpp b/src/gui/views/interpolationsetupview.cpp
similarity index 87%
rename from src/blackgui/views/interpolationsetupview.cpp
rename to src/gui/views/interpolationsetupview.cpp
index f57b113ab..c3d45b9e1 100644
--- a/src/blackgui/views/interpolationsetupview.cpp
+++ b/src/gui/views/interpolationsetupview.cpp
@@ -3,9 +3,9 @@
 
 #include "interpolationsetupview.h"
 
-using namespace BlackGui::Models;
+using namespace swift::gui::models;
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     CInterpolationSetupView::CInterpolationSetupView(QWidget *parent) : CViewWithCallsignObjects(parent)
     {
diff --git a/src/blackgui/views/interpolationsetupview.h b/src/gui/views/interpolationsetupview.h
similarity index 51%
rename from src/blackgui/views/interpolationsetupview.h
rename to src/gui/views/interpolationsetupview.h
index 115b065e1..1ec816b10 100644
--- a/src/blackgui/views/interpolationsetupview.h
+++ b/src/gui/views/interpolationsetupview.h
@@ -3,20 +3,20 @@
 
 //! \file
 
-#ifndef BLACKGUI_VIEWS_INTERPOLATIONSETUPVIEW_H
-#define BLACKGUI_VIEWS_INTERPOLATIONSETUPVIEW_H
+#ifndef SWIFT_GUI_VIEWS_INTERPOLATIONSETUPVIEW_H
+#define SWIFT_GUI_VIEWS_INTERPOLATIONSETUPVIEW_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/models/interpolationsetupmodel.h"
-#include "blackgui/views/viewcallsignobjects.h"
+#include "gui/swiftguiexport.h"
+#include "gui/models/interpolationsetupmodel.h"
+#include "gui/views/viewcallsignobjects.h"
 #include "misc/countrylist.h"
 
 class QWidget;
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     //! Distributors
-    class BLACKGUI_EXPORT CInterpolationSetupView : public CViewWithCallsignObjects<Models::CInterpolationSetupListModel>
+    class SWIFT_GUI_EXPORT CInterpolationSetupView : public CViewWithCallsignObjects<models::CInterpolationSetupListModel>
     {
         Q_OBJECT
 
diff --git a/src/blackgui/views/liveryview.cpp b/src/gui/views/liveryview.cpp
similarity index 73%
rename from src/blackgui/views/liveryview.cpp
rename to src/gui/views/liveryview.cpp
index 1ef5fd127..22a17917b 100644
--- a/src/blackgui/views/liveryview.cpp
+++ b/src/gui/views/liveryview.cpp
@@ -1,12 +1,12 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/views/liveryview.h"
-#include "blackgui/views/viewbase.h"
+#include "gui/views/liveryview.h"
+#include "gui/views/viewbase.h"
 
-using namespace BlackGui::Models;
+using namespace swift::gui::models;
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     CLiveryView::CLiveryView(QWidget *parent) : CViewWithDbObjects(parent)
     {
diff --git a/src/blackgui/views/liveryview.h b/src/gui/views/liveryview.h
similarity index 52%
rename from src/blackgui/views/liveryview.h
rename to src/gui/views/liveryview.h
index 6203ed938..b0e0830be 100644
--- a/src/blackgui/views/liveryview.h
+++ b/src/gui/views/liveryview.h
@@ -3,18 +3,18 @@
 
 //! \file
 
-#ifndef BLACKGUI_VIEWS_LIVERYVIEW_H
-#define BLACKGUI_VIEWS_LIVERYVIEW_H
+#ifndef SWIFT_GUI_VIEWS_LIVERYVIEW_H
+#define SWIFT_GUI_VIEWS_LIVERYVIEW_H
 
-#include "blackgui/views/viewdbobjects.h"
-#include "blackgui/models/liverylistmodel.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/views/viewdbobjects.h"
+#include "gui/models/liverylistmodel.h"
+#include "gui/swiftguiexport.h"
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     //! Distributors
-    class BLACKGUI_EXPORT CLiveryView :
-        public CViewWithDbObjects<Models::CLiveryListModel>
+    class SWIFT_GUI_EXPORT CLiveryView :
+        public CViewWithDbObjects<models::CLiveryListModel>
     {
         Q_OBJECT
 
diff --git a/src/blackgui/views/matchingstatisticsview.cpp b/src/gui/views/matchingstatisticsview.cpp
similarity index 90%
rename from src/blackgui/views/matchingstatisticsview.cpp
rename to src/gui/views/matchingstatisticsview.cpp
index d7c9057b5..4ef16533d 100644
--- a/src/blackgui/views/matchingstatisticsview.cpp
+++ b/src/gui/views/matchingstatisticsview.cpp
@@ -3,9 +3,9 @@
 
 #include "matchingstatisticsview.h"
 
-using namespace BlackGui::Models;
+using namespace swift::gui::models;
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     CMatchingStatisticsView::CMatchingStatisticsView(QWidget *parent) : CViewBase(parent)
     {
diff --git a/src/blackgui/views/matchingstatisticsview.h b/src/gui/views/matchingstatisticsview.h
similarity index 53%
rename from src/blackgui/views/matchingstatisticsview.h
rename to src/gui/views/matchingstatisticsview.h
index 7d83c3a61..2e1542185 100644
--- a/src/blackgui/views/matchingstatisticsview.h
+++ b/src/gui/views/matchingstatisticsview.h
@@ -3,20 +3,20 @@
 
 //! \file
 
-#ifndef BLACKGUI_VIEWS_MATCHINGSTATISTICSVIEW_H
-#define BLACKGUI_VIEWS_MATCHINGSTATISTICSVIEW_H
+#ifndef SWIFT_GUI_VIEWS_MATCHINGSTATISTICSVIEW_H
+#define SWIFT_GUI_VIEWS_MATCHINGSTATISTICSVIEW_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/models/matchingstatisticsmodel.h"
-#include "blackgui/views/viewbase.h"
+#include "gui/swiftguiexport.h"
+#include "gui/models/matchingstatisticsmodel.h"
+#include "gui/views/viewbase.h"
 #include "misc/network/serverlist.h"
 
 class QWidget;
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     //! Matching statistics
-    class BLACKGUI_EXPORT CMatchingStatisticsView : public CViewBase<Models::CMatchingStatisticsModel>
+    class SWIFT_GUI_EXPORT CMatchingStatisticsView : public CViewBase<models::CMatchingStatisticsModel>
     {
         Q_OBJECT
 
@@ -25,7 +25,7 @@ namespace BlackGui::Views
         explicit CMatchingStatisticsView(QWidget *parent = nullptr);
 
         //! Set vie mode
-        void setStatisticsModelMode(Models::CMatchingStatisticsModel::MatchingStatisticsMode mode);
+        void setStatisticsModelMode(models::CMatchingStatisticsModel::MatchingStatisticsMode mode);
     };
 } // ns
 #endif // guard
diff --git a/src/blackgui/views/namevariantpairview.cpp b/src/gui/views/namevariantpairview.cpp
similarity index 88%
rename from src/blackgui/views/namevariantpairview.cpp
rename to src/gui/views/namevariantpairview.cpp
index bf7ed0860..35e7167d2 100644
--- a/src/blackgui/views/namevariantpairview.cpp
+++ b/src/gui/views/namevariantpairview.cpp
@@ -1,15 +1,15 @@
 // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/models/namevariantpairlistmodel.h"
-#include "blackgui/views/namevariantpairview.h"
+#include "gui/models/namevariantpairlistmodel.h"
+#include "gui/views/namevariantpairview.h"
 
 #include <QtGlobal>
 
 using namespace swift::misc;
-using namespace BlackGui::Models;
+using namespace swift::gui::models;
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     CNameVariantPairView::CNameVariantPairView(QWidget *parent) : CViewBase(parent)
     {
diff --git a/src/blackgui/views/namevariantpairview.h b/src/gui/views/namevariantpairview.h
similarity index 75%
rename from src/blackgui/views/namevariantpairview.h
rename to src/gui/views/namevariantpairview.h
index 001e2f0e0..efb2d2137 100644
--- a/src/blackgui/views/namevariantpairview.h
+++ b/src/gui/views/namevariantpairview.h
@@ -3,12 +3,12 @@
 
 //! \file
 
-#ifndef BLACKGUI_NAMEVARIANTPAIRVIEW_H
-#define BLACKGUI_NAMEVARIANTPAIRVIEW_H
+#ifndef SWIFT_GUI_NAMEVARIANTPAIRVIEW_H
+#define SWIFT_GUI_NAMEVARIANTPAIRVIEW_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/models/namevariantpairlistmodel.h"
-#include "blackgui/views/viewbase.h"
+#include "gui/swiftguiexport.h"
+#include "gui/models/namevariantpairlistmodel.h"
+#include "gui/views/viewbase.h"
 #include "misc/icon.h"
 #include "misc/namevariantpairlist.h"
 #include "misc/variant.h"
@@ -19,10 +19,10 @@ namespace swift::misc
 {
     class CNameVariantPair;
 }
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     //! User view
-    class BLACKGUI_EXPORT CNameVariantPairView : public CViewBase<Models::CNameVariantPairModel>
+    class SWIFT_GUI_EXPORT CNameVariantPairView : public CViewBase<models::CNameVariantPairModel>
     {
         Q_OBJECT
 
diff --git a/src/blackgui/views/radarview.cpp b/src/gui/views/radarview.cpp
similarity index 96%
rename from src/blackgui/views/radarview.cpp
rename to src/gui/views/radarview.cpp
index 442ce2c9a..5c50559a0 100644
--- a/src/blackgui/views/radarview.cpp
+++ b/src/gui/views/radarview.cpp
@@ -6,7 +6,7 @@
 #include <QResizeEvent>
 #include <QWheelEvent>
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     CRadarView::CRadarView(QWidget *parent) : QGraphicsView(parent)
     {
diff --git a/src/blackgui/views/radarview.h b/src/gui/views/radarview.h
similarity index 81%
rename from src/blackgui/views/radarview.h
rename to src/gui/views/radarview.h
index 9ca76a665..f8546a2ad 100644
--- a/src/blackgui/views/radarview.h
+++ b/src/gui/views/radarview.h
@@ -3,16 +3,16 @@
 
 //! \file
 
-#ifndef BLACKGUI_RADARVIEW_H
-#define BLACKGUI_RADARVIEW_H
+#ifndef SWIFT_GUI_RADARVIEW_H
+#define SWIFT_GUI_RADARVIEW_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include <QGraphicsView>
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     //! Radar view
-    class BLACKGUI_EXPORT CRadarView : public QGraphicsView
+    class SWIFT_GUI_EXPORT CRadarView : public QGraphicsView
     {
         Q_OBJECT
 
diff --git a/src/blackgui/views/serverview.cpp b/src/gui/views/serverview.cpp
similarity index 85%
rename from src/blackgui/views/serverview.cpp
rename to src/gui/views/serverview.cpp
index 7ce64ebe8..58db05434 100644
--- a/src/blackgui/views/serverview.cpp
+++ b/src/gui/views/serverview.cpp
@@ -4,9 +4,9 @@
 #include "serverview.h"
 
 using namespace swift::misc;
-using namespace BlackGui::Models;
+using namespace swift::gui::models;
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     CServerView::CServerView(QWidget *parent) : CViewBase(parent)
     {
diff --git a/src/blackgui/views/serverview.h b/src/gui/views/serverview.h
similarity index 55%
rename from src/blackgui/views/serverview.h
rename to src/gui/views/serverview.h
index e96d420ea..32e36f2fd 100644
--- a/src/blackgui/views/serverview.h
+++ b/src/gui/views/serverview.h
@@ -3,19 +3,19 @@
 
 //! \file
 
-#ifndef BLACKGUI_VIEWS_SERVERVIEW_H
-#define BLACKGUI_VIEWS_SERVERVIEW_H
+#ifndef SWIFT_GUI_VIEWS_SERVERVIEW_H
+#define SWIFT_GUI_VIEWS_SERVERVIEW_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/views/viewbase.h"
-#include "blackgui/models/serverlistmodel.h"
+#include "gui/swiftguiexport.h"
+#include "gui/views/viewbase.h"
+#include "gui/models/serverlistmodel.h"
 
 class QWidget;
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     //! Network servers
-    class BLACKGUI_EXPORT CServerView : public CViewBase<Models::CServerListModel>
+    class SWIFT_GUI_EXPORT CServerView : public CViewBase<models::CServerListModel>
     {
         Q_OBJECT
 
diff --git a/src/blackgui/views/simulatedaircraftview.cpp b/src/gui/views/simulatedaircraftview.cpp
similarity index 98%
rename from src/blackgui/views/simulatedaircraftview.cpp
rename to src/gui/views/simulatedaircraftview.cpp
index 39bc19cc9..0d4ba8fb4 100644
--- a/src/blackgui/views/simulatedaircraftview.cpp
+++ b/src/gui/views/simulatedaircraftview.cpp
@@ -2,10 +2,10 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "simulatedaircraftview.h"
-#include "blackgui/views/flightplandialog.h"
-#include "blackgui/models/simulatedaircraftlistmodel.h"
-#include "blackgui/menus/menuaction.h"
-#include "blackgui/guiapplication.h"
+#include "gui/views/flightplandialog.h"
+#include "gui/models/simulatedaircraftlistmodel.h"
+#include "gui/menus/menuaction.h"
+#include "gui/guiapplication.h"
 #include "core/context/contextsimulator.h"
 #include "core/context/contextnetwork.h"
 #include "misc/simulation/simulatedaircraftlist.h"
@@ -23,10 +23,10 @@ using namespace swift::misc::physical_quantities;
 using namespace swift::misc::aviation;
 using namespace swift::misc::simulation;
 using namespace swift::core::context;
-using namespace BlackGui::Models;
-using namespace BlackGui::Menus;
+using namespace swift::gui::models;
+using namespace swift::gui::menus;
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     CSimulatedAircraftView::CSimulatedAircraftView(QWidget *parent) : CViewWithCallsignObjects(parent)
     {
diff --git a/src/blackgui/views/simulatedaircraftview.h b/src/gui/views/simulatedaircraftview.h
similarity index 90%
rename from src/blackgui/views/simulatedaircraftview.h
rename to src/gui/views/simulatedaircraftview.h
index a00525324..fe871c697 100644
--- a/src/blackgui/views/simulatedaircraftview.h
+++ b/src/gui/views/simulatedaircraftview.h
@@ -3,12 +3,12 @@
 
 //! \file
 
-#ifndef BLACKGUI_VIEWS_SIMULATEDAIRCRAFTVIEW_H
-#define BLACKGUI_VIEWS_SIMULATEDAIRCRAFTVIEW_H
+#ifndef SWIFT_GUI_VIEWS_SIMULATEDAIRCRAFTVIEW_H
+#define SWIFT_GUI_VIEWS_SIMULATEDAIRCRAFTVIEW_H
 
-#include "blackgui/views/viewcallsignobjects.h"
-#include "blackgui/models/simulatedaircraftlistmodel.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/views/viewcallsignobjects.h"
+#include "gui/models/simulatedaircraftlistmodel.h"
+#include "gui/swiftguiexport.h"
 #include "misc/simulation/simulatedaircraftlist.h"
 #include "misc/pq/angle.h"
 
@@ -31,19 +31,19 @@ namespace swift::core::context
     class IContextSimulator;
     class IContextNetwork;
 }
-namespace BlackGui
+namespace swift::gui
 {
-    namespace Menus
+    namespace menus
     {
         class CMenuActions;
     }
-    namespace Views
+    namespace views
     {
         class CFlightPlanDialog;
 
         //! Aircraft view
-        class BLACKGUI_EXPORT CSimulatedAircraftView :
-            public CViewWithCallsignObjects<Models::CSimulatedAircraftListModel>
+        class SWIFT_GUI_EXPORT CSimulatedAircraftView :
+            public CViewWithCallsignObjects<models::CSimulatedAircraftListModel>
         {
             Q_OBJECT
 
@@ -52,7 +52,7 @@ namespace BlackGui
             explicit CSimulatedAircraftView(QWidget *parent = nullptr);
 
             //! Mode
-            void setAircraftMode(Models::CSimulatedAircraftListModel::AircraftMode mode);
+            void setAircraftMode(models::CSimulatedAircraftListModel::AircraftMode mode);
 
             //! Configure the menu
             void configureMenu(bool menuRecalculate, bool menuHighlightAndFollow, bool menuEnableAircraft, bool menuFastPositionUpdates, bool menuGndFlag, bool menuFlightPlan);
@@ -69,7 +69,7 @@ namespace BlackGui
 
         protected:
             //! \copydoc CViewBase::customMenu
-            virtual void customMenu(Menus::CMenuActions &menuActions) override;
+            virtual void customMenu(menus::CMenuActions &menuActions) override;
 
         private:
             //! Request text message for selected aircraft
diff --git a/src/blackgui/views/statusmessageview.cpp b/src/gui/views/statusmessageview.cpp
similarity index 88%
rename from src/blackgui/views/statusmessageview.cpp
rename to src/gui/views/statusmessageview.cpp
index 1a7009137..b49291e76 100644
--- a/src/blackgui/views/statusmessageview.cpp
+++ b/src/gui/views/statusmessageview.cpp
@@ -1,16 +1,16 @@
 // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/models/statusmessagelistmodel.h"
-#include "blackgui/views/statusmessageview.h"
-#include "blackgui/filters/statusmessagefilterdialog.h"
+#include "gui/models/statusmessagelistmodel.h"
+#include "gui/views/statusmessageview.h"
+#include "gui/filters/statusmessagefilterdialog.h"
 #include <QFlags>
 
 using namespace swift::misc;
-using namespace BlackGui::Models;
-using namespace BlackGui::Filters;
+using namespace swift::gui::models;
+using namespace swift::gui::filters;
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     CStatusMessageView::CStatusMessageView(QWidget *parent) : CViewBase(parent)
     {
diff --git a/src/blackgui/views/statusmessageview.h b/src/gui/views/statusmessageview.h
similarity index 58%
rename from src/blackgui/views/statusmessageview.h
rename to src/gui/views/statusmessageview.h
index 1b42c7b54..5ffd5089e 100644
--- a/src/blackgui/views/statusmessageview.h
+++ b/src/gui/views/statusmessageview.h
@@ -3,27 +3,27 @@
 
 //! \file
 
-#ifndef BLACKGUI_VIEWS_STATUSMESSAGEVIEW_H
-#define BLACKGUI_VIEWS_STATUSMESSAGEVIEW_H
+#ifndef SWIFT_GUI_VIEWS_STATUSMESSAGEVIEW_H
+#define SWIFT_GUI_VIEWS_STATUSMESSAGEVIEW_H
 
-#include "blackgui/views/viewbase.h"
-#include "blackgui/models/statusmessagelistmodel.h"
+#include "gui/views/viewbase.h"
+#include "gui/models/statusmessagelistmodel.h"
 #include "misc/statusmessagelist.h"
 #include "misc/statusmessage.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 
 #include <QObject>
 
-namespace BlackGui
+namespace swift::gui
 {
-    namespace Filters
+    namespace filters
     {
         class CStatusMessageFilterDialog;
     }
-    namespace Views
+    namespace views
     {
         //! Status message view
-        class BLACKGUI_EXPORT CStatusMessageView : public CViewBase<Models::CStatusMessageListModel>
+        class SWIFT_GUI_EXPORT CStatusMessageView : public CViewBase<models::CStatusMessageListModel>
         {
             Q_OBJECT
 
@@ -32,15 +32,15 @@ namespace BlackGui
             explicit CStatusMessageView(QWidget *parent = nullptr);
 
             //! Set mode
-            void setMode(Models::CStatusMessageListModel::Mode mode);
+            void setMode(models::CStatusMessageListModel::Mode mode);
 
             //! Set mode and adjust order/no order
-            void setMode(Models::CStatusMessageListModel::Mode mode, const swift::misc::CStatusMessageList &messages);
+            void setMode(models::CStatusMessageListModel::Mode mode, const swift::misc::CStatusMessageList &messages);
 
-            //! \copydoc BlackGui::Models::CStatusMessageListModel::adjustOrderColumn
+            //! \copydoc swift::gui::models::CStatusMessageListModel::adjustOrderColumn
             void adjustOrderColumn(const swift::misc::CStatusMessageList &messages);
 
-            //! \copydoc BlackGui::Models::CStatusMessageListModel::isSortedByTimestampOrOrder
+            //! \copydoc swift::gui::models::CStatusMessageListModel::isSortedByTimestampOrOrder
             bool isSortedByTimestampOrOrder() const;
 
             //! \copydoc swift::misc::CStatusMessageList::keepLatest
@@ -50,7 +50,7 @@ namespace BlackGui
             void addFilterDialog();
 
             //! Filter dialog if any
-            Filters::CStatusMessageFilterDialog *getFilterDialog() const;
+            filters::CStatusMessageFilterDialog *getFilterDialog() const;
         };
     } // ns
 } // ns
diff --git a/src/blackgui/views/textmessageview.cpp b/src/gui/views/textmessageview.cpp
similarity index 86%
rename from src/blackgui/views/textmessageview.cpp
rename to src/gui/views/textmessageview.cpp
index 57a2ae17b..98b373a7f 100644
--- a/src/blackgui/views/textmessageview.cpp
+++ b/src/gui/views/textmessageview.cpp
@@ -1,15 +1,15 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/models/textmessagelistmodel.h"
-#include "blackgui/views/textmessageview.h"
+#include "gui/models/textmessagelistmodel.h"
+#include "gui/views/textmessageview.h"
 
 #include <QtGlobal>
 
 using namespace swift::misc;
-using namespace BlackGui::Models;
+using namespace swift::gui::models;
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     CTextMessageView::CTextMessageView(QWidget *parent) : CViewBase(parent)
     {
diff --git a/src/blackgui/views/textmessageview.h b/src/gui/views/textmessageview.h
similarity index 63%
rename from src/blackgui/views/textmessageview.h
rename to src/gui/views/textmessageview.h
index 659d50c57..59bd713fb 100644
--- a/src/blackgui/views/textmessageview.h
+++ b/src/gui/views/textmessageview.h
@@ -3,22 +3,22 @@
 
 //! \file
 
-#ifndef BLACKGUI_TEXTMESSAGEVIEW_H
-#define BLACKGUI_TEXTMESSAGEVIEW_H
+#ifndef SWIFT_GUI_TEXTMESSAGEVIEW_H
+#define SWIFT_GUI_TEXTMESSAGEVIEW_H
 
-#include "blackgui/views/viewbase.h"
-#include "blackgui/models/textmessagelistmodel.h"
+#include "gui/views/viewbase.h"
+#include "gui/models/textmessagelistmodel.h"
 #include "misc/network/textmessagelist.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 
 namespace swift::misc::network
 {
     class CTextMessage;
 }
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     //! Airports view
-    class BLACKGUI_EXPORT CTextMessageView : public CViewBase<Models::CTextMessageListModel>
+    class SWIFT_GUI_EXPORT CTextMessageView : public CViewBase<models::CTextMessageListModel>
     {
         Q_OBJECT
 
@@ -27,7 +27,7 @@ namespace BlackGui::Views
         explicit CTextMessageView(QWidget *parent = nullptr);
 
         //! Set display mode
-        void setTextMessageMode(BlackGui::Models::CTextMessageListModel::TextMessageMode mode);
+        void setTextMessageMode(swift::gui::models::CTextMessageListModel::TextMessageMode mode);
 
         //! Sorted by a timestamp property
         bool isSortedByTimestampProperty() const;
diff --git a/src/blackgui/views/userview.cpp b/src/gui/views/userview.cpp
similarity index 87%
rename from src/blackgui/views/userview.cpp
rename to src/gui/views/userview.cpp
index 454a94ed5..b2c44d791 100644
--- a/src/blackgui/views/userview.cpp
+++ b/src/gui/views/userview.cpp
@@ -1,17 +1,17 @@
 // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/views/userview.h"
-#include "blackgui/models/userlistmodel.h"
+#include "gui/views/userview.h"
+#include "gui/models/userlistmodel.h"
 
 #include <QtGlobal>
 
 using namespace swift::misc;
 using namespace swift::misc::network;
-using namespace BlackGui::Models;
-using namespace BlackGui::Menus;
+using namespace swift::gui::models;
+using namespace swift::gui::menus;
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     CUserView::CUserView(QWidget *parent) : CViewBase(parent)
     {
diff --git a/src/blackgui/views/userview.h b/src/gui/views/userview.h
similarity index 65%
rename from src/blackgui/views/userview.h
rename to src/gui/views/userview.h
index f62079620..f8cb7b5c0 100644
--- a/src/blackgui/views/userview.h
+++ b/src/gui/views/userview.h
@@ -3,22 +3,22 @@
 
 //! \file
 
-#ifndef BLACKGUI_USERVIEW_H
-#define BLACKGUI_USERVIEW_H
+#ifndef SWIFT_GUI_USERVIEW_H
+#define SWIFT_GUI_USERVIEW_H
 
-#include "blackgui/views/viewbase.h"
-#include "blackgui/models/userlistmodel.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/views/viewbase.h"
+#include "gui/models/userlistmodel.h"
+#include "gui/swiftguiexport.h"
 #include "misc/network/userlist.h"
 
 namespace swift::misc::network
 {
     class CUser;
 }
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     //! User view
-    class BLACKGUI_EXPORT CUserView : public CViewBase<Models::CUserListModel>
+    class SWIFT_GUI_EXPORT CUserView : public CViewBase<models::CUserListModel>
     {
         Q_OBJECT
 
@@ -27,7 +27,7 @@ namespace BlackGui::Views
         explicit CUserView(QWidget *parent = nullptr);
 
         //! Set user mode
-        void setUserMode(Models::CUserListModel::UserMode userMode);
+        void setUserMode(models::CUserListModel::UserMode userMode);
 
     signals:
         //! Request a text message
@@ -35,7 +35,7 @@ namespace BlackGui::Views
 
     protected:
         //! \copydoc CViewBase::customMenu
-        virtual void customMenu(Menus::CMenuActions &menuActions) override;
+        virtual void customMenu(menus::CMenuActions &menuActions) override;
 
     private:
         //! Request text message for selected aircraft
diff --git a/src/blackgui/views/viewbase.cpp b/src/gui/views/viewbase.cpp
similarity index 98%
rename from src/blackgui/views/viewbase.cpp
rename to src/gui/views/viewbase.cpp
index 551b9ef66..ce7739998 100644
--- a/src/blackgui/views/viewbase.cpp
+++ b/src/gui/views/viewbase.cpp
@@ -1,12 +1,12 @@
 // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/guiutility.h"
-#include "blackgui/views/viewbase.h"
-#include "blackgui/views/viewbaseproxystyle.h"
-#include "blackgui/views/viewbaseitemdelegate.h"
-#include "blackgui/models/allmodels.h"
-#include "blackgui/components/texteditdialog.h"
+#include "gui/guiutility.h"
+#include "gui/views/viewbase.h"
+#include "gui/views/viewbaseproxystyle.h"
+#include "gui/views/viewbaseitemdelegate.h"
+#include "gui/models/allmodels.h"
+#include "gui/components/texteditdialog.h"
 #include "misc/worker.h"
 #include "config/buildconfig.h"
 
@@ -17,14 +17,14 @@
 #include <QStringBuilder>
 
 using namespace swift::misc;
-using namespace BlackGui;
-using namespace BlackGui::Menus;
-using namespace BlackGui::Models;
-using namespace BlackGui::Filters;
-using namespace BlackGui::Settings;
-using namespace BlackGui::Components;
+using namespace swift::gui;
+using namespace swift::gui::menus;
+using namespace swift::gui::models;
+using namespace swift::gui::filters;
+using namespace swift::gui::settings;
+using namespace swift::gui::components;
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     template <class T>
     CViewBase<T>::CViewBase(QWidget *parent, ModelClass *model) : CViewBaseNonTemplate(parent), m_model(model)
@@ -530,7 +530,7 @@ namespace BlackGui::Views
     }
 
     template <class T>
-    void CViewBase<T>::takeFilterOwnership(std::unique_ptr<BlackGui::Models::IModelFilter<ContainerType>> &filter)
+    void CViewBase<T>::takeFilterOwnership(std::unique_ptr<swift::gui::models::IModelFilter<ContainerType>> &filter)
     {
         this->derivedModel()->takeFilterOwnership(filter);
     }
diff --git a/src/blackgui/views/viewbase.h b/src/gui/views/viewbase.h
similarity index 83%
rename from src/blackgui/views/viewbase.h
rename to src/gui/views/viewbase.h
index 136d9bf50..096aed0f5 100644
--- a/src/blackgui/views/viewbase.h
+++ b/src/gui/views/viewbase.h
@@ -3,16 +3,16 @@
 
 //! \file
 
-#ifndef BLACKGUI_VIEWBASE_H
-#define BLACKGUI_VIEWBASE_H
+#ifndef SWIFT_GUI_VIEWBASE_H
+#define SWIFT_GUI_VIEWBASE_H
 
-#include "blackgui/models/modelfilter.h"
-#include "blackgui/models/selectionmodel.h"
-#include "blackgui/settings/guisettings.h"
-#include "blackgui/menus/menuaction.h"
-#include "blackgui/overlaymessagesframe.h"
-#include "blackgui/enablefordockwidgetinfoarea.h"
-#include "blackgui/blackguiexport.h"
+#include "gui/models/modelfilter.h"
+#include "gui/models/selectionmodel.h"
+#include "gui/settings/guisettings.h"
+#include "gui/menus/menuaction.h"
+#include "gui/overlaymessagesframe.h"
+#include "gui/enablefordockwidgetinfoarea.h"
+#include "gui/swiftguiexport.h"
 #include "misc/namevariantpairlist.h"
 #include "misc/directories.h"
 #include "misc/statusmessage.h"
@@ -50,37 +50,37 @@ namespace swift::misc
 {
     class CWorker;
 }
-namespace BlackGui
+namespace swift::gui
 {
     class CDockWidgetInfoArea;
     class CLoadIndicator;
 
-    namespace Menus
+    namespace menus
     {
         class IMenuDelegate;
         class CFontMenu;
     }
 
-    namespace Models
+    namespace models
     {
         class CColumns;
     }
 
-    namespace Filters
+    namespace filters
     {
         class CFilterDialog;
         class CFilterWidget;
     }
 
-    namespace Components
+    namespace components
     {
         class CTextEditDialog;
     }
 
-    namespace Views
+    namespace views
     {
         //! Non templated base class, allows Q_OBJECT and signals / slots to be used
-        class BLACKGUI_EXPORT CViewBaseNonTemplate :
+        class SWIFT_GUI_EXPORT CViewBaseNonTemplate :
             public COverlayMessagesTableView,
             public CEnableForDockWidgetInfoArea
         {
@@ -163,31 +163,31 @@ namespace BlackGui
             //! Elements in container
             virtual int rowCount() const = 0;
 
-            //! Is the corresponding model orderable, swift::misc::Models::CListModelBaseNonTemplate::isOrderable
+            //! Is the corresponding model orderable, swift::misc::models::CListModelBaseNonTemplate::isOrderable
             virtual bool isOrderable() const = 0;
 
-            //! \copydoc BlackGui::Models::CListModelBaseNonTemplate::setSorting
+            //! \copydoc swift::gui::models::CListModelBaseNonTemplate::setSorting
             virtual bool setSorting(const swift::misc::CPropertyIndex &propertyIndex, Qt::SortOrder order = Qt::AscendingOrder) = 0;
 
-            //! \copydoc BlackGui::Models::CListModelBaseNonTemplate::sortByPropertyIndex
+            //! \copydoc swift::gui::models::CListModelBaseNonTemplate::sortByPropertyIndex
             virtual void sortByPropertyIndex(const swift::misc::CPropertyIndex &propertyIndex, Qt::SortOrder order = Qt::AscendingOrder) = 0;
 
-            //! \copydoc BlackGui::Models::CListModelBaseNonTemplate::setNoSorting
+            //! \copydoc swift::gui::models::CListModelBaseNonTemplate::setNoSorting
             virtual void setNoSorting() = 0;
 
-            //! \copydoc BlackGui::Models::CListModelBaseNonTemplate::getSortProperty
+            //! \copydoc swift::gui::models::CListModelBaseNonTemplate::getSortProperty
             virtual swift::misc::CPropertyIndex getSortProperty() const = 0;
 
-            //! \copydoc BlackGui::Models::CListModelBaseNonTemplate::getSortColumn
+            //! \copydoc swift::gui::models::CListModelBaseNonTemplate::getSortColumn
             virtual int getSortColumn() const = 0;
 
-            //! \copydoc BlackGui::Models::CListModelBaseNonTemplate::hasValidSortColumn
+            //! \copydoc swift::gui::models::CListModelBaseNonTemplate::hasValidSortColumn
             virtual bool hasValidSortColumn() const = 0;
 
-            //! \copydoc BlackGui::Models::CListModelBaseNonTemplate::endsWithEmptyColumn
+            //! \copydoc swift::gui::models::CListModelBaseNonTemplate::endsWithEmptyColumn
             virtual bool endsWithEmptyColumn() const = 0;
 
-            //! \copydoc BlackGui::Models::CListModelBaseNonTemplate::getSortOrder
+            //! \copydoc swift::gui::models::CListModelBaseNonTemplate::getSortOrder
             virtual Qt::SortOrder getSortOrder() const = 0;
 
             //! Allow to drag and/or drop value objects
@@ -200,7 +200,7 @@ namespace BlackGui
             virtual bool acceptDrop(const QMimeData *mimeData) const = 0;
 
             //! \copydoc CEnableForDockWidgetInfoArea::setParentDockWidgetInfoArea
-            virtual bool setParentDockWidgetInfoArea(BlackGui::CDockWidgetInfoArea *parentDockableWidget) override;
+            virtual bool setParentDockWidgetInfoArea(swift::gui::CDockWidgetInfoArea *parentDockableWidget) override;
 
             //! Resize mode
             ResizeMode getResizeMode() const { return m_resizeMode; }
@@ -258,16 +258,16 @@ namespace BlackGui
             bool isCurrentlyAllowingMultipleRowSelections() const;
 
             //! Filter dialog
-            void setFilterDialog(Filters::CFilterDialog *filterDialog);
+            void setFilterDialog(filters::CFilterDialog *filterDialog);
 
             //! Filter widget if any
             QWidget *getFilterWidget() const { return m_filterWidget; }
 
             //! Set filter widget
-            void setFilterWidget(Filters::CFilterWidget *filterWidget);
+            void setFilterWidget(filters::CFilterWidget *filterWidget);
 
             //! Set custom menu if applicable
-            Menus::IMenuDelegate *setCustomMenu(Menus::IMenuDelegate *menu, bool nestPreviousMenu = true);
+            menus::IMenuDelegate *setCustomMenu(menus::IMenuDelegate *menu, bool nestPreviousMenu = true);
 
             //! Enable loading indicator
             void enableLoadIndicator(bool enable);
@@ -430,8 +430,8 @@ namespace BlackGui
 
             //! Method creating the menu
             //! \remarks override this method to contribute to the menu
-            //! \sa BlackGui::Views::CViewBaseNonTemplate::customMenuRequested
-            virtual void customMenu(Menus::CMenuActions &menuActions);
+            //! \sa swift::gui::views::CViewBaseNonTemplate::customMenuRequested
+            virtual void customMenu(menus::CMenuActions &menuActions);
 
             //! \name Functions from QTableView
             //! @{
@@ -480,7 +480,7 @@ namespace BlackGui
             QString getFileDialogFileName(bool load) const;
 
             //! Init menu actions
-            Menus::CMenuActions initMenuActions(MenuFlag menu);
+            menus::CMenuActions initMenuActions(MenuFlag menu);
 
             //! Set the sort indicator to the current sort column
             virtual void updateSortIndicator() = 0;
@@ -571,7 +571,7 @@ namespace BlackGui
             virtual bool filterWidgetChangedFilter(bool enabled) = 0;
 
             //! Init text edit dialog if required and return pointer to it
-            Components::CTextEditDialog *textEditDialog();
+            components::CTextEditDialog *textEditDialog();
 
             ResizeMode m_resizeMode = PresizeSubset; //!< mode
             RowsResizeMode m_rowResizeMode = Interactive; //!< row resize mode for row height
@@ -593,15 +593,15 @@ namespace BlackGui
             bool m_allowCacheFileJson = true; //!< allow Cache format JSON to be loaded
             QWidget *m_filterWidget = nullptr; //!< filter widget or dialog
             Menu m_menus = MenuDefault; //!< Default menu settings
-            Menus::IMenuDelegate *m_menu = nullptr; //!< custom menu if any
-            Menus::CFontMenu *m_fontMenu = nullptr; //!< font menu if applicable
+            menus::IMenuDelegate *m_menu = nullptr; //!< custom menu if any
+            menus::CFontMenu *m_fontMenu = nullptr; //!< font menu if applicable
             CLoadIndicator *m_loadIndicator = nullptr; //!< load indicator if needed
-            Components::CTextEditDialog *m_textEditDialog = nullptr; //!< text edit dialog
-            QMap<MenuFlag, Menus::CMenuActions> m_menuFlagActions; //!< initialized actions for menu flag (enum)
+            components::CTextEditDialog *m_textEditDialog = nullptr; //!< text edit dialog
+            QMap<MenuFlag, menus::CMenuActions> m_menuFlagActions; //!< initialized actions for menu flag (enum)
             QString m_saveFileName; //!< save file name (JSON)
             swift::misc::CDirectories::ColumnIndex m_dirSettingsIndex = swift::misc::CDirectories::IndexDirLastViewJsonOrDefault; //!< allows to set more specialized directories                             //!< remember last JSON directory, having this member allows to have specific dir
             swift::misc::CSetting<swift::misc::settings::TDirectorySettings> m_dirSettings { this }; //!< directory for load/save
-            swift::misc::CSettingReadOnly<Settings::TGeneralGui> m_guiSettings { this, &CViewBaseNonTemplate::settingsChanged }; //!< general GUI settings
+            swift::misc::CSettingReadOnly<settings::TGeneralGui> m_guiSettings { this, &CViewBaseNonTemplate::settingsChanged }; //!< general GUI settings
 
         private:
             //! Remove selected rows if enabled
@@ -626,13 +626,13 @@ namespace BlackGui
             //! \remarks used for dialog and filter widget
             void setFilterWidgetImpl(QWidget *filterWidget);
         };
-        Q_DECLARE_OPERATORS_FOR_FLAGS(BlackGui::Views::CViewBaseNonTemplate::Menu)
+        Q_DECLARE_OPERATORS_FOR_FLAGS(swift::gui::views::CViewBaseNonTemplate::Menu)
 
         //! Base class for views
         template <class T>
         class CViewBase :
             public CViewBaseNonTemplate,
-            public Models::ISelectionModel<typename T::ContainerType>
+            public models::ISelectionModel<typename T::ContainerType>
         {
             // I cannot use Q_OBJECT here, because: Template classes are not supported by Q_OBJECT
             // and I cannot declare slots as SLOT because I have no Q_OBJECT macro
@@ -660,7 +660,7 @@ namespace BlackGui
             const ModelClass *derivedModel() const { return m_model; }
 
             //! The columns
-            const Models::CColumns &getColumns() const { return this->derivedModel()->getColumns(); }
+            const models::CColumns &getColumns() const { return this->derivedModel()->getColumns(); }
 
             //! Update whole container
             //! \return int size after update
@@ -696,19 +696,19 @@ namespace BlackGui
             //! The row of the given object
             int rowOf(const ObjectType &obj) const;
 
-            //! \copydoc BlackGui::Models::CListModelBase::containerOrFilteredContainer
+            //! \copydoc swift::gui::models::CListModelBase::containerOrFilteredContainer
             const ContainerType &containerOrFilteredContainer(bool *filtered = nullptr) const;
 
             //! \name Selection model interface ISelectionModel
             //! @{
 
-            //! \copydoc BlackGui::Models::ISelectionModel::selectObjects
+            //! \copydoc swift::gui::models::ISelectionModel::selectObjects
             virtual void selectObjects(const ContainerType &selectedObjects) override;
 
-            //! \copydoc BlackGui::Models::ISelectionModel::selectedObjects
+            //! \copydoc swift::gui::models::ISelectionModel::selectedObjects
             virtual ContainerType selectedObjects() const override;
 
-            //! \copydoc BlackGui::Models::ISelectionModel::unselectedObjects
+            //! \copydoc swift::gui::models::ISelectionModel::unselectedObjects
             virtual ContainerType unselectedObjects() const override;
             //! @}
 
@@ -748,68 +748,68 @@ namespace BlackGui
             //! \name Slot overrides from base class
             //! @{
 
-            //!\copydoc BlackGui::Views::CViewBaseNonTemplate::removeSelectedRows
+            //!\copydoc swift::gui::views::CViewBaseNonTemplate::removeSelectedRows
             virtual int removeSelectedRows() override;
 
-            //!\copydoc BlackGui::Views::CViewBaseNonTemplate::presizeOrFullResizeToContents
+            //!\copydoc swift::gui::views::CViewBaseNonTemplate::presizeOrFullResizeToContents
             virtual void presizeOrFullResizeToContents() override;
 
-            //!\copydoc BlackGui::Views::CViewBaseNonTemplate::clearHighlighting
+            //!\copydoc swift::gui::views::CViewBaseNonTemplate::clearHighlighting
             virtual void clearHighlighting() override;
 
-            //!\copydoc BlackGui::Views::CViewBaseNonTemplate::materializeFilter
+            //!\copydoc swift::gui::views::CViewBaseNonTemplate::materializeFilter
             virtual void materializeFilter() override;
             //! @}
 
-            //! \name BlackGui::Views::CViewBaseNonTemplate implementations
+            //! \name swift::gui::views::CViewBaseNonTemplate implementations
             //! @{
 
-            //!\copydoc BlackGui::Views::CViewBaseNonTemplate::clear
+            //!\copydoc swift::gui::views::CViewBaseNonTemplate::clear
             virtual void clear() override;
 
-            //!\copydoc BlackGui::Views::CViewBaseNonTemplate::rowCount
+            //!\copydoc swift::gui::views::CViewBaseNonTemplate::rowCount
             virtual int rowCount() const override;
 
-            //!\copydoc BlackGui::Views::CViewBaseNonTemplate::isEmpty
+            //!\copydoc swift::gui::views::CViewBaseNonTemplate::isEmpty
             virtual bool isEmpty() const override;
 
-            //!\copydoc BlackGui::Views::CViewBaseNonTemplate::isOrderable
+            //!\copydoc swift::gui::views::CViewBaseNonTemplate::isOrderable
             virtual bool isOrderable() const override;
 
-            //!\copydoc BlackGui::Views::CViewBaseNonTemplate::allowDragDrop
+            //!\copydoc swift::gui::views::CViewBaseNonTemplate::allowDragDrop
             virtual void allowDragDrop(bool allowDrag, bool allowDrop, bool allowDropJsonFile = false) override;
 
-            //!\copydoc BlackGui::Views::CViewBaseNonTemplate::isDropAllowed
+            //!\copydoc swift::gui::views::CViewBaseNonTemplate::isDropAllowed
             virtual bool isDropAllowed() const override;
 
-            //!\copydoc BlackGui::Views::CViewBaseNonTemplate::dropEvent
+            //!\copydoc swift::gui::views::CViewBaseNonTemplate::dropEvent
             virtual void dropEvent(QDropEvent *event) override;
 
-            //!\copydoc BlackGui::Views::CViewBaseNonTemplate::acceptDrop
+            //!\copydoc swift::gui::views::CViewBaseNonTemplate::acceptDrop
             virtual bool acceptDrop(const QMimeData *mimeData) const override;
 
-            //!\copydoc BlackGui::Views::CViewBaseNonTemplate::setSorting
+            //!\copydoc swift::gui::views::CViewBaseNonTemplate::setSorting
             virtual bool setSorting(const swift::misc::CPropertyIndex &propertyIndex, Qt::SortOrder order = Qt::AscendingOrder) override;
 
-            //!\copydoc BlackGui::Views::CViewBaseNonTemplate::sortByPropertyIndex
+            //!\copydoc swift::gui::views::CViewBaseNonTemplate::sortByPropertyIndex
             virtual void sortByPropertyIndex(const swift::misc::CPropertyIndex &propertyIndex, Qt::SortOrder order = Qt::AscendingOrder) override;
 
-            //!\copydoc BlackGui::Views::CViewBaseNonTemplate::setNoSorting
+            //!\copydoc swift::gui::views::CViewBaseNonTemplate::setNoSorting
             virtual void setNoSorting() override { m_model->setNoSorting(); }
 
-            //!\copydoc BlackGui::Views::CViewBaseNonTemplate::getSortProperty
+            //!\copydoc swift::gui::views::CViewBaseNonTemplate::getSortProperty
             virtual swift::misc::CPropertyIndex getSortProperty() const override { return m_model->getSortProperty(); }
 
-            //!\copydoc BlackGui::Views::CViewBaseNonTemplate::getSortColumn
+            //!\copydoc swift::gui::views::CViewBaseNonTemplate::getSortColumn
             virtual int getSortColumn() const override { return m_model->getSortColumn(); }
 
-            //!\copydoc BlackGui::Views::CViewBaseNonTemplate::hasValidSortColumn
+            //!\copydoc swift::gui::views::CViewBaseNonTemplate::hasValidSortColumn
             virtual bool hasValidSortColumn() const override { return m_model->hasValidSortColumn(); }
 
-            //!\copydoc BlackGui::Views::CViewBaseNonTemplate::endsWithEmptyColumn
+            //!\copydoc swift::gui::views::CViewBaseNonTemplate::endsWithEmptyColumn
             virtual bool endsWithEmptyColumn() const override { return m_model->endsWithEmptyColumn(); }
 
-            //!\copydoc BlackGui::Views::CViewBaseNonTemplate::getSortOrder
+            //!\copydoc swift::gui::views::CViewBaseNonTemplate::getSortOrder
             virtual Qt::SortOrder getSortOrder() const override { return m_model->getSortOrder(); }
             //! @}
 
@@ -832,7 +832,7 @@ namespace BlackGui
             virtual void setObjectName(const QString &name);
 
             //! Set filter and take ownership, any previously set filter will be destroyed
-            void takeFilterOwnership(std::unique_ptr<Models::IModelFilter<ContainerType>> &filter);
+            void takeFilterOwnership(std::unique_ptr<models::IModelFilter<ContainerType>> &filter);
 
             //! Has filter set?
             bool hasFilter() const;
@@ -872,63 +872,63 @@ namespace BlackGui
             //! \name base class implementations
             //! @{
 
-            //!\copydoc BlackGui::Views::CViewBaseNonTemplate::reachedResizeThreshold
+            //!\copydoc swift::gui::views::CViewBaseNonTemplate::reachedResizeThreshold
             virtual bool reachedResizeThreshold(int containrerSize = -1) const override;
 
-            //!\copydoc BlackGui::Views::CViewBaseNonTemplate::performModeBasedResizeToContent
+            //!\copydoc swift::gui::views::CViewBaseNonTemplate::performModeBasedResizeToContent
             virtual void performModeBasedResizeToContent() override;
 
-            //!\copydoc BlackGui::Views::CViewBaseNonTemplate::performUpdateContainer
+            //!\copydoc swift::gui::views::CViewBaseNonTemplate::performUpdateContainer
             virtual int performUpdateContainer(const swift::misc::CVariant &variant, bool sort, bool resize) override;
 
-            //!\copydoc BlackGui::Views::CViewBaseNonTemplate::updateSortIndicator
+            //!\copydoc swift::gui::views::CViewBaseNonTemplate::updateSortIndicator
             virtual void updateSortIndicator() override;
 
-            //!\copydoc BlackGui::Views::CViewBaseNonTemplate::mouseOverCallback
+            //!\copydoc swift::gui::views::CViewBaseNonTemplate::mouseOverCallback
             virtual void mouseOverCallback(const QModelIndex &index, bool mouseOver) override;
 
-            //!\copydoc BlackGui::Views::CViewBaseNonTemplate::drawDropIndicator
+            //!\copydoc swift::gui::views::CViewBaseNonTemplate::drawDropIndicator
             virtual void drawDropIndicator(bool indicator) override;
 
-            //!\copydoc BlackGui::Views::CViewBaseNonTemplate::copy
+            //!\copydoc swift::gui::views::CViewBaseNonTemplate::copy
             virtual void copy() override;
 
-            //!\copydoc BlackGui::Views::CViewBaseNonTemplate::cut
+            //!\copydoc swift::gui::views::CViewBaseNonTemplate::cut
             virtual void cut() override;
 
-            //!\copydoc BlackGui::Views::CViewBaseNonTemplate::paste
+            //!\copydoc swift::gui::views::CViewBaseNonTemplate::paste
             virtual void paste() override;
 
-            //!\copydoc BlackGui::Views::CViewBaseNonTemplate::displayJsonPopup
+            //!\copydoc swift::gui::views::CViewBaseNonTemplate::displayJsonPopup
             virtual void displayJsonPopup() override { this->displayContainerAsJsonPopup(false); }
 
-            //!\copydoc BlackGui::Views::CViewBaseNonTemplate::displaySelectedJsonPopup
+            //!\copydoc swift::gui::views::CViewBaseNonTemplate::displaySelectedJsonPopup
             virtual void displaySelectedJsonPopup() override { this->displayContainerAsJsonPopup(true); }
 
-            //!\copydoc BlackGui::Views::CViewBaseNonTemplate::filterDialogFinished
+            //!\copydoc swift::gui::views::CViewBaseNonTemplate::filterDialogFinished
             virtual bool filterDialogFinished(int status) override;
 
-            //!\copydoc BlackGui::Views::CViewBaseNonTemplate::filterWidgetChangedFilter
+            //!\copydoc swift::gui::views::CViewBaseNonTemplate::filterWidgetChangedFilter
             virtual bool filterWidgetChangedFilter(bool enabled) override;
 
-            //!\copydoc BlackGui::Views::CViewBaseNonTemplate::removeFilter
+            //!\copydoc swift::gui::views::CViewBaseNonTemplate::removeFilter
             virtual void removeFilter() override;
             //! @}
 
-            //! Modify JSON data loaded in BlackGui::Views::CViewBaseNonTemplate::loadJson
+            //! Modify JSON data loaded in swift::gui::views::CViewBaseNonTemplate::loadJson
             virtual swift::misc::CStatusMessage modifyLoadedJsonData(ContainerType &data) const;
 
-            //! Verify JSON data loaded in BlackGui::Views::CViewBaseNonTemplate::loadJson
+            //! Verify JSON data loaded in swift::gui::views::CViewBaseNonTemplate::loadJson
             virtual swift::misc::CStatusMessage validateLoadedJsonData(const ContainerType &data) const;
 
-            //! In BlackGui::Views::CViewBaseNonTemplate::loadJson the view has been updated because of loaded JSON data
+            //! In swift::gui::views::CViewBaseNonTemplate::loadJson the view has been updated because of loaded JSON data
             //! \remark I cannot use a signal with a template parameter, so this functions serves as callback
             virtual void jsonLoadedAndModelUpdated(const ContainerType &data);
 
-            //! \copydoc BlackGui::Views::CViewBaseNonTemplate::customMenu
-            virtual void customMenu(Menus::CMenuActions &menuActions) override;
+            //! \copydoc swift::gui::views::CViewBaseNonTemplate::customMenu
+            virtual void customMenu(menus::CMenuActions &menuActions) override;
 
-            //! \copydoc BlackGui::Views::CViewBaseNonTemplate::customMenu
+            //! \copydoc swift::gui::views::CViewBaseNonTemplate::customMenu
             virtual swift::misc::CStatusMessage loadJsonFile(const QString &fileName) override;
 
             //! Display the container as JSON popup
@@ -937,19 +937,19 @@ namespace BlackGui
             //! \name Overrides from base class
             //! @{
 
-            //!\copydoc BlackGui::Views::CViewBaseNonTemplate::removeFilter
+            //!\copydoc swift::gui::views::CViewBaseNonTemplate::removeFilter
             virtual void onClicked(const QModelIndex &index) override;
 
-            //!\copydoc BlackGui::Views::CViewBaseNonTemplate::onDoubleClicked
+            //!\copydoc swift::gui::views::CViewBaseNonTemplate::onDoubleClicked
             virtual void onDoubleClicked(const QModelIndex &index) override;
 
-            //!\copydoc BlackGui::Views::CViewBaseNonTemplate::onRowSelected
+            //!\copydoc swift::gui::views::CViewBaseNonTemplate::onRowSelected
             virtual void onRowSelected(const QModelIndex &index) override;
 
-            //!\copydoc BlackGui::Views::CViewBaseNonTemplate::loadJson
+            //!\copydoc swift::gui::views::CViewBaseNonTemplate::loadJson
             virtual swift::misc::CStatusMessage loadJson(const QString &directory = {}) override;
 
-            //!\copydoc BlackGui::Views::CViewBaseNonTemplate::saveJson
+            //!\copydoc swift::gui::views::CViewBaseNonTemplate::saveJson
             virtual swift::misc::CStatusMessage saveJson(bool selectedOnly = false, const QString &directory = {}) override;
             //! @}
         };
diff --git a/src/gui/views/viewbaseaviation.cpp b/src/gui/views/viewbaseaviation.cpp
new file mode 100644
index 000000000..f413e19ef
--- /dev/null
+++ b/src/gui/views/viewbaseaviation.cpp
@@ -0,0 +1,17 @@
+// SPDX-FileCopyrightText: Copyright (C) 2018 swift Project Community / Contributors
+// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
+
+#include "viewbase.cpp"
+
+namespace swift::gui::views
+{
+    template class CViewBase<swift::gui::models::CAircraftPartsListModel>;
+    template class CViewBase<swift::gui::models::CAircraftSituationListModel>;
+    template class CViewBase<swift::gui::models::CAircraftSituationChangeListModel>;
+    template class CViewBase<swift::gui::models::CAirlineIcaoCodeListModel>;
+    template class CViewBase<swift::gui::models::CAircraftCategoryListModel>;
+    template class CViewBase<swift::gui::models::CAircraftIcaoCodeListModel>;
+    template class CViewBase<swift::gui::models::CAirportListModel>;
+    template class CViewBase<swift::gui::models::CAtcStationListModel>;
+    template class CViewBase<swift::gui::models::CLiveryListModel>;
+} // namespace
diff --git a/src/blackgui/views/viewbaseitemdelegate.cpp b/src/gui/views/viewbaseitemdelegate.cpp
similarity index 96%
rename from src/blackgui/views/viewbaseitemdelegate.cpp
rename to src/gui/views/viewbaseitemdelegate.cpp
index 8190f72e2..c073c9724 100644
--- a/src/blackgui/views/viewbaseitemdelegate.cpp
+++ b/src/gui/views/viewbaseitemdelegate.cpp
@@ -4,7 +4,7 @@
 #include "viewbaseitemdelegate.h"
 #include "viewbase.h"
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     void CViewBaseItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
     {
diff --git a/src/blackgui/views/viewbaseitemdelegate.h b/src/gui/views/viewbaseitemdelegate.h
similarity index 90%
rename from src/blackgui/views/viewbaseitemdelegate.h
rename to src/gui/views/viewbaseitemdelegate.h
index 39ca7e5e6..13eb99614 100644
--- a/src/blackgui/views/viewbaseitemdelegate.h
+++ b/src/gui/views/viewbaseitemdelegate.h
@@ -3,12 +3,12 @@
 
 //! \file
 
-#ifndef BLACKGUI_VIEWS_ITEMDELEGATE_H
-#define BLACKGUI_VIEWS_ITEMDELEGATE_H
+#ifndef SWIFT_GUI_VIEWS_ITEMDELEGATE_H
+#define SWIFT_GUI_VIEWS_ITEMDELEGATE_H
 
 #include <QStyledItemDelegate>
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     class CViewBaseNonTemplate;
 
diff --git a/src/gui/views/viewbasemisc.cpp b/src/gui/views/viewbasemisc.cpp
new file mode 100644
index 000000000..d361f5006
--- /dev/null
+++ b/src/gui/views/viewbasemisc.cpp
@@ -0,0 +1,16 @@
+// SPDX-FileCopyrightText: Copyright (C) 2018 swift Project Community / Contributors
+// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
+
+#include "viewbase.cpp"
+
+namespace swift::gui::views
+{
+    template class CViewBase<swift::gui::models::CApplicationInfoListModel>;
+    template class CViewBase<swift::gui::models::CCountryListModel>;
+    template class CViewBase<swift::gui::models::CStatusMessageListModel>;
+    template class CViewBase<swift::gui::models::CIdentifierListModel>;
+    template class CViewBase<swift::gui::models::CNameVariantPairModel>;
+
+    template class CViewBase<swift::gui::models::CAudioDeviceInfoListModel>;
+
+} // namespace
diff --git a/src/gui/views/viewbasenetwork.cpp b/src/gui/views/viewbasenetwork.cpp
new file mode 100644
index 000000000..6abc74187
--- /dev/null
+++ b/src/gui/views/viewbasenetwork.cpp
@@ -0,0 +1,12 @@
+// SPDX-FileCopyrightText: Copyright (C) 2018 swift Project Community / Contributors
+// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
+
+#include "viewbase.cpp"
+
+namespace swift::gui::views
+{
+    template class CViewBase<swift::gui::models::CClientListModel>;
+    template class CViewBase<swift::gui::models::CServerListModel>;
+    template class CViewBase<swift::gui::models::CTextMessageListModel>;
+    template class CViewBase<swift::gui::models::CUserListModel>;
+} // namespace
diff --git a/src/blackgui/views/viewbasenontemplate.cpp b/src/gui/views/viewbasenontemplate.cpp
similarity index 98%
rename from src/blackgui/views/viewbasenontemplate.cpp
rename to src/gui/views/viewbasenontemplate.cpp
index e8abd457d..89e532ce9 100644
--- a/src/blackgui/views/viewbasenontemplate.cpp
+++ b/src/gui/views/viewbasenontemplate.cpp
@@ -2,17 +2,17 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "config/buildconfig.h"
-#include "blackgui/components/texteditdialog.h"
-#include "blackgui/dockwidgetinfoarea.h"
-#include "blackgui/filters/filterdialog.h"
-#include "blackgui/filters/filterwidget.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/guiutility.h"
-#include "blackgui/loadindicator.h"
-#include "blackgui/menus/fontmenus.h"
-#include "blackgui/menus/menudelegate.h"
-#include "blackgui/views/viewbase.h"
-#include "blackgui/shortcut.h"
+#include "gui/components/texteditdialog.h"
+#include "gui/dockwidgetinfoarea.h"
+#include "gui/filters/filterdialog.h"
+#include "gui/filters/filterwidget.h"
+#include "gui/guiapplication.h"
+#include "gui/guiutility.h"
+#include "gui/loadindicator.h"
+#include "gui/menus/fontmenus.h"
+#include "gui/menus/menudelegate.h"
+#include "gui/views/viewbase.h"
+#include "gui/shortcut.h"
 #include "misc/logmessage.h"
 
 #include <QApplication>
@@ -24,14 +24,14 @@
 
 using namespace swift::config;
 using namespace swift::misc;
-using namespace BlackGui;
-using namespace BlackGui::Menus;
-using namespace BlackGui::Models;
-using namespace BlackGui::Filters;
-using namespace BlackGui::Settings;
-using namespace BlackGui::Components;
+using namespace swift::gui;
+using namespace swift::gui::menus;
+using namespace swift::gui::models;
+using namespace swift::gui::filters;
+using namespace swift::gui::settings;
+using namespace swift::gui::components;
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     CViewBaseNonTemplate::CViewBaseNonTemplate(QWidget *parent) : COverlayMessagesTableView(parent)
     {
@@ -336,7 +336,7 @@ namespace BlackGui::Views
         return directories.propertyByIndex(m_dirSettingsIndex).toString();
     }
 
-    Components::CTextEditDialog *CViewBaseNonTemplate::textEditDialog()
+    components::CTextEditDialog *CViewBaseNonTemplate::textEditDialog()
     {
         if (!m_textEditDialog)
         {
diff --git a/src/blackgui/views/viewbaseproxystyle.cpp b/src/gui/views/viewbaseproxystyle.cpp
similarity index 94%
rename from src/blackgui/views/viewbaseproxystyle.cpp
rename to src/gui/views/viewbaseproxystyle.cpp
index 5ca3fb3de..0ccd8d9ba 100644
--- a/src/blackgui/views/viewbaseproxystyle.cpp
+++ b/src/gui/views/viewbaseproxystyle.cpp
@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "viewbaseproxystyle.h"
-#include "blackgui/views/viewbase.h"
+#include "gui/views/viewbase.h"
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     CViewBaseProxyStyle::CViewBaseProxyStyle(CViewBaseNonTemplate *view, QStyle *style) : QProxyStyle(style), m_view(view) {}
 
diff --git a/src/blackgui/views/viewbaseproxystyle.h b/src/gui/views/viewbaseproxystyle.h
similarity index 89%
rename from src/blackgui/views/viewbaseproxystyle.h
rename to src/gui/views/viewbaseproxystyle.h
index 507692ac1..095c7bb61 100644
--- a/src/blackgui/views/viewbaseproxystyle.h
+++ b/src/gui/views/viewbaseproxystyle.h
@@ -3,15 +3,15 @@
 
 //! \file
 
-#ifndef BLACKGUI_VIEWBASE_PROXYSTYLE_H
-#define BLACKGUI_VIEWBASE_PROXYSTYLE_H
+#ifndef SWIFT_GUI_VIEWBASE_PROXYSTYLE_H
+#define SWIFT_GUI_VIEWBASE_PROXYSTYLE_H
 
 #include <QProxyStyle>
 #include <QPen>
 #include <QPainter>
 #include <QStyleOptionViewItem>
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     class CViewBaseNonTemplate;
 
diff --git a/src/gui/views/viewbasesimulation.cpp b/src/gui/views/viewbasesimulation.cpp
new file mode 100644
index 000000000..6312f9bdc
--- /dev/null
+++ b/src/gui/views/viewbasesimulation.cpp
@@ -0,0 +1,13 @@
+// SPDX-FileCopyrightText: Copyright (C) 2018 swift Project Community / Contributors
+// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
+
+#include "viewbase.cpp"
+
+namespace swift::gui::views
+{
+    template class CViewBase<swift::gui::models::CAircraftModelListModel>;
+    template class CViewBase<swift::gui::models::CDistributorListModel>;
+    template class CViewBase<swift::gui::models::CInterpolationSetupListModel>;
+    template class CViewBase<swift::gui::models::CMatchingStatisticsModel>;
+    template class CViewBase<swift::gui::models::CSimulatedAircraftListModel>;
+} // namespace
diff --git a/src/blackgui/views/viewbaseweather.cpp b/src/gui/views/viewbaseweather.cpp
similarity index 54%
rename from src/blackgui/views/viewbaseweather.cpp
rename to src/gui/views/viewbaseweather.cpp
index 1fb481da7..4cbc706cc 100644
--- a/src/blackgui/views/viewbaseweather.cpp
+++ b/src/gui/views/viewbaseweather.cpp
@@ -3,8 +3,8 @@
 
 #include "viewbase.cpp"
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
-    template class CViewBase<BlackGui::Models::CCloudLayerListModel>;
-    template class CViewBase<BlackGui::Models::CWindLayerListModel>;
+    template class CViewBase<swift::gui::models::CCloudLayerListModel>;
+    template class CViewBase<swift::gui::models::CWindLayerListModel>;
 } // namespace
diff --git a/src/blackgui/views/viewcallsignobjects.cpp b/src/gui/views/viewcallsignobjects.cpp
similarity index 85%
rename from src/blackgui/views/viewcallsignobjects.cpp
rename to src/gui/views/viewcallsignobjects.cpp
index 2636d3bc6..1d4f7778f 100644
--- a/src/blackgui/views/viewcallsignobjects.cpp
+++ b/src/gui/views/viewcallsignobjects.cpp
@@ -1,10 +1,10 @@
 // SPDX-FileCopyrightText: Copyright (C) 2017 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/views/viewcallsignobjects.h"
-#include "blackgui/models/atcstationlistmodel.h"
-#include "blackgui/models/interpolationsetupmodel.h"
-#include "blackgui/models/simulatedaircraftlistmodel.h"
+#include "gui/views/viewcallsignobjects.h"
+#include "gui/models/atcstationlistmodel.h"
+#include "gui/models/interpolationsetupmodel.h"
+#include "gui/models/simulatedaircraftlistmodel.h"
 #include "misc/icons.h"
 
 #include <QAction>
@@ -16,10 +16,10 @@
 
 using namespace swift::misc;
 using namespace swift::misc::aviation;
-using namespace BlackGui;
-using namespace BlackGui::Models;
+using namespace swift::gui;
+using namespace swift::gui::models;
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     template <class T>
     CViewWithCallsignObjects<T>::CViewWithCallsignObjects(QWidget *parent) : CViewBase<T>(parent)
@@ -113,8 +113,8 @@ namespace BlackGui::Views
         }
     }
 
-    template class CViewWithCallsignObjects<BlackGui::Models::CAtcStationListModel>;
-    template class CViewWithCallsignObjects<BlackGui::Models::CInterpolationSetupListModel>;
-    template class CViewWithCallsignObjects<BlackGui::Models::CSimulatedAircraftListModel>;
+    template class CViewWithCallsignObjects<swift::gui::models::CAtcStationListModel>;
+    template class CViewWithCallsignObjects<swift::gui::models::CInterpolationSetupListModel>;
+    template class CViewWithCallsignObjects<swift::gui::models::CSimulatedAircraftListModel>;
 
 } // namespace
diff --git a/src/blackgui/views/viewcallsignobjects.h b/src/gui/views/viewcallsignobjects.h
similarity index 91%
rename from src/blackgui/views/viewcallsignobjects.h
rename to src/gui/views/viewcallsignobjects.h
index 3b19c7d3b..7e101dceb 100644
--- a/src/blackgui/views/viewcallsignobjects.h
+++ b/src/gui/views/viewcallsignobjects.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_VIEWS_VIEWCALLSIGNOBJECTS_H
-#define BLACKGUI_VIEWS_VIEWCALLSIGNOBJECTS_H
+#ifndef SWIFT_GUI_VIEWS_VIEWCALLSIGNOBJECTS_H
+#define SWIFT_GUI_VIEWS_VIEWCALLSIGNOBJECTS_H
 
-#include "blackgui/views/viewbase.h"
+#include "gui/views/viewbase.h"
 #include <QSet>
 #include <QObject>
 #include <QString>
@@ -17,13 +17,13 @@ class QIntValidator;
 class QLineEdit;
 class QWidget;
 
-namespace BlackGui
+namespace swift::gui
 {
-    namespace Menus
+    namespace menus
     {
         class CMenuActions;
     }
-    namespace Views
+    namespace views
     {
         //! Base class for views with DB objects
         template <class T>
diff --git a/src/blackgui/views/viewdbobjects.cpp b/src/gui/views/viewdbobjects.cpp
similarity index 85%
rename from src/blackgui/views/viewdbobjects.cpp
rename to src/gui/views/viewdbobjects.cpp
index 4fc8a03e5..29d2ca28c 100644
--- a/src/blackgui/views/viewdbobjects.cpp
+++ b/src/gui/views/viewdbobjects.cpp
@@ -1,15 +1,15 @@
 // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/menus/menuaction.h"
-#include "blackgui/views/viewdbobjects.h"
-#include "blackgui/models/aircrafticaolistmodel.h"
-#include "blackgui/models/aircraftcategorylistmodel.h"
-#include "blackgui/models/aircraftmodellistmodel.h"
-#include "blackgui/models/airlineicaolistmodel.h"
-#include "blackgui/models/countrylistmodel.h"
-#include "blackgui/models/distributorlistmodel.h"
-#include "blackgui/models/liverylistmodel.h"
+#include "gui/menus/menuaction.h"
+#include "gui/views/viewdbobjects.h"
+#include "gui/models/aircrafticaolistmodel.h"
+#include "gui/models/aircraftcategorylistmodel.h"
+#include "gui/models/aircraftmodellistmodel.h"
+#include "gui/models/airlineicaolistmodel.h"
+#include "gui/models/countrylistmodel.h"
+#include "gui/models/distributorlistmodel.h"
+#include "gui/models/liverylistmodel.h"
 #include "misc/simulation/aircraftmodellist.h"
 #include "misc/simulation/distributor.h"
 #include "misc/simulation/distributorlist.h"
@@ -27,11 +27,11 @@
 #include <QWidgetAction>
 
 using namespace swift::misc;
-using namespace BlackGui;
-using namespace BlackGui::Models;
-using namespace BlackGui::Menus;
+using namespace swift::gui;
+using namespace swift::gui::models;
+using namespace swift::gui::menus;
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     template <class T>
     CViewWithDbObjects<T>::CViewWithDbObjects(QWidget *parent) : CViewBase<ModelClass>(parent)
@@ -120,7 +120,7 @@ namespace BlackGui::Views
     }
 
     template <class T>
-    void CViewWithDbObjects<T>::customMenu(Menus::CMenuActions &menuActions)
+    void CViewWithDbObjects<T>::customMenu(menus::CMenuActions &menuActions)
     {
         // extensions would go here
         CViewBase<ModelClass>::customMenu(menuActions);
@@ -231,14 +231,14 @@ namespace BlackGui::Views
     // see here for the reason of thess forward instantiations
     // https://isocpp.org/wiki/faq/templates#separate-template-fn-defn-from-decl
 
-    template class CViewWithDbObjects<BlackGui::Models::CAircraftIcaoCodeListModel>;
-    template class CViewWithDbObjects<BlackGui::Models::CAircraftCategoryListModel>;
-    template class CViewWithDbObjects<BlackGui::Models::CAirlineIcaoCodeListModel>;
-    template class CViewWithDbObjects<BlackGui::Models::CCountryListModel>;
-    template class CViewWithDbObjects<BlackGui::Models::CLiveryListModel>;
-    template class CViewWithDbObjects<BlackGui::Models::CDistributorListModel>;
-    template class CViewWithDbObjects<BlackGui::Models::CAircraftModelListModel>;
-    template class COrderableViewWithDbObjects<BlackGui::Models::CDistributorListModel>;
-    template class COrderableViewWithDbObjects<BlackGui::Models::CAircraftModelListModel>;
+    template class CViewWithDbObjects<swift::gui::models::CAircraftIcaoCodeListModel>;
+    template class CViewWithDbObjects<swift::gui::models::CAircraftCategoryListModel>;
+    template class CViewWithDbObjects<swift::gui::models::CAirlineIcaoCodeListModel>;
+    template class CViewWithDbObjects<swift::gui::models::CCountryListModel>;
+    template class CViewWithDbObjects<swift::gui::models::CLiveryListModel>;
+    template class CViewWithDbObjects<swift::gui::models::CDistributorListModel>;
+    template class CViewWithDbObjects<swift::gui::models::CAircraftModelListModel>;
+    template class COrderableViewWithDbObjects<swift::gui::models::CDistributorListModel>;
+    template class COrderableViewWithDbObjects<swift::gui::models::CAircraftModelListModel>;
 
 } // namespace
diff --git a/src/blackgui/views/viewdbobjects.h b/src/gui/views/viewdbobjects.h
similarity index 86%
rename from src/blackgui/views/viewdbobjects.h
rename to src/gui/views/viewdbobjects.h
index 6484e5269..9044c2998 100644
--- a/src/blackgui/views/viewdbobjects.h
+++ b/src/gui/views/viewdbobjects.h
@@ -3,10 +3,10 @@
 
 //! \file
 
-#ifndef BLACKGUI_VIEWS_VIEWDBOBJECTS_H
-#define BLACKGUI_VIEWS_VIEWDBOBJECTS_H
+#ifndef SWIFT_GUI_VIEWS_VIEWDBOBJECTS_H
+#define SWIFT_GUI_VIEWS_VIEWDBOBJECTS_H
 
-#include "blackgui/views/viewbase.h"
+#include "gui/views/viewbase.h"
 #include <QSet>
 #include <QObject>
 #include <QString>
@@ -18,13 +18,13 @@ class QFrame;
 class QLineEdit;
 class QWidget;
 
-namespace BlackGui
+namespace swift::gui
 {
-    namespace Menus
+    namespace menus
     {
         class CMenuActions;
     }
-    namespace Views
+    namespace views
     {
         //! Base class for views with DB objects
         template <class T>
@@ -72,8 +72,8 @@ namespace BlackGui
             //! Constructor
             explicit CViewWithDbObjects(QWidget *parent = nullptr);
 
-            //! \copydoc BlackGui::Views::CViewBaseNonTemplate::customMenu
-            virtual void customMenu(BlackGui::Menus::CMenuActions &menuActions) override;
+            //! \copydoc swift::gui::views::CViewBaseNonTemplate::customMenu
+            virtual void customMenu(swift::gui::menus::CMenuActions &menuActions) override;
         };
 
         //! Base class for views with DB objects also orderable (based on swift::misc::IOrderableList )
@@ -101,8 +101,8 @@ namespace BlackGui
             //! Constructor
             explicit COrderableViewWithDbObjects(QWidget *parent = nullptr);
 
-            //! \copydoc BlackGui::Views::CViewBaseNonTemplate::customMenu
-            virtual void customMenu(BlackGui::Menus::CMenuActions &menuActions) override;
+            //! \copydoc swift::gui::views::CViewBaseNonTemplate::customMenu
+            virtual void customMenu(swift::gui::menus::CMenuActions &menuActions) override;
 
             //! Move selected items
             void moveSelectedItems(int order);
diff --git a/src/blackgui/views/viewtimestampobjects.cpp b/src/gui/views/viewtimestampobjects.cpp
similarity index 52%
rename from src/blackgui/views/viewtimestampobjects.cpp
rename to src/gui/views/viewtimestampobjects.cpp
index d2b2bd365..7407311c8 100644
--- a/src/blackgui/views/viewtimestampobjects.cpp
+++ b/src/gui/views/viewtimestampobjects.cpp
@@ -1,18 +1,18 @@
 // SPDX-FileCopyrightText: Copyright (C) 2018 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/views/viewtimestampobjects.h"
-#include "blackgui/models/aircraftpartslistmodel.h"
-#include "blackgui/models/aircraftsituationlistmodel.h"
-#include "blackgui/models/aircraftsituationchangelistmodel.h"
+#include "gui/views/viewtimestampobjects.h"
+#include "gui/models/aircraftpartslistmodel.h"
+#include "gui/models/aircraftsituationlistmodel.h"
+#include "gui/models/aircraftsituationchangelistmodel.h"
 #include <QAction>
 
 using namespace swift::misc;
 using namespace swift::misc::aviation;
-using namespace BlackGui;
-using namespace BlackGui::Models;
+using namespace swift::gui;
+using namespace swift::gui::models;
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     template <class T>
     void CViewWithTimestampWithOffsetObjects<T>::push_frontKeepLatestAdjustedFirst(const ObjectType &object, int max)
@@ -26,8 +26,8 @@ namespace BlackGui::Views
         // void
     }
 
-    template class CViewWithTimestampWithOffsetObjects<BlackGui::Models::CAircraftPartsListModel>;
-    template class CViewWithTimestampWithOffsetObjects<BlackGui::Models::CAircraftSituationListModel>;
-    template class CViewWithTimestampWithOffsetObjects<BlackGui::Models::CAircraftSituationChangeListModel>;
+    template class CViewWithTimestampWithOffsetObjects<swift::gui::models::CAircraftPartsListModel>;
+    template class CViewWithTimestampWithOffsetObjects<swift::gui::models::CAircraftSituationListModel>;
+    template class CViewWithTimestampWithOffsetObjects<swift::gui::models::CAircraftSituationChangeListModel>;
 
 } // namespace
diff --git a/src/blackgui/views/viewtimestampobjects.h b/src/gui/views/viewtimestampobjects.h
similarity index 85%
rename from src/blackgui/views/viewtimestampobjects.h
rename to src/gui/views/viewtimestampobjects.h
index 1a0d8b6fc..0b4085df1 100644
--- a/src/blackgui/views/viewtimestampobjects.h
+++ b/src/gui/views/viewtimestampobjects.h
@@ -3,21 +3,21 @@
 
 //! \file
 
-#ifndef BLACKGUI_VIEWS_VIEWTIMESTAMPOBJECTS_H
-#define BLACKGUI_VIEWS_VIEWTIMESTAMPOBJECTS_H
+#ifndef SWIFT_GUI_VIEWS_VIEWTIMESTAMPOBJECTS_H
+#define SWIFT_GUI_VIEWS_VIEWTIMESTAMPOBJECTS_H
 
-#include "blackgui/views/viewbase.h"
+#include "gui/views/viewbase.h"
 #include <QObject>
 #include <QString>
 #include <QtGlobal>
 
-namespace BlackGui
+namespace swift::gui
 {
-    namespace Menus
+    namespace menus
     {
         class CMenuActions;
     }
-    namespace Views
+    namespace views
     {
         //! Base class for views timestamp offset objects
         template <class T>
diff --git a/src/blackgui/views/windlayerview.cpp b/src/gui/views/windlayerview.cpp
similarity index 70%
rename from src/blackgui/views/windlayerview.cpp
rename to src/gui/views/windlayerview.cpp
index 2928ab61b..19c3f8999 100644
--- a/src/blackgui/views/windlayerview.cpp
+++ b/src/gui/views/windlayerview.cpp
@@ -1,13 +1,13 @@
 // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/models/windlayerlistmodel.h"
-#include "blackgui/views/windlayerview.h"
+#include "gui/models/windlayerlistmodel.h"
+#include "gui/views/windlayerview.h"
 
 using namespace swift::misc;
-using namespace BlackGui::Models;
+using namespace swift::gui::models;
 
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     CWindLayerView::CWindLayerView(QWidget *parent) : CViewBase(parent)
     {
diff --git a/src/blackgui/views/windlayerview.h b/src/gui/views/windlayerview.h
similarity index 58%
rename from src/blackgui/views/windlayerview.h
rename to src/gui/views/windlayerview.h
index d01a0b3f3..b7725c348 100644
--- a/src/blackgui/views/windlayerview.h
+++ b/src/gui/views/windlayerview.h
@@ -3,12 +3,12 @@
 
 //! \file
 
-#ifndef BLACKGUI_WINDLAYERVIEW_H
-#define BLACKGUI_WINDLAYERVIEW_H
+#ifndef SWIFT_GUI_WINDLAYERVIEW_H
+#define SWIFT_GUI_WINDLAYERVIEW_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/models/windlayerlistmodel.h"
-#include "blackgui/views/viewbase.h"
+#include "gui/swiftguiexport.h"
+#include "gui/models/windlayerlistmodel.h"
+#include "gui/views/viewbase.h"
 
 class QWidget;
 
@@ -16,10 +16,10 @@ namespace swift::misc::weather
 {
     class CWindLayer;
 }
-namespace BlackGui::Views
+namespace swift::gui::views
 {
     //! Wind layer view
-    class BLACKGUI_EXPORT CWindLayerView : public CViewBase<Models::CWindLayerListModel>
+    class SWIFT_GUI_EXPORT CWindLayerView : public CViewBase<models::CWindLayerListModel>
     {
         Q_OBJECT
 
diff --git a/src/blackgui/win/windowfinderwindows.cpp b/src/gui/win/windowfinderwindows.cpp
similarity index 94%
rename from src/blackgui/win/windowfinderwindows.cpp
rename to src/gui/win/windowfinderwindows.cpp
index 47ef1983b..e71b8d15e 100644
--- a/src/blackgui/win/windowfinderwindows.cpp
+++ b/src/gui/win/windowfinderwindows.cpp
@@ -1,13 +1,13 @@
 // SPDX-FileCopyrightText: Copyright (C) 2014 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/win/windowfinderwindows.h"
+#include "gui/win/windowfinderwindows.h"
 #include <QWindow>
 #include <QScopedArrayPointer>
 
 #include <windows.h>
 
-namespace BlackGui
+namespace swift::gui
 {
     QWindow *CWindowFinderWindows::findForeignWindow(const QString &windowName, const QString &className)
     {
diff --git a/src/blackgui/win/windowfinderwindows.h b/src/gui/win/windowfinderwindows.h
similarity index 69%
rename from src/blackgui/win/windowfinderwindows.h
rename to src/gui/win/windowfinderwindows.h
index df10b8afe..dc80eb34e 100644
--- a/src/blackgui/win/windowfinderwindows.h
+++ b/src/gui/win/windowfinderwindows.h
@@ -3,16 +3,16 @@
 
 //! \file
 
-#ifndef BLACKGUI_WINDOWFINDERWINDOWS_H
-#define BLACKGUI_WINDOWFINDERWINDOWS_H
+#ifndef SWIFT_GUI_WINDOWFINDERWINDOWS_H
+#define SWIFT_GUI_WINDOWFINDERWINDOWS_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/windowfinder.h"
+#include "gui/swiftguiexport.h"
+#include "gui/windowfinder.h"
 
-namespace BlackGui
+namespace swift::gui
 {
     //! Foreign windows
-    class BLACKGUI_EXPORT CWindowFinderWindows : public IWindowFinder
+    class SWIFT_GUI_EXPORT CWindowFinderWindows : public IWindowFinder
     {
     public:
         //! Constructor
diff --git a/src/blackgui/windowfinder.cpp b/src/gui/windowfinder.cpp
similarity index 92%
rename from src/blackgui/windowfinder.cpp
rename to src/gui/windowfinder.cpp
index 6ecfbc42d..e16c5a6b6 100644
--- a/src/blackgui/windowfinder.cpp
+++ b/src/gui/windowfinder.cpp
@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright (C) 2014 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/windowfinder.h"
+#include "gui/windowfinder.h"
 
 #include <QtGlobal>
 
@@ -13,7 +13,7 @@
 #    error "Platform is not supported!"
 #endif
 
-namespace BlackGui
+namespace swift::gui
 {
     IWindowFinder *IWindowFinder::create()
     {
diff --git a/src/blackgui/windowfinder.h b/src/gui/windowfinder.h
similarity index 80%
rename from src/blackgui/windowfinder.h
rename to src/gui/windowfinder.h
index e046f8542..b090f06b9 100644
--- a/src/blackgui/windowfinder.h
+++ b/src/gui/windowfinder.h
@@ -3,18 +3,18 @@
 
 //! \file
 
-#ifndef BLACKGUI_WINDOWFINDER_H
-#define BLACKGUI_WINDOWFINDER_H
+#ifndef SWIFT_GUI_WINDOWFINDER_H
+#define SWIFT_GUI_WINDOWFINDER_H
 
-#include "blackgui/blackguiexport.h"
+#include "gui/swiftguiexport.h"
 #include <QString>
 
 class QWindow;
 
-namespace BlackGui
+namespace swift::gui
 {
     //! Finder for foreign windows
-    class BLACKGUI_EXPORT IWindowFinder
+    class SWIFT_GUI_EXPORT IWindowFinder
     {
     public:
         //! Constructor
diff --git a/src/plugins/simulator/emulated/simulatoremulated.cpp b/src/plugins/simulator/emulated/simulatoremulated.cpp
index fac1896ee..6916d1e97 100644
--- a/src/plugins/simulator/emulated/simulatoremulated.cpp
+++ b/src/plugins/simulator/emulated/simulatoremulated.cpp
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "simulatoremulated.h"
-#include "blackgui/guiapplication.h"
+#include "gui/guiapplication.h"
 #include "core/context/contextsimulator.h"
 #include "misc/simulation/simulatorplugininfo.h"
 #include "misc/aviation/altitude.h"
@@ -12,7 +12,7 @@
 #include <QTimer>
 #include <QApplication>
 
-using namespace BlackGui;
+using namespace swift::gui;
 using namespace swift::misc;
 using namespace swift::misc::aviation;
 using namespace swift::misc::physical_quantities;
diff --git a/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.cpp b/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.cpp
index fb39ea7c0..b4e3700ad 100644
--- a/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.cpp
+++ b/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.cpp
@@ -5,8 +5,8 @@
 #include "ui_simulatoremulatedmonitordialog.h"
 #include "simulatoremulated.h"
 #include "core/context/contextsimulator.h"
-#include "blackgui/components/cockpitcomtransmissioncomponent.h"
-#include "blackgui/guiapplication.h"
+#include "gui/components/cockpitcomtransmissioncomponent.h"
+#include "gui/guiapplication.h"
 #include "misc/logmessage.h"
 
 #include <QIntValidator>
@@ -15,9 +15,9 @@ using namespace swift::config;
 using namespace swift::misc;
 using namespace swift::misc::aviation;
 using namespace swift::misc::simulation;
-using namespace BlackGui;
-using namespace BlackGui::Components;
-using namespace BlackGui::Editors;
+using namespace swift::gui;
+using namespace swift::gui::components;
+using namespace swift::gui::editors;
 
 namespace BlackSimPlugin::Emulated
 {
diff --git a/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.ui b/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.ui
index 0af536296..4bc205ba8 100644
--- a/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.ui
+++ b/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.ui
@@ -37,7 +37,7 @@
        </widget>
       </item>
       <item>
-       <widget class="BlackGui::CLedWidget" name="led_Receiving" native="true"/>
+       <widget class="swift::gui::CLedWidget" name="led_Receiving" native="true"/>
       </item>
       <item>
        <widget class="QLabel" name="lbl_Sending">
@@ -47,7 +47,7 @@
        </widget>
       </item>
       <item>
-       <widget class="BlackGui::CLedWidget" name="led_Sending" native="true"/>
+       <widget class="swift::gui::CLedWidget" name="led_Sending" native="true"/>
       </item>
       <item>
        <spacer name="hs_LedHeader">
@@ -88,7 +88,7 @@
         <number>6</number>
        </property>
        <item alignment="Qt::AlignTop">
-        <widget class="BlackGui::Editors::CSituationForm" name="editor_Situation">
+        <widget class="swift::gui::editors::CSituationForm" name="editor_Situation">
          <property name="minimumSize">
           <size>
            <width>0</width>
@@ -124,7 +124,7 @@
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_4">
           <item>
-           <widget class="BlackGui::Editors::CCockpitComForm" name="editor_Com">
+           <widget class="swift::gui::editors::CCockpitComForm" name="editor_Com">
             <property name="minimumSize">
              <size>
               <width>0</width>
@@ -143,7 +143,7 @@
          </property>
          <layout class="QVBoxLayout" name="vl_GroupBoxParts">
           <item>
-           <widget class="BlackGui::Editors::CAircraftPartsForm" name="editor_AircraftParts">
+           <widget class="swift::gui::editors::CAircraftPartsForm" name="editor_AircraftParts">
             <property name="minimumSize">
              <size>
               <width>0</width>
@@ -156,7 +156,7 @@
         </widget>
        </item>
        <item row="1" column="0">
-        <widget class="BlackGui::Components::CCockpitComTransmissionComponent" name="comp_ComTransmissions">
+        <widget class="swift::gui::components::CCockpitComTransmissionComponent" name="comp_ComTransmissions">
          <property name="minimumSize">
           <size>
            <width>0</width>
@@ -283,7 +283,7 @@
               <number>0</number>
              </property>
              <item>
-              <widget class="BlackGui::Components::CCallsignCompleter" name="comp_CallsignCompleter">
+              <widget class="swift::gui::components::CCallsignCompleter" name="comp_CallsignCompleter">
                <property name="minimumSize">
                 <size>
                  <width>125</width>
@@ -370,7 +370,7 @@
            </widget>
           </item>
           <item row="1" column="5">
-           <widget class="BlackGui::Components::CCallsignCompleter" name="comp_LogInterpolatorCallsign">
+           <widget class="swift::gui::components::CCallsignCompleter" name="comp_LogInterpolatorCallsign">
             <property name="frameShape">
              <enum>QFrame::StyledPanel</enum>
             </property>
@@ -400,7 +400,7 @@
            </widget>
           </item>
           <item row="0" column="3">
-           <widget class="BlackGui::CLedWidget" name="led_Fetching" native="true"/>
+           <widget class="swift::gui::CLedWidget" name="led_Fetching" native="true"/>
           </item>
          </layout>
         </widget>
@@ -606,7 +606,7 @@
              </property>
              <layout class="QVBoxLayout" name="vl_LogMessagesScrollArea">
               <item>
-               <widget class="BlackGui::Components::CStatusMessagesDetail" name="comp_LogComponent">
+               <widget class="swift::gui::components::CStatusMessagesDetail" name="comp_LogComponent">
                 <property name="minimumSize">
                  <size>
                   <width>0</width>
@@ -636,7 +636,7 @@
          </property>
          <layout class="QVBoxLayout" name="vl_GroupBoxSettings">
           <item>
-           <widget class="BlackGui::Components::CSettingsSwiftPlugin" name="comp_Settings"/>
+           <widget class="swift::gui::components::CSettingsSwiftPlugin" name="comp_Settings"/>
           </item>
          </layout>
         </widget>
@@ -659,51 +659,51 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CSettingsSwiftPlugin</class>
+   <class>swift::gui::components::CSettingsSwiftPlugin</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/settingsswiftplugin.h</header>
+   <header>gui/components/settingsswiftplugin.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CStatusMessagesDetail</class>
+   <class>swift::gui::components::CStatusMessagesDetail</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/statusmessagesdetail.h</header>
+   <header>gui/components/statusmessagesdetail.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Editors::CSituationForm</class>
+   <class>swift::gui::editors::CSituationForm</class>
    <extends>QFrame</extends>
-   <header>blackgui/editors/situationform.h</header>
+   <header>gui/editors/situationform.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Editors::CAircraftPartsForm</class>
+   <class>swift::gui::editors::CAircraftPartsForm</class>
    <extends>QFrame</extends>
-   <header>blackgui/editors/aircraftpartsform.h</header>
+   <header>gui/editors/aircraftpartsform.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Editors::CCockpitComForm</class>
+   <class>swift::gui::editors::CCockpitComForm</class>
    <extends>QFrame</extends>
-   <header>blackgui/editors/cockpitcomform.h</header>
+   <header>gui/editors/cockpitcomform.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::CLedWidget</class>
+   <class>swift::gui::CLedWidget</class>
    <extends>QWidget</extends>
-   <header>blackgui/led.h</header>
+   <header>gui/led.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CCallsignCompleter</class>
+   <class>swift::gui::components::CCallsignCompleter</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/callsigncompleter.h</header>
+   <header>gui/components/callsigncompleter.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CCockpitComTransmissionComponent</class>
+   <class>swift::gui::components::CCockpitComTransmissionComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/cockpitcomtransmissioncomponent.h</header>
+   <header>gui/components/cockpitcomtransmissioncomponent.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/plugins/simulator/emulatedconfig/simulatoremulatedconfig.cpp b/src/plugins/simulator/emulatedconfig/simulatoremulatedconfig.cpp
index 03d466978..5f7ca018f 100644
--- a/src/plugins/simulator/emulatedconfig/simulatoremulatedconfig.cpp
+++ b/src/plugins/simulator/emulatedconfig/simulatoremulatedconfig.cpp
@@ -11,7 +11,7 @@ namespace BlackSimPlugin::Emulated
         // void
     }
 
-    BlackGui::CPluginConfigWindow *CSimulatorEmulatedConfig::createConfigWindow(QWidget *parent)
+    swift::gui::CPluginConfigWindow *CSimulatorEmulatedConfig::createConfigWindow(QWidget *parent)
     {
         return new CSimulatorEmulatedConfigWidget(parent);
     }
diff --git a/src/plugins/simulator/emulatedconfig/simulatoremulatedconfig.h b/src/plugins/simulator/emulatedconfig/simulatoremulatedconfig.h
index 2c488101d..a1eb3c9f2 100644
--- a/src/plugins/simulator/emulatedconfig/simulatoremulatedconfig.h
+++ b/src/plugins/simulator/emulatedconfig/simulatoremulatedconfig.h
@@ -6,18 +6,18 @@
 #ifndef BLACKSIMPLUGIN_EMULATED_SIMULATOREMULATEDCONFIG_H
 #define BLACKSIMPLUGIN_EMULATED_SIMULATOREMULATEDCONFIG_H
 
-#include "blackgui/pluginconfig.h"
+#include "gui/pluginconfig.h"
 
 namespace BlackSimPlugin::Emulated
 {
     /*!
      * Window for setting up the FSX plugin.
      */
-    class CSimulatorEmulatedConfig : public QObject, public BlackGui::IPluginConfig
+    class CSimulatorEmulatedConfig : public QObject, public swift::gui::IPluginConfig
     {
         Q_OBJECT
-        Q_PLUGIN_METADATA(IID "org.swift-project.blackgui.pluginconfiginterface" FILE "simulatoremulatedconfig.json")
-        Q_INTERFACES(BlackGui::IPluginConfig)
+        Q_PLUGIN_METADATA(IID "org.swift-project.swiftgui.pluginconfiginterface" FILE "simulatoremulatedconfig.json")
+        Q_INTERFACES(swift::gui::IPluginConfig)
 
     public:
         //! Ctor
@@ -26,8 +26,8 @@ namespace BlackSimPlugin::Emulated
         //! Dtor
         virtual ~CSimulatorEmulatedConfig() override {}
 
-        //! \copydoc BlackGui::IPluginConfig::createConfigWindow()
-        BlackGui::CPluginConfigWindow *createConfigWindow(QWidget *parent) override;
+        //! \copydoc swift::gui::IPluginConfig::createConfigWindow()
+        swift::gui::CPluginConfigWindow *createConfigWindow(QWidget *parent) override;
     };
 } // ns
 
diff --git a/src/plugins/simulator/emulatedconfig/simulatoremulatedconfigwidget.cpp b/src/plugins/simulator/emulatedconfig/simulatoremulatedconfigwidget.cpp
index 95c883154..1a21f8d8b 100644
--- a/src/plugins/simulator/emulatedconfig/simulatoremulatedconfigwidget.cpp
+++ b/src/plugins/simulator/emulatedconfig/simulatoremulatedconfigwidget.cpp
@@ -4,11 +4,11 @@
 #include "simulatoremulatedconfigwidget.h"
 #include "ui_simulatoremulatedconfigwidget.h"
 
-using namespace BlackGui;
+using namespace swift::gui;
 
 namespace BlackSimPlugin::Emulated
 {
-    CSimulatorEmulatedConfigWidget::CSimulatorEmulatedConfigWidget(QWidget *parent) : BlackGui::CPluginConfigWindow(parent),
+    CSimulatorEmulatedConfigWidget::CSimulatorEmulatedConfigWidget(QWidget *parent) : swift::gui::CPluginConfigWindow(parent),
                                                                                       ui(new Ui::CSimulatorEmulatedConfigWidget)
     {
         ui->setupUi(this);
diff --git a/src/plugins/simulator/emulatedconfig/simulatoremulatedconfigwidget.h b/src/plugins/simulator/emulatedconfig/simulatoremulatedconfigwidget.h
index 19a3f479d..62ffeff5b 100644
--- a/src/plugins/simulator/emulatedconfig/simulatoremulatedconfigwidget.h
+++ b/src/plugins/simulator/emulatedconfig/simulatoremulatedconfigwidget.h
@@ -6,7 +6,7 @@
 #ifndef BLACKSIMPLUGIN_EMULATED_SIMULATOREMULATEDCONFIGWIDGET_H
 #define BLACKSIMPLUGIN_EMULATED_SIMULATOREMULATEDCONFIGWIDGET_H
 
-#include <blackgui/pluginconfigwindow.h>
+#include "gui/pluginconfigwindow.h"
 #include <QScopedPointer>
 
 namespace Ui
@@ -18,7 +18,7 @@ namespace BlackSimPlugin::Emulated
     /*!
      * Configuration window for CSimulatorEmulatedConfig
      */
-    class Q_DECL_EXPORT CSimulatorEmulatedConfigWidget : public BlackGui::CPluginConfigWindow
+    class Q_DECL_EXPORT CSimulatorEmulatedConfigWidget : public swift::gui::CPluginConfigWindow
     {
         Q_OBJECT
 
diff --git a/src/plugins/simulator/emulatedconfig/simulatoremulatedconfigwidget.ui b/src/plugins/simulator/emulatedconfig/simulatoremulatedconfigwidget.ui
index e1f6cff5e..65057ee41 100644
--- a/src/plugins/simulator/emulatedconfig/simulatoremulatedconfigwidget.ui
+++ b/src/plugins/simulator/emulatedconfig/simulatoremulatedconfigwidget.ui
@@ -21,7 +21,7 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <widget class="BlackGui::Components::CSettingsSwiftPlugin" name="comp_Settings">
+    <widget class="swift::gui::components::CSettingsSwiftPlugin" name="comp_Settings">
      <property name="frameShape">
       <enum>QFrame::StyledPanel</enum>
      </property>
@@ -44,9 +44,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CSettingsSwiftPlugin</class>
+   <class>swift::gui::components::CSettingsSwiftPlugin</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/settingsswiftplugin.h</header>
+   <header>gui/components/settingsswiftplugin.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/plugins/simulator/flightgearconfig/simulatorflightgearconfig.cpp b/src/plugins/simulator/flightgearconfig/simulatorflightgearconfig.cpp
index 870ea338a..c4595e4c0 100644
--- a/src/plugins/simulator/flightgearconfig/simulatorflightgearconfig.cpp
+++ b/src/plugins/simulator/flightgearconfig/simulatorflightgearconfig.cpp
@@ -12,7 +12,7 @@ namespace BlackSimPlugin::Flightgear
     {
     }
 
-    BlackGui::CPluginConfigWindow *CSimulatorFlightgearConfig::createConfigWindow(QWidget *parent)
+    swift::gui::CPluginConfigWindow *CSimulatorFlightgearConfig::createConfigWindow(QWidget *parent)
     {
         CSimulatorFlightgearConfigWindow *w = new CSimulatorFlightgearConfigWindow(parent);
         return w;
diff --git a/src/plugins/simulator/flightgearconfig/simulatorflightgearconfig.h b/src/plugins/simulator/flightgearconfig/simulatorflightgearconfig.h
index 2373779c9..dfef17917 100644
--- a/src/plugins/simulator/flightgearconfig/simulatorflightgearconfig.h
+++ b/src/plugins/simulator/flightgearconfig/simulatorflightgearconfig.h
@@ -6,7 +6,7 @@
 #ifndef BLACKSIMPLUGIN_SIMULATOR_FLIGHTGEAR_CONFIG_H
 #define BLACKSIMPLUGIN_SIMULATOR_FLIGHTGEAR_CONFIG_H
 
-#include "blackgui/pluginconfig.h"
+#include "gui/pluginconfig.h"
 #include "misc/settingscache.h"
 
 #include <QObject>
@@ -14,7 +14,7 @@
 
 class QWidget;
 
-namespace BlackGui
+namespace swift::gui
 {
     class CPluginConfigWindow;
 }
@@ -23,11 +23,11 @@ namespace BlackSimPlugin::Flightgear
     /*!
      * Config plugin for the Flightgear plugin.
      */
-    class CSimulatorFlightgearConfig : public QObject, public BlackGui::IPluginConfig
+    class CSimulatorFlightgearConfig : public QObject, public swift::gui::IPluginConfig
     {
         Q_OBJECT
-        Q_PLUGIN_METADATA(IID "org.swift-project.blackgui.pluginconfiginterface" FILE "simulatorflightgearconfig.json")
-        Q_INTERFACES(BlackGui::IPluginConfig)
+        Q_PLUGIN_METADATA(IID "org.swift-project.swiftgui.pluginconfiginterface" FILE "simulatorflightgearconfig.json")
+        Q_INTERFACES(swift::gui::IPluginConfig)
 
     public:
         //! Ctor
@@ -36,8 +36,8 @@ namespace BlackSimPlugin::Flightgear
         //! Dtor
         virtual ~CSimulatorFlightgearConfig() {}
 
-        //! \copydoc BlackGui::IPluginConfig::createConfigWindow()
-        BlackGui::CPluginConfigWindow *createConfigWindow(QWidget *parent) override;
+        //! \copydoc swift::gui::IPluginConfig::createConfigWindow()
+        swift::gui::CPluginConfigWindow *createConfigWindow(QWidget *parent) override;
     };
 } // ns
 
diff --git a/src/plugins/simulator/flightgearconfig/simulatorflightgearconfigwindow.cpp b/src/plugins/simulator/flightgearconfig/simulatorflightgearconfigwindow.cpp
index 8c35bf6bc..de2a3104f 100644
--- a/src/plugins/simulator/flightgearconfig/simulatorflightgearconfigwindow.cpp
+++ b/src/plugins/simulator/flightgearconfig/simulatorflightgearconfigwindow.cpp
@@ -4,12 +4,12 @@
 #include "ui_simulatorflightgearconfigwindow.h"
 #include "simulatorflightgearconfigwindow.h"
 #include "core/application.h"
-#include "blackgui/guiapplication.h"
+#include "gui/guiapplication.h"
 
 #include <QComboBox>
 #include <QDialogButtonBox>
 
-using namespace BlackGui;
+using namespace swift::gui;
 using namespace swift::misc;
 using namespace swift::misc::simulation::settings;
 // using namespace swift::misc::simulation::Flightgear;
diff --git a/src/plugins/simulator/flightgearconfig/simulatorflightgearconfigwindow.h b/src/plugins/simulator/flightgearconfig/simulatorflightgearconfigwindow.h
index 35cb36f19..dd2393937 100644
--- a/src/plugins/simulator/flightgearconfig/simulatorflightgearconfigwindow.h
+++ b/src/plugins/simulator/flightgearconfig/simulatorflightgearconfigwindow.h
@@ -6,7 +6,7 @@
 #ifndef BLACKSIMPLUGIN_SIMULATOR_FLIGHTGEAR_CONFIG_WINDOW_H
 #define BLACKSIMPLUGIN_SIMULATOR_FLIGHTGEAR_CONFIG_WINDOW_H
 
-#include "blackgui/pluginconfigwindow.h"
+#include "gui/pluginconfigwindow.h"
 #include "misc/simulation/settings/fgswiftbussettings.h"
 #include "simulatorflightgearconfig.h"
 #include <QObject>
@@ -21,7 +21,7 @@ namespace BlackSimPlugin::Flightgear
     /*!
      * A window that shows all the Flightgear plugin options.
      */
-    class CSimulatorFlightgearConfigWindow : public BlackGui::CPluginConfigWindow
+    class CSimulatorFlightgearConfigWindow : public swift::gui::CPluginConfigWindow
     {
         Q_OBJECT
 
diff --git a/src/plugins/simulator/flightgearconfig/simulatorflightgearconfigwindow.ui b/src/plugins/simulator/flightgearconfig/simulatorflightgearconfigwindow.ui
index dfc7e17ea..920ab4c9e 100644
--- a/src/plugins/simulator/flightgearconfig/simulatorflightgearconfigwindow.ui
+++ b/src/plugins/simulator/flightgearconfig/simulatorflightgearconfigwindow.ui
@@ -44,7 +44,7 @@
      </property>
      <layout class="QVBoxLayout" name="verticalLayout">
       <item>
-       <widget class="BlackGui::Components::CDBusServerAddressSelector" name="comp_SettingsFGSwiftBus">
+       <widget class="swift::gui::components::CDBusServerAddressSelector" name="comp_SettingsFGSwiftBus">
         <property name="minimumSize">
          <size>
           <width>0</width>
@@ -60,9 +60,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CDBusServerAddressSelector</class>
+   <class>swift::gui::components::CDBusServerAddressSelector</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/dbusserveraddressselector.h</header>
+   <header>gui/components/dbusserveraddressselector.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/plugins/simulator/fs9/fs9client.h b/src/plugins/simulator/fs9/fs9client.h
index d4f5a0d8f..cc89f2c29 100644
--- a/src/plugins/simulator/fs9/fs9client.h
+++ b/src/plugins/simulator/fs9/fs9client.h
@@ -96,7 +96,7 @@ namespace BlackSimPlugin::Fs9
         void handleConnectionCompleted();
 
         //! Simulator interface
-        const swift::core::ISimulator *simulator() const;
+        const swift::coree::ISimulator *simulator() const;
 
         swift::misc::simulation::CSimulatedAircraft m_remoteAircraft;
         swift::misc::physical_quantities::CTime m_updateInterval;
diff --git a/src/plugins/simulator/fsxcommon/fsxsettingscomponent.cpp b/src/plugins/simulator/fsxcommon/fsxsettingscomponent.cpp
index 0eeb8cd8d..335aadf6c 100644
--- a/src/plugins/simulator/fsxcommon/fsxsettingscomponent.cpp
+++ b/src/plugins/simulator/fsxcommon/fsxsettingscomponent.cpp
@@ -4,8 +4,8 @@
 #include "fsxsettingscomponent.h"
 #include "ui_fsxsettingscomponent.h"
 #include "simulatorfsxcommon.h"
-#include "blackgui/overlaymessagesframe.h"
-#include "blackgui/guiapplication.h"
+#include "gui/overlaymessagesframe.h"
+#include "gui/guiapplication.h"
 #include "core/context/contextsimulator.h"
 #include "config/buildconfig.h"
 
@@ -14,7 +14,7 @@
 
 using namespace swift::core;
 using namespace swift::core::context;
-using namespace BlackGui;
+using namespace swift::gui;
 using namespace swift::misc;
 using namespace swift::misc::simulation;
 using namespace swift::config;
diff --git a/src/plugins/simulator/fsxcommon/fsxsettingscomponent.h b/src/plugins/simulator/fsxcommon/fsxsettingscomponent.h
index 07f31920d..5a90fbb07 100644
--- a/src/plugins/simulator/fsxcommon/fsxsettingscomponent.h
+++ b/src/plugins/simulator/fsxcommon/fsxsettingscomponent.h
@@ -16,7 +16,7 @@ namespace Ui
 {
     class CFsxSettingsComponent;
 }
-namespace BlackGui
+namespace swift::gui
 {
     class COverlayMessagesFrame;
 }
@@ -68,7 +68,7 @@ namespace BlackSimPlugin::FsxCommon
         CSimulatorFsxCommon *getFsxOrP3DSimulator() const;
 
         swift::misc::simulation::CSimulatorInfo m_simulator { "FSX" };
-        BlackGui::COverlayMessagesFrame *m_mf = nullptr;
+        swift::gui::COverlayMessagesFrame *m_mf = nullptr;
         QScopedPointer<Ui::CFsxSettingsComponent> ui;
     };
 } // ns
diff --git a/src/plugins/simulator/fsxcommon/simconnectsettingscomponent.cpp b/src/plugins/simulator/fsxcommon/simconnectsettingscomponent.cpp
index 97a0042a2..225c2e354 100644
--- a/src/plugins/simulator/fsxcommon/simconnectsettingscomponent.cpp
+++ b/src/plugins/simulator/fsxcommon/simconnectsettingscomponent.cpp
@@ -3,7 +3,7 @@
 
 #include "simconnectsettingscomponent.h"
 #include "ui_simconnectsettingscomponent.h"
-#include "blackgui/guiapplication.h"
+#include "gui/guiapplication.h"
 #include "core/context/contextapplication.h"
 #include "core/context/contextsimulator.h"
 #include "misc/simulation/fsx/simconnectutilities.h"
@@ -22,7 +22,7 @@ using namespace swift::misc;
 using namespace swift::misc::simulation;
 using namespace swift::misc::simulation::Fsx;
 using namespace swift::misc::network;
-using namespace BlackGui;
+using namespace swift::gui;
 
 namespace BlackSimPlugin::FsxCommon
 {
diff --git a/src/plugins/simulator/fsxcommon/simconnectsettingscomponent.h b/src/plugins/simulator/fsxcommon/simconnectsettingscomponent.h
index d9519f710..b3f52d2c0 100644
--- a/src/plugins/simulator/fsxcommon/simconnectsettingscomponent.h
+++ b/src/plugins/simulator/fsxcommon/simconnectsettingscomponent.h
@@ -7,7 +7,7 @@
 #define BLACKSIMPLUGIN_FSXCOMMON_SIMCONNECTSETTINGSCOMPONENT_H
 
 #include "plugins/simulator/fsxcommon/fsxcommonexport.h"
-#include "blackgui/overlaymessagesframe.h"
+#include "gui/overlaymessagesframe.h"
 #include "misc/settingscache.h"
 #include "misc/simulation/settings/simulatorsettings.h"
 #include "misc/simulation/simulatorinfo.h"
@@ -23,7 +23,7 @@ namespace BlackSimPlugin::FsxCommon
     /*!
      * A component that gathers all SimConnect related settings.
      */
-    class FSXCOMMON_EXPORT CSimConnectSettingsComponent : public BlackGui::COverlayMessagesFrame
+    class FSXCOMMON_EXPORT CSimConnectSettingsComponent : public swift::gui::COverlayMessagesFrame
     {
         Q_OBJECT
 
diff --git a/src/plugins/simulator/fsxcommon/simulatorfsxconfigwindow.cpp b/src/plugins/simulator/fsxcommon/simulatorfsxconfigwindow.cpp
index 4b8da559b..71937ca86 100644
--- a/src/plugins/simulator/fsxcommon/simulatorfsxconfigwindow.cpp
+++ b/src/plugins/simulator/fsxcommon/simulatorfsxconfigwindow.cpp
@@ -4,7 +4,7 @@
 #include "simulatorfsxconfigwindow.h"
 #include "ui_simulatorfsxconfigwindow.h"
 
-using namespace BlackGui;
+using namespace swift::gui;
 
 namespace BlackSimPlugin::FsxCommon
 {
diff --git a/src/plugins/simulator/fsxcommon/simulatorfsxconfigwindow.h b/src/plugins/simulator/fsxcommon/simulatorfsxconfigwindow.h
index 1bfafc8c1..ded733fa6 100644
--- a/src/plugins/simulator/fsxcommon/simulatorfsxconfigwindow.h
+++ b/src/plugins/simulator/fsxcommon/simulatorfsxconfigwindow.h
@@ -7,7 +7,7 @@
 #define BLACKSIMPLUGIN_FSXCOMMON_SIMULATORFSXCONFIGWINDOW_H
 
 #include "plugins/simulator/fsxcommon/fsxcommonexport.h"
-#include "blackgui/pluginconfigwindow.h"
+#include "gui/pluginconfigwindow.h"
 #include "misc/simulation/simulatorinfo.h"
 #include <QScopedPointer>
 
@@ -20,7 +20,7 @@ namespace BlackSimPlugin::FsxCommon
     /*!
      * A window that lets user set up the FSX plugin.
      */
-    class FSXCOMMON_EXPORT CSimulatorFsxConfigWindow : public BlackGui::CPluginConfigWindow
+    class FSXCOMMON_EXPORT CSimulatorFsxConfigWindow : public swift::gui::CPluginConfigWindow
     {
         Q_OBJECT
 
diff --git a/src/plugins/simulator/fsxconfig/simulatorfsxconfig.cpp b/src/plugins/simulator/fsxconfig/simulatorfsxconfig.cpp
index d759f232f..5d9ea92bb 100644
--- a/src/plugins/simulator/fsxconfig/simulatorfsxconfig.cpp
+++ b/src/plugins/simulator/fsxconfig/simulatorfsxconfig.cpp
@@ -4,7 +4,7 @@
 #include "simulatorfsxconfig.h"
 #include "../fsxcommon/simulatorfsxconfigwindow.h"
 
-using namespace BlackGui;
+using namespace swift::gui;
 using namespace BlackSimPlugin::FsxCommon;
 
 namespace BlackSimPlugin::Fsx
diff --git a/src/plugins/simulator/fsxconfig/simulatorfsxconfig.h b/src/plugins/simulator/fsxconfig/simulatorfsxconfig.h
index 2a2c55540..7e272af28 100644
--- a/src/plugins/simulator/fsxconfig/simulatorfsxconfig.h
+++ b/src/plugins/simulator/fsxconfig/simulatorfsxconfig.h
@@ -6,7 +6,7 @@
 #ifndef BLACKSIMPLUGIN_SIMULATOR_FSX_CONFIG_H
 #define BLACKSIMPLUGIN_SIMULATOR_FSX_CONFIG_H
 
-#include "blackgui/pluginconfig.h"
+#include "gui/pluginconfig.h"
 #include "misc/settingscache.h"
 
 namespace BlackSimPlugin::Fsx
@@ -14,11 +14,11 @@ namespace BlackSimPlugin::Fsx
     /*!
      * Window for setting up the FSX plugin.
      */
-    class CSimulatorFsxConfig : public QObject, public BlackGui::IPluginConfig
+    class CSimulatorFsxConfig : public QObject, public swift::gui::IPluginConfig
     {
         Q_OBJECT
-        Q_PLUGIN_METADATA(IID "org.swift-project.blackgui.pluginconfiginterface" FILE "simulatorfsxconfig.json")
-        Q_INTERFACES(BlackGui::IPluginConfig)
+        Q_PLUGIN_METADATA(IID "org.swift-project.swiftgui.pluginconfiginterface" FILE "simulatorfsxconfig.json")
+        Q_INTERFACES(swift::gui::IPluginConfig)
 
     public:
         //! Ctor
@@ -27,8 +27,8 @@ namespace BlackSimPlugin::Fsx
         //! Dtor
         virtual ~CSimulatorFsxConfig() override {}
 
-        //! \copydoc BlackGui::IPluginConfig::createConfigWindow()
-        BlackGui::CPluginConfigWindow *createConfigWindow(QWidget *parent) override;
+        //! \copydoc swift::gui::IPluginConfig::createConfigWindow()
+        swift::gui::CPluginConfigWindow *createConfigWindow(QWidget *parent) override;
     };
 } // ns
 
diff --git a/src/plugins/simulator/p3dconfig/simulatorp3dconfig.cpp b/src/plugins/simulator/p3dconfig/simulatorp3dconfig.cpp
index 807ac0700..47e9b2ac9 100644
--- a/src/plugins/simulator/p3dconfig/simulatorp3dconfig.cpp
+++ b/src/plugins/simulator/p3dconfig/simulatorp3dconfig.cpp
@@ -11,7 +11,7 @@ namespace BlackSimPlugin::P3D
         // void
     }
 
-    BlackGui::CPluginConfigWindow *CSimulatorP3DConfig::createConfigWindow(QWidget *parent)
+    swift::gui::CPluginConfigWindow *CSimulatorP3DConfig::createConfigWindow(QWidget *parent)
     {
         return new FsxCommon::CSimulatorFsxConfigWindow("P3D", parent);
     }
diff --git a/src/plugins/simulator/p3dconfig/simulatorp3dconfig.h b/src/plugins/simulator/p3dconfig/simulatorp3dconfig.h
index 899aed56b..5fdf0e749 100644
--- a/src/plugins/simulator/p3dconfig/simulatorp3dconfig.h
+++ b/src/plugins/simulator/p3dconfig/simulatorp3dconfig.h
@@ -6,18 +6,18 @@
 #ifndef BLACKSIMPLUGIN_P3D_SIMULATORP3DCONFIG_H
 #define BLACKSIMPLUGIN_P3D_SIMULATORP3DCONFIG_H
 
-#include "blackgui/pluginconfig.h"
+#include "gui/pluginconfig.h"
 
 namespace BlackSimPlugin::P3D
 {
     /*!
      * Window for setting up the P3D plugin.
      */
-    class CSimulatorP3DConfig : public QObject, public BlackGui::IPluginConfig
+    class CSimulatorP3DConfig : public QObject, public swift::gui::IPluginConfig
     {
         Q_OBJECT
-        Q_PLUGIN_METADATA(IID "org.swift-project.blackgui.pluginconfiginterface" FILE "simulatorp3dconfig.json")
-        Q_INTERFACES(BlackGui::IPluginConfig)
+        Q_PLUGIN_METADATA(IID "org.swift-project.swiftgui.pluginconfiginterface" FILE "simulatorp3dconfig.json")
+        Q_INTERFACES(swift::gui::IPluginConfig)
 
     public:
         //! Ctor
@@ -26,8 +26,8 @@ namespace BlackSimPlugin::P3D
         //! Dtor
         virtual ~CSimulatorP3DConfig() {}
 
-        //! \copydoc BlackGui::IPluginConfig::createConfigWindow()
-        BlackGui::CPluginConfigWindow *createConfigWindow(QWidget *parent) override;
+        //! \copydoc swift::gui::IPluginConfig::createConfigWindow()
+        swift::gui::CPluginConfigWindow *createConfigWindow(QWidget *parent) override;
     };
 }
 
diff --git a/src/plugins/simulator/plugincommon/simulatorplugincommon.cpp b/src/plugins/simulator/plugincommon/simulatorplugincommon.cpp
index 09bb647e8..f767eb904 100644
--- a/src/plugins/simulator/plugincommon/simulatorplugincommon.cpp
+++ b/src/plugins/simulator/plugincommon/simulatorplugincommon.cpp
@@ -2,12 +2,12 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "simulatorplugincommon.h"
-#include "blackgui/components/interpolationlogdisplaydialog.h"
-#include "blackgui/guiapplication.h"
+#include "gui/components/interpolationlogdisplaydialog.h"
+#include "gui/guiapplication.h"
 #include "misc/simplecommandparser.h"
 
-using namespace BlackGui;
-using namespace BlackGui::Components;
+using namespace swift::gui;
+using namespace swift::gui::components;
 using namespace swift::core;
 using namespace swift::misc;
 using namespace swift::misc::network;
diff --git a/src/plugins/simulator/plugincommon/simulatorplugincommon.h b/src/plugins/simulator/plugincommon/simulatorplugincommon.h
index 4860a2737..73870733a 100644
--- a/src/plugins/simulator/plugincommon/simulatorplugincommon.h
+++ b/src/plugins/simulator/plugincommon/simulatorplugincommon.h
@@ -11,7 +11,7 @@
 #include <QObject>
 #include <QPointer>
 
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     class CInterpolationLogDisplayDialog;
 }
@@ -57,7 +57,7 @@ namespace BlackSimPlugin::Common
         //! Clean up the interpolation log.display if any
         void deleteInterpolationDisplay();
 
-        QPointer<BlackGui::Components::CInterpolationLogDisplayDialog> m_interpolationDisplayDialog; //!< can be owned by main window after setting a parent
+        QPointer<swift::gui::components::CInterpolationLogDisplayDialog> m_interpolationDisplayDialog; //!< can be owned by main window after setting a parent
     };
 } // namespace
 
diff --git a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfig.cpp b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfig.cpp
index a23b3ef06..8432da5ad 100644
--- a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfig.cpp
+++ b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfig.cpp
@@ -13,7 +13,7 @@ namespace BlackSimPlugin::XPlane
         // void
     }
 
-    BlackGui::CPluginConfigWindow *CSimulatorXPlaneConfig::createConfigWindow(QWidget *parent)
+    swift::gui::CPluginConfigWindow *CSimulatorXPlaneConfig::createConfigWindow(QWidget *parent)
     {
         CSimulatorXPlaneConfigWindow *w = new CSimulatorXPlaneConfigWindow(parent);
         return w;
diff --git a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfig.h b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfig.h
index 7eb7394b4..826afd602 100644
--- a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfig.h
+++ b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfig.h
@@ -6,7 +6,7 @@
 #ifndef BLACKSIMPLUGIN_SIMULATOR_XPLANE_CONFIG_H
 #define BLACKSIMPLUGIN_SIMULATOR_XPLANE_CONFIG_H
 
-#include "blackgui/pluginconfig.h"
+#include "gui/pluginconfig.h"
 #include "misc/settingscache.h"
 
 #include <QObject>
@@ -14,7 +14,7 @@
 
 class QWidget;
 
-namespace BlackGui
+namespace swift::gui
 {
     class CPluginConfigWindow;
 }
@@ -23,11 +23,11 @@ namespace BlackSimPlugin::XPlane
     /*!
      * Config plugin for the X-Plane plugin.
      */
-    class CSimulatorXPlaneConfig : public QObject, public BlackGui::IPluginConfig
+    class CSimulatorXPlaneConfig : public QObject, public swift::gui::IPluginConfig
     {
         Q_OBJECT
-        Q_PLUGIN_METADATA(IID "org.swift-project.blackgui.pluginconfiginterface" FILE "simulatorxplaneconfig.json")
-        Q_INTERFACES(BlackGui::IPluginConfig)
+        Q_PLUGIN_METADATA(IID "org.swift-project.swiftgui.pluginconfiginterface" FILE "simulatorxplaneconfig.json")
+        Q_INTERFACES(swift::gui::IPluginConfig)
 
     public:
         //! Ctor
@@ -36,8 +36,8 @@ namespace BlackSimPlugin::XPlane
         //! Dtor
         virtual ~CSimulatorXPlaneConfig() override {}
 
-        //! \copydoc BlackGui::IPluginConfig::createConfigWindow()
-        BlackGui::CPluginConfigWindow *createConfigWindow(QWidget *parent) override;
+        //! \copydoc swift::gui::IPluginConfig::createConfigWindow()
+        swift::gui::CPluginConfigWindow *createConfigWindow(QWidget *parent) override;
     };
 } // ns
 
diff --git a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.cpp b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.cpp
index 86b94eea6..0415492bd 100644
--- a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.cpp
+++ b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.cpp
@@ -4,14 +4,14 @@
 #include "ui_simulatorxplaneconfigwindow.h"
 #include "simulatorxplaneconfigwindow.h"
 #include "core/context/contextsimulator.h"
-#include "blackgui/guiapplication.h"
+#include "gui/guiapplication.h"
 #include "misc/simulation/xplane/xswiftbusconfigwriter.h"
 
 #include <QComboBox>
 #include <QDialogButtonBox>
 #include <vector>
 
-using namespace BlackGui;
+using namespace swift::gui;
 using namespace swift::core::context;
 using namespace swift::misc;
 using namespace swift::misc::simulation::settings;
diff --git a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.h b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.h
index 02733120c..31d575443 100644
--- a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.h
+++ b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.h
@@ -6,7 +6,7 @@
 #ifndef BLACKSIMPLUGIN_SIMULATOR_XPLANE_CONFIG_WINDOW_H
 #define BLACKSIMPLUGIN_SIMULATOR_XPLANE_CONFIG_WINDOW_H
 
-#include "blackgui/pluginconfigwindow.h"
+#include "gui/pluginconfigwindow.h"
 #include "misc/simulation/settings/xswiftbussettings.h"
 #include "simulatorxplaneconfig.h"
 #include <QObject>
@@ -21,7 +21,7 @@ namespace BlackSimPlugin::XPlane
     /*!
      * A window that shows all the X-Plane plugin options.
      */
-    class CSimulatorXPlaneConfigWindow : public BlackGui::CPluginConfigWindow
+    class CSimulatorXPlaneConfigWindow : public swift::gui::CPluginConfigWindow
     {
         Q_OBJECT
 
diff --git a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.ui b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.ui
index b16b7cc39..51aac68f2 100644
--- a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.ui
+++ b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.ui
@@ -54,7 +54,7 @@
        <number>3</number>
       </property>
       <item>
-       <widget class="BlackGui::Components::CDBusServerAddressSelector" name="comp_SettingsXSwiftBus">
+       <widget class="swift::gui::components::CDBusServerAddressSelector" name="comp_SettingsXSwiftBus">
         <property name="minimumSize">
          <size>
           <width>0</width>
@@ -142,7 +142,7 @@
        </widget>
       </item>
       <item row="4" column="1">
-       <widget class="BlackGui::Components::CColorSelector" name="cs_LabelColor" />
+       <widget class="swift::gui::components::CColorSelector" name="cs_LabelColor" />
       </item>
       <item row="5" column="0">
        <widget class="QLabel" name="lbl_BundleLights">
@@ -350,11 +350,11 @@
          <property name="bottomMargin">
           <number>0</number>
          </property>
-         <item row="1" column="0"><widget class="BlackGui::Components::CColorSelector" name="cs_ColorFreq" /></item>
-         <item row="1" column="1"><widget class="BlackGui::Components::CColorSelector" name="cs_ColorPriv" /></item>
-         <item row="1" column="2"><widget class="BlackGui::Components::CColorSelector" name="cs_ColorServ" /></item>
-         <item row="1" column="3"><widget class="BlackGui::Components::CColorSelector" name="cs_ColorStat" /></item>
-         <item row="1" column="4"><widget class="BlackGui::Components::CColorSelector" name="cs_ColorSup" /></item>
+         <item row="1" column="0"><widget class="swift::gui::components::CColorSelector" name="cs_ColorFreq" /></item>
+         <item row="1" column="1"><widget class="swift::gui::components::CColorSelector" name="cs_ColorPriv" /></item>
+         <item row="1" column="2"><widget class="swift::gui::components::CColorSelector" name="cs_ColorServ" /></item>
+         <item row="1" column="3"><widget class="swift::gui::components::CColorSelector" name="cs_ColorStat" /></item>
+         <item row="1" column="4"><widget class="swift::gui::components::CColorSelector" name="cs_ColorSup" /></item>
          <item row="0" column="0">
           <widget class="QLabel" name="lbl_ColorFreq">
            <property name="text">
@@ -478,15 +478,15 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CDBusServerAddressSelector</class>
+   <class>swift::gui::components::CDBusServerAddressSelector</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/dbusserveraddressselector.h</header>
+   <header>gui/components/dbusserveraddressselector.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CColorSelector</class>
+   <class>swift::gui::components::CColorSelector</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/colorselector.h</header>
+   <header>gui/components/colorselector.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/swiftcore/main.cpp b/src/swiftcore/main.cpp
index faa4b4f90..68e050c25 100644
--- a/src/swiftcore/main.cpp
+++ b/src/swiftcore/main.cpp
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "core/corefacadeconfig.h"
-#include "blackgui/guiapplication.h"
+#include "gui/guiapplication.h"
 #include "misc/icons.h"
 #include "misc/crashhandler.h"
 #include "swiftcore.h"
@@ -15,7 +15,7 @@
 
 using namespace swift::misc;
 using namespace swift::core;
-using namespace BlackGui;
+using namespace swift::gui;
 
 int main(int argc, char *argv[])
 {
diff --git a/src/swiftcore/swiftcore.cpp b/src/swiftcore/swiftcore.cpp
index 260a5a870..11caa7a61 100644
--- a/src/swiftcore/swiftcore.cpp
+++ b/src/swiftcore/swiftcore.cpp
@@ -2,15 +2,15 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "swiftcore.h"
-#include "blackgui/components/commandinput.h"
-#include "blackgui/components/coreinfoareacomponent.h"
-#include "blackgui/components/coresettingsdialog.h"
-#include "blackgui/components/cockpitcomaudiodialog.h"
-#include "blackgui/components/audioadvanceddistributeddialog.h"
-#include "blackgui/components/logcomponent.h"
-#include "blackgui/components/rawfsdmessagesdialog.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/stylesheetutility.h"
+#include "gui/components/commandinput.h"
+#include "gui/components/coreinfoareacomponent.h"
+#include "gui/components/coresettingsdialog.h"
+#include "gui/components/cockpitcomaudiodialog.h"
+#include "gui/components/audioadvanceddistributeddialog.h"
+#include "gui/components/logcomponent.h"
+#include "gui/components/rawfsdmessagesdialog.h"
+#include "gui/guiapplication.h"
+#include "gui/stylesheetutility.h"
 #include "core/context/contextaudio.h"
 #include "core/context/contextnetwork.h"
 #include "core/corefacade.h"
@@ -33,8 +33,8 @@
 
 using namespace swift::misc;
 using namespace swift::core;
-using namespace BlackGui;
-using namespace BlackGui::Components;
+using namespace swift::gui;
+using namespace swift::gui::components;
 
 CSwiftCore::CSwiftCore(QWidget *parent) : CSystemTrayWindow(CIcons::swiftCore24(), parent),
                                           CIdentifiable(this),
diff --git a/src/swiftcore/swiftcore.h b/src/swiftcore/swiftcore.h
index e619c4af1..4d9e552fc 100644
--- a/src/swiftcore/swiftcore.h
+++ b/src/swiftcore/swiftcore.h
@@ -7,8 +7,8 @@
 #define SWIFTCORE_H
 
 #include "core/coremodeenums.h"
-#include "blackgui/mainwindowaccess.h"
-#include "blackgui/systemtraywindow.h"
+#include "gui/mainwindowaccess.h"
+#include "gui/systemtraywindow.h"
 #include "misc/identifiable.h"
 #include "misc/statusmessage.h"
 
@@ -17,7 +17,7 @@
 #include <QString>
 
 class QWidget;
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     class CCoreSettingsDialog;
     class CRawFsdMessagesDialog;
@@ -33,12 +33,12 @@ namespace Ui
  * swift core control GUI
  */
 class CSwiftCore :
-    public BlackGui::CSystemTrayWindow,
-    public BlackGui::IMainWindowAccess,
+    public swift::gui::CSystemTrayWindow,
+    public swift::gui::IMainWindowAccess,
     public swift::misc::CIdentifiable
 {
     Q_OBJECT
-    Q_INTERFACES(BlackGui::IMainWindowAccess)
+    Q_INTERFACES(swift::gui::IMainWindowAccess)
 
 public:
     //! Constructor
@@ -82,10 +82,10 @@ private:
     //! Restart CMD args
     QStringList getRestartCmdArgs() const;
 
-    QScopedPointer<BlackGui::Components::CCoreSettingsDialog> m_settingsDialog;
-    QScopedPointer<BlackGui::Components::CRawFsdMessagesDialog> m_rawFsdMessageDialog;
-    QScopedPointer<BlackGui::Components::CCockpitComAudioDialog> m_audioDialog;
-    QScopedPointer<BlackGui::Components::CAudioAdvancedDistributedDialog> m_audioAdvDialog;
+    QScopedPointer<swift::gui::components::CCoreSettingsDialog> m_settingsDialog;
+    QScopedPointer<swift::gui::components::CRawFsdMessagesDialog> m_rawFsdMessageDialog;
+    QScopedPointer<swift::gui::components::CCockpitComAudioDialog> m_audioDialog;
+    QScopedPointer<swift::gui::components::CAudioAdvancedDistributedDialog> m_audioAdvDialog;
 
     QScopedPointer<Ui::CSwiftCore> ui;
 };
diff --git a/src/swiftcore/swiftcore.ui b/src/swiftcore/swiftcore.ui
index aa0f29bcb..32c76851e 100644
--- a/src/swiftcore/swiftcore.ui
+++ b/src/swiftcore/swiftcore.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>CSwiftCore</class>
- <widget class="BlackGui::CSystemTrayWindow" name="CSwiftCore">
+ <widget class="swift::gui::CSystemTrayWindow" name="CSwiftCore">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -46,7 +46,7 @@
         <number>4</number>
        </property>
        <item>
-        <widget class="BlackGui::Components::CCommandInput" name="lep_CommandLineInput">
+        <widget class="swift::gui::components::CCommandInput" name="lep_CommandLineInput">
          <property name="placeholderText">
           <string>.dot commands</string>
          </property>
@@ -118,7 +118,7 @@ QTextEdit {
      </widget>
     </item>
     <item row="0" column="0" colspan="3">
-     <widget class="BlackGui::Components::CInfoBarStatusComponent" name="comp_InfoBarStatus" native="true">
+     <widget class="swift::gui::components::CInfoBarStatusComponent" name="comp_InfoBarStatus" native="true">
       <property name="sizePolicy">
        <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
         <horstretch>0</horstretch>
@@ -143,7 +143,7 @@ QTextEdit {
      </widget>
     </item>
     <item row="4" column="0" colspan="3">
-     <widget class="BlackGui::Components::CCoreInfoAreaComponent" name="comp_InfoArea" native="true">
+     <widget class="swift::gui::components::CCoreInfoAreaComponent" name="comp_InfoArea" native="true">
       <property name="sizePolicy">
        <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
         <horstretch>0</horstretch>
@@ -177,7 +177,7 @@ QTextEdit {
         <number>2</number>
        </property>
        <item>
-        <widget class="BlackGui::Components::CDBusServerAddressSelector" name="comp_DBusSelector">
+        <widget class="swift::gui::components::CDBusServerAddressSelector" name="comp_DBusSelector">
          <property name="frameShape">
           <enum>QFrame::StyledPanel</enum>
          </property>
@@ -289,33 +289,33 @@ QTextEdit {
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CDBusServerAddressSelector</class>
+   <class>swift::gui::components::CDBusServerAddressSelector</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/dbusserveraddressselector.h</header>
+   <header>gui/components/dbusserveraddressselector.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CCommandInput</class>
+   <class>swift::gui::components::CCommandInput</class>
    <extends>QLineEdit</extends>
-   <header>blackgui/components/commandinput.h</header>
+   <header>gui/components/commandinput.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CInfoBarStatusComponent</class>
+   <class>swift::gui::components::CInfoBarStatusComponent</class>
    <extends>QWidget</extends>
-   <header>blackgui/components/infobarstatuscomponent.h</header>
+   <header>gui/components/infobarstatuscomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::CSystemTrayWindow</class>
+   <class>swift::gui::CSystemTrayWindow</class>
    <extends>QMainWindow</extends>
-   <header>blackgui/systemtraywindow.h</header>
+   <header>gui/systemtraywindow.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CCoreInfoAreaComponent</class>
+   <class>swift::gui::components::CCoreInfoAreaComponent</class>
    <extends>QWidget</extends>
-   <header>blackgui/components/coreinfoareacomponent.h</header>
+   <header>gui/components/coreinfoareacomponent.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/swiftdata/main.cpp b/src/swiftdata/main.cpp
index 644a434e6..4a938f8d6 100644
--- a/src/swiftdata/main.cpp
+++ b/src/swiftdata/main.cpp
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "core/webreaderflags.h"
-#include "blackgui/guiapplication.h"
+#include "gui/guiapplication.h"
 #include "misc/icons.h"
 #include "misc/crashhandler.h"
 #include "swiftdata.h"
@@ -14,7 +14,7 @@
 using namespace swift::misc;
 using namespace swift::core;
 using namespace swift::core::db;
-using namespace BlackGui;
+using namespace swift::gui;
 
 int main(int argc, char *argv[])
 {
diff --git a/src/swiftdata/swiftdata.cpp b/src/swiftdata/swiftdata.cpp
index 9122ae480..5b40ee015 100644
--- a/src/swiftdata/swiftdata.cpp
+++ b/src/swiftdata/swiftdata.cpp
@@ -2,13 +2,13 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "swiftdata.h"
-#include "blackgui/components/datamaininfoareacomponent.h"
-#include "blackgui/components/dbmappingcomponent.h"
-#include "blackgui/components/logcomponent.h"
-#include "blackgui/components/datasettingscomponent.h"
-#include "blackgui/components/autopublishdialog.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/stylesheetutility.h"
+#include "gui/components/datamaininfoareacomponent.h"
+#include "gui/components/dbmappingcomponent.h"
+#include "gui/components/logcomponent.h"
+#include "gui/components/datasettingscomponent.h"
+#include "gui/components/autopublishdialog.h"
+#include "gui/guiapplication.h"
+#include "gui/stylesheetutility.h"
 #include "core/data/globalsetup.h"
 #include "misc/simulation/autopublishdata.h"
 #include "misc/simulation/distributorlist.h"
@@ -34,8 +34,8 @@ using namespace swift::misc::simulation;
 using namespace swift::core;
 using namespace swift::core::data;
 using namespace swift::core::db;
-using namespace BlackGui;
-using namespace BlackGui::Components;
+using namespace swift::gui;
+using namespace swift::gui::components;
 using namespace swift::config;
 
 CSwiftData::CSwiftData(QWidget *parent) : QMainWindow(parent),
diff --git a/src/swiftdata/swiftdata.h b/src/swiftdata/swiftdata.h
index d93e05d78..aa034bfa5 100644
--- a/src/swiftdata/swiftdata.h
+++ b/src/swiftdata/swiftdata.h
@@ -6,9 +6,9 @@
 #ifndef SWIFTDATA_H
 #define SWIFTDATA_H
 
-#include "blackgui/settings/guisettings.h"
-#include "blackgui/mainwindowaccess.h"
-#include "blackgui/managedstatusbar.h"
+#include "gui/settings/guisettings.h"
+#include "gui/mainwindowaccess.h"
+#include "gui/managedstatusbar.h"
 #include "core/db/backgrounddataupdater.h"
 #include "misc/loghistory.h"
 #include "misc/identifiable.h"
@@ -26,7 +26,7 @@ namespace swift::core
 {
     class CWebDataServices;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     class CAutoPublishDialog;
 }
@@ -37,10 +37,10 @@ namespace BlackGui::Components
 class CSwiftData :
     public QMainWindow,
     public swift::misc::CIdentifiable,
-    public BlackGui::IMainWindowAccess
+    public swift::gui::IMainWindowAccess
 {
     Q_OBJECT
-    Q_INTERFACES(BlackGui::IMainWindowAccess)
+    Q_INTERFACES(swift::gui::IMainWindowAccess)
 
 public:
     //! Constructor
@@ -85,13 +85,13 @@ private:
     void checkMinimumVersion();
 
     QScopedPointer<Ui::CSwiftData> ui;
-    BlackGui::CManagedStatusBar m_statusBar;
+    swift::gui::CManagedStatusBar m_statusBar;
     swift::core::db::CBackgroundDataUpdater *m_updater = nullptr; //!< consolidate with DB data
-    swift::misc::CSettingReadOnly<BlackGui::Settings::TBackgroundConsolidation> m_consolidationSettings { this, &CSwiftData::consolidationSettingChanged }; //!< consolidation time
+    swift::misc::CSettingReadOnly<swift::gui::settings::TBackgroundConsolidation> m_consolidationSettings { this, &CSwiftData::consolidationSettingChanged }; //!< consolidation time
     swift::misc::CLogHistoryReplica m_logHistory { this };
 
     // auto update
-    BlackGui::Components::CAutoPublishDialog *m_autoPublishDialog = nullptr; //!< auto publishing dialog
+    swift::gui::components::CAutoPublishDialog *m_autoPublishDialog = nullptr; //!< auto publishing dialog
 };
 
 #endif // guard
diff --git a/src/swiftdata/swiftdata.ui b/src/swiftdata/swiftdata.ui
index d03088bd7..3ed431df6 100644
--- a/src/swiftdata/swiftdata.ui
+++ b/src/swiftdata/swiftdata.ui
@@ -40,7 +40,7 @@
      <number>2</number>
     </property>
     <item>
-     <widget class="BlackGui::Components::CInfoBarWebReadersStatusComponent" name="comp_InfoBar">
+     <widget class="swift::gui::components::CInfoBarWebReadersStatusComponent" name="comp_InfoBar">
       <property name="frameShape">
        <enum>QFrame::StyledPanel</enum>
       </property>
@@ -60,7 +60,7 @@
       <property name="currentIndex">
        <number>0</number>
       </property>
-      <widget class="BlackGui::Components::CDataMainInfoAreaComponent" name="comp_MainInfoArea"/>
+      <widget class="swift::gui::components::CDataMainInfoAreaComponent" name="comp_MainInfoArea"/>
       <widget class="QWidget" name="comp_EmptyPage"/>
      </widget>
     </item>
@@ -252,15 +252,15 @@
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CDataMainInfoAreaComponent</class>
+   <class>swift::gui::components::CDataMainInfoAreaComponent</class>
    <extends>QWidget</extends>
-   <header>blackgui/components/datamaininfoareacomponent.h</header>
+   <header>gui/components/datamaininfoareacomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CInfoBarWebReadersStatusComponent</class>
+   <class>swift::gui::components::CInfoBarWebReadersStatusComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/infobarwebreadersstatuscomponent.h</header>
+   <header>gui/components/infobarwebreadersstatuscomponent.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/swiftdata/swiftdatamenus.cpp b/src/swiftdata/swiftdatamenus.cpp
index 3763cb33d..0e20a44ab 100644
--- a/src/swiftdata/swiftdatamenus.cpp
+++ b/src/swiftdata/swiftdatamenus.cpp
@@ -1,10 +1,10 @@
 // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/datainfoareacomponent.h"
-#include "blackgui/components/datamaininfoareacomponent.h"
-#include "blackgui/components/dbmappingcomponent.h"
-#include "blackgui/guiapplication.h"
+#include "gui/components/datainfoareacomponent.h"
+#include "gui/components/datamaininfoareacomponent.h"
+#include "gui/components/dbmappingcomponent.h"
+#include "gui/guiapplication.h"
 #include "misc/icons.h"
 #include "misc/swiftdirectories.h"
 #include "misc/directoryutils.h"
@@ -19,9 +19,9 @@
 #include <QString>
 #include <QtGlobal>
 
-using namespace BlackGui;
+using namespace swift::gui;
 using namespace swift::core;
-using namespace BlackGui::Components;
+using namespace swift::gui::components;
 using namespace swift::misc;
 
 void CSwiftData::onMenuClicked()
@@ -30,7 +30,7 @@ void CSwiftData::onMenuClicked()
     if (sender == ui->menu_WindowFont)
     {
         // this->ps_setMainPageToInfoArea();
-        // ui->comp_MainInfoArea->selectSettingsTab(BlackGui::Components::CSettingsComponent::SettingTabGui);
+        // ui->comp_MainInfoArea->selectSettingsTab(swift::gui::components::CSettingsComponent::SettingTabGui);
     }
     else if (sender == ui->menu_MappingMaxData)
     {
diff --git a/src/swiftguistandard/main.cpp b/src/swiftguistandard/main.cpp
index 755be5352..19a95e1b1 100644
--- a/src/swiftguistandard/main.cpp
+++ b/src/swiftguistandard/main.cpp
@@ -4,9 +4,9 @@
 #include "swiftguistd.h"
 #include "swiftguistdapplication.h"
 
-#include "blackgui/enableforframelesswindow.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/guiutility.h"
+#include "gui/enableforframelesswindow.h"
+#include "gui/guiapplication.h"
+#include "gui/guiutility.h"
 #include "misc/audio/audioutils.h"
 #include "misc/crashhandler.h"
 
@@ -14,7 +14,7 @@
 
 #include <QApplication>
 
-using namespace BlackGui;
+using namespace swift::gui;
 using namespace swift::misc;
 using namespace swift::misc::audio;
 using namespace swift::core;
diff --git a/src/swiftguistandard/swiftguistd.cpp b/src/swiftguistandard/swiftguistd.cpp
index abbb524be..3b0c5a217 100644
--- a/src/swiftguistandard/swiftguistd.cpp
+++ b/src/swiftguistandard/swiftguistd.cpp
@@ -3,16 +3,16 @@
 
 #include "ui_swiftguistd.h"
 
-#include "blackgui/components/infobarstatuscomponent.h"
-#include "blackgui/components/logcomponent.h"
-#include "blackgui/components/dbloaddatadialog.h"
-#include "blackgui/components/autopublishdialog.h"
-#include "blackgui/components/modelbrowserdialog.h"
-#include "blackgui/components/settingscomponent.h"
-#include "blackgui/components/textmessagecomponent.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/guiutility.h"
-#include "blackgui/overlaymessagesframe.h"
+#include "gui/components/infobarstatuscomponent.h"
+#include "gui/components/logcomponent.h"
+#include "gui/components/dbloaddatadialog.h"
+#include "gui/components/autopublishdialog.h"
+#include "gui/components/modelbrowserdialog.h"
+#include "gui/components/settingscomponent.h"
+#include "gui/components/textmessagecomponent.h"
+#include "gui/guiapplication.h"
+#include "gui/guiutility.h"
+#include "gui/overlaymessagesframe.h"
 #include "core/context/contextapplication.h"
 #include "core/context/contextaudio.h"
 #include "core/context/contextnetwork.h"
@@ -48,7 +48,7 @@ class QEvent;
 class QMouseEvent;
 class QWidget;
 
-namespace BlackGui
+namespace swift::gui
 {
     class CEnableForFramelessWindow;
     class IMainWindowAccess;
@@ -60,8 +60,8 @@ namespace swift::misc
 
 using namespace swift::core;
 using namespace swift::core::context;
-using namespace BlackGui;
-using namespace BlackGui::Components;
+using namespace swift::gui;
+using namespace swift::gui::components;
 using namespace swift::misc;
 using namespace swift::misc::network;
 using namespace swift::misc::aviation;
@@ -73,10 +73,10 @@ using namespace swift::misc::simulation;
 using namespace swift::config;
 
 // Constructor
-SwiftGuiStd::SwiftGuiStd(BlackGui::CEnableForFramelessWindow::WindowMode windowMode, QWidget *parent) : QMainWindow(parent, CEnableForFramelessWindow::modeToWindowFlags(windowMode)),
-                                                                                                        CIdentifiable(this),
-                                                                                                        CEnableForFramelessWindow(windowMode, true, "framelessMainWindow", this),
-                                                                                                        ui(new Ui::SwiftGuiStd)
+SwiftGuiStd::SwiftGuiStd(swift::gui::CEnableForFramelessWindow::WindowMode windowMode, QWidget *parent) : QMainWindow(parent, CEnableForFramelessWindow::modeToWindowFlags(windowMode)),
+                                                                                                          CIdentifiable(this),
+                                                                                                          CEnableForFramelessWindow(windowMode, true, "framelessMainWindow", this),
+                                                                                                          ui(new Ui::SwiftGuiStd)
 {
     // GUI
     Q_ASSERT_X(sGui, Q_FUNC_INFO, "Need sGui");
@@ -584,7 +584,7 @@ void SwiftGuiStd::onShowOverlayVariant(const CVariant &variant, int durationMs)
     ui->fr_CentralFrameInside->showOverlayVariant(variant, durationMs);
 }
 
-void SwiftGuiStd::onShowOverlayInlineTextMessageTab(Components::TextMessageTab tab)
+void SwiftGuiStd::onShowOverlayInlineTextMessageTab(components::TextMessageTab tab)
 {
     if (!sGui || sGui->isShuttingDown()) { return; }
     ui->fr_CentralFrameInside->showOverlayInlineTextMessage(tab);
diff --git a/src/swiftguistandard/swiftguistd.h b/src/swiftguistandard/swiftguistd.h
index a5b28d198..5b9ad3892 100644
--- a/src/swiftguistandard/swiftguistd.h
+++ b/src/swiftguistandard/swiftguistd.h
@@ -6,14 +6,14 @@
 #ifndef STDGUI_SWIFTGUISTD_H
 #define STDGUI_SWIFTGUISTD_H
 
-#include "blackgui/components/maininfoareacomponent.h"
-#include "blackgui/components/navigatordialog.h"
-#include "blackgui/components/aircraftmodelsetvalidationdialog.h"
-#include "blackgui/components/textmessagecomponenttab.h"
-#include "blackgui/enableforframelesswindow.h"
-#include "blackgui/mainwindowaccess.h"
-#include "blackgui/managedstatusbar.h"
-#include "blackgui/guiactionbind.h"
+#include "gui/components/maininfoareacomponent.h"
+#include "gui/components/navigatordialog.h"
+#include "gui/components/aircraftmodelsetvalidationdialog.h"
+#include "gui/components/textmessagecomponenttab.h"
+#include "gui/enableforframelesswindow.h"
+#include "gui/mainwindowaccess.h"
+#include "gui/managedstatusbar.h"
+#include "gui/guiactionbind.h"
 #include "core/actionbind.h"
 #include "misc/network/connectionstatus.h"
 #include "misc/simulation/simulatedaircraft.h"
@@ -43,7 +43,7 @@ namespace swift::misc::aviation
 {
     class CAltitude;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     class CDbLoadDataDialog;
     class CAutoPublishDialog;
@@ -58,11 +58,11 @@ namespace Ui
 class SwiftGuiStd :
     public QMainWindow,
     public swift::misc::CIdentifiable,
-    public BlackGui::CEnableForFramelessWindow,
-    public BlackGui::IMainWindowAccess
+    public swift::gui::CEnableForFramelessWindow,
+    public swift::gui::IMainWindowAccess
 {
     Q_OBJECT
-    Q_INTERFACES(BlackGui::IMainWindowAccess)
+    Q_INTERFACES(swift::gui::IMainWindowAccess)
 
 public:
     //! Main page indexes
@@ -118,15 +118,15 @@ protected:
 
 private:
     QScopedPointer<Ui::SwiftGuiStd> ui;
-    QScopedPointer<BlackGui::Components::CNavigatorDialog> m_navigator { new BlackGui::Components::CNavigatorDialog() }; //!< navigator dialog bar, if I pass the parent, the dialog is always centered over the parent
-    QScopedPointer<BlackGui::Components::CDbLoadDataDialog> m_dbLoadDialog; //!< load DB data, lazy init UI component
-    QScopedPointer<BlackGui::Components::CAutoPublishDialog> m_autoPublishDialog; //!< auto publish dialog
-    QScopedPointer<BlackGui::Components::CModelBrowserDialog> m_modelBrower; //!< model browser
-    QScopedPointer<BlackGui::Components::CAircraftModelSetValidationDialog> m_validationDialog; //!< aircraft model validation dialog
+    QScopedPointer<swift::gui::components::CNavigatorDialog> m_navigator { new swift::gui::components::CNavigatorDialog() }; //!< navigator dialog bar, if I pass the parent, the dialog is always centered over the parent
+    QScopedPointer<swift::gui::components::CDbLoadDataDialog> m_dbLoadDialog; //!< load DB data, lazy init UI component
+    QScopedPointer<swift::gui::components::CAutoPublishDialog> m_autoPublishDialog; //!< auto publish dialog
+    QScopedPointer<swift::gui::components::CModelBrowserDialog> m_modelBrower; //!< model browser
+    QScopedPointer<swift::gui::components::CAircraftModelSetValidationDialog> m_validationDialog; //!< aircraft model validation dialog
     swift::misc::CData<swift::misc::simulation::data::TLastAutoPublish> m_lastAutoPublish { this };
     swift::core::CActionBind m_actionPtt { swift::misc::input::pttHotkeyAction(), swift::misc::CIcons::StandardIconRadio16, this, &SwiftGuiStd::onPttChanged };
     swift::core::CActionBindings m_menuHotkeyHandlers;
-    BlackGui::CManagedStatusBar m_statusBar;
+    swift::gui::CManagedStatusBar m_statusBar;
     swift::misc::CLogHistoryReplica m_logHistoryForLogButtons { this };
     swift::misc::CLogHistoryReplica m_logHistoryForOverlay { this };
     swift::misc::CSetting<swift::misc::audio::TSettings> m_audioSettings { this };
@@ -222,7 +222,7 @@ private:
     void setMainPage(MainPageIndex mainPage);
 
     //! Set the main info area
-    void setMainPageInfoArea(BlackGui::Components::CMainInfoAreaComponent::InfoArea infoArea);
+    void setMainPageInfoArea(swift::gui::components::CMainInfoAreaComponent::InfoArea infoArea);
 
     //! Display the settings page
     void setSettingsPage(int settingsTabIndex = -1);
@@ -322,7 +322,7 @@ private:
     //! @{
     //! Request overlay inline text message
     void onShowOverlayVariant(const swift::misc::CVariant &variant, int durationMs);
-    void onShowOverlayInlineTextMessageTab(BlackGui::Components::TextMessageTab tab);
+    void onShowOverlayInlineTextMessageTab(swift::gui::components::TextMessageTab tab);
     void onShowOverlayInlineTextMessageCallsign(const swift::misc::aviation::CCallsign &callsign);
     //! @}
 };
diff --git a/src/swiftguistandard/swiftguistd.ui b/src/swiftguistandard/swiftguistd.ui
index 5f1ec5582..7712ef160 100644
--- a/src/swiftguistandard/swiftguistd.ui
+++ b/src/swiftguistandard/swiftguistd.ui
@@ -58,7 +58,7 @@
      <number>2</number>
     </property>
     <item>
-     <widget class="BlackGui::COverlayMessagesFrame" name="fr_CentralFrameInside">
+     <widget class="swift::gui::COverlayMessagesFrame" name="fr_CentralFrameInside">
       <property name="sizePolicy">
        <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
         <horstretch>0</horstretch>
@@ -126,7 +126,7 @@
             <number>0</number>
            </property>
            <item>
-            <widget class="BlackGui::Components::CMainInfoAreaComponent" name="comp_MainInfoArea" native="true"/>
+            <widget class="swift::gui::components::CMainInfoAreaComponent" name="comp_MainInfoArea" native="true"/>
            </item>
           </layout>
          </widget>
@@ -148,7 +148,7 @@
             <number>0</number>
            </property>
            <item>
-            <widget class="BlackGui::Components::CLoginComponent" name="comp_Login" native="true"/>
+            <widget class="swift::gui::components::CLoginComponent" name="comp_Login" native="true"/>
            </item>
           </layout>
          </widget>
@@ -170,14 +170,14 @@
             <number>0</number>
            </property>
            <item>
-            <widget class="BlackGui::Components::CInternalsComponent" name="comp_Internals" native="true"/>
+            <widget class="swift::gui::components::CInternalsComponent" name="comp_Internals" native="true"/>
            </item>
           </layout>
          </widget>
         </widget>
        </item>
        <item>
-        <widget class="BlackGui::Components::CMainKeypadAreaComponent" name="comp_MainKeypadArea">
+        <widget class="swift::gui::components::CMainKeypadAreaComponent" name="comp_MainKeypadArea">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
            <horstretch>0</horstretch>
@@ -301,7 +301,7 @@
     <bool>false</bool>
    </property>
   </widget>
-  <widget class="BlackGui::CDockWidgetInfoBar" name="dw_InfoBarStatus">
+  <widget class="swift::gui::CDockWidgetInfoBar" name="dw_InfoBarStatus">
    <property name="features">
     <set>QDockWidget::DockWidgetClosable|QDockWidget::DockWidgetMovable|QDockWidget::DockWidgetFloatable</set>
    </property>
@@ -332,7 +332,7 @@
       <number>0</number>
      </property>
      <item alignment="Qt::AlignLeft|Qt::AlignTop">
-      <widget class="BlackGui::Components::CInfoBarStatusComponent" name="comp_InfoBarStatus" native="true">
+      <widget class="swift::gui::components::CInfoBarStatusComponent" name="comp_InfoBarStatus" native="true">
        <property name="minimumSize">
         <size>
          <width>250</width>
@@ -526,45 +526,45 @@
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::COverlayMessagesFrame</class>
+   <class>swift::gui::COverlayMessagesFrame</class>
    <extends>QFrame</extends>
-   <header>blackgui/overlaymessagesframe.h</header>
+   <header>gui/overlaymessagesframe.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CInfoBarStatusComponent</class>
+   <class>swift::gui::components::CInfoBarStatusComponent</class>
    <extends>QWidget</extends>
-   <header>blackgui/components/infobarstatuscomponent.h</header>
+   <header>gui/components/infobarstatuscomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CMainInfoAreaComponent</class>
+   <class>swift::gui::components::CMainInfoAreaComponent</class>
    <extends>QWidget</extends>
-   <header>blackgui/components/maininfoareacomponent.h</header>
+   <header>gui/components/maininfoareacomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::CDockWidgetInfoBar</class>
+   <class>swift::gui::CDockWidgetInfoBar</class>
    <extends>QDockWidget</extends>
-   <header>blackgui/dockwidgetinfobar.h</header>
+   <header>gui/dockwidgetinfobar.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CMainKeypadAreaComponent</class>
+   <class>swift::gui::components::CMainKeypadAreaComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/mainkeypadareacomponent.h</header>
+   <header>gui/components/mainkeypadareacomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CLoginComponent</class>
+   <class>swift::gui::components::CLoginComponent</class>
    <extends>QWidget</extends>
-   <header>blackgui/components/logincomponent.h</header>
+   <header>gui/components/logincomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CInternalsComponent</class>
+   <class>swift::gui::components::CInternalsComponent</class>
    <extends>QWidget</extends>
-   <header>blackgui/components/internalscomponent.h</header>
+   <header>gui/components/internalscomponent.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/swiftguistandard/swiftguistdaircraft.cpp b/src/swiftguistandard/swiftguistdaircraft.cpp
index d2e53b25a..6d53b0c0a 100644
--- a/src/swiftguistandard/swiftguistdaircraft.cpp
+++ b/src/swiftguistandard/swiftguistdaircraft.cpp
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "core/context/contextownaircraft.h"
-#include "blackgui/guiapplication.h"
+#include "gui/guiapplication.h"
 #include "misc/mixin/mixincompare.h"
 #include "misc/geo/coordinategeodetic.h"
 #include "misc/geo/latitude.h"
@@ -16,7 +16,7 @@
 
 using namespace swift::core;
 using namespace swift::misc;
-using namespace BlackGui;
+using namespace swift::gui;
 using namespace swift::misc::network;
 using namespace swift::misc::aviation;
 using namespace swift::misc::simulation;
diff --git a/src/swiftguistandard/swiftguistdapplication.h b/src/swiftguistandard/swiftguistdapplication.h
index 41fbb5c38..6d122a3bf 100644
--- a/src/swiftguistandard/swiftguistdapplication.h
+++ b/src/swiftguistandard/swiftguistdapplication.h
@@ -6,7 +6,7 @@
 #ifndef SWIFTGUISTDAPPLICATION_H
 #define SWIFTGUISTDAPPLICATION_H
 
-#include "blackgui/guiapplication.h"
+#include "gui/guiapplication.h"
 
 #include <QCommandLineOption>
 #include <QCoreApplication>
@@ -17,7 +17,7 @@
  * Specialized GUI application for swift pilot client.
  * Handles parsing of some specialized CMD line argumenets and startup of core
  */
-class CSwiftGuiStdApplication : public BlackGui::CGuiApplication
+class CSwiftGuiStdApplication : public swift::gui::CGuiApplication
 {
     Q_OBJECT
 
diff --git a/src/swiftguistandard/swiftguistdinit.cpp b/src/swiftguistandard/swiftguistdinit.cpp
index a65e5e409..a0a3e7398 100644
--- a/src/swiftguistandard/swiftguistdinit.cpp
+++ b/src/swiftguistandard/swiftguistdinit.cpp
@@ -3,25 +3,25 @@
 
 #include "swiftguistd.h"
 #include "ui_swiftguistd.h"
-#include "blackgui/components/aircraftcomponent.h"
-#include "blackgui/components/atcstationcomponent.h"
-#include "blackgui/components/cockpitcomponent.h"
-#include "blackgui/components/flightplancomponent.h"
-#include "blackgui/components/logcomponent.h"
-#include "blackgui/components/logincomponent.h"
-#include "blackgui/components/interpolationcomponent.h"
-#include "blackgui/components/maininfoareacomponent.h"
-#include "blackgui/components/mainkeypadareacomponent.h"
-#include "blackgui/components/mappingcomponent.h"
-#include "blackgui/components/navigatordialog.h"
-#include "blackgui/components/settingscomponent.h"
-#include "blackgui/components/textmessagecomponent.h"
-#include "blackgui/components/usercomponent.h"
-#include "blackgui/dockwidgetinfobar.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/managedstatusbar.h"
-#include "blackgui/overlaymessagesframe.h"
-#include "blackgui/stylesheetutility.h"
+#include "gui/components/aircraftcomponent.h"
+#include "gui/components/atcstationcomponent.h"
+#include "gui/components/cockpitcomponent.h"
+#include "gui/components/flightplancomponent.h"
+#include "gui/components/logcomponent.h"
+#include "gui/components/logincomponent.h"
+#include "gui/components/interpolationcomponent.h"
+#include "gui/components/maininfoareacomponent.h"
+#include "gui/components/mainkeypadareacomponent.h"
+#include "gui/components/mappingcomponent.h"
+#include "gui/components/navigatordialog.h"
+#include "gui/components/settingscomponent.h"
+#include "gui/components/textmessagecomponent.h"
+#include "gui/components/usercomponent.h"
+#include "gui/dockwidgetinfobar.h"
+#include "gui/guiapplication.h"
+#include "gui/managedstatusbar.h"
+#include "gui/overlaymessagesframe.h"
+#include "gui/stylesheetutility.h"
 #include "core/webdataservices.h"
 #include "core/context/contextnetwork.h"
 #include "core/context/contextsimulator.h"
@@ -54,8 +54,8 @@ using namespace swift::misc;
 using namespace swift::misc::aviation;
 using namespace swift::misc::network;
 using namespace swift::misc::input;
-using namespace BlackGui;
-using namespace BlackGui::Components;
+using namespace swift::gui;
+using namespace swift::gui::components;
 
 void SwiftGuiStd::init()
 {
diff --git a/src/swiftguistandard/swiftguistdmenus.cpp b/src/swiftguistandard/swiftguistdmenus.cpp
index b1734c1fd..57716f92c 100644
--- a/src/swiftguistandard/swiftguistdmenus.cpp
+++ b/src/swiftguistandard/swiftguistdmenus.cpp
@@ -1,13 +1,13 @@
 // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "blackgui/components/maininfoareacomponent.h"
-#include "blackgui/components/settingscomponent.h"
-#include "blackgui/components/autopublishdialog.h"
-#include "blackgui/guiactionbind.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/foreignwindows.h"
-#include "blackgui/copyxswiftbusdialog.h"
+#include "gui/components/maininfoareacomponent.h"
+#include "gui/components/settingscomponent.h"
+#include "gui/components/autopublishdialog.h"
+#include "gui/guiactionbind.h"
+#include "gui/guiapplication.h"
+#include "gui/foreignwindows.h"
+#include "gui/copyxswiftbusdialog.h"
 #include "misc/aviation/altitude.h"
 #include "misc/pq/units.h"
 #include "misc/logmessage.h"
@@ -25,8 +25,8 @@
 #include <QMessageBox>
 
 using namespace swift::config;
-using namespace BlackGui;
-using namespace BlackGui::Components;
+using namespace swift::gui;
+using namespace swift::gui::components;
 using namespace swift::core;
 using namespace swift::misc;
 using namespace swift::misc::physical_quantities;
@@ -70,7 +70,7 @@ void SwiftGuiStd::onMenuClicked()
     else if (sender == ui->menu_WindowFont)
     {
         this->setMainPageToInfoArea();
-        ui->comp_MainInfoArea->selectSettingsTab(BlackGui::Components::CSettingsComponent::SettingTabGui);
+        ui->comp_MainInfoArea->selectSettingsTab(swift::gui::components::CSettingsComponent::SettingTabGui);
     }
     else if (sender == ui->menu_InternalsPage)
     {
diff --git a/src/swiftlauncher/main.cpp b/src/swiftlauncher/main.cpp
index 5cd6d7a21..d9217dedb 100644
--- a/src/swiftlauncher/main.cpp
+++ b/src/swiftlauncher/main.cpp
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "swiftlauncher.h"
-#include "blackgui/guiapplication.h"
+#include "gui/guiapplication.h"
 #include "core/db/databasereaderconfig.h"
 #include "misc/directoryutils.h"
 #include "misc/icons.h"
@@ -13,7 +13,7 @@
 #include <QPushButton>
 #include <QCommandLineParser>
 
-using namespace BlackGui;
+using namespace swift::gui;
 using namespace swift::misc;
 using namespace swift::core;
 using namespace swift::core::db;
diff --git a/src/swiftlauncher/swiftlauncher.cpp b/src/swiftlauncher/swiftlauncher.cpp
index 4285510ab..40e737001 100644
--- a/src/swiftlauncher/swiftlauncher.cpp
+++ b/src/swiftlauncher/swiftlauncher.cpp
@@ -3,11 +3,11 @@
 
 #include "swiftlauncher.h"
 #include "ui_swiftlauncher.h"
-#include "blackgui/overlaymessagesframe.h"
-#include "blackgui/components/configurationwizard.h"
-#include "blackgui/components/texteditdialog.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/stylesheetutility.h"
+#include "gui/overlaymessagesframe.h"
+#include "gui/components/configurationwizard.h"
+#include "gui/components/texteditdialog.h"
+#include "gui/guiapplication.h"
+#include "gui/stylesheetutility.h"
 #include "core/context/contextapplicationproxy.h"
 #include "core/setupreader.h"
 #include "sound/audioutilities.h"
@@ -36,8 +36,8 @@
 #include <qcompilerdetection.h>
 
 using namespace swift::config;
-using namespace BlackGui;
-using namespace BlackGui::Components;
+using namespace swift::gui;
+using namespace swift::gui::components;
 using namespace swift::core;
 using namespace swift::core::context;
 using namespace swift::core::data;
diff --git a/src/swiftlauncher/swiftlauncher.h b/src/swiftlauncher/swiftlauncher.h
index bbd12b378..a2d511da2 100644
--- a/src/swiftlauncher/swiftlauncher.h
+++ b/src/swiftlauncher/swiftlauncher.h
@@ -6,9 +6,9 @@
 #ifndef SWIFTLAUNCHER_H
 #define SWIFTLAUNCHER_H
 
-#include "blackgui/enableforframelesswindow.h"
-#include "blackgui/overlaymessagesframe.h"
-#include "blackgui/mainwindowaccess.h"
+#include "gui/enableforframelesswindow.h"
+#include "gui/overlaymessagesframe.h"
+#include "gui/mainwindowaccess.h"
 #include "core/data/globalsetup.h"
 #include "core/data/launchersetup.h"
 #include "core/coremodeenums.h"
@@ -30,7 +30,7 @@ namespace Ui
 {
     class CSwiftLauncher;
 }
-namespace BlackGui::Components
+namespace swift::gui::components
 {
     class CConfigurationWizard;
     class CTextEditDialog;
@@ -44,13 +44,13 @@ namespace BlackGui::Components
  */
 class CSwiftLauncher :
     public QMainWindow,
-    public BlackGui::CEnableForFramelessWindow,
-    public BlackGui::IMainWindowAccess,
+    public swift::gui::CEnableForFramelessWindow,
+    public swift::gui::IMainWindowAccess,
     public swift::misc::simulation::data::CCentralMultiSimulatorModelSetCachesAware,
     public swift::misc::CIdentifiable
 {
     Q_OBJECT
-    Q_INTERFACES(BlackGui::IMainWindowAccess)
+    Q_INTERFACES(swift::gui::IMainWindowAccess)
 
 public:
     //! Pages
@@ -98,8 +98,8 @@ private slots:
 
 private:
     QScopedPointer<Ui::CSwiftLauncher> ui;
-    QScopedPointer<BlackGui::Components::CConfigurationWizard> m_wizard;
-    QScopedPointer<BlackGui::Components::CTextEditDialog> m_textEditDialog;
+    QScopedPointer<swift::gui::components::CConfigurationWizard> m_wizard;
+    QScopedPointer<swift::gui::components::CTextEditDialog> m_textEditDialog;
     swift::misc::CData<swift::core::data::TLauncherSetup> m_setup { this }; //!< setup, i.e. last user selection
     swift::misc::CLogHistoryReplica m_logHistory { this }; //!< for the overlay
 #ifdef Q_OS_MAC
@@ -117,7 +117,7 @@ private:
     swift::core::CoreModes::CoreMode getCoreMode() const;
 
     //! Selected window mode
-    BlackGui::CEnableForFramelessWindow::WindowMode getWindowMode() const;
+    swift::gui::CEnableForFramelessWindow::WindowMode getWindowMode() const;
 
     //! Init
     void init();
diff --git a/src/swiftlauncher/swiftlauncher.ui b/src/swiftlauncher/swiftlauncher.ui
index a1f4956bb..f845826f1 100644
--- a/src/swiftlauncher/swiftlauncher.ui
+++ b/src/swiftlauncher/swiftlauncher.ui
@@ -47,7 +47,7 @@
       <number>0</number>
      </property>
      <item>
-      <widget class="BlackGui::COverlayMessagesFrame" name="fr_SwiftLauncherMain">
+      <widget class="swift::gui::COverlayMessagesFrame" name="fr_SwiftLauncherMain">
        <layout class="QVBoxLayout" name="vl_SwiftLauncherMain">
         <property name="spacing">
          <number>20</number>
@@ -90,7 +90,7 @@
            </attribute>
            <layout class="QVBoxLayout" name="vl_About">
             <item>
-             <widget class="BlackGui::Components::CAboutHtmlComponent" name="comp_AboutHTML"/>
+             <widget class="swift::gui::components::CAboutHtmlComponent" name="comp_AboutHTML"/>
             </item>
            </layout>
           </widget>
@@ -304,7 +304,7 @@
                 <number>4</number>
                </property>
                <item>
-                <widget class="BlackGui::Components::CDBusServerAddressSelector" name="comp_DBusSelector">
+                <widget class="swift::gui::components::CDBusServerAddressSelector" name="comp_DBusSelector">
                  <property name="minimumSize">
                   <size>
                    <width>0</width>
@@ -368,7 +368,7 @@
                 <number>4</number>
                </property>
                <item>
-                <widget class="BlackGui::Components::CUpdateInfoComponent" name="comp_UpdateInfo">
+                <widget class="swift::gui::components::CUpdateInfoComponent" name="comp_UpdateInfo">
                  <property name="minimumSize">
                   <size>
                    <width>0</width>
@@ -429,7 +429,7 @@
                     <number>3</number>
                    </property>
                    <item>
-                    <widget class="BlackGui::Components::CInfoBarWebReadersStatusSmallComponent" name="comp_InfoBar">
+                    <widget class="swift::gui::components::CInfoBarWebReadersStatusSmallComponent" name="comp_InfoBar">
                      <property name="frameShape">
                       <enum>QFrame::StyledPanel</enum>
                      </property>
@@ -439,7 +439,7 @@
                     </widget>
                    </item>
                    <item>
-                    <widget class="BlackGui::Components::CDbLoadOverviewComponent" name="comp_DataUpdates">
+                    <widget class="swift::gui::components::CDbLoadOverviewComponent" name="comp_DataUpdates">
                      <property name="frameShape">
                       <enum>QFrame::StyledPanel</enum>
                      </property>
@@ -740,7 +740,7 @@
              </widget>
             </item>
             <item row="0" column="0" colspan="3">
-             <widget class="BlackGui::Components::CScaleScreenFactor" name="comp_Scale">
+             <widget class="swift::gui::components::CScaleScreenFactor" name="comp_Scale">
               <property name="frameShape">
                <enum>QFrame::StyledPanel</enum>
               </property>
@@ -780,7 +780,7 @@
       <number>3</number>
      </property>
      <item>
-      <widget class="BlackGui::Components::CLogComponent" name="comp_SwiftLauncherLog">
+      <widget class="swift::gui::components::CLogComponent" name="comp_SwiftLauncherLog">
        <property name="frameShape">
         <enum>QFrame::StyledPanel</enum>
        </property>
@@ -809,51 +809,51 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::COverlayMessagesFrame</class>
+   <class>swift::gui::COverlayMessagesFrame</class>
    <extends>QFrame</extends>
-   <header>blackgui/overlaymessagesframe.h</header>
+   <header>gui/overlaymessagesframe.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CDbLoadOverviewComponent</class>
+   <class>swift::gui::components::CDbLoadOverviewComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/dbloadoverviewcomponent.h</header>
+   <header>gui/components/dbloadoverviewcomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CLogComponent</class>
+   <class>swift::gui::components::CLogComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/logcomponent.h</header>
+   <header>gui/components/logcomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CInfoBarWebReadersStatusSmallComponent</class>
+   <class>swift::gui::components::CInfoBarWebReadersStatusSmallComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/infobarwebreadersstatussmallcomponent.h</header>
+   <header>gui/components/infobarwebreadersstatussmallcomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CUpdateInfoComponent</class>
+   <class>swift::gui::components::CUpdateInfoComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/updateinfocomponent.h</header>
+   <header>gui/components/updateinfocomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CDBusServerAddressSelector</class>
+   <class>swift::gui::components::CDBusServerAddressSelector</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/dbusserveraddressselector.h</header>
+   <header>gui/components/dbusserveraddressselector.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CAboutHtmlComponent</class>
+   <class>swift::gui::components::CAboutHtmlComponent</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/abouthtmlcomponent.h</header>
+   <header>gui/components/abouthtmlcomponent.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>BlackGui::Components::CScaleScreenFactor</class>
+   <class>swift::gui::components::CScaleScreenFactor</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/scalescreenfactor.h</header>
+   <header>gui/components/scalescreenfactor.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 8b1a03ac2..ea2881c68 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -6,7 +6,7 @@ target_link_libraries(tests_test INTERFACE Qt::Core Qt::Test)
 target_include_directories(tests_test INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
 
 add_subdirectory(core)
-add_subdirectory(blackgui)
+add_subdirectory(gui)
 add_subdirectory(misc)
 
 if(SWIFT_BUILD_FSX_PLUGIN)
diff --git a/tests/blackgui/CMakeLists.txt b/tests/gui/CMakeLists.txt
similarity index 100%
rename from tests/blackgui/CMakeLists.txt
rename to tests/gui/CMakeLists.txt
diff --git a/tests/blackgui/blackguitest.h b/tests/gui/blackguitest.h
similarity index 62%
rename from tests/blackgui/blackguitest.h
rename to tests/gui/blackguitest.h
index 983f65e95..866f2deee 100644
--- a/tests/blackgui/blackguitest.h
+++ b/tests/gui/blackguitest.h
@@ -7,11 +7,11 @@
 //! \cond PRIVATE_TESTS
 
 /*!
- * \namespace BlackGuiTest
- * \defgroup testblackgui BlackGui Unit Tests
+ * \namespace SwiftGuiTest
+ * \defgroup testswiftgui Gui Unit Tests
  * \ingroup tests
- * Unit tests for BlackGui. Unit tests do have their own namespace, so
- * the regular namespace BlackGui is completely free of unit tests.
+ * Unit tests for GUI. Unit tests do have their own namespace, so
+ * the regular namespace swift:gui is completely free of unit tests.
  * Add any new tests to TestMain::unitMain as shown there.
  */
 
diff --git a/tests/blackgui/testguiutility/testguiutility.cpp b/tests/gui/testguiutility/testguiutility.cpp
similarity index 83%
rename from tests/blackgui/testguiutility/testguiutility.cpp
rename to tests/gui/testguiutility/testguiutility.cpp
index 721ffbcee..1fd0b16f6 100644
--- a/tests/blackgui/testguiutility/testguiutility.cpp
+++ b/tests/gui/testguiutility/testguiutility.cpp
@@ -3,14 +3,14 @@
 
 //! \cond PRIVATE_TESTS
 //! \file
-//! \ingroup testblackgui
+//! \ingroup testswiftgui
 
-#include "blackgui/guiutility.h"
+#include "gui/guiutility.h"
 #include "test.h"
 
-using namespace BlackGui;
+using namespace swift::gui;
 
-namespace BlackGuiTest
+namespace SwiftGuiTest
 {
     //! Test GUI utilities
     class CTestGuiUtility : public QObject
@@ -31,7 +31,7 @@ namespace BlackGuiTest
 } // ns
 
 //! main
-BLACKTEST_APPLESS_MAIN(BlackGuiTest::CTestGuiUtility);
+BLACKTEST_APPLESS_MAIN(SwiftGuiTest::CTestGuiUtility);
 
 #include "testguiutility.moc"
 
diff --git a/tests/blackgui/testguiutility/testguiutility.h b/tests/gui/testguiutility/testguiutility.h
similarity index 87%
rename from tests/blackgui/testguiutility/testguiutility.h
rename to tests/gui/testguiutility/testguiutility.h
index 8bf3f346a..6a79644ac 100644
--- a/tests/blackgui/testguiutility/testguiutility.h
+++ b/tests/gui/testguiutility/testguiutility.h
@@ -5,7 +5,7 @@
 
 /*!
  * \file
- * \ingroup testblackgui
+ * \ingroup testswiftgui
  */
 
 #ifndef BLACKGUITEST_TESTUTILS_H
@@ -13,7 +13,7 @@
 
 #include <QObject>
 
-namespace BlackGuiTest
+namespace SwiftGuiTest
 {
 
 } // namespace