diff --git a/src/blackcore/contextapplication.cpp b/src/blackcore/contextapplication.cpp
index 2c229738f..93a030c20 100644
--- a/src/blackcore/contextapplication.cpp
+++ b/src/blackcore/contextapplication.cpp
@@ -12,7 +12,7 @@
 #include "blackcore/contextapplicationproxy.h"
 #include "blackcore/contextapplicationempty.h"
 #include "blackcore/inputmanager.h"
-#include "blackcore/settingscache.h"
+#include "blackmisc/settingscache.h"
 #include "blackmisc/statusmessage.h"
 #include "blackmisc/loghandler.h"
 #include "blackmisc/logmessage.h"
diff --git a/src/blackcore/contextapplicationimpl.cpp b/src/blackcore/contextapplicationimpl.cpp
index 0116b8190..8269627a0 100644
--- a/src/blackcore/contextapplicationimpl.cpp
+++ b/src/blackcore/contextapplicationimpl.cpp
@@ -10,7 +10,7 @@
 #include "contextapplicationimpl.h"
 #include "contextruntime.h"
 #include "inputmanager.h"
-#include "settingscache.h"
+#include "blackmisc/settingscache.h"
 #include "blackmisc/logmessage.h"
 #include "blackmisc/loghandler.h"
 #include <QtMsgHandler>
diff --git a/src/blackcore/contextapplicationproxy.cpp b/src/blackcore/contextapplicationproxy.cpp
index cc4992dae..b16a9ab4b 100644
--- a/src/blackcore/contextapplicationproxy.cpp
+++ b/src/blackcore/contextapplicationproxy.cpp
@@ -9,7 +9,7 @@
 
 #include "blackcore/contextapplicationproxy.h"
 #include "blackcore/inputmanager.h"
-#include "blackcore/settingscache.h"
+#include "blackmisc/settingscache.h"
 #include "blackmisc/blackmiscfreefunctions.h"
 #include "blackmisc/loghandler.h"
 #include "blackmisc/identifierlist.h"
diff --git a/src/blackcore/contextaudioimpl.h b/src/blackcore/contextaudioimpl.h
index b0df32b53..c816f4649 100644
--- a/src/blackcore/contextaudioimpl.h
+++ b/src/blackcore/contextaudioimpl.h
@@ -169,7 +169,7 @@ namespace BlackCore
         QHash<BlackMisc::Aviation::CComSystem::ComUnit, QSharedPointer<IVoiceChannel>> m_voiceChannelMapping;
 
         // settings
-        CSetting<BlackCore::Settings::Audio::AudioSettings> m_audioSettings { this };
+        BlackMisc::CSetting<BlackCore::Settings::Audio::AudioSettings> m_audioSettings { this };
     };
 } // namespace
 
diff --git a/src/blackcore/contextownaircraftimpl.h b/src/blackcore/contextownaircraftimpl.h
index 929ac8029..8a7ed6ce3 100644
--- a/src/blackcore/contextownaircraftimpl.h
+++ b/src/blackcore/contextownaircraftimpl.h
@@ -145,7 +145,7 @@ namespace BlackCore
         QString m_voiceRoom2UrlOverride;             //!< overridden voice room url
         mutable QReadWriteLock m_lockAircraft;       //!< lock aircraft
 
-        CSetting<Settings::Network::CurrentTrafficServer> m_currentNetworkServer { this };
+        BlackMisc::CSetting<Settings::Network::CurrentTrafficServer> m_currentNetworkServer { this };
 
         //! Init my very own aircraft with some defaults, before overridden by simulator
         void initOwnAircraft();
diff --git a/src/blackcore/contextruntime.h b/src/blackcore/contextruntime.h
index fe6b2d9ba..c2a7e0041 100644
--- a/src/blackcore/contextruntime.h
+++ b/src/blackcore/contextruntime.h
@@ -151,7 +151,7 @@ namespace BlackCore
 
     private:
         bool m_init = false; //!< flag
-        CSetting<Settings::Network::DBusServerAddress> m_dbusServerAddress { this };
+        BlackMisc::CSetting<Settings::Network::DBusServerAddress> m_dbusServerAddress { this };
 
         // DBus
         BlackMisc::CDBusServer *m_dbusServer = nullptr;
diff --git a/src/blackcore/data/aircraftmodels.h b/src/blackcore/data/aircraftmodels.h
index 1ab27205e..25ddd7f3b 100644
--- a/src/blackcore/data/aircraftmodels.h
+++ b/src/blackcore/data/aircraftmodels.h
@@ -13,7 +13,7 @@
 #define BLACKCORE_DATA_AIRCRAFTMODELS_H
 
 #include "blackcore/blackcoreexport.h"
-#include "blackcore/datacache.h"
+#include "blackmisc/datacache.h"
 #include "blackmisc/simulation/aircraftmodellist.h"
 #include "blackmisc/variant.h"
 
