diff --git a/GUI/Items/RealDataItem.cpp b/GUI/Items/RealDataItem.cpp
index 441aeaa1032ca0ec7a539db5128321af8669b352..44cdba11b0859d41842019272df731e61adf867a 100644
--- a/GUI/Items/RealDataItem.cpp
+++ b/GUI/Items/RealDataItem.cpp
@@ -29,7 +29,7 @@
 #include "GUI/Models/Data/ImportDataInfo.h"
 #include "GUI/Models/Data/RealDataModel.h"
 #include "GUI/Models/Instrument/InstrumentModel.h"
-#include "GUI/Project/projectmanager.h"
+#include "GUI/Items/projectmanager.h"
 #include "GUI/utils/DeserializationException.h"
 #include "GUI/utils/Error.h"
 #include <QtCore/QXmlStreamReader>
diff --git a/GUI/Project/projectmanager.cpp b/GUI/Items/projectmanager.cpp
similarity index 99%
rename from GUI/Project/projectmanager.cpp
rename to GUI/Items/projectmanager.cpp
index 2e8844582c003f5f5d0a6da2b3b7320dd63ed052..0acaae2a3d406be8f13a5a29b670e5d7f6eaacc8 100644
--- a/GUI/Project/projectmanager.cpp
+++ b/GUI/Items/projectmanager.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Project/projectmanager.cpp
+//! @file      GUI/Items/projectmanager.cpp
 //! @brief     Implements class ProjectManager
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Project/projectmanager.h"
+#include "GUI/Items/projectmanager.h"
 #include "Base/Utils/Assert.h"
 #include "GUI/Application/GlobalSettings.h"
 #include "GUI/InfoWidgets/ProjectLoadProblemDialog.h"
diff --git a/GUI/Project/projectmanager.h b/GUI/Items/projectmanager.h
similarity index 94%
rename from GUI/Project/projectmanager.h
rename to GUI/Items/projectmanager.h
index 0526c7e46a1cee2141b9242e23db41c696e5262b..a971a272186b9be45cc7164b041237419a03e0e0 100644
--- a/GUI/Project/projectmanager.h
+++ b/GUI/Items/projectmanager.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Project/projectmanager.h
+//! @file      GUI/Items/projectmanager.h
 //! @brief     Defines class ProjectManager
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_PROJECT_PROJECTMANAGER_H
-#define BORNAGAIN_GUI_PROJECT_PROJECTMANAGER_H
+#ifndef BORNAGAIN_GUI_ITEMS_PROJECTMANAGER_H
+#define BORNAGAIN_GUI_ITEMS_PROJECTMANAGER_H
 
 #include "GUI/Project/projectdocument.h"
 #include <QObject>
@@ -102,4 +102,4 @@ private:
     static ProjectManager* s_instance;
 };
 
-#endif // BORNAGAIN_GUI_PROJECT_PROJECTMANAGER_H
+#endif // BORNAGAIN_GUI_ITEMS_PROJECTMANAGER_H
diff --git a/GUI/CommonWidgets/DoubleLineEdit.cpp b/GUI/Views/Edit/DoubleLineEdit.cpp
similarity index 94%
rename from GUI/CommonWidgets/DoubleLineEdit.cpp
rename to GUI/Views/Edit/DoubleLineEdit.cpp
index 5ce54a2bdf0b367e8101a0ec4aba226f82beba14..4ee99c9b209c194a5ea1521824cb264c1fb2358d 100644
--- a/GUI/CommonWidgets/DoubleLineEdit.cpp
+++ b/GUI/Views/Edit/DoubleLineEdit.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/CommonWidgets/DoubleLineEdit.cpp
+//! @file      GUI/Views/Edit/DoubleLineEdit.cpp
 //! @brief     Implements class DoubleLineEdit
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/CommonWidgets/DoubleLineEdit.h"
+#include "GUI/Views/Edit/DoubleLineEdit.h"
 #include "GUI/utils/GUIHelpers.h"
 #include <QDoubleValidator>
 
