diff --git a/GUI/View/Fit/FitActivityPanel.cpp b/GUI/View/Fit/FitActivityPanel.cpp
index 4755cc59a5db902b688c2be0cdb2481a5f22f1d8..131f1e85a530b83bd6c6bdea603883bef4e3699b 100644
--- a/GUI/View/Fit/FitActivityPanel.cpp
+++ b/GUI/View/Fit/FitActivityPanel.cpp
@@ -18,7 +18,7 @@
 #include "GUI/View/Fit/FitSessionManager.h"
 #include "GUI/View/Fit/FitSessionWidget.h"
 #include "GUI/View/Fit/JobRealTimeWidget.h"
-#include "GUI/View/Fit/RunFitControlWidget.h"
+#include "GUI/View/FitControl/RunFitControlWidget.h"
 #include <QLabel>
 #include <QSettings>
 #include <QVBoxLayout>
diff --git a/GUI/View/Fit/FitSessionController.cpp b/GUI/View/Fit/FitSessionController.cpp
index 5e721e23919b39dbd80ea1c20b9ae956b736ace1..bb3afaed51c0262c4665d351e2107e84f03d720c 100644
--- a/GUI/View/Fit/FitSessionController.cpp
+++ b/GUI/View/Fit/FitSessionController.cpp
@@ -18,10 +18,10 @@
 #include "GUI/Model/Job/FitParameterContainerItem.h"
 #include "GUI/Model/Job/FitSuiteItem.h"
 #include "GUI/Model/Job/JobItem.h"
-#include "GUI/View/Fit/FitLog.h"
-#include "GUI/View/Fit/FitObjectiveBuilder.h"
-#include "GUI/View/Fit/FitWorkerLauncher.h"
-#include "GUI/View/Fit/GUIFitObserver.h"
+#include "GUI/View/FitDisplay/FitLog.h"
+#include "GUI/View/FitObjective/FitObjectiveBuilder.h"
+#include "GUI/View/FitControl/FitWorkerLauncher.h"
+#include "GUI/View/FitDisplay/GUIFitObserver.h"
 
 namespace {
 
diff --git a/GUI/View/Fit/FitSessionWidget.cpp b/GUI/View/Fit/FitSessionWidget.cpp
index 0e37c2b5b8af8f9493a9939925ee25f135dee387..42016497232ed8e5e9e0fe67c4efca17c55e8123 100644
--- a/GUI/View/Fit/FitSessionWidget.cpp
+++ b/GUI/View/Fit/FitSessionWidget.cpp
@@ -15,10 +15,10 @@
 #include "GUI/View/Fit/FitSessionWidget.h"
 #include "Base/Util/Assert.h"
 #include "GUI/Support/Tool/mainwindow_constants.h"
-#include "GUI/View/Fit/FitParameterWidget.h"
+#include "GUI/View/FitObjective/FitParameterWidget.h"
 #include "GUI/View/Fit/FitSessionController.h"
-#include "GUI/View/Fit/MinimizerSettingsWidget.h"
-#include "GUI/View/Fit/RunFitControlWidget.h"
+#include "GUI/View/FitControl/MinimizerSettingsWidget.h"
+#include "GUI/View/FitControl/RunFitControlWidget.h"
 #include <QSettings>
 #include <QTabWidget>
 #include <QVBoxLayout>
diff --git a/GUI/View/Fit/JobRealTimeWidget.cpp b/GUI/View/Fit/JobRealTimeWidget.cpp
index fa9a9252fcff3c86203ee11874ae946b16a01085..b0d043c36e104fe383361c73c79c3dda8333af3b 100644
--- a/GUI/View/Fit/JobRealTimeWidget.cpp
+++ b/GUI/View/Fit/JobRealTimeWidget.cpp
@@ -15,7 +15,7 @@
 #include "GUI/View/Fit/JobRealTimeWidget.h"
 #include "GUI/Model/Model/JobModel.h"
 #include "GUI/Support/Tool/mainwindow_constants.h"
-#include "GUI/View/Fit/ParameterTuningWidget.h"
+#include "GUI/View/FitObjective/ParameterTuningWidget.h"
 #include <QSettings>
 #include <QVBoxLayout>
 
diff --git a/GUI/View/Fit/FitWorker.cpp b/GUI/View/FitControl/FitWorker.cpp
similarity index 85%
rename from GUI/View/Fit/FitWorker.cpp
rename to GUI/View/FitControl/FitWorker.cpp
index 3d2788aafce7dc8e4b6048a9a6ed8da32343c86f..65a0708f91a6e9407deacc288d57c94a1869ef49 100644
--- a/GUI/View/Fit/FitWorker.cpp
+++ b/GUI/View/FitControl/FitWorker.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Fit/FitWorker.cpp
+//! @file      GUI/View/FitControl/FitWorker.cpp
 //! @brief     Implements class FitWorker
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Fit/FitWorker.h"
-#include "GUI/View/Fit/FitObjectiveBuilder.h"
+#include "GUI/View/FitControl/FitWorker.h"
+#include "GUI/View/FitObjective/FitObjectiveBuilder.h"
 
 void FitWorker::startFit()
 {
diff --git a/GUI/View/Fit/FitWorker.h b/GUI/View/FitControl/FitWorker.h
similarity index 83%
rename from GUI/View/Fit/FitWorker.h
rename to GUI/View/FitControl/FitWorker.h
index d774bd75b3f373d28c85dac4cd3284341d42bb2a..58486afb0f1f9ec75ed328ca42a03082dcdaf3f7 100644
--- a/GUI/View/Fit/FitWorker.h
+++ b/GUI/View/FitControl/FitWorker.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Fit/FitWorker.h
+//! @file      GUI/View/FitControl/FitWorker.h
 //! @brief     Implements class FitWorker
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_FIT_FITWORKER_H
-#define BORNAGAIN_GUI_VIEW_FIT_FITWORKER_H
+#ifndef BORNAGAIN_GUI_VIEW_FITCONTROL_FITWORKER_H
+#define BORNAGAIN_GUI_VIEW_FITCONTROL_FITWORKER_H
 
 #include <QObject>
 #include <memory>
@@ -44,4 +44,4 @@ private:
     std::shared_ptr<FitObjectiveBuilder> m_fit_objective;
 };
 
-#endif // BORNAGAIN_GUI_VIEW_FIT_FITWORKER_H
+#endif // BORNAGAIN_GUI_VIEW_FITCONTROL_FITWORKER_H
diff --git a/GUI/View/Fit/FitWorkerLauncher.cpp b/GUI/View/FitControl/FitWorkerLauncher.cpp
similarity index 94%
rename from GUI/View/Fit/FitWorkerLauncher.cpp
rename to GUI/View/FitControl/FitWorkerLauncher.cpp
index 82ca9121b3be4e9de37710eea656bbcd3518ab47..9da86d0c8c894db286f9d058f17b819f23ef6c99 100644
--- a/GUI/View/Fit/FitWorkerLauncher.cpp
+++ b/GUI/View/FitControl/FitWorkerLauncher.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Fit/FitWorkerLauncher.cpp
+//! @file      GUI/View/FitControl/FitWorkerLauncher.cpp
 //! @brief     Implements class FitWorkerLauncher
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Fit/FitWorkerLauncher.h"
-#include "GUI/View/Fit/FitWorker.h"
+#include "GUI/View/FitControl/FitWorkerLauncher.h"
+#include "GUI/View/FitControl/FitWorker.h"
 #include <QThread>
 
 FitWorkerLauncher::FitWorkerLauncher(QObject* parent)
diff --git a/GUI/View/Fit/FitWorkerLauncher.h b/GUI/View/FitControl/FitWorkerLauncher.h
similarity index 85%
rename from GUI/View/Fit/FitWorkerLauncher.h
rename to GUI/View/FitControl/FitWorkerLauncher.h
index 1a98237955c5649e114e57f9b6076cdb69f873ec..66826e9d9bbaecb26c09fe62d6c01873ac2100ab 100644
--- a/GUI/View/Fit/FitWorkerLauncher.h
+++ b/GUI/View/FitControl/FitWorkerLauncher.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Fit/FitWorkerLauncher.h
+//! @file      GUI/View/FitControl/FitWorkerLauncher.h
 //! @brief     Implements class FitWorkerLauncher
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_FIT_FITWORKERLAUNCHER_H
-#define BORNAGAIN_GUI_VIEW_FIT_FITWORKERLAUNCHER_H
+#ifndef BORNAGAIN_GUI_VIEW_FITCONTROL_FITWORKERLAUNCHER_H
+#define BORNAGAIN_GUI_VIEW_FITCONTROL_FITWORKERLAUNCHER_H
 
 #include <QDateTime>
 #include <QObject>
@@ -56,4 +56,4 @@ private:
     QDateTime m_fit_end;
 };
 
