diff --git a/GUI/Application/Application.h b/GUI/Application/Application.h
index 88a9dc864d070ee8fa885ca4c3559ced0b76f5b7..4d40388f6ffb87f31e3ce0ef86407c9152c979c7 100644
--- a/GUI/Application/Application.h
+++ b/GUI/Application/Application.h
@@ -16,7 +16,7 @@
 #define BORNAGAIN_GUI_APPLICATION_APPLICATION_H
 
 #include "GUI/Application/ApplicationSettings.h"
-#include "GUI/Application/InstrumentLibrary.h"
+#include "GUI/Models/Instrument/InstrumentLibrary.h"
 #include <QApplication>
 #include <QColor>
 
diff --git a/GUI/Models/Data/GUIObjectBuilder.cpp b/GUI/Models/Data/GUIObjectBuilder.cpp
index b1deb45725eaeacacbec737d32207d5d7123b222..b084fcf582d5c57a59d01d2084c62c32e5dacbd6 100644
--- a/GUI/Models/Data/GUIObjectBuilder.cpp
+++ b/GUI/Models/Data/GUIObjectBuilder.cpp
@@ -18,7 +18,7 @@
 #include "Core/Simulation/includeSimulations.h"
 #include "Device/Instrument/Instrument.h"
 #include "GUI/Models/Data/DocumentModel.h"
-#include "GUI/Models/Domain/GUIDomainSampleVisitor.h"
+#include "GUI/Models/Sample/GUIDomainSampleVisitor.h"
 #include "GUI/Session/InstrumentItems.h"
 #include "GUI/Models/Instrument/InstrumentModel.h"
 #include "GUI/Session/SimulationOptionsItem.h"
diff --git a/GUI/Models/Domain/TransformToDomain.cpp b/GUI/Models/Domain/TransformToDomain.cpp
index 6af86b3d171409aeb93e91852e94abedb92c1b74..9ba2aefa0ef16b803dd5c9f05a95f27b3ce3e3e5 100644
--- a/GUI/Models/Domain/TransformToDomain.cpp
+++ b/GUI/Models/Domain/TransformToDomain.cpp
@@ -22,7 +22,7 @@
 #include "GUI/Session/BeamWavelengthItem.h"
 #include "GUI/Models/Types/DoubleDescriptor.h"
 #include "GUI/Session/JobItem.h"
-#include "GUI/Models/Job/JobModelFunctions.h"
+#include "GUI/Session/JobModelFunctions.h"
 #include "GUI/Session/LayerItem.h"
 #include "GUI/Session/LayerRoughnessItems.h"
 #include "GUI/Session/MaterialItemUtils.h"
diff --git a/GUI/Application/InstrumentLibrary.cpp b/GUI/Models/Instrument/InstrumentLibrary.cpp
similarity index 96%
rename from GUI/Application/InstrumentLibrary.cpp
rename to GUI/Models/Instrument/InstrumentLibrary.cpp
index d963619cd080aae96f32449dcdd0268b5d1256ea..7a8e93d07521c120c69d701970a96795380c5986 100644
--- a/GUI/Application/InstrumentLibrary.cpp
+++ b/GUI/Models/Instrument/InstrumentLibrary.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Application/InstrumentLibrary.cpp
+//! @file      GUI/Models/Instrument/InstrumentLibrary.cpp
 //! @brief     Implements class InstrumentLibrary
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Application/InstrumentLibrary.h"
+#include "GUI/Models/Instrument/InstrumentLibrary.h"
 #include "GUI/Models/Instrument/InstrumentsTreeModel.h"
 #include "GUI/Session/InstrumentItems.h"
 #include <QFile>