diff --git a/GUI/CommonWidgets/DoubleLineEdit.h b/GUI/Views/Edit/DoubleLineEdit.h
similarity index 88%
rename from GUI/CommonWidgets/DoubleLineEdit.h
rename to GUI/Views/Edit/DoubleLineEdit.h
index 415acf8f37cfd205c89f2c9227386de877e2bf59..0949e2400d42f1300e064401d474c86b5bb9d3ba 100644
--- a/GUI/CommonWidgets/DoubleLineEdit.h
+++ b/GUI/Views/Edit/DoubleLineEdit.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/CommonWidgets/DoubleLineEdit.h
+//! @file      GUI/Views/Edit/DoubleLineEdit.h
 //! @brief     Defines class DoubleLineEdit
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_COMMONWIDGETS_DOUBLELINEEDIT_H
-#define BORNAGAIN_GUI_COMMONWIDGETS_DOUBLELINEEDIT_H
+#ifndef BORNAGAIN_GUI_VIEWS_EDIT_DOUBLELINEEDIT_H
+#define BORNAGAIN_GUI_VIEWS_EDIT_DOUBLELINEEDIT_H
 
 #include "GUI/Models/Types/DoubleDescriptor.h"
 #include <QLineEdit>
@@ -51,4 +51,4 @@ private:
 };
 
 
-#endif // BORNAGAIN_GUI_COMMONWIDGETS_DOUBLELINEEDIT_H
+#endif // BORNAGAIN_GUI_VIEWS_EDIT_DOUBLELINEEDIT_H
diff --git a/GUI/CommonWidgets/DoubleSpinBox.cpp b/GUI/Views/Edit/DoubleSpinBox.cpp
similarity index 96%
rename from GUI/CommonWidgets/DoubleSpinBox.cpp
rename to GUI/Views/Edit/DoubleSpinBox.cpp
index 7206a6bca358c9e9881a501032a932338993e53b..f0660f981cb86963bda9fab00384da71058d991f 100644
--- a/GUI/CommonWidgets/DoubleSpinBox.cpp
+++ b/GUI/Views/Edit/DoubleSpinBox.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/CommonWidgets/DoubleSpinBox.cpp
+//! @file      GUI/Views/Edit/DoubleSpinBox.cpp
 //! @brief     Implements class DoubleSpinBox
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/CommonWidgets/DoubleSpinBox.h"
+#include "GUI/Views/Edit/DoubleSpinBox.h"
 #include "GUI/utils/GUIHelpers.h"
 #include <QWheelEvent>
 
diff --git a/GUI/CommonWidgets/DoubleSpinBox.h b/GUI/Views/Edit/DoubleSpinBox.h
similarity index 91%
rename from GUI/CommonWidgets/DoubleSpinBox.h
rename to GUI/Views/Edit/DoubleSpinBox.h
index d76d1c139f2b51ef4fdc23daaae30d060ad43c08..fb54daed6603c05d5d8ed981abd224978388a1f1 100644
--- a/GUI/CommonWidgets/DoubleSpinBox.h
+++ b/GUI/Views/Edit/DoubleSpinBox.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/CommonWidgets/DoubleSpinBox.h
+//! @file      GUI/Views/Edit/DoubleSpinBox.h
 //! @brief     Defines class DoubleSpinBox
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_COMMONWIDGETS_DOUBLESPINBOX_H
-#define BORNAGAIN_GUI_COMMONWIDGETS_DOUBLESPINBOX_H
+#ifndef BORNAGAIN_GUI_VIEWS_EDIT_DOUBLESPINBOX_H
+#define BORNAGAIN_GUI_VIEWS_EDIT_DOUBLESPINBOX_H
 
 #include "GUI/Models/Types/DoubleDescriptor.h"
 #include <QDoubleSpinBox>
@@ -73,4 +73,4 @@ private:
 };
 
 
