From b8440629e9e98188df3a37b58c0348b53f6e1186 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Mon, 1 Nov 2021 22:15:38 +0100
Subject: [PATCH] mv ctd

---
 GUI/CommonWidgets/DocksController.cpp                     | 2 +-
 GUI/CommonWidgets/GUIHelpers.cpp                          | 2 +-
 GUI/CommonWidgets/ItemStackWidget.cpp                     | 2 +-
 GUI/CommonWidgets/ModelTreeView.cpp                       | 2 +-
 GUI/Models/ComboProperty.cpp                              | 2 +-
 GUI/Models/Data1DViewItem.cpp                             | 2 +-
 GUI/Models/DataItem.cpp                                   | 2 +-
 GUI/Models/DataProperties.cpp                             | 2 +-
 GUI/Models/DataPropertyContainer.cpp                      | 2 +-
 GUI/Models/DomainObjectBuilder.cpp                        | 2 +-
 GUI/Models/DomainSimulationBuilder.cpp                    | 2 +-
 GUI/Models/FitParameterItems.cpp                          | 2 +-
 GUI/Models/FitParameterProxyModel.cpp                     | 2 +-
 GUI/Models/FitSuiteItem.cpp                               | 2 +-
 GUI/Models/GUIDomainSampleVisitor.cpp                     | 2 +-
 GUI/Models/GroupInfo.cpp                                  | 2 +-
 GUI/Models/GroupItem.cpp                                  | 2 +-
 GUI/Models/ImportDataInfo.cpp                             | 2 +-
 GUI/Models/InstrumentItems.cpp                            | 2 +-
 GUI/Models/IntensityDataItem.cpp                          | 2 +-
 GUI/Models/ItemCatalog.cpp                                | 2 +-
 GUI/Models/JobItem.cpp                                    | 2 +-
 GUI/Models/JobModelFunctions.cpp                          | 2 +-
 GUI/Models/JobQueueData.cpp                               | 2 +-
 GUI/Models/MaskItems.cpp                                  | 2 +-
 GUI/Models/MaterialItemUtils.cpp                          | 2 +-
 GUI/Models/MaterialModelStore.cpp                         | 2 +-
 GUI/Models/MesoCrystalItem.cpp                            | 2 +-
 GUI/Models/ParameterTreeUtils.cpp                         | 2 +-
 GUI/Models/ParticleCoreShellItem.cpp                      | 2 +-
 GUI/Models/RealDataItem.cpp                               | 2 +-
 GUI/Models/RectangularDetectorItem.cpp                    | 2 +-
 GUI/Models/SessionItemTags.cpp                            | 2 +-
 GUI/Models/SessionModel.cpp                               | 2 +-
 GUI/Models/SessionXML.cpp                                 | 2 +-
 GUI/Models/SpecularDataItem.cpp                           | 2 +-
 GUI/Models/TransformFromDomain.cpp                        | 2 +-
 GUI/Project/projectdocument.cpp                           | 2 +-
 GUI/Project/projectmanager.cpp                            | 2 +-
 GUI/Views/FitWidgets/FitObjectiveBuilder.cpp              | 2 +-
 GUI/Views/FitWidgets/FitSessionController.cpp             | 2 +-
 GUI/Views/FitWidgets/FitSessionManager.cpp                | 2 +-
 GUI/Views/FitWidgets/ParameterTuningWidget.cpp            | 2 +-
 GUI/Views/ImportDataWidgets/RealDataPresenter.cpp         | 2 +-
 GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp    | 2 +-
 GUI/Views/IntensityDataWidgets/ColorMapUtils.cpp          | 2 +-
 .../IntensityDataWidgets/IntensityDataFFTPresenter.cpp    | 2 +-
 GUI/Views/MaskWidgets/MaskGraphicsScene.cpp               | 2 +-
 GUI/Views/MaskWidgets/MaskViewFactory.cpp                 | 2 +-
 GUI/Views/ProjectionsWidgets/SaveProjectionsAssistant.cpp | 2 +-
 GUI/Views/SampleDesigner/ConnectableView.cpp              | 2 +-
 GUI/Views/SampleDesigner/ILayerView.cpp                   | 2 +-
 GUI/Views/SampleDesigner/ParticleLayoutView.cpp           | 2 +-
 GUI/Views/SampleDesigner/ParticleView.cpp                 | 2 +-
 GUI/mainwindow/OutputDataIOHistory.cpp                    | 2 +-
 GUI/mainwindow/SaveService.cpp                            | 2 +-
 GUI/{Models => utils}/Error.cpp                           | 4 ++--
 GUI/{Models => utils}/Error.h                             | 8 ++++----
 Tests/Unit/GUI/TestAxesItems.cpp                          | 2 +-
 Tests/Unit/GUI/TestDataItemViews.cpp                      | 2 +-
 Tests/Unit/GUI/TestGroupItem.cpp                          | 2 +-
 Tests/Unit/GUI/TestOutputDataIOService.cpp                | 2 +-
 Tests/Unit/GUI/TestProjectUtils.cpp                       | 2 +-
 Tests/Unit/GUI/TestSaveService.cpp                        | 2 +-
 Tests/Unit/GUI/TestSavingSpecularData.cpp                 | 2 +-
 Tests/Unit/GUI/TestSessionItemTags.cpp                    | 2 +-
 Tests/Unit/GUI/Utils.cpp                                  | 2 +-
 67 files changed, 71 insertions(+), 71 deletions(-)
 rename GUI/{Models => utils}/Error.cpp (91%)
 rename GUI/{Models => utils}/Error.h (84%)