diff --git a/GUI/Application/InstrumentLibrary.h b/GUI/Models/Instrument/InstrumentLibrary.h
similarity index 82%
rename from GUI/Application/InstrumentLibrary.h
rename to GUI/Models/Instrument/InstrumentLibrary.h
index 94cea23f918839e222eec36be59d2183007e25e2..afc915c6c2ab354395d989df36a1ae78fab2c1c4 100644
--- a/GUI/Application/InstrumentLibrary.h
+++ b/GUI/Models/Instrument/InstrumentLibrary.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Application/InstrumentLibrary.h
+//! @file      GUI/Models/Instrument/InstrumentLibrary.h
 //! @brief     Defines class InstrumentLibrary
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_APPLICATION_INSTRUMENTLIBRARY_H
-#define BORNAGAIN_GUI_APPLICATION_INSTRUMENTLIBRARY_H
+#ifndef BORNAGAIN_GUI_MODELS_INSTRUMENT_INSTRUMENTLIBRARY_H
+#define BORNAGAIN_GUI_MODELS_INSTRUMENT_INSTRUMENTLIBRARY_H
 
 #include "GUI/Models/Instrument/InstrumentModel.h"
 
@@ -38,4 +38,4 @@ private:
     bool m_modified;
 };
 
-#endif // BORNAGAIN_GUI_APPLICATION_INSTRUMENTLIBRARY_H
+#endif // BORNAGAIN_GUI_MODELS_INSTRUMENT_INSTRUMENTLIBRARY_H
diff --git a/GUI/Models/Job/JobModel.cpp b/GUI/Models/Job/JobModel.cpp
index a82ef898feeb11293565e9980328500da9a4e9fa..6bd32e32b2ff602f6ec5a174c33244c4cc7df900 100644
--- a/GUI/Models/Job/JobModel.cpp
+++ b/GUI/Models/Job/JobModel.cpp
@@ -17,7 +17,7 @@
 #include "GUI/Session/InstrumentItems.h"
 #include "GUI/Session/IntensityDataItem.h"
 #include "GUI/Session/JobItem.h"
-#include "GUI/Models/Job/JobModelFunctions.h"
+#include "GUI/Session/JobModelFunctions.h"
 #include "GUI/Models/Job/JobQueueData.h"
 #include "GUI/Session/MultiLayerItem.h"
 #include "GUI/Session/ParameterTreeItems.h"
diff --git a/GUI/Models/Domain/GUIDomainSampleVisitor.cpp b/GUI/Models/Sample/GUIDomainSampleVisitor.cpp
similarity index 99%
rename from GUI/Models/Domain/GUIDomainSampleVisitor.cpp
rename to GUI/Models/Sample/GUIDomainSampleVisitor.cpp
index 801e86547c78cc5312c62e1d79d4839bc0ecf571..170937f28f1a3273b1e64b1568bd4293f8465705 100644
--- a/GUI/Models/Domain/GUIDomainSampleVisitor.cpp
+++ b/GUI/Models/Sample/GUIDomainSampleVisitor.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Models/Domain/GUIDomainSampleVisitor.cpp
+//! @file      GUI/Models/Sample/GUIDomainSampleVisitor.cpp
 //! @brief     Implements class GUIDomainSampleVisitor
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Models/Domain/GUIDomainSampleVisitor.h"
+#include "GUI/Models/Sample/GUIDomainSampleVisitor.h"
 #include "Base/Const/Units.h"
 #include "GUI/Models/Group/ComboProperty.h"
 #include "GUI/Models/Types/DoubleDescriptor.h"
diff --git a/GUI/Models/Domain/GUIDomainSampleVisitor.h b/GUI/Models/Sample/GUIDomainSampleVisitor.h
similarity index 93%
rename from GUI/Models/Domain/GUIDomainSampleVisitor.h
rename to GUI/Models/Sample/GUIDomainSampleVisitor.h
index df5aa0dd3d2a85aac59d03f7af96436f578f3eea..d19eca4e9133c4a9158a8c986d7e8c70b51e3906 100644
--- a/GUI/Models/Domain/GUIDomainSampleVisitor.h
+++ b/GUI/Models/Sample/GUIDomainSampleVisitor.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Models/Domain/GUIDomainSampleVisitor.h
+//! @file      GUI/Models/Sample/GUIDomainSampleVisitor.h
 //! @brief     Defines class GUIDomainSampleVisitor
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_MODELS_DOMAIN_GUIDOMAINSAMPLEVISITOR_H
-#define BORNAGAIN_GUI_MODELS_DOMAIN_GUIDOMAINSAMPLEVISITOR_H
+#ifndef BORNAGAIN_GUI_MODELS_SAMPLE_GUIDOMAINSAMPLEVISITOR_H
+#define BORNAGAIN_GUI_MODELS_SAMPLE_GUIDOMAINSAMPLEVISITOR_H
 
 #include "Param/Node/INodeVisitor.h"
 #include <QMap>