-#endif // BORNAGAIN_GUI_COMMONWIDGETS_DOUBLESPINBOX_H
+#endif // BORNAGAIN_GUI_VIEWS_EDIT_DOUBLESPINBOX_H
diff --git a/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp b/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
index 0270b18dbd8e103a339a0d62f02ec725e781705b..e8ce5919271cea88bfc46250771ebd1b6209ddb6 100644
--- a/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
+++ b/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
@@ -21,7 +21,7 @@
 #include "GUI/Models/Data/AbstractDataLoader1D.h"
 #include "GUI/Models/Data/DataLoaders1D.h"
 #include "GUI/Models/Data/RealDataModel.h"
-#include "GUI/Project/projectmanager.h"
+#include "GUI/Items/projectmanager.h"
 #include "GUI/Views/ImportDataWidgets/ImportDataUtils.h"
 #include "GUI/Views/ImportDataWidgets/RealDataPropertiesWidget.h"
 #include "GUI/Views/ImportDataWidgets/RealDataTreeModel.h"
diff --git a/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.cpp b/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.cpp
index 34b94176396b12f939a1237a22ef1f0f271b9516..39ddb374583c8a3f5ea3a84a724837df4c126ca4 100644
--- a/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.cpp
+++ b/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.cpp
@@ -16,7 +16,7 @@
 #include "GUI/Items/IntensityDataItem.h"
 #include "GUI/Items/RealDataItem.h"
 #include "GUI/Models/Group/ComboProperty.h"
-#include "GUI/Project/projectmanager.h"
+#include "GUI/Items/projectmanager.h"
 #include "GUI/Views/IntensityDataWidgets/ColorMap.h"
 #include "GUI/Views/IntensityDataWidgets/ColorMapCanvas.h"
 #include "GUI/Views/IntensityDataWidgets/SavePlotAssistant.h"
diff --git a/GUI/Views/JobWidgets/JobView.cpp b/GUI/Views/JobWidgets/JobView.cpp
index 74ada46f221581c826570ebf1f1a176e33133a84..9debbe6a0dd9ec113dcac6146b71f91d2378a702 100644
--- a/GUI/Views/JobWidgets/JobView.cpp
+++ b/GUI/Views/JobWidgets/JobView.cpp
@@ -16,7 +16,7 @@
 #include "GUI/CommonWidgets/DocksController.h"
 #include "GUI/Items/JobItem.h"
 #include "GUI/Models/Job/JobModel.h"
-#include "GUI/Project/projectmanager.h"
+#include "GUI/Items/projectmanager.h"
 #include "GUI/Views/FitWidgets/FitActivityPanel.h"
 #include "GUI/Views/FitWidgets/JobRealTimeWidget.h"
 #include "GUI/Views/JobWidgets/JobMessagePanel.h"
diff --git a/GUI/Views/MaskWidgets/MaskEditorCanvas.cpp b/GUI/Views/MaskWidgets/MaskEditorCanvas.cpp
index 431e2dcfe96e2286b5369ec0f86ace6dcfd81171..0be8642b04d33214a2bd316c7daaa7bf4d537d83 100644
--- a/GUI/Views/MaskWidgets/MaskEditorCanvas.cpp
+++ b/GUI/Views/MaskWidgets/MaskEditorCanvas.cpp
@@ -15,7 +15,7 @@
 #include "GUI/Views/MaskWidgets/MaskEditorCanvas.h"
 #include "GUI/Items/IntensityDataItem.h"
 #include "GUI/Items/MaskItems.h"
-#include "GUI/Project/projectmanager.h"
+#include "GUI/Items/projectmanager.h"
 #include "GUI/Views/IntensityDataWidgets/ColorMap.h"
 #include "GUI/Views/IntensityDataWidgets/PlotStatusLabel.h"
 #include "GUI/Views/IntensityDataWidgets/SavePlotAssistant.h"
