From 43c172c05a7a720204613f9f6d9186e18420b5a8 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Mon, 1 Nov 2021 23:57:01 +0100
Subject: [PATCH] mv

---
 GUI/Models/Data/ApplicationModels.cpp               | 2 +-
 GUI/Models/Data/RealDataItem.cpp                    | 2 +-
 GUI/Models/Domain/DomainSimulationBuilder.cpp       | 2 +-
 GUI/Models/Domain/TransformToDomain.cpp             | 2 +-
 GUI/Models/Group/GroupInfo.h                        | 2 +-
 GUI/Models/Group/ItemFactory.cpp                    | 2 +-
 GUI/Models/Instrument/InstrumentItems.cpp           | 2 +-
 GUI/Models/{X1 => Instrument}/ItemFileNameUtils.cpp | 4 ++--
 GUI/Models/{X1 => Instrument}/ItemFileNameUtils.h   | 8 ++++----
 GUI/Models/Job/JobItem.cpp                          | 4 ++--
 GUI/Models/Job/JobModelFunctions.cpp                | 2 +-
 GUI/Models/Sample/ParticleLayoutItem.cpp            | 2 +-
 GUI/Models/X/DocumentModel.cpp                      | 2 +-
 GUI/Models/X/GUIObjectBuilder.cpp                   | 2 +-
 GUI/{Models/Group => Session}/ItemCatalog.cpp       | 6 +++---
 GUI/{Models/Group => Session}/ItemCatalog.h         | 8 ++++----
 GUI/{Models/X => Session}/SimulationOptionsItem.cpp | 4 ++--
 GUI/{Models/X => Session}/SimulationOptionsItem.h   | 8 ++++----
 GUI/Views/SampleDesigner/SampleToolBox.cpp          | 2 +-
 GUI/Views/SampleDesigner/SampleTreeWidget.cpp       | 2 +-
 GUI/Views/SimulationView.cpp                        | 2 +-
 Tests/Unit/GUI/TestMapperCases.cpp                  | 2 +-
 Tests/Unit/GUI/TestProjectUtils.cpp                 | 2 +-
 Tests/Unit/GUI/TestSavingSpecularData.cpp           | 2 +-
 24 files changed, 38 insertions(+), 38 deletions(-)
 rename GUI/Models/{X1 => Instrument}/ItemFileNameUtils.cpp (96%)
 rename GUI/Models/{X1 => Instrument}/ItemFileNameUtils.h (83%)
 rename GUI/{Models/Group => Session}/ItemCatalog.cpp (99%)
 rename GUI/{Models/Group => Session}/ItemCatalog.h (90%)
 rename GUI/{Models/X => Session}/SimulationOptionsItem.cpp (98%)
 rename GUI/{Models/X => Session}/SimulationOptionsItem.h (90%)

diff --git a/GUI/Models/Data/ApplicationModels.cpp b/GUI/Models/Data/ApplicationModels.cpp
index 9f18e0156cf..f9e23dd9463 100644
--- a/GUI/Models/Data/ApplicationModels.cpp
+++ b/GUI/Models/Data/ApplicationModels.cpp
@@ -20,7 +20,7 @@
 #include "GUI/Models/Material/MaterialModel.h"
 #include "GUI/Models/Data/RealDataModel.h"
 #include "GUI/Models/Sample/SampleModel.h"
-#include "GUI/Models/X/SimulationOptionsItem.h"
+#include "GUI/Session/SimulationOptionsItem.h"
 #include "GUI/utils/DeserializationException.h"
 #include <QtCore/QXmlStreamWriter>
 
diff --git a/GUI/Models/Data/RealDataItem.cpp b/GUI/Models/Data/RealDataItem.cpp
index b47eec758f7..947929eafa9 100644
--- a/GUI/Models/Data/RealDataItem.cpp
+++ b/GUI/Models/Data/RealDataItem.cpp
@@ -22,7 +22,7 @@
 #include "GUI/Models/Instrument/InstrumentItems.h"
 #include "GUI/Models/Instrument/InstrumentModel.h"
 #include "GUI/Models/Data/IntensityDataItem.h"