@@ -106,4 +106,4 @@ private:
     MaterialModel* m_materialModel;
 };
 
-#endif // BORNAGAIN_GUI_MODELS_DOMAIN_GUIDOMAINSAMPLEVISITOR_H
+#endif // BORNAGAIN_GUI_MODELS_SAMPLE_GUIDOMAINSAMPLEVISITOR_H
diff --git a/GUI/Models/Domain/GUIExamplesFactory.cpp b/GUI/Models/Sample/GUIExamplesFactory.cpp
similarity index 95%
rename from GUI/Models/Domain/GUIExamplesFactory.cpp
rename to GUI/Models/Sample/GUIExamplesFactory.cpp
index 1197470e6a724c8a14de05e5b19742743295074e..9cd6b338d8de58443ed096deda435c278b3baf0d 100644
--- a/GUI/Models/Domain/GUIExamplesFactory.cpp
+++ b/GUI/Models/Sample/GUIExamplesFactory.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Models/Domain/GUIExamplesFactory.cpp
+//! @file      GUI/Models/Sample/GUIExamplesFactory.cpp
 //! @brief     Implements class GUIExamplesFactory
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,9 +12,9 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Models/Domain/GUIExamplesFactory.h"
+#include "GUI/Models/Sample/GUIExamplesFactory.h"
 #include "Base/Utils/Assert.h"
-#include "GUI/Models/Domain/GUIDomainSampleVisitor.h"
+#include "GUI/Models/Sample/GUIDomainSampleVisitor.h"
 #include "Sample/Multilayer/MultiLayer.h"
 #include "Sample/StandardSamples/ExemplarySamples.h"
 #include <QMap>
diff --git a/GUI/Models/Domain/GUIExamplesFactory.h b/GUI/Models/Sample/GUIExamplesFactory.h
similarity index 83%
rename from GUI/Models/Domain/GUIExamplesFactory.h
rename to GUI/Models/Sample/GUIExamplesFactory.h
index c23722314cfe7e5cb47771c24abc251f57903859..20c97edaf36b548a6e14e34514dab7767912a1c8 100644
--- a/GUI/Models/Domain/GUIExamplesFactory.h
+++ b/GUI/Models/Sample/GUIExamplesFactory.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Models/Domain/GUIExamplesFactory.h
+//! @file      GUI/Models/Sample/GUIExamplesFactory.h
 //! @brief     Defines class GUIExamplesFactory
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_MODELS_DOMAIN_GUIEXAMPLESFACTORY_H
-#define BORNAGAIN_GUI_MODELS_DOMAIN_GUIEXAMPLESFACTORY_H
+#ifndef BORNAGAIN_GUI_MODELS_SAMPLE_GUIEXAMPLESFACTORY_H
+#define BORNAGAIN_GUI_MODELS_SAMPLE_GUIEXAMPLESFACTORY_H
 
 #include <QString>
 
@@ -36,4 +36,4 @@ public:
     static std::tuple<QString, QString> exampleInfo(const QString& name);
 };
 
-#endif // BORNAGAIN_GUI_MODELS_DOMAIN_GUIEXAMPLESFACTORY_H
+#endif // BORNAGAIN_GUI_MODELS_SAMPLE_GUIEXAMPLESFACTORY_H
diff --git a/GUI/Models/Sample/SampleListModel.cpp b/GUI/Models/Sample/SampleListModel.cpp
index 0f076fc92177f5f4c48d85fe96c69517dddf0649..5809823211d22d80a8e6d7113ad857da94ca2ca6 100644
--- a/GUI/Models/Sample/SampleListModel.cpp
+++ b/GUI/Models/Sample/SampleListModel.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/Models/Sample/SampleListModel.h"
 #include "GUI/Application/Application.h"