diff --git a/GUI/Views/ProjectionsWidgets/SaveProjectionsAssistant.cpp b/GUI/Views/ProjectionsWidgets/SaveProjectionsAssistant.cpp
index 3977ec80d0c89405609efae5917936840191f382..a1aebba92812020ef4c73c46656f30c5c287a6fb 100644
--- a/GUI/Views/ProjectionsWidgets/SaveProjectionsAssistant.cpp
+++ b/GUI/Views/ProjectionsWidgets/SaveProjectionsAssistant.cpp
@@ -20,7 +20,7 @@
 #include "GUI/Items/IntensityDataItem.h"
 #include "GUI/Items/MaskItems.h"
 #include "GUI/Items/ProjectionItems.h"
-#include "GUI/Project/projectmanager.h"
+#include "GUI/Items/projectmanager.h"
 #include "GUI/utils/Error.h"
 #include <QFileDialog>
 #include <QTextStream>
diff --git a/GUI/Views/PropertyEditor/CustomEditors.cpp b/GUI/Views/PropertyEditor/CustomEditors.cpp
index 5bacb10c00c35067ed377dc95804120169d93f2d..385fd5a20a29e999b83aed365476fb70d9db4c18 100644
--- a/GUI/Views/PropertyEditor/CustomEditors.cpp
+++ b/GUI/Views/PropertyEditor/CustomEditors.cpp
@@ -18,7 +18,7 @@
 #include "GUI/CommonWidgets/ScientificSpinBox.h"
 #include "GUI/Items/MaterialItemUtils.h"
 #include "GUI/Models/Group/ComboProperty.h"
-#include "GUI/Project/projectmanager.h"
+#include "GUI/Items/projectmanager.h"
 #include "GUI/Views/MaterialEditor/MaterialEditorDialog.h"
 #include "GUI/utils/CustomEventFilters.h"
 #include <QApplication>
diff --git a/GUI/Views/RealSpaceWidgets/RealSpaceCanvas.cpp b/GUI/Views/RealSpaceWidgets/RealSpaceCanvas.cpp
index a11ad58b3139cda1a8ab83bd0a99e324d9bc1945..82820ea728e306524b171acbf8be2fe38690b1e6 100644
--- a/GUI/Views/RealSpaceWidgets/RealSpaceCanvas.cpp
+++ b/GUI/Views/RealSpaceWidgets/RealSpaceCanvas.cpp
@@ -18,7 +18,7 @@
 #include "GUI/Items/SessionItemUtils.h"
 #include "GUI/Models/Parameter/FilterPropertyProxy.h"
 #include "GUI/Models/Sample/SampleModel.h"
-#include "GUI/Project/projectmanager.h"
+#include "GUI/Items/projectmanager.h"
 #include "GUI/Views/RealSpaceWidgets/RealSpaceBuilder.h"
 #include "GUI/Views/RealSpaceWidgets/RealSpaceModel.h"
 #include "GUI/Views/RealSpaceWidgets/RealSpaceView.h"
diff --git a/GUI/Views/SampleDesigner/FormLayouter.cpp b/GUI/Views/SampleDesigner/FormLayouter.cpp
index de2ac7e28a298d16759dd88b19c1e38b77f36e89..bddbcbdf72b8915e607db0093177cb4979053e91 100644
--- a/GUI/Views/SampleDesigner/FormLayouter.cpp
+++ b/GUI/Views/SampleDesigner/FormLayouter.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Views/SampleDesigner/FormLayouter.h"
-#include "GUI/CommonWidgets/DoubleSpinBox.h"
+#include "GUI/Views/Edit/DoubleSpinBox.h"
 #include "GUI/Models/Types/UIntDescriptor.h"
 #include "GUI/Models/Types/VectorDescriptor.h"
 #include "GUI/Views/SampleDesigner/GroupBoxCollapser.h"