-#endif // BORNAGAIN_GUI_VIEW_FIT_FITWORKERLAUNCHER_H
+#endif // BORNAGAIN_GUI_VIEW_FITCONTROL_FITWORKERLAUNCHER_H
diff --git a/GUI/View/Fit/MinimizerSettingsWidget.cpp b/GUI/View/FitControl/MinimizerSettingsWidget.cpp
similarity index 99%
rename from GUI/View/Fit/MinimizerSettingsWidget.cpp
rename to GUI/View/FitControl/MinimizerSettingsWidget.cpp
index 176eae9878f99621c9b7248b0b615a84d0f2c33c..46ec7f8378e06afc32c938daaff9ffef7a0e26f4 100644
--- a/GUI/View/Fit/MinimizerSettingsWidget.cpp
+++ b/GUI/View/FitControl/MinimizerSettingsWidget.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Fit/MinimizerSettingsWidget.cpp
+//! @file      GUI/View/FitControl/MinimizerSettingsWidget.cpp
 //! @brief     Implements class MinimizerSettingsWidget
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Fit/MinimizerSettingsWidget.h"
+#include "GUI/View/FitControl/MinimizerSettingsWidget.h"
 #include "Base/Util/Assert.h"
 #include "GUI/Model/Job/FitSuiteItem.h"
 #include "GUI/Model/Project/ProjectDocument.h"