-#include "GUI/Models/Domain/GUIExamplesFactory.h"
+#include "GUI/Models/Sample/GUIExamplesFactory.h"
 #include "GUI/Mapper/ModelUtils.h"
 #include "GUI/Session/MultiLayerItem.h"
 #include "GUI/Models/Sample/SampleModel.h"
diff --git a/GUI/Session/ItemWithMaterial.cpp b/GUI/Session/ItemWithMaterial.cpp
index 1ae79638ff04729644c31ccaed60ba24cc08b6c0..3c9f97dfdad2cb51601685704841a10cf1b8506c 100644
--- a/GUI/Session/ItemWithMaterial.cpp
+++ b/GUI/Session/ItemWithMaterial.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/Session/ItemWithMaterial.h"
 #include "GUI/Session/JobItem.h"
-#include "GUI/Models/Job/JobModelFunctions.h"
+#include "GUI/Session/JobModelFunctions.h"
 #include "GUI/Session/MaterialItemContainer.h"
 #include "GUI/Session/MaterialItemUtils.h"
 
diff --git a/GUI/Models/Job/JobModelFunctions.cpp b/GUI/Session/JobModelFunctions.cpp
similarity index 99%
rename from GUI/Models/Job/JobModelFunctions.cpp
rename to GUI/Session/JobModelFunctions.cpp
index 03ad1148ebbddd6d07aa763e8d109993b30f8ba7..45755017e239e9276e97d1acd92ae8c10dbef545 100644
--- a/GUI/Models/Job/JobModelFunctions.cpp
+++ b/GUI/Session/JobModelFunctions.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Models/Job/JobModelFunctions.cpp
+//! @file      GUI/Session/JobModelFunctions.cpp
 //! @brief     Implements auxiliary functions in JobModelFunctions namespace.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Models/Job/JobModelFunctions.h"
+#include "GUI/Session/JobModelFunctions.h"
 #include "Base/Utils/Assert.h"
 #include "Device/Instrument/Instrument.h"
 #include "GUI/Session/Data1DViewItem.h"
diff --git a/GUI/Models/Job/JobModelFunctions.h b/GUI/Session/JobModelFunctions.h
similarity index 89%
rename from GUI/Models/Job/JobModelFunctions.h
rename to GUI/Session/JobModelFunctions.h
index 6944f850dcca7abad5e1dd399baeebd97e283ff2..4d445b2765480a770cb5639fd5cd28fae75c38fb 100644
--- a/GUI/Models/Job/JobModelFunctions.h
+++ b/GUI/Session/JobModelFunctions.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Models/Job/JobModelFunctions.h
+//! @file      GUI/Session/JobModelFunctions.h
 //! @brief     Defines auxiliary functions in namespace GUI::Model::JobModelFunctions.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_MODELS_JOB_JOBMODELFUNCTIONS_H
-#define BORNAGAIN_GUI_MODELS_JOB_JOBMODELFUNCTIONS_H
+#ifndef BORNAGAIN_GUI_SESSION_JOBMODELFUNCTIONS_H
+#define BORNAGAIN_GUI_SESSION_JOBMODELFUNCTIONS_H
 
 class InstrumentItem;
 class JobItem;
@@ -51,4 +51,4 @@ const JobItem* findJobItem(const SessionItem* item);
 
 } // namespace GUI::Model::JobFunctions
 
-#endif // BORNAGAIN_GUI_MODELS_JOB_JOBMODELFUNCTIONS_H
+#endif // BORNAGAIN_GUI_SESSION_JOBMODELFUNCTIONS_H
diff --git a/GUI/Session/RealDataItem.cpp b/GUI/Session/RealDataItem.cpp
index c1ccdb78c0f8f3bccf334bb134fa4fa70e1bfa35..5da139490b731d0fa2d2bd255e0fa76ac2b02810 100644
--- a/GUI/Session/RealDataItem.cpp
+++ b/GUI/Session/RealDataItem.cpp
@@ -25,7 +25,7 @@
 #include "GUI/Session/ItemFileNameUtils.h"
 #include "GUI/Session/JobItem.h"
 #include "GUI/Session/JobItemUtils.h"
