diff --git a/GUI/Views/CommonWidgets/AdjustingScrollArea.cpp b/GUI/CommonWidgets/AdjustingScrollArea.cpp
similarity index 92%
rename from GUI/Views/CommonWidgets/AdjustingScrollArea.cpp
rename to GUI/CommonWidgets/AdjustingScrollArea.cpp
index 7fd7697ce005d6b6ab4e3764e25c3cb9b2b4cb4a..9f2e1bb361fdf45763a0b6440fbb9e85317792a2 100644
--- a/GUI/Views/CommonWidgets/AdjustingScrollArea.cpp
+++ b/GUI/CommonWidgets/AdjustingScrollArea.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/AdjustingScrollArea.cpp
+//! @file GUI/CommonWidgets/AdjustingScrollArea.cpp
//! @brief Implements class AdjustingScrollArea
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Views/CommonWidgets/AdjustingScrollArea.h"
+#include "GUI/CommonWidgets/AdjustingScrollArea.h"
#include <QEvent>
#include <QScrollBar>
diff --git a/GUI/Views/CommonWidgets/AdjustingScrollArea.h b/GUI/CommonWidgets/AdjustingScrollArea.h
similarity index 78%
rename from GUI/Views/CommonWidgets/AdjustingScrollArea.h
rename to GUI/CommonWidgets/AdjustingScrollArea.h
index 67ad5532737248182bbdbfa56a4cb8489ac2b5ed..3a6305627215f2645d744ecf8e4932e7d96bb30a 100644
--- a/GUI/Views/CommonWidgets/AdjustingScrollArea.h
+++ b/GUI/CommonWidgets/AdjustingScrollArea.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/AdjustingScrollArea.h
+//! @file GUI/CommonWidgets/AdjustingScrollArea.h
//! @brief Defines class AdjustingScrollArea
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_ADJUSTINGSCROLLAREA_H
-#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_ADJUSTINGSCROLLAREA_H
+#ifndef BORNAGAIN_GUI_COMMONWIDGETS_ADJUSTINGSCROLLAREA_H
+#define BORNAGAIN_GUI_COMMONWIDGETS_ADJUSTINGSCROLLAREA_H
#include <QScrollArea>
@@ -33,4 +33,4 @@ private:
bool eventFilter(QObject* obj, QEvent* ev);
};
-#endif // BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_ADJUSTINGSCROLLAREA_H
+#endif // BORNAGAIN_GUI_COMMONWIDGETS_ADJUSTINGSCROLLAREA_H
diff --git a/GUI/Views/CommonWidgets/DesignerHelper.cpp b/GUI/CommonWidgets/DesignerHelper.cpp
similarity index 98%
rename from GUI/Views/CommonWidgets/DesignerHelper.cpp
rename to GUI/CommonWidgets/DesignerHelper.cpp
index f603e9a0805e02d2d8218991d9e1503b4da731c3..a06de8fd4f2a189df1199394e2b7d0aaa4863bc2 100644
--- a/GUI/Views/CommonWidgets/DesignerHelper.cpp
+++ b/GUI/CommonWidgets/DesignerHelper.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/DesignerHelper.cpp
+//! @file GUI/CommonWidgets/DesignerHelper.cpp
//! @brief Implements class DesignerHelper
//!
//! @homepage http://www.bornagainproject.org
@@ -12,9 +12,9 @@
//
// ************************************************************************************************
-#include "GUI/Views/CommonWidgets/DesignerHelper.h"
+#include "GUI/CommonWidgets/DesignerHelper.h"
#include "GUI/Models/MaterialItemUtils.h"
-#include "GUI/Views/CommonWidgets/StyleUtils.h"
+#include "GUI/CommonWidgets/StyleUtils.h"
#include <QPainter>
#include <cmath>
#include <iostream>
diff --git a/GUI/Views/CommonWidgets/DesignerHelper.h b/GUI/CommonWidgets/DesignerHelper.h
similarity index 91%
rename from GUI/Views/CommonWidgets/DesignerHelper.h
rename to GUI/CommonWidgets/DesignerHelper.h
index 5190ce878b2307a91b901556cf74270581b61695..5e3f407af58ad8d52f7eac1f19f20d82a8f7cd2c 100644
--- a/GUI/Views/CommonWidgets/DesignerHelper.h
+++ b/GUI/CommonWidgets/DesignerHelper.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/DesignerHelper.h
+//! @file GUI/CommonWidgets/DesignerHelper.h
//! @brief Defines class DesignerHelper
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_DESIGNERHELPER_H
-#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_DESIGNERHELPER_H
+#ifndef BORNAGAIN_GUI_COMMONWIDGETS_DESIGNERHELPER_H
+#define BORNAGAIN_GUI_COMMONWIDGETS_DESIGNERHELPER_H
#include <QColor>
#include <QGradient>
@@ -75,4 +75,4 @@ public:
static int getPythonEditorFontSize();
};
-#endif // BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_DESIGNERHELPER_H
+#endif // BORNAGAIN_GUI_COMMONWIDGETS_DESIGNERHELPER_H
diff --git a/GUI/Views/CommonWidgets/DockWidgetInfo.cpp b/GUI/CommonWidgets/DockWidgetInfo.cpp
similarity index 90%
rename from GUI/Views/CommonWidgets/DockWidgetInfo.cpp
rename to GUI/CommonWidgets/DockWidgetInfo.cpp
index 62691898f55ad60cb8b8afdd1d32972c7fe8b7f1..2460406386131eedde1928a900ac58991ad5714f 100644
--- a/GUI/Views/CommonWidgets/DockWidgetInfo.cpp
+++ b/GUI/CommonWidgets/DockWidgetInfo.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/DockWidgetInfo.cpp
+//! @file GUI/CommonWidgets/DockWidgetInfo.cpp
//! @brief Implements class DockWidgetInfo
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Views/CommonWidgets/DockWidgetInfo.h"
+#include "GUI/CommonWidgets/DockWidgetInfo.h"
#include <QDockWidget>
#include <QWidget>
diff --git a/GUI/Views/CommonWidgets/DockWidgetInfo.h b/GUI/CommonWidgets/DockWidgetInfo.h
similarity index 80%
rename from GUI/Views/CommonWidgets/DockWidgetInfo.h
rename to GUI/CommonWidgets/DockWidgetInfo.h
index 5492ac4ff0c10d92dcb6c4be84bdf098a171f55f..88573a79e0dc721b4f05db70b8f77daf72074dce 100644
--- a/GUI/Views/CommonWidgets/DockWidgetInfo.h
+++ b/GUI/CommonWidgets/DockWidgetInfo.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/DockWidgetInfo.h
+//! @file GUI/CommonWidgets/DockWidgetInfo.h
//! @brief Defines class DockWidgetInfo
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_DOCKWIDGETINFO_H
-#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_DOCKWIDGETINFO_H
+#ifndef BORNAGAIN_GUI_COMMONWIDGETS_DOCKWIDGETINFO_H
+#define BORNAGAIN_GUI_COMMONWIDGETS_DOCKWIDGETINFO_H
#include <qnamespace.h>
@@ -37,4 +37,4 @@ private:
Qt::DockWidgetArea m_area;
};
-#endif // BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_DOCKWIDGETINFO_H
+#endif // BORNAGAIN_GUI_COMMONWIDGETS_DOCKWIDGETINFO_H
diff --git a/GUI/Views/CommonWidgets/DocksController.cpp b/GUI/CommonWidgets/DocksController.cpp
similarity index 98%
rename from GUI/Views/CommonWidgets/DocksController.cpp
rename to GUI/CommonWidgets/DocksController.cpp
index ad5af54d7a753a0fc16f30ad00bec9d4efc9256b..08e4cb10235e513ed35ce2d53c19c658b96a8a40 100644
--- a/GUI/Views/CommonWidgets/DocksController.cpp
+++ b/GUI/CommonWidgets/DocksController.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/DocksController.cpp
+//! @file GUI/CommonWidgets/DocksController.cpp
//! @brief Implements class DocksController
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Views/CommonWidgets/DocksController.h"
+#include "GUI/CommonWidgets/DocksController.h"
#include "Base/Utils/Assert.h"
#include "GUI/Models/Error.h"
#include <QAbstractItemView>
diff --git a/GUI/Views/CommonWidgets/DocksController.h b/GUI/CommonWidgets/DocksController.h
similarity index 87%
rename from GUI/Views/CommonWidgets/DocksController.h
rename to GUI/CommonWidgets/DocksController.h
index 5972e1725cb28a207672fd2bb9823a0d8b83d657..1d5a4f99a806e5df53ef7308078484d262ce7896 100644
--- a/GUI/Views/CommonWidgets/DocksController.h
+++ b/GUI/CommonWidgets/DocksController.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/DocksController.h
+//! @file GUI/CommonWidgets/DocksController.h
//! @brief Defines class DocksController
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_DOCKSCONTROLLER_H
-#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_DOCKSCONTROLLER_H
+#ifndef BORNAGAIN_GUI_COMMONWIDGETS_DOCKSCONTROLLER_H
+#define BORNAGAIN_GUI_COMMONWIDGETS_DOCKSCONTROLLER_H
-#include "GUI/Views/CommonWidgets/DockWidgetInfo.h"
+#include "GUI/CommonWidgets/DockWidgetInfo.h"
#include <QObject>
#include <QSize>
#include <map>
@@ -72,4 +72,4 @@ private:
bool m_handleDockVisibilityChanges = true;
};
-#endif // BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_DOCKSCONTROLLER_H
+#endif // BORNAGAIN_GUI_COMMONWIDGETS_DOCKSCONTROLLER_H
diff --git a/GUI/Views/CommonWidgets/DoubleLineEdit.cpp b/GUI/CommonWidgets/DoubleLineEdit.cpp
similarity index 91%
rename from GUI/Views/CommonWidgets/DoubleLineEdit.cpp
rename to GUI/CommonWidgets/DoubleLineEdit.cpp
index c4110275e85e2949c403e5b9b9c9f672a2ff7828..54e48091da56398b24f4513bdbf3f1fa43be5645 100644
--- a/GUI/Views/CommonWidgets/DoubleLineEdit.cpp
+++ b/GUI/CommonWidgets/DoubleLineEdit.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/DoubleLineEdit.cpp
+//! @file GUI/CommonWidgets/DoubleLineEdit.cpp
//! @brief Implements class DoubleLineEdit
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#include "GUI/Views/CommonWidgets/DoubleLineEdit.h"
-#include "GUI/Views/CommonWidgets/GUIHelpers.h"
+#include "GUI/CommonWidgets/DoubleLineEdit.h"
+#include "GUI/CommonWidgets/GUIHelpers.h"
#include <QDoubleValidator>
DoubleLineEdit::DoubleLineEdit(QWidget* parent, const DoubleDescriptor& d)
diff --git a/GUI/Views/CommonWidgets/DoubleLineEdit.h b/GUI/CommonWidgets/DoubleLineEdit.h
similarity index 87%
rename from GUI/Views/CommonWidgets/DoubleLineEdit.h
rename to GUI/CommonWidgets/DoubleLineEdit.h
index d865ba8463da38a7227f97e23b66ac0fd0077dde..398317b8cfecec7fce4cd604daf39136db3dadc3 100644
--- a/GUI/Views/CommonWidgets/DoubleLineEdit.h
+++ b/GUI/CommonWidgets/DoubleLineEdit.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/DoubleLineEdit.h
+//! @file GUI/CommonWidgets/DoubleLineEdit.h
//! @brief Defines class DoubleLineEdit
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_DOUBLELINEEDIT_H
-#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_DOUBLELINEEDIT_H
+#ifndef BORNAGAIN_GUI_COMMONWIDGETS_DOUBLELINEEDIT_H
+#define BORNAGAIN_GUI_COMMONWIDGETS_DOUBLELINEEDIT_H
#include "GUI/Models/DoubleDescriptor.h"
#include <QLineEdit>
@@ -51,4 +51,4 @@ private:
};
-#endif // BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_DOUBLELINEEDIT_H
+#endif // BORNAGAIN_GUI_COMMONWIDGETS_DOUBLELINEEDIT_H
diff --git a/GUI/Views/CommonWidgets/DoubleSpinBox.cpp b/GUI/CommonWidgets/DoubleSpinBox.cpp
similarity index 94%
rename from GUI/Views/CommonWidgets/DoubleSpinBox.cpp
rename to GUI/CommonWidgets/DoubleSpinBox.cpp
index c3ed8f23fb90e720e4f20cb9085e38c5f1c30833..5ef8abc19334f1c88d0560b1a06c9dbf9b741f38 100644
--- a/GUI/Views/CommonWidgets/DoubleSpinBox.cpp
+++ b/GUI/CommonWidgets/DoubleSpinBox.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/DoubleSpinBox.cpp
+//! @file GUI/CommonWidgets/DoubleSpinBox.cpp
//! @brief Implements class DoubleSpinBox
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#include "GUI/Views/CommonWidgets/DoubleSpinBox.h"
-#include "GUI/Views/CommonWidgets/GUIHelpers.h"
+#include "GUI/CommonWidgets/DoubleSpinBox.h"
+#include "GUI/CommonWidgets/GUIHelpers.h"
#include <QWheelEvent>
DoubleSpinBox::DoubleSpinBox(QWidget* parent, const DoubleDescriptor& d)
diff --git a/GUI/Views/CommonWidgets/DoubleSpinBox.h b/GUI/CommonWidgets/DoubleSpinBox.h
similarity index 90%
rename from GUI/Views/CommonWidgets/DoubleSpinBox.h
rename to GUI/CommonWidgets/DoubleSpinBox.h
index 922ec6124c407e3fa4ca4b2ac81ba415bde9eb5a..26182d78b98fb2a2ba66607588a4dc0da1a20f6c 100644
--- a/GUI/Views/CommonWidgets/DoubleSpinBox.h
+++ b/GUI/CommonWidgets/DoubleSpinBox.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/DoubleSpinBox.h
+//! @file GUI/CommonWidgets/DoubleSpinBox.h
//! @brief Defines class DoubleSpinBox
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_DOUBLESPINBOX_H
-#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_DOUBLESPINBOX_H
+#ifndef BORNAGAIN_GUI_COMMONWIDGETS_DOUBLESPINBOX_H
+#define BORNAGAIN_GUI_COMMONWIDGETS_DOUBLESPINBOX_H
#include "GUI/Models/DoubleDescriptor.h"
#include <QDoubleSpinBox>
@@ -73,4 +73,4 @@ private:
};
-#endif // BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_DOUBLESPINBOX_H
+#endif // BORNAGAIN_GUI_COMMONWIDGETS_DOUBLESPINBOX_H
diff --git a/GUI/Views/CommonWidgets/GUIHelpers.cpp b/GUI/CommonWidgets/GUIHelpers.cpp
similarity index 98%
rename from GUI/Views/CommonWidgets/GUIHelpers.cpp
rename to GUI/CommonWidgets/GUIHelpers.cpp
index f7175c6832ae547ad45073451b39ea7fe4f8defb..43a84aeeeaf729877c1523ef1c3c16178a4821f2 100644
--- a/GUI/Views/CommonWidgets/GUIHelpers.cpp
+++ b/GUI/CommonWidgets/GUIHelpers.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/GUIHelpers.cpp
+//! @file GUI/CommonWidgets/GUIHelpers.cpp
//! @brief Implements GUIHelpers functions
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Views/CommonWidgets/GUIHelpers.h"
+#include "GUI/CommonWidgets/GUIHelpers.h"
#include "Fit/Param/RealLimits.h"
#include "GUI/Models/Error.h"
#include <QApplication>
diff --git a/GUI/Views/CommonWidgets/GUIHelpers.h b/GUI/CommonWidgets/GUIHelpers.h
similarity index 87%
rename from GUI/Views/CommonWidgets/GUIHelpers.h
rename to GUI/CommonWidgets/GUIHelpers.h
index 6d663ccd0665d1ee78c2520eb3965342c6cd3786..1a323231a343aad4303075a64276492030631d45 100644
--- a/GUI/Views/CommonWidgets/GUIHelpers.h
+++ b/GUI/CommonWidgets/GUIHelpers.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/GUIHelpers.h
+//! @file GUI/CommonWidgets/GUIHelpers.h
//! @brief Defines class GUIHelpers functions
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_GUIHELPERS_H
-#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_GUIHELPERS_H
+#ifndef BORNAGAIN_GUI_COMMONWIDGETS_GUIHELPERS_H
+#define BORNAGAIN_GUI_COMMONWIDGETS_GUIHELPERS_H
#include <QWidget>
@@ -45,4 +45,4 @@ void configSpinbox(QDoubleSpinBox* spinBox, int decimals, const RealLimits& limi
} // namespace GUI::View::Helpers
-#endif // BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_GUIHELPERS_H
+#endif // BORNAGAIN_GUI_COMMONWIDGETS_GUIHELPERS_H
diff --git a/GUI/Views/CommonWidgets/GroupBoxCollapser.cpp b/GUI/CommonWidgets/GroupBoxCollapser.cpp
similarity index 98%
rename from GUI/Views/CommonWidgets/GroupBoxCollapser.cpp
rename to GUI/CommonWidgets/GroupBoxCollapser.cpp
index 500a0e13d8a956923075d5ad8584c1288e607514..17719ed23e2331526feaea734e15303cb9c296ec 100644
--- a/GUI/Views/CommonWidgets/GroupBoxCollapser.cpp
+++ b/GUI/CommonWidgets/GroupBoxCollapser.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/GroupBoxCollapser.cpp
+//! @file GUI/CommonWidgets/GroupBoxCollapser.cpp
//! @brief Implements class GroupBoxCollapser
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/Views/CommonWidgets/GroupBoxCollapser.h b/GUI/CommonWidgets/GroupBoxCollapser.h
similarity index 90%
rename from GUI/Views/CommonWidgets/GroupBoxCollapser.h
rename to GUI/CommonWidgets/GroupBoxCollapser.h
index b1d62bb543ab5e04cf0ca431eebae9837ffe2942..167c8252fbd9293d302120616fbec809eab42583 100644
--- a/GUI/Views/CommonWidgets/GroupBoxCollapser.h
+++ b/GUI/CommonWidgets/GroupBoxCollapser.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/GroupBoxCollapser.h
+//! @file GUI/CommonWidgets/GroupBoxCollapser.h
//! @brief Defines class GroupBoxCollapser
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_GROUPBOXCOLLAPSER_H
-#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_GROUPBOXCOLLAPSER_H
+#ifndef BORNAGAIN_GUI_COMMONWIDGETS_GROUPBOXCOLLAPSER_H
+#define BORNAGAIN_GUI_COMMONWIDGETS_GROUPBOXCOLLAPSER_H
#include <QObject>
@@ -62,4 +62,4 @@ private:
};
-#endif // BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_GROUPBOXCOLLAPSER_H
+#endif // BORNAGAIN_GUI_COMMONWIDGETS_GROUPBOXCOLLAPSER_H
diff --git a/GUI/Views/CommonWidgets/InfoPanel.cpp b/GUI/CommonWidgets/InfoPanel.cpp
similarity index 95%
rename from GUI/Views/CommonWidgets/InfoPanel.cpp
rename to GUI/CommonWidgets/InfoPanel.cpp
index c8643c5fe3855a90a2f2a42cb2d6c83c77f34478..5f85716bde065f3b3de6a40ccff9af5ed0675687 100644
--- a/GUI/Views/CommonWidgets/InfoPanel.cpp
+++ b/GUI/CommonWidgets/InfoPanel.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/InfoPanel.cpp
+//! @file GUI/CommonWidgets/InfoPanel.cpp
//! @brief Declares class InfoPanel
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#include "GUI/Views/CommonWidgets/InfoPanel.h"
-#include "GUI/Views/CommonWidgets/InfoPanelToolBar.h"
+#include "GUI/CommonWidgets/InfoPanel.h"
+#include "GUI/CommonWidgets/InfoPanelToolBar.h"
#include <QBoxLayout>
#include <QResizeEvent>
#include <QStackedWidget>
diff --git a/GUI/Views/CommonWidgets/InfoPanel.h b/GUI/CommonWidgets/InfoPanel.h
similarity index 86%
rename from GUI/Views/CommonWidgets/InfoPanel.h
rename to GUI/CommonWidgets/InfoPanel.h
index d676554584a408dbd661954dc4c4851dc8684ee5..7112e212b1cf8b54d00d9423bfa7f2b98abc09c4 100644
--- a/GUI/Views/CommonWidgets/InfoPanel.h
+++ b/GUI/CommonWidgets/InfoPanel.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/InfoPanel.h
+//! @file GUI/CommonWidgets/InfoPanel.h
//! @brief Defines class InfoPanel
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_INFOPANEL_H
-#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_INFOPANEL_H
+#ifndef BORNAGAIN_GUI_COMMONWIDGETS_INFOPANEL_H
+#define BORNAGAIN_GUI_COMMONWIDGETS_INFOPANEL_H
#include <QFrame>
@@ -51,4 +51,4 @@ protected:
int m_cached_height;
};
-#endif // BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_INFOPANEL_H
+#endif // BORNAGAIN_GUI_COMMONWIDGETS_INFOPANEL_H
diff --git a/GUI/Views/CommonWidgets/InfoPanelToolBar.cpp b/GUI/CommonWidgets/InfoPanelToolBar.cpp
similarity index 94%
rename from GUI/Views/CommonWidgets/InfoPanelToolBar.cpp
rename to GUI/CommonWidgets/InfoPanelToolBar.cpp
index 581e7234de5fdfae313ceefcbbc77aef8da98bf5..abcd0f948f99ad8caeca8ddc2cbc507216a9331d 100644
--- a/GUI/Views/CommonWidgets/InfoPanelToolBar.cpp
+++ b/GUI/CommonWidgets/InfoPanelToolBar.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/InfoPanelToolBar.cpp
+//! @file GUI/CommonWidgets/InfoPanelToolBar.cpp
//! @brief Declares class InfoPanelToolBar
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Views/CommonWidgets/InfoPanelToolBar.h"
+#include "GUI/CommonWidgets/InfoPanelToolBar.h"
#include <QAction>
#include <QHBoxLayout>
#include <QToolButton>
diff --git a/GUI/Views/CommonWidgets/InfoPanelToolBar.h b/GUI/CommonWidgets/InfoPanelToolBar.h
similarity index 76%
rename from GUI/Views/CommonWidgets/InfoPanelToolBar.h
rename to GUI/CommonWidgets/InfoPanelToolBar.h
index bca753304a516a35a402b675ea18abc2a3e6b814..609b1e3782d5b9d097ec846f453cea8c07a69867 100644
--- a/GUI/Views/CommonWidgets/InfoPanelToolBar.h
+++ b/GUI/CommonWidgets/InfoPanelToolBar.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/InfoPanelToolBar.h
+//! @file GUI/CommonWidgets/InfoPanelToolBar.h
//! @brief Defines class InfoPanelToolBar
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_INFOPANELTOOLBAR_H
-#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_INFOPANELTOOLBAR_H
+#ifndef BORNAGAIN_GUI_COMMONWIDGETS_INFOPANELTOOLBAR_H
+#define BORNAGAIN_GUI_COMMONWIDGETS_INFOPANELTOOLBAR_H
-#include "GUI/Views/CommonWidgets/StyledToolBar.h"
+#include "GUI/CommonWidgets/StyledToolBar.h"
class QAction;
@@ -41,4 +41,4 @@ private:
bool m_expanded;
};
-#endif // BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_INFOPANELTOOLBAR_H
+#endif // BORNAGAIN_GUI_COMMONWIDGETS_INFOPANELTOOLBAR_H
diff --git a/GUI/Views/CommonWidgets/ItemComboToolBar.cpp b/GUI/CommonWidgets/ItemComboToolBar.cpp
similarity index 96%
rename from GUI/Views/CommonWidgets/ItemComboToolBar.cpp
rename to GUI/CommonWidgets/ItemComboToolBar.cpp
index 3b40ad0ebe255b875f440303fcfdf60b3f0190aa..feb030a2f202f2d2399ee046dc5dfe137cdcbc7c 100644
--- a/GUI/Views/CommonWidgets/ItemComboToolBar.cpp
+++ b/GUI/CommonWidgets/ItemComboToolBar.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/ItemComboToolBar.cpp
+//! @file GUI/CommonWidgets/ItemComboToolBar.cpp
//! @brief Implements class ItemComboToolBar
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Views/CommonWidgets/ItemComboToolBar.h"
+#include "GUI/CommonWidgets/ItemComboToolBar.h"
#include "Base/Utils/Assert.h"
#include <QAction>
#include <QComboBox>
diff --git a/GUI/Views/CommonWidgets/ItemComboToolBar.h b/GUI/CommonWidgets/ItemComboToolBar.h
similarity index 83%
rename from GUI/Views/CommonWidgets/ItemComboToolBar.h
rename to GUI/CommonWidgets/ItemComboToolBar.h
index 5d99cc915061e0378c8ab229f7a67171e4281d47..1de82ab662226d488b9e93d7ed93b7a3291bc4fe 100644
--- a/GUI/Views/CommonWidgets/ItemComboToolBar.h
+++ b/GUI/CommonWidgets/ItemComboToolBar.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/ItemComboToolBar.h
+//! @file GUI/CommonWidgets/ItemComboToolBar.h
//! @brief Defines class ItemComboToolBar
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_ITEMCOMBOTOOLBAR_H
-#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_ITEMCOMBOTOOLBAR_H
+#ifndef BORNAGAIN_GUI_COMMONWIDGETS_ITEMCOMBOTOOLBAR_H
+#define BORNAGAIN_GUI_COMMONWIDGETS_ITEMCOMBOTOOLBAR_H
-#include "GUI/Views/CommonWidgets/StyledToolBar.h"
+#include "GUI/CommonWidgets/StyledToolBar.h"
#include <QList>
class QAction;
@@ -51,4 +51,4 @@ private:
QAction* m_comboBoxAction;
};
-#endif // BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_ITEMCOMBOTOOLBAR_H
+#endif // BORNAGAIN_GUI_COMMONWIDGETS_ITEMCOMBOTOOLBAR_H
diff --git a/GUI/Views/CommonWidgets/ItemComboWidget.cpp b/GUI/CommonWidgets/ItemComboWidget.cpp
similarity index 96%
rename from GUI/Views/CommonWidgets/ItemComboWidget.cpp
rename to GUI/CommonWidgets/ItemComboWidget.cpp
index 521f1215b9c931ebc3d84c06685a197277a5dedc..2c2d5d7fa3bbd23a092d35fd7fcee3c450a00def 100644
--- a/GUI/Views/CommonWidgets/ItemComboWidget.cpp
+++ b/GUI/CommonWidgets/ItemComboWidget.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/ItemComboWidget.cpp
+//! @file GUI/CommonWidgets/ItemComboWidget.cpp
//! @brief Implements class ItemComboWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,9 +12,9 @@
//
// ************************************************************************************************
-#include "GUI/Views/CommonWidgets/ItemComboWidget.h"
+#include "GUI/CommonWidgets/ItemComboWidget.h"
#include "Base/Utils/Assert.h"
-#include "GUI/Views/CommonWidgets/ItemComboToolBar.h"
+#include "GUI/CommonWidgets/ItemComboToolBar.h"
#include <QComboBox>
#include <QEvent>
#include <QStackedWidget>
diff --git a/GUI/Views/CommonWidgets/ItemComboWidget.h b/GUI/CommonWidgets/ItemComboWidget.h
similarity index 89%
rename from GUI/Views/CommonWidgets/ItemComboWidget.h
rename to GUI/CommonWidgets/ItemComboWidget.h
index dfcd7ea780eaf857d207fabf19208604856d8595..7b1a7b98f252e6e96dcace8ee0e044d4533ad822 100644
--- a/GUI/Views/CommonWidgets/ItemComboWidget.h
+++ b/GUI/CommonWidgets/ItemComboWidget.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/ItemComboWidget.h
+//! @file GUI/CommonWidgets/ItemComboWidget.h
//! @brief Defines class ItemComboWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,11 +12,11 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_ITEMCOMBOWIDGET_H
-#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_ITEMCOMBOWIDGET_H
+#ifndef BORNAGAIN_GUI_COMMONWIDGETS_ITEMCOMBOWIDGET_H
+#define BORNAGAIN_GUI_COMMONWIDGETS_ITEMCOMBOWIDGET_H
#include "Base/Utils/IFactory.h"
-#include "GUI/Views/CommonWidgets/SessionItemWidget.h"
+#include "GUI/CommonWidgets/SessionItemWidget.h"
#include <QMap>
#include <QString>
#include <QWidget>
@@ -72,4 +72,4 @@ private:
QWidget* m_blankWidget;
};
-#endif // BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_ITEMCOMBOWIDGET_H
+#endif // BORNAGAIN_GUI_COMMONWIDGETS_ITEMCOMBOWIDGET_H
diff --git a/GUI/Views/CommonWidgets/ItemSelectorWidget.cpp b/GUI/CommonWidgets/ItemSelectorWidget.cpp
similarity index 95%
rename from GUI/Views/CommonWidgets/ItemSelectorWidget.cpp
rename to GUI/CommonWidgets/ItemSelectorWidget.cpp
index 9d5ea2747144441bb5d6d375e27bad70f575520e..ec9d4f271cf40ac9bcc221864b0a501b56b2a72f 100644
--- a/GUI/Views/CommonWidgets/ItemSelectorWidget.cpp
+++ b/GUI/CommonWidgets/ItemSelectorWidget.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/ItemSelectorWidget.cpp
+//! @file GUI/CommonWidgets/ItemSelectorWidget.cpp
//! @brief Implements class ItemSelectorWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#include "GUI/Views/CommonWidgets/ItemSelectorWidget.h"
+#include "GUI/CommonWidgets/ItemSelectorWidget.h"
#include "GUI/Models/SessionDecorationModel.h"
#include "GUI/Models/SessionModel.h"
-#include "GUI/Views/Tools/mainwindow_constants.h"
+#include "GUI/utils/mainwindow_constants.h"
#include <QListView>
#include <QVBoxLayout>
diff --git a/GUI/Views/CommonWidgets/ItemSelectorWidget.h b/GUI/CommonWidgets/ItemSelectorWidget.h
similarity index 88%
rename from GUI/Views/CommonWidgets/ItemSelectorWidget.h
rename to GUI/CommonWidgets/ItemSelectorWidget.h
index 9844759b5829b8551a80fa4b8b48507ed057f590..fec70430b0fac176b10a115bf58cf56a2c038909 100644
--- a/GUI/Views/CommonWidgets/ItemSelectorWidget.h
+++ b/GUI/CommonWidgets/ItemSelectorWidget.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/ItemSelectorWidget.h
+//! @file GUI/CommonWidgets/ItemSelectorWidget.h
//! @brief Defines class ItemSelectorWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_ITEMSELECTORWIDGET_H
-#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_ITEMSELECTORWIDGET_H
+#ifndef BORNAGAIN_GUI_COMMONWIDGETS_ITEMSELECTORWIDGET_H
+#define BORNAGAIN_GUI_COMMONWIDGETS_ITEMSELECTORWIDGET_H
#include <QItemSelectionModel>
#include <QWidget>
@@ -69,4 +69,4 @@ protected:
std::unique_ptr<SessionDecorationModel> m_decorationModel;
};
-#endif // BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_ITEMSELECTORWIDGET_H
+#endif // BORNAGAIN_GUI_COMMONWIDGETS_ITEMSELECTORWIDGET_H
diff --git a/GUI/Views/CommonWidgets/ItemStackPresenter.h b/GUI/CommonWidgets/ItemStackPresenter.h
similarity index 91%
rename from GUI/Views/CommonWidgets/ItemStackPresenter.h
rename to GUI/CommonWidgets/ItemStackPresenter.h
index bc8cd31a5db04a1b892bc29493c35e1b2f87e814..e1c34127539aa43344baa4e609b8ac4ea20aaab0 100644
--- a/GUI/Views/CommonWidgets/ItemStackPresenter.h
+++ b/GUI/CommonWidgets/ItemStackPresenter.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/ItemStackPresenter.h
+//! @file GUI/CommonWidgets/ItemStackPresenter.h
//! @brief Defines class ItemStackPresenter
//!
//! @homepage http://www.bornagainproject.org
@@ -12,11 +12,11 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_ITEMSTACKPRESENTER_H
-#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_ITEMSTACKPRESENTER_H
+#ifndef BORNAGAIN_GUI_COMMONWIDGETS_ITEMSTACKPRESENTER_H
+#define BORNAGAIN_GUI_COMMONWIDGETS_ITEMSTACKPRESENTER_H
#include "Base/Utils/Assert.h"
-#include "GUI/Views/CommonWidgets/ItemStackWidget.h"
+#include "GUI/CommonWidgets/ItemStackWidget.h"
#include <QMap>
#include <QStackedWidget>
@@ -132,4 +132,4 @@ template <class T> void ItemStackPresenter<T>::removeWidgets()
m_itemToWidget.clear();
}
-#endif // BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_ITEMSTACKPRESENTER_H
+#endif // BORNAGAIN_GUI_COMMONWIDGETS_ITEMSTACKPRESENTER_H
diff --git a/GUI/Views/CommonWidgets/ItemStackWidget.cpp b/GUI/CommonWidgets/ItemStackWidget.cpp
similarity index 96%
rename from GUI/Views/CommonWidgets/ItemStackWidget.cpp
rename to GUI/CommonWidgets/ItemStackWidget.cpp
index 41b99a637c2d32c2844fd64c251196dda7aac793..21fc2672107595bac6e1e24dab1a8f632fc47a00 100644
--- a/GUI/Views/CommonWidgets/ItemStackWidget.cpp
+++ b/GUI/CommonWidgets/ItemStackWidget.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/ItemStackWidget.cpp
+//! @file GUI/CommonWidgets/ItemStackWidget.cpp
//! @brief Implements class ItemStackWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Views/CommonWidgets/ItemStackWidget.h"
+#include "GUI/CommonWidgets/ItemStackWidget.h"
#include "GUI/Models/Error.h"
#include "GUI/Models/SessionModel.h"
#include <QStackedWidget>
diff --git a/GUI/Views/CommonWidgets/ItemStackWidget.h b/GUI/CommonWidgets/ItemStackWidget.h
similarity index 87%
rename from GUI/Views/CommonWidgets/ItemStackWidget.h
rename to GUI/CommonWidgets/ItemStackWidget.h
index 5f40431f84498894d1655e1495f85d9d1897ab6d..b0c69681ffdc59d0c520435d3f8f53191f46248b 100644
--- a/GUI/Views/CommonWidgets/ItemStackWidget.h
+++ b/GUI/CommonWidgets/ItemStackWidget.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/ItemStackWidget.h
+//! @file GUI/CommonWidgets/ItemStackWidget.h
//! @brief Defines class ItemStackWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_ITEMSTACKWIDGET_H
-#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_ITEMSTACKWIDGET_H
+#ifndef BORNAGAIN_GUI_COMMONWIDGETS_ITEMSTACKWIDGET_H
+#define BORNAGAIN_GUI_COMMONWIDGETS_ITEMSTACKWIDGET_H
#include <QWidget>
@@ -56,4 +56,4 @@ protected:
QSize m_size_hint;
};
-#endif // BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_ITEMSTACKWIDGET_H
+#endif // BORNAGAIN_GUI_COMMONWIDGETS_ITEMSTACKWIDGET_H
diff --git a/GUI/Views/CommonWidgets/ItemViewOverlayButtons.cpp b/GUI/CommonWidgets/ItemViewOverlayButtons.cpp
similarity index 99%
rename from GUI/Views/CommonWidgets/ItemViewOverlayButtons.cpp
rename to GUI/CommonWidgets/ItemViewOverlayButtons.cpp
index 48cfb3646a836dd2a9a8cfe7f3fd62e7e2ecf9fe..c375da67efdfdb5eea93bf7ab6e574cdde219dc6 100644
--- a/GUI/Views/CommonWidgets/ItemViewOverlayButtons.cpp
+++ b/GUI/CommonWidgets/ItemViewOverlayButtons.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/ItemViewOverlayButtons.cpp
+//! @file GUI/CommonWidgets/ItemViewOverlayButtons.cpp
//! @brief Implements class ItemViewOverlayButtons
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/Views/CommonWidgets/ItemViewOverlayButtons.h b/GUI/CommonWidgets/ItemViewOverlayButtons.h
similarity index 81%
rename from GUI/Views/CommonWidgets/ItemViewOverlayButtons.h
rename to GUI/CommonWidgets/ItemViewOverlayButtons.h
index 94846ef78cefb1bc40490d5223701c3d45d98a54..214ce41b33037f360a24d0bb955d636fd8dd427a 100644
--- a/GUI/Views/CommonWidgets/ItemViewOverlayButtons.h
+++ b/GUI/CommonWidgets/ItemViewOverlayButtons.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/ItemViewOverlayButtons.h
+//! @file GUI/CommonWidgets/ItemViewOverlayButtons.h
//! @brief Defines class ItemViewOverlayButtons
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_TREEVIEWOVERLAYBUTTONS_H
-#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_TREEVIEWOVERLAYBUTTONS_H
+#ifndef BORNAGAIN_GUI_COMMONWIDGETS_ITEMVIEWOVERLAYBUTTONS_H
+#define BORNAGAIN_GUI_COMMONWIDGETS_ITEMVIEWOVERLAYBUTTONS_H
#include <QObject>
#include <functional>
@@ -42,4 +42,4 @@ private:
};
-#endif // BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_TREEVIEWOVERLAYBUTTONS_H
+#endif // BORNAGAIN_GUI_COMMONWIDGETS_ITEMVIEWOVERLAYBUTTONS_H
diff --git a/GUI/Views/CommonWidgets/ModelTreeView.cpp b/GUI/CommonWidgets/ModelTreeView.cpp
similarity index 92%
rename from GUI/Views/CommonWidgets/ModelTreeView.cpp
rename to GUI/CommonWidgets/ModelTreeView.cpp
index 718ab420278f011089b27d2027c9c6a08d94390e..b01e17705dd56e729454b61dd02bc9c6e48a7041 100644
--- a/GUI/Views/CommonWidgets/ModelTreeView.cpp
+++ b/GUI/CommonWidgets/ModelTreeView.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/ModelTreeView.cpp
+//! @file GUI/CommonWidgets/ModelTreeView.cpp
//! @brief Implements class ModelTreeView
//!
//! @homepage http://www.bornagainproject.org
@@ -12,11 +12,11 @@
//
// ************************************************************************************************
-#include "GUI/Views/CommonWidgets/ModelTreeView.h"
+#include "GUI/CommonWidgets/ModelTreeView.h"
#include "GUI/Models/Error.h"
#include "GUI/Models/SessionDecorationModel.h"
#include "GUI/Models/SessionModel.h"
-#include "GUI/Views/CommonWidgets/StyleUtils.h"
+#include "GUI/CommonWidgets/StyleUtils.h"
#include <QTreeView>
#include <QVBoxLayout>
diff --git a/GUI/Views/CommonWidgets/ModelTreeView.h b/GUI/CommonWidgets/ModelTreeView.h
similarity index 84%
rename from GUI/Views/CommonWidgets/ModelTreeView.h
rename to GUI/CommonWidgets/ModelTreeView.h
index 3863ae66727d6605b9c1853f56245b1d80faa908..d28fcd58e69cd256e66c102dacbfc30835ec640f 100644
--- a/GUI/Views/CommonWidgets/ModelTreeView.h
+++ b/GUI/CommonWidgets/ModelTreeView.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/ModelTreeView.h
+//! @file GUI/CommonWidgets/ModelTreeView.h
//! @brief Defines class ModelTreeView
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_MODELTREEVIEW_H
-#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_MODELTREEVIEW_H
+#ifndef BORNAGAIN_GUI_COMMONWIDGETS_MODELTREEVIEW_H
+#define BORNAGAIN_GUI_COMMONWIDGETS_MODELTREEVIEW_H
#include <QWidget>
@@ -43,4 +43,4 @@ private:
bool m_is_expanded;
};
-#endif // BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_MODELTREEVIEW_H
+#endif // BORNAGAIN_GUI_COMMONWIDGETS_MODELTREEVIEW_H
diff --git a/GUI/Views/CommonWidgets/ScientificSpinBox.cpp b/GUI/CommonWidgets/ScientificSpinBox.cpp
similarity index 97%
rename from GUI/Views/CommonWidgets/ScientificSpinBox.cpp
rename to GUI/CommonWidgets/ScientificSpinBox.cpp
index d5ff7c9c9055fe4f962a73b5fd1140c4e934b715..8eab7b326ad8fe0144d6475c01be626e77733493 100644
--- a/GUI/Views/CommonWidgets/ScientificSpinBox.cpp
+++ b/GUI/CommonWidgets/ScientificSpinBox.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/ScientificSpinBox.cpp
+//! @file GUI/CommonWidgets/ScientificSpinBox.cpp
//! @brief Implements class ScientificSpinBox
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Views/CommonWidgets/ScientificSpinBox.h"
+#include "GUI/CommonWidgets/ScientificSpinBox.h"
#include <QLineEdit>
#include <cmath>
diff --git a/GUI/Views/CommonWidgets/ScientificSpinBox.h b/GUI/CommonWidgets/ScientificSpinBox.h
similarity index 88%
rename from GUI/Views/CommonWidgets/ScientificSpinBox.h
rename to GUI/CommonWidgets/ScientificSpinBox.h
index f18816fa4cf12bec7a3cdb1e597bd52a78664197..9d8c19bc0d135fdb0bf06571bd1e31f8374695d4 100644
--- a/GUI/Views/CommonWidgets/ScientificSpinBox.h
+++ b/GUI/CommonWidgets/ScientificSpinBox.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/ScientificSpinBox.h
+//! @file GUI/CommonWidgets/ScientificSpinBox.h
//! @brief Defines class ScientificSpinBox
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_SCIENTIFICSPINBOX_H
-#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_SCIENTIFICSPINBOX_H
+#ifndef BORNAGAIN_GUI_COMMONWIDGETS_SCIENTIFICSPINBOX_H
+#define BORNAGAIN_GUI_COMMONWIDGETS_SCIENTIFICSPINBOX_H
#include <QAbstractSpinBox>
@@ -66,4 +66,4 @@ private:
QDoubleValidator m_validator;
};
-#endif // BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_SCIENTIFICSPINBOX_H
+#endif // BORNAGAIN_GUI_COMMONWIDGETS_SCIENTIFICSPINBOX_H
diff --git a/GUI/Views/CommonWidgets/SessionItemController.cpp b/GUI/CommonWidgets/SessionItemController.cpp
similarity index 95%
rename from GUI/Views/CommonWidgets/SessionItemController.cpp
rename to GUI/CommonWidgets/SessionItemController.cpp
index 65c942574c3ae0008d0562a2a061d973a3596aff..6883869df04db51a634adada5d7b4a9cd7eff239 100644
--- a/GUI/Views/CommonWidgets/SessionItemController.cpp
+++ b/GUI/CommonWidgets/SessionItemController.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/SessionItemController.cpp
+//! @file GUI/CommonWidgets/SessionItemController.cpp
//! @brief Implements class SessionItemController
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Views/CommonWidgets/SessionItemController.h"
+#include "GUI/CommonWidgets/SessionItemController.h"
#include "GUI/Models/SessionItem.h"
SessionItemController::SessionItemController(QObject* prt)
diff --git a/GUI/Views/CommonWidgets/SessionItemController.h b/GUI/CommonWidgets/SessionItemController.h
similarity index 84%
rename from GUI/Views/CommonWidgets/SessionItemController.h
rename to GUI/CommonWidgets/SessionItemController.h
index e79e0266ee29b1f230e6791a7971d8fabcf70ce8..bf374a8f484f9f41fefe886c0ab45e7b80d05072 100644
--- a/GUI/Views/CommonWidgets/SessionItemController.h
+++ b/GUI/CommonWidgets/SessionItemController.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/SessionItemController.h
+//! @file GUI/CommonWidgets/SessionItemController.h
//! @brief Defines class SessionItemController
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_SESSIONITEMCONTROLLER_H
-#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_SESSIONITEMCONTROLLER_H
+#ifndef BORNAGAIN_GUI_COMMONWIDGETS_SESSIONITEMCONTROLLER_H
+#define BORNAGAIN_GUI_COMMONWIDGETS_SESSIONITEMCONTROLLER_H
#include <QObject>
#include <functional>
@@ -53,4 +53,4 @@ private:
bool m_parent_subscribed;
};
-#endif // BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_SESSIONITEMCONTROLLER_H
+#endif // BORNAGAIN_GUI_COMMONWIDGETS_SESSIONITEMCONTROLLER_H
diff --git a/GUI/Views/CommonWidgets/SessionItemWidget.cpp b/GUI/CommonWidgets/SessionItemWidget.cpp
similarity index 89%
rename from GUI/Views/CommonWidgets/SessionItemWidget.cpp
rename to GUI/CommonWidgets/SessionItemWidget.cpp
index d1affc641c5b531b29697ab87990b6169bac7be5..2dc7bae07e2917d70bb7b6b3ebe56d23cda4c896 100644
--- a/GUI/Views/CommonWidgets/SessionItemWidget.cpp
+++ b/GUI/CommonWidgets/SessionItemWidget.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/SessionItemWidget.cpp
+//! @file GUI/CommonWidgets/SessionItemWidget.cpp
//! @brief Declares class ItemComboWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#include "GUI/Views/CommonWidgets/SessionItemWidget.h"
-#include "GUI/Views/CommonWidgets/SessionItemController.h"
+#include "GUI/CommonWidgets/SessionItemWidget.h"
+#include "GUI/CommonWidgets/SessionItemController.h"
SessionItemWidget::SessionItemWidget(QWidget* parent)
: QWidget(parent), m_itemController(new SessionItemController(this))
diff --git a/GUI/Views/CommonWidgets/SessionItemWidget.h b/GUI/CommonWidgets/SessionItemWidget.h
similarity index 85%
rename from GUI/Views/CommonWidgets/SessionItemWidget.h
rename to GUI/CommonWidgets/SessionItemWidget.h
index 5193560b2dff34483b33202e968bea7cc7da44a1..10ada37065847f33b2013a0a2c74cd3c10cd13d3 100644
--- a/GUI/Views/CommonWidgets/SessionItemWidget.h
+++ b/GUI/CommonWidgets/SessionItemWidget.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/SessionItemWidget.h
+//! @file GUI/CommonWidgets/SessionItemWidget.h
//! @brief Defines class ItemComboWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_SESSIONITEMWIDGET_H
-#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_SESSIONITEMWIDGET_H
+#ifndef BORNAGAIN_GUI_COMMONWIDGETS_SESSIONITEMWIDGET_H
+#define BORNAGAIN_GUI_COMMONWIDGETS_SESSIONITEMWIDGET_H
#include <QWidget>
@@ -49,4 +49,4 @@ private:
SessionItemController* m_itemController;
};
-#endif // BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_SESSIONITEMWIDGET_H
+#endif // BORNAGAIN_GUI_COMMONWIDGETS_SESSIONITEMWIDGET_H
diff --git a/GUI/Views/CommonWidgets/StatusLabel.cpp b/GUI/CommonWidgets/StatusLabel.cpp
similarity index 92%
rename from GUI/Views/CommonWidgets/StatusLabel.cpp
rename to GUI/CommonWidgets/StatusLabel.cpp
index 0e365132b1670294f850f451c905e060cc24600b..a908dfbc152a12eddd2facfad415594937251fa7 100644
--- a/GUI/Views/CommonWidgets/StatusLabel.cpp
+++ b/GUI/CommonWidgets/StatusLabel.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/StatusLabel.cpp
+//! @file GUI/CommonWidgets/StatusLabel.cpp
//! @brief Implements class StatusLabel
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#include "GUI/Views/CommonWidgets/StatusLabel.h"
-#include "GUI/Views/CommonWidgets/StyleUtils.h"
+#include "GUI/CommonWidgets/StatusLabel.h"
+#include "GUI/CommonWidgets/StyleUtils.h"
#include <QColor>
#include <QFont>
#include <QPainter>
diff --git a/GUI/Views/CommonWidgets/StatusLabel.h b/GUI/CommonWidgets/StatusLabel.h
similarity index 85%
rename from GUI/Views/CommonWidgets/StatusLabel.h
rename to GUI/CommonWidgets/StatusLabel.h
index d13a01c792a66f4f9799107fcfbc3ba2a575bcb3..1dfa6cdc5dcf6f9b8db2ef967853378a5c0ae09b 100644
--- a/GUI/Views/CommonWidgets/StatusLabel.h
+++ b/GUI/CommonWidgets/StatusLabel.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/StatusLabel.h
+//! @file GUI/CommonWidgets/StatusLabel.h
//! @brief Defines class StatusLabel
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_STATUSLABEL_H
-#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_STATUSLABEL_H
+#ifndef BORNAGAIN_GUI_COMMONWIDGETS_STATUSLABEL_H
+#define BORNAGAIN_GUI_COMMONWIDGETS_STATUSLABEL_H
#include <QFrame>
@@ -45,4 +45,4 @@ private:
QFont m_font;
};
-#endif // BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_STATUSLABEL_H
+#endif // BORNAGAIN_GUI_COMMONWIDGETS_STATUSLABEL_H
diff --git a/GUI/Views/CommonWidgets/StyleUtils.cpp b/GUI/CommonWidgets/StyleUtils.cpp
similarity index 95%
rename from GUI/Views/CommonWidgets/StyleUtils.cpp
rename to GUI/CommonWidgets/StyleUtils.cpp
index 1f8060527d6b1850672e7a564ea66155ce0f2628..c663c8ed0266f30e51725b1d026ead5d2a2e5a6b 100644
--- a/GUI/Views/CommonWidgets/StyleUtils.cpp
+++ b/GUI/CommonWidgets/StyleUtils.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/StyleUtils.cpp
+//! @file GUI/CommonWidgets/StyleUtils.cpp
//! @brief Defines GUI::StyleUtils namespace
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#include "GUI/Views/CommonWidgets/StyleUtils.h"
+#include "GUI/CommonWidgets/StyleUtils.h"
#include "Base/Utils/Assert.h"
-#include "GUI/Views/CommonWidgets/DesignerHelper.h"
-#include "GUI/Views/CommonWidgets/detailswidget.h"
+#include "GUI/CommonWidgets/DesignerHelper.h"
+#include "GUI/CommonWidgets/detailswidget.h"
#include "GUI/utils/hostosinfo.h"
#include <QApplication>
#include <QBoxLayout>
diff --git a/GUI/Views/CommonWidgets/StyleUtils.h b/GUI/CommonWidgets/StyleUtils.h
similarity index 88%
rename from GUI/Views/CommonWidgets/StyleUtils.h
rename to GUI/CommonWidgets/StyleUtils.h
index f50e9fc18ffc3a39bfd2623c78275841318153a6..19dbfc51fa3cba300a0f81e40ea4e1b2ac42a26d 100644
--- a/GUI/Views/CommonWidgets/StyleUtils.h
+++ b/GUI/CommonWidgets/StyleUtils.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/StyleUtils.h
+//! @file GUI/CommonWidgets/StyleUtils.h
//! @brief Defines GUI::StyleUtils namespace
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_STYLEUTILS_H
-#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_STYLEUTILS_H
+#ifndef BORNAGAIN_GUI_COMMONWIDGETS_STYLEUTILS_H
+#define BORNAGAIN_GUI_COMMONWIDGETS_STYLEUTILS_H
#include <QFont>
#include <QString>
@@ -58,4 +58,4 @@ int PropertyPanelWidth();
} // namespace GUI::Utils::Style
-#endif // BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_STYLEUTILS_H
+#endif // BORNAGAIN_GUI_COMMONWIDGETS_STYLEUTILS_H
diff --git a/GUI/Views/CommonWidgets/StyledToolBar.cpp b/GUI/CommonWidgets/StyledToolBar.cpp
similarity index 93%
rename from GUI/Views/CommonWidgets/StyledToolBar.cpp
rename to GUI/CommonWidgets/StyledToolBar.cpp
index f85239b0759381b1a1179c50acca8b7644d1ff12..2a0534136c23a2f10bb24da1d45ea3e44efaeda7 100644
--- a/GUI/Views/CommonWidgets/StyledToolBar.cpp
+++ b/GUI/CommonWidgets/StyledToolBar.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/StyledToolBar.cpp
+//! @file GUI/CommonWidgets/StyledToolBar.cpp
//! @brief Implements class StyledToolBar
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Views/CommonWidgets/StyledToolBar.h"
+#include "GUI/CommonWidgets/StyledToolBar.h"
#include <QLabel>
#include <QStyle>
diff --git a/GUI/Views/CommonWidgets/StyledToolBar.h b/GUI/CommonWidgets/StyledToolBar.h
similarity index 80%
rename from GUI/Views/CommonWidgets/StyledToolBar.h
rename to GUI/CommonWidgets/StyledToolBar.h
index 69374bc093ae2903649fe88d91275c4bf553ed2a..c18bd6553389d5e3bf71c9d633c091d4ec184a3b 100644
--- a/GUI/Views/CommonWidgets/StyledToolBar.h
+++ b/GUI/CommonWidgets/StyledToolBar.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/StyledToolBar.h
+//! @file GUI/CommonWidgets/StyledToolBar.h
//! @brief Defines class StyledToolBar
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_STYLEDTOOLBAR_H
-#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_STYLEDTOOLBAR_H
+#ifndef BORNAGAIN_GUI_COMMONWIDGETS_STYLEDTOOLBAR_H
+#define BORNAGAIN_GUI_COMMONWIDGETS_STYLEDTOOLBAR_H
#include <QToolBar>
@@ -32,4 +32,4 @@ protected:
void contextMenuEvent(QContextMenuEvent*);
};
-#endif // BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_STYLEDTOOLBAR_H
+#endif // BORNAGAIN_GUI_COMMONWIDGETS_STYLEDTOOLBAR_H
diff --git a/GUI/Views/CommonWidgets/UpdateTimer.cpp b/GUI/CommonWidgets/UpdateTimer.cpp
similarity index 93%
rename from GUI/Views/CommonWidgets/UpdateTimer.cpp
rename to GUI/CommonWidgets/UpdateTimer.cpp
index 4e7523ca8722189da54b1fbe0681d2fe71106ac9..993e466644c1971a02ca963c9b28ad439059203a 100644
--- a/GUI/Views/CommonWidgets/UpdateTimer.cpp
+++ b/GUI/CommonWidgets/UpdateTimer.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/UpdateTimer.cpp
+//! @file GUI/CommonWidgets/UpdateTimer.cpp
//! @brief Implements class UpdateTimer
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Views/CommonWidgets/UpdateTimer.h"
+#include "GUI/CommonWidgets/UpdateTimer.h"
#include <QTimer>
UpdateTimer::UpdateTimer(int timerInterval, QObject* parent)
diff --git a/GUI/Views/CommonWidgets/UpdateTimer.h b/GUI/CommonWidgets/UpdateTimer.h
similarity index 85%
rename from GUI/Views/CommonWidgets/UpdateTimer.h
rename to GUI/CommonWidgets/UpdateTimer.h
index 6f76c20ac5fdc42d7a849c2c7bca9c17520eca1a..3ec2c37eb76e0069bd93ae3b469f4d33c6856283 100644
--- a/GUI/Views/CommonWidgets/UpdateTimer.h
+++ b/GUI/CommonWidgets/UpdateTimer.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/CommonWidgets/UpdateTimer.h
+//! @file GUI/CommonWidgets/UpdateTimer.h
//! @brief Defines class UpdateTimer
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_UPDATETIMER_H
-#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_UPDATETIMER_H
+#ifndef BORNAGAIN_GUI_COMMONWIDGETS_UPDATETIMER_H
+#define BORNAGAIN_GUI_COMMONWIDGETS_UPDATETIMER_H
#include <QObject>
@@ -49,4 +49,4 @@ private:
QTimer* m_timer;
};
-#endif // BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_UPDATETIMER_H
+#endif // BORNAGAIN_GUI_COMMONWIDGETS_UPDATETIMER_H
diff --git a/GUI/Views/CommonWidgets/detailsbutton.cpp b/GUI/CommonWidgets/detailsbutton.cpp
similarity index 99%
rename from GUI/Views/CommonWidgets/detailsbutton.cpp
rename to GUI/CommonWidgets/detailsbutton.cpp
index 4848448d8769e4c82e1384ed1984b661507ea164..4da5a4c7f66dbf493cfc32913e248266fbc86067 100644
--- a/GUI/Views/CommonWidgets/detailsbutton.cpp
+++ b/GUI/CommonWidgets/detailsbutton.cpp
@@ -23,7 +23,7 @@
**
****************************************************************************/
-#include "GUI/Views/CommonWidgets/detailsbutton.h"
+#include "GUI/CommonWidgets/detailsbutton.h"
#include "GUI/utils/hostosinfo.h"
#include <QGraphicsOpacityEffect>
diff --git a/GUI/Views/CommonWidgets/detailsbutton.h b/GUI/CommonWidgets/detailsbutton.h
similarity index 92%
rename from GUI/Views/CommonWidgets/detailsbutton.h
rename to GUI/CommonWidgets/detailsbutton.h
index df43e7c65f2f7eba047656a9791027a9819b13b1..bd0a5785d386f4be33380b49a8a1b4d1a69aec5d 100644
--- a/GUI/Views/CommonWidgets/detailsbutton.h
+++ b/GUI/CommonWidgets/detailsbutton.h
@@ -23,8 +23,8 @@
**
****************************************************************************/
-#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_DETAILSBUTTON_H
-#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_DETAILSBUTTON_H
+#ifndef BORNAGAIN_GUI_COMMONWIDGETS_DETAILSBUTTON_H
+#define BORNAGAIN_GUI_COMMONWIDGETS_DETAILSBUTTON_H
#include <QAbstractButton>
@@ -81,4 +81,4 @@ private:
} // namespace GUI::Utils
-#endif // BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_DETAILSBUTTON_H
+#endif // BORNAGAIN_GUI_COMMONWIDGETS_DETAILSBUTTON_H
diff --git a/GUI/Views/CommonWidgets/detailswidget.cpp b/GUI/CommonWidgets/detailswidget.cpp
similarity index 99%
rename from GUI/Views/CommonWidgets/detailswidget.cpp
rename to GUI/CommonWidgets/detailswidget.cpp
index 0edab9bcd15efd486022ae881739291a38ff34c7..1400df00c5a2933d45bf5cd1c2a17c0348aff693 100644
--- a/GUI/Views/CommonWidgets/detailswidget.cpp
+++ b/GUI/CommonWidgets/detailswidget.cpp
@@ -23,8 +23,8 @@
**
****************************************************************************/
-#include "GUI/Views/CommonWidgets/detailswidget.h"
-#include "GUI/Views/CommonWidgets/detailsbutton.h"
+#include "GUI/CommonWidgets/detailswidget.h"
+#include "GUI/CommonWidgets/detailsbutton.h"
#include "GUI/utils/hostosinfo.h"
#include <QApplication>
diff --git a/GUI/Views/CommonWidgets/detailswidget.h b/GUI/CommonWidgets/detailswidget.h
similarity index 94%
rename from GUI/Views/CommonWidgets/detailswidget.h
rename to GUI/CommonWidgets/detailswidget.h
index 59dbf118da4d3da24a3e48a53d8a82b56ee900ee..c50eaaa0e783e7065defd6df7cd8dc0de36b8b46 100644
--- a/GUI/Views/CommonWidgets/detailswidget.h
+++ b/GUI/CommonWidgets/detailswidget.h
@@ -23,8 +23,8 @@
**
****************************************************************************/
-#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_DETAILSWIDGET_H
-#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_DETAILSWIDGET_H
+#ifndef BORNAGAIN_GUI_COMMONWIDGETS_DETAILSWIDGET_H
+#define BORNAGAIN_GUI_COMMONWIDGETS_DETAILSWIDGET_H
#include <QWidget>
@@ -95,4 +95,4 @@ private:
} // namespace GUI::Utils
-#endif // BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_DETAILSWIDGET_H
+#endif // BORNAGAIN_GUI_COMMONWIDGETS_DETAILSWIDGET_H
diff --git a/GUI/Views/InfoWidgets/CautionSign.cpp b/GUI/InfoWidgets/CautionSign.cpp
similarity index 95%
rename from GUI/Views/InfoWidgets/CautionSign.cpp
rename to GUI/InfoWidgets/CautionSign.cpp
index 4a9999b2069a880c2cdd88ed3d282068698014bb..0652c1c5d9331ffc90a23fb62e1b5eecbe49ba45 100644
--- a/GUI/Views/InfoWidgets/CautionSign.cpp
+++ b/GUI/InfoWidgets/CautionSign.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/InfoWidgets/CautionSign.cpp
+//! @file GUI/InfoWidgets/CautionSign.cpp
//! @brief Implements class CautionSign
//!
//! @homepage http://www.bornagainproject.org
@@ -12,9 +12,9 @@
//
// ************************************************************************************************
-#include "GUI/Views/InfoWidgets/CautionSign.h"
+#include "GUI/InfoWidgets/CautionSign.h"
#include "Base/Utils/Assert.h"
-#include "GUI/Views/InfoWidgets/CautionSignWidget.h"
+#include "GUI/InfoWidgets/CautionSignWidget.h"
#include <QAbstractScrollArea>
#include <QEvent>
#include <QScrollBar>
diff --git a/GUI/Views/InfoWidgets/CautionSign.h b/GUI/InfoWidgets/CautionSign.h
similarity index 85%
rename from GUI/Views/InfoWidgets/CautionSign.h
rename to GUI/InfoWidgets/CautionSign.h
index 5b73be31729f0002944c877c7bde19650134eee8..77ffe176d5c949086e870eb540bb34c64470af09 100644
--- a/GUI/Views/InfoWidgets/CautionSign.h
+++ b/GUI/InfoWidgets/CautionSign.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/InfoWidgets/CautionSign.h
+//! @file GUI/InfoWidgets/CautionSign.h
//! @brief Defines class CautionSign
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_INFOWIDGETS_CAUTIONSIGN_H
-#define BORNAGAIN_GUI_VIEWS_INFOWIDGETS_CAUTIONSIGN_H
+#ifndef BORNAGAIN_GUI_INFOWIDGETS_CAUTIONSIGN_H
+#define BORNAGAIN_GUI_INFOWIDGETS_CAUTIONSIGN_H
#include <QObject>
@@ -50,4 +50,4 @@ private:
bool m_clear_just_had_happened;
};
-#endif // BORNAGAIN_GUI_VIEWS_INFOWIDGETS_CAUTIONSIGN_H
+#endif // BORNAGAIN_GUI_INFOWIDGETS_CAUTIONSIGN_H
diff --git a/GUI/Views/InfoWidgets/CautionSignWidget.cpp b/GUI/InfoWidgets/CautionSignWidget.cpp
similarity index 93%
rename from GUI/Views/InfoWidgets/CautionSignWidget.cpp
rename to GUI/InfoWidgets/CautionSignWidget.cpp
index fdd9db1f746a3d53335d6508d97cc9c615d7d75d..6b071e9e23b41953c8c0de0cdce349fdd20c3b1c 100644
--- a/GUI/Views/InfoWidgets/CautionSignWidget.cpp
+++ b/GUI/InfoWidgets/CautionSignWidget.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/InfoWidgets/CautionSignWidget.cpp
+//! @file GUI/InfoWidgets/CautionSignWidget.cpp
//! @brief Implements class CautionSignWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Views/InfoWidgets/CautionSignWidget.h"
+#include "GUI/InfoWidgets/CautionSignWidget.h"
#include <QMessageBox>
#include <QPainter>
#include <QRect>
diff --git a/GUI/Views/InfoWidgets/CautionSignWidget.h b/GUI/InfoWidgets/CautionSignWidget.h
similarity index 83%
rename from GUI/Views/InfoWidgets/CautionSignWidget.h
rename to GUI/InfoWidgets/CautionSignWidget.h
index 11041d17fa5bdc38933bbdf03086f3aea219f504..450f52b633ecbaf487d228d5ea4ed231e8ba8a99 100644
--- a/GUI/Views/InfoWidgets/CautionSignWidget.h
+++ b/GUI/InfoWidgets/CautionSignWidget.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/InfoWidgets/CautionSignWidget.h
+//! @file GUI/InfoWidgets/CautionSignWidget.h
//! @brief Defines class CautionSignWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_INFOWIDGETS_CAUTIONSIGNWIDGET_H
-#define BORNAGAIN_GUI_VIEWS_INFOWIDGETS_CAUTIONSIGNWIDGET_H
+#ifndef BORNAGAIN_GUI_INFOWIDGETS_CAUTIONSIGNWIDGET_H
+#define BORNAGAIN_GUI_INFOWIDGETS_CAUTIONSIGNWIDGET_H
#include <QPixmap>
#include <QString>
@@ -40,4 +40,4 @@ private:
QString m_caution_message;
};
-#endif // BORNAGAIN_GUI_VIEWS_INFOWIDGETS_CAUTIONSIGNWIDGET_H
+#endif // BORNAGAIN_GUI_INFOWIDGETS_CAUTIONSIGNWIDGET_H
diff --git a/GUI/Views/InfoWidgets/ComboSelectorDialog.cpp b/GUI/InfoWidgets/ComboSelectorDialog.cpp
similarity index 96%
rename from GUI/Views/InfoWidgets/ComboSelectorDialog.cpp
rename to GUI/InfoWidgets/ComboSelectorDialog.cpp
index 0716a946394ad1e52b97977b19f95e7aaee4a1a7..5635e6571800eb17c1b20591b2b5699ce5911621 100644
--- a/GUI/Views/InfoWidgets/ComboSelectorDialog.cpp
+++ b/GUI/InfoWidgets/ComboSelectorDialog.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/InfoWidgets/ComboSelectorDialog.cpp
+//! @file GUI/InfoWidgets/ComboSelectorDialog.cpp
//! @brief Implements class ComboSelectorDialog
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Views/InfoWidgets/ComboSelectorDialog.h"
+#include "GUI/InfoWidgets/ComboSelectorDialog.h"
#include <QApplication>
#include <QComboBox>
#include <QLabel>
diff --git a/GUI/Views/InfoWidgets/ComboSelectorDialog.h b/GUI/InfoWidgets/ComboSelectorDialog.h
similarity index 83%
rename from GUI/Views/InfoWidgets/ComboSelectorDialog.h
rename to GUI/InfoWidgets/ComboSelectorDialog.h
index c3a6d15abce4b57dca2cf55ad54f4a84eb725ff2..6412cee18759a6e34794bed09ac9b85639cf17b3 100644
--- a/GUI/Views/InfoWidgets/ComboSelectorDialog.h
+++ b/GUI/InfoWidgets/ComboSelectorDialog.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/InfoWidgets/ComboSelectorDialog.h
+//! @file GUI/InfoWidgets/ComboSelectorDialog.h
//! @brief Defines class ComboSelectorDialog
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_INFOWIDGETS_COMBOSELECTORDIALOG_H
-#define BORNAGAIN_GUI_VIEWS_INFOWIDGETS_COMBOSELECTORDIALOG_H
+#ifndef BORNAGAIN_GUI_INFOWIDGETS_COMBOSELECTORDIALOG_H
+#define BORNAGAIN_GUI_INFOWIDGETS_COMBOSELECTORDIALOG_H
#include <QDialog>
#include <QString>
@@ -45,4 +45,4 @@ private:
QLabel* m_bottomLabel;
};
-#endif // BORNAGAIN_GUI_VIEWS_INFOWIDGETS_COMBOSELECTORDIALOG_H
+#endif // BORNAGAIN_GUI_INFOWIDGETS_COMBOSELECTORDIALOG_H
diff --git a/GUI/Views/InfoWidgets/DetailedMessageBox.cpp b/GUI/InfoWidgets/DetailedMessageBox.cpp
similarity index 96%
rename from GUI/Views/InfoWidgets/DetailedMessageBox.cpp
rename to GUI/InfoWidgets/DetailedMessageBox.cpp
index 03a75b01f4a4e58f5b18d191df24c8fce59e3212..57b8d7997db733db9f9d8bcd6b59cdade11f51a4 100644
--- a/GUI/Views/InfoWidgets/DetailedMessageBox.cpp
+++ b/GUI/InfoWidgets/DetailedMessageBox.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/InfoWidgets/DetailedMessageBox.cpp
+//! @file GUI/InfoWidgets/DetailedMessageBox.cpp
//! @brief Implements class DetailedMessageBox
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Views/InfoWidgets/DetailedMessageBox.h"
+#include "GUI/InfoWidgets/DetailedMessageBox.h"
#include <QApplication>
#include <QLabel>
#include <QMessageBox>
diff --git a/GUI/Views/InfoWidgets/DetailedMessageBox.h b/GUI/InfoWidgets/DetailedMessageBox.h
similarity index 84%
rename from GUI/Views/InfoWidgets/DetailedMessageBox.h
rename to GUI/InfoWidgets/DetailedMessageBox.h
index 7a727be76cdfaad05812a66f715eb259662a6ad2..8088fdaded5f26918e67d82a42fa8eb64b1bd268 100644
--- a/GUI/Views/InfoWidgets/DetailedMessageBox.h
+++ b/GUI/InfoWidgets/DetailedMessageBox.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/InfoWidgets/DetailedMessageBox.h
+//! @file GUI/InfoWidgets/DetailedMessageBox.h
//! @brief Defines class DetailedMessageBox
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_INFOWIDGETS_DETAILEDMESSAGEBOX_H
-#define BORNAGAIN_GUI_VIEWS_INFOWIDGETS_DETAILEDMESSAGEBOX_H
+#ifndef BORNAGAIN_GUI_INFOWIDGETS_DETAILEDMESSAGEBOX_H
+#define BORNAGAIN_GUI_INFOWIDGETS_DETAILEDMESSAGEBOX_H
#include <QDialog>
#include <QString>
@@ -43,4 +43,4 @@ private:
QTextEdit* m_textEdit;
};
-#endif // BORNAGAIN_GUI_VIEWS_INFOWIDGETS_DETAILEDMESSAGEBOX_H
+#endif // BORNAGAIN_GUI_INFOWIDGETS_DETAILEDMESSAGEBOX_H
diff --git a/GUI/Views/InfoWidgets/OverlayLabelController.cpp b/GUI/InfoWidgets/OverlayLabelController.cpp
similarity index 91%
rename from GUI/Views/InfoWidgets/OverlayLabelController.cpp
rename to GUI/InfoWidgets/OverlayLabelController.cpp
index 834ccccabd051d775b214e5bb4344581563b8b32..7d2561c360efff69850eab8ef9cc57f64343d083 100644
--- a/GUI/Views/InfoWidgets/OverlayLabelController.cpp
+++ b/GUI/InfoWidgets/OverlayLabelController.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/InfoWidgets/OverlayLabelController.cpp
+//! @file GUI/InfoWidgets/OverlayLabelController.cpp
//! @brief Implements class OverlayLabelController
//!
//! @homepage http://www.bornagainproject.org
@@ -12,9 +12,9 @@
//
// ************************************************************************************************
-#include "GUI/Views/InfoWidgets/OverlayLabelController.h"
+#include "GUI/InfoWidgets/OverlayLabelController.h"
#include "Base/Utils/Assert.h"
-#include "GUI/Views/InfoWidgets/OverlayLabelWidget.h"
+#include "GUI/InfoWidgets/OverlayLabelWidget.h"
#include <QAbstractScrollArea>
#include <QEvent>
#include <QRect>
diff --git a/GUI/Views/InfoWidgets/OverlayLabelController.h b/GUI/InfoWidgets/OverlayLabelController.h
similarity index 82%
rename from GUI/Views/InfoWidgets/OverlayLabelController.h
rename to GUI/InfoWidgets/OverlayLabelController.h
index effc2871c19889274a21c636089674be4ea9bea0..d4666b60fa4123709f3e3057557c002f973455e8 100644
--- a/GUI/Views/InfoWidgets/OverlayLabelController.h
+++ b/GUI/InfoWidgets/OverlayLabelController.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/InfoWidgets/OverlayLabelController.h
+//! @file GUI/InfoWidgets/OverlayLabelController.h
//! @brief Defines class OverlayLabelController
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_INFOWIDGETS_OVERLAYLABELCONTROLLER_H
-#define BORNAGAIN_GUI_VIEWS_INFOWIDGETS_OVERLAYLABELCONTROLLER_H
+#ifndef BORNAGAIN_GUI_INFOWIDGETS_OVERLAYLABELCONTROLLER_H
+#define BORNAGAIN_GUI_INFOWIDGETS_OVERLAYLABELCONTROLLER_H
#include <QObject>
#include <QString>
@@ -46,4 +46,4 @@ private:
QString m_text;
};
-#endif // BORNAGAIN_GUI_VIEWS_INFOWIDGETS_OVERLAYLABELCONTROLLER_H
+#endif // BORNAGAIN_GUI_INFOWIDGETS_OVERLAYLABELCONTROLLER_H
diff --git a/GUI/Views/InfoWidgets/OverlayLabelWidget.cpp b/GUI/InfoWidgets/OverlayLabelWidget.cpp
similarity index 87%
rename from GUI/Views/InfoWidgets/OverlayLabelWidget.cpp
rename to GUI/InfoWidgets/OverlayLabelWidget.cpp
index 8ae83b8bb3b8fb5bb83c5a2839fde87d53f211e4..5c68537ed6c67c53b36b9d20b54393a4c989984d 100644
--- a/GUI/Views/InfoWidgets/OverlayLabelWidget.cpp
+++ b/GUI/InfoWidgets/OverlayLabelWidget.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/InfoWidgets/OverlayLabelWidget.cpp
+//! @file GUI/InfoWidgets/OverlayLabelWidget.cpp
//! @brief Implements class OverlayLabelWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,9 +12,9 @@
//
// ************************************************************************************************
-#include "GUI/Views/InfoWidgets/OverlayLabelWidget.h"
-#include "GUI/Views/CommonWidgets/DesignerHelper.h"
-#include "GUI/Views/CommonWidgets/StyleUtils.h"
+#include "GUI/InfoWidgets/OverlayLabelWidget.h"
+#include "GUI/CommonWidgets/DesignerHelper.h"
+#include "GUI/CommonWidgets/StyleUtils.h"
#include <QColor>
#include <QFont>
#include <QPainter>
diff --git a/GUI/Views/InfoWidgets/OverlayLabelWidget.h b/GUI/InfoWidgets/OverlayLabelWidget.h
similarity index 82%
rename from GUI/Views/InfoWidgets/OverlayLabelWidget.h
rename to GUI/InfoWidgets/OverlayLabelWidget.h
index 587fe950414e549b8e3824f5ef5bb5351beb1b57..160e333969c0097d493b514cecb93b0f3d5b6e39 100644
--- a/GUI/Views/InfoWidgets/OverlayLabelWidget.h
+++ b/GUI/InfoWidgets/OverlayLabelWidget.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/InfoWidgets/OverlayLabelWidget.h
+//! @file GUI/InfoWidgets/OverlayLabelWidget.h
//! @brief Defines class OverlayLabelWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_INFOWIDGETS_OVERLAYLABELWIDGET_H
-#define BORNAGAIN_GUI_VIEWS_INFOWIDGETS_OVERLAYLABELWIDGET_H
+#ifndef BORNAGAIN_GUI_INFOWIDGETS_OVERLAYLABELWIDGET_H
+#define BORNAGAIN_GUI_INFOWIDGETS_OVERLAYLABELWIDGET_H
#include <QRect>
#include <QString>
@@ -40,4 +40,4 @@ private:
QRect m_bounding_rect;
};
-#endif // BORNAGAIN_GUI_VIEWS_INFOWIDGETS_OVERLAYLABELWIDGET_H
+#endif // BORNAGAIN_GUI_INFOWIDGETS_OVERLAYLABELWIDGET_H
diff --git a/GUI/Views/InfoWidgets/ProjectLoadProblemDialog.cpp b/GUI/InfoWidgets/ProjectLoadProblemDialog.cpp
similarity index 96%
rename from GUI/Views/InfoWidgets/ProjectLoadProblemDialog.cpp
rename to GUI/InfoWidgets/ProjectLoadProblemDialog.cpp
index fbfbb1997c6da3fed22838f7977da2f6701ad27f..51bc90204d464b9b2fb2a2136c24ee60eaf1d4d6 100644
--- a/GUI/Views/InfoWidgets/ProjectLoadProblemDialog.cpp
+++ b/GUI/InfoWidgets/ProjectLoadProblemDialog.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/InfoWidgets/ProjectLoadProblemDialog.cpp
+//! @file GUI/InfoWidgets/ProjectLoadProblemDialog.cpp
//! @brief Implements class ProjectLoadProblemDialog
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#include "GUI/Views/InfoWidgets/ProjectLoadProblemDialog.h"
-#include "GUI/Views/CommonWidgets/DesignerHelper.h"
+#include "GUI/InfoWidgets/ProjectLoadProblemDialog.h"
+#include "GUI/CommonWidgets/DesignerHelper.h"
#include "GUI/utils/Helpers.h"
#include <QBoxLayout>
#include <QGridLayout>
diff --git a/GUI/Views/InfoWidgets/ProjectLoadProblemDialog.h b/GUI/InfoWidgets/ProjectLoadProblemDialog.h
similarity index 80%
rename from GUI/Views/InfoWidgets/ProjectLoadProblemDialog.h
rename to GUI/InfoWidgets/ProjectLoadProblemDialog.h
index a9bb1b874249ed7dba0a1ab92b286ea9eaaabd1b..e8131bc636ec6688c4a2c23dab3f8a8e0cc0bfbb 100644
--- a/GUI/Views/InfoWidgets/ProjectLoadProblemDialog.h
+++ b/GUI/InfoWidgets/ProjectLoadProblemDialog.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/InfoWidgets/ProjectLoadProblemDialog.h
+//! @file GUI/InfoWidgets/ProjectLoadProblemDialog.h
//! @brief Defines class ProjectLoadProblemDialog
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_INFOWIDGETS_PROJECTLOADPROBLEMDIALOG_H
-#define BORNAGAIN_GUI_VIEWS_INFOWIDGETS_PROJECTLOADPROBLEMDIALOG_H
+#ifndef BORNAGAIN_GUI_INFOWIDGETS_PROJECTLOADPROBLEMDIALOG_H
+#define BORNAGAIN_GUI_INFOWIDGETS_PROJECTLOADPROBLEMDIALOG_H
#include <QDialog>
#include <QString>
@@ -34,4 +34,4 @@ private:
QString m_projectDocumentVersion;
};
-#endif // BORNAGAIN_GUI_VIEWS_INFOWIDGETS_PROJECTLOADPROBLEMDIALOG_H
+#endif // BORNAGAIN_GUI_INFOWIDGETS_PROJECTLOADPROBLEMDIALOG_H
diff --git a/GUI/Views/InfoWidgets/PythonSyntaxHighlighter.cpp b/GUI/InfoWidgets/PythonSyntaxHighlighter.cpp
similarity index 98%
rename from GUI/Views/InfoWidgets/PythonSyntaxHighlighter.cpp
rename to GUI/InfoWidgets/PythonSyntaxHighlighter.cpp
index ae82d0938c054534201974a17c59dbe7193003cd..6f871a4b0e0ab91119b76798ec7b896a4571cd15 100644
--- a/GUI/Views/InfoWidgets/PythonSyntaxHighlighter.cpp
+++ b/GUI/InfoWidgets/PythonSyntaxHighlighter.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/InfoWidgets/PythonSyntaxHighlighter.cpp
+//! @file GUI/InfoWidgets/PythonSyntaxHighlighter.cpp
//! @brief Defines class PythonSyntaxHighlighter
//!
//! @homepage http://www.bornagainproject.org
@@ -35,7 +35,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OU
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-#include "GUI/Views/InfoWidgets/PythonSyntaxHighlighter.h"
+#include "GUI/InfoWidgets/PythonSyntaxHighlighter.h"
PythonSyntaxHighlighter::PythonSyntaxHighlighter(QTextDocument* parent) : QSyntaxHighlighter(parent)
{
diff --git a/GUI/Views/InfoWidgets/PythonSyntaxHighlighter.h b/GUI/InfoWidgets/PythonSyntaxHighlighter.h
similarity index 92%
rename from GUI/Views/InfoWidgets/PythonSyntaxHighlighter.h
rename to GUI/InfoWidgets/PythonSyntaxHighlighter.h
index 17c44f5459c3aef4a417522b4348a7c86190caf8..18c2fee7761147b4337b12abeebee969f0449647 100644
--- a/GUI/Views/InfoWidgets/PythonSyntaxHighlighter.h
+++ b/GUI/InfoWidgets/PythonSyntaxHighlighter.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/InfoWidgets/PythonSyntaxHighlighter.h
+//! @file GUI/InfoWidgets/PythonSyntaxHighlighter.h
//! @brief Defines class PythonSyntaxHighlighter
//!
//! @homepage http://www.bornagainproject.org
@@ -35,8 +35,8 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OU
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-#ifndef BORNAGAIN_GUI_VIEWS_INFOWIDGETS_PYTHONSYNTAXHIGHLIGHTER_H
-#define BORNAGAIN_GUI_VIEWS_INFOWIDGETS_PYTHONSYNTAXHIGHLIGHTER_H
+#ifndef BORNAGAIN_GUI_INFOWIDGETS_PYTHONSYNTAXHIGHLIGHTER_H
+#define BORNAGAIN_GUI_INFOWIDGETS_PYTHONSYNTAXHIGHLIGHTER_H
#include <QSyntaxHighlighter>
@@ -86,4 +86,4 @@ private:
QRegExp triDoubleQuote;
};
-#endif // BORNAGAIN_GUI_VIEWS_INFOWIDGETS_PYTHONSYNTAXHIGHLIGHTER_H
+#endif // BORNAGAIN_GUI_INFOWIDGETS_PYTHONSYNTAXHIGHLIGHTER_H
diff --git a/GUI/Models/RealDataItem.cpp b/GUI/Models/RealDataItem.cpp
index f3c984fbeba878c00f8f1491a73c8e253a30bd15..a8db72166326b0c43b5f15b8250a46b4036059f8 100644
--- a/GUI/Models/RealDataItem.cpp
+++ b/GUI/Models/RealDataItem.cpp
@@ -30,7 +30,7 @@
#include "GUI/Models/ProjectionItems.h"
#include "GUI/Models/RealDataModel.h"
#include "GUI/Models/SpecularDataItem.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Project/projectmanager.h"
#include "GUI/utils/DeserializationException.h"
#include <QtCore/QXmlStreamReader>
#include <QtCore/QXmlStreamWriter>
diff --git a/GUI/Models/SampleListModel.cpp b/GUI/Models/SampleListModel.cpp
index a1f048a4f3d961834e9fd3797e9d172ee49b03e4..d341c1497021a94608005f4a6c43ba7b56730f01 100644
--- a/GUI/Models/SampleListModel.cpp
+++ b/GUI/Models/SampleListModel.cpp
@@ -18,7 +18,7 @@
#include "GUI/Models/ModelUtils.h"
#include "GUI/Models/MultiLayerItem.h"
#include "GUI/Models/SampleModel.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Project/projectmanager.h"
#include <QApplication>
#include <QFontMetrics>
#include <QIcon>
diff --git a/GUI/mainwindow/ProjectUtils.cpp b/GUI/Project/ProjectUtils.cpp
similarity index 91%
rename from GUI/mainwindow/ProjectUtils.cpp
rename to GUI/Project/ProjectUtils.cpp
index 06e7d9ae2dbc4bb88bf42ad3b8ceef1178d9f234..b57f1c80d000343e0e9c88669af2b65d5f1fe94b 100644
--- a/GUI/mainwindow/ProjectUtils.cpp
+++ b/GUI/Project/ProjectUtils.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/mainwindow/ProjectUtils.cpp
+//! @file GUI/Project/ProjectUtils.cpp
//! @brief Implements ProjectUtils namespace
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#include "GUI/mainwindow/ProjectUtils.h"
-#include "GUI/mainwindow/projectdocument.h"
+#include "GUI/Project/ProjectUtils.h"
+#include "GUI/Project/projectdocument.h"
#include <QFileInfo>
QString GUI::Project::Utils::projectName(const QString& projectFileName)
diff --git a/GUI/mainwindow/ProjectUtils.h b/GUI/Project/ProjectUtils.h
similarity index 89%
rename from GUI/mainwindow/ProjectUtils.h
rename to GUI/Project/ProjectUtils.h
index 41fff8d50c6c0cda3f3188919dad17d7eeb0cfaa..1ce08899cccc511aac3f9c39a05597222015820a 100644
--- a/GUI/mainwindow/ProjectUtils.h
+++ b/GUI/Project/ProjectUtils.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/mainwindow/ProjectUtils.h
+//! @file GUI/Project/ProjectUtils.h
//! @brief Defines namespace GUI::Project::Utils
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MAINWINDOW_PROJECTUTILS_H
-#define BORNAGAIN_GUI_MAINWINDOW_PROJECTUTILS_H
+#ifndef BORNAGAIN_GUI_PROJECT_PROJECTUTILS_H
+#define BORNAGAIN_GUI_PROJECT_PROJECTUTILS_H
#include <QString>
@@ -44,4 +44,4 @@ bool hasAutosavedData(const QString& projectFileName);
} // namespace GUI::Project::Utils
-#endif // BORNAGAIN_GUI_MAINWINDOW_PROJECTUTILS_H
+#endif // BORNAGAIN_GUI_PROJECT_PROJECTUTILS_H
diff --git a/GUI/mainwindow/projectdocument.cpp b/GUI/Project/projectdocument.cpp
similarity index 98%
rename from GUI/mainwindow/projectdocument.cpp
rename to GUI/Project/projectdocument.cpp
index fe4860d4371588a802bdb424652f070fc37d1ce7..79029dc0704f512ded5deeb1b8abb6df04336a6a 100644
--- a/GUI/mainwindow/projectdocument.cpp
+++ b/GUI/Project/projectdocument.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/mainwindow/projectdocument.cpp
+//! @file GUI/Project/projectdocument.cpp
//! @brief Implements class ProjectDocument
//!
//! @homepage http://www.bornagainproject.org
@@ -12,12 +12,12 @@
//
// ************************************************************************************************
-#include "GUI/mainwindow/projectdocument.h"
+#include "GUI/Project/projectdocument.h"
#include "GUI/Models/DocumentModel.h"
#include "GUI/Models/Error.h"
#include "GUI/Models/JobModel.h"
#include "GUI/mainwindow/OutputDataIOService.h"
-#include "GUI/mainwindow/ProjectUtils.h"
+#include "GUI/Project/ProjectUtils.h"
#include "GUI/utils/Helpers.h"
#include "GUI/utils/MessageService.h"
#include <QDir>
diff --git a/GUI/mainwindow/projectdocument.h b/GUI/Project/projectdocument.h
similarity index 95%
rename from GUI/mainwindow/projectdocument.h
rename to GUI/Project/projectdocument.h
index 49f166ac02e7513d366e67da1fa984fee9a5f58e..05ed252405a62e9b1eabb01add9a4ceadd2e85b8 100644
--- a/GUI/mainwindow/projectdocument.h
+++ b/GUI/Project/projectdocument.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/mainwindow/projectdocument.h
+//! @file GUI/Project/projectdocument.h
//! @brief Defines class ProjectDocument
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MAINWINDOW_PROJECTDOCUMENT_H
-#define BORNAGAIN_GUI_MAINWINDOW_PROJECTDOCUMENT_H
+#ifndef BORNAGAIN_GUI_PROJECT_PROJECTDOCUMENT_H
+#define BORNAGAIN_GUI_PROJECT_PROJECTDOCUMENT_H
#include "GUI/Models/ApplicationModels.h"
#include "GUI/mainwindow/LinkInstrumentManager.h"
@@ -140,4 +140,4 @@ inline ProjectDocument::Functionalities toFunctionalities(const QVariant& v)
v.value<ProjectDocument::Functionalities::Int>());
}
-#endif // BORNAGAIN_GUI_MAINWINDOW_PROJECTDOCUMENT_H
+#endif // BORNAGAIN_GUI_PROJECT_PROJECTDOCUMENT_H
diff --git a/GUI/mainwindow/projectmanager.cpp b/GUI/Project/projectmanager.cpp
similarity index 97%
rename from GUI/mainwindow/projectmanager.cpp
rename to GUI/Project/projectmanager.cpp
index e65daa728296e5c9a35d36b91c5d0920917a06c9..0f564ee19f060df09a181560e6db56c41193da9d 100644
--- a/GUI/mainwindow/projectmanager.cpp
+++ b/GUI/Project/projectmanager.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/mainwindow/projectmanager.cpp
+//! @file GUI/Project/projectmanager.cpp
//! @brief Implements class ProjectManager
//!
//! @homepage http://www.bornagainproject.org
@@ -12,19 +12,19 @@
//
// ************************************************************************************************
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Project/projectmanager.h"
#include "Base/Utils/Assert.h"
#include "GUI/Application/Application.h"
#include "GUI/Models/ApplicationModels.h"
#include "GUI/Models/Error.h"
-#include "GUI/Views/CommonWidgets/GUIHelpers.h"
-#include "GUI/Views/InfoWidgets/ProjectLoadProblemDialog.h"
-#include "GUI/Views/Tools/mainwindow_constants.h"
-#include "GUI/mainwindow/ProjectUtils.h"
+#include "GUI/CommonWidgets/GUIHelpers.h"
+#include "GUI/InfoWidgets/ProjectLoadProblemDialog.h"
+#include "GUI/utils/mainwindow_constants.h"
+#include "GUI/Project/ProjectUtils.h"
#include "GUI/mainwindow/SaveService.h"
#include "GUI/mainwindow/mainwindow.h"
#include "GUI/mainwindow/newprojectdialog.h"
-#include "GUI/mainwindow/projectdocument.h"
+#include "GUI/Project/projectdocument.h"
#include "GUI/utils/MessageService.h"
#include <QApplication>
#include <QDateTime>
diff --git a/GUI/mainwindow/projectmanager.h b/GUI/Project/projectmanager.h
similarity index 92%
rename from GUI/mainwindow/projectmanager.h
rename to GUI/Project/projectmanager.h
index df39b430e17ed2088eba1624a1786e4e0aceae8d..5d05aa36ae18a948e14b6135cd663cb8a76534f3 100644
--- a/GUI/mainwindow/projectmanager.h
+++ b/GUI/Project/projectmanager.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/mainwindow/projectmanager.h
+//! @file GUI/Project/projectmanager.h
//! @brief Defines class ProjectManager
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MAINWINDOW_PROJECTMANAGER_H
-#define BORNAGAIN_GUI_MAINWINDOW_PROJECTMANAGER_H
+#ifndef BORNAGAIN_GUI_PROJECT_PROJECTMANAGER_H
+#define BORNAGAIN_GUI_PROJECT_PROJECTMANAGER_H
-#include "GUI/mainwindow/projectdocument.h"
+#include "GUI/Project/projectdocument.h"
#include <QObject>
#include <QStringList>
@@ -103,4 +103,4 @@ private:
static ProjectManager* s_instance;
};
-#endif // BORNAGAIN_GUI_MAINWINDOW_PROJECTMANAGER_H
+#endif // BORNAGAIN_GUI_PROJECT_PROJECTMANAGER_H
diff --git a/GUI/Views/FitWidgets/FitActivityPanel.cpp b/GUI/Views/FitWidgets/FitActivityPanel.cpp
index e79d7cf68a6b6be1c62432bd48d414162e28eaf3..e5a7b12ac4f52fb569be2428859f295dfc820864 100644
--- a/GUI/Views/FitWidgets/FitActivityPanel.cpp
+++ b/GUI/Views/FitWidgets/FitActivityPanel.cpp
@@ -20,7 +20,7 @@
#include "GUI/Views/FitWidgets/FitSessionWidget.h"
#include "GUI/Views/FitWidgets/JobRealTimeWidget.h"
#include "GUI/Views/FitWidgets/RunFitControlWidget.h"
-#include "GUI/Views/Tools/mainwindow_constants.h"
+#include "GUI/utils/mainwindow_constants.h"
#include <QLabel>
#include <QPushButton>
#include <QStackedWidget>
diff --git a/GUI/Views/FitWidgets/FitParameterWidget.cpp b/GUI/Views/FitWidgets/FitParameterWidget.cpp
index 5bf4bb4d792de6dae83d14deca36c540f3958bf9..605c21138d54d9478a1f94cdcd308e1cb2689e54 100644
--- a/GUI/Views/FitWidgets/FitParameterWidget.cpp
+++ b/GUI/Views/FitWidgets/FitParameterWidget.cpp
@@ -22,9 +22,9 @@
#include "GUI/Models/JobModel.h"
#include "GUI/Models/ParameterTreeItems.h"
#include "GUI/Views/FitWidgets/ParameterTuningWidget.h"
-#include "GUI/Views/InfoWidgets/OverlayLabelController.h"
+#include "GUI/InfoWidgets/OverlayLabelController.h"
#include "GUI/Views/SessionModelDelegate.h"
-#include "GUI/Views/Tools/mainwindow_constants.h"
+#include "GUI/utils/mainwindow_constants.h"
#include "GUI/utils/CustomEventFilters.h"
#include <QAction>
#include <QMenu>
diff --git a/GUI/Views/FitWidgets/FitParameterWidget.h b/GUI/Views/FitWidgets/FitParameterWidget.h
index da374b6d6ce787239edc4de758a46316c3ab060a..41f9480dd9c128b17a0e85361bf45711e919e06f 100644
--- a/GUI/Views/FitWidgets/FitParameterWidget.h
+++ b/GUI/Views/FitWidgets/FitParameterWidget.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_FITWIDGETS_FITPARAMETERWIDGET_H
#define BORNAGAIN_GUI_VIEWS_FITWIDGETS_FITPARAMETERWIDGET_H
-#include "GUI/Views/CommonWidgets/SessionItemWidget.h"
+#include "GUI/CommonWidgets/SessionItemWidget.h"
#include <memory>
class JobItem;
diff --git a/GUI/Views/FitWidgets/FitSessionWidget.cpp b/GUI/Views/FitWidgets/FitSessionWidget.cpp
index ac9229333360850f9b3965dbf4e1df512682912b..34ba0eff562ef586302efb0cc71fc806dd91c3d7 100644
--- a/GUI/Views/FitWidgets/FitSessionWidget.cpp
+++ b/GUI/Views/FitWidgets/FitSessionWidget.cpp
@@ -19,7 +19,7 @@
#include "GUI/Views/FitWidgets/FitSessionController.h"
#include "GUI/Views/FitWidgets/MinimizerSettingsWidget.h"
#include "GUI/Views/FitWidgets/RunFitControlWidget.h"
-#include "GUI/Views/Tools/mainwindow_constants.h"
+#include "GUI/utils/mainwindow_constants.h"
#include <QTabWidget>
#include <QVBoxLayout>
diff --git a/GUI/Views/FitWidgets/JobRealTimeToolBar.h b/GUI/Views/FitWidgets/JobRealTimeToolBar.h
index 14c93f65caa32a65cee5a09932d1dfb7930f56f2..792f1519a988980530bfa9f23f0daecf4875e15c 100644
--- a/GUI/Views/FitWidgets/JobRealTimeToolBar.h
+++ b/GUI/Views/FitWidgets/JobRealTimeToolBar.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_FITWIDGETS_JOBREALTIMETOOLBAR_H
#define BORNAGAIN_GUI_VIEWS_FITWIDGETS_JOBREALTIMETOOLBAR_H
-#include "GUI/Views/CommonWidgets/StyledToolBar.h"
+#include "GUI/CommonWidgets/StyledToolBar.h"
class QToolButton;
diff --git a/GUI/Views/FitWidgets/JobRealTimeWidget.cpp b/GUI/Views/FitWidgets/JobRealTimeWidget.cpp
index 4235ff801c11bfc5a112a9d58e52a4ff810f8b3b..e1d8dac28b8f5e1952659b27529e7744c18b5514 100644
--- a/GUI/Views/FitWidgets/JobRealTimeWidget.cpp
+++ b/GUI/Views/FitWidgets/JobRealTimeWidget.cpp
@@ -16,7 +16,7 @@
#include "GUI/Models/JobItem.h"
#include "GUI/Models/JobModel.h"
#include "GUI/Views/FitWidgets/ParameterTuningWidget.h"
-#include "GUI/Views/Tools/mainwindow_constants.h"
+#include "GUI/utils/mainwindow_constants.h"
#include <QVBoxLayout>
namespace {
diff --git a/GUI/Views/FitWidgets/JobRealTimeWidget.h b/GUI/Views/FitWidgets/JobRealTimeWidget.h
index f36478aac679714d12088d20f1011e5addbdee77..d405015bb5ef9cf27bddb105a456e7ab80af9ced 100644
--- a/GUI/Views/FitWidgets/JobRealTimeWidget.h
+++ b/GUI/Views/FitWidgets/JobRealTimeWidget.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_FITWIDGETS_JOBREALTIMEWIDGET_H
#define BORNAGAIN_GUI_VIEWS_FITWIDGETS_JOBREALTIMEWIDGET_H
-#include "GUI/Views/CommonWidgets/ItemStackPresenter.h"
+#include "GUI/CommonWidgets/ItemStackPresenter.h"
class JobModel;
class JobItem;
diff --git a/GUI/Views/FitWidgets/ParameterTuningDelegate.cpp b/GUI/Views/FitWidgets/ParameterTuningDelegate.cpp
index 4d9525f612ff532b449875c5386781d68d637ace..4bda538e259434a48646e253ceaf434f610e3f0e 100644
--- a/GUI/Views/FitWidgets/ParameterTuningDelegate.cpp
+++ b/GUI/Views/FitWidgets/ParameterTuningDelegate.cpp
@@ -18,7 +18,7 @@
#include "GUI/Models/ParameterTuningModel.h"
#include "GUI/Models/SessionItemUtils.h"
#include "GUI/Models/SessionModel.h"
-#include "GUI/Views/CommonWidgets/ScientificSpinBox.h"
+#include "GUI/CommonWidgets/ScientificSpinBox.h"
#include <QAbstractItemModel>
#include <QApplication>
#include <QHBoxLayout>
diff --git a/GUI/Views/FitWidgets/ParameterTuningWidget.cpp b/GUI/Views/FitWidgets/ParameterTuningWidget.cpp
index e3eedde0fe90ecec0fe1b100d323e524506026b6..38dcf05deeff37192a6f73107a08166feba66707 100644
--- a/GUI/Views/FitWidgets/ParameterTuningWidget.cpp
+++ b/GUI/Views/FitWidgets/ParameterTuningWidget.cpp
@@ -22,7 +22,7 @@
#include "GUI/Views/FitWidgets/JobRealTimeToolBar.h"
#include "GUI/Views/FitWidgets/ParameterTuningDelegate.h"
#include "GUI/Views/FitWidgets/SliderSettingsWidget.h"
-#include "GUI/Views/InfoWidgets/CautionSign.h"
+#include "GUI/InfoWidgets/CautionSign.h"
#include <QTreeView>
#include <QVBoxLayout>
diff --git a/GUI/Views/FitWidgets/ParameterTuningWidget.h b/GUI/Views/FitWidgets/ParameterTuningWidget.h
index a5b8234a0be39fc4edb8236cc9c232730ac965e1..1392228c9b446a089f8d355cb5cd25c0bfe3176d 100644
--- a/GUI/Views/FitWidgets/ParameterTuningWidget.h
+++ b/GUI/Views/FitWidgets/ParameterTuningWidget.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_FITWIDGETS_PARAMETERTUNINGWIDGET_H
#define BORNAGAIN_GUI_VIEWS_FITWIDGETS_PARAMETERTUNINGWIDGET_H
-#include "GUI/Views/CommonWidgets/SessionItemWidget.h"
+#include "GUI/CommonWidgets/SessionItemWidget.h"
class JobRealTimeToolBar;
class JobModel;
diff --git a/GUI/Views/FitWidgets/RunFitControlWidget.cpp b/GUI/Views/FitWidgets/RunFitControlWidget.cpp
index 7c2429acbf666839d3a760d2ece34df6ec20550d..18df163cf8e764f06d141bf20e14b731b841771a 100644
--- a/GUI/Views/FitWidgets/RunFitControlWidget.cpp
+++ b/GUI/Views/FitWidgets/RunFitControlWidget.cpp
@@ -15,9 +15,9 @@
#include "GUI/Views/FitWidgets/RunFitControlWidget.h"
#include "GUI/Models/FitSuiteItem.h"
#include "GUI/Models/JobItem.h"
-#include "GUI/Views/CommonWidgets/DesignerHelper.h"
-#include "GUI/Views/InfoWidgets/CautionSign.h"
-#include "GUI/Views/Tools/mainwindow_constants.h"
+#include "GUI/CommonWidgets/DesignerHelper.h"
+#include "GUI/InfoWidgets/CautionSign.h"
+#include "GUI/utils/mainwindow_constants.h"
#include <QFont>
#include <QHBoxLayout>
#include <QLabel>
diff --git a/GUI/Views/FitWidgets/RunFitControlWidget.h b/GUI/Views/FitWidgets/RunFitControlWidget.h
index f1b6374d313b9dcea4c07b68d491a40dbf6ab40f..a3b7c011ef34f40b4321d52b3516cac3066ee9f1 100644
--- a/GUI/Views/FitWidgets/RunFitControlWidget.h
+++ b/GUI/Views/FitWidgets/RunFitControlWidget.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_FITWIDGETS_RUNFITCONTROLWIDGET_H
#define BORNAGAIN_GUI_VIEWS_FITWIDGETS_RUNFITCONTROLWIDGET_H
-#include "GUI/Views/CommonWidgets/SessionItemWidget.h"
+#include "GUI/CommonWidgets/SessionItemWidget.h"
#include <QWidget>
class JobItem;
diff --git a/GUI/Views/ImportDataView.cpp b/GUI/Views/ImportDataView.cpp
index 7fe10743884478f8a7c04a7733af8fb3ac84dd5c..7ee2e94b6f7ad7f87e516706e32be49049cc1e66 100644
--- a/GUI/Views/ImportDataView.cpp
+++ b/GUI/Views/ImportDataView.cpp
@@ -16,9 +16,9 @@
#include "GUI/Models/RealDataItem.h"
#include "GUI/Models/RealDataModel.h"
#include "GUI/Views/ImportDataWidgets/RealDataSelectorWidget.h"
-#include "GUI/Views/Tools/mainwindow_constants.h"
+#include "GUI/utils/mainwindow_constants.h"
#include "GUI/mainwindow/mainwindow.h"
-#include "GUI/mainwindow/projectdocument.h"
+#include "GUI/Project/projectdocument.h"
#include <QAction>
#include <QSplitter>
#include <QVBoxLayout>
diff --git a/GUI/Views/ImportDataView.h b/GUI/Views/ImportDataView.h
index 4f1b362aa2fc3774d458bc1d104396b5c6ca35bd..9957e155fe2f3de6c0e46a8571d6d43aef708370 100644
--- a/GUI/Views/ImportDataView.h
+++ b/GUI/Views/ImportDataView.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_IMPORTDATAVIEW_H
#define BORNAGAIN_GUI_VIEWS_IMPORTDATAVIEW_H
-#include "GUI/Views/CommonWidgets/ItemStackPresenter.h"
+#include "GUI/CommonWidgets/ItemStackPresenter.h"
#include "GUI/Views/ImportDataWidgets/RealDataPresenter.h"
class RealDataModel;
diff --git a/GUI/Views/ImportDataWidgets/RealDataMaskWidget.h b/GUI/Views/ImportDataWidgets/RealDataMaskWidget.h
index 8e2227414498c8339ab729548a5cc2f0bf174fda..1f3444fad402401cf4ff46e763192efdee2c3592 100644
--- a/GUI/Views/ImportDataWidgets/RealDataMaskWidget.h
+++ b/GUI/Views/ImportDataWidgets/RealDataMaskWidget.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_IMPORTDATAWIDGETS_REALDATAMASKWIDGET_H
#define BORNAGAIN_GUI_VIEWS_IMPORTDATAWIDGETS_REALDATAMASKWIDGET_H
-#include "GUI/Views/CommonWidgets/SessionItemWidget.h"
+#include "GUI/CommonWidgets/SessionItemWidget.h"
class SessionItem;
class MaskEditor;
diff --git a/GUI/Views/ImportDataWidgets/RealDataPresenter.h b/GUI/Views/ImportDataWidgets/RealDataPresenter.h
index bed67de9405d0c4f4dbac73852831d834a255fbc..0c800efdf782dc3d352aac567850046cebf347b3 100644
--- a/GUI/Views/ImportDataWidgets/RealDataPresenter.h
+++ b/GUI/Views/ImportDataWidgets/RealDataPresenter.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_IMPORTDATAWIDGETS_REALDATAPRESENTER_H
#define BORNAGAIN_GUI_VIEWS_IMPORTDATAWIDGETS_REALDATAPRESENTER_H
-#include "GUI/Views/CommonWidgets/ItemComboWidget.h"
+#include "GUI/CommonWidgets/ItemComboWidget.h"
class RealDataMaskWidget;
class QAction;
diff --git a/GUI/Views/ImportDataWidgets/RealDataPropertiesWidget.cpp b/GUI/Views/ImportDataWidgets/RealDataPropertiesWidget.cpp
index a4cbedb1ed95351b3061c31bdd045b4d81cdbfae..49b74f4656f688463ece8b723c00c65959740853 100644
--- a/GUI/Views/ImportDataWidgets/RealDataPropertiesWidget.cpp
+++ b/GUI/Views/ImportDataWidgets/RealDataPropertiesWidget.cpp
@@ -17,7 +17,7 @@
#include "GUI/Models/InstrumentModel.h"
#include "GUI/Models/RealDataItem.h"
#include "GUI/mainwindow/mainwindow.h"
-#include "GUI/mainwindow/projectdocument.h"
+#include "GUI/Project/projectdocument.h"
#include <QComboBox>
#include <QLabel>
#include <QVBoxLayout>
diff --git a/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp b/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
index 01166ac0681e4916b925300768135bc59285b64f..cda0f00d08c9dddcfd4c7944b47d032316fa2d18 100644
--- a/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
+++ b/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
@@ -20,15 +20,15 @@
#include "GUI/Models/Error.h"
#include "GUI/Models/RealDataItem.h"
#include "GUI/Models/RealDataModel.h"
-#include "GUI/Views/CommonWidgets/GUIHelpers.h"
-#include "GUI/Views/CommonWidgets/ItemViewOverlayButtons.h"
-#include "GUI/Views/CommonWidgets/StyledToolBar.h"
+#include "GUI/CommonWidgets/GUIHelpers.h"
+#include "GUI/CommonWidgets/ItemViewOverlayButtons.h"
+#include "GUI/CommonWidgets/StyledToolBar.h"
#include "GUI/Views/ImportDataWidgets/ImportDataUtils.h"
#include "GUI/Views/ImportDataWidgets/RealDataPropertiesWidget.h"
#include "GUI/Views/ImportDataWidgets/RealDataTreeModel.h"
#include "GUI/mainwindow/mainwindow.h"
-#include "GUI/mainwindow/projectdocument.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Project/projectdocument.h"
+#include "GUI/Project/projectmanager.h"
#include <QApplication>
#include <QFileDialog>
#include <QItemSelectionModel>
diff --git a/GUI/Views/InstrumentWidgets/DepthProbeInstrumentEditor.cpp b/GUI/Views/InstrumentWidgets/DepthProbeInstrumentEditor.cpp
index dda604feea54b0499e8d79b73d754e62a8a3913b..9352291792cf23f55fe2d6af7f4ec07ccfd8c422 100644
--- a/GUI/Views/InstrumentWidgets/DepthProbeInstrumentEditor.cpp
+++ b/GUI/Views/InstrumentWidgets/DepthProbeInstrumentEditor.cpp
@@ -15,7 +15,7 @@
#include "GUI/Views/InstrumentWidgets/DepthProbeInstrumentEditor.h"
#include "GUI/Models/BeamWavelengthItem.h"
#include "GUI/Models/InstrumentItems.h"
-#include "GUI/Views/CommonWidgets/StyleUtils.h"
+#include "GUI/CommonWidgets/StyleUtils.h"
#include "GUI/Views/InstrumentWidgets/DistributionEditor.h"
#include "GUI/Views/InstrumentWidgets/InclinationAnglesEditor.h"
#include "GUI/Views/InstrumentWidgets/PolarizationAnalysisEditor.h"
diff --git a/GUI/Views/InstrumentWidgets/DistributionForms.cpp b/GUI/Views/InstrumentWidgets/DistributionForms.cpp
index 64c041b28ead746259b2e577c886b7d0805c712c..0af6e15f489b6c8ea7ad919d0d7597f13c4f4491 100644
--- a/GUI/Views/InstrumentWidgets/DistributionForms.cpp
+++ b/GUI/Views/InstrumentWidgets/DistributionForms.cpp
@@ -15,7 +15,7 @@
#include "GUI/Views/InstrumentWidgets/DistributionForms.h"
#include "GUI/Models/DistributionItems.h"
#include "GUI/Models/ItemWithDistribution.h"
-#include "GUI/Views/CommonWidgets/ScientificSpinBox.h"
+#include "GUI/CommonWidgets/ScientificSpinBox.h"
#include "GUI/Views/InstrumentWidgets/DistributionEditor.h"
#include <QDoubleSpinBox>
diff --git a/GUI/Views/InstrumentWidgets/DistributionPlot.cpp b/GUI/Views/InstrumentWidgets/DistributionPlot.cpp
index 9036dc2d4f32b83f946fd888f18f598c21a60076..27c752b30d46adfcf57fa4fa2d9179fa25fdc096 100644
--- a/GUI/Views/InstrumentWidgets/DistributionPlot.cpp
+++ b/GUI/Views/InstrumentWidgets/DistributionPlot.cpp
@@ -15,7 +15,7 @@
#include "GUI/Views/InstrumentWidgets/DistributionPlot.h"
#include "GUI/Models/DistributionItems.h"
#include "GUI/Models/RealLimitsItems.h"
-#include "GUI/Views/InfoWidgets/CautionSign.h"
+#include "GUI/InfoWidgets/CautionSign.h"
#include "Param/Distrib/Distributions.h"
#include <QLabel>
#include <QVBoxLayout>
diff --git a/GUI/Views/InstrumentWidgets/GISASInstrumentEditor.cpp b/GUI/Views/InstrumentWidgets/GISASInstrumentEditor.cpp
index fef9c761b63794678a77975902540fc7023c19d6..2a2192f8186eb3d42fa1debd2bdb44fa38bba23b 100644
--- a/GUI/Views/InstrumentWidgets/GISASInstrumentEditor.cpp
+++ b/GUI/Views/InstrumentWidgets/GISASInstrumentEditor.cpp
@@ -14,7 +14,7 @@
#include "GUI/Views/InstrumentWidgets/GISASInstrumentEditor.h"
#include "GUI/Models/InstrumentItems.h"
-#include "GUI/Views/CommonWidgets/StyleUtils.h"
+#include "GUI/CommonWidgets/StyleUtils.h"
#include "GUI/Views/InstrumentWidgets/DetectorEditor.h"
#include "GUI/Views/InstrumentWidgets/EnvironmentEditor.h"
#include "GUI/Views/InstrumentWidgets/GISASBeamEditor.h"
diff --git a/GUI/Views/InstrumentWidgets/InstrumentLibraryEditor.cpp b/GUI/Views/InstrumentWidgets/InstrumentLibraryEditor.cpp
index ec6af1bad872129424ac7c7e3a022882980855a3..6dcbae33982ad28ac870cd0407bc14040ec0686c 100644
--- a/GUI/Views/InstrumentWidgets/InstrumentLibraryEditor.cpp
+++ b/GUI/Views/InstrumentWidgets/InstrumentLibraryEditor.cpp
@@ -15,8 +15,8 @@
#include "GUI/Views/InstrumentWidgets/InstrumentLibraryEditor.h"
#include "GUI/Application/Application.h"
#include "GUI/Models/InstrumentItems.h"
-#include "GUI/Views/CommonWidgets/ItemViewOverlayButtons.h"
-#include "GUI/Views/CommonWidgets/StyleUtils.h"
+#include "GUI/CommonWidgets/ItemViewOverlayButtons.h"
+#include "GUI/CommonWidgets/StyleUtils.h"
#include "GUI/mainwindow/mainwindow.h"
#include "GUI/utils/ItemDelegateForHTML.h"
#include "ui_InstrumentLibraryEditor.h"
diff --git a/GUI/Views/InstrumentWidgets/InstrumentListView.cpp b/GUI/Views/InstrumentWidgets/InstrumentListView.cpp
index e9c64295323067c25579e8002b1c99e60d8dc700..f70d2e573697d4010f1c0681304a050a59541981 100644
--- a/GUI/Views/InstrumentWidgets/InstrumentListView.cpp
+++ b/GUI/Views/InstrumentWidgets/InstrumentListView.cpp
@@ -19,7 +19,7 @@
#include "GUI/Views/InstrumentWidgets/InstrumentLibraryEditor.h"
#include "GUI/Views/InstrumentWidgets/InstrumentListModel.h"
#include "GUI/mainwindow/mainwindow.h"
-#include "GUI/mainwindow/projectdocument.h"
+#include "GUI/Project/projectdocument.h"
#include <QAction>
#include <QListView>
#include <QMessageBox>
diff --git a/GUI/Views/InstrumentWidgets/InstrumentView.cpp b/GUI/Views/InstrumentWidgets/InstrumentView.cpp
index ece40599aa1d76f20bd08ae800ec507afba46d43..20cce9454e75133ee813f08cf1a58d81c696d7f9 100644
--- a/GUI/Views/InstrumentWidgets/InstrumentView.cpp
+++ b/GUI/Views/InstrumentWidgets/InstrumentView.cpp
@@ -15,10 +15,10 @@
#include "GUI/Views/InstrumentWidgets/InstrumentView.h"
#include "GUI/Models/InstrumentItems.h"
#include "GUI/Models/InstrumentModel.h"
-#include "GUI/Views/CommonWidgets/StyledToolBar.h"
+#include "GUI/CommonWidgets/StyledToolBar.h"
#include "GUI/Views/InstrumentWidgets/InstrumentEditor.h"
#include "GUI/Views/InstrumentWidgets/InstrumentListView.h"
-#include "GUI/mainwindow/projectdocument.h"
+#include "GUI/Project/projectdocument.h"
#include <QBoxLayout>
InstrumentView::InstrumentView(QWidget* parent, ProjectDocument* document)
diff --git a/GUI/Views/InstrumentWidgets/OffSpecularInstrumentEditor.cpp b/GUI/Views/InstrumentWidgets/OffSpecularInstrumentEditor.cpp
index c7e5728061e34e5ea4dc8361960ae18d24297e0e..097bba77ca44798fbe5b648050c928a485c10088 100644
--- a/GUI/Views/InstrumentWidgets/OffSpecularInstrumentEditor.cpp
+++ b/GUI/Views/InstrumentWidgets/OffSpecularInstrumentEditor.cpp
@@ -14,7 +14,7 @@
#include "GUI/Views/InstrumentWidgets/OffSpecularInstrumentEditor.h"
#include "GUI/Models/InstrumentItems.h"
-#include "GUI/Views/CommonWidgets/StyleUtils.h"
+#include "GUI/CommonWidgets/StyleUtils.h"
#include "GUI/Views/InstrumentWidgets/DetectorEditor.h"
#include "GUI/Views/InstrumentWidgets/OffSpecularBeamEditor.h"
#include "GUI/Views/InstrumentWidgets/PolarizationAnalysisEditor.h"
diff --git a/GUI/Views/InstrumentWidgets/SpecularInstrumentEditor.cpp b/GUI/Views/InstrumentWidgets/SpecularInstrumentEditor.cpp
index 555e5fb0cdb0a9166e1cfdd6659a5978693dd250..a78ffe05bb17f8d8208f8766b47eb58a46d8e679 100644
--- a/GUI/Views/InstrumentWidgets/SpecularInstrumentEditor.cpp
+++ b/GUI/Views/InstrumentWidgets/SpecularInstrumentEditor.cpp
@@ -14,7 +14,7 @@
#include "GUI/Views/InstrumentWidgets/SpecularInstrumentEditor.h"
#include "GUI/Models/InstrumentItems.h"
-#include "GUI/Views/CommonWidgets/StyleUtils.h"
+#include "GUI/CommonWidgets/StyleUtils.h"
#include "GUI/Views/InstrumentWidgets/EnvironmentEditor.h"
#include "GUI/Views/InstrumentWidgets/PolarizationAnalysisEditor.h"
#include "GUI/Views/InstrumentWidgets/SpecularBeamEditor.h"
diff --git a/GUI/Views/IntensityDataWidgets/ColorMap.cpp b/GUI/Views/IntensityDataWidgets/ColorMap.cpp
index 2ee34c692452833c0cd0fd504f3606cce0d09f4d..b06de0e4a593892e8fb80787736cdbc6022bce51 100644
--- a/GUI/Views/IntensityDataWidgets/ColorMap.cpp
+++ b/GUI/Views/IntensityDataWidgets/ColorMap.cpp
@@ -15,7 +15,7 @@
#include "GUI/Views/IntensityDataWidgets/ColorMap.h"
#include "GUI/Models/AxesItems.h"
#include "GUI/Models/IntensityDataItem.h"
-#include "GUI/Views/CommonWidgets/UpdateTimer.h"
+#include "GUI/CommonWidgets/UpdateTimer.h"
#include "GUI/Views/IntensityDataWidgets/ColorMapUtils.h"
#include "GUI/Views/IntensityDataWidgets/PlotEventInfo.h"
#include "GUI/Views/IntensityDataWidgets/plot_constants.h"
diff --git a/GUI/Views/IntensityDataWidgets/ColorMapCanvas.h b/GUI/Views/IntensityDataWidgets/ColorMapCanvas.h
index 6ad6eb21233c5bea5dc54b96eb8b01a6ab838148..dc461241ddb694b57ee066399fcc334293f012be 100644
--- a/GUI/Views/IntensityDataWidgets/ColorMapCanvas.h
+++ b/GUI/Views/IntensityDataWidgets/ColorMapCanvas.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_COLORMAPCANVAS_H
#define BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_COLORMAPCANVAS_H
-#include "GUI/Views/CommonWidgets/SessionItemWidget.h"
+#include "GUI/CommonWidgets/SessionItemWidget.h"
class ColorMap;
class FontScalingEvent;
diff --git a/GUI/Views/IntensityDataWidgets/ColorMapUtils.cpp b/GUI/Views/IntensityDataWidgets/ColorMapUtils.cpp
index 7a325389bfb9dcfca401a7da27ec553364a4d0ad..49660c8cb6b93b8d94f5ffd9ebf56ed0964b4a7d 100644
--- a/GUI/Views/IntensityDataWidgets/ColorMapUtils.cpp
+++ b/GUI/Views/IntensityDataWidgets/ColorMapUtils.cpp
@@ -15,7 +15,7 @@
#include "GUI/Views/IntensityDataWidgets/ColorMapUtils.h"
#include "GUI/Models/Error.h"
#include "GUI/Models/IntensityDataItem.h"
-#include "GUI/Views/CommonWidgets/StyleUtils.h"
+#include "GUI/CommonWidgets/StyleUtils.h"
using gradient_map_t = QMap<QString, QCPColorGradient::GradientPreset>;
diff --git a/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.cpp b/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.cpp
index beda226f989376d69d44d8a436f512f123427e8d..c49056c7c1dba2f9c769d3ba22ef84e1dfa45c58 100644
--- a/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.cpp
+++ b/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.cpp
@@ -16,12 +16,12 @@
#include "GUI/Models/ComboProperty.h"
#include "GUI/Models/IntensityDataItem.h"
#include "GUI/Models/RealDataItem.h"
-#include "GUI/Views/CommonWidgets/GUIHelpers.h"
+#include "GUI/CommonWidgets/GUIHelpers.h"
#include "GUI/Views/IntensityDataWidgets/ColorMap.h"
#include "GUI/Views/IntensityDataWidgets/ColorMapCanvas.h"
#include "GUI/Views/IntensityDataWidgets/SavePlotAssistant.h"
#include "GUI/mainwindow/mainwindow.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Project/projectmanager.h"
#include <QAction>
#include <QMouseEvent>
#include <QSettings>
diff --git a/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.h b/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.h
index 0eb3fcde882b9680ef54a894f9614bfd210c5cf4..e8df4d64b7ba5b5c8f5577fa9632cf39a6ce30f3 100644
--- a/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.h
+++ b/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.h
@@ -16,7 +16,7 @@
#define BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_INTENSITYDATACANVAS_H
#include "Device/Data/OutputData.h"
-#include "GUI/Views/CommonWidgets/SessionItemWidget.h"
+#include "GUI/CommonWidgets/SessionItemWidget.h"
#include <memory>
class SessionItem;
diff --git a/GUI/Views/IntensityDataWidgets/IntensityDataPropertyWidget.cpp b/GUI/Views/IntensityDataWidgets/IntensityDataPropertyWidget.cpp
index 2473ba731a827c9d091fc89e4bc8ef18e5037cbd..d3ef3b7e227545c7482274640b8e319b83247589 100644
--- a/GUI/Views/IntensityDataWidgets/IntensityDataPropertyWidget.cpp
+++ b/GUI/Views/IntensityDataWidgets/IntensityDataPropertyWidget.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/IntensityDataWidgets/IntensityDataPropertyWidget.h"
-#include "GUI/Views/CommonWidgets/StyleUtils.h"
+#include "GUI/CommonWidgets/StyleUtils.h"
#include "GUI/Views/PropertyEditor/ComponentEditor.h"
#include <QAction>
#include <QVBoxLayout>
diff --git a/GUI/Views/IntensityDataWidgets/IntensityDataPropertyWidget.h b/GUI/Views/IntensityDataWidgets/IntensityDataPropertyWidget.h
index 8c3a008a509bb156632c48fb40f8ede98f6433bf..170fd81f11a510981d6065ac41b527a8c059aace 100644
--- a/GUI/Views/IntensityDataWidgets/IntensityDataPropertyWidget.h
+++ b/GUI/Views/IntensityDataWidgets/IntensityDataPropertyWidget.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_INTENSITYDATAPROPERTYWIDGET_H
#define BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_INTENSITYDATAPROPERTYWIDGET_H
-#include "GUI/Views/CommonWidgets/SessionItemWidget.h"
+#include "GUI/CommonWidgets/SessionItemWidget.h"
class IntensityDataItem;
class ComponentEditor;
diff --git a/GUI/Views/IntensityDataWidgets/IntensityDataWidget.h b/GUI/Views/IntensityDataWidgets/IntensityDataWidget.h
index ff518635df3f5361d9c53651f506da559e894aa1..35ebfaa1d62af98ebd6c29a24df9b0f0a3dcd8fe 100644
--- a/GUI/Views/IntensityDataWidgets/IntensityDataWidget.h
+++ b/GUI/Views/IntensityDataWidgets/IntensityDataWidget.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_INTENSITYDATAWIDGET_H
#define BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_INTENSITYDATAWIDGET_H
-#include "GUI/Views/CommonWidgets/SessionItemWidget.h"
+#include "GUI/CommonWidgets/SessionItemWidget.h"
#include <memory>
class SessionItem;
diff --git a/GUI/Views/IntensityDataWidgets/Plot1D.cpp b/GUI/Views/IntensityDataWidgets/Plot1D.cpp
index 21906401642ea682a6291cbb05258af23795102c..d664abc3e0eb83926fa62a4d1af09a299baf854f 100644
--- a/GUI/Views/IntensityDataWidgets/Plot1D.cpp
+++ b/GUI/Views/IntensityDataWidgets/Plot1D.cpp
@@ -18,7 +18,7 @@
#include "GUI/Models/DataItem.h"
#include "GUI/Models/DataProperties.h"
#include "GUI/Models/DataPropertyContainer.h"
-#include "GUI/Views/CommonWidgets/UpdateTimer.h"
+#include "GUI/CommonWidgets/UpdateTimer.h"
#include "GUI/Views/IntensityDataWidgets/ColorMapUtils.h"
#include "GUI/Views/IntensityDataWidgets/PlotEventInfo.h"
#include "GUI/Views/IntensityDataWidgets/plot_constants.h"
diff --git a/GUI/Views/IntensityDataWidgets/PlotStatusLabel.h b/GUI/Views/IntensityDataWidgets/PlotStatusLabel.h
index 6c9ec51e971289d8aa19ca1e44f9356fdd464286..4c11273bfaf2f3747d578cd0dee1374be9c17282 100644
--- a/GUI/Views/IntensityDataWidgets/PlotStatusLabel.h
+++ b/GUI/Views/IntensityDataWidgets/PlotStatusLabel.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_PLOTSTATUSLABEL_H
#define BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_PLOTSTATUSLABEL_H
-#include "GUI/Views/CommonWidgets/StatusLabel.h"
+#include "GUI/CommonWidgets/StatusLabel.h"
#include <QList>
class ScientificPlot;
diff --git a/GUI/Views/IntensityDataWidgets/ScientificPlot.h b/GUI/Views/IntensityDataWidgets/ScientificPlot.h
index 960ec2fb45e90a34744bfcb56a908bb54a1937f4..fc13e6d3f71a24fc59028f12094824fe0ffedd7a 100644
--- a/GUI/Views/IntensityDataWidgets/ScientificPlot.h
+++ b/GUI/Views/IntensityDataWidgets/ScientificPlot.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_SCIENTIFICPLOT_H
#define BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_SCIENTIFICPLOT_H
-#include "GUI/Views/CommonWidgets/SessionItemWidget.h"
+#include "GUI/CommonWidgets/SessionItemWidget.h"
#include <memory>
class PlotEventInfo;
diff --git a/GUI/Views/IntensityDataWidgets/plot_constants.h b/GUI/Views/IntensityDataWidgets/plot_constants.h
index a7bae1451d701337bbe8a7d46f4bd728aacd6c39..2efeb7ba0fac965bbc3354e998ebbb292b2534e5 100644
--- a/GUI/Views/IntensityDataWidgets/plot_constants.h
+++ b/GUI/Views/IntensityDataWidgets/plot_constants.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_PLOT_CONSTANTS_H
#define BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_PLOT_CONSTANTS_H
-#include "GUI/Views/CommonWidgets/StyleUtils.h"
+#include "GUI/CommonWidgets/StyleUtils.h"
#include <QSize>
namespace GUI::Constants {
diff --git a/GUI/Views/JobWidgets/FitComparisonWidget.h b/GUI/Views/JobWidgets/FitComparisonWidget.h
index 51fbcd2c5ebed1b0354de709c13dfb07303aae93..d63d93861348bc5d37fc8a268e590924cc196d08 100644
--- a/GUI/Views/JobWidgets/FitComparisonWidget.h
+++ b/GUI/Views/JobWidgets/FitComparisonWidget.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_JOBWIDGETS_FITCOMPARISONWIDGET_H
#define BORNAGAIN_GUI_VIEWS_JOBWIDGETS_FITCOMPARISONWIDGET_H
-#include "GUI/Views/CommonWidgets/SessionItemWidget.h"
+#include "GUI/CommonWidgets/SessionItemWidget.h"
#include <QMap>
class JobItem;
diff --git a/GUI/Views/JobWidgets/FitComparisonWidget1D.h b/GUI/Views/JobWidgets/FitComparisonWidget1D.h
index ea853cf3fea2fd2edb1c1bc7dcf8e939fcb10acb..a979cb85f1660f90f893440490a94d3998d73e2b 100644
--- a/GUI/Views/JobWidgets/FitComparisonWidget1D.h
+++ b/GUI/Views/JobWidgets/FitComparisonWidget1D.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_JOBWIDGETS_FITCOMPARISONWIDGET1D_H
#define BORNAGAIN_GUI_VIEWS_JOBWIDGETS_FITCOMPARISONWIDGET1D_H
-#include "GUI/Views/CommonWidgets/SessionItemWidget.h"
+#include "GUI/CommonWidgets/SessionItemWidget.h"
class Data1DViewItem;
class FitComparison1DViewController;
diff --git a/GUI/Views/JobWidgets/FitFlowWidget.h b/GUI/Views/JobWidgets/FitFlowWidget.h
index d3f18724bba215f24375ed7ecf516de6a5f42c57..a8e7e0b5efa462403e372584355de216aeb88d01 100644
--- a/GUI/Views/JobWidgets/FitFlowWidget.h
+++ b/GUI/Views/JobWidgets/FitFlowWidget.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_JOBWIDGETS_FITFLOWWIDGET_H
#define BORNAGAIN_GUI_VIEWS_JOBWIDGETS_FITFLOWWIDGET_H
-#include "GUI/Views/CommonWidgets/SessionItemWidget.h"
+#include "GUI/CommonWidgets/SessionItemWidget.h"
class HistogramPlot;
class FitSuiteItem;
diff --git a/GUI/Views/JobWidgets/JobListView.cpp b/GUI/Views/JobWidgets/JobListView.cpp
index a830bc9aed51833c7ad3a9330001ca51ae2bdbb4..9c5ce8281a87d0bcdf6e451c083d660a9a1100e9 100644
--- a/GUI/Views/JobWidgets/JobListView.cpp
+++ b/GUI/Views/JobWidgets/JobListView.cpp
@@ -16,7 +16,7 @@
#include "GUI/Models/IntensityDataItem.h"
#include "GUI/Models/JobItem.h"
#include "GUI/Models/JobModel.h"
-#include "GUI/Views/CommonWidgets/StyledToolBar.h"
+#include "GUI/CommonWidgets/StyledToolBar.h"
#include "GUI/Views/JobWidgets/JobListModel.h"
#include "GUI/Views/JobWidgets/JobListViewDelegate.h"
#include <QAction>
diff --git a/GUI/Views/JobWidgets/JobMessagePanel.cpp b/GUI/Views/JobWidgets/JobMessagePanel.cpp
index 4e55543413a95db211b1fe50e7a52b8707ab242d..8282b14d74e2a9d3544f7b9c20dbbb06aad47138 100644
--- a/GUI/Views/JobWidgets/JobMessagePanel.cpp
+++ b/GUI/Views/JobWidgets/JobMessagePanel.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/JobWidgets/JobMessagePanel.h"
-#include "GUI/Views/Tools/mainwindow_constants.h"
+#include "GUI/utils/mainwindow_constants.h"
#include <QScrollBar>
#include <QStackedWidget>
#include <QTextEdit>
diff --git a/GUI/Views/JobWidgets/JobMessagePanel.h b/GUI/Views/JobWidgets/JobMessagePanel.h
index 0cbf4f7979bb67cb8472609bcff7f973618ceac1..06c81dfdd5e002ff9708b223f6bb184462f66f44 100644
--- a/GUI/Views/JobWidgets/JobMessagePanel.h
+++ b/GUI/Views/JobWidgets/JobMessagePanel.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_JOBWIDGETS_JOBMESSAGEPANEL_H
#define BORNAGAIN_GUI_VIEWS_JOBWIDGETS_JOBMESSAGEPANEL_H
-#include "GUI/Views/CommonWidgets/InfoPanel.h"
+#include "GUI/CommonWidgets/InfoPanel.h"
#include "GUI/Views/FitWidgets/FitLog.h"
#include <QColor>
diff --git a/GUI/Views/JobWidgets/JobPropertiesWidget.cpp b/GUI/Views/JobWidgets/JobPropertiesWidget.cpp
index 00552914d67e6c5a7391feac3d3d71c9ead4929d..4865fb52f3ef208032d3f58ae0aea4071f76746c 100644
--- a/GUI/Views/JobWidgets/JobPropertiesWidget.cpp
+++ b/GUI/Views/JobWidgets/JobPropertiesWidget.cpp
@@ -14,9 +14,9 @@
#include "GUI/Views/JobWidgets/JobPropertiesWidget.h"
#include "GUI/Models/JobItem.h"
-#include "GUI/Views/CommonWidgets/StyleUtils.h"
+#include "GUI/CommonWidgets/StyleUtils.h"
#include "GUI/Views/JobWidgets/JobPropertiesTableModel.h"
-#include "GUI/Views/Tools/mainwindow_constants.h"
+#include "GUI/utils/mainwindow_constants.h"
#include <QTabBar>
#include <QTabWidget>
#include <QTextEdit>
diff --git a/GUI/Views/JobWidgets/JobResultsPresenter.h b/GUI/Views/JobWidgets/JobResultsPresenter.h
index 7ebb7e26c0707de3b99c468f9b53bdf89ca351bc..d2b53dca40dc3422484f77046fcd9975785f7cb2 100644
--- a/GUI/Views/JobWidgets/JobResultsPresenter.h
+++ b/GUI/Views/JobWidgets/JobResultsPresenter.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_JOBWIDGETS_JOBRESULTSPRESENTER_H
#define BORNAGAIN_GUI_VIEWS_JOBWIDGETS_JOBRESULTSPRESENTER_H
-#include "GUI/Views/CommonWidgets/ItemComboWidget.h"
+#include "GUI/CommonWidgets/ItemComboWidget.h"
class InstrumentItem;
class JobItem;
diff --git a/GUI/Views/JobWidgets/JobSelectorWidget.cpp b/GUI/Views/JobWidgets/JobSelectorWidget.cpp
index 7cb961159964a7f4bfefcd31bf8f1b4d13e85de0..9b6e661d00620b31794a1bea81f8225d508699e3 100644
--- a/GUI/Views/JobWidgets/JobSelectorWidget.cpp
+++ b/GUI/Views/JobWidgets/JobSelectorWidget.cpp
@@ -17,7 +17,7 @@
#include "GUI/Models/JobItem.h"
#include "GUI/Views/JobWidgets/JobListView.h"
#include "GUI/Views/JobWidgets/JobPropertiesWidget.h"
-#include "GUI/Views/Tools/mainwindow_constants.h"
+#include "GUI/utils/mainwindow_constants.h"
#include <QSplitter>
#include <QVBoxLayout>
diff --git a/GUI/Views/JobWidgets/JobView.cpp b/GUI/Views/JobWidgets/JobView.cpp
index 7bcf6d3d535998376b9c2d04da1b27acf4fa0ef3..feaf8b3f846ac3ed3e44dd725b0bb113808e710b 100644
--- a/GUI/Views/JobWidgets/JobView.cpp
+++ b/GUI/Views/JobWidgets/JobView.cpp
@@ -15,7 +15,7 @@
#include "GUI/Views/JobWidgets/JobView.h"
#include "GUI/Models/JobItem.h"
#include "GUI/Models/JobModel.h"
-#include "GUI/Views/CommonWidgets/DocksController.h"
+#include "GUI/CommonWidgets/DocksController.h"
#include "GUI/Views/FitWidgets/FitActivityPanel.h"
#include "GUI/Views/FitWidgets/JobRealTimeWidget.h"
#include "GUI/Views/JobWidgets/JobMessagePanel.h"
@@ -24,7 +24,7 @@
#include "GUI/Views/JobWidgets/JobSelectorWidget.h"
#include "GUI/Views/JobWidgets/JobViewActivities.h"
#include "GUI/mainwindow/mainwindow.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Project/projectmanager.h"
#include <QMenu>
JobView::JobView(MainWindow* mainWindow, ProjectDocument* document)
diff --git a/GUI/Views/JobWidgets/JobViewActivities.cpp b/GUI/Views/JobWidgets/JobViewActivities.cpp
index a2d9ff1a5ea440d5319e3b1b172f1e26e469fadb..8483057ce4aaa40a3055747def5214dce9538dd6 100644
--- a/GUI/Views/JobWidgets/JobViewActivities.cpp
+++ b/GUI/Views/JobWidgets/JobViewActivities.cpp
@@ -14,7 +14,7 @@
#include "GUI/Views/JobWidgets/JobViewActivities.h"
#include "Base/Utils/Assert.h"
-#include "GUI/Views/Tools/mainwindow_constants.h"
+#include "GUI/utils/mainwindow_constants.h"
namespace {
QMap<JobViewActivity, QVector<JobViewFlags::Dock>> createActivityMap()
diff --git a/GUI/Views/MaskWidgets/MaskEditorCanvas.cpp b/GUI/Views/MaskWidgets/MaskEditorCanvas.cpp
index 3cc43f9fa4ef443390daa0b21a78b7ffc9dc0a85..f2e6c56baf9b7689d530f2ab5d49b9f6a142ba61 100644
--- a/GUI/Views/MaskWidgets/MaskEditorCanvas.cpp
+++ b/GUI/Views/MaskWidgets/MaskEditorCanvas.cpp
@@ -21,7 +21,7 @@
#include "GUI/Views/MaskWidgets/MaskGraphicsScene.h"
#include "GUI/Views/MaskWidgets/MaskGraphicsView.h"
#include "GUI/Views/MaskWidgets/MaskResultsPresenter.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Project/projectmanager.h"
#include <QVBoxLayout>
MaskEditorCanvas::MaskEditorCanvas(QWidget* parent)
diff --git a/GUI/Views/MaskWidgets/MaskEditorToolBar.cpp b/GUI/Views/MaskWidgets/MaskEditorToolBar.cpp
index 495ae41813897bd1b37b6e78a00143fae96ac900..d7295fa05e7a074f87bbc449bf28292c19c0bcb3 100644
--- a/GUI/Views/MaskWidgets/MaskEditorToolBar.cpp
+++ b/GUI/Views/MaskWidgets/MaskEditorToolBar.cpp
@@ -15,7 +15,7 @@
#include "GUI/Views/MaskWidgets/MaskEditorToolBar.h"
#include "Base/Utils/Assert.h"
#include "GUI/Views/MaskWidgets/MaskEditorActions.h"
-#include "GUI/Views/Tools/mainwindow_constants.h"
+#include "GUI/utils/mainwindow_constants.h"
#include <QButtonGroup>
#include <QLabel>
#include <QRadioButton>
diff --git a/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp b/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp
index 602312b0c0fa962644db598410e08767ed418dd6..48e36a4546fee3ec3008dc9362c8cef099247f1b 100644
--- a/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp
+++ b/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp
@@ -20,12 +20,12 @@
#include "GUI/Models/MaterialModelStore.h"
#include "GUI/Models/SampleModel.h"
#include "GUI/Models/VectorItem.h"
-#include "GUI/Views/CommonWidgets/GUIHelpers.h"
-#include "GUI/Views/CommonWidgets/StyleUtils.h"
+#include "GUI/CommonWidgets/GUIHelpers.h"
+#include "GUI/CommonWidgets/StyleUtils.h"
#include "GUI/Views/MaterialEditor/MaterialEditorModel.h"
-#include "GUI/Views/Tools/mainwindow_constants.h"
+#include "GUI/utils/mainwindow_constants.h"
#include "GUI/mainwindow/mainwindow.h"
-#include "GUI/mainwindow/projectdocument.h"
+#include "GUI/Project/projectdocument.h"
#include "ui_MaterialEditorDialog.h"
#include <QAction>
diff --git a/GUI/Views/ProjectSettingsView.cpp b/GUI/Views/ProjectSettingsView.cpp
index 85117f3164b2c1a960ea911c031556423b57c471..d3af86238a2ccf431c33418d75a2f2a568afa464 100644
--- a/GUI/Views/ProjectSettingsView.cpp
+++ b/GUI/Views/ProjectSettingsView.cpp
@@ -17,8 +17,8 @@
#include "GUI/Models/ApplicationModels.h"
#include "GUI/Models/InstrumentModel.h"
#include "GUI/Models/SampleModel.h"
-#include "GUI/Views/CommonWidgets/GroupBoxCollapser.h"
-#include "GUI/mainwindow/projectdocument.h"
+#include "GUI/CommonWidgets/GroupBoxCollapser.h"
+#include "GUI/Project/projectdocument.h"
#include "GUI/utils/qstringutils.h"
#include "ui_ProjectSettingsView.h"
#include <QDir>
diff --git a/GUI/Views/ProjectSettingsView.h b/GUI/Views/ProjectSettingsView.h
index 4b37ad409ff0e07610309663a00caf2bbdc7797a..8c961e8c603671f78775992f7b1ee207fea9d356 100644
--- a/GUI/Views/ProjectSettingsView.h
+++ b/GUI/Views/ProjectSettingsView.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_PROJECTSETTINGSVIEW_H
#define BORNAGAIN_GUI_VIEWS_PROJECTSETTINGSVIEW_H
-#include "GUI/mainwindow/projectdocument.h"
+#include "GUI/Project/projectdocument.h"
#include <QWidget>
namespace Ui {
diff --git a/GUI/Views/ProjectionsWidgets/IntensityDataProjectionsWidget.h b/GUI/Views/ProjectionsWidgets/IntensityDataProjectionsWidget.h
index 6ca8bf83f2f5af5ca31df8ea76980be3bd01f9b8..e79459afadc81280997502bc345d97c9f315bdd2 100644
--- a/GUI/Views/ProjectionsWidgets/IntensityDataProjectionsWidget.h
+++ b/GUI/Views/ProjectionsWidgets/IntensityDataProjectionsWidget.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_PROJECTIONSWIDGETS_INTENSITYDATAPROJECTIONSWIDGET_H
#define BORNAGAIN_GUI_VIEWS_PROJECTIONSWIDGETS_INTENSITYDATAPROJECTIONSWIDGET_H
-#include "GUI/Views/CommonWidgets/SessionItemWidget.h"
+#include "GUI/CommonWidgets/SessionItemWidget.h"
class ProjectionsEditor;
class IntensityDataItem;
diff --git a/GUI/Views/ProjectionsWidgets/ProjectionsPlot.h b/GUI/Views/ProjectionsWidgets/ProjectionsPlot.h
index b1e851f061ae942dc2d7a815dd4cbe5ce5b2f557..cf5b08855d174dfe35209de3147bc0d6d398365e 100644
--- a/GUI/Views/ProjectionsWidgets/ProjectionsPlot.h
+++ b/GUI/Views/ProjectionsWidgets/ProjectionsPlot.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_PROJECTIONSWIDGETS_PROJECTIONSPLOT_H
#define BORNAGAIN_GUI_VIEWS_PROJECTIONSWIDGETS_PROJECTIONSPLOT_H
-#include "GUI/Views/CommonWidgets/SessionItemWidget.h"
+#include "GUI/CommonWidgets/SessionItemWidget.h"
#include <QMap>
#include <memory>
#include <qcustomplot.h>
diff --git a/GUI/Views/ProjectionsWidgets/ProjectionsPropertyPanel.h b/GUI/Views/ProjectionsWidgets/ProjectionsPropertyPanel.h
index f8c51cb8235622d007327ce74d52033b71f153b9..0b9bf88e65844b2753dd1b0a57e8f005030b8e55 100644
--- a/GUI/Views/ProjectionsWidgets/ProjectionsPropertyPanel.h
+++ b/GUI/Views/ProjectionsWidgets/ProjectionsPropertyPanel.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_PROJECTIONSWIDGETS_PROJECTIONSPROPERTYPANEL_H
#define BORNAGAIN_GUI_VIEWS_PROJECTIONSWIDGETS_PROJECTIONSPROPERTYPANEL_H
-#include "GUI/Views/CommonWidgets/SessionItemWidget.h"
+#include "GUI/CommonWidgets/SessionItemWidget.h"
class ComponentEditor;
diff --git a/GUI/Views/ProjectionsWidgets/ProjectionsToolBar.cpp b/GUI/Views/ProjectionsWidgets/ProjectionsToolBar.cpp
index ffaffc2605f6c4e845d0fda5238f55df0f7f9492..2fc05896cdf68df7ad69a2afd7a9959d1f61778b 100644
--- a/GUI/Views/ProjectionsWidgets/ProjectionsToolBar.cpp
+++ b/GUI/Views/ProjectionsWidgets/ProjectionsToolBar.cpp
@@ -14,7 +14,7 @@
#include "GUI/Views/ProjectionsWidgets/ProjectionsToolBar.h"
#include "GUI/Views/ProjectionsWidgets/ProjectionsEditorActions.h"
-#include "GUI/Views/Tools/mainwindow_constants.h"
+#include "GUI/utils/mainwindow_constants.h"
#include <QButtonGroup>
#include <QLabel>
#include <QToolButton>
diff --git a/GUI/Views/ProjectionsWidgets/ProjectionsWidget.h b/GUI/Views/ProjectionsWidgets/ProjectionsWidget.h
index a36b7d365b7c974832c0c7b6a01d0b38c03a50b1..fb5f3eb0a6a805b91ec4519bd83f1a734d9cc6d3 100644
--- a/GUI/Views/ProjectionsWidgets/ProjectionsWidget.h
+++ b/GUI/Views/ProjectionsWidgets/ProjectionsWidget.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_PROJECTIONSWIDGETS_PROJECTIONSWIDGET_H
#define BORNAGAIN_GUI_VIEWS_PROJECTIONSWIDGETS_PROJECTIONSWIDGET_H
-#include "GUI/Views/CommonWidgets/SessionItemWidget.h"
+#include "GUI/CommonWidgets/SessionItemWidget.h"
#include "GUI/Views/MaskWidgets/MaskEditorFlags.h"
class ProjectionsPlot;
diff --git a/GUI/Views/ProjectionsWidgets/SaveProjectionsAssistant.cpp b/GUI/Views/ProjectionsWidgets/SaveProjectionsAssistant.cpp
index 4145e06a4d5335e32cffe9dfb6cf9783ca2264c8..78cf5ef83fd751e3341f55c10feeac290130d92e 100644
--- a/GUI/Views/ProjectionsWidgets/SaveProjectionsAssistant.cpp
+++ b/GUI/Views/ProjectionsWidgets/SaveProjectionsAssistant.cpp
@@ -21,8 +21,8 @@
#include "GUI/Models/IntensityDataItem.h"
#include "GUI/Models/MaskItems.h"
#include "GUI/Models/ProjectionItems.h"
-#include "GUI/mainwindow/ProjectUtils.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Project/ProjectUtils.h"
+#include "GUI/Project/projectmanager.h"
#include <QFileDialog>
#include <QTextStream>
diff --git a/GUI/Views/PropertyEditor/ComponentTreeView.cpp b/GUI/Views/PropertyEditor/ComponentTreeView.cpp
index c6cd25201b8e25c3cff9b956915825db872ec136..0ea79158fd3d5e072c5d70b9cb3cd5d014c8a9fa 100644
--- a/GUI/Views/PropertyEditor/ComponentTreeView.cpp
+++ b/GUI/Views/PropertyEditor/ComponentTreeView.cpp
@@ -15,7 +15,7 @@
#include "GUI/Views/PropertyEditor/ComponentTreeView.h"
#include "GUI/Models/ComponentProxyModel.h"
#include "GUI/Models/SessionModel.h"
-#include "GUI/Views/CommonWidgets/StyleUtils.h"
+#include "GUI/CommonWidgets/StyleUtils.h"
#include "GUI/Views/PropertyEditor/ComponentTreeActions.h"
#include "GUI/Views/SessionModelDelegate.h"
#include "GUI/utils/CustomEventFilters.h"
diff --git a/GUI/Views/PropertyEditor/CustomEditors.cpp b/GUI/Views/PropertyEditor/CustomEditors.cpp
index b01868a95a56ff6a36a1c25ef9d67534cac45eb8..d78ad38d8e29eb8a8931b7fc18bbf1420760d076 100644
--- a/GUI/Views/PropertyEditor/CustomEditors.cpp
+++ b/GUI/Views/PropertyEditor/CustomEditors.cpp
@@ -17,9 +17,9 @@
#include "Fit/Param/RealLimits.h"
#include "GUI/Models/ComboProperty.h"
#include "GUI/Models/MaterialItemUtils.h"
-#include "GUI/Views/CommonWidgets/ScientificSpinBox.h"
+#include "GUI/CommonWidgets/ScientificSpinBox.h"
#include "GUI/Views/MaterialEditor/MaterialEditorDialog.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Project/projectmanager.h"
#include "GUI/utils/CustomEventFilters.h"
#include <QApplication>
#include <QBoxLayout>
diff --git a/GUI/Views/PropertyEditor/PropertyEditorFactory.cpp b/GUI/Views/PropertyEditor/PropertyEditorFactory.cpp
index 47ba56a3dac28584e65996fd262330d7cfd36762..85d0b7d35a9556ecca2f60383e19cac8b78ba630 100644
--- a/GUI/Views/PropertyEditor/PropertyEditorFactory.cpp
+++ b/GUI/Views/PropertyEditor/PropertyEditorFactory.cpp
@@ -17,7 +17,7 @@
#include "GUI/Models/MaterialItemUtils.h"
#include "GUI/Models/SessionFlags.h"
#include "GUI/Models/SessionItem.h"
-#include "GUI/Views/CommonWidgets/ScientificSpinBox.h"
+#include "GUI/CommonWidgets/ScientificSpinBox.h"
#include "GUI/Views/PropertyEditor/MultiComboPropertyEditor.h"
#include <QLabel>
#include <QLineEdit>
diff --git a/GUI/Views/PropertyEditor/TestComponentView.cpp b/GUI/Views/PropertyEditor/TestComponentView.cpp
index fa27c5902babc06cd1b27d36d055c8f372208490..eb3a9ba935e5abdd720adfa1dc0ced6f6c5ab337 100644
--- a/GUI/Views/PropertyEditor/TestComponentView.cpp
+++ b/GUI/Views/PropertyEditor/TestComponentView.cpp
@@ -21,7 +21,7 @@
#include "GUI/Models/ParticleItem.h"
#include "GUI/Models/SampleModel.h"
#include "GUI/Models/VectorItem.h"
-#include "GUI/Views/CommonWidgets/StyleUtils.h"
+#include "GUI/CommonWidgets/StyleUtils.h"
#include "GUI/Views/PropertyEditor/ComponentEditor.h"
#include "GUI/Views/SessionModelDelegate.h"
#include "Sample/Multilayer/MultiLayer.h"
diff --git a/GUI/Views/RealSpaceWidgets/RealSpaceCanvas.cpp b/GUI/Views/RealSpaceWidgets/RealSpaceCanvas.cpp
index a2a0c5c9104d4edc150e7a6a281b06361f64121c..cd8007369ac786de8e57e2ea8514ccd67e21f96c 100644
--- a/GUI/Views/RealSpaceWidgets/RealSpaceCanvas.cpp
+++ b/GUI/Views/RealSpaceWidgets/RealSpaceCanvas.cpp
@@ -17,11 +17,11 @@
#include "GUI/Models/FilterPropertyProxy.h"
#include "GUI/Models/SampleModel.h"
#include "GUI/Models/SessionItemUtils.h"
-#include "GUI/Views/InfoWidgets/CautionSign.h"
+#include "GUI/InfoWidgets/CautionSign.h"
#include "GUI/Views/RealSpaceWidgets/RealSpaceBuilder.h"
#include "GUI/Views/RealSpaceWidgets/RealSpaceModel.h"
#include "GUI/Views/RealSpaceWidgets/RealSpaceView.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Project/projectmanager.h"
#include <QApplication>
#include <QFileDialog>
#include <QMessageBox>
diff --git a/GUI/Views/RealSpaceWidgets/RealSpaceToolBar.cpp b/GUI/Views/RealSpaceWidgets/RealSpaceToolBar.cpp
index 95248c40ffbd193fab7ceb0294707f7820b18fac..c5f461e853b6c9fd82355de241e3b0d38054388b 100644
--- a/GUI/Views/RealSpaceWidgets/RealSpaceToolBar.cpp
+++ b/GUI/Views/RealSpaceWidgets/RealSpaceToolBar.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/RealSpaceWidgets/RealSpaceToolBar.h"
-#include "GUI/Views/Tools/mainwindow_constants.h"
+#include "GUI/utils/mainwindow_constants.h"
#include <QCheckBox>
#include <QToolButton>
diff --git a/GUI/Views/RealSpaceWidgets/RealSpaceToolBar.h b/GUI/Views/RealSpaceWidgets/RealSpaceToolBar.h
index 5366c3756793a827b87773a75e2a3120e665370c..a232f4202d0ee34d98b83bf21381f48a77597900 100644
--- a/GUI/Views/RealSpaceWidgets/RealSpaceToolBar.h
+++ b/GUI/Views/RealSpaceWidgets/RealSpaceToolBar.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_REALSPACEWIDGETS_REALSPACETOOLBAR_H
#define BORNAGAIN_GUI_VIEWS_REALSPACEWIDGETS_REALSPACETOOLBAR_H
-#include "GUI/Views/CommonWidgets/StyledToolBar.h"
+#include "GUI/CommonWidgets/StyledToolBar.h"
class QToolButton;
class QCheckBox;
diff --git a/GUI/Views/SampleDesigner/ConnectableView.cpp b/GUI/Views/SampleDesigner/ConnectableView.cpp
index 641ab5fb482d22e00cc3955f9fb25bb197bc0d37..287b09dd239c08115f0494003c35a4e5e8f7f015 100644
--- a/GUI/Views/SampleDesigner/ConnectableView.cpp
+++ b/GUI/Views/SampleDesigner/ConnectableView.cpp
@@ -15,8 +15,8 @@
#include "GUI/Views/SampleDesigner/ConnectableView.h"
#include "GUI/Models/Error.h"
#include "GUI/Models/SessionGraphicsItem.h"
-#include "GUI/Views/CommonWidgets/DesignerHelper.h"
-#include "GUI/Views/CommonWidgets/StyleUtils.h"
+#include "GUI/CommonWidgets/DesignerHelper.h"
+#include "GUI/CommonWidgets/StyleUtils.h"
#include "GUI/Views/SampleDesigner/NodeEditorConnection.h"
#include <QObject>
#include <QPainter>
diff --git a/GUI/Views/SampleDesigner/DesignerMimeData.cpp b/GUI/Views/SampleDesigner/DesignerMimeData.cpp
index f2fd444a90cc5e8db34651a74c8a02272f80d740..fc2ef648f7cccda47e1aef9faaf024ef29ca5c03 100644
--- a/GUI/Views/SampleDesigner/DesignerMimeData.cpp
+++ b/GUI/Views/SampleDesigner/DesignerMimeData.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/DesignerMimeData.h"
-#include "GUI/Views/CommonWidgets/DesignerHelper.h"
+#include "GUI/CommonWidgets/DesignerHelper.h"
#include <QDrag>
#include <QPixmap>
#include <QWidget>
diff --git a/GUI/Views/SampleDesigner/DesignerScene.cpp b/GUI/Views/SampleDesigner/DesignerScene.cpp
index ddfaf5610622182d68af9111c8a1909b840dd728..fe838d06f3267eef3fa3c3747e509169102666e7 100644
--- a/GUI/Views/SampleDesigner/DesignerScene.cpp
+++ b/GUI/Views/SampleDesigner/DesignerScene.cpp
@@ -24,7 +24,7 @@
#include "GUI/Models/ParticleLayoutItem.h"
#include "GUI/Models/RotationItems.h"
#include "GUI/Models/SampleModel.h"
-#include "GUI/Views/CommonWidgets/DesignerHelper.h"
+#include "GUI/CommonWidgets/DesignerHelper.h"
#include "GUI/Views/SampleDesigner/DesignerMimeData.h"
#include "GUI/Views/SampleDesigner/LayerView.h"
#include "GUI/Views/SampleDesigner/MultiLayerView.h"
@@ -32,7 +32,7 @@
#include "GUI/Views/SampleDesigner/NodeEditorConnection.h"
#include "GUI/Views/SampleDesigner/SampleViewAligner.h"
#include "GUI/Views/SampleDesigner/SampleViewFactory.h"
-#include "GUI/mainwindow/projectdocument.h"
+#include "GUI/Project/projectdocument.h"
#include <QGraphicsSceneMouseEvent>
#include <QItemSelection>
#include <QPainter>
diff --git a/GUI/Views/SampleDesigner/FormLayouter.cpp b/GUI/Views/SampleDesigner/FormLayouter.cpp
index d133622c043603ece34a90b88f04604cfe2f1cc9..dfb47c912293c4348e5a4478176a95c7f5c5e383 100644
--- a/GUI/Views/SampleDesigner/FormLayouter.cpp
+++ b/GUI/Views/SampleDesigner/FormLayouter.cpp
@@ -15,8 +15,8 @@
#include "GUI/Views/SampleDesigner/FormLayouter.h"
#include "GUI/Models/UIntDescriptor.h"
#include "GUI/Models/VectorDescriptor.h"
-#include "GUI/Views/CommonWidgets/DoubleSpinBox.h"
-#include "GUI/Views/CommonWidgets/GroupBoxCollapser.h"
+#include "GUI/CommonWidgets/DoubleSpinBox.h"
+#include "GUI/CommonWidgets/GroupBoxCollapser.h"
#include "GUI/Views/SampleDesigner/LayerEditorUtils.h"
#include "GUI/Views/SampleDesigner/SampleEditorController.h"
diff --git a/GUI/Views/SampleDesigner/ILayerView.cpp b/GUI/Views/SampleDesigner/ILayerView.cpp
index f8ce66c4fc31ca2fe284f10d21da7d35606ca85b..2e967f232f84fafda08e9d05f6e4064c3523a70b 100644
--- a/GUI/Views/SampleDesigner/ILayerView.cpp
+++ b/GUI/Views/SampleDesigner/ILayerView.cpp
@@ -16,7 +16,7 @@
#include "GUI/Models/Error.h"
#include "GUI/Models/LayerItem.h"
#include "GUI/Models/SampleModel.h"
-#include "GUI/Views/CommonWidgets/DesignerHelper.h"
+#include "GUI/CommonWidgets/DesignerHelper.h"
#include "GUI/Views/SampleDesigner/DesignerScene.h"
#include "GUI/Views/SampleDesigner/MultiLayerView.h"
#include <QGraphicsSceneMouseEvent>
diff --git a/GUI/Views/SampleDesigner/InterferenceForm.cpp b/GUI/Views/SampleDesigner/InterferenceForm.cpp
index d02937d01c37f1014e7d3094aca9384a8132b016..b930727d14087680872be6dd612176a49253e228 100644
--- a/GUI/Views/SampleDesigner/InterferenceForm.cpp
+++ b/GUI/Views/SampleDesigner/InterferenceForm.cpp
@@ -15,7 +15,7 @@
#include "GUI/Views/SampleDesigner/InterferenceForm.h"
#include "GUI/Models/InterferenceItems.h"
#include "GUI/Models/ParticleLayoutItem.h"
-#include "GUI/Views/CommonWidgets/GroupBoxCollapser.h"
+#include "GUI/CommonWidgets/GroupBoxCollapser.h"
#include "GUI/Views/SampleDesigner/FormLayouter.h"
#include "GUI/Views/SampleDesigner/SampleEditorController.h"
#include "GUI/Views/SampleDesigner/SelectionContainerForm.h"
diff --git a/GUI/Views/SampleDesigner/InterferenceViews.cpp b/GUI/Views/SampleDesigner/InterferenceViews.cpp
index 2e8bcade65a3f3d4ad1503b61555251259580d3f..3de6f266d770262c5242f3edb5eadf5c5faa3c7b 100644
--- a/GUI/Views/SampleDesigner/InterferenceViews.cpp
+++ b/GUI/Views/SampleDesigner/InterferenceViews.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/InterferenceViews.h"
-#include "GUI/Views/CommonWidgets/DesignerHelper.h"
+#include "GUI/CommonWidgets/DesignerHelper.h"
Interference1DLatticeView::Interference1DLatticeView(QGraphicsItem* parent)
: ConnectableView(parent)
diff --git a/GUI/Views/SampleDesigner/LayerEditorUtils.cpp b/GUI/Views/SampleDesigner/LayerEditorUtils.cpp
index fa05c9cd1179bae4ff8f3e5a8d9551b5e5a923e3..950da909332eecccd7a0e6ad7a22ecefb9e00287 100644
--- a/GUI/Views/SampleDesigner/LayerEditorUtils.cpp
+++ b/GUI/Views/SampleDesigner/LayerEditorUtils.cpp
@@ -23,7 +23,7 @@
#include "GUI/Models/ParticleItem.h"
#include "GUI/Models/RotationItems.h"
#include "GUI/Models/VectorDescriptor.h"
-#include "GUI/Views/CommonWidgets/DoubleSpinBox.h"
+#include "GUI/CommonWidgets/DoubleSpinBox.h"
#include "GUI/Views/SampleDesigner/MesoCrystalForm.h"
#include "GUI/Views/SampleDesigner/ParticleCompositionForm.h"
#include "GUI/Views/SampleDesigner/ParticleCoreShellForm.h"
diff --git a/GUI/Views/SampleDesigner/LayerForm.cpp b/GUI/Views/SampleDesigner/LayerForm.cpp
index cb77b856d3fc5bae56651c8f9e962e2769c7a897..4dc6d3488c6a2d284c23543e2072d2482315eb2c 100644
--- a/GUI/Views/SampleDesigner/LayerForm.cpp
+++ b/GUI/Views/SampleDesigner/LayerForm.cpp
@@ -16,7 +16,7 @@
#include "GUI/Models/LayerItem.h"
#include "GUI/Models/MultiLayerItem.h"
#include "GUI/Models/UIntDescriptor.h"
-#include "GUI/Views/CommonWidgets/GroupBoxCollapser.h"
+#include "GUI/CommonWidgets/GroupBoxCollapser.h"
#include "GUI/Views/SampleDesigner/MaterialInplaceForm.h"
#include "GUI/Views/SampleDesigner/ParticleLayoutForm.h"
#include "GUI/Views/SampleDesigner/SampleEditorController.h"
diff --git a/GUI/Views/SampleDesigner/LayerOrientedSampleEditor.cpp b/GUI/Views/SampleDesigner/LayerOrientedSampleEditor.cpp
index 9116a39a3c0d949241f689ce69a4f4d3873d48fc..45e5107398f7d90406f29103f236e105b8ab541e 100644
--- a/GUI/Views/SampleDesigner/LayerOrientedSampleEditor.cpp
+++ b/GUI/Views/SampleDesigner/LayerOrientedSampleEditor.cpp
@@ -15,7 +15,7 @@
#include "GUI/Views/SampleDesigner/LayerOrientedSampleEditor.h"
#include "GUI/Models/LayerItem.h"
#include "GUI/Models/MultiLayerItem.h"
-#include "GUI/Views/CommonWidgets/StyledToolBar.h"
+#include "GUI/CommonWidgets/StyledToolBar.h"
#include "GUI/Views/SampleDesigner/LayerEditorUtils.h"
#include "GUI/Views/SampleDesigner/MultiLayerForm.h"
#include "GUI/Views/SampleDesigner/SampleEditorController.h"
diff --git a/GUI/Views/SampleDesigner/LayerView.cpp b/GUI/Views/SampleDesigner/LayerView.cpp
index 4132263c9e8f7a10bb73210b739df2bcb426e244..c87c3ab23e7db356518fc5b9d53bed93af3059e5 100644
--- a/GUI/Views/SampleDesigner/LayerView.cpp
+++ b/GUI/Views/SampleDesigner/LayerView.cpp
@@ -14,7 +14,7 @@
#include "GUI/Views/SampleDesigner/LayerView.h"
#include "GUI/Models/LayerItem.h"
-#include "GUI/Views/CommonWidgets/DesignerHelper.h"
+#include "GUI/CommonWidgets/DesignerHelper.h"
#include "GUI/Views/SampleDesigner/MultiLayerView.h"
#include "GUI/Views/SampleDesigner/ParticleLayoutView.h"
#include <QPainter>
diff --git a/GUI/Views/SampleDesigner/MaterialInplaceForm.cpp b/GUI/Views/SampleDesigner/MaterialInplaceForm.cpp
index de56b8d6b175801dd9c6649c26332ce362a84fc5..8b6f6a63add75c7a1fd30ee40c11184e2ca04f9e 100644
--- a/GUI/Views/SampleDesigner/MaterialInplaceForm.cpp
+++ b/GUI/Views/SampleDesigner/MaterialInplaceForm.cpp
@@ -20,12 +20,12 @@
#include "GUI/Models/MaterialModelStore.h"
#include "GUI/Models/ModelPath.h"
#include "GUI/Models/VectorDescriptor.h"
-#include "GUI/Views/CommonWidgets/DoubleLineEdit.h"
-#include "GUI/Views/CommonWidgets/DoubleSpinBox.h"
+#include "GUI/CommonWidgets/DoubleLineEdit.h"
+#include "GUI/CommonWidgets/DoubleSpinBox.h"
#include "GUI/Views/MaterialEditor/MaterialEditorDialog.h"
#include "GUI/Views/SampleDesigner/LayerEditorUtils.h"
#include "GUI/Views/SampleDesigner/SampleEditorController.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Project/projectmanager.h"
#include "GUI/utils/LayoutUtils.h"
#include <QGridLayout>
diff --git a/GUI/Views/SampleDesigner/MesoCrystalForm.cpp b/GUI/Views/SampleDesigner/MesoCrystalForm.cpp
index fff3322efe74c697790ab166636b8dad4dc21242..f792ec50e2278bd9302b3d0ec8c2ec5d80c51892 100644
--- a/GUI/Views/SampleDesigner/MesoCrystalForm.cpp
+++ b/GUI/Views/SampleDesigner/MesoCrystalForm.cpp
@@ -17,7 +17,7 @@
#include "GUI/Models/MesoCrystalItem.h"
#include "GUI/Models/ParticleItem.h"
#include "GUI/Models/VectorDescriptor.h"
-#include "GUI/Views/CommonWidgets/GroupBoxCollapser.h"
+#include "GUI/CommonWidgets/GroupBoxCollapser.h"
#include "GUI/Views/SampleDesigner/FormLayouter.h"
#include "GUI/Views/SampleDesigner/LayerEditorUtils.h"
#include "GUI/Views/SampleDesigner/SampleEditorController.h"
diff --git a/GUI/Views/SampleDesigner/MesoCrystalView.cpp b/GUI/Views/SampleDesigner/MesoCrystalView.cpp
index 11e0d2dae63c4bdd4c3495f4ca59b4e4366b1ea0..ee9d801a7a624ca7c4aa7ee2c7ab69ff8a38a3b9 100644
--- a/GUI/Views/SampleDesigner/MesoCrystalView.cpp
+++ b/GUI/Views/SampleDesigner/MesoCrystalView.cpp
@@ -15,8 +15,8 @@
#include "GUI/Views/SampleDesigner/MesoCrystalView.h"
#include "GUI/Models/MesoCrystalItem.h"
#include "GUI/Models/ParticleItem.h"
-#include "GUI/Views/CommonWidgets/DesignerHelper.h"
-#include "GUI/Views/CommonWidgets/StyleUtils.h"
+#include "GUI/CommonWidgets/DesignerHelper.h"
+#include "GUI/CommonWidgets/StyleUtils.h"
MesoCrystalView::MesoCrystalView(QGraphicsItem* parent) : ConnectableView(parent)
{
diff --git a/GUI/Views/SampleDesigner/MultiLayerForm.cpp b/GUI/Views/SampleDesigner/MultiLayerForm.cpp
index 6015cab1a1f96ffced5a904de43d1ae84d659d8b..db8abcd8f830d9a37336698132e1adef9206978d 100644
--- a/GUI/Views/SampleDesigner/MultiLayerForm.cpp
+++ b/GUI/Views/SampleDesigner/MultiLayerForm.cpp
@@ -15,8 +15,8 @@
#include "GUI/Views/SampleDesigner/MultiLayerForm.h"
#include "GUI/Models/MultiLayerItem.h"
#include "GUI/Models/VectorDescriptor.h"
-#include "GUI/Views/CommonWidgets/DoubleSpinBox.h"
-#include "GUI/Views/CommonWidgets/GroupBoxCollapser.h"
+#include "GUI/CommonWidgets/DoubleSpinBox.h"
+#include "GUI/CommonWidgets/GroupBoxCollapser.h"
#include "GUI/Views/SampleDesigner/LayerEditorUtils.h"
#include "GUI/Views/SampleDesigner/LayerForm.h"
#include "GUI/Views/SampleDesigner/MesoCrystalForm.h"
diff --git a/GUI/Views/SampleDesigner/MultiLayerView.cpp b/GUI/Views/SampleDesigner/MultiLayerView.cpp
index 1a190973914c2c2b4aed4adec8eaa2f9cfc2ddc3..f37643ded943c92cb98f25c7d24a8c673cbedc11 100644
--- a/GUI/Views/SampleDesigner/MultiLayerView.cpp
+++ b/GUI/Views/SampleDesigner/MultiLayerView.cpp
@@ -15,7 +15,7 @@
#include "GUI/Views/SampleDesigner/MultiLayerView.h"
#include "GUI/Models/SampleModel.h"
#include "GUI/Models/SessionGraphicsItem.h"
-#include "GUI/Views/CommonWidgets/DesignerHelper.h"
+#include "GUI/CommonWidgets/DesignerHelper.h"
#include "GUI/Views/SampleDesigner/DesignerMimeData.h"
#include "GUI/Views/SampleDesigner/DesignerScene.h"
#include "GUI/Views/SampleDesigner/LayerView.h"
diff --git a/GUI/Views/SampleDesigner/NodeEditorPort.cpp b/GUI/Views/SampleDesigner/NodeEditorPort.cpp
index 6640777c2da8a2651282be1d1c711617b8fb4cad..856e2bb689602b6e422ee1ed8a21c436434464ed 100644
--- a/GUI/Views/SampleDesigner/NodeEditorPort.cpp
+++ b/GUI/Views/SampleDesigner/NodeEditorPort.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/NodeEditorPort.h"
-#include "GUI/Views/CommonWidgets/DesignerHelper.h"
-#include "GUI/Views/CommonWidgets/StyleUtils.h"
+#include "GUI/CommonWidgets/DesignerHelper.h"
+#include "GUI/CommonWidgets/StyleUtils.h"
#include "GUI/Views/SampleDesigner/NodeEditorConnection.h"
#include <QGraphicsScene>
#include <QPainter>
diff --git a/GUI/Views/SampleDesigner/ParticleCompositionForm.cpp b/GUI/Views/SampleDesigner/ParticleCompositionForm.cpp
index 70088b9d984c578af13b0c640f5081df1bd07773..a13d2b377161b558e3f2417dbfb576ab692bd7f1 100644
--- a/GUI/Views/SampleDesigner/ParticleCompositionForm.cpp
+++ b/GUI/Views/SampleDesigner/ParticleCompositionForm.cpp
@@ -15,7 +15,7 @@
#include "GUI/Views/SampleDesigner/ParticleCompositionForm.h"
#include "GUI/Models/ParticleCompositionItem.h"
#include "GUI/Models/VectorDescriptor.h"
-#include "GUI/Views/CommonWidgets/GroupBoxCollapser.h"
+#include "GUI/CommonWidgets/GroupBoxCollapser.h"
#include "GUI/Views/SampleDesigner/FormLayouter.h"
#include "GUI/Views/SampleDesigner/LayerEditorUtils.h"
#include "GUI/Views/SampleDesigner/SampleEditorController.h"
diff --git a/GUI/Views/SampleDesigner/ParticleCompositionView.cpp b/GUI/Views/SampleDesigner/ParticleCompositionView.cpp
index 1ac5bb8bd456ec2180126aa43b2db4e7ad9ac529..6347749ec60b1fbdf82887af4ab25774238f317d 100644
--- a/GUI/Views/SampleDesigner/ParticleCompositionView.cpp
+++ b/GUI/Views/SampleDesigner/ParticleCompositionView.cpp
@@ -14,8 +14,8 @@
#include "GUI/Views/SampleDesigner/ParticleCompositionView.h"
#include "GUI/Models/ParticleItem.h"
-#include "GUI/Views/CommonWidgets/DesignerHelper.h"
-#include "GUI/Views/CommonWidgets/StyleUtils.h"
+#include "GUI/CommonWidgets/DesignerHelper.h"
+#include "GUI/CommonWidgets/StyleUtils.h"
ParticleCompositionView::ParticleCompositionView(QGraphicsItem* parent) : ConnectableView(parent)
{
diff --git a/GUI/Views/SampleDesigner/ParticleCoreShellForm.cpp b/GUI/Views/SampleDesigner/ParticleCoreShellForm.cpp
index 36f99ff3ebca1d439d28371890c67525aaafa53a..348ba31f5c69dd457b261742ffee74154030a5e0 100644
--- a/GUI/Views/SampleDesigner/ParticleCoreShellForm.cpp
+++ b/GUI/Views/SampleDesigner/ParticleCoreShellForm.cpp
@@ -18,7 +18,7 @@
#include "GUI/Models/ParticleCoreShellItem.h"
#include "GUI/Models/ParticleItem.h"
#include "GUI/Models/VectorDescriptor.h"
-#include "GUI/Views/CommonWidgets/GroupBoxCollapser.h"
+#include "GUI/CommonWidgets/GroupBoxCollapser.h"
#include "GUI/Views/SampleDesigner/SampleEditorController.h"
#include "GUI/Views/SampleDesigner/SelectionContainerForm.h"
#include "GUI/utils/ActionFactory.h"
diff --git a/GUI/Views/SampleDesigner/ParticleCoreShellView.cpp b/GUI/Views/SampleDesigner/ParticleCoreShellView.cpp
index 8e6e4cfae16cfb1776e276c54cdac01057b8e181..64bad7bed296561f62a65e37b522b966036a9821 100644
--- a/GUI/Views/SampleDesigner/ParticleCoreShellView.cpp
+++ b/GUI/Views/SampleDesigner/ParticleCoreShellView.cpp
@@ -14,8 +14,8 @@
#include "GUI/Views/SampleDesigner/ParticleCoreShellView.h"
#include "GUI/Models/ParticleCoreShellItem.h"
-#include "GUI/Views/CommonWidgets/DesignerHelper.h"
-#include "GUI/Views/CommonWidgets/StyleUtils.h"
+#include "GUI/CommonWidgets/DesignerHelper.h"
+#include "GUI/CommonWidgets/StyleUtils.h"
ParticleCoreShellView::ParticleCoreShellView(QGraphicsItem* parent) : ConnectableView(parent)
{
diff --git a/GUI/Views/SampleDesigner/ParticleForm.cpp b/GUI/Views/SampleDesigner/ParticleForm.cpp
index 3811f69a89de64653cfe965e2be129fc51d084db..d6a3b399f74727a5c45aa43ad9a1100437ac188d 100644
--- a/GUI/Views/SampleDesigner/ParticleForm.cpp
+++ b/GUI/Views/SampleDesigner/ParticleForm.cpp
@@ -17,7 +17,7 @@
#include "GUI/Models/FormFactorItems.h"
#include "GUI/Models/ParticleItem.h"
#include "GUI/Models/VectorDescriptor.h"
-#include "GUI/Views/CommonWidgets/GroupBoxCollapser.h"
+#include "GUI/CommonWidgets/GroupBoxCollapser.h"
#include "GUI/Views/SampleDesigner/FormLayouter.h"
#include "GUI/Views/SampleDesigner/MaterialInplaceForm.h"
#include "GUI/Views/SampleDesigner/SampleEditorController.h"
diff --git a/GUI/Views/SampleDesigner/ParticleLayoutForm.cpp b/GUI/Views/SampleDesigner/ParticleLayoutForm.cpp
index e048bf5c978ffae6c826b18ea8ec0b2289c6b245..0b59ad6de39f5f3e0adb342cff8dcefbb917ad4f 100644
--- a/GUI/Views/SampleDesigner/ParticleLayoutForm.cpp
+++ b/GUI/Views/SampleDesigner/ParticleLayoutForm.cpp
@@ -15,7 +15,7 @@
#include "GUI/Views/SampleDesigner/ParticleLayoutForm.h"
#include "GUI/Models/ItemWithParticles.h"
#include "GUI/Models/ParticleLayoutItem.h"
-#include "GUI/Views/CommonWidgets/GroupBoxCollapser.h"
+#include "GUI/CommonWidgets/GroupBoxCollapser.h"
#include "GUI/Views/SampleDesigner/InterferenceForm.h"
#include "GUI/Views/SampleDesigner/LayerEditorUtils.h"
#include "GUI/Views/SampleDesigner/LayerForm.h"
diff --git a/GUI/Views/SampleDesigner/ParticleLayoutView.cpp b/GUI/Views/SampleDesigner/ParticleLayoutView.cpp
index 48a1429948e2bbbb973ae0d903c22e21af3e8838..de9346b01d6a4ca1c58bf4752d205febdfba11b1 100644
--- a/GUI/Views/SampleDesigner/ParticleLayoutView.cpp
+++ b/GUI/Views/SampleDesigner/ParticleLayoutView.cpp
@@ -15,7 +15,7 @@
#include "GUI/Views/SampleDesigner/ParticleLayoutView.h"
#include "GUI/Models/Error.h"
#include "GUI/Models/SessionItem.h"
-#include "GUI/Views/CommonWidgets/DesignerHelper.h"
+#include "GUI/CommonWidgets/DesignerHelper.h"
#include "GUI/Views/SampleDesigner/ParticleView.h"
ParticleLayoutView::ParticleLayoutView(QGraphicsItem* parent) : ConnectableView(parent)
diff --git a/GUI/Views/SampleDesigner/ParticleView.cpp b/GUI/Views/SampleDesigner/ParticleView.cpp
index eaba862c6cf6ab2d247bf20f3cba23400c8de3b0..c1b8d9478b3ae97cb26ecc3765c71ddf1d697adf 100644
--- a/GUI/Views/SampleDesigner/ParticleView.cpp
+++ b/GUI/Views/SampleDesigner/ParticleView.cpp
@@ -17,8 +17,8 @@
#include "GUI/Models/FormFactorItems.h"
#include "GUI/Models/GroupItem.h"
#include "GUI/Models/ParticleItem.h"
-#include "GUI/Views/CommonWidgets/DesignerHelper.h"
-#include "GUI/Views/CommonWidgets/StyleUtils.h"
+#include "GUI/CommonWidgets/DesignerHelper.h"
+#include "GUI/CommonWidgets/StyleUtils.h"
#include <QObject>
#include <QPainter>
#include <QStyleOptionGraphicsItem>
diff --git a/GUI/Views/SampleDesigner/SampleEditorController.cpp b/GUI/Views/SampleDesigner/SampleEditorController.cpp
index 34e018fa675136fde1ff80264ac8b80997b59aad..f5c9a60d8e9c5ce440aea50235ad84e0e3a837c7 100644
--- a/GUI/Views/SampleDesigner/SampleEditorController.cpp
+++ b/GUI/Views/SampleDesigner/SampleEditorController.cpp
@@ -21,7 +21,7 @@
#include "GUI/Models/ParticleItem.h"
#include "GUI/Models/ParticleLayoutItem.h"
#include "GUI/Models/UIntDescriptor.h"
-#include "GUI/Views/CommonWidgets/DoubleSpinBox.h"
+#include "GUI/CommonWidgets/DoubleSpinBox.h"
#include "GUI/Views/SampleDesigner/InterferenceForm.h"
#include "GUI/Views/SampleDesigner/LayerForm.h"
#include "GUI/Views/SampleDesigner/MaterialInplaceForm.h"
diff --git a/GUI/Views/SampleDesigner/SampleListView.cpp b/GUI/Views/SampleDesigner/SampleListView.cpp
index d7f41c3db8273d1b3b4e34190f1e6fd035c752f1..8a7957a21d39376dca44253b17db39f5d698b566 100644
--- a/GUI/Views/SampleDesigner/SampleListView.cpp
+++ b/GUI/Views/SampleDesigner/SampleListView.cpp
@@ -17,7 +17,7 @@
#include "GUI/Models/GUIExamplesFactory.h"
#include "GUI/Models/MultiLayerItem.h"
#include "GUI/Models/SampleListModel.h"
-#include "GUI/Views/CommonWidgets/ItemViewOverlayButtons.h"
+#include "GUI/CommonWidgets/ItemViewOverlayButtons.h"
#include "GUI/utils/ItemDelegateForHTML.h"
#include <QAction>
#include <QDialog>
diff --git a/GUI/Views/SampleDesigner/SampleToolBar.cpp b/GUI/Views/SampleDesigner/SampleToolBar.cpp
index b5f706405da714e32a4a9994a1a9a41d1c8b225b..52a18cb4a1e3e4a64a136007e4a1981c77de877e 100644
--- a/GUI/Views/SampleDesigner/SampleToolBar.cpp
+++ b/GUI/Views/SampleDesigner/SampleToolBar.cpp
@@ -16,7 +16,7 @@
#include "GUI/Views/MaterialEditor/MaterialEditorDialog.h"
#include "GUI/Views/SampleDesigner/DesignerView.h"
#include "GUI/Views/SampleView.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Project/projectmanager.h"
#include <QAction>
#include <QButtonGroup>
#include <QComboBox>
diff --git a/GUI/Views/SampleDesigner/SampleToolBar.h b/GUI/Views/SampleDesigner/SampleToolBar.h
index 456b56e75ab8de3fedabd7294592c36a0c4e204c..e5df4beea033df6ca710405660207b029d2796d7 100644
--- a/GUI/Views/SampleDesigner/SampleToolBar.h
+++ b/GUI/Views/SampleDesigner/SampleToolBar.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SAMPLETOOLBAR_H
#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SAMPLETOOLBAR_H
-#include "GUI/Views/CommonWidgets/StyledToolBar.h"
+#include "GUI/CommonWidgets/StyledToolBar.h"
#include <QTreeView>
class QAction;
diff --git a/GUI/Views/SampleDesigner/SampleViewAligner.cpp b/GUI/Views/SampleDesigner/SampleViewAligner.cpp
index 66db00d47e51ab93d7676269082f5b1129c409c7..48c7592165c257f6f8b95ffb05bba75e98de5ebc 100644
--- a/GUI/Views/SampleDesigner/SampleViewAligner.cpp
+++ b/GUI/Views/SampleDesigner/SampleViewAligner.cpp
@@ -16,7 +16,7 @@
#include "GUI/Models/LayerItem.h"
#include "GUI/Models/MultiLayerItem.h"
#include "GUI/Models/SampleModel.h"
-#include "GUI/Views/CommonWidgets/StyleUtils.h"
+#include "GUI/CommonWidgets/StyleUtils.h"
#include "GUI/Views/SampleDesigner/DesignerScene.h"
#include "GUI/Views/SampleDesigner/IView.h"
#include <QModelIndex>
diff --git a/GUI/Views/SampleDesigner/ScriptPanel.cpp b/GUI/Views/SampleDesigner/ScriptPanel.cpp
index bae2dbb4a3cc42679595bd769c405ecffb097c4c..1ece6448628b5c83bccabc57533c1cbea9319853 100644
--- a/GUI/Views/SampleDesigner/ScriptPanel.cpp
+++ b/GUI/Views/SampleDesigner/ScriptPanel.cpp
@@ -17,10 +17,10 @@
#include "GUI/Models/DomainObjectBuilder.h"
#include "GUI/Models/MultiLayerItem.h"
#include "GUI/Models/SampleModel.h"
-#include "GUI/Views/CommonWidgets/DesignerHelper.h"
-#include "GUI/Views/CommonWidgets/UpdateTimer.h"
-#include "GUI/Views/InfoWidgets/PythonSyntaxHighlighter.h"
-#include "GUI/Views/InfoWidgets/CautionSign.h"
+#include "GUI/CommonWidgets/DesignerHelper.h"
+#include "GUI/CommonWidgets/UpdateTimer.h"
+#include "GUI/InfoWidgets/PythonSyntaxHighlighter.h"
+#include "GUI/InfoWidgets/CautionSign.h"
#include "Sample/Multilayer/MultiLayer.h"
#include <QScrollBar>
diff --git a/GUI/Views/SampleDesigner/ScriptPanel.h b/GUI/Views/SampleDesigner/ScriptPanel.h
index a7273eb5d570a526d3255a259ae583ee62958fd0..6406b06edede7c792cd285209db20da238464ba6 100644
--- a/GUI/Views/SampleDesigner/ScriptPanel.h
+++ b/GUI/Views/SampleDesigner/ScriptPanel.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SCRIPTPANEL_H
#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SCRIPTPANEL_H
-#include "GUI/Views/CommonWidgets/InfoPanel.h"
+#include "GUI/CommonWidgets/InfoPanel.h"
class SampleModel;
class PythonSyntaxHighlighter;
diff --git a/GUI/Views/SampleDesigner/TransformationView.cpp b/GUI/Views/SampleDesigner/TransformationView.cpp
index ae78e585e1a16e828d0bf22c231690cf551c411a..17481742a59a8f97daf640c9bba796d7fb0211cc 100644
--- a/GUI/Views/SampleDesigner/TransformationView.cpp
+++ b/GUI/Views/SampleDesigner/TransformationView.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/TransformationView.h"
-#include "GUI/Views/CommonWidgets/DesignerHelper.h"
+#include "GUI/CommonWidgets/DesignerHelper.h"
TransformationView::TransformationView(QGraphicsItem* parent) : ConnectableView(parent)
{
diff --git a/GUI/Views/SampleView.cpp b/GUI/Views/SampleView.cpp
index bbd664f18bb68d46b408b4b874c72db6f5341b5d..9c6982da54095fa7c3443bf16ec2f8b7222d9988 100644
--- a/GUI/Views/SampleView.cpp
+++ b/GUI/Views/SampleView.cpp
@@ -16,7 +16,7 @@
#include "GUI/Models/ApplicationModels.h"
#include "GUI/Models/FilterPropertyProxy.h"
#include "GUI/Models/MultiLayerItem.h"
-#include "GUI/Views/CommonWidgets/DocksController.h"
+#include "GUI/CommonWidgets/DocksController.h"
#include "GUI/Views/SampleDesigner/DesignerScene.h"
#include "GUI/Views/SampleDesigner/DesignerView.h"
#include "GUI/Views/SampleDesigner/LayerOrientedSampleEditor.h"
@@ -28,7 +28,7 @@
#include "GUI/Views/SampleDesigner/SampleTreeWidget.h"
#include "GUI/Views/SampleDesigner/ScriptPanel.h"
#include "GUI/mainwindow/mainwindow.h"
-#include "GUI/mainwindow/projectdocument.h"
+#include "GUI/Project/projectdocument.h"
#include <QBoxLayout>
#include <QDockWidget>
diff --git a/GUI/Views/SessionModelView.cpp b/GUI/Views/SessionModelView.cpp
index c6cc343c9ae767ddd180587f2f21d1b87f598866..05c39682d3f1be87de505007d3a9aeccf1d5487a 100644
--- a/GUI/Views/SessionModelView.cpp
+++ b/GUI/Views/SessionModelView.cpp
@@ -18,12 +18,12 @@
#include "GUI/Models/MaterialModel.h"
#include "GUI/Models/RealDataModel.h"
#include "GUI/Models/SampleModel.h"
-#include "GUI/Views/CommonWidgets/ModelTreeView.h"
+#include "GUI/CommonWidgets/ModelTreeView.h"
#include "GUI/Views/SessionModelDelegate.h"
#include "GUI/Views/TestView.h"
#include "GUI/mainwindow/mainwindow.h"
-#include "GUI/mainwindow/projectdocument.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Project/projectdocument.h"
+#include "GUI/Project/projectmanager.h"
#include <QToolBar>
#include <QToolButton>
#include <QVBoxLayout>
diff --git a/GUI/Views/SimulationView.cpp b/GUI/Views/SimulationView.cpp
index ef03952f54f1c396cef1ef2dcd146d936ec796f2..e3958e7306b90804b7f3e95cf0659223f509a66b 100644
--- a/GUI/Views/SimulationView.cpp
+++ b/GUI/Views/SimulationView.cpp
@@ -26,11 +26,11 @@
#include "GUI/Models/SampleModel.h"
#include "GUI/Models/SampleValidator.h"
#include "GUI/Models/SimulationOptionsItem.h"
-#include "GUI/Views/CommonWidgets/GroupBoxCollapser.h"
+#include "GUI/CommonWidgets/GroupBoxCollapser.h"
#include "GUI/Views/SimulationWidgets/PythonScriptWidget.h"
#include "GUI/mainwindow/mainwindow.h"
-#include "GUI/mainwindow/projectdocument.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Project/projectdocument.h"
+#include "GUI/Project/projectmanager.h"
#include "ui_SimulationView.h"
#include <QButtonGroup>
#include <QMessageBox>
diff --git a/GUI/Views/SimulationWidgets/PythonScriptWidget.cpp b/GUI/Views/SimulationWidgets/PythonScriptWidget.cpp
index d167cc9919b458976fa570aa8236c8d5b853e480..73eace35a1a7cebe85ca2b2b562a629e024c0716 100644
--- a/GUI/Views/SimulationWidgets/PythonScriptWidget.cpp
+++ b/GUI/Views/SimulationWidgets/PythonScriptWidget.cpp
@@ -17,11 +17,11 @@
#include "Core/Simulation/GISASSimulation.h"
#include "GUI/Application/Application.h"
#include "GUI/Models/DomainSimulationBuilder.h"
-#include "GUI/Views/CommonWidgets/DesignerHelper.h"
-#include "GUI/Views/CommonWidgets/StyleUtils.h"
-#include "GUI/Views/CommonWidgets/StyledToolBar.h"
-#include "GUI/Views/InfoWidgets/PythonSyntaxHighlighter.h"
-#include "GUI/Views/InfoWidgets/CautionSign.h"
+#include "GUI/CommonWidgets/DesignerHelper.h"
+#include "GUI/CommonWidgets/StyleUtils.h"
+#include "GUI/CommonWidgets/StyledToolBar.h"
+#include "GUI/InfoWidgets/PythonSyntaxHighlighter.h"
+#include "GUI/InfoWidgets/CautionSign.h"
#include <QFileDialog>
#include <QMessageBox>
#include <QPushButton>
diff --git a/GUI/Views/SpecularDataWidgets/Plot1DCanvas.h b/GUI/Views/SpecularDataWidgets/Plot1DCanvas.h
index b5dddacf64920efe4e9d74329ebaacf451f55df5..6f9f784c5b8412ea246068372f2bdf2377212fe5 100644
--- a/GUI/Views/SpecularDataWidgets/Plot1DCanvas.h
+++ b/GUI/Views/SpecularDataWidgets/Plot1DCanvas.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_SPECULARDATAWIDGETS_PLOT1DCANVAS_H
#define BORNAGAIN_GUI_VIEWS_SPECULARDATAWIDGETS_PLOT1DCANVAS_H
-#include "GUI/Views/CommonWidgets/SessionItemWidget.h"
+#include "GUI/CommonWidgets/SessionItemWidget.h"
class FontScalingEvent;
class PlotStatusLabel;
diff --git a/GUI/Views/SpecularDataWidgets/SpecularDataCanvas.cpp b/GUI/Views/SpecularDataWidgets/SpecularDataCanvas.cpp
index 6fef3db395eb564bddb7a4b88884aaa0ff4adc35..d9d0ebc7a59da9748ca68970ba9f0a8fe7244f10 100644
--- a/GUI/Views/SpecularDataWidgets/SpecularDataCanvas.cpp
+++ b/GUI/Views/SpecularDataWidgets/SpecularDataCanvas.cpp
@@ -16,7 +16,7 @@
#include "GUI/Models/SpecularDataItem.h"
#include "GUI/Views/IntensityDataWidgets/SavePlotAssistant.h"
#include "GUI/Views/SpecularDataWidgets/SpecularPlotCanvas.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Project/projectmanager.h"
#include <qcustomplot.h>
SpecularDataCanvas::SpecularDataCanvas(QWidget* parent)
diff --git a/GUI/Views/SpecularDataWidgets/SpecularDataCanvas.h b/GUI/Views/SpecularDataWidgets/SpecularDataCanvas.h
index 78be99e8bcf4b0aa497be3652279b9d4f1ca6fd7..4c28ecb976e378a0885e0bd587781756e9f40179 100644
--- a/GUI/Views/SpecularDataWidgets/SpecularDataCanvas.h
+++ b/GUI/Views/SpecularDataWidgets/SpecularDataCanvas.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_SPECULARDATAWIDGETS_SPECULARDATACANVAS_H
#define BORNAGAIN_GUI_VIEWS_SPECULARDATAWIDGETS_SPECULARDATACANVAS_H
-#include "GUI/Views/CommonWidgets/SessionItemWidget.h"
+#include "GUI/CommonWidgets/SessionItemWidget.h"
#include <QWidget>
class SpecularDataItem;
diff --git a/GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.h b/GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.h
index fd1074638be654175dad8603616544f322a7bd97..65bd082073dbb5f01c74449df0d779794be5764a 100644
--- a/GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.h
+++ b/GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.h
@@ -16,7 +16,7 @@
#define BORNAGAIN_GUI_VIEWS_SPECULARDATAWIDGETS_SPECULARDATAIMPORTWIDGET_H
#include "GUI/Models/AbstractDataLoader1D.h"
-#include "GUI/Views/CommonWidgets/SessionItemWidget.h"
+#include "GUI/CommonWidgets/SessionItemWidget.h"
#include "qcustomplot.h"
#include <memory>
diff --git a/GUI/Views/SpecularDataWidgets/SpecularDataWidget.h b/GUI/Views/SpecularDataWidgets/SpecularDataWidget.h
index 580c34374e6d5f750dbd12718fffd22f19cc88aa..639649217c632d6151fc2cc7b2f8a4ae941bc012 100644
--- a/GUI/Views/SpecularDataWidgets/SpecularDataWidget.h
+++ b/GUI/Views/SpecularDataWidgets/SpecularDataWidget.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_SPECULARDATAWIDGETS_SPECULARDATAWIDGET_H
#define BORNAGAIN_GUI_VIEWS_SPECULARDATAWIDGETS_SPECULARDATAWIDGET_H
-#include "GUI/Views/CommonWidgets/SessionItemWidget.h"
+#include "GUI/CommonWidgets/SessionItemWidget.h"
class SpecularDataCanvas;
class SpecularDataItem;
diff --git a/GUI/Views/SpecularDataWidgets/SpecularPlot.cpp b/GUI/Views/SpecularDataWidgets/SpecularPlot.cpp
index 3b09620a0494750753d91ad691d05d30b4cc4c58..a786b267fdb89e2e8693c774d8029aa5944118e9 100644
--- a/GUI/Views/SpecularDataWidgets/SpecularPlot.cpp
+++ b/GUI/Views/SpecularDataWidgets/SpecularPlot.cpp
@@ -15,7 +15,7 @@
#include "GUI/Views/SpecularDataWidgets/SpecularPlot.h"
#include "GUI/Models/AxesItems.h"
#include "GUI/Models/SpecularDataItem.h"
-#include "GUI/Views/CommonWidgets/UpdateTimer.h"
+#include "GUI/CommonWidgets/UpdateTimer.h"
#include "GUI/Views/IntensityDataWidgets/ColorMapUtils.h"
#include "GUI/Views/IntensityDataWidgets/PlotEventInfo.h"
#include "GUI/Views/IntensityDataWidgets/plot_constants.h"
diff --git a/GUI/Views/SpecularDataWidgets/SpecularPlotCanvas.h b/GUI/Views/SpecularDataWidgets/SpecularPlotCanvas.h
index 8b1c36ec87742bbc5a6be830c1c44e6d97e0a7dd..f17b0c8ec4a747f8efb3d9bc462b9d350a675656 100644
--- a/GUI/Views/SpecularDataWidgets/SpecularPlotCanvas.h
+++ b/GUI/Views/SpecularDataWidgets/SpecularPlotCanvas.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_SPECULARDATAWIDGETS_SPECULARPLOTCANVAS_H
#define BORNAGAIN_GUI_VIEWS_SPECULARDATAWIDGETS_SPECULARPLOTCANVAS_H
-#include "GUI/Views/CommonWidgets/SessionItemWidget.h"
+#include "GUI/CommonWidgets/SessionItemWidget.h"
class FontScalingEvent;
class PlotStatusLabel;
diff --git a/GUI/Views/WelcomeView.cpp b/GUI/Views/WelcomeView.cpp
index 3ad7f0b51a82213a8a463f0c49eefcd8a92468ec..5c336c57ecffdd66badb5b0244bd4eb34fe5e108 100644
--- a/GUI/Views/WelcomeView.cpp
+++ b/GUI/Views/WelcomeView.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Views/WelcomeView.h"
-#include "GUI/Views/CommonWidgets/GroupBoxCollapser.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/CommonWidgets/GroupBoxCollapser.h"
+#include "GUI/Project/projectmanager.h"
#include "GUI/utils/LayoutUtils.h"
#include "GUI/utils/qstringutils.h"
#include "ui_WelcomeView.h"
diff --git a/GUI/mainwindow/AutosaveController.cpp b/GUI/mainwindow/AutosaveController.cpp
index 35af4fdce3a8bc3e0b8812e71afdb1c38d57bdd9..e5ac7e6c2476a91ddb4fcb97ab258032d67e5b53 100644
--- a/GUI/mainwindow/AutosaveController.cpp
+++ b/GUI/mainwindow/AutosaveController.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/mainwindow/AutosaveController.h"
-#include "GUI/Views/CommonWidgets/UpdateTimer.h"
-#include "GUI/mainwindow/ProjectUtils.h"
-#include "GUI/mainwindow/projectdocument.h"
+#include "GUI/CommonWidgets/UpdateTimer.h"
+#include "GUI/Project/ProjectUtils.h"
+#include "GUI/Project/projectdocument.h"
#include <QDir>
namespace {
diff --git a/GUI/mainwindow/OutputDataIOService.cpp b/GUI/mainwindow/OutputDataIOService.cpp
index 13d21bbe8b0b0b0f34507c0ae45c9097e201e07c..a71f310a49c25fdf135cc92f569a8e10c2cec02b 100644
--- a/GUI/mainwindow/OutputDataIOService.cpp
+++ b/GUI/mainwindow/OutputDataIOService.cpp
@@ -17,7 +17,7 @@
#include "GUI/Models/JobItem.h"
#include "GUI/Models/ModelPath.h"
#include "GUI/Models/SaveLoadInterface.h"
-#include "GUI/mainwindow/ProjectUtils.h"
+#include "GUI/Project/ProjectUtils.h"
#include "GUI/utils/MessageService.h"
#include <QFile>
#include <QSet>
diff --git a/GUI/mainwindow/PyImportAssistant.cpp b/GUI/mainwindow/PyImportAssistant.cpp
index 5eeb1b34d5aaf5bdf2e4e5babfae814d730f2234..a773952d8f2f7f2427d4555b8d6249fcd7df097c 100644
--- a/GUI/mainwindow/PyImportAssistant.cpp
+++ b/GUI/mainwindow/PyImportAssistant.cpp
@@ -21,12 +21,12 @@
#include "GUI/Application/Application.h"
#include "GUI/Models/GUIDomainSampleVisitor.h"
#include "GUI/Models/GUIObjectBuilder.h"
-#include "GUI/Views/CommonWidgets/GUIHelpers.h"
-#include "GUI/Views/InfoWidgets/ComboSelectorDialog.h"
-#include "GUI/Views/InfoWidgets/DetailedMessageBox.h"
-#include "GUI/mainwindow/ProjectUtils.h"
+#include "GUI/CommonWidgets/GUIHelpers.h"
+#include "GUI/InfoWidgets/ComboSelectorDialog.h"
+#include "GUI/InfoWidgets/DetailedMessageBox.h"
+#include "GUI/Project/ProjectUtils.h"
#include "GUI/mainwindow/mainwindow.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Project/projectmanager.h"
#include "GUI/utils/Helpers.h"
#include "Sample/Multilayer/MultiLayer.h"
#include "Sample/Multilayer/PyImport.h"
diff --git a/GUI/mainwindow/SaveService.cpp b/GUI/mainwindow/SaveService.cpp
index f883e2f57a6d51e463d94d97dceb482f683a01a0..2544ece2b95cbaee85bcc87d78c645428c1cafab 100644
--- a/GUI/mainwindow/SaveService.cpp
+++ b/GUI/mainwindow/SaveService.cpp
@@ -16,9 +16,9 @@
#include "Base/Utils/Assert.h"
#include "GUI/Models/Error.h"
#include "GUI/mainwindow/AutosaveController.h"
-#include "GUI/mainwindow/ProjectUtils.h"
+#include "GUI/Project/ProjectUtils.h"
#include "GUI/mainwindow/SaveThread.h"
-#include "GUI/mainwindow/projectdocument.h"
+#include "GUI/Project/projectdocument.h"
#include <QApplication>
#include <QCoreApplication>
#include <QTime>
diff --git a/GUI/mainwindow/SaveThread.cpp b/GUI/mainwindow/SaveThread.cpp
index af3d2c8043d94fa7953d8d10219b0eb0784826b5..b99ea795f2fb2427e1b4f5067b49f252675760cb 100644
--- a/GUI/mainwindow/SaveThread.cpp
+++ b/GUI/mainwindow/SaveThread.cpp
@@ -14,7 +14,7 @@
#include "GUI/mainwindow/SaveThread.h"
#include "Base/Utils/Assert.h"
-#include "GUI/mainwindow/projectdocument.h"
+#include "GUI/Project/projectdocument.h"
SaveThread::SaveThread(QObject* parent) : QThread(parent), m_document(nullptr) {}
diff --git a/GUI/mainwindow/aboutapplicationdialog.cpp b/GUI/mainwindow/aboutapplicationdialog.cpp
index 875a62d06daf0e472d476fba03f89d476313a658..68a34ce957b4ae2c7a72a9e6ef48d664eb8f9f8a 100644
--- a/GUI/mainwindow/aboutapplicationdialog.cpp
+++ b/GUI/mainwindow/aboutapplicationdialog.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/mainwindow/aboutapplicationdialog.h"
-#include "GUI/Views/CommonWidgets/DesignerHelper.h"
+#include "GUI/CommonWidgets/DesignerHelper.h"
#include "GUI/utils/CustomEventFilters.h"
#include "GUI/utils/Helpers.h"
#include <QDate>
diff --git a/GUI/mainwindow/actionmanager.cpp b/GUI/mainwindow/actionmanager.cpp
index a1ea8af84ab5b7ca2fe0d1c8b65f9b3d7b457069..07a29987f2c42920420f8f1d767ee1f1b8010c43 100644
--- a/GUI/mainwindow/actionmanager.cpp
+++ b/GUI/mainwindow/actionmanager.cpp
@@ -18,11 +18,11 @@
#include "GUI/Application/Application.h"
#include "GUI/Views/JobWidgets/JobView.h"
#include "GUI/Views/SampleView.h"
-#include "GUI/Views/Tools/mainwindow_constants.h"
+#include "GUI/utils/mainwindow_constants.h"
#include "GUI/mainwindow/PyImportAssistant.h"
#include "GUI/mainwindow/aboutapplicationdialog.h"
#include "GUI/mainwindow/mainwindow.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Project/projectmanager.h"
#include "GUI/utils/hostosinfo.h"
#include "GUI/utils/qstringutils.h"
#include <QDesktopServices>
diff --git a/GUI/mainwindow/mainwindow.cpp b/GUI/mainwindow/mainwindow.cpp
index f62c14481547e6e4234e90cca50fab195613768e..34bf56677a18d627171dc100f103d12ba23ffbe8 100644
--- a/GUI/mainwindow/mainwindow.cpp
+++ b/GUI/mainwindow/mainwindow.cpp
@@ -23,10 +23,10 @@
#include "GUI/Views/SampleView.h"
#include "GUI/Views/SessionModelView.h"
#include "GUI/Views/SimulationView.h"
-#include "GUI/Views/Tools/mainwindow_constants.h"
+#include "GUI/utils/mainwindow_constants.h"
#include "GUI/Views/WelcomeView.h"
#include "GUI/mainwindow/actionmanager.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Project/projectmanager.h"
#include "GUI/utils/Helpers.h"
#include "GUI/utils/hostosinfo.h"
#include <QAction>
diff --git a/GUI/mainwindow/newprojectdialog.cpp b/GUI/mainwindow/newprojectdialog.cpp
index 9472b8e7c173a7d6e6c067dabad47dfe0e75e92c..047db054d473a81c0e297794aa3fe1eaf09a4177 100644
--- a/GUI/mainwindow/newprojectdialog.cpp
+++ b/GUI/mainwindow/newprojectdialog.cpp
@@ -14,7 +14,7 @@
#include "GUI/mainwindow/newprojectdialog.h"
#include "GUI/Application/Application.h"
-#include "GUI/mainwindow/projectdocument.h"
+#include "GUI/Project/projectdocument.h"
#include <QFileDialog>
#include <QGroupBox>
#include <QLabel>
diff --git a/GUI/Views/Tools/mainwindow_constants.h b/GUI/utils/mainwindow_constants.h
similarity index 90%
rename from GUI/Views/Tools/mainwindow_constants.h
rename to GUI/utils/mainwindow_constants.h
index 72c1123deceb417be6a58136c79871f08baa56ad..0838d9660d5f09a462dc12868931ea4f5cf1e039 100644
--- a/GUI/Views/Tools/mainwindow_constants.h
+++ b/GUI/utils/mainwindow_constants.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Views/Tools/mainwindow_constants.h
+//! @file GUI/utils/mainwindow_constants.h
//! @brief Defines namespace GUI::Constants
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_TOOLS_MAINWINDOW_CONSTANTS_H
-#define BORNAGAIN_GUI_VIEWS_TOOLS_MAINWINDOW_CONSTANTS_H
+#ifndef BORNAGAIN_GUI_UTILS_MAINWINDOW_CONSTANTS_H
+#define BORNAGAIN_GUI_UTILS_MAINWINDOW_CONSTANTS_H
#include <QString>
@@ -65,4 +65,4 @@ const int styled_toolbar_height = 25;
} // namespace GUI::Constants
-#endif // BORNAGAIN_GUI_VIEWS_TOOLS_MAINWINDOW_CONSTANTS_H
+#endif // BORNAGAIN_GUI_UTILS_MAINWINDOW_CONSTANTS_H
diff --git a/Tests/Unit/GUI/TestDataItemViews.cpp b/Tests/Unit/GUI/TestDataItemViews.cpp
index 0b3c91ca271807fd51981688eb4ad742a749f5fa..a1d5c1e04091c87e9adbafef8a102cab8f6a70ff 100644
--- a/Tests/Unit/GUI/TestDataItemViews.cpp
+++ b/Tests/Unit/GUI/TestDataItemViews.cpp
@@ -6,7 +6,7 @@
#include "GUI/Models/Error.h"
#include "GUI/Models/RealDataModel.h"
#include "GUI/Models/SpecularDataItem.h"
-#include "GUI/mainwindow/projectdocument.h"
+#include "GUI/Project/projectdocument.h"
#include "GUI/utils/MessageService.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Tests/Unit/GUI/Utils.h"
diff --git a/Tests/Unit/GUI/TestLinkInstrument.cpp b/Tests/Unit/GUI/TestLinkInstrument.cpp
index 331ad36e8e4f931162681c9122f548912dd9c4df..0d0ca770d7cd0cb538249936e7a026e06cfd748e 100644
--- a/Tests/Unit/GUI/TestLinkInstrument.cpp
+++ b/Tests/Unit/GUI/TestLinkInstrument.cpp
@@ -5,7 +5,7 @@
#include "GUI/Models/RealDataItem.h"
#include "GUI/Models/RealDataModel.h"
#include "GUI/Models/RectangularDetectorItem.h"
-#include "GUI/mainwindow/projectdocument.h"
+#include "GUI/Project/projectdocument.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Tests/Unit/GUI/Utils.h"
#include <QSignalSpy>
diff --git a/Tests/Unit/GUI/TestOutputDataIOService.cpp b/Tests/Unit/GUI/TestOutputDataIOService.cpp
index ba801127b0b9840a0d0f3b160f6f492f2ed4e69d..129f76596d59a41ce0ec2bb1e110bac85c86c294 100644
--- a/Tests/Unit/GUI/TestOutputDataIOService.cpp
+++ b/Tests/Unit/GUI/TestOutputDataIOService.cpp
@@ -11,7 +11,7 @@
#include "GUI/Models/RealDataItem.h"
#include "GUI/Models/RealDataModel.h"
#include "GUI/mainwindow/OutputDataIOService.h"
-#include "GUI/mainwindow/ProjectUtils.h"
+#include "GUI/Project/ProjectUtils.h"
#include "GUI/utils/Helpers.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Tests/Unit/GUI/Utils.h"
diff --git a/Tests/Unit/GUI/TestProjectDocument.cpp b/Tests/Unit/GUI/TestProjectDocument.cpp
index 8937d307e90bf80d5443cce70b9edb72564dea08..b8bee3f00c8432b21a64e73b1052235886dc82ad 100644
--- a/Tests/Unit/GUI/TestProjectDocument.cpp
+++ b/Tests/Unit/GUI/TestProjectDocument.cpp
@@ -5,8 +5,8 @@
#include "GUI/Models/JobItemUtils.h"
#include "GUI/Models/RealDataItem.h"
#include "GUI/Models/RealDataModel.h"
-#include "GUI/mainwindow/ProjectUtils.h"
-#include "GUI/mainwindow/projectdocument.h"
+#include "GUI/Project/ProjectUtils.h"
+#include "GUI/Project/projectdocument.h"
#include "GUI/utils/Helpers.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Tests/Unit/GUI/Utils.h"
diff --git a/Tests/Unit/GUI/TestProjectUtils.cpp b/Tests/Unit/GUI/TestProjectUtils.cpp
index db044904c53deddf6de72806f00c04d8f4edaa5a..79887b6c9aafee351969734ba75b66a4c78e6be0 100644
--- a/Tests/Unit/GUI/TestProjectUtils.cpp
+++ b/Tests/Unit/GUI/TestProjectUtils.cpp
@@ -1,6 +1,6 @@
#include "GUI/Models/Error.h"
#include "GUI/Models/ItemFileNameUtils.h"
-#include "GUI/mainwindow/ProjectUtils.h"
+#include "GUI/Project/ProjectUtils.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Utils.h"
#include <QDir>
diff --git a/Tests/Unit/GUI/TestSaveService.cpp b/Tests/Unit/GUI/TestSaveService.cpp
index 5332555850d602bedc875dd2ac4d226bbcddfbdd..ccf0f933654123efd25d7f23705feb864f1c183e 100644
--- a/Tests/Unit/GUI/TestSaveService.cpp
+++ b/Tests/Unit/GUI/TestSaveService.cpp
@@ -7,9 +7,9 @@
#include "GUI/Models/RealDataItem.h"
#include "GUI/Models/RealDataModel.h"
#include "GUI/mainwindow/AutosaveController.h"
-#include "GUI/mainwindow/ProjectUtils.h"
+#include "GUI/Project/ProjectUtils.h"
#include "GUI/mainwindow/SaveService.h"
-#include "GUI/mainwindow/projectdocument.h"
+#include "GUI/Project/projectdocument.h"
#include "GUI/utils/Helpers.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Tests/Unit/GUI/Utils.h"
diff --git a/Tests/Unit/GUI/TestSavingSpecularData.cpp b/Tests/Unit/GUI/TestSavingSpecularData.cpp
index 28de1f026bbda9dee50c54be1ed552ac7af2b33e..756e1f64c1922760c6d2a2398394615c51ac0efe 100644
--- a/Tests/Unit/GUI/TestSavingSpecularData.cpp
+++ b/Tests/Unit/GUI/TestSavingSpecularData.cpp
@@ -14,7 +14,7 @@
#include "GUI/Models/PointwiseAxisItem.h"
#include "GUI/Models/SpecularBeamInclinationItem.h"
#include "GUI/mainwindow/OutputDataIOService.h"
-#include "GUI/mainwindow/ProjectUtils.h"
+#include "GUI/Project/ProjectUtils.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Tests/Unit/GUI/Utils.h"
#include <QTest>
diff --git a/Tests/Unit/GUI/TestScientificSpinBox.cpp b/Tests/Unit/GUI/TestScientificSpinBox.cpp
index ae5a247dd6869a20671c2b487f613a6e7124cc93..2477978f2b960fe183511d6575b0b3ba9816eeb6 100644
--- a/Tests/Unit/GUI/TestScientificSpinBox.cpp
+++ b/Tests/Unit/GUI/TestScientificSpinBox.cpp
@@ -1,4 +1,4 @@
-#include "GUI/Views/CommonWidgets/ScientificSpinBox.h"
+#include "GUI/CommonWidgets/ScientificSpinBox.h"
#include "Tests/GTestWrapper/google_test.h"
#include <limits>
diff --git a/Tests/Unit/GUI/TestSessionItemController.cpp b/Tests/Unit/GUI/TestSessionItemController.cpp
index 04ea3baa1c767e4bd3107725d213e8921fbbd27a..776a2908b5a42b3445319272e4b174605612b818 100644
--- a/Tests/Unit/GUI/TestSessionItemController.cpp
+++ b/Tests/Unit/GUI/TestSessionItemController.cpp
@@ -1,6 +1,6 @@
#include "GUI/Models/AxesItems.h"
#include "GUI/Models/SessionModel.h"
-#include "GUI/Views/CommonWidgets/SessionItemController.h"
+#include "GUI/CommonWidgets/SessionItemController.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Tests/Unit/GUI/TestSessionItemControllerHelper.h"
#include <QObject>
diff --git a/Tests/Unit/GUI/TestSessionItemControllerHelper.cpp b/Tests/Unit/GUI/TestSessionItemControllerHelper.cpp
index 2d0e60314213bd3e6ea95b2e609808596d3701d7..4ef356f496968ed03dbcabfd40f48857bcba189d 100644
--- a/Tests/Unit/GUI/TestSessionItemControllerHelper.cpp
+++ b/Tests/Unit/GUI/TestSessionItemControllerHelper.cpp
@@ -1,6 +1,6 @@
#include "Tests/Unit/GUI/TestSessionItemControllerHelper.h"
#include "GUI/Models/SessionItem.h"
-#include "GUI/Views/CommonWidgets/SessionItemController.h"
+#include "GUI/CommonWidgets/SessionItemController.h"
TestListener::TestListener()
: m_onItemDestroyedCount(0), m_onPropertyChangeCount(0), m_onWidgetDestroyed(0)
diff --git a/Tests/Unit/GUI/TestUpdateTimer.cpp b/Tests/Unit/GUI/TestUpdateTimer.cpp
index e190926a7373c99f4ec51ffc279439c5962caa92..5a6677f66443a561b95642e3d44c0d67d4b6da2a 100644
--- a/Tests/Unit/GUI/TestUpdateTimer.cpp
+++ b/Tests/Unit/GUI/TestUpdateTimer.cpp
@@ -1,4 +1,4 @@
-#include "GUI/Views/CommonWidgets/UpdateTimer.h"
+#include "GUI/CommonWidgets/UpdateTimer.h"
#include "Tests/GTestWrapper/google_test.h"
#include <QSignalSpy>
diff --git a/Tests/Unit/GUI/Utils.cpp b/Tests/Unit/GUI/Utils.cpp
index 553035bd4010163d2d06a892a9e251440aa1e7b4..c4bf83b47b8e6f7a5499b9c35c01823599e19f82 100644
--- a/Tests/Unit/GUI/Utils.cpp
+++ b/Tests/Unit/GUI/Utils.cpp
@@ -19,7 +19,7 @@
#include "GUI/Models/Error.h"
#include "GUI/Models/RealDataItem.h"
#include "GUI/Models/SessionModel.h"
-#include "GUI/mainwindow/ProjectUtils.h"
+#include "GUI/Project/ProjectUtils.h"
#include <QDir>
namespace {