@@ -22,7 +22,7 @@ namespace BlackCore
     namespace Data
     {
         //! Trait for own simulator models
-        struct OwnSimulatorAircraftModels : public BlackCore::CDataTrait<BlackMisc::Simulation::CAircraftModelList>
+        struct OwnSimulatorAircraftModels : public BlackMisc::CDataTrait<BlackMisc::Simulation::CAircraftModelList>
         {
             //! Key in data cache
             static const char *key() { return "simulator/models"; }
@@ -36,7 +36,7 @@ namespace BlackCore
         };
 
         //! Trait for vPilot derived models
-        struct VPilotAircraftModels : public BlackCore::CDataTrait<BlackMisc::Simulation::CAircraftModelList>
+        struct VPilotAircraftModels : public BlackMisc::CDataTrait<BlackMisc::Simulation::CAircraftModelList>
         {
             //! Key in data cache
             static const char *key() { return "vpilot/models"; }
diff --git a/src/blackcore/data/authenticateduser.h b/src/blackcore/data/authenticateduser.h
index f24c7f5ef..df70106a6 100644
--- a/src/blackcore/data/authenticateduser.h
+++ b/src/blackcore/data/authenticateduser.h
@@ -13,7 +13,7 @@
 #define BLACKCORE_DATA_AUTHENTICATEDUSER_H
 
 #include "blackcore/blackcoreexport.h"
-#include "blackcore/datacache.h"
+#include "blackmisc/datacache.h"
 #include "blackmisc/network/authenticateduser.h"
 
 namespace BlackCore
@@ -21,7 +21,7 @@ namespace BlackCore
     namespace Data
     {
         //! Trait for for global setup data
-        struct AuthenticatedUser : public BlackCore::CDataTrait<BlackMisc::Network::CAuthenticatedUser>
+        struct AuthenticatedUser : public BlackMisc::CDataTrait<BlackMisc::Network::CAuthenticatedUser>
         {
             //! Key in data cache
             static const char *key() { return "readers/global/user"; }
diff --git a/src/blackcore/data/globalsetup.h b/src/blackcore/data/globalsetup.h
index 31f8e2484..665123fc5 100644
--- a/src/blackcore/data/globalsetup.h
+++ b/src/blackcore/data/globalsetup.h
@@ -13,7 +13,7 @@
 #define BLACKCORE_DATA_GLOBALSETUP_H
 
 #include "blackcore/blackcoreexport.h"
-#include "blackcore/datacache.h"
+#include "blackmisc/datacache.h"
 #include "blackmisc/network/serverlist.h"
 #include "blackmisc/network/urllist.h"
 #include "blackmisc/valueobject.h"
@@ -149,7 +149,7 @@ namespace BlackCore
         };
 
         //! Trait for global setup data
-        struct GlobalSetup : public BlackCore::CDataTrait<CGlobalSetup>
+        struct GlobalSetup : public BlackMisc::CDataTrait<CGlobalSetup>
         {
             //! Key in data cache
             static const char *key() { return "readers/setup"; }
diff --git a/src/blackcore/data/updateinfo.h b/src/blackcore/data/updateinfo.h
index 8d82eea66..c28e0b2ad 100644
--- a/src/blackcore/data/updateinfo.h
+++ b/src/blackcore/data/updateinfo.h
@@ -13,7 +13,7 @@
 #define BLACKCORE_DATA_UPDATEINFO_H
 
 #include "blackcore/blackcoreexport.h"
-#include "blackcore/datacache.h"
+#include "blackmisc/datacache.h"
 #include "blackmisc/network/urllist.h"
 #include "blackmisc/valueobject.h"
 #include "blackmisc/variant.h"
@@ -103,7 +103,7 @@ namespace BlackCore
         };
 
         //! Trait for global setup data
-        struct UpdateInfo : public BlackCore::CDataTrait<CUpdateInfo>
+        struct UpdateInfo : public BlackMisc::CDataTrait<CUpdateInfo>
         {
             //! Key in data cache
             static const char *key() { return "readers/updateinfo"; }
diff --git a/src/blackcore/databaseauthentication.h b/src/blackcore/databaseauthentication.h
index 9539c45b3..922c07fdb 100644
--- a/src/blackcore/databaseauthentication.h
+++ b/src/blackcore/databaseauthentication.h
@@ -59,8 +59,8 @@ namespace BlackCore
         void ps_userChanged();
 
     private:
-        CData<BlackCore::Data::GlobalSetup> m_setup {this}; //!< data cache
-        BlackCore::CData<BlackCore::Data::AuthenticatedUser> m_user {this, &CDatabaseAuthenticationService::ps_userChanged};
+        BlackMisc::CData<BlackCore::Data::GlobalSetup> m_setup {this}; //!< data cache
+        BlackMisc::CData<BlackCore::Data::AuthenticatedUser> m_user {this, &CDatabaseAuthenticationService::ps_userChanged};
 
         QNetworkAccessManager  *m_networkManager = nullptr;
         bool                    m_shutdown = false;
diff --git a/src/blackcore/databasewriter.h b/src/blackcore/databasewriter.h
index c7e940ea7..0da49cf39 100644
--- a/src/blackcore/databasewriter.h
+++ b/src/blackcore/databasewriter.h
@@ -43,11 +43,11 @@ namespace BlackCore
         void ps_postResponse(QNetworkReply *nwReplyPtr);
 
     private:
-        CData<BlackCore::Data::GlobalSetup>    m_setup {this}; //!< data cache
-        BlackMisc::Network::CUrl               m_modelUrl;
-        QNetworkAccessManager                 *m_networkManager = nullptr;
-        QNetworkReply                         *m_pendingReply = nullptr;
-        bool                                   m_shutdown = false;
+        BlackMisc::CData<BlackCore::Data::GlobalSetup> m_setup {this}; //!< data cache
+        BlackMisc::Network::CUrl                       m_modelUrl;
+        QNetworkAccessManager                         *m_networkManager = nullptr;
+        QNetworkReply                                 *m_pendingReply = nullptr;
+        bool                                           m_shutdown = false;
 
         //! URL model web service
         static BlackMisc::Network::CUrl getModelWriteUrl(const BlackMisc::Network::CUrl &baseUrl);
diff --git a/src/blackcore/icaodatareader.h b/src/blackcore/icaodatareader.h
index 7bf3f7be7..1a2b94a05 100644
--- a/src/blackcore/icaodatareader.h
+++ b/src/blackcore/icaodatareader.h
@@ -134,7 +134,7 @@ namespace BlackCore
         mutable QReadWriteLock m_lockAircraft;
         mutable QReadWriteLock m_lockCountry;
 
-        BlackCore::CData<BlackCore::Data::GlobalSetup> m_setup {this}; //!< setup cache
+        BlackMisc::CData<BlackCore::Data::GlobalSetup> m_setup {this}; //!< setup cache
 
         //! Base URL
         BlackMisc::Network::CUrl getBaseUrl() const;
diff --git a/src/blackcore/inputmanager.h b/src/blackcore/inputmanager.h
index a040b3d07..ceaf6a97c 100644
--- a/src/blackcore/inputmanager.h
+++ b/src/blackcore/inputmanager.h
@@ -132,7 +132,7 @@ namespace BlackCore
         BlackMisc::Input::CHotkeyCombination m_lastCombination;
         BlackMisc::Input::CHotkeyCombination m_capturedCombination;
 
-        BlackCore::CSetting<BlackCore::Settings::Application::ActionHotkeys> m_actionHotkeys { this, &CInputManager::ps_changeHotkeySettings };
+        BlackMisc::CSetting<BlackCore::Settings::Application::ActionHotkeys> m_actionHotkeys { this, &CInputManager::ps_changeHotkeySettings };
     };
 }
 
diff --git a/src/blackcore/modeldatareader.h b/src/blackcore/modeldatareader.h
index 7deff4b72..a5dbc0676 100644
--- a/src/blackcore/modeldatareader.h
+++ b/src/blackcore/modeldatareader.h
@@ -133,7 +133,7 @@ namespace BlackCore
         mutable QReadWriteLock m_lockLivery;
         mutable QReadWriteLock m_lockModels;
 
-        BlackCore::CData<BlackCore::Data::GlobalSetup> m_setup {this}; //!< setup cache
+        BlackMisc::CData<BlackCore::Data::GlobalSetup> m_setup {this}; //!< setup cache
 
         //! Base URL
         BlackMisc::Network::CUrl getBaseUrl() const;
diff --git a/src/blackcore/networkvatlib.h b/src/blackcore/networkvatlib.h
index 07f4ea372..9a9645d9d 100644
--- a/src/blackcore/networkvatlib.h
+++ b/src/blackcore/networkvatlib.h
@@ -181,7 +181,7 @@ namespace BlackCore
         static int const c_updateIntervalMsec = 5000;
         static int const c_logoffTimeoutSec = 5;
 
-        CSetting<Settings::Network::WireTextCodec> m_fsdTextCodecSetting { this };
+        BlackMisc::CSetting<Settings::Network::WireTextCodec> m_fsdTextCodecSetting { this };
         QTextCodec *m_fsdTextCodec = nullptr;
 
         BlackMisc::Aviation::CAircraftParts m_sentAircraftConfig;
diff --git a/src/blackcore/settings/application.h b/src/blackcore/settings/application.h
index d83c64ba0..4f21a46f2 100644
--- a/src/blackcore/settings/application.h
+++ b/src/blackcore/settings/application.h
@@ -12,7 +12,7 @@
 #ifndef BLACKCORE_SETTINGS_APPLICATION_H
 #define BLACKCORE_SETTINGS_APPLICATION_H
 
-#include "blackcore/settingscache.h"
+#include "blackmisc/settingscache.h"
 #include "blackmisc/input/actionhotkeylist.h"
 
 namespace BlackCore
@@ -22,12 +22,12 @@ namespace BlackCore
         namespace Application
         {
             //! User configured hotkeys
-            struct ActionHotkeys : public CSettingTrait<BlackMisc::Input::CActionHotkeyList>
+            struct ActionHotkeys : public BlackMisc::CSettingTrait<BlackMisc::Input::CActionHotkeyList>
             {
-                //! \copydoc BlackCore::CSettingTrait::key
+                //! \copydoc BlackMisc::CSettingTrait::key
                 static const char *key() { return "application/actionhotkeys"; }
 
-                //! \copydoc BlackCore::CSettingTrait::isValid
+                //! \copydoc BlackMisc::CSettingTrait::isValid
                 static bool isValid(const BlackMisc::Input::CActionHotkeyList &value)
                 {
                     for (const auto &actionHotkey : value)
@@ -39,8 +39,8 @@ namespace BlackCore
                     return true;
                 }
             };
-        }
-    }
-}
+        } // ns
+    } // ns
+} // ns
 
 #endif