-#include "GUI/Models/Job/JobModelFunctions.h"
+#include "GUI/Session/JobModelFunctions.h"
 #include "GUI/Session/MaskItems.h"
 #include "GUI/Session/ProjectionItems.h"
 #include "GUI/Models/Data/RealDataModel.h"
diff --git a/GUI/Views/PropertyEditor/TestComponentView.cpp b/GUI/Views/PropertyEditor/TestComponentView.cpp
index d3c61b0fb19da7b0c4e45639f34d3586ecdb2395..6232354d9061a2001f5c7e2a307d9030845dacff 100644
--- a/GUI/Views/PropertyEditor/TestComponentView.cpp
+++ b/GUI/Views/PropertyEditor/TestComponentView.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/Views/PropertyEditor/TestComponentView.h"
 #include "GUI/Session/BeamItems.h"
-#include "GUI/Models/Domain/GUIDomainSampleVisitor.h"
+#include "GUI/Models/Sample/GUIDomainSampleVisitor.h"
 #include "GUI/Models/Data/GUIObjectBuilder.h"
 #include "GUI/Session/IntensityDataItem.h"
 #include "GUI/Models/Material/MaterialModel.h"
diff --git a/GUI/Views/SampleDesigner/DesignerScene.cpp b/GUI/Views/SampleDesigner/DesignerScene.cpp
index 6a985ce4bd84336c0f86251a500b0371842b5a2d..e9aca1565b36af59f6f8a3bad4beb9d53144fe24 100644
--- a/GUI/Views/SampleDesigner/DesignerScene.cpp
+++ b/GUI/Views/SampleDesigner/DesignerScene.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/Views/SampleDesigner/DesignerScene.h"
 #include "GUI/Models/Parameter/FilterPropertyProxy.h"
-#include "GUI/Models/Domain/GUIExamplesFactory.h"
+#include "GUI/Models/Sample/GUIExamplesFactory.h"
 #include "GUI/Session/InterferenceItems.h"
 #include "GUI/Session/ItemFactory.h"
 #include "GUI/Session/MesoCrystalItem.h"
diff --git a/GUI/Views/SampleDesigner/SampleListView.cpp b/GUI/Views/SampleDesigner/SampleListView.cpp
index fa7ea892095cadcf5f6e83b974bf58eea3a9bd48..0e28df89eaaac43c3c35eb112d31bd5ba1da241e 100644
--- a/GUI/Views/SampleDesigner/SampleListView.cpp
+++ b/GUI/Views/SampleDesigner/SampleListView.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/Views/SampleDesigner/SampleListView.h"
 #include "GUI/Application/Application.h"
-#include "GUI/Models/Domain/GUIExamplesFactory.h"
+#include "GUI/Models/Sample/GUIExamplesFactory.h"
 #include "GUI/Session/MultiLayerItem.h"
 #include "GUI/Models/Sample/SampleListModel.h"
 #include "GUI/CommonWidgets/ItemViewOverlayButtons.h"
diff --git a/GUI/Views/SampleDesigner/SampleToolBox.cpp b/GUI/Views/SampleDesigner/SampleToolBox.cpp
index 67b481ccfbdbe55bd382b83cc122422e2919f4f4..0a18f1d488760e75a5f76cb2fe94a0f05608e935 100644
--- a/GUI/Views/SampleDesigner/SampleToolBox.cpp
+++ b/GUI/Views/SampleDesigner/SampleToolBox.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Views/SampleDesigner/SampleToolBox.h"
-#include "GUI/Models/Domain/GUIExamplesFactory.h"
+#include "GUI/Models/Sample/GUIExamplesFactory.h"
 #include "GUI/Session/ItemCatalog.h"
 #include "GUI/Session/LayerItem.h"
 #include "GUI/Session/MultiLayerItem.h"
