diff --git a/GUI/View/Frame/Fit1DFrame.cpp b/GUI/View/Frame/Fit1DFrame.cpp
index 32a9868e5d327ee3bf048a7ea1296ff842407d33..9cfe173d15a725fea3d5937d9204beb66bb5e325 100644
--- a/GUI/View/Frame/Fit1DFrame.cpp
+++ b/GUI/View/Frame/Fit1DFrame.cpp
@@ -23,7 +23,7 @@
 #include "GUI/Model/Job/JobItem.h"
 #include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/Support/Util/ActionFactory.h"
-#include "GUI/View/PlotComparison/FitFlowWidget.h"
+#include "GUI/View/PlotProgress/FitFlowWidget.h"
 #include "GUI/View/PlotScale/RangeUtil.h"
 #include "GUI/View/PlotSpecular/SpecularDataPropertyWidget.h"
 #include "GUI/View/PlotSpecular/SpecularPlot.h"
diff --git a/GUI/View/Frame/Fit2DFrame.cpp b/GUI/View/Frame/Fit2DFrame.cpp
index f1a235aa4a74ad837effe027ffbc24b51d79060b..6b10410145ae4374e40dc853588fdbeb8b5c1fc4 100644
--- a/GUI/View/Frame/Fit2DFrame.cpp
+++ b/GUI/View/Frame/Fit2DFrame.cpp
@@ -21,7 +21,7 @@
 #include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/Support/Util/ActionFactory.h"
 #include "GUI/View/Plot2D/ColorMapCanvas.h"
-#include "GUI/View/PlotComparison/FitFlowWidget.h"
+#include "GUI/View/PlotProgress/FitFlowWidget.h"
 #include "GUI/View/PlotScale/RangeUtil.h"
 #include "GUI/View/PlotUtil/ColorMap.h"
 #include "GUI/View/PlotUtil/PlotStatusLabel.h"
diff --git a/GUI/View/PropertyEditor/CustomEditors.cpp b/GUI/View/ParEdit/CustomEditors.cpp
similarity index 98%
rename from GUI/View/PropertyEditor/CustomEditors.cpp
rename to GUI/View/ParEdit/CustomEditors.cpp
index f5ad04e5b372bcd06ed47029b0ab35755d4eba9b..b94c3fe9e9ef94e7341cc2de493d7082e825442d 100644
--- a/GUI/View/PropertyEditor/CustomEditors.cpp
+++ b/GUI/View/ParEdit/CustomEditors.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/PropertyEditor/CustomEditors.cpp
+//! @file      GUI/View/ParEdit/CustomEditors.cpp
 //! @brief     Implements classes CustomEditor, ComboPropertyEditor, ScientificSpinBoxEditor.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/PropertyEditor/CustomEditors.h"
+#include "GUI/View/ParEdit/CustomEditors.h"
 #include "Base/Util/Assert.h"
 #include "Fit/Param/RealLimits.h"
 #include "GUI/Support/Data/ComboProperty.h"
diff --git a/GUI/View/PropertyEditor/CustomEditors.h b/GUI/View/ParEdit/CustomEditors.h
similarity index 90%
rename from GUI/View/PropertyEditor/CustomEditors.h
rename to GUI/View/ParEdit/CustomEditors.h
index d101574697a7ffbcdef8f19508be23cc2391b67a..d640e8aa1d8f025650045b730b17ac1bddf01332 100644
--- a/GUI/View/PropertyEditor/CustomEditors.h
+++ b/GUI/View/ParEdit/CustomEditors.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/PropertyEditor/CustomEditors.h
+//! @file      GUI/View/ParEdit/CustomEditors.h
 //! @brief     Defines classes CustomEditor, ComboPropertyEditor, ScientificSpinBoxEditor.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_PROPERTYEDITOR_CUSTOMEDITORS_H
-#define BORNAGAIN_GUI_VIEW_PROPERTYEDITOR_CUSTOMEDITORS_H
+#ifndef BORNAGAIN_GUI_VIEW_PAREDIT_CUSTOMEDITORS_H
+#define BORNAGAIN_GUI_VIEW_PAREDIT_CUSTOMEDITORS_H
 
 #include <QComboBox>
 #include <QLabel>
@@ -91,4 +91,4 @@ private:
     class ScientificSpinBox* m_doubleEditor;
 };
 