diff --git a/GUI/Views/SampleDesigner/LayerEditorUtils.cpp b/GUI/Views/SampleDesigner/LayerEditorUtils.cpp
index f8b7663b77d23a1ca9011699bf4f01c693b151c4..d93f0eaf07f699ae6ab9714e654028f76d1a0112 100644
--- a/GUI/Views/SampleDesigner/LayerEditorUtils.cpp
+++ b/GUI/Views/SampleDesigner/LayerEditorUtils.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Views/SampleDesigner/LayerEditorUtils.h"
-#include "GUI/CommonWidgets/DoubleSpinBox.h"
+#include "GUI/Views/Edit/DoubleSpinBox.h"
 #include "GUI/Items/FTDecayFunctionItems.h"
 #include "GUI/Items/FTDistributionItems.h"
 #include "GUI/Items/FormFactorItems.h"
diff --git a/GUI/Views/SampleDesigner/MaterialInplaceForm.cpp b/GUI/Views/SampleDesigner/MaterialInplaceForm.cpp
index 27ae846cde50a3942a684ec78cebded5750d1f9e..a83cfede617e0ec81166e6cd14a734debdbb478d 100644
--- a/GUI/Views/SampleDesigner/MaterialInplaceForm.cpp
+++ b/GUI/Views/SampleDesigner/MaterialInplaceForm.cpp
@@ -13,8 +13,8 @@
 //  ************************************************************************************************
 
 #include "GUI/Views/SampleDesigner/MaterialInplaceForm.h"
-#include "GUI/CommonWidgets/DoubleLineEdit.h"
-#include "GUI/CommonWidgets/DoubleSpinBox.h"
+#include "GUI/Views/Edit/DoubleLineEdit.h"
+#include "GUI/Views/Edit/DoubleSpinBox.h"
 #include "GUI/Items/ItemWithMaterial.h"
 #include "GUI/Items/MaterialItemUtils.h"
 #include "GUI/Items/ModelPath.h"
@@ -22,7 +22,7 @@
 #include "GUI/Models/Material/MaterialModelStore.h"
 #include "GUI/Models/Types/DoubleDescriptor.h"
 #include "GUI/Models/Types/VectorDescriptor.h"
-#include "GUI/Project/projectmanager.h"
+#include "GUI/Items/projectmanager.h"
 #include "GUI/Views/MaterialEditor/MaterialEditorDialog.h"
 #include "GUI/Views/SampleDesigner/LayerEditorUtils.h"
 #include "GUI/Views/SampleDesigner/SampleEditorController.h"
diff --git a/GUI/Views/SampleDesigner/MultiLayerForm.cpp b/GUI/Views/SampleDesigner/MultiLayerForm.cpp
index 59999edf5e9cf528e7c26d6ae9fd89db8149f5f0..8f49562a4e09851901d2ce7f028a7e2a00d95d7d 100644
--- a/GUI/Views/SampleDesigner/MultiLayerForm.cpp
+++ b/GUI/Views/SampleDesigner/MultiLayerForm.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Views/SampleDesigner/MultiLayerForm.h"
-#include "GUI/CommonWidgets/DoubleSpinBox.h"
+#include "GUI/Views/Edit/DoubleSpinBox.h"
 #include "GUI/Items/MultiLayerItem.h"
 #include "GUI/Models/Types/VectorDescriptor.h"
 #include "GUI/Views/SampleDesigner/GroupBoxCollapser.h"
diff --git a/GUI/Views/SampleDesigner/SampleEditorController.cpp b/GUI/Views/SampleDesigner/SampleEditorController.cpp
index 3fb0df02ac6f8a09a9f0c267d62cbad06611587d..3d37a84276865c18af16f6b4f14f69d389c7cc0a 100644
--- a/GUI/Views/SampleDesigner/SampleEditorController.cpp
+++ b/GUI/Views/SampleDesigner/SampleEditorController.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Views/SampleDesigner/SampleEditorController.h"
-#include "GUI/CommonWidgets/DoubleSpinBox.h"
+#include "GUI/Views/Edit/DoubleSpinBox.h"
 #include "GUI/Items/LayerItem.h"
 #include "GUI/Items/MesoCrystalItem.h"
 #include "GUI/Items/MultiLayerItem.h"