-#include "GUI/Models/X1/ItemFileNameUtils.h"
+#include "GUI/Models/Instrument/ItemFileNameUtils.h"
 #include "GUI/Models/Job/JobItem.h"
 #include "GUI/Models/Job/JobItemUtils.h"
 #include "GUI/Models/Job/JobModelFunctions.h"
diff --git a/GUI/Models/Domain/DomainSimulationBuilder.cpp b/GUI/Models/Domain/DomainSimulationBuilder.cpp
index fb07e79e9dc..15006f69978 100644
--- a/GUI/Models/Domain/DomainSimulationBuilder.cpp
+++ b/GUI/Models/Domain/DomainSimulationBuilder.cpp
@@ -26,7 +26,7 @@
 #include "GUI/Models/Instrument/FootprintItems.h"
 #include "GUI/Models/Instrument/InstrumentItems.h"
 #include "GUI/Models/Sample/MultiLayerItem.h"
-#include "GUI/Models/X/SimulationOptionsItem.h"
+#include "GUI/Session/SimulationOptionsItem.h"
 #include "GUI/Models/Domain/TransformToDomain.h"
 
 namespace {
diff --git a/GUI/Models/Domain/TransformToDomain.cpp b/GUI/Models/Domain/TransformToDomain.cpp
index 06a41636777..930ed6d69b1 100644
--- a/GUI/Models/Domain/TransformToDomain.cpp
+++ b/GUI/Models/Domain/TransformToDomain.cpp
@@ -33,7 +33,7 @@
 #include "GUI/Models/Sample/ParticleItem.h"
 #include "GUI/Models/Sample/ParticleLayoutItem.h"
 #include "GUI/Models/X4/RotationItems.h"
-#include "GUI/Models/X/SimulationOptionsItem.h"
+#include "GUI/Session/SimulationOptionsItem.h"
 #include "GUI/Models/X4/TransformationItem.h"
 #include "GUI/Models/Types/UIntDescriptor.h"
 #include "GUI/Models/Types/VectorItem.h"
diff --git a/GUI/Models/Group/GroupInfo.h b/GUI/Models/Group/GroupInfo.h
index a700e07629b..77e74cd5248 100644
--- a/GUI/Models/Group/GroupInfo.h
+++ b/GUI/Models/Group/GroupInfo.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_GUI_MODELS_GROUP_GROUPINFO_H
 #define BORNAGAIN_GUI_MODELS_GROUP_GROUPINFO_H
 
-#include "GUI/Models/Group/ItemCatalog.h"
+#include "GUI/Session/ItemCatalog.h"
 #include <QString>
 #include <QStringList>
 #include <QVector>
diff --git a/GUI/Models/Group/ItemFactory.cpp b/GUI/Models/Group/ItemFactory.cpp
index afb3d9054a1..fd4b275c1a9 100644
--- a/GUI/Models/Group/ItemFactory.cpp
+++ b/GUI/Models/Group/ItemFactory.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Models/Group/ItemFactory.h"
-#include "GUI/Models/Group/ItemCatalog.h"
+#include "GUI/Session/ItemCatalog.h"
 #include "GUI/Session/SessionItem.h"
 
 SessionItem* GUI::Model::ItemFactory::CreateItem(const QString& model_name, SessionItem* parent)
diff --git a/GUI/Models/Instrument/InstrumentItems.cpp b/GUI/Models/Instrument/InstrumentItems.cpp
index d19ce7123ff..18d677d5c39 100644
--- a/GUI/Models/Instrument/InstrumentItems.cpp
+++ b/GUI/Models/Instrument/InstrumentItems.cpp
@@ -26,7 +26,7 @@
 #include "GUI/Models/Instrument/DetectorItems.h"
 #include "GUI/utils/Error.h"
 #include "GUI/Models/Group/GroupItem.h"
-#include "GUI/Models/X1/ItemFileNameUtils.h"
+#include "GUI/Models/Instrument/ItemFileNameUtils.h"
 #include "GUI/Models/Job/JobItemUtils.h"
 #include "GUI/Models/Data/PointwiseAxisItem.h"
 #include "GUI/Models/Data/RealDataItem.h"
diff --git a/GUI/Models/X1/ItemFileNameUtils.cpp b/GUI/Models/Instrument/ItemFileNameUtils.cpp
similarity index 96%
rename from GUI/Models/X1/ItemFileNameUtils.cpp
rename to GUI/Models/Instrument/ItemFileNameUtils.cpp
index f6e8dac8ebf..b910c227c27 100644
--- a/GUI/Models/X1/ItemFileNameUtils.cpp
+++ b/GUI/Models/Instrument/ItemFileNameUtils.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Models/X1/ItemFileNameUtils.cpp
+//! @file      GUI/Models/Instrument/ItemFileNameUtils.cpp
 //! @brief     Defines auxiliary functions in ItemFileNameUtils namespace.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Models/X1/ItemFileNameUtils.h"
+#include "GUI/Models/Instrument/ItemFileNameUtils.h"
 #include "GUI/Models/Instrument/InstrumentItems.h"
 #include "GUI/Models/Job/JobItem.h"
 #include "GUI/Models/Data/RealDataItem.h"
diff --git a/GUI/Models/X1/ItemFileNameUtils.h b/GUI/Models/Instrument/ItemFileNameUtils.h
similarity index 83%
rename from GUI/Models/X1/ItemFileNameUtils.h
rename to GUI/Models/Instrument/ItemFileNameUtils.h
index c657c1ced22..59d4ce3477f 100644
--- a/GUI/Models/X1/ItemFileNameUtils.h
+++ b/GUI/Models/Instrument/ItemFileNameUtils.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Models/X1/ItemFileNameUtils.h
+//! @file      GUI/Models/Instrument/ItemFileNameUtils.h
 //! @brief     Defines namespace GUI::Model::FilenameUtils
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_MODELS_X1_ITEMFILENAMEUTILS_H
-#define BORNAGAIN_GUI_MODELS_X1_ITEMFILENAMEUTILS_H
+#ifndef BORNAGAIN_GUI_MODELS_INSTRUMENT_ITEMFILENAMEUTILS_H
+#define BORNAGAIN_GUI_MODELS_INSTRUMENT_ITEMFILENAMEUTILS_H
 
 #include <QString>
 
@@ -41,4 +41,4 @@ QStringList nonXMLFileNameFilters();
 
 } // namespace GUI::Model::FilenameUtils
 