-#endif // BORNAGAIN_GUI_VIEW_PROPERTYEDITOR_CUSTOMEDITORS_H
+#endif // BORNAGAIN_GUI_VIEW_PAREDIT_CUSTOMEDITORS_H
diff --git a/GUI/View/Tuning/FitParameterDelegate.cpp b/GUI/View/ParEdit/FitParameterDelegate.cpp
similarity index 97%
rename from GUI/View/Tuning/FitParameterDelegate.cpp
rename to GUI/View/ParEdit/FitParameterDelegate.cpp
index 1eaef4c7132710d7a93d2bd12c254f9178f82203..96fb22a0d26848f333fab62e310aa3533527c826 100644
--- a/GUI/View/Tuning/FitParameterDelegate.cpp
+++ b/GUI/View/ParEdit/FitParameterDelegate.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Tuning/FitParameterDelegate.cpp
+//! @file      GUI/View/ParEdit/FitParameterDelegate.cpp
 //! @brief     Implements class FitParameterDelegate.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,14 +12,14 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Tuning/FitParameterDelegate.h"
+#include "GUI/View/ParEdit/FitParameterDelegate.h"
 #include "Base/Util/Assert.h"
 #include "GUI/Model/Job/FitParameterItem.h"
 #include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/Support/Data/ComboProperty.h"
 #include "GUI/Support/Util/CustomEventFilters.h"
 #include "GUI/View/Numeric/ScientificSpinBox.h"
-#include "GUI/View/PropertyEditor/CustomEditors.h"
+#include "GUI/View/ParEdit/CustomEditors.h"
 #include <QApplication>
 #include <QModelIndex>
 #include <QSpinBox>
diff --git a/GUI/View/Tuning/FitParameterDelegate.h b/GUI/View/ParEdit/FitParameterDelegate.h
similarity index 89%
rename from GUI/View/Tuning/FitParameterDelegate.h
rename to GUI/View/ParEdit/FitParameterDelegate.h
index fc05a718d3d72789c3fc9d29a59166756c1f2961..d16a3f0a3e9eb50c05f1a8102c80f960b0a03607 100644
--- a/GUI/View/Tuning/FitParameterDelegate.h
+++ b/GUI/View/ParEdit/FitParameterDelegate.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Tuning/FitParameterDelegate.h
+//! @file      GUI/View/ParEdit/FitParameterDelegate.h
 //! @brief     Defines class FitParameterDelegate.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_TUNING_FITPARAMETERDELEGATE_H
-#define BORNAGAIN_GUI_VIEW_TUNING_FITPARAMETERDELEGATE_H
+#ifndef BORNAGAIN_GUI_VIEW_PAREDIT_FITPARAMETERDELEGATE_H
+#define BORNAGAIN_GUI_VIEW_PAREDIT_FITPARAMETERDELEGATE_H
 
 #include <QStyledItemDelegate>
 
@@ -53,4 +53,4 @@ private:
                           const QModelIndex& index, const QString& text) const;
 };
 
-#endif // BORNAGAIN_GUI_VIEW_TUNING_FITPARAMETERDELEGATE_H
+#endif // BORNAGAIN_GUI_VIEW_PAREDIT_FITPARAMETERDELEGATE_H
diff --git a/GUI/View/Tuning/ParameterTuningDelegate.cpp b/GUI/View/ParEdit/ParameterTuningDelegate.cpp
similarity index 98%
rename from GUI/View/Tuning/ParameterTuningDelegate.cpp
rename to GUI/View/ParEdit/ParameterTuningDelegate.cpp
index 4497bf567ba9c0d5b13fca5d208132e42c26f3ba..e2d9732eb2fd62ff5dfc11d08efe2ae7b8bf23a8 100644
--- a/GUI/View/Tuning/ParameterTuningDelegate.cpp
+++ b/GUI/View/ParEdit/ParameterTuningDelegate.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Tuning/ParameterTuningDelegate.cpp
+//! @file      GUI/View/ParEdit/ParameterTuningDelegate.cpp
 //! @brief     Implements class ParameterTuningDelegate.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Tuning/ParameterTuningDelegate.h"