diff --git a/GUI/Views/SampleDesigner/SampleListView.cpp b/GUI/Views/SampleDesigner/SampleListView.cpp
index acbe5bdd54a571c561ecaab8ff4961f27dc6c7de..9d701f722c9181b1899839f2e69b7ceaaa3911b0 100644
--- a/GUI/Views/SampleDesigner/SampleListView.cpp
+++ b/GUI/Views/SampleDesigner/SampleListView.cpp
@@ -18,7 +18,7 @@
 #include "GUI/Items/MultiLayerItem.h"
 #include "GUI/Models/Sample/GUIExamplesFactory.h"
 #include "GUI/Models/Sample/SampleListModel.h"
-#include "GUI/Project/projectmanager.h"
+#include "GUI/Items/projectmanager.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 06dfae4635c4b9519ba579d3bcc2cbe7d76e4071..f98b3894b5d3bc2b14966549168d91fe6cbcf3b1 100644
--- a/GUI/Views/SampleDesigner/SampleToolBar.cpp
+++ b/GUI/Views/SampleDesigner/SampleToolBar.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Views/SampleDesigner/SampleToolBar.h"
-#include "GUI/Project/projectmanager.h"
+#include "GUI/Items/projectmanager.h"
 #include "GUI/Views/MaterialEditor/MaterialEditorDialog.h"
 #include "GUI/Views/SampleDesigner/DesignerView.h"
 #include "GUI/Views/Toplevel/SampleView.h"
diff --git a/GUI/Views/SpecularDataWidgets/SpecularDataCanvas.cpp b/GUI/Views/SpecularDataWidgets/SpecularDataCanvas.cpp
index e8e717b5be6a6363784d95f2e5c731f46dd6ed32..8b0af8032d00f355d05aa14e38b1899800985bcc 100644
--- a/GUI/Views/SpecularDataWidgets/SpecularDataCanvas.cpp
+++ b/GUI/Views/SpecularDataWidgets/SpecularDataCanvas.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/Views/SpecularDataWidgets/SpecularDataCanvas.h"
 #include "GUI/Items/SpecularDataItem.h"
-#include "GUI/Project/projectmanager.h"
+#include "GUI/Items/projectmanager.h"
 #include "GUI/Views/IntensityDataWidgets/SavePlotAssistant.h"
 #include "GUI/Views/SpecularDataWidgets/SpecularPlotCanvas.h"
 #include <qcustomplot.h>
diff --git a/GUI/Views/Toplevel/SessionModelView.cpp b/GUI/Views/Toplevel/SessionModelView.cpp
index 1569be1bd60b08723714aa42de28663c079b5f4b..614faa2d73d28e1c2b94f6fdca7d3c68e73903af 100644
--- a/GUI/Views/Toplevel/SessionModelView.cpp
+++ b/GUI/Views/Toplevel/SessionModelView.cpp
@@ -19,7 +19,7 @@
 #include "GUI/Models/Job/JobModel.h"
 #include "GUI/Models/Material/MaterialModel.h"
 #include "GUI/Models/Sample/SampleModel.h"
-#include "GUI/Project/projectmanager.h"
+#include "GUI/Items/projectmanager.h"
 #include "GUI/Views/PropertyEditor/SessionModelDelegate.h"
 #include "GUI/Views/Toplevel/TestView.h"
 #include "GUI/mainwindow/mainwindow.h"
diff --git a/GUI/Views/Toplevel/SimulationView.cpp b/GUI/Views/Toplevel/SimulationView.cpp
index 0354ee0259eb21894b7ea6f376e28f7822855339..8b1cdee714e6e20f135c15ca6c0136c050c58e77 100644
--- a/GUI/Views/Toplevel/SimulationView.cpp
+++ b/GUI/Views/Toplevel/SimulationView.cpp
@@ -27,7 +27,7 @@
 #include "GUI/Models/Sample/SampleModel.h"
 #include "GUI/Models/Sample/SampleValidator.h"
 #include "GUI/Project/projectdocument.h"