-#endif // BORNAGAIN_GUI_MODELS_X1_ITEMFILENAMEUTILS_H
+#endif // BORNAGAIN_GUI_MODELS_INSTRUMENT_ITEMFILENAMEUTILS_H
diff --git a/GUI/Models/Job/JobItem.cpp b/GUI/Models/Job/JobItem.cpp
index 131509828a7..4013b1b8caf 100644
--- a/GUI/Models/Job/JobItem.cpp
+++ b/GUI/Models/Job/JobItem.cpp
@@ -19,13 +19,13 @@
 #include "GUI/Models/Fit/FitSuiteItem.h"
 #include "GUI/Models/Instrument/InstrumentItems.h"
 #include "GUI/Models/Data/IntensityDataItem.h"
-#include "GUI/Models/X1/ItemFileNameUtils.h"
+#include "GUI/Models/Instrument/ItemFileNameUtils.h"
 #include "GUI/Models/Job/JobItemUtils.h"
 #include "GUI/Models/Material/MaterialItemContainer.h"
 #include "GUI/Models/Sample/MultiLayerItem.h"
 #include "GUI/Models/Parameter/ParameterTreeItems.h"
 #include "GUI/Models/Data/RealDataItem.h"
-#include "GUI/Models/X/SimulationOptionsItem.h"
+#include "GUI/Session/SimulationOptionsItem.h"
 #include "GUI/Models/Data/SpecularDataItem.h"
 
 JobItem::JobItem() : SessionItem(M_TYPE)
diff --git a/GUI/Models/Job/JobModelFunctions.cpp b/GUI/Models/Job/JobModelFunctions.cpp
index 97e564288cf..e2dfc517d63 100644
--- a/GUI/Models/Job/JobModelFunctions.cpp
+++ b/GUI/Models/Job/JobModelFunctions.cpp
@@ -23,7 +23,7 @@
 #include "GUI/Models/Group/GroupItem.h"
 #include "GUI/Models/Instrument/InstrumentItems.h"
 #include "GUI/Models/Data/IntensityDataItem.h"