+#include "GUI/View/ParEdit/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/Tuning/ParameterTuningDelegate.h b/GUI/View/ParEdit/ParameterTuningDelegate.h
similarity index 91%
rename from GUI/View/Tuning/ParameterTuningDelegate.h
rename to GUI/View/ParEdit/ParameterTuningDelegate.h
index 1e9db8f0be7b9971c2dbb97136fd5e6132eed9a8..a7a8f0d08675beda51214ef7f1b492c4e1d55f4c 100644
--- a/GUI/View/Tuning/ParameterTuningDelegate.h
+++ b/GUI/View/ParEdit/ParameterTuningDelegate.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Tuning/ParameterTuningDelegate.h
+//! @file      GUI/View/ParEdit/ParameterTuningDelegate.h
 //! @brief     Defines class ParameterTuningDelegate.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_TUNING_PARAMETERTUNINGDELEGATE_H
-#define BORNAGAIN_GUI_VIEW_TUNING_PARAMETERTUNINGDELEGATE_H
+#ifndef BORNAGAIN_GUI_VIEW_PAREDIT_PARAMETERTUNINGDELEGATE_H
+#define BORNAGAIN_GUI_VIEW_PAREDIT_PARAMETERTUNINGDELEGATE_H
 
 #include "Fit/Param/RealLimits.h"
 #include <QItemDelegate>
@@ -87,4 +87,4 @@ private:
     bool m_isReadOnly;
 };
 
-#endif // BORNAGAIN_GUI_VIEW_TUNING_PARAMETERTUNINGDELEGATE_H
+#endif // BORNAGAIN_GUI_VIEW_PAREDIT_PARAMETERTUNINGDELEGATE_H
diff --git a/GUI/View/PlotComparison/FitFlowWidget.cpp b/GUI/View/PlotProgress/FitFlowWidget.cpp
similarity index 90%
rename from GUI/View/PlotComparison/FitFlowWidget.cpp
rename to GUI/View/PlotProgress/FitFlowWidget.cpp
index b404889b943bae0b9b58695b27bba082888dee4a..d1713e190aca01501655542668c7b58569693ad7 100644
--- a/GUI/View/PlotComparison/FitFlowWidget.cpp
+++ b/GUI/View/PlotProgress/FitFlowWidget.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/PlotComparison/FitFlowWidget.cpp
+//! @file      GUI/View/PlotProgress/FitFlowWidget.cpp
 //! @brief     Implement class FitFlowWidget
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,11 +12,11 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/PlotComparison/FitFlowWidget.h"
+#include "GUI/View/PlotProgress/FitFlowWidget.h"
 #include "Base/Util/Assert.h"
 #include "GUI/Model/Job/FitSuiteItem.h"
 #include "GUI/Model/Job/JobItem.h"
-#include "GUI/View/PlotComparison/HistogramPlot.h"
+#include "GUI/View/PlotProgress/HistogramPlot.h"
 #include <QVBoxLayout>
 
 FitFlowWidget::FitFlowWidget(QWidget* parent)
diff --git a/GUI/View/PlotComparison/FitFlowWidget.h b/GUI/View/PlotProgress/FitFlowWidget.h
similarity index 81%
rename from GUI/View/PlotComparison/FitFlowWidget.h
rename to GUI/View/PlotProgress/FitFlowWidget.h
index 70e9136f5f460938fa05975ba74fc9208bd19e8a..39582a3e39d098fb481a89dc335afa31d2dd6f39 100644
--- a/GUI/View/PlotComparison/FitFlowWidget.h
+++ b/GUI/View/PlotProgress/FitFlowWidget.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/PlotComparison/FitFlowWidget.h
+//! @file      GUI/View/PlotProgress/FitFlowWidget.h
 //! @brief     Defines class FitFlowWidget.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_PLOTCOMPARISON_FITFLOWWIDGET_H
-#define BORNAGAIN_GUI_VIEW_PLOTCOMPARISON_FITFLOWWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_PLOTPROGRESS_FITFLOWWIDGET_H
+#define BORNAGAIN_GUI_VIEW_PLOTPROGRESS_FITFLOWWIDGET_H
 
 #include "GUI/View/Access/DataAccessWidget.h"
 
@@ -35,4 +35,4 @@ private:
     HistogramPlot* m_histPlot;
 };
 