diff --git a/GUI/View/Fit/MinimizerSettingsWidget.h b/GUI/View/FitControl/MinimizerSettingsWidget.h
similarity index 85%
rename from GUI/View/Fit/MinimizerSettingsWidget.h
rename to GUI/View/FitControl/MinimizerSettingsWidget.h
index 225d4afe8745000bc54934b3c457af0ef1c28cc4..cd8e896eb794e420cbdd0efa4cadbd2e2035ab29 100644
--- a/GUI/View/Fit/MinimizerSettingsWidget.h
+++ b/GUI/View/FitControl/MinimizerSettingsWidget.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Fit/MinimizerSettingsWidget.h
+//! @file      GUI/View/FitControl/MinimizerSettingsWidget.h
 //! @brief     Defines class MinimizerSettingsWidget
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_FIT_MINIMIZERSETTINGSWIDGET_H
-#define BORNAGAIN_GUI_VIEW_FIT_MINIMIZERSETTINGSWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_FITCONTROL_MINIMIZERSETTINGSWIDGET_H
+#define BORNAGAIN_GUI_VIEW_FITCONTROL_MINIMIZERSETTINGSWIDGET_H
 
 #include "GUI/Model/Job/MinimizerItem.h"
 #include <QWidget>
@@ -52,4 +52,4 @@ private:
     QList<std::function<void()>> m_updaters;
 };
 
-#endif // BORNAGAIN_GUI_VIEW_FIT_MINIMIZERSETTINGSWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_FITCONTROL_MINIMIZERSETTINGSWIDGET_H
diff --git a/GUI/View/Fit/RunFitControlWidget.cpp b/GUI/View/FitControl/RunFitControlWidget.cpp
similarity index 98%
rename from GUI/View/Fit/RunFitControlWidget.cpp
rename to GUI/View/FitControl/RunFitControlWidget.cpp
index 22a09c722e5901a07ce372f5549f16c328669f0e..d291c23a45549383389153fecb8321e99f7f52b9 100644
--- a/GUI/View/Fit/RunFitControlWidget.cpp
+++ b/GUI/View/FitControl/RunFitControlWidget.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Fit/RunFitControlWidget.cpp
+//! @file      GUI/View/FitControl/RunFitControlWidget.cpp
 //! @brief     Implements class RunFitControlWidget
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Fit/RunFitControlWidget.h"
+#include "GUI/View/FitControl/RunFitControlWidget.h"
 #include "Base/Util/Assert.h"
 #include "GUI/Model/Job/FitSuiteItem.h"
 #include "GUI/Model/Project/ProjectDocument.h"
diff --git a/GUI/View/Fit/RunFitControlWidget.h b/GUI/View/FitControl/RunFitControlWidget.h
similarity index 87%
rename from GUI/View/Fit/RunFitControlWidget.h
rename to GUI/View/FitControl/RunFitControlWidget.h
index 5e8aa3d7d659dadf011d57fc0cb45d0b7a97a93e..b87297921b7f2e7223e6fe2c9f7dcba17327635b 100644
--- a/GUI/View/Fit/RunFitControlWidget.h
+++ b/GUI/View/FitControl/RunFitControlWidget.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Fit/RunFitControlWidget.h
+//! @file      GUI/View/FitControl/RunFitControlWidget.h
 //! @brief     Defines class RunFitControlWidget
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_FIT_RUNFITCONTROLWIDGET_H
-#define BORNAGAIN_GUI_VIEW_FIT_RUNFITCONTROLWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_FITCONTROL_RUNFITCONTROLWIDGET_H
+#define BORNAGAIN_GUI_VIEW_FITCONTROL_RUNFITCONTROLWIDGET_H
 
 #include "GUI/View/Data/DataAccessWidget.h"
 
@@ -61,4 +61,4 @@ private:
     CautionSign* m_cautionSign;
 };
 
-#endif // BORNAGAIN_GUI_VIEW_FIT_RUNFITCONTROLWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_FITCONTROL_RUNFITCONTROLWIDGET_H
diff --git a/GUI/View/Fit/FitLog.cpp b/GUI/View/FitDisplay/FitLog.cpp
similarity index 91%
rename from GUI/View/Fit/FitLog.cpp
rename to GUI/View/FitDisplay/FitLog.cpp
index 149a8a7114c36e9d731693ec69128483cd2fa3fb..cb991d38e3ec6ad26143875c6c471d6e0536f762 100644
--- a/GUI/View/Fit/FitLog.cpp
+++ b/GUI/View/FitDisplay/FitLog.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Fit/FitLog.cpp
+//! @file      GUI/View/FitDisplay/FitLog.cpp
 //! @brief     Implements class FitLog
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Fit/FitLog.h"
+#include "GUI/View/FitDisplay/FitLog.h"
 
 FitLog::FitLog(QObject* parent)
     : QObject(parent)
diff --git a/GUI/View/Fit/FitLog.h b/GUI/View/FitDisplay/FitLog.h
similarity index 86%
rename from GUI/View/Fit/FitLog.h
rename to GUI/View/FitDisplay/FitLog.h
index b29b06832a4d2d8b08ed75a977588c92fe55517a..c75e9dc9ec73b1c2c7731b3c917cd2c70a09ff68 100644
--- a/GUI/View/Fit/FitLog.h
+++ b/GUI/View/FitDisplay/FitLog.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Fit/FitLog.h
+//! @file      GUI/View/FitDisplay/FitLog.h
 //! @brief     Defines class FitLog
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_FIT_FITLOG_H
-#define BORNAGAIN_GUI_VIEW_FIT_FITLOG_H
+#ifndef BORNAGAIN_GUI_VIEW_FITDISPLAY_FITLOG_H
+#define BORNAGAIN_GUI_VIEW_FITDISPLAY_FITLOG_H
 
 #include <QObject>
 