-#include "GUI/Models/X1/ItemFileNameUtils.h"
+#include "GUI/Models/Instrument/ItemFileNameUtils.h"
 #include "GUI/Models/X1/ItemWithMaterial.h"
 #include "GUI/Models/Job/JobItem.h"
 #include "GUI/Models/Job/JobItemUtils.h"
diff --git a/GUI/Models/Sample/ParticleLayoutItem.cpp b/GUI/Models/Sample/ParticleLayoutItem.cpp
index 9db9f333e87..d2396dadc0c 100644
--- a/GUI/Models/Sample/ParticleLayoutItem.cpp
+++ b/GUI/Models/Sample/ParticleLayoutItem.cpp
@@ -15,7 +15,7 @@
 #include "GUI/Models/Sample/ParticleLayoutItem.h"
 #include "GUI/Models/Types/DoubleDescriptor.h"
 #include "GUI/Models/Sample/InterferenceItems.h"
-#include "GUI/Models/Group/ItemCatalog.h"
+#include "GUI/Session/ItemCatalog.h"
 #include "GUI/Models/Sample/Lattice2DItems.h"
 #include "GUI/Models/Sample/MesoCrystalItem.h"
 #include "GUI/Models/Sample/ParticleCompositionItem.h"
diff --git a/GUI/Models/X/DocumentModel.cpp b/GUI/Models/X/DocumentModel.cpp
index 0b43490a42d..8e41d6af1a6 100644
--- a/GUI/Models/X/DocumentModel.cpp
+++ b/GUI/Models/X/DocumentModel.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Models/X/DocumentModel.h"
-#include "GUI/Models/X/SimulationOptionsItem.h"
+#include "GUI/Session/SimulationOptionsItem.h"
 
 DocumentModel::DocumentModel(QObject* parent)
     : SessionModel(GUI::Session::XML::DocumentModelTag, parent)
diff --git a/GUI/Models/X/GUIObjectBuilder.cpp b/GUI/Models/X/GUIObjectBuilder.cpp
index dcddd363f08..3fc85f964cd 100644
--- a/GUI/Models/X/GUIObjectBuilder.cpp
+++ b/GUI/Models/X/GUIObjectBuilder.cpp
@@ -21,7 +21,7 @@
 #include "GUI/Models/Domain/GUIDomainSampleVisitor.h"
 #include "GUI/Models/Instrument/InstrumentItems.h"
 #include "GUI/Models/Instrument/InstrumentModel.h"
-#include "GUI/Models/X/SimulationOptionsItem.h"
+#include "GUI/Session/SimulationOptionsItem.h"
 #include "GUI/Models/Domain/TransformFromDomain.h"
 #include "Resample/Options/SimulationOptions.h"
 
diff --git a/GUI/Models/Group/ItemCatalog.cpp b/GUI/Session/ItemCatalog.cpp
similarity index 99%
rename from GUI/Models/Group/ItemCatalog.cpp
rename to GUI/Session/ItemCatalog.cpp
index 95e9c5164d3..a2cc64eaed6 100644
--- a/GUI/Models/Group/ItemCatalog.cpp
+++ b/GUI/Session/ItemCatalog.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Models/Group/ItemCatalog.cpp
+//! @file      GUI/Session/ItemCatalog.cpp
 //! @brief     Implements class ItemCatalog
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Models/Group/ItemCatalog.h"
+#include "GUI/Session/ItemCatalog.h"
 #include "Base/Utils/Assert.h"
 #include "GUI/Models/Instrument/BackgroundItems.h"
 #include "GUI/Models/Instrument/BeamAngleItems.h"
@@ -55,7 +55,7 @@
 #include "GUI/Models/Instrument/RectangularDetectorItem.h"
 #include "GUI/Models/Instrument/ResolutionFunctionItems.h"
 #include "GUI/Models/X4/RotationItems.h"
-#include "GUI/Models/X/SimulationOptionsItem.h"
+#include "GUI/Session/SimulationOptionsItem.h"
 #include "GUI/Models/Instrument/SpecularBeamInclinationItem.h"
 #include "GUI/Models/Data/SpecularDataItem.h"
 #include "GUI/Models/Instrument/SphericalDetectorItem.h"