-#endif // BORNAGAIN_GUI_VIEW_PLOTCOMPARISON_FITFLOWWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_PLOTPROGRESS_FITFLOWWIDGET_H
diff --git a/GUI/View/PlotComparison/HistogramPlot.cpp b/GUI/View/PlotProgress/HistogramPlot.cpp
similarity index 96%
rename from GUI/View/PlotComparison/HistogramPlot.cpp
rename to GUI/View/PlotProgress/HistogramPlot.cpp
index a090c3f3332705739357a33487cf389f8caa41f9..a941afb0a9e12f88e5748e0e76ca578216c24f4a 100644
--- a/GUI/View/PlotComparison/HistogramPlot.cpp
+++ b/GUI/View/PlotProgress/HistogramPlot.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/PlotComparison/HistogramPlot.cpp
+//! @file      GUI/View/PlotProgress/HistogramPlot.cpp
 //! @brief     Implements class HistogramPlot.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/PlotComparison/HistogramPlot.h"
+#include "GUI/View/PlotProgress/HistogramPlot.h"
 #include "GUI/Support/Util/Style.h"
 #include <qcustomplot.h>
 
diff --git a/GUI/View/PlotComparison/HistogramPlot.h b/GUI/View/PlotProgress/HistogramPlot.h
similarity index 81%
rename from GUI/View/PlotComparison/HistogramPlot.h
rename to GUI/View/PlotProgress/HistogramPlot.h
index a4775f3b4b00d2180a358e4547262903cef49845..fb330e33362a0a7bb67a73ca64a263929c1ecfb8 100644
--- a/GUI/View/PlotComparison/HistogramPlot.h
+++ b/GUI/View/PlotProgress/HistogramPlot.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/PlotComparison/HistogramPlot.h
+//! @file      GUI/View/PlotProgress/HistogramPlot.h
 //! @brief     Defines class HistogramPlot.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_PLOTCOMPARISON_HISTOGRAMPLOT_H
-#define BORNAGAIN_GUI_VIEW_PLOTCOMPARISON_HISTOGRAMPLOT_H
+#ifndef BORNAGAIN_GUI_VIEW_PLOTPROGRESS_HISTOGRAMPLOT_H
+#define BORNAGAIN_GUI_VIEW_PLOTPROGRESS_HISTOGRAMPLOT_H
 
 #include <QWidget>
 
@@ -36,4 +36,4 @@ private:
     QCustomPlot* m_plot;
 };
 
-#endif // BORNAGAIN_GUI_VIEW_PLOTCOMPARISON_HISTOGRAMPLOT_H
+#endif // BORNAGAIN_GUI_VIEW_PLOTPROGRESS_HISTOGRAMPLOT_H
diff --git a/GUI/View/Tuning/FitParameterWidget.cpp b/GUI/View/Tuning/FitParameterWidget.cpp
index 05806e6af8bd11b5c45102cedd06b7797a143d9b..6a126a4627c8000f90ee44402c8fe3472d39c4a2 100644
--- a/GUI/View/Tuning/FitParameterWidget.cpp
+++ b/GUI/View/Tuning/FitParameterWidget.cpp
@@ -20,7 +20,7 @@
 #include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/Support/Util/CustomEventFilters.h"
 #include "GUI/View/Info/OverlayLabelController.h"
-#include "GUI/View/Tuning/FitParameterDelegate.h"
+#include "GUI/View/ParEdit/FitParameterDelegate.h"
 #include "GUI/View/Tuning/ParameterTuningWidget.h"
 #include <QAction>
 #include <QHeaderView>
diff --git a/GUI/View/Tuning/ParameterTuningWidget.cpp b/GUI/View/Tuning/ParameterTuningWidget.cpp
index 13e8e8fdc5ba0e475c4b5583541bef33f51acc79..7b9e623b8714bb80d75062f02233e10acc25e9aa 100644
--- a/GUI/View/Tuning/ParameterTuningWidget.cpp
+++ b/GUI/View/Tuning/ParameterTuningWidget.cpp
@@ -20,7 +20,7 @@
 #include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/Support/Tool/mainwindow_constants.h"
 #include "GUI/View/Info/CautionSign.h"
-#include "GUI/View/Tuning/ParameterTuningDelegate.h"
+#include "GUI/View/ParEdit/ParameterTuningDelegate.h"
 #include "GUI/View/Tuning/SliderSettingsWidget.h"
 #include "GUI/View/Widget/StyledToolbar.h"
 #include <QAction>