@@ -46,4 +46,4 @@ private:
     std::vector<Message> m_messages;
 };
 
-#endif // BORNAGAIN_GUI_VIEW_FIT_FITLOG_H
+#endif // BORNAGAIN_GUI_VIEW_FITDISPLAY_FITLOG_H
diff --git a/GUI/View/Fit/FitProgressInfo.cpp b/GUI/View/FitDisplay/FitProgressInfo.cpp
similarity index 86%
rename from GUI/View/Fit/FitProgressInfo.cpp
rename to GUI/View/FitDisplay/FitProgressInfo.cpp
index 35d966336b379e63519d8a06708e38dc71e05ae0..058868b23867af9d5a27847df9b4838702ee7a8c 100644
--- a/GUI/View/Fit/FitProgressInfo.cpp
+++ b/GUI/View/FitDisplay/FitProgressInfo.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Fit/FitProgressInfo.cpp
+//! @file      GUI/View/FitDisplay/FitProgressInfo.cpp
 //! @brief     Implements class FitProgressInfo
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Fit/FitProgressInfo.h"
+#include "GUI/View/FitDisplay/FitProgressInfo.h"
 
 FitProgressInfo::FitProgressInfo()
     : m_chi2(0.0)
diff --git a/GUI/View/Fit/FitProgressInfo.h b/GUI/View/FitDisplay/FitProgressInfo.h
similarity index 85%
rename from GUI/View/Fit/FitProgressInfo.h
rename to GUI/View/FitDisplay/FitProgressInfo.h
index af2d0ab1f8200eadebc4265583dde8608d2df750..7db150f42b65a3180ae1f59491d00e13e54d5f71 100644
--- a/GUI/View/Fit/FitProgressInfo.h
+++ b/GUI/View/FitDisplay/FitProgressInfo.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Fit/FitProgressInfo.h
+//! @file      GUI/View/FitDisplay/FitProgressInfo.h
 //! @brief     Defines class FitProgressInfo
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_FIT_FITPROGRESSINFO_H
-#define BORNAGAIN_GUI_VIEW_FIT_FITPROGRESSINFO_H
+#ifndef BORNAGAIN_GUI_VIEW_FITDISPLAY_FITPROGRESSINFO_H
+#define BORNAGAIN_GUI_VIEW_FITDISPLAY_FITPROGRESSINFO_H
 
 #include <string>
 #include <vector>
@@ -41,4 +41,4 @@ private:
     std::vector<double> m_sim_values;
 };
 
-#endif // BORNAGAIN_GUI_VIEW_FIT_FITPROGRESSINFO_H
+#endif // BORNAGAIN_GUI_VIEW_FITDISPLAY_FITPROGRESSINFO_H
diff --git a/GUI/View/Fit/GUIFitObserver.cpp b/GUI/View/FitDisplay/GUIFitObserver.cpp
similarity index 96%
rename from GUI/View/Fit/GUIFitObserver.cpp
rename to GUI/View/FitDisplay/GUIFitObserver.cpp
index dece057a202eac5f9471d17ff24149bf14b56879..89f5affb97712d079d3f947c4907ef58faea951e 100644
--- a/GUI/View/Fit/GUIFitObserver.cpp
+++ b/GUI/View/FitDisplay/GUIFitObserver.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Fit/GUIFitObserver.cpp
+//! @file      GUI/View/FitDisplay/GUIFitObserver.cpp
 //! @brief     Implements class GUIFitObserver
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Fit/GUIFitObserver.h"
+#include "GUI/View/FitDisplay/GUIFitObserver.h"
 #include "Device/Data/Datafield.h"
 #include "Fit/Minimizer/MinimizerResult.h"
 #include "Sim/Fitting/FitObjective.h"
diff --git a/GUI/View/Fit/GUIFitObserver.h b/GUI/View/FitDisplay/GUIFitObserver.h
similarity index 84%
rename from GUI/View/Fit/GUIFitObserver.h
rename to GUI/View/FitDisplay/GUIFitObserver.h
index 3d86d7d12dfbf749b0a19d5459964b40a2990779..01dc2e6f5ea634b171870beb0806ba537a0f8663 100644
--- a/GUI/View/Fit/GUIFitObserver.h
+++ b/GUI/View/FitDisplay/GUIFitObserver.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Fit/GUIFitObserver.h
+//! @file      GUI/View/FitDisplay/GUIFitObserver.h
 //! @brief     Implements class GUIFitObserver
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,10 +12,10 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_FIT_GUIFITOBSERVER_H
-#define BORNAGAIN_GUI_VIEW_FIT_GUIFITOBSERVER_H
+#ifndef BORNAGAIN_GUI_VIEW_FITDISPLAY_GUIFITOBSERVER_H
+#define BORNAGAIN_GUI_VIEW_FITDISPLAY_GUIFITOBSERVER_H
 
-#include "GUI/View/Fit/FitProgressInfo.h"
+#include "GUI/View/FitDisplay/FitProgressInfo.h"
 #include <QObject>
 #include <condition_variable>
 #include <mutex>
@@ -57,4 +57,4 @@ private:
     FitProgressInfo m_iteration_info;
 };
 