diff --git a/src/blackcore/settings/audio.h b/src/blackcore/settings/audio.h
index 546bfcd5b..1a5883241 100644
--- a/src/blackcore/settings/audio.h
+++ b/src/blackcore/settings/audio.h
@@ -12,7 +12,7 @@
 #ifndef BLACKCORE_SETTINGS_AUDIO_H
 #define BLACKCORE_SETTINGS_AUDIO_H
 
-#include "blackcore/settingscache.h"
+#include "blackmisc/settingscache.h"
 #include "blackmisc/audio/settings/settingsaudio.h"
 
 namespace BlackCore
@@ -22,15 +22,15 @@ namespace BlackCore
         namespace Audio
         {
             //! Name of text codec to use with text in FSD protocol
-            struct AudioSettings : public CSettingTrait<BlackMisc::Audio::Settings::CSettingsAudio>
+            struct AudioSettings : public BlackMisc::CSettingTrait<BlackMisc::Audio::Settings::CSettingsAudio>
             {
-                //! \copydoc BlackCore::CSettingTrait::key
+                //! \copydoc BlackMisc::CSettingTrait::key
                 static const char *key() { return "audio/setup"; }
 
-                //! \copydoc BlackCore::CSettingTrait::defaultValue
+                //! \copydoc BlackMisc::CSettingTrait::defaultValue
                 static const BlackMisc::Audio::Settings::CSettingsAudio &defaultValue() { static const BlackMisc::Audio::Settings::CSettingsAudio a; return a; }
 
-                //! \copydoc BlackCore::CSettingTrait::isValid
+                //! \copydoc BlackMisc::CSettingTrait::isValid
                 static bool isValid(const BlackMisc::Audio::Settings::CSettingsAudio &value) { Q_UNUSED(value); return true; }
             };
 
diff --git a/src/blackcore/settings/network.h b/src/blackcore/settings/network.h
index a3d8f2bef..e93bf4564 100644
--- a/src/blackcore/settings/network.h
+++ b/src/blackcore/settings/network.h
@@ -12,7 +12,7 @@
 #ifndef BLACKCORE_SETTINGS_NETWORK_H
 #define BLACKCORE_SETTINGS_NETWORK_H
 
-#include "blackcore/settingscache.h"
+#include "blackmisc/settingscache.h"
 #include "blackmisc/network/serverlist.h"
 #include <QTextCodec>
 
@@ -23,32 +23,32 @@ namespace BlackCore
         namespace Network
         {
             //! Name of text codec to use with text in FSD protocol
-            struct WireTextCodec : public CSettingTrait<QString>
+            struct WireTextCodec : public BlackMisc::CSettingTrait<QString>
             {
-                //! \copydoc BlackCore::CSettingTrait::key
+                //! \copydoc BlackMisc::CSettingTrait::key
                 static const char *key() { return "network/wiretextcodec"; }
 
-                //! \copydoc BlackCore::CSettingTrait::defaultValue
+                //! \copydoc BlackMisc::CSettingTrait::defaultValue
                 static const QString &defaultValue() { static const QString dv("latin1"); return dv; }
 
-                //! \copydoc BlackCore::CSettingTrait::isValid
+                //! \copydoc BlackMisc::CSettingTrait::isValid
                 static bool isValid(const QString &value) { return QTextCodec::codecForName(qPrintable(value)); }
             };
 
             //! Virtual air traffic servers
-            struct TrafficServers : public CSettingTrait<BlackMisc::Network::CServerList>
+            struct TrafficServers : public BlackMisc::CSettingTrait<BlackMisc::Network::CServerList>
             {
-                //! \copydoc BlackCore::CSettingTrait::key
+                //! \copydoc BlackMisc::CSettingTrait::key
                 static const char *key() { return "network/trafficservers"; }
             };
 
             //! Currently selected virtual air traffic server
-            struct CurrentTrafficServer : public CSettingTrait<BlackMisc::Network::CServer>
+            struct CurrentTrafficServer : public BlackMisc::CSettingTrait<BlackMisc::Network::CServer>
             {
-                //! \copydoc BlackCore::CSettingTrait::key
+                //! \copydoc BlackMisc::CSettingTrait::key
                 static const char *key() { return "network/currenttrafficserver"; }
 
-                //! \copydoc BlackCore::CSettingTrait::defaultValue
+                //! \copydoc BlackMisc::CSettingTrait::defaultValue
                 static const BlackMisc::Network::CServer &defaultValue()
                 {
                     using namespace BlackMisc::Network;
@@ -58,12 +58,12 @@ namespace BlackCore
             };
 
             //! DBus server address
-            struct DBusServerAddress : public CSettingTrait<QString>
+            struct DBusServerAddress : public BlackMisc::CSettingTrait<QString>
             {
-                //! \copydoc BlackCore::CSettingTrait::key
+                //! \copydoc BlackMisc::CSettingTrait::key
                 static const char *key() { return "network/dbusserver"; }
 
-                //! \copydoc BlackCore::CSettingTrait::defaultValue
+                //! \copydoc BlackMisc::CSettingTrait::defaultValue
                 static const QString &defaultValue() { static const QString dv("session"); return dv; }
             };
         } // ns
diff --git a/src/blackcore/settingsallclasses.h b/src/blackcore/settingsallclasses.h
deleted file mode 100644
index 138e96575..000000000
--- a/src/blackcore/settingsallclasses.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/*  Copyright (C) 2013 VATSIM Community / contributors
- *  This Source Code Form is subject to the terms of the Mozilla Public
- *  License, v. 2.0. If a copy of the MPL was not distributed with this
- *  file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef BLACKCORE_SETTINGSALLCLASSES_H
-#define BLACKCORE_SETTINGSALLCLASSES_H
-
-#include "blackmisc/settingsblackmiscclasses.h"
-
-#endif // guard
diff --git a/src/blackcore/setupreader.h b/src/blackcore/setupreader.h
index 433a3135a..1a0e03995 100644
--- a/src/blackcore/setupreader.h
+++ b/src/blackcore/setupreader.h
@@ -70,8 +70,8 @@ namespace BlackCore
         QNetworkAccessManager              *m_networkManagerUpdateInfo = nullptr;
         BlackMisc::LockFree<BlackMisc::Network::CFailoverUrlList> m_bootstrapUrls;
         BlackMisc::LockFree<BlackMisc::Network::CFailoverUrlList> m_updateInfoUrls;
-        CData<BlackCore::Data::GlobalSetup> m_setup {this};      //!< data cache setup
-        CData<BlackCore::Data::UpdateInfo>  m_updateInfo {this}; //!< data cache update info
+        BlackMisc::CData<BlackCore::Data::GlobalSetup> m_setup {this};      //!< data cache setup
+        BlackMisc::CData<BlackCore::Data::UpdateInfo>  m_updateInfo {this}; //!< data cache update info
 
         //! Constructor
         explicit CSetupReader(QObject *owner);
diff --git a/src/blackcore/vatsimbookingreader.h b/src/blackcore/vatsimbookingreader.h
index a32a3ccc8..b2d81cacb 100644
--- a/src/blackcore/vatsimbookingreader.h
+++ b/src/blackcore/vatsimbookingreader.h
@@ -56,7 +56,7 @@ namespace BlackCore
         void ps_read();
 
     private:
-        BlackCore::CData<BlackCore::Data::GlobalSetup> m_setup {this}; //!< setup cache
+        BlackMisc::CData<BlackCore::Data::GlobalSetup> m_setup {this}; //!< setup cache
         QNetworkAccessManager *m_networkManager = nullptr;
     };
 }
diff --git a/src/blackcore/vatsimdatafilereader.h b/src/blackcore/vatsimdatafilereader.h
index 472371590..3a636af53 100644
--- a/src/blackcore/vatsimdatafilereader.h
+++ b/src/blackcore/vatsimdatafilereader.h
@@ -130,7 +130,7 @@ namespace BlackCore
         BlackMisc::Aviation::CAtcStationList          m_atcStations;
         BlackMisc::Simulation::CSimulatedAircraftList m_aircraft;
         QMap<BlackMisc::Aviation::CCallsign, BlackMisc::Network::CVoiceCapabilities> m_voiceCapabilities;
-        BlackCore::CData<BlackCore::Data::GlobalSetup> m_setup {this}; //!< setup cache
+        BlackMisc::CData<BlackCore::Data::GlobalSetup> m_setup {this}; //!< setup cache
 
         //! Split line and assign values to their corresponding attribute names
         static const QMap<QString, QString> clientPartsToMap(const QString &currentLine, const QStringList &clientSectionAttributes);
diff --git a/src/blackcore/vatsimmetarreader.h b/src/blackcore/vatsimmetarreader.h
index cb84ed1a8..277a4c4ba 100644
--- a/src/blackcore/vatsimmetarreader.h
+++ b/src/blackcore/vatsimmetarreader.h
@@ -72,7 +72,7 @@ namespace BlackCore
         QNetworkAccessManager            *m_networkManager = nullptr;
         BlackMisc::Weather::CMetarDecoder m_metarDecoder;
         BlackMisc::Weather::CMetarSet     m_metars;
-        BlackCore::CData<BlackCore::Data::GlobalSetup> m_setup {this}; //!< setup cache
+        BlackMisc::CData<BlackCore::Data::GlobalSetup> m_setup {this}; //!< setup cache
     };
 }
 #endif // guard
diff --git a/src/blackcore/webdataservices.h b/src/blackcore/webdataservices.h
index 032bfa755..3ef050a4c 100644
--- a/src/blackcore/webdataservices.h
+++ b/src/blackcore/webdataservices.h
@@ -285,7 +285,7 @@ namespace BlackCore
         CWebReaderFlags::WebReader m_readerFlags = CWebReaderFlags::WebReaderFlag::None; //!< which readers are available
         int m_autoReadAfterSetupMs               = -1;                                   //!< directly read all known readers after setup was syncronized
         bool m_initialRead                       = false;                                //!< Initial read conducted
-        BlackCore::CData<BlackCore::Data::GlobalSetup> m_setup {this, &CWebDataServices::ps_setupChanged}; //!< setup cache
+        BlackMisc::CData<BlackCore::Data::GlobalSetup> m_setup {this, &CWebDataServices::ps_setupChanged}; //!< setup cache
 
         // for reading XML and VATSIM data files
         CVatsimBookingReader  *m_vatsimBookingReader  = nullptr;
diff --git a/src/blackgui/components/audiosetupcomponent.h b/src/blackgui/components/audiosetupcomponent.h
index 3dab9df47..bae14c707 100644
--- a/src/blackgui/components/audiosetupcomponent.h
+++ b/src/blackgui/components/audiosetupcomponent.h
@@ -73,7 +73,7 @@ namespace BlackGui
             void initAudioDeviceLists();
 
             QScopedPointer<Ui::CAudioSetupComponent> ui;
-            BlackCore::CSetting<BlackCore::Settings::Audio::AudioSettings> m_audioSettings { this, &CAudioSetupComponent::ps_reloadSettings };
+            BlackMisc::CSetting<BlackCore::Settings::Audio::AudioSettings> m_audioSettings { this, &CAudioSetupComponent::ps_reloadSettings };
 
         };
     } // namespace
diff --git a/src/blackgui/components/dbdebugdatabasesetup.h b/src/blackgui/components/dbdebugdatabasesetup.h
index 9d4a0d750..d7a33027b 100644
--- a/src/blackgui/components/dbdebugdatabasesetup.h
+++ b/src/blackgui/components/dbdebugdatabasesetup.h
@@ -43,7 +43,7 @@ namespace BlackGui
 
         private:
             QScopedPointer<Ui::CDbDebugDatabaseSetup> ui;
-            BlackCore::CData<BlackCore::Data::GlobalSetup> m_setup {this};   //!< data cache
+            BlackMisc::CData<BlackCore::Data::GlobalSetup> m_setup {this};   //!< data cache
         };
     } // ns
 } // ns
diff --git a/src/blackgui/components/dblogincomponent.h b/src/blackgui/components/dblogincomponent.h
index 9d542a140..a7030f946 100644
--- a/src/blackgui/components/dblogincomponent.h
+++ b/src/blackgui/components/dblogincomponent.h
@@ -40,8 +40,8 @@ namespace BlackGui
 
         private:
             QScopedPointer<Ui::CDbLoginComponent> ui;
-            BlackCore::CData<BlackCore::Data::GlobalSetup> m_setup {this, &CDbLoginComponent::ps_setupChanged};   //!< data cache
-            BlackCore::CDatabaseAuthenticationService m_loginService {this}; //!< login service
+            BlackMisc::CData<BlackCore::Data::GlobalSetup> m_setup {this, &CDbLoginComponent::ps_setupChanged};   //!< data cache
+            BlackCore::CDatabaseAuthenticationService m_loginService {this};                                      //!< login service
 
             //! Overlay messages
             void displayOverlayMessages(const BlackMisc::CStatusMessageList &msgs);
diff --git a/src/blackgui/components/dbmappingcomponent.h b/src/blackgui/components/dbmappingcomponent.h
index bc8781730..b0e83847f 100644
--- a/src/blackgui/components/dbmappingcomponent.h
+++ b/src/blackgui/components/dbmappingcomponent.h
@@ -164,10 +164,10 @@ namespace BlackGui
         private:
             QScopedPointer<Ui::CDbMappingComponent> ui;
             BlackMisc::Simulation::FsCommon::CVPilotRulesReader           m_vPilotReader;                //!< read vPilot rules
-            BlackCore::CData<BlackCore::Data::VPilotAircraftModels>       m_cachedVPilotModels { this, &CDbMappingComponent::ps_onVPilotCacheChanged }; //!< cache for latest vPilot rules
+            BlackMisc::CData<BlackCore::Data::VPilotAircraftModels>       m_cachedVPilotModels { this, &CDbMappingComponent::ps_onVPilotCacheChanged }; //!< cache for latest vPilot rules
             std::unique_ptr<BlackMisc::Simulation::IAircraftModelLoader>  m_modelLoader;                 //!< read own aircraft models
-            BlackCore::CData<BlackCore::Data::OwnSimulatorAircraftModels> m_cachedOwnModels { this };    //!< cache for latest models
-            BlackCore::CData<BlackCore::Data::AuthenticatedUser>          m_user {this, &CDbMappingComponent::ps_userChanged};
+            BlackMisc::CData<BlackCore::Data::OwnSimulatorAircraftModels> m_cachedOwnModels { this };    //!< cache for latest models
+            BlackMisc::CData<BlackCore::Data::AuthenticatedUser>          m_user {this, &CDbMappingComponent::ps_userChanged};
             bool m_vPilot1stInit = true;
             bool m_withVPilot    = false;
 
diff --git a/src/blackgui/components/logincomponent.h b/src/blackgui/components/logincomponent.h
index ce90a6ace..589991979 100644
--- a/src/blackgui/components/logincomponent.h
+++ b/src/blackgui/components/logincomponent.h
@@ -147,8 +147,8 @@ namespace BlackGui
             QScopedPointer<Ui::CLoginComponent> ui;
             const int LogoffIntervalSeconds = 10;
             QTimer *m_logoffCountdownTimer { nullptr };
-            BlackCore::CSetting<BlackCore::Settings::Network::TrafficServers> m_otherTrafficNetworkServers { this, &CLoginComponent::ps_reloadSettings };
-            BlackCore::CData<BlackCore::Data::GlobalSetup> m_setup {this}; //!< setup cache
+            BlackMisc::CSetting<BlackCore::Settings::Network::TrafficServers> m_otherTrafficNetworkServers { this, &CLoginComponent::ps_reloadSettings };
+            BlackMisc::CData<BlackCore::Data::GlobalSetup> m_setup {this}; //!< setup cache
         };
 
     } // namespace
diff --git a/src/blackgui/components/settingshotkeycomponent.h b/src/blackgui/components/settingshotkeycomponent.h
index d2720da14..39359722b 100644
--- a/src/blackgui/components/settingshotkeycomponent.h
+++ b/src/blackgui/components/settingshotkeycomponent.h
@@ -54,7 +54,7 @@ namespace BlackGui
 
             QScopedPointer<Ui::CSettingsHotkeyComponent> ui;
             BlackGui::Models::CActionHotkeyListModel m_model;
-            BlackCore::CSetting<BlackCore::Settings::Application::ActionHotkeys> m_actionHotkeys { this };
+            BlackMisc::CSetting<BlackCore::Settings::Application::ActionHotkeys> m_actionHotkeys { this };
             BlackCore::CActionBind m_action { "/Test/Message", this, &CSettingsHotkeyComponent::ps_hotkeySlot };
 
             void ps_hotkeySlot(bool keyDown);
diff --git a/src/blackgui/components/settingsnetworkserverscomponent.h b/src/blackgui/components/settingsnetworkserverscomponent.h
index ade01ed5c..dc250fe2b 100644
--- a/src/blackgui/components/settingsnetworkserverscomponent.h
+++ b/src/blackgui/components/settingsnetworkserverscomponent.h
@@ -51,8 +51,8 @@ namespace BlackGui
 
         private:
             QScopedPointer<Ui::CSettingsNetworkServersComponent> ui;
-            BlackCore::CSetting<BlackCore::Settings::Network::TrafficServers> m_trafficNetworkServers { this, &CSettingsNetworkServersComponent::ps_reloadSettings };
-            BlackCore::CData<BlackCore::Data::GlobalSetup> m_setup {this}; //!< setup cache
+            BlackMisc::CSetting<BlackCore::Settings::Network::TrafficServers> m_trafficNetworkServers { this, &CSettingsNetworkServersComponent::ps_reloadSettings };
+            BlackMisc::CData<BlackCore::Data::GlobalSetup> m_setup {this}; //!< setup cache
         };
     } // ns
 } // ns
diff --git a/src/plugins/simulator/fsxconfig/simulatorfsxconfig.h b/src/plugins/simulator/fsxconfig/simulatorfsxconfig.h
index 8eae73b05..e45d0ebea 100644
--- a/src/plugins/simulator/fsxconfig/simulatorfsxconfig.h
+++ b/src/plugins/simulator/fsxconfig/simulatorfsxconfig.h
@@ -13,7 +13,7 @@
 #define BLACKSIMPLUGIN_SIMULATOR_FSX_CONFIG_H
 
 #include "blackgui/pluginconfig.h"
-#include "blackcore/settingscache.h"
+#include "blackmisc/settingscache.h"
 
 namespace BlackSimPlugin
 {
diff --git a/src/plugins/simulator/xplane/simulatorxplane.h b/src/plugins/simulator/xplane/simulatorxplane.h
index 431239ff7..57d4ca51f 100644
--- a/src/plugins/simulator/xplane/simulatorxplane.h
+++ b/src/plugins/simulator/xplane/simulatorxplane.h
@@ -214,7 +214,7 @@ namespace BlackSimPlugin
         private:
             QDBusConnection m_conn { "default" };
             QDBusServiceWatcher *m_watcher { nullptr };
-            BlackCore::CSetting<XBusServer> m_xbusServerSetting { this, &CSimulatorXPlaneListener::ps_xbusServerSettingChanged };
+            BlackMisc::CSetting<XBusServer> m_xbusServerSetting { this, &CSimulatorXPlaneListener::ps_xbusServerSettingChanged };
 
         };
 
diff --git a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfig.h b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfig.h
index d4a8333cf..3e53e994d 100644
--- a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfig.h
+++ b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfig.h
@@ -13,7 +13,7 @@
 #define BLACKSIMPLUGIN_SIMULATOR_XPLANE_CONFIG_H
 
 #include "blackgui/pluginconfig.h"
-#include "blackcore/settingscache.h"
+#include "blackmisc/settingscache.h"
 
 namespace BlackSimPlugin
 {
@@ -23,12 +23,12 @@ namespace BlackSimPlugin
         /*!
          * Setting for XBus.
          */
-        struct XBusServer : public BlackCore::CSettingTrait<QString>
+        struct XBusServer : public BlackMisc::CSettingTrait<QString>
         {
-            //! \copydoc BlackCore::CSetting::key
+            //! \copydoc BlackMisc::CSetting::key
             static const char *key() { return "xbus/server"; }
 
-            //! \copydoc BlackCore::CSetting::defaultValue
+            //! \copydoc BlackMisc::CSetting::defaultValue
             static QString defaultValue() { return QStringLiteral("session"); }
         };
 
diff --git a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.h b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.h
index ef5a9a464..69f796218 100644
--- a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.h
+++ b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.h
@@ -48,7 +48,7 @@ namespace BlackSimPlugin
 
         private:
             QScopedPointer<Ui::CSimulatorXPlaneConfigWindow> ui;
-            BlackCore::CSetting<XBusServer> m_xbusServerSetting { this };
+            BlackMisc::CSetting<XBusServer> m_xbusServerSetting { this };
 
         };
     }