diff --git a/GUI/CommonWidgets/DocksController.cpp b/GUI/CommonWidgets/DocksController.cpp
index 08e4cb10235..8f4758e946c 100644
--- a/GUI/CommonWidgets/DocksController.cpp
+++ b/GUI/CommonWidgets/DocksController.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/CommonWidgets/DocksController.h"
 #include "Base/Utils/Assert.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 #include <QAbstractItemView>
 #include <QAction>
 #include <QDockWidget>
diff --git a/GUI/CommonWidgets/GUIHelpers.cpp b/GUI/CommonWidgets/GUIHelpers.cpp
index 43a84aeeeaf..c13bf5002e6 100644
--- a/GUI/CommonWidgets/GUIHelpers.cpp
+++ b/GUI/CommonWidgets/GUIHelpers.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/CommonWidgets/GUIHelpers.h"
 #include "Fit/Param/RealLimits.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 #include <QApplication>
 #include <QDoubleSpinBox>
 #include <QDoubleValidator>
diff --git a/GUI/CommonWidgets/ItemStackWidget.cpp b/GUI/CommonWidgets/ItemStackWidget.cpp
index 21fc2672107..2b8ea83909c 100644
--- a/GUI/CommonWidgets/ItemStackWidget.cpp
+++ b/GUI/CommonWidgets/ItemStackWidget.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/CommonWidgets/ItemStackWidget.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 #include "GUI/Models/SessionModel.h"
 #include <QStackedWidget>
 #include <QVBoxLayout>
diff --git a/GUI/CommonWidgets/ModelTreeView.cpp b/GUI/CommonWidgets/ModelTreeView.cpp
index b01e17705dd..6a8e51a27a4 100644
--- a/GUI/CommonWidgets/ModelTreeView.cpp
+++ b/GUI/CommonWidgets/ModelTreeView.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/CommonWidgets/ModelTreeView.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 #include "GUI/Models/SessionDecorationModel.h"
 #include "GUI/Models/SessionModel.h"
 #include "GUI/CommonWidgets/StyleUtils.h"