-#endif // BORNAGAIN_GUI_VIEW_FIT_GUIFITOBSERVER_H
+#endif // BORNAGAIN_GUI_VIEW_FITDISPLAY_GUIFITOBSERVER_H
diff --git a/GUI/View/Fit/JobMessagePanel.cpp b/GUI/View/FitDisplay/JobMessagePanel.cpp
similarity index 96%
rename from GUI/View/Fit/JobMessagePanel.cpp
rename to GUI/View/FitDisplay/JobMessagePanel.cpp
index 5ded43daed2fe27a0fcc18731606824608970a2d..4e5c2d71432a5d5eb46baff380bd3336a122adac 100644
--- a/GUI/View/Fit/JobMessagePanel.cpp
+++ b/GUI/View/FitDisplay/JobMessagePanel.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Fit/JobMessagePanel.cpp
+//! @file      GUI/View/FitDisplay/JobMessagePanel.cpp
 //! @brief     Implements class JobMessagePanel
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Fit/JobMessagePanel.h"
+#include "GUI/View/FitDisplay/JobMessagePanel.h"
 #include "GUI/Support/Tool/mainwindow_constants.h"
 #include <QScrollBar>
 #include <QSettings>
diff --git a/GUI/View/Fit/JobMessagePanel.h b/GUI/View/FitDisplay/JobMessagePanel.h
similarity index 79%
rename from GUI/View/Fit/JobMessagePanel.h
rename to GUI/View/FitDisplay/JobMessagePanel.h
index 36cc3c09f589a405859a7e91d8822a245c9dc6da..1e1565b7247fddcbf3b029c7bb6bbe3071033907 100644
--- a/GUI/View/Fit/JobMessagePanel.h
+++ b/GUI/View/FitDisplay/JobMessagePanel.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Fit/JobMessagePanel.h
+//! @file      GUI/View/FitDisplay/JobMessagePanel.h
 //! @brief     Defines class JobMessagePanel
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,10 +12,10 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_FIT_JOBMESSAGEPANEL_H
-#define BORNAGAIN_GUI_VIEW_FIT_JOBMESSAGEPANEL_H
+#ifndef BORNAGAIN_GUI_VIEW_FITDISPLAY_JOBMESSAGEPANEL_H
+#define BORNAGAIN_GUI_VIEW_FITDISPLAY_JOBMESSAGEPANEL_H
 
-#include "GUI/View/Fit/FitLog.h"
+#include "GUI/View/FitDisplay/FitLog.h"
 #include <QTextEdit>
 
 //! Shows log messages from FitActivityPanel at the bottom part of JobView.
@@ -38,4 +38,4 @@ private:
     FitLog* m_log;
 };
 
-#endif // BORNAGAIN_GUI_VIEW_FIT_JOBMESSAGEPANEL_H
+#endif // BORNAGAIN_GUI_VIEW_FITDISPLAY_JOBMESSAGEPANEL_H
diff --git a/GUI/View/Fit/FitObjectiveBuilder.cpp b/GUI/View/FitObjective/FitObjectiveBuilder.cpp
similarity index 96%
rename from GUI/View/Fit/FitObjectiveBuilder.cpp
rename to GUI/View/FitObjective/FitObjectiveBuilder.cpp
index cd468852dd37865a808009b240e89f91808a58f4..0f34e8c04203ffa5d8426e07b5936bf0acaa0a32 100644
--- a/GUI/View/Fit/FitObjectiveBuilder.cpp
+++ b/GUI/View/FitObjective/FitObjectiveBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Fit/FitObjectiveBuilder.cpp
+//! @file      GUI/View/FitObjective/FitObjectiveBuilder.cpp
 //! @brief     Implements class SimulationBuilder
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Fit/FitObjectiveBuilder.h"
+#include "GUI/View/FitObjective/FitObjectiveBuilder.h"
 #include "Base/Util/Assert.h"
 #include "Device/Data/Datafield.h"
 #include "Fit/Kernel/Minimizer.h"
@@ -24,7 +24,7 @@
 #include "GUI/Model/Job/JobItem.h"
 #include "GUI/Model/Job/MinimizerItem.h"
 #include "GUI/Model/ToCore/SimulationToCore.h"
-#include "GUI/View/Fit/GUIFitObserver.h"
+#include "GUI/View/FitDisplay/GUIFitObserver.h"
 #include "Sim/Fitting/FitObjective.h"
 #include "Sim/Fitting/ObjectiveMetric.h"
 #include "Sim/Simulation/ISimulation.h"
diff --git a/GUI/View/Fit/FitObjectiveBuilder.h b/GUI/View/FitObjective/FitObjectiveBuilder.h
similarity index 86%
rename from GUI/View/Fit/FitObjectiveBuilder.h
rename to GUI/View/FitObjective/FitObjectiveBuilder.h
index c77d069a970a6d7c2d1ff93796aab67fe8340b8d..11cc50f1c283035d7346312d1a98bd38f3a59280 100644
--- a/GUI/View/Fit/FitObjectiveBuilder.h
+++ b/GUI/View/FitObjective/FitObjectiveBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Fit/FitObjectiveBuilder.h
+//! @file      GUI/View/FitObjective/FitObjectiveBuilder.h
 //! @brief     Defines class FitObjectiveBuilder
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_FIT_FITOBJECTIVEBUILDER_H
-#define BORNAGAIN_GUI_VIEW_FIT_FITOBJECTIVEBUILDER_H
+#ifndef BORNAGAIN_GUI_VIEW_FITOBJECTIVE_FITOBJECTIVEBUILDER_H
+#define BORNAGAIN_GUI_VIEW_FITOBJECTIVE_FITOBJECTIVEBUILDER_H
 
 #include <memory>
 