diff --git a/src/swiftdata/swiftdata.h b/src/swiftdata/swiftdata.h
index bf5fb8cd5..8313534dd 100644
--- a/src/swiftdata/swiftdata.h
+++ b/src/swiftdata/swiftdata.h
@@ -73,8 +73,8 @@ private:
     QScopedPointer<Ui::CSwiftData> ui;
     BlackGui::CManagedStatusBar    m_statusBar;
     BlackCore::CWebDataServices   *m_webDataReader = nullptr;
-    BlackCore::CData<BlackCore::Data::GlobalSetup> m_setup {this, &CSwiftData::ps_setupChanged}; //!< setup cache
-    BlackCore::CData<BlackCore::Data::UpdateInfo>  m_updateInfo { this };                        //!< download / version data
+    BlackMisc::CData<BlackCore::Data::GlobalSetup> m_setup {this, &CSwiftData::ps_setupChanged}; //!< setup cache
+    BlackMisc::CData<BlackCore::Data::UpdateInfo>  m_updateInfo { this };                        //!< download / version data
 };
 
 #endif // guard
diff --git a/src/swiftdata/swiftdatamenus.cpp b/src/swiftdata/swiftdatamenus.cpp
index b25edf3bb..786ea2893 100644
--- a/src/swiftdata/swiftdatamenus.cpp
+++ b/src/swiftdata/swiftdatamenus.cpp
@@ -13,8 +13,8 @@
 #include "blackgui/components/datainfoareacomponent.h"
 #include "blackgui/components/logcomponent.h"
 #include "blackgui/stylesheetutility.h"