diff --git a/GUI/Models/Group/ItemCatalog.h b/GUI/Session/ItemCatalog.h
similarity index 90%
rename from GUI/Models/Group/ItemCatalog.h
rename to GUI/Session/ItemCatalog.h
index 964a1a0f455..47aca582582 100644
--- a/GUI/Models/Group/ItemCatalog.h
+++ b/GUI/Session/ItemCatalog.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Models/Group/ItemCatalog.h
+//! @file      GUI/Session/ItemCatalog.h
 //! @brief     Defines class ItemCatalog
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_MODELS_GROUP_ITEMCATALOG_H
-#define BORNAGAIN_GUI_MODELS_GROUP_ITEMCATALOG_H
+#ifndef BORNAGAIN_GUI_SESSION_ITEMCATALOG_H
+#define BORNAGAIN_GUI_SESSION_ITEMCATALOG_H
 
 #include "Base/Utils/IFactory.h"
 #include <QMap>
@@ -64,4 +64,4 @@ private:
 };
 
 
-#endif // BORNAGAIN_GUI_MODELS_GROUP_ITEMCATALOG_H
+#endif // BORNAGAIN_GUI_SESSION_ITEMCATALOG_H
diff --git a/GUI/Models/X/SimulationOptionsItem.cpp b/GUI/Session/SimulationOptionsItem.cpp
similarity index 98%
rename from GUI/Models/X/SimulationOptionsItem.cpp
rename to GUI/Session/SimulationOptionsItem.cpp
index 76ba7357964..6168ebc1f0d 100644
--- a/GUI/Models/X/SimulationOptionsItem.cpp
+++ b/GUI/Session/SimulationOptionsItem.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Models/X/SimulationOptionsItem.cpp
+//! @file      GUI/Session/SimulationOptionsItem.cpp
 //! @brief     Defines class SimulationOptionsItem
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Models/X/SimulationOptionsItem.h"
+#include "GUI/Session/SimulationOptionsItem.h"
 #include "GUI/Models/Group/ComboProperty.h"
 #include <thread>
 
diff --git a/GUI/Models/X/SimulationOptionsItem.h b/GUI/Session/SimulationOptionsItem.h
similarity index 90%
rename from GUI/Models/X/SimulationOptionsItem.h
rename to GUI/Session/SimulationOptionsItem.h
index 6fe07d1304d..4a19fae5ba4 100644
--- a/GUI/Models/X/SimulationOptionsItem.h
+++ b/GUI/Session/SimulationOptionsItem.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Models/X/SimulationOptionsItem.h
+//! @file      GUI/Session/SimulationOptionsItem.h
 //! @brief     Defines class SimulationOptionsItem
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_MODELS_X_SIMULATIONOPTIONSITEM_H
-#define BORNAGAIN_GUI_MODELS_X_SIMULATIONOPTIONSITEM_H
+#ifndef BORNAGAIN_GUI_SESSION_SIMULATIONOPTIONSITEM_H
+#define BORNAGAIN_GUI_SESSION_SIMULATIONOPTIONSITEM_H
 
 #include "GUI/Session/SessionItem.h"
 #include <QMap>
@@ -58,4 +58,4 @@ public:
     bool includeSpecularPeak() const;
 };
 
-#endif // BORNAGAIN_GUI_MODELS_X_SIMULATIONOPTIONSITEM_H
+#endif // BORNAGAIN_GUI_SESSION_SIMULATIONOPTIONSITEM_H
diff --git a/GUI/Views/SampleDesigner/SampleToolBox.cpp b/GUI/Views/SampleDesigner/SampleToolBox.cpp
index 60b8ead8cc6..954ad67d68d 100644
--- a/GUI/Views/SampleDesigner/SampleToolBox.cpp
+++ b/GUI/Views/SampleDesigner/SampleToolBox.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/Views/SampleDesigner/SampleToolBox.h"
 #include "GUI/Models/X/GUIExamplesFactory.h"
-#include "GUI/Models/Group/ItemCatalog.h"
+#include "GUI/Session/ItemCatalog.h"
 #include "GUI/Models/Sample/LayerItem.h"
 #include "GUI/Models/Sample/MultiLayerItem.h"
 #include "GUI/Models/Sample/ParticleLayoutItem.h"