@@ -57,4 +57,4 @@ private:
     std::unique_ptr<FitObjective> m_fit_objective;
 };
 
-#endif // BORNAGAIN_GUI_VIEW_FIT_FITOBJECTIVEBUILDER_H
+#endif // BORNAGAIN_GUI_VIEW_FITOBJECTIVE_FITOBJECTIVEBUILDER_H
diff --git a/GUI/View/Fit/FitParameterDelegate.cpp b/GUI/View/FitObjective/FitParameterDelegate.cpp
similarity index 97%
rename from GUI/View/Fit/FitParameterDelegate.cpp
rename to GUI/View/FitObjective/FitParameterDelegate.cpp
index b548eb039bbafeba47baef6e6b0ddcc6eebaec57..4c79969f0db53797136a3545a407148a1e29f277 100644
--- a/GUI/View/Fit/FitParameterDelegate.cpp
+++ b/GUI/View/FitObjective/FitParameterDelegate.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Fit/FitParameterDelegate.cpp
+//! @file      GUI/View/FitObjective/FitParameterDelegate.cpp
 //! @brief     Implements class FitParameterDelegate
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Fit/FitParameterDelegate.h"
+#include "GUI/View/FitObjective/FitParameterDelegate.h"
 #include "Base/Util/Assert.h"
 #include "GUI/Support/Util/CustomEventFilters.h"
 #include "GUI/View/PropertyEditor/CustomEditors.h"
diff --git a/GUI/View/Fit/FitParameterDelegate.h b/GUI/View/FitObjective/FitParameterDelegate.h
similarity index 88%
rename from GUI/View/Fit/FitParameterDelegate.h
rename to GUI/View/FitObjective/FitParameterDelegate.h
index 49ba34890f57bc6bc04d05ac1528130c7ffc402b..5c04c38c2e19ea3b17d3b746185a20890c0f9b75 100644
--- a/GUI/View/Fit/FitParameterDelegate.h
+++ b/GUI/View/FitObjective/FitParameterDelegate.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Fit/FitParameterDelegate.h
+//! @file      GUI/View/FitObjective/FitParameterDelegate.h
 //! @brief     Defines class FitParameterDelegate
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_FIT_FITPARAMETERDELEGATE_H
-#define BORNAGAIN_GUI_VIEW_FIT_FITPARAMETERDELEGATE_H
+#ifndef BORNAGAIN_GUI_VIEW_FITOBJECTIVE_FITPARAMETERDELEGATE_H
+#define BORNAGAIN_GUI_VIEW_FITOBJECTIVE_FITPARAMETERDELEGATE_H
 
 #include <QStyledItemDelegate>
 
@@ -53,4 +53,4 @@ private:
                           const QModelIndex& index, const QString& text) const;
 };
 
-#endif // BORNAGAIN_GUI_VIEW_FIT_FITPARAMETERDELEGATE_H
+#endif // BORNAGAIN_GUI_VIEW_FITOBJECTIVE_FITPARAMETERDELEGATE_H
diff --git a/GUI/View/Fit/FitParameterWidget.cpp b/GUI/View/FitObjective/FitParameterWidget.cpp
similarity index 98%
rename from GUI/View/Fit/FitParameterWidget.cpp
rename to GUI/View/FitObjective/FitParameterWidget.cpp
index da1bbc9d4ed764c3a6e4d0d7d17fc9f974be2104..72bb1891ab59a666e47fc01fb613280808d4a0ba 100644
--- a/GUI/View/Fit/FitParameterWidget.cpp
+++ b/GUI/View/FitObjective/FitParameterWidget.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Fit/FitParameterWidget.cpp
+//! @file      GUI/View/FitObjective/FitParameterWidget.cpp
 //! @brief     Implements class FitParameterWidget
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,15 +12,15 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Fit/FitParameterWidget.h"
+#include "GUI/View/FitObjective/FitParameterWidget.h"
 #include "Base/Util/Assert.h"
 #include "GUI/Model/Job/FitParameterContainerItem.h"
 #include "GUI/Model/Job/ParameterTreeItems.h"
 #include "GUI/Model/Model/FitParameterModel.h"
 #include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/Support/Util/CustomEventFilters.h"
-#include "GUI/View/Fit/FitParameterDelegate.h"
-#include "GUI/View/Fit/ParameterTuningWidget.h"
+#include "GUI/View/FitObjective/FitParameterDelegate.h"
+#include "GUI/View/FitObjective/ParameterTuningWidget.h"
 #include "GUI/View/Info/OverlayLabelController.h"
 #include <QAction>
 #include <QHeaderView>