-#include "blackcore/datacache.h"
-#include "blackcore/settingscache.h"
+#include "blackmisc/datacache.h"
+#include "blackmisc/settingscache.h"
 #include "blackcore/webdataservices.h"
 #include "blackmisc/statusmessagelist.h"
 #include "blackmisc/logmessage.h"
diff --git a/src/swiftguistandard/swiftguistd.h b/src/swiftguistandard/swiftguistd.h
index 2e05ed99c..5aad4cb98 100644
--- a/src/swiftguistandard/swiftguistd.h
+++ b/src/swiftguistandard/swiftguistd.h
@@ -113,7 +113,7 @@ private:
     bool                                           m_init = false;
     BlackGui::CManagedStatusBar                    m_statusBar;
     BlackMisc::CLogSubscriber                      m_logSubscriber { this, &SwiftGuiStd::ps_displayStatusMessageInGui };
-    BlackCore::CData<BlackCore::Data::GlobalSetup> m_setup {this};  //!< setup cache
+    BlackMisc::CData<BlackCore::Data::GlobalSetup> m_setup {this};  //!< setup cache
 
     // contexts
     bool m_coreAvailable           = false;
diff --git a/src/swiftguistandard/swiftguistdmenus.cpp b/src/swiftguistandard/swiftguistdmenus.cpp
index 0d08e7710..cc47913a2 100644
--- a/src/swiftguistandard/swiftguistdmenus.cpp
+++ b/src/swiftguistandard/swiftguistdmenus.cpp
@@ -9,8 +9,8 @@
 
 #include "swiftguistd.h"
 #include "ui_swiftguistd.h"