diff --git a/GUI/mainwindow/PyImportAssistant.cpp b/GUI/mainwindow/PyImportAssistant.cpp
index 71cf7aa4028b454ec2d36974bfdc27ef85cd0c61..67f7407cf4541d380acc69650d0160797d1549c9 100644
--- a/GUI/mainwindow/PyImportAssistant.cpp
+++ b/GUI/mainwindow/PyImportAssistant.cpp
@@ -19,7 +19,7 @@
 #include "Base/Utils/Assert.h"
 #include "Base/Utils/SysUtils.h"
 #include "GUI/Application/Application.h"
-#include "GUI/Models/Domain/GUIDomainSampleVisitor.h"
+#include "GUI/Models/Sample/GUIDomainSampleVisitor.h"
 #include "GUI/Models/Data/GUIObjectBuilder.h"
 #include "GUI/CommonWidgets/GUIHelpers.h"
 #include "GUI/InfoWidgets/ComboSelectorDialog.h"
diff --git a/Tests/Functional/GUI/Check.cpp b/Tests/Functional/GUI/Check.cpp
index 2f7019c8ac3198e42338aaf0c4c7cc340126aba8..71a27cf11d7ace970d472475d5b3cd3b84c1f10c 100644
--- a/Tests/Functional/GUI/Check.cpp
+++ b/Tests/Functional/GUI/Check.cpp
@@ -21,7 +21,7 @@
 #include "Device/Histo/SimulationResult.h"
 #include "GUI/Models/Data/DocumentModel.h"
 #include "GUI/Models/Domain/DomainSimulationBuilder.h"
-#include "GUI/Models/Domain/GUIDomainSampleVisitor.h"
+#include "GUI/Models/Sample/GUIDomainSampleVisitor.h"
 #include "GUI/Models/Data/GUIObjectBuilder.h"
 #include "GUI/Session/InstrumentItems.h"
 #include "GUI/Models/Instrument/InstrumentModel.h"
diff --git a/Tests/Unit/GUI/TestOutputDataIOService.cpp b/Tests/Unit/GUI/TestOutputDataIOService.cpp
index e1e3b2b15162ad5caf41941102262d20aaa972e6..96bd8376b7465b6eb67e9055e07b7c94221c10ee 100644
--- a/Tests/Unit/GUI/TestOutputDataIOService.cpp
+++ b/Tests/Unit/GUI/TestOutputDataIOService.cpp
@@ -7,7 +7,7 @@
 #include "GUI/Session/JobItem.h"
 #include "GUI/Session/JobItemUtils.h"
 #include "GUI/Models/Job/JobModel.h"
-#include "GUI/Models/Job/JobModelFunctions.h"
+#include "GUI/Session/JobModelFunctions.h"
 #include "GUI/Session/RealDataItem.h"
 #include "GUI/Models/Data/RealDataModel.h"
 #include "GUI/mainwindow/OutputDataIOService.h"
diff --git a/Tests/Unit/GUI/TestSavingSpecularData.cpp b/Tests/Unit/GUI/TestSavingSpecularData.cpp
index 4b0f0bb4ff1232dcfa4d14f9ca8a4956e51e36da..9a95a8fd860b267e1e6415d05a9a84330a8cd9ee 100644
--- a/Tests/Unit/GUI/TestSavingSpecularData.cpp
+++ b/Tests/Unit/GUI/TestSavingSpecularData.cpp
@@ -10,7 +10,7 @@
 #include "GUI/Session/ItemFileNameUtils.h"
 #include "GUI/Session/JobItem.h"
 #include "GUI/Models/Job/JobModel.h"
-#include "GUI/Models/Job/JobModelFunctions.h"
+#include "GUI/Session/JobModelFunctions.h"
 #include "GUI/Session/PointwiseAxisItem.h"
 #include "GUI/Session/SpecularBeamInclinationItem.h"
 #include "GUI/mainwindow/OutputDataIOService.h"