diff --git a/GUI/View/Fit/FitParameterWidget.h b/GUI/View/FitObjective/FitParameterWidget.h
similarity index 90%
rename from GUI/View/Fit/FitParameterWidget.h
rename to GUI/View/FitObjective/FitParameterWidget.h
index be872f1f34d86356271dbc685cfb3e407ed1b6e7..983d1417d542f341ff0b9c14b26555182b89a980 100644
--- a/GUI/View/Fit/FitParameterWidget.h
+++ b/GUI/View/FitObjective/FitParameterWidget.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Fit/FitParameterWidget.h
+//! @file      GUI/View/FitObjective/FitParameterWidget.h
 //! @brief     Defines class FitParameterWidget
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_FIT_FITPARAMETERWIDGET_H
-#define BORNAGAIN_GUI_VIEW_FIT_FITPARAMETERWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_FITOBJECTIVE_FITPARAMETERWIDGET_H
+#define BORNAGAIN_GUI_VIEW_FITOBJECTIVE_FITPARAMETERWIDGET_H
 
 #include "GUI/View/Data/DataAccessWidget.h"
 
@@ -77,4 +77,4 @@ private:
     OverlayLabelController* m_infoLabel;
 };
 
-#endif // BORNAGAIN_GUI_VIEW_FIT_FITPARAMETERWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_FITOBJECTIVE_FITPARAMETERWIDGET_H
diff --git a/GUI/View/Fit/ParameterTuningDelegate.cpp b/GUI/View/FitObjective/ParameterTuningDelegate.cpp
similarity index 98%
rename from GUI/View/Fit/ParameterTuningDelegate.cpp
rename to GUI/View/FitObjective/ParameterTuningDelegate.cpp
index 011090741b774bb69e7760c5b219fe95d75e1c6f..cdbe97b75118525658b0f0c0040bc02094c9cdbe 100644
--- a/GUI/View/Fit/ParameterTuningDelegate.cpp
+++ b/GUI/View/FitObjective/ParameterTuningDelegate.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Fit/ParameterTuningDelegate.cpp
+//! @file      GUI/View/FitObjective/ParameterTuningDelegate.cpp
 //! @brief     Implements class ParameterTuningDelegate
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Fit/ParameterTuningDelegate.h"
+#include "GUI/View/FitObjective/ParameterTuningDelegate.h"
 #include "GUI/Model/Job/ParameterTreeItems.h"
 #include "GUI/Model/Model/ParameterTuningModel.h"
 #include "GUI/Model/Project/ProjectDocument.h"
diff --git a/GUI/View/Fit/ParameterTuningDelegate.h b/GUI/View/FitObjective/ParameterTuningDelegate.h
similarity index 91%
rename from GUI/View/Fit/ParameterTuningDelegate.h
rename to GUI/View/FitObjective/ParameterTuningDelegate.h
index 9a4b66a70fb7c02e3729ddfd6d6e734f1cbafe1d..ae0b8903b41ab51705b3a73b92185ddd7f26e16b 100644
--- a/GUI/View/Fit/ParameterTuningDelegate.h
+++ b/GUI/View/FitObjective/ParameterTuningDelegate.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Fit/ParameterTuningDelegate.h
+//! @file      GUI/View/FitObjective/ParameterTuningDelegate.h
 //! @brief     Defines class ParameterTuningDelegate
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_FIT_PARAMETERTUNINGDELEGATE_H
-#define BORNAGAIN_GUI_VIEW_FIT_PARAMETERTUNINGDELEGATE_H
+#ifndef BORNAGAIN_GUI_VIEW_FITOBJECTIVE_PARAMETERTUNINGDELEGATE_H
+#define BORNAGAIN_GUI_VIEW_FITOBJECTIVE_PARAMETERTUNINGDELEGATE_H
 
 #include "Fit/Param/RealLimits.h"
 #include <QItemDelegate>
@@ -86,4 +86,4 @@ private:
     bool m_isReadOnly;
 };
 
-#endif // BORNAGAIN_GUI_VIEW_FIT_PARAMETERTUNINGDELEGATE_H
+#endif // BORNAGAIN_GUI_VIEW_FITOBJECTIVE_PARAMETERTUNINGDELEGATE_H
diff --git a/GUI/View/Fit/ParameterTuningWidget.cpp b/GUI/View/FitObjective/ParameterTuningWidget.cpp
similarity index 96%
rename from GUI/View/Fit/ParameterTuningWidget.cpp
rename to GUI/View/FitObjective/ParameterTuningWidget.cpp
index 14a41d3dc5132335878e50355e48e30e84073128..b0ad42044f722b604fe1ae9e7418f5f1e8004eba 100644
--- a/GUI/View/Fit/ParameterTuningWidget.cpp
+++ b/GUI/View/FitObjective/ParameterTuningWidget.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Fit/ParameterTuningWidget.cpp
+//! @file      GUI/View/FitObjective/ParameterTuningWidget.cpp
 //! @brief     Implements class ParameterTuningWidget
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,14 +12,14 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Fit/ParameterTuningWidget.h"
+#include "GUI/View/FitObjective/ParameterTuningWidget.h"
 #include "Base/Util/Assert.h"
 #include "GUI/Model/Data/IntensityDataItem.h"
 #include "GUI/Model/Job/ParameterTreeItems.h"
 #include "GUI/Model/Model/ParameterTuningModel.h"
 #include "GUI/Model/Project/ProjectDocument.h"