-#include "blackcore/datacache.h"
-#include "blackcore/settingscache.h"
+#include "blackmisc/datacache.h"
+#include "blackmisc/settingscache.h"
 #include "blackgui/stylesheetutility.h"
 #include "blackgui/components/settingscomponent.h"
 #include "blackgui/components/logcomponent.h"
diff --git a/src/swiftlauncher/swiftlauncher.h b/src/swiftlauncher/swiftlauncher.h
index bf4e33958..989dcee33 100644
--- a/src/swiftlauncher/swiftlauncher.h
+++ b/src/swiftlauncher/swiftlauncher.h
@@ -60,11 +60,11 @@ protected:
 
 private:
     QScopedPointer<Ui::CSwiftLauncher>             ui;
-    BlackCore::CData<BlackCore::Data::GlobalSetup> m_setup      { this, &CSwiftLauncher::ps_changedCache };   //!< setup cache
-    BlackCore::CData<BlackCore::Data::UpdateInfo>  m_updateInfo { this, &CSwiftLauncher::ps_changedCache }; //!< version cache
+    BlackMisc::CData<BlackCore::Data::GlobalSetup> m_setup      { this, &CSwiftLauncher::ps_changedCache };   //!< setup cache
+    BlackMisc::CData<BlackCore::Data::UpdateInfo>  m_updateInfo { this, &CSwiftLauncher::ps_changedCache }; //!< version cache
     QString     m_executable;
     QStringList m_executableArgs;
-    BlackCore::CSetting<BlackCore::Settings::Network::DBusServerAddress> m_dbusServerAddress { this };
+    BlackMisc::CSetting<BlackCore::Settings::Network::DBusServerAddress> m_dbusServerAddress { this };
 
     //! Get core mode
     GuiModes::CoreMode getCoreMode() const;
diff --git a/tests/blackcore/testreaders.h b/tests/blackcore/testreaders.h
index 4cd479751..0c10438ad 100644
--- a/tests/blackcore/testreaders.h
+++ b/tests/blackcore/testreaders.h
@@ -40,7 +40,7 @@ namespace BlackCoreTest
     private:
         BlackCore::CIcaoDataReader  m_icaoReader;
         BlackCore::CModelDataReader m_modelReader;
-        BlackCore::CData<BlackCore::Data::GlobalSetup> m_setup {this}; //!< setup cache
+        BlackMisc::CData<BlackCore::Data::GlobalSetup> m_setup {this}; //!< setup cache
 
         //! Test if server is available
         static bool pingServer(const BlackMisc::Network::CUrl &url);