diff --git a/GUI/Models/ComboProperty.cpp b/GUI/Models/ComboProperty.cpp
index b2f56eb6376..c6ad4ea3ff1 100644
--- a/GUI/Models/ComboProperty.cpp
+++ b/GUI/Models/ComboProperty.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/Models/ComboProperty.h"
 #include "Base/Utils/Assert.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 
 namespace {
 const QString value_separator = ";";
diff --git a/GUI/Models/Data1DViewItem.cpp b/GUI/Models/Data1DViewItem.cpp
index 5407f25de51..a8803075b5d 100644
--- a/GUI/Models/Data1DViewItem.cpp
+++ b/GUI/Models/Data1DViewItem.cpp
@@ -19,7 +19,7 @@
 #include "GUI/Models/DataProperties.h"
 #include "GUI/Models/DataPropertyContainer.h"
 #include "GUI/Models/DataViewUtils.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 #include "GUI/Models/JobItem.h"
 
 namespace {
diff --git a/GUI/Models/DataItem.cpp b/GUI/Models/DataItem.cpp
index dd6aea3ec16..a3c70d882d2 100644
--- a/GUI/Models/DataItem.cpp
+++ b/GUI/Models/DataItem.cpp
@@ -15,7 +15,7 @@
 #include "GUI/Models/DataItem.h"
 #include "Device/Histo/IntensityDataIOFactory.h"
 #include "GUI/Models/ComboProperty.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 
 void DataItem::setOutputData(OutputData<double>* data)
 {
diff --git a/GUI/Models/DataProperties.cpp b/GUI/Models/DataProperties.cpp
index cb9176a8e8d..98bd021fd91 100644
--- a/GUI/Models/DataProperties.cpp
+++ b/GUI/Models/DataProperties.cpp
@@ -15,7 +15,7 @@
 #include "GUI/Models/DataProperties.h"
 #include "GUI/Models/ComboProperty.h"
 #include "GUI/Models/DataItem.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 #include "GUI/Models/ModelPath.h"
 #include "GUI/Models/SessionModel.h"
 #include <QColor>
diff --git a/GUI/Models/DataPropertyContainer.cpp b/GUI/Models/DataPropertyContainer.cpp
index 89bc239fd72..16aae22d70a 100644
--- a/GUI/Models/DataPropertyContainer.cpp
+++ b/GUI/Models/DataPropertyContainer.cpp
@@ -15,7 +15,7 @@
 #include "GUI/Models/DataPropertyContainer.h"
 #include "GUI/Models/DataItem.h"
 #include "GUI/Models/DataProperties.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 
 DataPropertyContainer::DataPropertyContainer() : SessionItem(M_TYPE)
 {
diff --git a/GUI/Models/DomainObjectBuilder.cpp b/GUI/Models/DomainObjectBuilder.cpp
index 4fdf0e22f15..f2707983152 100644
--- a/GUI/Models/DomainObjectBuilder.cpp
+++ b/GUI/Models/DomainObjectBuilder.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Models/DomainObjectBuilder.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 #include "GUI/Models/InstrumentItems.h"
 #include "GUI/Models/InterferenceItems.h"
 #include "GUI/Models/LayerItem.h"
diff --git a/GUI/Models/DomainSimulationBuilder.cpp b/GUI/Models/DomainSimulationBuilder.cpp
index ec886b53fdf..7541564289e 100644
--- a/GUI/Models/DomainSimulationBuilder.cpp
+++ b/GUI/Models/DomainSimulationBuilder.cpp
@@ -22,7 +22,7 @@
 #include "GUI/Models/AxesItems.h"
 #include "GUI/Models/BackgroundItems.h"
 #include "GUI/Models/DomainObjectBuilder.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 #include "GUI/Models/FootprintItems.h"
 #include "GUI/Models/InstrumentItems.h"
 #include "GUI/Models/MultiLayerItem.h"
diff --git a/GUI/Models/FitParameterItems.cpp b/GUI/Models/FitParameterItems.cpp
index 133f2dd82e5..a991e5dedc9 100644
--- a/GUI/Models/FitParameterItems.cpp
+++ b/GUI/Models/FitParameterItems.cpp
@@ -16,7 +16,7 @@
 #include "Base/Utils/Assert.h"
 #include "Fit/Param/Parameters.h"
 #include "GUI/Models/ComboProperty.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 #include "GUI/Models/JobItem.h"
 #include "GUI/Models/ModelPath.h"
 #include "GUI/Models/ParameterTreeItems.h"
diff --git a/GUI/Models/FitParameterProxyModel.cpp b/GUI/Models/FitParameterProxyModel.cpp
index bbd1d2c9c9b..85b1366dff5 100644
--- a/GUI/Models/FitParameterProxyModel.cpp
+++ b/GUI/Models/FitParameterProxyModel.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Models/FitParameterProxyModel.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 #include "GUI/Models/FitParameterHelper.h"
 #include "GUI/Models/FitParameterItems.h"
 #include "GUI/Models/JobModel.h"
diff --git a/GUI/Models/FitSuiteItem.cpp b/GUI/Models/FitSuiteItem.cpp
index 0e847b185db..6e5139cc850 100644
--- a/GUI/Models/FitSuiteItem.cpp
+++ b/GUI/Models/FitSuiteItem.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Models/FitSuiteItem.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 #include "GUI/Models/FitParameterItems.h"
 #include "GUI/Models/MinimizerItem.h"
 #include "GUI/Models/SessionModel.h"
diff --git a/GUI/Models/GUIDomainSampleVisitor.cpp b/GUI/Models/GUIDomainSampleVisitor.cpp
index 914821abcd9..cba4a36253f 100644
--- a/GUI/Models/GUIDomainSampleVisitor.cpp
+++ b/GUI/Models/GUIDomainSampleVisitor.cpp
@@ -16,7 +16,7 @@
 #include "Base/Const/Units.h"
 #include "GUI/Models/ComboProperty.h"
 #include "GUI/Models/DoubleDescriptor.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 #include "GUI/Models/FormFactorItems.h"
 #include "GUI/Models/InterferenceItems.h"
 #include "GUI/Models/LayerItem.h"
diff --git a/GUI/Models/GroupInfo.cpp b/GUI/Models/GroupInfo.cpp
index d93c2a45038..3de3b6235ad 100644
--- a/GUI/Models/GroupInfo.cpp
+++ b/GUI/Models/GroupInfo.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Models/GroupInfo.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 
 GroupInfo::GroupInfo(bool is_sorted) : is_sorted(is_sorted) {}
 
diff --git a/GUI/Models/GroupItem.cpp b/GUI/Models/GroupItem.cpp
index 8838e66bbad..5f5fb43ffd8 100644
--- a/GUI/Models/GroupItem.cpp
+++ b/GUI/Models/GroupItem.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/Models/GroupItem.h"
 #include "GUI/Models/ComboProperty.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 
 GroupItem::GroupItem() : SessionItem(M_TYPE)
 {
diff --git a/GUI/Models/ImportDataInfo.cpp b/GUI/Models/ImportDataInfo.cpp
index 83b1e715598..c67562bb372 100644
--- a/GUI/Models/ImportDataInfo.cpp
+++ b/GUI/Models/ImportDataInfo.cpp
@@ -15,7 +15,7 @@
 #include "GUI/Models/ImportDataInfo.h"
 #include "Device/Coord/AxisNames.h"
 #include "Device/Data/OutputData.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 #include "GUI/Models/JobItemUtils.h"
 #include "GUI/utils/OutputDataUtils.h"
 
diff --git a/GUI/Models/InstrumentItems.cpp b/GUI/Models/InstrumentItems.cpp
index 4be8015fdd2..078e3728545 100644
--- a/GUI/Models/InstrumentItems.cpp
+++ b/GUI/Models/InstrumentItems.cpp
@@ -24,7 +24,7 @@
 #include "GUI/Models/BackgroundItems.h"
 #include "GUI/Models/BeamWavelengthItem.h"
 #include "GUI/Models/DetectorItems.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 #include "GUI/Models/GroupItem.h"
 #include "GUI/Models/ItemFileNameUtils.h"
 #include "GUI/Models/JobItemUtils.h"
diff --git a/GUI/Models/IntensityDataItem.cpp b/GUI/Models/IntensityDataItem.cpp
index ff6d94e8dfa..54536aa093d 100644
--- a/GUI/Models/IntensityDataItem.cpp
+++ b/GUI/Models/IntensityDataItem.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/Models/IntensityDataItem.h"
 #include "GUI/Models/AxesItems.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 #include "GUI/Models/ImportDataInfo.h"
 #include "GUI/Models/JobItemUtils.h"
 #include "GUI/Models/MaskItems.h"
diff --git a/GUI/Models/ItemCatalog.cpp b/GUI/Models/ItemCatalog.cpp
index d7ea3feeb6a..3d2e5cc5592 100644
--- a/GUI/Models/ItemCatalog.cpp
+++ b/GUI/Models/ItemCatalog.cpp
@@ -20,7 +20,7 @@
 #include "GUI/Models/Data1DViewItem.h"
 #include "GUI/Models/DataProperties.h"
 #include "GUI/Models/DataPropertyContainer.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 #include "GUI/Models/FTDecayFunctionItems.h"
 #include "GUI/Models/FTDistributionItems.h"
 #include "GUI/Models/FitParameterItems.h"
diff --git a/GUI/Models/JobItem.cpp b/GUI/Models/JobItem.cpp
index 59738e8d10a..8e1410406d3 100644
--- a/GUI/Models/JobItem.cpp
+++ b/GUI/Models/JobItem.cpp
@@ -15,7 +15,7 @@
 #include "GUI/Models/JobItem.h"
 #include "Base/Utils/Assert.h"
 #include "GUI/Models/Data1DViewItem.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 #include "GUI/Models/FitSuiteItem.h"
 #include "GUI/Models/InstrumentItems.h"
 #include "GUI/Models/IntensityDataItem.h"
diff --git a/GUI/Models/JobModelFunctions.cpp b/GUI/Models/JobModelFunctions.cpp
index 896cff85b7c..94d3efa1517 100644
--- a/GUI/Models/JobModelFunctions.cpp
+++ b/GUI/Models/JobModelFunctions.cpp
@@ -17,7 +17,7 @@
 #include "Device/Instrument/Instrument.h"
 #include "GUI/Models/Data1DViewItem.h"
 #include "GUI/Models/DataPropertyContainer.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 #include "GUI/Models/FitParameterItems.h"
 #include "GUI/Models/FitSuiteItem.h"
 #include "GUI/Models/GroupItem.h"
diff --git a/GUI/Models/JobQueueData.cpp b/GUI/Models/JobQueueData.cpp
index 7b77893f1cd..d177bc423e5 100644
--- a/GUI/Models/JobQueueData.cpp
+++ b/GUI/Models/JobQueueData.cpp
@@ -15,7 +15,7 @@
 #include "GUI/Models/JobQueueData.h"
 #include "Core/Simulation/GISASSimulation.h"
 #include "GUI/Models/DomainSimulationBuilder.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 #include "GUI/Models/JobItem.h"
 #include "GUI/Models/JobModel.h"
 #include "GUI/Models/JobWorker.h"
diff --git a/GUI/Models/MaskItems.cpp b/GUI/Models/MaskItems.cpp
index b313260032e..e1259cd3248 100644
--- a/GUI/Models/MaskItems.cpp
+++ b/GUI/Models/MaskItems.cpp
@@ -18,7 +18,7 @@
 #include "Device/Mask/Line.h"
 #include "Device/Mask/Polygon.h"
 #include "Device/Mask/Rectangle.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 
 MaskContainerItem::MaskContainerItem() : SessionItem(M_TYPE)
 {
diff --git a/GUI/Models/MaterialItemUtils.cpp b/GUI/Models/MaterialItemUtils.cpp
index bb597230a5d..354557861ab 100644
--- a/GUI/Models/MaterialItemUtils.cpp
+++ b/GUI/Models/MaterialItemUtils.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Models/MaterialItemUtils.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 #include "GUI/Models/LayerItem.h"
 #include "GUI/Models/MaterialItemContainer.h"
 #include "GUI/Models/MaterialModel.h"
diff --git a/GUI/Models/MaterialModelStore.cpp b/GUI/Models/MaterialModelStore.cpp
index 6e0b527bba9..f6d9d3247f2 100644
--- a/GUI/Models/MaterialModelStore.cpp
+++ b/GUI/Models/MaterialModelStore.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Models/MaterialModelStore.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 
 namespace {
 MaterialModel* theMaterialModel = nullptr;
diff --git a/GUI/Models/MesoCrystalItem.cpp b/GUI/Models/MesoCrystalItem.cpp
index 96f05c8085b..adc9e4e4277 100644
--- a/GUI/Models/MesoCrystalItem.cpp
+++ b/GUI/Models/MesoCrystalItem.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Models/MesoCrystalItem.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 #include "GUI/Models/FormFactorItems.h"
 #include "GUI/Models/GroupInfo.h"
 #include "GUI/Models/ParticleCompositionItem.h"
diff --git a/GUI/Models/ParameterTreeUtils.cpp b/GUI/Models/ParameterTreeUtils.cpp
index f29de29771c..74d7477a82d 100644
--- a/GUI/Models/ParameterTreeUtils.cpp
+++ b/GUI/Models/ParameterTreeUtils.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Models/ParameterTreeUtils.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 #include "GUI/Models/FitParameterHelper.h"
 #include "GUI/Models/GroupItem.h"
 #include "GUI/Models/InstrumentItems.h"
diff --git a/GUI/Models/ParticleCoreShellItem.cpp b/GUI/Models/ParticleCoreShellItem.cpp
index d69c70a60e7..3c24429e6f4 100644
--- a/GUI/Models/ParticleCoreShellItem.cpp
+++ b/GUI/Models/ParticleCoreShellItem.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/Models/ParticleCoreShellItem.h"
 #include "GUI/Models/DoubleDescriptor.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 #include "GUI/Models/ModelPath.h"
 #include "GUI/Models/ParticleItem.h"
 #include "GUI/Models/SessionItemUtils.h"
diff --git a/GUI/Models/RealDataItem.cpp b/GUI/Models/RealDataItem.cpp
index a8db7216632..1facec6f749 100644
--- a/GUI/Models/RealDataItem.cpp
+++ b/GUI/Models/RealDataItem.cpp
@@ -17,7 +17,7 @@
 #include "GUI/Models/AbstractDataLoader1D.h"
 #include "GUI/Models/ApplicationModels.h"
 #include "GUI/Models/DataLoaders1D.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 #include "GUI/Models/ImportDataInfo.h"
 #include "GUI/Models/InstrumentItems.h"
 #include "GUI/Models/InstrumentModel.h"
diff --git a/GUI/Models/RectangularDetectorItem.cpp b/GUI/Models/RectangularDetectorItem.cpp
index 60f359f9164..5e324867146 100644
--- a/GUI/Models/RectangularDetectorItem.cpp
+++ b/GUI/Models/RectangularDetectorItem.cpp
@@ -15,7 +15,7 @@
 #include "GUI/Models/RectangularDetectorItem.h"
 #include "Device/Detector/RectangularDetector.h"
 #include "GUI/Models/AxesItems.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 #include "GUI/Models/VectorItem.h"
 
 namespace {
diff --git a/GUI/Models/SessionItemTags.cpp b/GUI/Models/SessionItemTags.cpp
index 8f5312cbaf8..5e784180d97 100644
--- a/GUI/Models/SessionItemTags.cpp
+++ b/GUI/Models/SessionItemTags.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Models/SessionItemTags.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 
 //! Register tag with given parameters. Returns true in case of success. Returns
 //! false if parameters are invalid or such tag was already registered.
diff --git a/GUI/Models/SessionModel.cpp b/GUI/Models/SessionModel.cpp
index 3b1f7539c31..5f2d5a943fb 100644
--- a/GUI/Models/SessionModel.cpp
+++ b/GUI/Models/SessionModel.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Models/SessionModel.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 #include "GUI/Models/ItemFactory.h"
 #include "GUI/Models/SessionItemTags.h"
 #include "GUI/Models/SessionItemUtils.h"
diff --git a/GUI/Models/SessionXML.cpp b/GUI/Models/SessionXML.cpp
index 6b8a6ecfd3f..f52b588a8ee 100644
--- a/GUI/Models/SessionXML.cpp
+++ b/GUI/Models/SessionXML.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Models/ComboProperty.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 #include "GUI/Models/GroupItem.h"
 #include "GUI/Models/MaterialItem.h"
 #include "GUI/Models/SessionItemTags.h"
diff --git a/GUI/Models/SpecularDataItem.cpp b/GUI/Models/SpecularDataItem.cpp
index 669535a515b..85c9da8028e 100644
--- a/GUI/Models/SpecularDataItem.cpp
+++ b/GUI/Models/SpecularDataItem.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/Models/SpecularDataItem.h"
 #include "GUI/Models/AxesItems.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 #include "GUI/Models/ImportDataInfo.h"
 #include "GUI/Models/JobItemUtils.h"
 
diff --git a/GUI/Models/TransformFromDomain.cpp b/GUI/Models/TransformFromDomain.cpp
index dbacb2abed1..086aec0d429 100644
--- a/GUI/Models/TransformFromDomain.cpp
+++ b/GUI/Models/TransformFromDomain.cpp
@@ -37,7 +37,7 @@
 #include "GUI/Models/BeamAngleItems.h"
 #include "GUI/Models/BeamWavelengthItem.h"
 #include "GUI/Models/DoubleDescriptor.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 #include "GUI/Models/FTDecayFunctionItems.h"
 #include "GUI/Models/FTDistributionItems.h"
 #include "GUI/Models/InstrumentItems.h"
diff --git a/GUI/Project/projectdocument.cpp b/GUI/Project/projectdocument.cpp
index 79029dc0704..b7bf32663fa 100644
--- a/GUI/Project/projectdocument.cpp
+++ b/GUI/Project/projectdocument.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/Project/projectdocument.h"
 #include "GUI/Models/DocumentModel.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 #include "GUI/Models/JobModel.h"
 #include "GUI/mainwindow/OutputDataIOService.h"
 #include "GUI/Project/ProjectUtils.h"
diff --git a/GUI/Project/projectmanager.cpp b/GUI/Project/projectmanager.cpp
index 0f564ee19f0..365de873961 100644
--- a/GUI/Project/projectmanager.cpp
+++ b/GUI/Project/projectmanager.cpp
@@ -16,7 +16,7 @@
 #include "Base/Utils/Assert.h"
 #include "GUI/Application/Application.h"
 #include "GUI/Models/ApplicationModels.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 #include "GUI/CommonWidgets/GUIHelpers.h"
 #include "GUI/InfoWidgets/ProjectLoadProblemDialog.h"
 #include "GUI/utils/mainwindow_constants.h"
diff --git a/GUI/Views/FitWidgets/FitObjectiveBuilder.cpp b/GUI/Views/FitWidgets/FitObjectiveBuilder.cpp
index 02c6d440c22..1cf3a8eeb50 100644
--- a/GUI/Views/FitWidgets/FitObjectiveBuilder.cpp
+++ b/GUI/Views/FitWidgets/FitObjectiveBuilder.cpp
@@ -20,7 +20,7 @@
 #include "Fit/Minimizer/IMinimizer.h"
 #include "GUI/Models/DataItem.h"
 #include "GUI/Models/DomainSimulationBuilder.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 #include "GUI/Models/FitParameterItems.h"
 #include "GUI/Models/FitSuiteItem.h"
 #include "GUI/Models/JobItem.h"
diff --git a/GUI/Views/FitWidgets/FitSessionController.cpp b/GUI/Views/FitWidgets/FitSessionController.cpp
index 132f214b51b..afc6e8efcb0 100644
--- a/GUI/Views/FitWidgets/FitSessionController.cpp
+++ b/GUI/Views/FitWidgets/FitSessionController.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Views/FitWidgets/FitSessionController.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 #include "GUI/Models/FitParameterItems.h"
 #include "GUI/Models/FitSuiteItem.h"
 #include "GUI/Models/IntensityDataItem.h"
diff --git a/GUI/Views/FitWidgets/FitSessionManager.cpp b/GUI/Views/FitWidgets/FitSessionManager.cpp
index 8c5ad284f08..186817f63f7 100644
--- a/GUI/Views/FitWidgets/FitSessionManager.cpp
+++ b/GUI/Views/FitWidgets/FitSessionManager.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Views/FitWidgets/FitSessionManager.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 #include "GUI/Models/JobItem.h"
 #include "GUI/Views/FitWidgets/FitLog.h"
 #include "GUI/Views/FitWidgets/FitSessionController.h"
diff --git a/GUI/Views/FitWidgets/ParameterTuningWidget.cpp b/GUI/Views/FitWidgets/ParameterTuningWidget.cpp
index 38dcf05deef..acdee95b3d6 100644
--- a/GUI/Views/FitWidgets/ParameterTuningWidget.cpp
+++ b/GUI/Views/FitWidgets/ParameterTuningWidget.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Views/FitWidgets/ParameterTuningWidget.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 #include "GUI/Models/IntensityDataItem.h"
 #include "GUI/Models/JobItem.h"
 #include "GUI/Models/JobModel.h"
diff --git a/GUI/Views/ImportDataWidgets/RealDataPresenter.cpp b/GUI/Views/ImportDataWidgets/RealDataPresenter.cpp
index 6b714b4c433..b9f011ec584 100644
--- a/GUI/Views/ImportDataWidgets/RealDataPresenter.cpp
+++ b/GUI/Views/ImportDataWidgets/RealDataPresenter.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Views/ImportDataWidgets/RealDataPresenter.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 #include "GUI/Models/RealDataItem.h"
 #include "GUI/Views/ImportDataWidgets/RealDataMaskWidget.h"
 #include "GUI/Views/IntensityDataWidgets/IntensityDataWidget.h"
diff --git a/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp b/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
index cda0f00d08c..36fea3d65a5 100644
--- a/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
+++ b/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
@@ -17,7 +17,7 @@
 #include "GUI/Application/Application.h"
 #include "GUI/Models/AbstractDataLoader1D.h"
 #include "GUI/Models/DataLoaders1D.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 #include "GUI/Models/RealDataItem.h"
 #include "GUI/Models/RealDataModel.h"
 #include "GUI/CommonWidgets/GUIHelpers.h"
diff --git a/GUI/Views/IntensityDataWidgets/ColorMapUtils.cpp b/GUI/Views/IntensityDataWidgets/ColorMapUtils.cpp
index 49660c8cb6b..0a9b47abd5e 100644
--- a/GUI/Views/IntensityDataWidgets/ColorMapUtils.cpp
+++ b/GUI/Views/IntensityDataWidgets/ColorMapUtils.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Views/IntensityDataWidgets/ColorMapUtils.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 #include "GUI/Models/IntensityDataItem.h"
 #include "GUI/CommonWidgets/StyleUtils.h"
 
diff --git a/GUI/Views/IntensityDataWidgets/IntensityDataFFTPresenter.cpp b/GUI/Views/IntensityDataWidgets/IntensityDataFFTPresenter.cpp
index d438708642c..a754f41f11f 100644
--- a/GUI/Views/IntensityDataWidgets/IntensityDataFFTPresenter.cpp
+++ b/GUI/Views/IntensityDataWidgets/IntensityDataFFTPresenter.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/Views/IntensityDataWidgets/IntensityDataFFTPresenter.h"
 #include "Device/Data/DataUtils.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 #include "GUI/Models/IntensityDataItem.h"
 #include "GUI/Models/SessionModel.h"
 #include <QAction>
diff --git a/GUI/Views/MaskWidgets/MaskGraphicsScene.cpp b/GUI/Views/MaskWidgets/MaskGraphicsScene.cpp
index ce79f7977a3..802f2f80aa3 100644
--- a/GUI/Views/MaskWidgets/MaskGraphicsScene.cpp
+++ b/GUI/Views/MaskWidgets/MaskGraphicsScene.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Views/MaskWidgets/MaskGraphicsScene.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 #include "GUI/Models/GroupItem.h"
 #include "GUI/Models/MaskItems.h"
 #include "GUI/Models/ProjectionItems.h"
diff --git a/GUI/Views/MaskWidgets/MaskViewFactory.cpp b/GUI/Views/MaskWidgets/MaskViewFactory.cpp
index a5c3a99f713..379e992603e 100644
--- a/GUI/Views/MaskWidgets/MaskViewFactory.cpp
+++ b/GUI/Views/MaskWidgets/MaskViewFactory.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Views/MaskWidgets/MaskViewFactory.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 #include "GUI/Models/MaskItems.h"
 #include "GUI/Models/ProjectionItems.h"
 #include "GUI/Models/SessionItem.h"
diff --git a/GUI/Views/ProjectionsWidgets/SaveProjectionsAssistant.cpp b/GUI/Views/ProjectionsWidgets/SaveProjectionsAssistant.cpp
index 78cf5ef83fd..7a820e102d1 100644
--- a/GUI/Views/ProjectionsWidgets/SaveProjectionsAssistant.cpp
+++ b/GUI/Views/ProjectionsWidgets/SaveProjectionsAssistant.cpp
@@ -17,7 +17,7 @@
 #include "Device/Histo/Histogram1D.h"
 #include "Device/Histo/Histogram2D.h"
 #include "GUI/Application/Application.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 #include "GUI/Models/IntensityDataItem.h"
 #include "GUI/Models/MaskItems.h"
 #include "GUI/Models/ProjectionItems.h"
diff --git a/GUI/Views/SampleDesigner/ConnectableView.cpp b/GUI/Views/SampleDesigner/ConnectableView.cpp
index 287b09dd239..be485634e4f 100644
--- a/GUI/Views/SampleDesigner/ConnectableView.cpp
+++ b/GUI/Views/SampleDesigner/ConnectableView.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Views/SampleDesigner/ConnectableView.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 #include "GUI/Models/SessionGraphicsItem.h"
 #include "GUI/CommonWidgets/DesignerHelper.h"
 #include "GUI/CommonWidgets/StyleUtils.h"
diff --git a/GUI/Views/SampleDesigner/ILayerView.cpp b/GUI/Views/SampleDesigner/ILayerView.cpp
index 2e967f232f8..fb733dfb594 100644
--- a/GUI/Views/SampleDesigner/ILayerView.cpp
+++ b/GUI/Views/SampleDesigner/ILayerView.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Models/DoubleDescriptor.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 #include "GUI/Models/LayerItem.h"
 #include "GUI/Models/SampleModel.h"
 #include "GUI/CommonWidgets/DesignerHelper.h"
diff --git a/GUI/Views/SampleDesigner/ParticleLayoutView.cpp b/GUI/Views/SampleDesigner/ParticleLayoutView.cpp
index de9346b01d6..959ac011bc7 100644
--- a/GUI/Views/SampleDesigner/ParticleLayoutView.cpp
+++ b/GUI/Views/SampleDesigner/ParticleLayoutView.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Views/SampleDesigner/ParticleLayoutView.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 #include "GUI/Models/SessionItem.h"
 #include "GUI/CommonWidgets/DesignerHelper.h"
 #include "GUI/Views/SampleDesigner/ParticleView.h"
diff --git a/GUI/Views/SampleDesigner/ParticleView.cpp b/GUI/Views/SampleDesigner/ParticleView.cpp
index c1b8d9478b3..0ddb093db9e 100644
--- a/GUI/Views/SampleDesigner/ParticleView.cpp
+++ b/GUI/Views/SampleDesigner/ParticleView.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Views/SampleDesigner/ParticleView.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 #include "GUI/Models/FormFactorItems.h"
 #include "GUI/Models/GroupItem.h"
 #include "GUI/Models/ParticleItem.h"
diff --git a/GUI/mainwindow/OutputDataIOHistory.cpp b/GUI/mainwindow/OutputDataIOHistory.cpp
index 4a00a165756..445316970f5 100644
--- a/GUI/mainwindow/OutputDataIOHistory.cpp
+++ b/GUI/mainwindow/OutputDataIOHistory.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/mainwindow/OutputDataIOHistory.h"
 #include "Base/Utils/Assert.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 #include "GUI/Models/SaveLoadInterface.h"
 
 //! Static method to create info for just saved item.
diff --git a/GUI/mainwindow/SaveService.cpp b/GUI/mainwindow/SaveService.cpp
index 2544ece2b95..6636d7bcf2d 100644
--- a/GUI/mainwindow/SaveService.cpp
+++ b/GUI/mainwindow/SaveService.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/mainwindow/SaveService.h"
 #include "Base/Utils/Assert.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 #include "GUI/mainwindow/AutosaveController.h"
 #include "GUI/Project/ProjectUtils.h"
 #include "GUI/mainwindow/SaveThread.h"
diff --git a/GUI/Models/Error.cpp b/GUI/utils/Error.cpp
similarity index 91%
rename from GUI/Models/Error.cpp
rename to GUI/utils/Error.cpp
index b6881446d5b..1aa6462cb5f 100644
--- a/GUI/Models/Error.cpp
+++ b/GUI/utils/Error.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Models/Error.cpp
+//! @file      GUI/utils/Error.cpp
 //! @brief     Implements Error class
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 
 Error::Error(const QString& message) noexcept : m_messageAsLatin1(message.toLatin1()) {}
 
diff --git a/GUI/Models/Error.h b/GUI/utils/Error.h
similarity index 84%
rename from GUI/Models/Error.h
rename to GUI/utils/Error.h
index 29ea6035c89..3da8a68bfc9 100644
--- a/GUI/Models/Error.h
+++ b/GUI/utils/Error.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Models/Error.h
+//! @file      GUI/utils/Error.h
 //! @brief     Defines error class
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_MODELS_ERROR_H
-#define BORNAGAIN_GUI_MODELS_ERROR_H
+#ifndef BORNAGAIN_GUI_UTILS_ERROR_H
+#define BORNAGAIN_GUI_UTILS_ERROR_H
 
 #include <QByteArray>
 #include <QString>
@@ -27,4 +27,4 @@ private:
     QByteArray m_messageAsLatin1;
 };
 
-#endif // BORNAGAIN_GUI_MODELS_ERROR_H
+#endif // BORNAGAIN_GUI_UTILS_ERROR_H
diff --git a/Tests/Unit/GUI/TestAxesItems.cpp b/Tests/Unit/GUI/TestAxesItems.cpp
index d0ca125d298..7d537ad8b4e 100644
--- a/Tests/Unit/GUI/TestAxesItems.cpp
+++ b/Tests/Unit/GUI/TestAxesItems.cpp
@@ -2,7 +2,7 @@
 #include "Base/Axis/VariableBinAxis.h"
 #include "Base/Const/Units.h"
 #include "GUI/Models/AxesItems.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 #include "GUI/Models/PropertyItem.h"
 #include "GUI/Models/TransformFromDomain.h"
 #include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/Unit/GUI/TestDataItemViews.cpp b/Tests/Unit/GUI/TestDataItemViews.cpp
index a1d5c1e0409..944fd478c6f 100644
--- a/Tests/Unit/GUI/TestDataItemViews.cpp
+++ b/Tests/Unit/GUI/TestDataItemViews.cpp
@@ -3,7 +3,7 @@
 #include "GUI/Models/DataItem.h"
 #include "GUI/Models/DataProperties.h"
 #include "GUI/Models/DataPropertyContainer.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 #include "GUI/Models/RealDataModel.h"
 #include "GUI/Models/SpecularDataItem.h"
 #include "GUI/Project/projectdocument.h"
diff --git a/Tests/Unit/GUI/TestGroupItem.cpp b/Tests/Unit/GUI/TestGroupItem.cpp
index ebb76683eb2..744d9b234c4 100644
--- a/Tests/Unit/GUI/TestGroupItem.cpp
+++ b/Tests/Unit/GUI/TestGroupItem.cpp
@@ -1,6 +1,6 @@
 #include "GUI/Models/ComboProperty.h"
 #include "GUI/Models/DistributionItems.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 #include "GUI/Models/FormFactorItems.h"
 #include "GUI/Models/GroupItem.h"
 #include "GUI/Models/SessionItemUtils.h"
diff --git a/Tests/Unit/GUI/TestOutputDataIOService.cpp b/Tests/Unit/GUI/TestOutputDataIOService.cpp
index 129f76596d5..708dd2c9d9c 100644
--- a/Tests/Unit/GUI/TestOutputDataIOService.cpp
+++ b/Tests/Unit/GUI/TestOutputDataIOService.cpp
@@ -1,7 +1,7 @@
 #include "Device/Histo/IntensityDataIOFactory.h"
 #include "GUI/Models/ApplicationModels.h"
 #include "GUI/Models/DataItem.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 #include "GUI/Models/ImportDataInfo.h"
 #include "GUI/Models/IntensityDataItem.h"
 #include "GUI/Models/JobItem.h"
diff --git a/Tests/Unit/GUI/TestProjectUtils.cpp b/Tests/Unit/GUI/TestProjectUtils.cpp
index 79887b6c9aa..b33d79169e2 100644
--- a/Tests/Unit/GUI/TestProjectUtils.cpp
+++ b/Tests/Unit/GUI/TestProjectUtils.cpp
@@ -1,4 +1,4 @@
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 #include "GUI/Models/ItemFileNameUtils.h"
 #include "GUI/Project/ProjectUtils.h"
 #include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/Unit/GUI/TestSaveService.cpp b/Tests/Unit/GUI/TestSaveService.cpp
index ccf0f933654..ca68a318cc9 100644
--- a/Tests/Unit/GUI/TestSaveService.cpp
+++ b/Tests/Unit/GUI/TestSaveService.cpp
@@ -1,5 +1,5 @@
 #include "GUI/Models/ApplicationModels.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 #include "GUI/Models/InstrumentItems.h"
 #include "GUI/Models/InstrumentModel.h"
 #include "GUI/Models/IntensityDataItem.h"
diff --git a/Tests/Unit/GUI/TestSavingSpecularData.cpp b/Tests/Unit/GUI/TestSavingSpecularData.cpp
index 756e1f64c19..43a9c59ff08 100644
--- a/Tests/Unit/GUI/TestSavingSpecularData.cpp
+++ b/Tests/Unit/GUI/TestSavingSpecularData.cpp
@@ -2,7 +2,7 @@
 #include "Device/Histo/IntensityDataIOFactory.h"
 #include "GUI/Models/ApplicationModels.h"
 #include "GUI/Models/DataItem.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 #include "GUI/Models/GroupItem.h"
 #include "GUI/Models/InstrumentItems.h"
 #include "GUI/Models/InstrumentModel.h"
diff --git a/Tests/Unit/GUI/TestSessionItemTags.cpp b/Tests/Unit/GUI/TestSessionItemTags.cpp
index c382edc7bdb..6eeebcfaf66 100644
--- a/Tests/Unit/GUI/TestSessionItemTags.cpp
+++ b/Tests/Unit/GUI/TestSessionItemTags.cpp
@@ -1,4 +1,4 @@
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 #include "GUI/Models/LayerItem.h"
 #include "GUI/Models/ParticleItem.h"
 #include "GUI/Models/SessionItemTags.h"
diff --git a/Tests/Unit/GUI/Utils.cpp b/Tests/Unit/GUI/Utils.cpp
index c4bf83b47b8..57af0b02c6a 100644
--- a/Tests/Unit/GUI/Utils.cpp
+++ b/Tests/Unit/GUI/Utils.cpp
@@ -16,7 +16,7 @@
 #include "Tests/Unit/GUI/Utils.h"
 #include "Device/Data/DataUtils.h"
 #include "Device/Histo/IntensityDataIOFactory.h"
-#include "GUI/Models/Error.h"
+#include "GUI/utils/Error.h"
 #include "GUI/Models/RealDataItem.h"
 #include "GUI/Models/SessionModel.h"
 #include "GUI/Project/ProjectUtils.h"
-- 
GitLab