-#include "GUI/View/Fit/ParameterTuningDelegate.h"
-#include "GUI/View/Fit/SliderSettingsWidget.h"
+#include "GUI/View/FitObjective/ParameterTuningDelegate.h"
+#include "GUI/View/FitObjective/SliderSettingsWidget.h"
 #include "GUI/View/Info/CautionSign.h"
 #include "GUI/View/Widget/StyledToolbar.h"
 #include <QAction>
diff --git a/GUI/View/Fit/ParameterTuningWidget.h b/GUI/View/FitObjective/ParameterTuningWidget.h
similarity index 89%
rename from GUI/View/Fit/ParameterTuningWidget.h
rename to GUI/View/FitObjective/ParameterTuningWidget.h
index 4a3b70e2b2d8e619fda85fa912b48f94978bcfa9..4254105e3226af3e13ba021d8fd3ae9c27b6e8bc 100644
--- a/GUI/View/Fit/ParameterTuningWidget.h
+++ b/GUI/View/FitObjective/ParameterTuningWidget.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Fit/ParameterTuningWidget.h
+//! @file      GUI/View/FitObjective/ParameterTuningWidget.h
 //! @brief     Defines class ParameterTuningWidget
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_FIT_PARAMETERTUNINGWIDGET_H
-#define BORNAGAIN_GUI_VIEW_FIT_PARAMETERTUNINGWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_FITOBJECTIVE_PARAMETERTUNINGWIDGET_H
+#define BORNAGAIN_GUI_VIEW_FITOBJECTIVE_PARAMETERTUNINGWIDGET_H
 
 #include "GUI/View/Data/DataAccessWidget.h"
 
@@ -72,4 +72,4 @@ private:
     CautionSign* m_cautionSign;
 };
 
-#endif // BORNAGAIN_GUI_VIEW_FIT_PARAMETERTUNINGWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_FITOBJECTIVE_PARAMETERTUNINGWIDGET_H
diff --git a/GUI/View/Fit/SliderSettingsWidget.cpp b/GUI/View/FitObjective/SliderSettingsWidget.cpp
similarity index 96%
rename from GUI/View/Fit/SliderSettingsWidget.cpp
rename to GUI/View/FitObjective/SliderSettingsWidget.cpp
index a391abbce96565a577a638844c9245ca753dd223..55fd273492509c25f030f37fe54bb730b28cd87d 100644
--- a/GUI/View/Fit/SliderSettingsWidget.cpp
+++ b/GUI/View/FitObjective/SliderSettingsWidget.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Fit/SliderSettingsWidget.cpp
+//! @file      GUI/View/FitObjective/SliderSettingsWidget.cpp
 //! @brief     Implements class SliderSettingsWidget
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Fit/SliderSettingsWidget.h"
+#include "GUI/View/FitObjective/SliderSettingsWidget.h"
 #include "GUI/Model/Data/IntensityDataItem.h"
 #include "GUI/Model/Project/ProjectDocument.h"
 #include <QLabel>
diff --git a/GUI/View/Fit/SliderSettingsWidget.h b/GUI/View/FitObjective/SliderSettingsWidget.h
similarity index 82%
rename from GUI/View/Fit/SliderSettingsWidget.h
rename to GUI/View/FitObjective/SliderSettingsWidget.h
index 676b156d5be2e44353b077a33a787f44c8f251ed..521e160f23839419200b410ef0d1607b0c0a7dcc 100644
--- a/GUI/View/Fit/SliderSettingsWidget.h
+++ b/GUI/View/FitObjective/SliderSettingsWidget.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Fit/SliderSettingsWidget.h
+//! @file      GUI/View/FitObjective/SliderSettingsWidget.h
 //! @brief     Defines class SliderSettingsWidget
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_FIT_SLIDERSETTINGSWIDGET_H
-#define BORNAGAIN_GUI_VIEW_FIT_SLIDERSETTINGSWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_FITOBJECTIVE_SLIDERSETTINGSWIDGET_H
+#define BORNAGAIN_GUI_VIEW_FITOBJECTIVE_SLIDERSETTINGSWIDGET_H
 
 #include "GUI/View/Data/DataAccessWidget.h"
 #include <QCheckBox>
@@ -46,4 +46,4 @@ private:
     QCheckBox* m_lockzCheckBox;
 };
 
-#endif // BORNAGAIN_GUI_VIEW_FIT_SLIDERSETTINGSWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_FITOBJECTIVE_SLIDERSETTINGSWIDGET_H
diff --git a/GUI/View/Job/JobView.cpp b/GUI/View/Job/JobView.cpp
index 3ea354b18c28638b84c3aa056eb3ab094bde1f21..82d640b82c7a4485cc9e58b3e8d74b88a7ded9ff 100644
--- a/GUI/View/Job/JobView.cpp
+++ b/GUI/View/Job/JobView.cpp
@@ -15,7 +15,7 @@
 #include "GUI/View/Job/JobView.h"
 #include "GUI/Support/Data/ID.h"
 #include "GUI/View/Fit/FitActivityPanel.h"
-#include "GUI/View/Fit/JobMessagePanel.h"
+#include "GUI/View/FitDisplay/JobMessagePanel.h"
 #include "GUI/View/Fit/JobRealTimeWidget.h"
 #include "GUI/View/Job/JobProgressAssistant.h"
 #include "GUI/View/Job/JobResultsPresenter.h"