diff --git a/src/blackgui/components/copyconfigurationcomponent.h b/src/blackgui/components/copyconfigurationcomponent.h
index 8ce735647..4aae1dbdd 100644
--- a/src/blackgui/components/copyconfigurationcomponent.h
+++ b/src/blackgui/components/copyconfigurationcomponent.h
@@ -27,9 +27,8 @@ namespace BlackGui
 {
     namespace Components
     {
-        /**
-         * Copy configuration (i.e. settings and cache files)
-         */
+        //! Copy configuration (i.e. settings and cache files)
+        //! \deprecated replaced by CCopySettingsAndCachesComponent
         class BLACKGUI_EXPORT CCopyConfigurationComponent : public QFrame
         {
             Q_OBJECT
diff --git a/src/blackgui/components/copyconfigurationdialog.h b/src/blackgui/components/copyconfigurationdialog.h
index 57a6a692d..f433da632 100644
--- a/src/blackgui/components/copyconfigurationdialog.h
+++ b/src/blackgui/components/copyconfigurationdialog.h
@@ -21,9 +21,8 @@ namespace BlackGui
 {
     namespace Components
     {
-        /**
-         * Dialog to copy cache and settings
-         */
+        //! Dialog to copy cache and settings
+        //! \deprecated replaced by CCopySettingsAndCachesComponent
         class BLACKGUI_EXPORT CCopyConfigurationDialog : public QDialog
         {
             Q_OBJECT
diff --git a/src/blackgui/components/copysettingsandcachescomponent.h b/src/blackgui/components/copysettingsandcachescomponent.h
index d423e244d..84147b3e9 100644
--- a/src/blackgui/components/copysettingsandcachescomponent.h
+++ b/src/blackgui/components/copysettingsandcachescomponent.h
@@ -29,6 +29,7 @@
 #include "blackmisc/simulation/settings/modelsettings.h"
 #include "blackmisc/network/data/lastserver.h"
 #include "blackmisc/network/settings/servers.h"
+#include "blackmisc/directories.h"
 #include "blackmisc/applicationinfo.h"
 
 #include <QWizardPage>
@@ -110,31 +111,31 @@ namespace BlackGui
 
             QScopedPointer<Ui::CCopySettingsAndCachesComponent> ui;
 
-            BlackMisc::CSetting<BlackCore::Audio::TSettings> m_settingsAudio { this };
             BlackMisc::CSetting<BlackCore::Audio::TInputDevice>  m_settingsAudioInputDevice { this };
             BlackMisc::CSetting<BlackCore::Audio::TOutputDevice> m_settingsAudioOutputDevice { this };
-            BlackMisc::CSetting<BlackMisc::Network::Settings::TTrafficServers> m_settingsNetworkServers { this };
             BlackMisc::CSetting<Settings::TGeneralGui> m_settingsGuiGeneral { this };
             BlackMisc::CSetting<Settings::TDockWidget> m_settingsDockWidget { this };
             BlackMisc::CSetting<Settings::TViewUpdateSettings> m_settingsViewUpdate { this };
+            BlackMisc::CSetting<Settings::TBackgroundConsolidation> m_settingsConsolidation { this }; //!< consolidation time
+            BlackMisc::CSetting<Settings::TAtcStationsSettings> m_settingsAtcStations { this };
+            BlackMisc::CSetting<Settings::TextMessageSettings> m_settingsTextMessage { this };
             BlackMisc::CSetting<BlackCore::Application::TEnabledSimulators> m_settingsEnabledSimulators { this };
             BlackMisc::CSetting<BlackCore::Application::TActionHotkeys> m_settingsActionHotkeys { this };
+            BlackMisc::CSetting<BlackCore::Audio::TSettings> m_settingsAudio { this };
+            BlackMisc::CSetting<BlackMisc::Network::Settings::TTrafficServers> m_settingsNetworkServers { this };
             BlackMisc::CSetting<BlackMisc::Simulation::Settings::TSimulatorFsx> m_settingsSimulatorFsx { this }; //!< FSX settings
             BlackMisc::CSetting<BlackMisc::Simulation::Settings::TSimulatorFs9> m_settingsSimulatorFs9 { this }; //!< FS9 settings
             BlackMisc::CSetting<BlackMisc::Simulation::Settings::TSimulatorP3D> m_settingsSimulatorP3D { this }; //!< P3D settings
             BlackMisc::CSetting<BlackMisc::Simulation::Settings::TSimulatorXP>  m_settingsSimulatorXPlane  { this }; //!< XP settings
-            BlackMisc::CSetting<Settings::TBackgroundConsolidation> m_settingsConsolidation { this }; //!< consolidation time
             BlackMisc::CSetting<BlackMisc::Simulation::Settings::TModel> m_settingsModel { this }; //!< model setting
-            BlackMisc::CSetting<BlackGui::Settings::TAtcStationsSettings> m_settingsAtcStations { this };
-            BlackMisc::CSetting<BlackGui::Settings::TextMessageSettings> m_settingsTextMessage { this };
 
-            BlackMisc::CData<BlackMisc::Network::Data::TLastServer> m_cacheLastNetworkServer { this }; //!< recently used server (VATSIM, other)
             BlackMisc::CData<BlackCore::Data::TVatsimLastServer> m_cacheLastVatsimServer { this }; //!< recently used VATSIM server
+            BlackMisc::CData<BlackCore::Data::TLauncherSetup> m_cacheLauncherSetup { this };
+            BlackMisc::CData<BlackCore::Data::TVatsimSetup> m_cacheVatsimSetup { this };
+            BlackMisc::CData<BlackMisc::Network::Data::TLastServer> m_cacheLastNetworkServer { this }; //!< recently used server (VATSIM, other)
             BlackMisc::CData<BlackMisc::Simulation::Data::TSimulatorLastSelection> m_cacheModelSetCurrentSimulator { this };
             BlackMisc::CData<BlackMisc::Simulation::Data::TModelCacheLastSelection> m_cacheModelsCurrentSimulator { this };
             BlackMisc::CData<BlackMisc::Simulation::Data::TLastModel> m_cacheLastAircraftModel { this }; //!< recently used aircraft model
-            BlackMisc::CData<BlackCore::Data::TLauncherSetup> m_cacheLauncherSetup { this };
-            BlackMisc::CData<BlackCore::Data::TVatsimSetup> m_cacheVatsimSetup { this };
         };
 
         /**