diff --git a/GUI/Views/SampleDesigner/SampleTreeWidget.cpp b/GUI/Views/SampleDesigner/SampleTreeWidget.cpp
index b8a606a5375..f89bb58bfe3 100644
--- a/GUI/Views/SampleDesigner/SampleTreeWidget.cpp
+++ b/GUI/Views/SampleDesigner/SampleTreeWidget.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/Views/SampleDesigner/SampleTreeWidget.h"
 #include "GUI/Models/Parameter/FilterPropertyProxy.h"
-#include "GUI/Models/Group/ItemCatalog.h"
+#include "GUI/Session/ItemCatalog.h"
 #include "GUI/Models/Sample/SampleModel.h"
 #include "GUI/Views/SampleDesigner/ItemTreeView.h"
 #include <QAction>
diff --git a/GUI/Views/SimulationView.cpp b/GUI/Views/SimulationView.cpp
index e6c19f255f2..747dbef838c 100644
--- a/GUI/Views/SimulationView.cpp
+++ b/GUI/Views/SimulationView.cpp
@@ -25,7 +25,7 @@
 #include "GUI/Models/Data/RealDataModel.h"
 #include "GUI/Models/Sample/SampleModel.h"
 #include "GUI/Models/Sample/SampleValidator.h"
-#include "GUI/Models/X/SimulationOptionsItem.h"
+#include "GUI/Session/SimulationOptionsItem.h"
 #include "GUI/CommonWidgets/GroupBoxCollapser.h"
 #include "GUI/Views/SimulationWidgets/PythonScriptWidget.h"
 #include "GUI/mainwindow/mainwindow.h"
diff --git a/Tests/Unit/GUI/TestMapperCases.cpp b/Tests/Unit/GUI/TestMapperCases.cpp
index 632d4c6d25b..f5a9ee6112b 100644
--- a/Tests/Unit/GUI/TestMapperCases.cpp
+++ b/Tests/Unit/GUI/TestMapperCases.cpp
@@ -7,7 +7,7 @@
 #include "GUI/Models/Sample/ParticleLayoutItem.h"
 #include "GUI/Models/Sample/SampleModel.h"
 #include "GUI/Session/SessionItemUtils.h"
-#include "GUI/Models/X/SimulationOptionsItem.h"
+#include "GUI/Session/SimulationOptionsItem.h"
 #include "Tests/GTestWrapper/google_test.h"
 #include <QtTest>
 
diff --git a/Tests/Unit/GUI/TestProjectUtils.cpp b/Tests/Unit/GUI/TestProjectUtils.cpp
index f5d5fdb9240..85a7ed4bb85 100644
--- a/Tests/Unit/GUI/TestProjectUtils.cpp
+++ b/Tests/Unit/GUI/TestProjectUtils.cpp
@@ -1,5 +1,5 @@
 #include "GUI/utils/Error.h"
-#include "GUI/Models/X1/ItemFileNameUtils.h"
+#include "GUI/Models/Instrument/ItemFileNameUtils.h"
 #include "GUI/Project/ProjectUtils.h"
 #include "Tests/GTestWrapper/google_test.h"
 #include "Utils.h"
diff --git a/Tests/Unit/GUI/TestSavingSpecularData.cpp b/Tests/Unit/GUI/TestSavingSpecularData.cpp
index 6bbd2866c8b..deb0df14114 100644
--- a/Tests/Unit/GUI/TestSavingSpecularData.cpp
+++ b/Tests/Unit/GUI/TestSavingSpecularData.cpp
@@ -7,7 +7,7 @@
 #include "GUI/Models/Instrument/InstrumentItems.h"
 #include "GUI/Models/Instrument/InstrumentModel.h"
 #include "GUI/Models/Data/IntensityDataItem.h"
-#include "GUI/Models/X1/ItemFileNameUtils.h"
+#include "GUI/Models/Instrument/ItemFileNameUtils.h"
 #include "GUI/Models/Job/JobItem.h"
 #include "GUI/Models/Job/JobModel.h"
 #include "GUI/Models/Job/JobModelFunctions.h"
-- 
GitLab