-#include "GUI/Project/projectmanager.h"
+#include "GUI/Items/projectmanager.h"
 #include "GUI/Views/SampleDesigner/GroupBoxCollapser.h"
 #include "GUI/Views/SimulationWidgets/PythonScriptWidget.h"
 #include "GUI/mainwindow/mainwindow.h"
diff --git a/GUI/Views/Toplevel/WelcomeView.cpp b/GUI/Views/Toplevel/WelcomeView.cpp
index f689375c16ea4ec175754ad19fba407788b8a2b9..17237543c939b744a2797b79daa226ded4bbb235 100644
--- a/GUI/Views/Toplevel/WelcomeView.cpp
+++ b/GUI/Views/Toplevel/WelcomeView.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Views/Toplevel/WelcomeView.h"
-#include "GUI/Project/projectmanager.h"
+#include "GUI/Items/projectmanager.h"
 #include "GUI/Views/SampleDesigner/GroupBoxCollapser.h"
 #include "GUI/utils/LayoutUtils.h"
 #include "GUI/utils/qstringutils.h"
diff --git a/GUI/mainwindow/PyImportAssistant.cpp b/GUI/mainwindow/PyImportAssistant.cpp
index e202e7a67f364d375cf0ff3e1a4d4034709c986b..b459111215e29554ffc539582cc1f703d553fd91 100644
--- a/GUI/mainwindow/PyImportAssistant.cpp
+++ b/GUI/mainwindow/PyImportAssistant.cpp
@@ -24,7 +24,7 @@
 #include "GUI/Models/Data/GUIObjectBuilder.h"
 #include "GUI/Models/Sample/GUIDomainSampleVisitor.h"
 #include "GUI/Project/ProjectUtils.h"
-#include "GUI/Project/projectmanager.h"
+#include "GUI/Items/projectmanager.h"
 #include "GUI/mainwindow/mainwindow.h"
 #include "GUI/utils/GUIHelpers.h"
 #include "GUI/utils/Helpers.h"
diff --git a/GUI/mainwindow/actionmanager.cpp b/GUI/mainwindow/actionmanager.cpp
index efef5dcbfbd7af844093863c7f794063460f5e02..a5d1c9878a31c69f3693120101ca098730423a5e 100644
--- a/GUI/mainwindow/actionmanager.cpp
+++ b/GUI/mainwindow/actionmanager.cpp
@@ -16,7 +16,7 @@
 #include "Base/Utils/Assert.h"
 #include "Base/Utils/SysUtils.h"
 #include "GUI/Application/GlobalSettings.h"
-#include "GUI/Project/projectmanager.h"
+#include "GUI/Items/projectmanager.h"
 #include "GUI/Views/JobWidgets/JobView.h"
 #include "GUI/Views/Toplevel/SampleView.h"
 #include "GUI/mainwindow/PyImportAssistant.h"
diff --git a/GUI/mainwindow/mainwindow.cpp b/GUI/mainwindow/mainwindow.cpp
index 523713e3d22071dff018e2486a216806e814bfff..0074f3920cd4478e9beb1f30853821ee11c05121 100644
--- a/GUI/mainwindow/mainwindow.cpp
+++ b/GUI/mainwindow/mainwindow.cpp
@@ -15,7 +15,7 @@
 #include "GUI/mainwindow/mainwindow.h"
 #include "GUI/Application/GlobalSettings.h"
 #include "GUI/Models/Job/JobModel.h"
-#include "GUI/Project/projectmanager.h"
+#include "GUI/Items/projectmanager.h"
 #include "GUI/Views/InstrumentWidgets/InstrumentView.h"
 #include "GUI/Views/JobWidgets/JobView.h"
 #include "GUI/Views/Toplevel/ImportDataView.h"