From 09ab40a3ab5be1d9e8de669ed094f78926a4bbf4 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (l)" <j.wuttke@fz-juelich.de>
Date: Fri, 5 Nov 2021 16:41:17 +0100
Subject: [PATCH] rename -> GUI/Utils
---
App/AppOptions.cpp | 2 +-
App/main.cpp | 4 +-
GUI/Models/Data/ApplicationModels.cpp | 2 +-
GUI/Models/Data/Data1DViewItem.cpp | 4 +-
GUI/Models/Data/DataItem.cpp | 4 +-
GUI/Models/Data/DataItem.h | 2 +-
GUI/Models/Data/DataProperties.cpp | 4 +-
GUI/Models/Data/DataPropertyContainer.cpp | 2 +-
GUI/Models/Data/ImportDataInfo.cpp | 4 +-
GUI/Models/Data/IntensityDataItem.cpp | 2 +-
GUI/Models/Data/MaskItems.cpp | 2 +-
GUI/Models/Data/PointwiseAxisItem.h | 2 +-
GUI/Models/Data/RealDataItem.cpp | 6 +-
GUI/Models/Data/SpecularDataItem.cpp | 2 +-
GUI/Models/Domain/DomainObjectBuilder.cpp | 2 +-
GUI/Models/Domain/DomainSimulationBuilder.cpp | 2 +-
GUI/Models/Domain/TransformFromDomain.cpp | 2 +-
GUI/Models/Fit/FitParameterItems.cpp | 4 +-
GUI/Models/Fit/FitParameterProxyModel.cpp | 2 +-
GUI/Models/Fit/FitSuiteItem.cpp | 2 +-
GUI/Models/Fit/MinimizerItemCatalog.cpp | 2 +-
GUI/Models/Fit/MinimizerItemCatalog.h | 2 +-
GUI/Models/Group/GroupInfo.cpp | 2 +-
GUI/Models/Group/GroupItem.cpp | 4 +-
GUI/Models/Group/GroupItemController.cpp | 2 +-
GUI/Models/Group/ItemCatalog.cpp | 2 +-
GUI/Models/Group/SelectionDescriptor.h | 2 +-
GUI/Models/Instrument/InstrumentItems.cpp | 6 +-
.../Instrument/RectangularDetectorItem.cpp | 4 +-
GUI/Models/Job/JobItem.cpp | 4 +-
GUI/Models/Job/JobItemUtils.h | 2 +-
GUI/Models/Job/JobModel.cpp | 2 +-
GUI/Models/Job/JobModelFunctions.cpp | 6 +-
GUI/Models/Job/JobQueueData.cpp | 4 +-
GUI/Models/Job/ParameterTreeUtils.cpp | 2 +-
GUI/Models/Material/MaterialItem.cpp | 2 +-
GUI/Models/Material/MaterialItemContainer.cpp | 2 +-
GUI/Models/Material/MaterialItemUtils.cpp | 2 +-
GUI/Models/Material/MaterialModel.cpp | 2 +-
GUI/Models/Material/MaterialModelStore.cpp | 2 +-
GUI/Models/Project/OutputDataIOHistory.cpp | 4 +-
GUI/Models/Project/OutputDataIOService.cpp | 4 +-
GUI/Models/Project/ProjectDocument.cpp | 6 +-
GUI/Models/Sample/GUIDomainSampleVisitor.cpp | 2 +-
GUI/Models/Sample/MesoCrystalItem.cpp | 2 +-
GUI/Models/Sample/ParticleCoreShellItem.cpp | 2 +-
GUI/Models/Session/SessionItemTags.cpp | 2 +-
GUI/Models/Session/SessionModel.cpp | 4 +-
GUI/Models/Session/SessionXML.cpp | 8 +-
GUI/Models/Session/SimulationOptionsItem.cpp | 2 +-
GUI/Models/Types/DoubleDescriptor.h | 2 +-
GUI/Models/Types/UIntDescriptor.h | 2 +-
GUI/{utils => Utils}/ActionFactory.cpp | 4 +-
GUI/{utils => Utils}/ActionFactory.h | 2 +-
GUI/{utils => Utils}/ComboProperty.cpp | 6 +-
GUI/{utils => Utils}/ComboProperty.h | 2 +-
GUI/{utils => Utils}/CustomEventFilters.cpp | 4 +-
GUI/{utils => Utils}/CustomEventFilters.h | 2 +-
.../DeserializationException.cpp | 76 +++++++++----------
.../DeserializationException.h | 2 +-
GUI/{utils => Utils}/Error.cpp | 4 +-
GUI/{utils => Utils}/Error.h | 2 +-
GUI/{utils => Utils}/GUIHelpers.cpp | 6 +-
GUI/{utils => Utils}/GUIHelpers.h | 2 +-
GUI/{utils => Utils}/Helpers.cpp | 4 +-
GUI/{utils => Utils}/Helpers.h | 2 +-
GUI/{utils => Utils}/ItemDelegateForHTML.cpp | 4 +-
GUI/{utils => Utils}/ItemDelegateForHTML.h | 2 +-
GUI/{utils => Utils}/ItemFileNameUtils.cpp | 6 +-
GUI/{utils => Utils}/ItemFileNameUtils.h | 2 +-
GUI/{utils => Utils}/ItemIDFactory.cpp | 4 +-
GUI/{utils => Utils}/ItemIDFactory.h | 2 +-
GUI/{utils => Utils}/LayoutUtils.cpp | 4 +-
GUI/{utils => Utils}/LayoutUtils.h | 2 +-
GUI/{utils => Utils}/MessageService.cpp | 4 +-
GUI/{utils => Utils}/MessageService.h | 2 +-
GUI/{utils => Utils}/OutputDataUtils.cpp | 4 +-
GUI/{utils => Utils}/OutputDataUtils.h | 2 +-
GUI/{utils => Utils}/SaveLoadInterface.cpp | 4 +-
GUI/{utils => Utils}/SaveLoadInterface.h | 2 +-
GUI/{utils => Utils}/Unit.cpp | 4 +-
GUI/{utils => Utils}/Unit.h | 2 +-
GUI/{utils => Utils}/hostosinfo.h | 2 +-
GUI/{utils => Utils}/mainwindow_constants.h | 2 +-
GUI/{utils => Utils}/qstringutils.cpp | 6 +-
GUI/{utils => Utils}/qstringutils.h | 2 +-
GUI/Views/Edit/DoubleLineEdit.cpp | 2 +-
GUI/Views/Edit/DoubleSpinBox.cpp | 2 +-
GUI/Views/FitWidgets/FitActivityPanel.cpp | 2 +-
GUI/Views/FitWidgets/FitObjectiveBuilder.cpp | 4 +-
GUI/Views/FitWidgets/FitParameterWidget.cpp | 4 +-
GUI/Views/FitWidgets/FitSessionController.cpp | 4 +-
GUI/Views/FitWidgets/FitSessionManager.cpp | 2 +-
GUI/Views/FitWidgets/FitSessionWidget.cpp | 2 +-
GUI/Views/FitWidgets/JobRealTimeWidget.cpp | 2 +-
.../FitWidgets/ParameterTuningWidget.cpp | 2 +-
GUI/Views/FitWidgets/RunFitControlWidget.cpp | 2 +-
.../ImportDataWidgets/ImportDataUtils.cpp | 2 +-
.../ImportDataWidgets/RealDataPresenter.cpp | 2 +-
.../RealDataSelectorWidget.cpp | 4 +-
.../DetectorAlignmentEditor.cpp | 2 +-
.../InstrumentLibraryEditor.cpp | 2 +-
.../IntensityDataWidgets/ColorMapUtils.cpp | 2 +-
.../IntensityDataCanvas.cpp | 4 +-
.../IntensityDataFFTPresenter.cpp | 2 +-
.../FitComparisonViewController.cpp | 2 +-
GUI/Views/JobWidgets/JobMessagePanel.cpp | 2 +-
GUI/Views/JobWidgets/JobPropertiesWidget.cpp | 2 +-
GUI/Views/JobWidgets/JobSelectorWidget.cpp | 2 +-
GUI/Views/JobWidgets/JobViewActivities.cpp | 2 +-
GUI/Views/Loaders/AutomaticDataLoader1D.cpp | 2 +-
GUI/Views/Loaders/QREDataLoader.cpp | 2 +-
GUI/Views/Main/AboutDialog.cpp | 4 +-
GUI/Views/Main/ActionManager.cpp | 6 +-
GUI/Views/Main/MainWindow.cpp | 6 +-
GUI/Views/Main/ProjectManager.cpp | 8 +-
GUI/Views/Main/PyImportAssistant.cpp | 4 +-
GUI/Views/Main/SaveService.cpp | 2 +-
GUI/Views/MaskWidgets/MaskEditorToolBar.cpp | 2 +-
GUI/Views/MaskWidgets/MaskGraphicsScene.cpp | 2 +-
GUI/Views/MaskWidgets/MaskViewFactory.cpp | 2 +-
.../MaterialEditor/MaterialEditorDialog.cpp | 4 +-
.../ProjectionsWidgets/ProjectionsToolBar.cpp | 2 +-
.../SaveProjectionsAssistant.cpp | 2 +-
.../PropertyEditor/ComponentFlatView.cpp | 2 +-
.../PropertyEditor/ComponentTreeView.cpp | 2 +-
GUI/Views/PropertyEditor/CustomEditors.cpp | 4 +-
GUI/Views/PropertyEditor/GroupInfoBox.cpp | 2 +-
.../MultiComboPropertyEditor.cpp | 4 +-
.../PropertyEditor/PropertyEditorFactory.cpp | 2 +-
.../PropertyEditor/SessionModelDelegate.cpp | 2 +-
.../RealSpaceWidgets/RealSpaceToolBar.cpp | 2 +-
GUI/Views/SampleDesigner/ConnectableView.cpp | 2 +-
GUI/Views/SampleDesigner/ILayerView.cpp | 2 +-
GUI/Views/SampleDesigner/InterferenceForm.cpp | 2 +-
GUI/Views/SampleDesigner/LayerForm.cpp | 2 +-
.../SampleDesigner/MaterialInplaceForm.cpp | 2 +-
GUI/Views/SampleDesigner/MesoCrystalForm.cpp | 2 +-
.../ParticleCompositionForm.cpp | 2 +-
.../SampleDesigner/ParticleCoreShellForm.cpp | 2 +-
GUI/Views/SampleDesigner/ParticleForm.cpp | 2 +-
.../SampleDesigner/ParticleLayoutForm.cpp | 2 +-
.../SampleDesigner/ParticleLayoutView.cpp | 2 +-
GUI/Views/SampleDesigner/ParticleView.cpp | 2 +-
GUI/Views/SampleDesigner/SampleListView.cpp | 2 +-
.../SampleDesigner/SelectionContainerForm.h | 4 +-
GUI/Views/Toplevel/ImportDataView.cpp | 2 +-
GUI/Views/Toplevel/ProjectSettingsView.cpp | 2 +-
GUI/Views/Toplevel/WelcomeView.cpp | 4 +-
GUI/Widgets/Common/DocksController.cpp | 2 +-
GUI/Widgets/Common/ItemSelectorWidget.cpp | 2 +-
GUI/Widgets/Common/ItemStackWidget.cpp | 2 +-
GUI/Widgets/Common/ModelTreeView.cpp | 2 +-
GUI/Widgets/Common/StyleUtils.cpp | 2 +-
GUI/Widgets/Common/detailsbutton.cpp | 2 +-
GUI/Widgets/Common/detailswidget.cpp | 2 +-
GUI/Widgets/Info/ProjectLoadProblemDialog.cpp | 2 +-
Tests/Unit/GUI/Comparators.cpp | 2 +-
Tests/Unit/GUI/TestAxesItems.cpp | 2 +-
Tests/Unit/GUI/TestComboProperty.cpp | 2 +-
Tests/Unit/GUI/TestComponentProxyModel.cpp | 2 +-
Tests/Unit/GUI/TestDataItemViews.cpp | 6 +-
Tests/Unit/GUI/TestDetectorItems.cpp | 2 +-
Tests/Unit/GUI/TestGroupItem.cpp | 4 +-
Tests/Unit/GUI/TestHelpers.cpp | 2 +-
Tests/Unit/GUI/TestMapperCases.cpp | 2 +-
Tests/Unit/GUI/TestMessageService.cpp | 2 +-
Tests/Unit/GUI/TestOutputDataIOService.cpp | 4 +-
Tests/Unit/GUI/TestProjectDocument.cpp | 2 +-
Tests/Unit/GUI/TestProjectUtils.cpp | 4 +-
Tests/Unit/GUI/TestSaveService.cpp | 4 +-
Tests/Unit/GUI/TestSavingSpecularData.cpp | 4 +-
Tests/Unit/GUI/TestSessionItemTags.cpp | 2 +-
Tests/Unit/GUI/TestSessionItemUtils.cpp | 2 +-
Tests/Unit/GUI/Utils.cpp | 2 +-
175 files changed, 281 insertions(+), 281 deletions(-)
rename GUI/{utils => Utils}/ActionFactory.cpp (93%)
rename GUI/{utils => Utils}/ActionFactory.h (97%)
rename GUI/{utils => Utils}/ComboProperty.cpp (98%)
rename GUI/{utils => Utils}/ComboProperty.h (98%)
rename GUI/{utils => Utils}/CustomEventFilters.cpp (98%)
rename GUI/{utils => Utils}/CustomEventFilters.h (98%)
rename GUI/{utils => Utils}/DeserializationException.cpp (89%)
rename GUI/{utils => Utils}/DeserializationException.h (95%)
rename GUI/{utils => Utils}/Error.cpp (91%)
rename GUI/{utils => Utils}/Error.h (96%)
rename GUI/{utils => Utils}/GUIHelpers.cpp (98%)
rename GUI/{utils => Utils}/GUIHelpers.h (97%)
rename GUI/{utils => Utils}/Helpers.cpp (98%)
rename GUI/{utils => Utils}/Helpers.h (97%)
rename GUI/{utils => Utils}/ItemDelegateForHTML.cpp (97%)
rename GUI/{utils => Utils}/ItemDelegateForHTML.h (96%)
rename GUI/{utils => Utils}/ItemFileNameUtils.cpp (95%)
rename GUI/{utils => Utils}/ItemFileNameUtils.h (96%)
rename GUI/{utils => Utils}/ItemIDFactory.cpp (95%)
rename GUI/{utils => Utils}/ItemIDFactory.h (97%)
rename GUI/{utils => Utils}/LayoutUtils.cpp (98%)
rename GUI/{utils => Utils}/LayoutUtils.h (97%)
rename GUI/{utils => Utils}/MessageService.cpp (94%)
rename GUI/{utils => Utils}/MessageService.h (97%)
rename GUI/{utils => Utils}/OutputDataUtils.cpp (92%)
rename GUI/{utils => Utils}/OutputDataUtils.h (95%)
rename GUI/{utils => Utils}/SaveLoadInterface.cpp (90%)
rename GUI/{utils => Utils}/SaveLoadInterface.h (97%)
rename GUI/{utils => Utils}/Unit.cpp (97%)
rename GUI/{utils => Utils}/Unit.h (97%)
rename GUI/{utils => Utils}/hostosinfo.h (98%)
rename GUI/{utils => Utils}/mainwindow_constants.h (97%)
rename GUI/{utils => Utils}/qstringutils.cpp (90%)
rename GUI/{utils => Utils}/qstringutils.h (95%)
diff --git a/App/AppOptions.cpp b/App/AppOptions.cpp
index c706b397847..f11fc0bfe96 100644
--- a/App/AppOptions.cpp
+++ b/App/AppOptions.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "App/AppOptions.h"
-#include "GUI/utils/Helpers.h"
+#include "GUI/Utils/Helpers.h"
#include <QSize>
#include <boost/program_options/config.hpp>
#include <boost/program_options/parsers.hpp>
diff --git a/App/main.cpp b/App/main.cpp
index c8a03fad31d..0583ce233ab 100644
--- a/App/main.cpp
+++ b/App/main.cpp
@@ -18,8 +18,8 @@
#include "GUI/Models/State/SessionData.h"
#include "GUI/Views/Loaders/DataLoaderUtil.h"
#include "GUI/Views/Main/MainWindow.h"
-#include "GUI/utils/Helpers.h"
-#include "GUI/utils/hostosinfo.h"
+#include "GUI/Utils/Helpers.h"
+#include "GUI/Utils/hostosinfo.h"
#include "config_build.h"
#include <QDir>
#include <QIcon>
diff --git a/GUI/Models/Data/ApplicationModels.cpp b/GUI/Models/Data/ApplicationModels.cpp
index 98d628d6340..0bfa826791b 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/Sample/SampleModel.h"
#include "GUI/Models/Session/SimulationOptionsItem.h"
-#include "GUI/utils/DeserializationException.h"
+#include "GUI/Utils/DeserializationException.h"
#include <QtCore/QXmlStreamWriter>
ApplicationModels::ApplicationModels(QObject* parent)
diff --git a/GUI/Models/Data/Data1DViewItem.cpp b/GUI/Models/Data/Data1DViewItem.cpp
index dcb50ce5fd8..ad9aa817139 100644
--- a/GUI/Models/Data/Data1DViewItem.cpp
+++ b/GUI/Models/Data/Data1DViewItem.cpp
@@ -19,8 +19,8 @@
#include "GUI/Models/Data/DataPropertyContainer.h"
#include "GUI/Models/Data/DataViewUtils.h"
#include "GUI/Models/Job/JobItem.h"
-#include "GUI/utils/ComboProperty.h"
-#include "GUI/utils/Error.h"
+#include "GUI/Utils/ComboProperty.h"
+#include "GUI/Utils/Error.h"
namespace {
const QString x_axis_default_name = "X [nbins]";
diff --git a/GUI/Models/Data/DataItem.cpp b/GUI/Models/Data/DataItem.cpp
index c63441dcca2..43f39afeb48 100644
--- a/GUI/Models/Data/DataItem.cpp
+++ b/GUI/Models/Data/DataItem.cpp
@@ -14,8 +14,8 @@
#include "GUI/Models/Data/DataItem.h"
#include "Device/Histo/IntensityDataIOFactory.h"
-#include "GUI/utils/ComboProperty.h"
-#include "GUI/utils/Error.h"
+#include "GUI/Utils/ComboProperty.h"
+#include "GUI/Utils/Error.h"
void DataItem::setOutputData(OutputData<double>* data)
{
diff --git a/GUI/Models/Data/DataItem.h b/GUI/Models/Data/DataItem.h
index 69c2523d75e..ded58a06532 100644
--- a/GUI/Models/Data/DataItem.h
+++ b/GUI/Models/Data/DataItem.h
@@ -17,7 +17,7 @@
#include "Device/Data/OutputData.h"
#include "GUI/Models/Session/SessionItem.h"
-#include "GUI/utils/SaveLoadInterface.h"
+#include "GUI/Utils/SaveLoadInterface.h"
#include <QDateTime>
#include <mutex>
diff --git a/GUI/Models/Data/DataProperties.cpp b/GUI/Models/Data/DataProperties.cpp
index 7e8fdc912cf..8ba45aad855 100644
--- a/GUI/Models/Data/DataProperties.cpp
+++ b/GUI/Models/Data/DataProperties.cpp
@@ -16,8 +16,8 @@
#include "GUI/Models/Data/DataItem.h"
#include "GUI/Models/Session/ModelPath.h"
#include "GUI/Models/Session/SessionModel.h"
-#include "GUI/utils/ComboProperty.h"
-#include "GUI/utils/Error.h"
+#include "GUI/Utils/ComboProperty.h"
+#include "GUI/Utils/Error.h"
#include <QColor>
namespace {
diff --git a/GUI/Models/Data/DataPropertyContainer.cpp b/GUI/Models/Data/DataPropertyContainer.cpp
index e80d5c2914c..803e0a98fe7 100644
--- a/GUI/Models/Data/DataPropertyContainer.cpp
+++ b/GUI/Models/Data/DataPropertyContainer.cpp
@@ -15,7 +15,7 @@
#include "GUI/Models/Data/DataPropertyContainer.h"
#include "GUI/Models/Data/DataItem.h"
#include "GUI/Models/Data/DataProperties.h"
-#include "GUI/utils/Error.h"
+#include "GUI/Utils/Error.h"
DataPropertyContainer::DataPropertyContainer() : SessionItem(M_TYPE)
{
diff --git a/GUI/Models/Data/ImportDataInfo.cpp b/GUI/Models/Data/ImportDataInfo.cpp
index c4d6765d934..465c76cb06b 100644
--- a/GUI/Models/Data/ImportDataInfo.cpp
+++ b/GUI/Models/Data/ImportDataInfo.cpp
@@ -16,8 +16,8 @@
#include "Device/Coord/AxisNames.h"
#include "Device/Data/OutputData.h"
#include "GUI/Models/Job/JobItemUtils.h"
-#include "GUI/utils/Error.h"
-#include "GUI/utils/OutputDataUtils.h"
+#include "GUI/Utils/Error.h"
+#include "GUI/Utils/OutputDataUtils.h"
namespace {
std::vector<Axes::Coords> specularUnits()
diff --git a/GUI/Models/Data/IntensityDataItem.cpp b/GUI/Models/Data/IntensityDataItem.cpp
index 6e1d5f12749..d644eda10c1 100644
--- a/GUI/Models/Data/IntensityDataItem.cpp
+++ b/GUI/Models/Data/IntensityDataItem.cpp
@@ -20,7 +20,7 @@
#include "GUI/Models/Data/ProjectionItems.h"
#include "GUI/Models/Job/JobItemUtils.h"
#include "GUI/Models/Session/SessionModel.h"
-#include "GUI/utils/Error.h"
+#include "GUI/Utils/Error.h"
namespace {
ComboProperty gradientCombo()
diff --git a/GUI/Models/Data/MaskItems.cpp b/GUI/Models/Data/MaskItems.cpp
index 67365d1864b..3efa3fee579 100644
--- a/GUI/Models/Data/MaskItems.cpp
+++ b/GUI/Models/Data/MaskItems.cpp
@@ -18,7 +18,7 @@
#include "Device/Mask/Line.h"
#include "Device/Mask/Polygon.h"
#include "Device/Mask/Rectangle.h"
-#include "GUI/utils/Error.h"
+#include "GUI/Utils/Error.h"
MaskContainerItem::MaskContainerItem() : SessionItem(M_TYPE)
{
diff --git a/GUI/Models/Data/PointwiseAxisItem.h b/GUI/Models/Data/PointwiseAxisItem.h
index f12da579a1c..c5ba3c698cb 100644
--- a/GUI/Models/Data/PointwiseAxisItem.h
+++ b/GUI/Models/Data/PointwiseAxisItem.h
@@ -16,7 +16,7 @@
#define BORNAGAIN_GUI_MODELS_DATA_POINTWISEAXISITEM_H
#include "GUI/Models/Data/AxesItems.h"
-#include "GUI/utils/SaveLoadInterface.h"
+#include "GUI/Utils/SaveLoadInterface.h"
class PointwiseAxis;
class SpecularInstrumentItem;
diff --git a/GUI/Models/Data/RealDataItem.cpp b/GUI/Models/Data/RealDataItem.cpp
index bbd7b4e22e1..17201307a32 100644
--- a/GUI/Models/Data/RealDataItem.cpp
+++ b/GUI/Models/Data/RealDataItem.cpp
@@ -29,9 +29,9 @@
#include "GUI/Models/Job/JobItemUtils.h"
#include "GUI/Models/Job/JobModelFunctions.h"
#include "GUI/Models/State/SessionData.h"
-#include "GUI/utils/DeserializationException.h"
-#include "GUI/utils/Error.h"
-#include "GUI/utils/ItemFileNameUtils.h"
+#include "GUI/Utils/DeserializationException.h"
+#include "GUI/Utils/Error.h"
+#include "GUI/Utils/ItemFileNameUtils.h"
#include <QtCore/QXmlStreamReader>
#include <QtCore/QXmlStreamWriter>
diff --git a/GUI/Models/Data/SpecularDataItem.cpp b/GUI/Models/Data/SpecularDataItem.cpp
index eba43c1c109..58fa9e6e35f 100644
--- a/GUI/Models/Data/SpecularDataItem.cpp
+++ b/GUI/Models/Data/SpecularDataItem.cpp
@@ -16,7 +16,7 @@
#include "GUI/Models/Data/AxesItems.h"
#include "GUI/Models/Data/ImportDataInfo.h"
#include "GUI/Models/Job/JobItemUtils.h"
-#include "GUI/utils/Error.h"
+#include "GUI/Utils/Error.h"
namespace {
diff --git a/GUI/Models/Domain/DomainObjectBuilder.cpp b/GUI/Models/Domain/DomainObjectBuilder.cpp
index 8aeb31b806f..b730ae55bcf 100644
--- a/GUI/Models/Domain/DomainObjectBuilder.cpp
+++ b/GUI/Models/Domain/DomainObjectBuilder.cpp
@@ -19,7 +19,7 @@
#include "GUI/Models/Sample/LayerItem.h"
#include "GUI/Models/Sample/MultiLayerItem.h"
#include "GUI/Models/Sample/ParticleLayoutItem.h"
-#include "GUI/utils/Error.h"
+#include "GUI/Utils/Error.h"
std::unique_ptr<MultiLayer>
GUI::Model::DomainObjectBuilder::buildMultiLayer(const MultiLayerItem& multilayer_item)
diff --git a/GUI/Models/Domain/DomainSimulationBuilder.cpp b/GUI/Models/Domain/DomainSimulationBuilder.cpp
index c74e9c15533..9ca20960994 100644
--- a/GUI/Models/Domain/DomainSimulationBuilder.cpp
+++ b/GUI/Models/Domain/DomainSimulationBuilder.cpp
@@ -27,7 +27,7 @@
#include "GUI/Models/Instrument/InstrumentItems.h"
#include "GUI/Models/Sample/MultiLayerItem.h"
#include "GUI/Models/Session/SimulationOptionsItem.h"
-#include "GUI/utils/Error.h"
+#include "GUI/Utils/Error.h"
namespace {
diff --git a/GUI/Models/Domain/TransformFromDomain.cpp b/GUI/Models/Domain/TransformFromDomain.cpp
index ada2ce597cc..76997af7974 100644
--- a/GUI/Models/Domain/TransformFromDomain.cpp
+++ b/GUI/Models/Domain/TransformFromDomain.cpp
@@ -49,7 +49,7 @@
#include "GUI/Models/Sample/ResolutionFunctionItems.h"
#include "GUI/Models/Types/UIntDescriptor.h"
#include "GUI/Models/Types/VectorItem.h"
-#include "GUI/utils/Error.h"
+#include "GUI/Utils/Error.h"
#include "Param/Distrib/Distributions.h"
#include "Param/Distrib/RangedDistributions.h"
#include "Param/Node/NodeUtils.h"
diff --git a/GUI/Models/Fit/FitParameterItems.cpp b/GUI/Models/Fit/FitParameterItems.cpp
index d007b5318ff..7a45efae637 100644
--- a/GUI/Models/Fit/FitParameterItems.cpp
+++ b/GUI/Models/Fit/FitParameterItems.cpp
@@ -18,8 +18,8 @@
#include "GUI/Models/Fit/ParameterTreeItems.h"
#include "GUI/Models/Job/JobItem.h"
#include "GUI/Models/Session/ModelPath.h"
-#include "GUI/utils/ComboProperty.h"
-#include "GUI/utils/Error.h"
+#include "GUI/Utils/ComboProperty.h"
+#include "GUI/Utils/Error.h"
#include <cmath>
namespace {
diff --git a/GUI/Models/Fit/FitParameterProxyModel.cpp b/GUI/Models/Fit/FitParameterProxyModel.cpp
index ad1f8a9016f..59bb2a03581 100644
--- a/GUI/Models/Fit/FitParameterProxyModel.cpp
+++ b/GUI/Models/Fit/FitParameterProxyModel.cpp
@@ -18,7 +18,7 @@
#include "GUI/Models/Job/JobModel.h"
#include "GUI/Models/Session/ModelPath.h"
#include "GUI/Models/Session/SessionItemUtils.h"
-#include "GUI/utils/Error.h"
+#include "GUI/Utils/Error.h"
#include <QColor>
#include <QMimeData>
diff --git a/GUI/Models/Fit/FitSuiteItem.cpp b/GUI/Models/Fit/FitSuiteItem.cpp
index 5bca3eb6d5b..cae9c220389 100644
--- a/GUI/Models/Fit/FitSuiteItem.cpp
+++ b/GUI/Models/Fit/FitSuiteItem.cpp
@@ -16,7 +16,7 @@
#include "GUI/Models/Fit/FitParameterItems.h"
#include "GUI/Models/Fit/MinimizerItem.h"
#include "GUI/Models/Session/SessionModel.h"
-#include "GUI/utils/Error.h"
+#include "GUI/Utils/Error.h"
FitSuiteItem::FitSuiteItem() : SessionItem(M_TYPE)
{
diff --git a/GUI/Models/Fit/MinimizerItemCatalog.cpp b/GUI/Models/Fit/MinimizerItemCatalog.cpp
index fba0e387f2b..878552e93c9 100644
--- a/GUI/Models/Fit/MinimizerItemCatalog.cpp
+++ b/GUI/Models/Fit/MinimizerItemCatalog.cpp
@@ -14,7 +14,7 @@
#include "GUI/Models/Fit/MinimizerItemCatalog.h"
#include "Fit/Kernel/MinimizerFactory.h"
-#include "GUI/utils/Helpers.h"
+#include "GUI/Utils/Helpers.h"
//! Returns ComboProperty representing list of algorithms defined for given minimizerType.
diff --git a/GUI/Models/Fit/MinimizerItemCatalog.h b/GUI/Models/Fit/MinimizerItemCatalog.h
index 9294aa072fc..dbe630454a2 100644
--- a/GUI/Models/Fit/MinimizerItemCatalog.h
+++ b/GUI/Models/Fit/MinimizerItemCatalog.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_MODELS_FIT_MINIMIZERITEMCATALOG_H
#define BORNAGAIN_GUI_MODELS_FIT_MINIMIZERITEMCATALOG_H
-#include "GUI/utils/ComboProperty.h"
+#include "GUI/Utils/ComboProperty.h"
class MinimizerItem;
diff --git a/GUI/Models/Group/GroupInfo.cpp b/GUI/Models/Group/GroupInfo.cpp
index 3f2e77ef675..fbaa69cbf6c 100644
--- a/GUI/Models/Group/GroupInfo.cpp
+++ b/GUI/Models/Group/GroupInfo.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Models/Group/GroupInfo.h"
-#include "GUI/utils/Error.h"
+#include "GUI/Utils/Error.h"
GroupInfo::GroupInfo(bool is_sorted) : is_sorted(is_sorted) {}
diff --git a/GUI/Models/Group/GroupItem.cpp b/GUI/Models/Group/GroupItem.cpp
index f3fbfb740c5..8a3f2e27644 100644
--- a/GUI/Models/Group/GroupItem.cpp
+++ b/GUI/Models/Group/GroupItem.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Models/Group/GroupItem.h"
-#include "GUI/utils/ComboProperty.h"
-#include "GUI/utils/Error.h"
+#include "GUI/Utils/ComboProperty.h"
+#include "GUI/Utils/Error.h"
GroupItem::GroupItem() : SessionItem(M_TYPE)
{
diff --git a/GUI/Models/Group/GroupItemController.cpp b/GUI/Models/Group/GroupItemController.cpp
index 1bf34dfc23a..16a3bbe0142 100644
--- a/GUI/Models/Group/GroupItemController.cpp
+++ b/GUI/Models/Group/GroupItemController.cpp
@@ -15,7 +15,7 @@
#include "GUI/Models/Group/GroupItemController.h"
#include "GUI/Models/Group/ItemFactory.h"
#include "GUI/Models/Session/SessionItem.h"
-#include "GUI/utils/ComboProperty.h"
+#include "GUI/Utils/ComboProperty.h"
GroupItemController::GroupItemController(SessionItem* groupItem, GroupInfo groupInfo)
: m_groupItem(groupItem), m_groupInfo(groupInfo)
diff --git a/GUI/Models/Group/ItemCatalog.cpp b/GUI/Models/Group/ItemCatalog.cpp
index 44c2861d385..ffc47da2f94 100644
--- a/GUI/Models/Group/ItemCatalog.cpp
+++ b/GUI/Models/Group/ItemCatalog.cpp
@@ -60,7 +60,7 @@
#include "GUI/Models/Trafo/RotationItems.h"
#include "GUI/Models/Trafo/TransformationItem.h"
#include "GUI/Models/Types/VectorItem.h"
-#include "GUI/utils/Error.h"
+#include "GUI/Utils/Error.h"
ItemCatalog::ItemCatalog()
{
diff --git a/GUI/Models/Group/SelectionDescriptor.h b/GUI/Models/Group/SelectionDescriptor.h
index 48cb709465f..b767d0470c1 100644
--- a/GUI/Models/Group/SelectionDescriptor.h
+++ b/GUI/Models/Group/SelectionDescriptor.h
@@ -16,7 +16,7 @@
#define BORNAGAIN_GUI_MODELS_GROUP_SELECTIONDESCRIPTOR_H
#include "GUI/Models/Group/GroupItem.h"
-#include "GUI/utils/ComboProperty.h"
+#include "GUI/Utils/ComboProperty.h"
#include <QString>
#include <QStringList>
#include <functional>
diff --git a/GUI/Models/Instrument/InstrumentItems.cpp b/GUI/Models/Instrument/InstrumentItems.cpp
index 9ef52a4f3c3..4d2f20e21de 100644
--- a/GUI/Models/Instrument/InstrumentItems.cpp
+++ b/GUI/Models/Instrument/InstrumentItems.cpp
@@ -32,9 +32,9 @@
#include "GUI/Models/Instrument/SphericalDetectorItem.h"
#include "GUI/Models/Job/JobItemUtils.h"
#include "GUI/Models/Types/VectorItem.h"
-#include "GUI/utils/Error.h"
-#include "GUI/utils/Helpers.h"
-#include "GUI/utils/ItemFileNameUtils.h"
+#include "GUI/Utils/Error.h"
+#include "GUI/Utils/Helpers.h"
+#include "GUI/Utils/ItemFileNameUtils.h"
namespace {
diff --git a/GUI/Models/Instrument/RectangularDetectorItem.cpp b/GUI/Models/Instrument/RectangularDetectorItem.cpp
index 38f7a8b7ce9..9d9b7fd8c5e 100644
--- a/GUI/Models/Instrument/RectangularDetectorItem.cpp
+++ b/GUI/Models/Instrument/RectangularDetectorItem.cpp
@@ -16,8 +16,8 @@
#include "Device/Detector/RectangularDetector.h"
#include "GUI/Models/Data/AxesItems.h"
#include "GUI/Models/Types/VectorItem.h"
-#include "GUI/utils/ComboProperty.h"
-#include "GUI/utils/Error.h"
+#include "GUI/Utils/ComboProperty.h"
+#include "GUI/Utils/Error.h"
namespace {
const double default_detector_width = 20.0;
diff --git a/GUI/Models/Job/JobItem.cpp b/GUI/Models/Job/JobItem.cpp
index d7721e958fd..3fe7d87b1a2 100644
--- a/GUI/Models/Job/JobItem.cpp
+++ b/GUI/Models/Job/JobItem.cpp
@@ -25,8 +25,8 @@
#include "GUI/Models/Material/MaterialItemContainer.h"
#include "GUI/Models/Sample/MultiLayerItem.h"
#include "GUI/Models/Session/SimulationOptionsItem.h"
-#include "GUI/utils/Error.h"
-#include "GUI/utils/ItemFileNameUtils.h"
+#include "GUI/Utils/Error.h"
+#include "GUI/Utils/ItemFileNameUtils.h"
JobItem::JobItem() : SessionItem(M_TYPE)
{
diff --git a/GUI/Models/Job/JobItemUtils.h b/GUI/Models/Job/JobItemUtils.h
index 78c8dedd7e3..7dcfb121952 100644
--- a/GUI/Models/Job/JobItemUtils.h
+++ b/GUI/Models/Job/JobItemUtils.h
@@ -16,7 +16,7 @@
#define BORNAGAIN_GUI_MODELS_JOB_JOBITEMUTILS_H
#include "Device/Detector/IDetector.h"
-#include "GUI/utils/ComboProperty.h"
+#include "GUI/Utils/ComboProperty.h"
#include <QMap>
class DataItem;
diff --git a/GUI/Models/Job/JobModel.cpp b/GUI/Models/Job/JobModel.cpp
index 8d084a1534d..9e96a31dfe2 100644
--- a/GUI/Models/Job/JobModel.cpp
+++ b/GUI/Models/Job/JobModel.cpp
@@ -24,7 +24,7 @@
#include "GUI/Models/Job/JobQueueData.h"
#include "GUI/Models/Job/ParameterTreeUtils.h"
#include "GUI/Models/Sample/MultiLayerItem.h"
-#include "GUI/utils/Helpers.h"
+#include "GUI/Utils/Helpers.h"
JobModel::JobModel(QObject* parent)
: SessionModel(GUI::Session::XML::JobModelTag, parent), m_queue_data(nullptr)
diff --git a/GUI/Models/Job/JobModelFunctions.cpp b/GUI/Models/Job/JobModelFunctions.cpp
index de6f4c54a72..52a0950aaa4 100644
--- a/GUI/Models/Job/JobModelFunctions.cpp
+++ b/GUI/Models/Job/JobModelFunctions.cpp
@@ -32,9 +32,9 @@
#include "GUI/Models/Material/MaterialItemUtils.h"
#include "GUI/Models/Sample/ItemWithMaterial.h"
#include "GUI/Models/Sample/MultiLayerItem.h"
-#include "GUI/utils/Error.h"
-#include "GUI/utils/Helpers.h"
-#include "GUI/utils/ItemFileNameUtils.h"
+#include "GUI/Utils/Error.h"
+#include "GUI/Utils/Helpers.h"
+#include "GUI/Utils/ItemFileNameUtils.h"
#include <map>
namespace {
diff --git a/GUI/Models/Job/JobQueueData.cpp b/GUI/Models/Job/JobQueueData.cpp
index 68c0acd34b8..a08f8f16a72 100644
--- a/GUI/Models/Job/JobQueueData.cpp
+++ b/GUI/Models/Job/JobQueueData.cpp
@@ -18,8 +18,8 @@
#include "GUI/Models/Job/JobItem.h"
#include "GUI/Models/Job/JobModel.h"
#include "GUI/Models/Job/JobWorker.h"
-#include "GUI/utils/Error.h"
-#include "GUI/utils/Helpers.h"
+#include "GUI/Utils/Error.h"
+#include "GUI/Utils/Helpers.h"
#include <QThread>
namespace {
diff --git a/GUI/Models/Job/ParameterTreeUtils.cpp b/GUI/Models/Job/ParameterTreeUtils.cpp
index 40f9e7ee9f6..8adfe114b08 100644
--- a/GUI/Models/Job/ParameterTreeUtils.cpp
+++ b/GUI/Models/Job/ParameterTreeUtils.cpp
@@ -21,7 +21,7 @@
#include "GUI/Models/Parameter/PropertyItem.h"
#include "GUI/Models/Sample/MultiLayerItem.h"
#include "GUI/Models/Session/ModelPath.h"
-#include "GUI/utils/Error.h"
+#include "GUI/Utils/Error.h"
#include <QStack>
#include <boost/polymorphic_cast.hpp>
diff --git a/GUI/Models/Material/MaterialItem.cpp b/GUI/Models/Material/MaterialItem.cpp
index 4a2491d2a85..925dddc9220 100644
--- a/GUI/Models/Material/MaterialItem.cpp
+++ b/GUI/Models/Material/MaterialItem.cpp
@@ -17,7 +17,7 @@
#include "GUI/Models/Group/GroupInfo.h"
#include "GUI/Models/Material/MaterialDataItems.h"
#include "GUI/Models/Types/VectorDescriptor.h"
-#include "GUI/utils/Helpers.h"
+#include "GUI/Utils/Helpers.h"
#include "Sample/Material/MaterialFactoryFuncs.h"
#include <QColor>
diff --git a/GUI/Models/Material/MaterialItemContainer.cpp b/GUI/Models/Material/MaterialItemContainer.cpp
index bf85764cd34..a7ef210aa03 100644
--- a/GUI/Models/Material/MaterialItemContainer.cpp
+++ b/GUI/Models/Material/MaterialItemContainer.cpp
@@ -15,7 +15,7 @@
#include "GUI/Models/Material/MaterialItemContainer.h"
#include "GUI/Models/Material/MaterialItem.h"
#include "GUI/Models/Session/SessionModel.h"
-#include "GUI/utils/Helpers.h"
+#include "GUI/Utils/Helpers.h"
MaterialItemContainer::MaterialItemContainer() : SessionItem(M_TYPE)
{
diff --git a/GUI/Models/Material/MaterialItemUtils.cpp b/GUI/Models/Material/MaterialItemUtils.cpp
index 732c4a90f01..bde308be72e 100644
--- a/GUI/Models/Material/MaterialItemUtils.cpp
+++ b/GUI/Models/Material/MaterialItemUtils.cpp
@@ -22,7 +22,7 @@
#include "GUI/Models/Sample/ParticleCoreShellItem.h"
#include "GUI/Models/Sample/ParticleItem.h"
#include "GUI/Models/Sample/ParticleLayoutItem.h"
-#include "GUI/utils/Error.h"
+#include "GUI/Utils/Error.h"
#include "Sample/Material/Material.h"
#include <boost/polymorphic_cast.hpp>
diff --git a/GUI/Models/Material/MaterialModel.cpp b/GUI/Models/Material/MaterialModel.cpp
index 6c75ba6aa68..e25c8483c72 100644
--- a/GUI/Models/Material/MaterialModel.cpp
+++ b/GUI/Models/Material/MaterialModel.cpp
@@ -15,7 +15,7 @@
#include "GUI/Models/Material/MaterialModel.h"
#include "GUI/Models/Material/MaterialItemUtils.h"
#include "GUI/Models/Material/MaterialModelStore.h"
-#include "GUI/utils/Helpers.h"
+#include "GUI/Utils/Helpers.h"
MaterialModel::MaterialModel(QObject* parent)
: SessionModel(GUI::Session::XML::MaterialModelTag, parent)
diff --git a/GUI/Models/Material/MaterialModelStore.cpp b/GUI/Models/Material/MaterialModelStore.cpp
index 197b54dfbbb..ee07812d91a 100644
--- a/GUI/Models/Material/MaterialModelStore.cpp
+++ b/GUI/Models/Material/MaterialModelStore.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Models/Material/MaterialModelStore.h"
-#include "GUI/utils/Error.h"
+#include "GUI/Utils/Error.h"
namespace {
MaterialModel* theMaterialModel = nullptr;
diff --git a/GUI/Models/Project/OutputDataIOHistory.cpp b/GUI/Models/Project/OutputDataIOHistory.cpp
index 35ccfadd437..36a8e848a88 100644
--- a/GUI/Models/Project/OutputDataIOHistory.cpp
+++ b/GUI/Models/Project/OutputDataIOHistory.cpp
@@ -14,8 +14,8 @@
#include "GUI/Models/Project/OutputDataIOHistory.h"
#include "Base/Utils/Assert.h"
-#include "GUI/utils/Error.h"
-#include "GUI/utils/SaveLoadInterface.h"
+#include "GUI/Utils/Error.h"
+#include "GUI/Utils/SaveLoadInterface.h"
//! Static method to create info for just saved item.
diff --git a/GUI/Models/Project/OutputDataIOService.cpp b/GUI/Models/Project/OutputDataIOService.cpp
index e2876a95835..fac10278fb0 100644
--- a/GUI/Models/Project/OutputDataIOService.cpp
+++ b/GUI/Models/Project/OutputDataIOService.cpp
@@ -17,8 +17,8 @@
#include "GUI/Models/Job/JobItem.h"
#include "GUI/Models/Project/ProjectUtils.h"
#include "GUI/Models/Session/ModelPath.h"
-#include "GUI/utils/MessageService.h"
-#include "GUI/utils/SaveLoadInterface.h"
+#include "GUI/Utils/MessageService.h"
+#include "GUI/Utils/SaveLoadInterface.h"
#include <QFile>
#include <QSet>
diff --git a/GUI/Models/Project/ProjectDocument.cpp b/GUI/Models/Project/ProjectDocument.cpp
index e053a79cbfb..8005b8ee86b 100644
--- a/GUI/Models/Project/ProjectDocument.cpp
+++ b/GUI/Models/Project/ProjectDocument.cpp
@@ -18,9 +18,9 @@
#include "GUI/Models/Project/LinkInstrumentManager.h"
#include "GUI/Models/Project/OutputDataIOService.h"
#include "GUI/Models/Project/ProjectUtils.h"
-#include "GUI/utils/Error.h"
-#include "GUI/utils/Helpers.h"
-#include "GUI/utils/MessageService.h"
+#include "GUI/Utils/Error.h"
+#include "GUI/Utils/Helpers.h"
+#include "GUI/Utils/MessageService.h"
#include <QDir>
#include <QElapsedTimer>
#include <QXmlStreamReader>
diff --git a/GUI/Models/Sample/GUIDomainSampleVisitor.cpp b/GUI/Models/Sample/GUIDomainSampleVisitor.cpp
index 2fc94b3c736..c56ff88bcb0 100644
--- a/GUI/Models/Sample/GUIDomainSampleVisitor.cpp
+++ b/GUI/Models/Sample/GUIDomainSampleVisitor.cpp
@@ -30,7 +30,7 @@
#include "GUI/Models/Trafo/RotationItems.h"
#include "GUI/Models/Trafo/TransformationItem.h"
#include "GUI/Models/Types/VectorItem.h"
-#include "GUI/utils/Error.h"
+#include "GUI/Utils/Error.h"
#include "Param/Node/NodeUtils.h"
#include "Sample/Aggregate/ParticleLayout.h"
#include "Sample/HardParticle/HardParticles.h"
diff --git a/GUI/Models/Sample/MesoCrystalItem.cpp b/GUI/Models/Sample/MesoCrystalItem.cpp
index d00879d9f70..271802fdb6a 100644
--- a/GUI/Models/Sample/MesoCrystalItem.cpp
+++ b/GUI/Models/Sample/MesoCrystalItem.cpp
@@ -20,7 +20,7 @@
#include "GUI/Models/Sample/ParticleItem.h"
#include "GUI/Models/Session/SessionItemUtils.h"
#include "GUI/Models/Types/VectorDescriptor.h"
-#include "GUI/utils/Error.h"
+#include "GUI/Utils/Error.h"
#include "Sample/Particle/Crystal.h"
#include "Sample/Particle/MesoCrystal.h"
#include "Sample/Particle/Particle.h"
diff --git a/GUI/Models/Sample/ParticleCoreShellItem.cpp b/GUI/Models/Sample/ParticleCoreShellItem.cpp
index c73876f45d4..2c3d7195c8c 100644
--- a/GUI/Models/Sample/ParticleCoreShellItem.cpp
+++ b/GUI/Models/Sample/ParticleCoreShellItem.cpp
@@ -19,7 +19,7 @@
#include "GUI/Models/Session/SessionModel.h"
#include "GUI/Models/Types/DoubleDescriptor.h"
#include "GUI/Models/Types/VectorItem.h"
-#include "GUI/utils/Error.h"
+#include "GUI/Utils/Error.h"
#include "Sample/Particle/Particle.h"
#include "Sample/Particle/ParticleCoreShell.h"
diff --git a/GUI/Models/Session/SessionItemTags.cpp b/GUI/Models/Session/SessionItemTags.cpp
index 31a7fdeab2e..0070a78c72b 100644
--- a/GUI/Models/Session/SessionItemTags.cpp
+++ b/GUI/Models/Session/SessionItemTags.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Models/Session/SessionItemTags.h"
-#include "GUI/utils/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/Session/SessionModel.cpp b/GUI/Models/Session/SessionModel.cpp
index 47d3d4daa27..83e1a672bed 100644
--- a/GUI/Models/Session/SessionModel.cpp
+++ b/GUI/Models/Session/SessionModel.cpp
@@ -16,8 +16,8 @@
#include "GUI/Models/Group/ItemFactory.h"
#include "GUI/Models/Session/SessionItemTags.h"
#include "GUI/Models/Session/SessionItemUtils.h"
-#include "GUI/utils/Error.h"
-#include "GUI/utils/Helpers.h"
+#include "GUI/Utils/Error.h"
+#include "GUI/Utils/Helpers.h"
#include <QFile>
#include <QMimeData>
#include <QtCore/QXmlStreamWriter>
diff --git a/GUI/Models/Session/SessionXML.cpp b/GUI/Models/Session/SessionXML.cpp
index 67a692cd976..9a6c1ba5de5 100644
--- a/GUI/Models/Session/SessionXML.cpp
+++ b/GUI/Models/Session/SessionXML.cpp
@@ -16,10 +16,10 @@
#include "GUI/Models/Material/MaterialItem.h"
#include "GUI/Models/Session/SessionItemTags.h"
#include "GUI/Models/Session/SessionModel.h"
-#include "GUI/utils/ComboProperty.h"
-#include "GUI/utils/DeserializationException.h"
-#include "GUI/utils/Error.h"
-#include "GUI/utils/MessageService.h"
+#include "GUI/Utils/ComboProperty.h"
+#include "GUI/Utils/DeserializationException.h"
+#include "GUI/Utils/Error.h"
+#include "GUI/Utils/MessageService.h"
#include <QtCore/QXmlStreamWriter>
#include <QColor>
diff --git a/GUI/Models/Session/SimulationOptionsItem.cpp b/GUI/Models/Session/SimulationOptionsItem.cpp
index 1b617070f3f..b86bf5fc47d 100644
--- a/GUI/Models/Session/SimulationOptionsItem.cpp
+++ b/GUI/Models/Session/SimulationOptionsItem.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Models/Session/SimulationOptionsItem.h"
-#include "GUI/utils/ComboProperty.h"
+#include "GUI/Utils/ComboProperty.h"
#include <thread>
// !! Attention !! Do not change the following texts, despite they are not matching the
diff --git a/GUI/Models/Types/DoubleDescriptor.h b/GUI/Models/Types/DoubleDescriptor.h
index c94e90d35b7..9e54f9d8f14 100644
--- a/GUI/Models/Types/DoubleDescriptor.h
+++ b/GUI/Models/Types/DoubleDescriptor.h
@@ -16,7 +16,7 @@
#define BORNAGAIN_GUI_MODELS_TYPES_DOUBLEDESCRIPTOR_H
#include "Fit/Param/RealLimits.h"
-#include "GUI/utils/Unit.h"
+#include "GUI/Utils/Unit.h"
#include <QString>
#include <functional>
#include <variant>
diff --git a/GUI/Models/Types/UIntDescriptor.h b/GUI/Models/Types/UIntDescriptor.h
index d5a879d6169..71b11d0053e 100644
--- a/GUI/Models/Types/UIntDescriptor.h
+++ b/GUI/Models/Types/UIntDescriptor.h
@@ -16,7 +16,7 @@
#define BORNAGAIN_GUI_MODELS_TYPES_UINTDESCRIPTOR_H
#include "Fit/Param/RealLimits.h"
-#include "GUI/utils/Unit.h"
+#include "GUI/Utils/Unit.h"
#include <QString>
#include <functional>
#include <variant>
diff --git a/GUI/utils/ActionFactory.cpp b/GUI/Utils/ActionFactory.cpp
similarity index 93%
rename from GUI/utils/ActionFactory.cpp
rename to GUI/Utils/ActionFactory.cpp
index 70d649e0797..a93d8b7478c 100644
--- a/GUI/utils/ActionFactory.cpp
+++ b/GUI/Utils/ActionFactory.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/utils/ActionFactory.cpp
+//! @file GUI/Utils/ActionFactory.cpp
//! @brief Implements class ActionFactory
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/utils/ActionFactory.h"
+#include "GUI/Utils/ActionFactory.h"
#include <QAction>
QAction* ActionFactory::createRemoveAction(QObject* parent, const QString& what,
diff --git a/GUI/utils/ActionFactory.h b/GUI/Utils/ActionFactory.h
similarity index 97%
rename from GUI/utils/ActionFactory.h
rename to GUI/Utils/ActionFactory.h
index a373d9f8a45..61d861d912e 100644
--- a/GUI/utils/ActionFactory.h
+++ b/GUI/Utils/ActionFactory.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/utils/ActionFactory.h
+//! @file GUI/Utils/ActionFactory.h
//! @brief Defines class ActionFactory
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/utils/ComboProperty.cpp b/GUI/Utils/ComboProperty.cpp
similarity index 98%
rename from GUI/utils/ComboProperty.cpp
rename to GUI/Utils/ComboProperty.cpp
index d4c8e537c90..1f15535eebc 100644
--- a/GUI/utils/ComboProperty.cpp
+++ b/GUI/Utils/ComboProperty.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/utils/ComboProperty.cpp
+//! @file GUI/Utils/ComboProperty.cpp
//! @brief Implements class ComboProperty
//!
//! @homepage http://www.bornagainproject.org
@@ -12,9 +12,9 @@
//
// ************************************************************************************************
-#include "GUI/utils/ComboProperty.h"
+#include "GUI/Utils/ComboProperty.h"
#include "Base/Utils/Assert.h"
-#include "GUI/utils/Error.h"
+#include "GUI/Utils/Error.h"
namespace {
const QString value_separator = ";";
diff --git a/GUI/utils/ComboProperty.h b/GUI/Utils/ComboProperty.h
similarity index 98%
rename from GUI/utils/ComboProperty.h
rename to GUI/Utils/ComboProperty.h
index 9b7a25441a3..322d0e0144c 100644
--- a/GUI/utils/ComboProperty.h
+++ b/GUI/Utils/ComboProperty.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/utils/ComboProperty.h
+//! @file GUI/Utils/ComboProperty.h
//! @brief Defines class ComboProperty
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/utils/CustomEventFilters.cpp b/GUI/Utils/CustomEventFilters.cpp
similarity index 98%
rename from GUI/utils/CustomEventFilters.cpp
rename to GUI/Utils/CustomEventFilters.cpp
index f8efbe84958..b47966b2879 100644
--- a/GUI/utils/CustomEventFilters.cpp
+++ b/GUI/Utils/CustomEventFilters.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/utils/CustomEventFilters.cpp
+//! @file GUI/Utils/CustomEventFilters.cpp
//! @brief Defines classes releted to event filtering
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/utils/CustomEventFilters.h"
+#include "GUI/Utils/CustomEventFilters.h"
#include <QApplication>
#include <QComboBox>
#include <QKeyEvent>
diff --git a/GUI/utils/CustomEventFilters.h b/GUI/Utils/CustomEventFilters.h
similarity index 98%
rename from GUI/utils/CustomEventFilters.h
rename to GUI/Utils/CustomEventFilters.h
index be1cc8e5309..6494fb73446 100644
--- a/GUI/utils/CustomEventFilters.h
+++ b/GUI/Utils/CustomEventFilters.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/utils/CustomEventFilters.h
+//! @file GUI/Utils/CustomEventFilters.h
//! @brief Defines classes releted to event filtering
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/utils/DeserializationException.cpp b/GUI/Utils/DeserializationException.cpp
similarity index 89%
rename from GUI/utils/DeserializationException.cpp
rename to GUI/Utils/DeserializationException.cpp
index 865985b9998..2669e4980ab 100644
--- a/GUI/utils/DeserializationException.cpp
+++ b/GUI/Utils/DeserializationException.cpp
@@ -1,38 +1,38 @@
-// ************************************************************************************************
-//
-// BornAgain: simulate and fit reflection and scattering
-//
-//! @file GUI/utils/DeserializationException.cpp
-//! @brief Implements class DeserializationException
-//!
-//! @homepage http://www.bornagainproject.org
-//! @license GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2021
-//! @authors Scientific Computing Group at MLZ (see CITATION, AUTHORS)
-//
-// ************************************************************************************************
-
-#include "GUI/utils/DeserializationException.h"
-#include <QString>
-
-DeserializationException::DeserializationException(const QString& t) : m_text(t) {}
-
-DeserializationException DeserializationException::tooOld()
-{
- return DeserializationException("The found file is too old.");
-}
-
-DeserializationException DeserializationException::tooNew()
-{
- return DeserializationException("The found file is too new.");
-}
-
-DeserializationException DeserializationException::streamError()
-{
- return DeserializationException("The data seems to be corrupted.");
-}
-
-QString DeserializationException::text() const
-{
- return m_text;
-}
+// ************************************************************************************************
+//
+// BornAgain: simulate and fit reflection and scattering
+//
+//! @file GUI/Utils/DeserializationException.cpp
+//! @brief Implements class DeserializationException
+//!
+//! @homepage http://www.bornagainproject.org
+//! @license GNU General Public License v3 or higher (see COPYING)
+//! @copyright Forschungszentrum Jülich GmbH 2021
+//! @authors Scientific Computing Group at MLZ (see CITATION, AUTHORS)
+//
+// ************************************************************************************************
+
+#include "GUI/Utils/DeserializationException.h"
+#include <QString>
+
+DeserializationException::DeserializationException(const QString& t) : m_text(t) {}
+
+DeserializationException DeserializationException::tooOld()
+{
+ return DeserializationException("The found file is too old.");
+}
+
+DeserializationException DeserializationException::tooNew()
+{
+ return DeserializationException("The found file is too new.");
+}
+
+DeserializationException DeserializationException::streamError()
+{
+ return DeserializationException("The data seems to be corrupted.");
+}
+
+QString DeserializationException::text() const
+{
+ return m_text;
+}
diff --git a/GUI/utils/DeserializationException.h b/GUI/Utils/DeserializationException.h
similarity index 95%
rename from GUI/utils/DeserializationException.h
rename to GUI/Utils/DeserializationException.h
index bde8be45cb9..95146ff15b6 100644
--- a/GUI/utils/DeserializationException.h
+++ b/GUI/Utils/DeserializationException.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/utils/DeserializationException.h
+//! @file GUI/Utils/DeserializationException.h
//! @brief Defines class DeserializationException
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/utils/Error.cpp b/GUI/Utils/Error.cpp
similarity index 91%
rename from GUI/utils/Error.cpp
rename to GUI/Utils/Error.cpp
index 1aa6462cb5f..0a9d66b0f61 100644
--- a/GUI/utils/Error.cpp
+++ b/GUI/Utils/Error.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/utils/Error.cpp
+//! @file GUI/Utils/Error.cpp
//! @brief Implements Error class
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/utils/Error.h"
+#include "GUI/Utils/Error.h"
Error::Error(const QString& message) noexcept : m_messageAsLatin1(message.toLatin1()) {}
diff --git a/GUI/utils/Error.h b/GUI/Utils/Error.h
similarity index 96%
rename from GUI/utils/Error.h
rename to GUI/Utils/Error.h
index 3da8a68bfc9..d243a6ed687 100644
--- a/GUI/utils/Error.h
+++ b/GUI/Utils/Error.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/utils/Error.h
+//! @file GUI/Utils/Error.h
//! @brief Defines error class
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/utils/GUIHelpers.cpp b/GUI/Utils/GUIHelpers.cpp
similarity index 98%
rename from GUI/utils/GUIHelpers.cpp
rename to GUI/Utils/GUIHelpers.cpp
index d113a971780..4b10314c02a 100644
--- a/GUI/utils/GUIHelpers.cpp
+++ b/GUI/Utils/GUIHelpers.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/utils/GUIHelpers.cpp
+//! @file GUI/Utils/GUIHelpers.cpp
//! @brief Implements GUIHelpers functions
//!
//! @homepage http://www.bornagainproject.org
@@ -12,9 +12,9 @@
//
// ************************************************************************************************
-#include "GUI/utils/GUIHelpers.h"
+#include "GUI/Utils/GUIHelpers.h"
#include "Fit/Param/RealLimits.h"
-#include "GUI/utils/Error.h"
+#include "GUI/Utils/Error.h"
#include <QApplication>
#include <QDoubleSpinBox>
#include <QDoubleValidator>
diff --git a/GUI/utils/GUIHelpers.h b/GUI/Utils/GUIHelpers.h
similarity index 97%
rename from GUI/utils/GUIHelpers.h
rename to GUI/Utils/GUIHelpers.h
index 3cfdd456a7f..02c146cacbf 100644
--- a/GUI/utils/GUIHelpers.h
+++ b/GUI/Utils/GUIHelpers.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/utils/GUIHelpers.h
+//! @file GUI/Utils/GUIHelpers.h
//! @brief Defines class GUIHelpers functions
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/utils/Helpers.cpp b/GUI/Utils/Helpers.cpp
similarity index 98%
rename from GUI/utils/Helpers.cpp
rename to GUI/Utils/Helpers.cpp
index 5fd0a9496cf..45a29d4d6db 100644
--- a/GUI/utils/Helpers.cpp
+++ b/GUI/Utils/Helpers.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/utils/Helpers.cpp
+//! @file GUI/Utils/Helpers.cpp
//! @brief Implements Helpers functions
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/utils/Helpers.h"
+#include "GUI/Utils/Helpers.h"
#include "BAVersion.h"
#include <QDateTime>
#include <QDir>
diff --git a/GUI/utils/Helpers.h b/GUI/Utils/Helpers.h
similarity index 97%
rename from GUI/utils/Helpers.h
rename to GUI/Utils/Helpers.h
index abe651e20bc..c979d422086 100644
--- a/GUI/utils/Helpers.h
+++ b/GUI/Utils/Helpers.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/utils/Helpers.h
+//! @file GUI/Utils/Helpers.h
//! @brief Defines class Helpers functions
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/utils/ItemDelegateForHTML.cpp b/GUI/Utils/ItemDelegateForHTML.cpp
similarity index 97%
rename from GUI/utils/ItemDelegateForHTML.cpp
rename to GUI/Utils/ItemDelegateForHTML.cpp
index ccc44c8845f..26d3a016601 100644
--- a/GUI/utils/ItemDelegateForHTML.cpp
+++ b/GUI/Utils/ItemDelegateForHTML.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/utils/ItemDelegateForHTML.cpp
+//! @file GUI/Utils/ItemDelegateForHTML.cpp
//! @brief Implements class ItemDelegateForHTML
//!
//! @homepage http://www.bornagainproject.org
@@ -13,7 +13,7 @@
// ************************************************************************************************
-#include "GUI/utils/ItemDelegateForHTML.h"
+#include "GUI/Utils/ItemDelegateForHTML.h"
#include <QAbstractItemView>
#include <QAbstractTextDocumentLayout>
#include <QApplication>
diff --git a/GUI/utils/ItemDelegateForHTML.h b/GUI/Utils/ItemDelegateForHTML.h
similarity index 96%
rename from GUI/utils/ItemDelegateForHTML.h
rename to GUI/Utils/ItemDelegateForHTML.h
index 9f4350c3a35..57e2fd28e02 100644
--- a/GUI/utils/ItemDelegateForHTML.h
+++ b/GUI/Utils/ItemDelegateForHTML.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/utils/ItemDelegateForHTML.h
+//! @file GUI/Utils/ItemDelegateForHTML.h
//! @brief Defines class ItemDelegateForHTML
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/utils/ItemFileNameUtils.cpp b/GUI/Utils/ItemFileNameUtils.cpp
similarity index 95%
rename from GUI/utils/ItemFileNameUtils.cpp
rename to GUI/Utils/ItemFileNameUtils.cpp
index 5f418d154f4..5fa271ec5ab 100644
--- a/GUI/utils/ItemFileNameUtils.cpp
+++ b/GUI/Utils/ItemFileNameUtils.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/utils/ItemFileNameUtils.cpp
+//! @file GUI/Utils/ItemFileNameUtils.cpp
//! @brief Defines auxiliary functions in ItemFileNameUtils namespace.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#include "GUI/utils/ItemFileNameUtils.h"
-#include "GUI/utils/Helpers.h"
+#include "GUI/Utils/ItemFileNameUtils.h"
+#include "GUI/Utils/Helpers.h"
namespace {
diff --git a/GUI/utils/ItemFileNameUtils.h b/GUI/Utils/ItemFileNameUtils.h
similarity index 96%
rename from GUI/utils/ItemFileNameUtils.h
rename to GUI/Utils/ItemFileNameUtils.h
index 29ca435c89a..bec32c04423 100644
--- a/GUI/utils/ItemFileNameUtils.h
+++ b/GUI/Utils/ItemFileNameUtils.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/utils/ItemFileNameUtils.h
+//! @file GUI/Utils/ItemFileNameUtils.h
//! @brief Defines namespace GUI::Model::FilenameUtils
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/utils/ItemIDFactory.cpp b/GUI/Utils/ItemIDFactory.cpp
similarity index 95%
rename from GUI/utils/ItemIDFactory.cpp
rename to GUI/Utils/ItemIDFactory.cpp
index 77d23da9213..cf59ed7d50d 100644
--- a/GUI/utils/ItemIDFactory.cpp
+++ b/GUI/Utils/ItemIDFactory.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/utils/ItemIDFactory.cpp
+//! @file GUI/Utils/ItemIDFactory.cpp
//! @brief Implements class ItemIDFactory
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/utils/ItemIDFactory.h"
+#include "GUI/Utils/ItemIDFactory.h"
ItemIDFactory& ItemIDFactory::instance()
{
diff --git a/GUI/utils/ItemIDFactory.h b/GUI/Utils/ItemIDFactory.h
similarity index 97%
rename from GUI/utils/ItemIDFactory.h
rename to GUI/Utils/ItemIDFactory.h
index da20563609b..806a3e75133 100644
--- a/GUI/utils/ItemIDFactory.h
+++ b/GUI/Utils/ItemIDFactory.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/utils/ItemIDFactory.h
+//! @file GUI/Utils/ItemIDFactory.h
//! @brief Defines class ItemIDFactory
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/utils/LayoutUtils.cpp b/GUI/Utils/LayoutUtils.cpp
similarity index 98%
rename from GUI/utils/LayoutUtils.cpp
rename to GUI/Utils/LayoutUtils.cpp
index af50f4cef28..59ec255e07d 100644
--- a/GUI/utils/LayoutUtils.cpp
+++ b/GUI/Utils/LayoutUtils.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/utils/LayoutUtils.cpp
+//! @file GUI/Utils/LayoutUtils.cpp
//! @brief Implements LayoutUtils namespace
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/utils/LayoutUtils.h"
+#include "GUI/Utils/LayoutUtils.h"
#include <QBoxLayout>
#include <QGridLayout>
#include <QLayoutItem>
diff --git a/GUI/utils/LayoutUtils.h b/GUI/Utils/LayoutUtils.h
similarity index 97%
rename from GUI/utils/LayoutUtils.h
rename to GUI/Utils/LayoutUtils.h
index 46b3ecfb49d..20d4081e8f0 100644
--- a/GUI/utils/LayoutUtils.h
+++ b/GUI/Utils/LayoutUtils.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/utils/LayoutUtils.h
+//! @file GUI/Utils/LayoutUtils.h
//! @brief Defines namespace GUI::Utils::Layout
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/utils/MessageService.cpp b/GUI/Utils/MessageService.cpp
similarity index 94%
rename from GUI/utils/MessageService.cpp
rename to GUI/Utils/MessageService.cpp
index b9b3862ff91..e96b1c98363 100644
--- a/GUI/utils/MessageService.cpp
+++ b/GUI/Utils/MessageService.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/utils/MessageService.cpp
+//! @file GUI/Utils/MessageService.cpp
//! @brief Implements MessageService class
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/utils/MessageService.h"
+#include "GUI/Utils/MessageService.h"
#include <QObject>
QStringList MessageService::descriptions(const Messages& messages, bool includeSenders) const
diff --git a/GUI/utils/MessageService.h b/GUI/Utils/MessageService.h
similarity index 97%
rename from GUI/utils/MessageService.h
rename to GUI/Utils/MessageService.h
index b9f656896cd..eee1e699cb4 100644
--- a/GUI/utils/MessageService.h
+++ b/GUI/Utils/MessageService.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/utils/MessageService.h
+//! @file GUI/Utils/MessageService.h
//! @brief Defines MessageService class
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/utils/OutputDataUtils.cpp b/GUI/Utils/OutputDataUtils.cpp
similarity index 92%
rename from GUI/utils/OutputDataUtils.cpp
rename to GUI/Utils/OutputDataUtils.cpp
index 926971276a9..062093fdcf1 100644
--- a/GUI/utils/OutputDataUtils.cpp
+++ b/GUI/Utils/OutputDataUtils.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/utils/OutputDataUtils.cpp
+//! @file GUI/Utils/OutputDataUtils.cpp
//! @brief Implements OutputDataUtils namespace
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/utils/OutputDataUtils.h"
+#include "GUI/Utils/OutputDataUtils.h"
#include "Device/Data/OutputData.h"
std::unique_ptr<OutputData<double>> GUI::Utils::Output::binifyAxes(const OutputData<double>& data)
diff --git a/GUI/utils/OutputDataUtils.h b/GUI/Utils/OutputDataUtils.h
similarity index 95%
rename from GUI/utils/OutputDataUtils.h
rename to GUI/Utils/OutputDataUtils.h
index 1cabfa3d9a9..1af87fb3d09 100644
--- a/GUI/utils/OutputDataUtils.h
+++ b/GUI/Utils/OutputDataUtils.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/utils/OutputDataUtils.h
+//! @file GUI/Utils/OutputDataUtils.h
//! @brief Defines namespace GUI::Utils::Output
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/utils/SaveLoadInterface.cpp b/GUI/Utils/SaveLoadInterface.cpp
similarity index 90%
rename from GUI/utils/SaveLoadInterface.cpp
rename to GUI/Utils/SaveLoadInterface.cpp
index 4872eec77e2..0b84a50bccf 100644
--- a/GUI/utils/SaveLoadInterface.cpp
+++ b/GUI/Utils/SaveLoadInterface.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/utils/SaveLoadInterface.cpp
+//! @file GUI/Utils/SaveLoadInterface.cpp
//! @brief Impelments save/load interface.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/utils/SaveLoadInterface.h"
+#include "GUI/Utils/SaveLoadInterface.h"
#include "Base/Utils/FileSystemUtils.h"
QString SaveLoadInterface::fileName(const QString& projectDir) const
diff --git a/GUI/utils/SaveLoadInterface.h b/GUI/Utils/SaveLoadInterface.h
similarity index 97%
rename from GUI/utils/SaveLoadInterface.h
rename to GUI/Utils/SaveLoadInterface.h
index 2c8f4a72818..d2b2a46eb2d 100644
--- a/GUI/utils/SaveLoadInterface.h
+++ b/GUI/Utils/SaveLoadInterface.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/utils/SaveLoadInterface.h
+//! @file GUI/Utils/SaveLoadInterface.h
//! @brief Defines save/load interface.
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/utils/Unit.cpp b/GUI/Utils/Unit.cpp
similarity index 97%
rename from GUI/utils/Unit.cpp
rename to GUI/Utils/Unit.cpp
index 956cb2b0dcc..c639acc8989 100644
--- a/GUI/utils/Unit.cpp
+++ b/GUI/Utils/Unit.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/utils/Unit.cpp
+//! @file GUI/Utils/Unit.cpp
//! @brief Implements class Unit
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/utils/Unit.h"
+#include "GUI/Utils/Unit.h"
#include "Base/Const/Units.h"
#include "Base/Utils/Assert.h"
#include <QString>
diff --git a/GUI/utils/Unit.h b/GUI/Utils/Unit.h
similarity index 97%
rename from GUI/utils/Unit.h
rename to GUI/Utils/Unit.h
index e51d72e90a1..de2faf093c5 100644
--- a/GUI/utils/Unit.h
+++ b/GUI/Utils/Unit.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/utils/Unit.h
+//! @file GUI/Utils/Unit.h
//! @brief Defines class Unit
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/utils/hostosinfo.h b/GUI/Utils/hostosinfo.h
similarity index 98%
rename from GUI/utils/hostosinfo.h
rename to GUI/Utils/hostosinfo.h
index fac4db04b09..7f264d2b061 100644
--- a/GUI/utils/hostosinfo.h
+++ b/GUI/Utils/hostosinfo.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/utils/hostosinfo.h
+//! @file GUI/Utils/hostosinfo.h
//! @brief Defines namespace GUI::Utils::OS
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/utils/mainwindow_constants.h b/GUI/Utils/mainwindow_constants.h
similarity index 97%
rename from GUI/utils/mainwindow_constants.h
rename to GUI/Utils/mainwindow_constants.h
index 0838d9660d5..56790e39e92 100644
--- a/GUI/utils/mainwindow_constants.h
+++ b/GUI/Utils/mainwindow_constants.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/utils/mainwindow_constants.h
+//! @file GUI/Utils/mainwindow_constants.h
//! @brief Defines namespace GUI::Constants
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/utils/qstringutils.cpp b/GUI/Utils/qstringutils.cpp
similarity index 90%
rename from GUI/utils/qstringutils.cpp
rename to GUI/Utils/qstringutils.cpp
index c8f621c3f6a..5ac70e56cef 100644
--- a/GUI/utils/qstringutils.cpp
+++ b/GUI/Utils/qstringutils.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/utils/qstringutils.cpp
+//! @file GUI/Utils/qstringutils.cpp
//! @brief Implements functions from Utils namespace
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#include "GUI/utils/qstringutils.h"
-#include "GUI/utils/hostosinfo.h"
+#include "GUI/Utils/qstringutils.h"
+#include "GUI/Utils/hostosinfo.h"
#include <QDir>
QString GUI::Utils::String::withTildeHomePath(const QString& path)
diff --git a/GUI/utils/qstringutils.h b/GUI/Utils/qstringutils.h
similarity index 95%
rename from GUI/utils/qstringutils.h
rename to GUI/Utils/qstringutils.h
index 56e9cd03815..c7b596128d8 100644
--- a/GUI/utils/qstringutils.h
+++ b/GUI/Utils/qstringutils.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/utils/qstringutils.h
+//! @file GUI/Utils/qstringutils.h
//! @brief Defines functions from namespace GUI::Utils::String
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/Views/Edit/DoubleLineEdit.cpp b/GUI/Views/Edit/DoubleLineEdit.cpp
index 4ee99c9b209..aa8178cc6f3 100644
--- a/GUI/Views/Edit/DoubleLineEdit.cpp
+++ b/GUI/Views/Edit/DoubleLineEdit.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/Edit/DoubleLineEdit.h"
-#include "GUI/utils/GUIHelpers.h"
+#include "GUI/Utils/GUIHelpers.h"
#include <QDoubleValidator>
DoubleLineEdit::DoubleLineEdit(QWidget* parent, const DoubleDescriptor& d)
diff --git a/GUI/Views/Edit/DoubleSpinBox.cpp b/GUI/Views/Edit/DoubleSpinBox.cpp
index f0660f981cb..59db0544a9a 100644
--- a/GUI/Views/Edit/DoubleSpinBox.cpp
+++ b/GUI/Views/Edit/DoubleSpinBox.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/Edit/DoubleSpinBox.h"
-#include "GUI/utils/GUIHelpers.h"
+#include "GUI/Utils/GUIHelpers.h"
#include <QWheelEvent>
DoubleSpinBox::DoubleSpinBox(QWidget* parent, const DoubleDescriptor& d)
diff --git a/GUI/Views/FitWidgets/FitActivityPanel.cpp b/GUI/Views/FitWidgets/FitActivityPanel.cpp
index f24be3a1ffa..f52d0666296 100644
--- a/GUI/Views/FitWidgets/FitActivityPanel.cpp
+++ b/GUI/Views/FitWidgets/FitActivityPanel.cpp
@@ -20,7 +20,7 @@
#include "GUI/Views/FitWidgets/FitSessionWidget.h"
#include "GUI/Views/FitWidgets/JobRealTimeWidget.h"
#include "GUI/Views/FitWidgets/RunFitControlWidget.h"
-#include "GUI/utils/mainwindow_constants.h"
+#include "GUI/Utils/mainwindow_constants.h"
#include <QLabel>
#include <QPushButton>
#include <QStackedWidget>
diff --git a/GUI/Views/FitWidgets/FitObjectiveBuilder.cpp b/GUI/Views/FitWidgets/FitObjectiveBuilder.cpp
index a8f10240621..7e0ea0a51ff 100644
--- a/GUI/Views/FitWidgets/FitObjectiveBuilder.cpp
+++ b/GUI/Views/FitWidgets/FitObjectiveBuilder.cpp
@@ -26,8 +26,8 @@
#include "GUI/Models/Fit/MinimizerItem.h"
#include "GUI/Models/Job/JobItem.h"
#include "GUI/Views/FitWidgets/GUIFitObserver.h"
-#include "GUI/utils/Error.h"
-#include "GUI/utils/Helpers.h"
+#include "GUI/Utils/Error.h"
+#include "GUI/Utils/Helpers.h"
FitObjectiveBuilder::FitObjectiveBuilder(JobItem* jobItem) : m_jobItem(jobItem)
{
diff --git a/GUI/Views/FitWidgets/FitParameterWidget.cpp b/GUI/Views/FitWidgets/FitParameterWidget.cpp
index 40ae6ab05a9..79df1231c4b 100644
--- a/GUI/Views/FitWidgets/FitParameterWidget.cpp
+++ b/GUI/Views/FitWidgets/FitParameterWidget.cpp
@@ -24,8 +24,8 @@
#include "GUI/Views/FitWidgets/ParameterTuningWidget.h"
#include "GUI/Views/PropertyEditor/SessionModelDelegate.h"
#include "GUI/Widgets/Info/OverlayLabelController.h"
-#include "GUI/utils/CustomEventFilters.h"
-#include "GUI/utils/mainwindow_constants.h"
+#include "GUI/Utils/CustomEventFilters.h"
+#include "GUI/Utils/mainwindow_constants.h"
#include <QAction>
#include <QMenu>
#include <QTreeView>
diff --git a/GUI/Views/FitWidgets/FitSessionController.cpp b/GUI/Views/FitWidgets/FitSessionController.cpp
index 6f5bf057f4e..c09bed5f963 100644
--- a/GUI/Views/FitWidgets/FitSessionController.cpp
+++ b/GUI/Views/FitWidgets/FitSessionController.cpp
@@ -21,8 +21,8 @@
#include "GUI/Views/FitWidgets/FitObjectiveBuilder.h"
#include "GUI/Views/FitWidgets/FitWorkerLauncher.h"
#include "GUI/Views/FitWidgets/GUIFitObserver.h"
-#include "GUI/utils/Error.h"
-#include "GUI/utils/Helpers.h"
+#include "GUI/Utils/Error.h"
+#include "GUI/Utils/Helpers.h"
namespace {
const bool use_fit_objective = true;
diff --git a/GUI/Views/FitWidgets/FitSessionManager.cpp b/GUI/Views/FitWidgets/FitSessionManager.cpp
index 7573f57055f..e6421586d83 100644
--- a/GUI/Views/FitWidgets/FitSessionManager.cpp
+++ b/GUI/Views/FitWidgets/FitSessionManager.cpp
@@ -16,7 +16,7 @@
#include "GUI/Models/Job/JobItem.h"
#include "GUI/Views/FitWidgets/FitLog.h"
#include "GUI/Views/FitWidgets/FitSessionController.h"
-#include "GUI/utils/Error.h"
+#include "GUI/Utils/Error.h"
FitSessionManager::FitSessionManager(QObject* parent) : QObject(parent), m_activeController(nullptr)
{
diff --git a/GUI/Views/FitWidgets/FitSessionWidget.cpp b/GUI/Views/FitWidgets/FitSessionWidget.cpp
index 9a7c2f226b3..d4aab52856e 100644
--- a/GUI/Views/FitWidgets/FitSessionWidget.cpp
+++ b/GUI/Views/FitWidgets/FitSessionWidget.cpp
@@ -19,7 +19,7 @@
#include "GUI/Views/FitWidgets/FitSessionController.h"
#include "GUI/Views/FitWidgets/MinimizerSettingsWidget.h"
#include "GUI/Views/FitWidgets/RunFitControlWidget.h"
-#include "GUI/utils/mainwindow_constants.h"
+#include "GUI/Utils/mainwindow_constants.h"
#include <QTabWidget>
#include <QVBoxLayout>
diff --git a/GUI/Views/FitWidgets/JobRealTimeWidget.cpp b/GUI/Views/FitWidgets/JobRealTimeWidget.cpp
index 020f292b236..c6c15e1165f 100644
--- a/GUI/Views/FitWidgets/JobRealTimeWidget.cpp
+++ b/GUI/Views/FitWidgets/JobRealTimeWidget.cpp
@@ -16,7 +16,7 @@
#include "GUI/Models/Job/JobItem.h"
#include "GUI/Models/Job/JobModel.h"
#include "GUI/Views/FitWidgets/ParameterTuningWidget.h"
-#include "GUI/utils/mainwindow_constants.h"
+#include "GUI/Utils/mainwindow_constants.h"
#include <QVBoxLayout>
namespace {
diff --git a/GUI/Views/FitWidgets/ParameterTuningWidget.cpp b/GUI/Views/FitWidgets/ParameterTuningWidget.cpp
index 84e5900e1ac..cbd38dc886e 100644
--- a/GUI/Views/FitWidgets/ParameterTuningWidget.cpp
+++ b/GUI/Views/FitWidgets/ParameterTuningWidget.cpp
@@ -22,7 +22,7 @@
#include "GUI/Views/FitWidgets/ParameterTuningDelegate.h"
#include "GUI/Views/FitWidgets/SliderSettingsWidget.h"
#include "GUI/Widgets/Info/CautionSign.h"
-#include "GUI/utils/Error.h"
+#include "GUI/Utils/Error.h"
#include <QTreeView>
#include <QVBoxLayout>
diff --git a/GUI/Views/FitWidgets/RunFitControlWidget.cpp b/GUI/Views/FitWidgets/RunFitControlWidget.cpp
index 3180105a139..8efc6b5c25f 100644
--- a/GUI/Views/FitWidgets/RunFitControlWidget.cpp
+++ b/GUI/Views/FitWidgets/RunFitControlWidget.cpp
@@ -17,7 +17,7 @@
#include "GUI/Models/Job/JobItem.h"
#include "GUI/Widgets/Common/DesignerHelper.h"
#include "GUI/Widgets/Info/CautionSign.h"
-#include "GUI/utils/mainwindow_constants.h"
+#include "GUI/Utils/mainwindow_constants.h"
#include <QFont>
#include <QHBoxLayout>
#include <QLabel>
diff --git a/GUI/Views/ImportDataWidgets/ImportDataUtils.cpp b/GUI/Views/ImportDataWidgets/ImportDataUtils.cpp
index 83f76d219c2..1a864d5981a 100644
--- a/GUI/Views/ImportDataWidgets/ImportDataUtils.cpp
+++ b/GUI/Views/ImportDataWidgets/ImportDataUtils.cpp
@@ -18,7 +18,7 @@
#include "GUI/Models/Data/ImportDataInfo.h"
#include "GUI/Models/Data/RealDataItem.h"
#include "GUI/Views/Loaders/QREDataLoader.h"
-#include "GUI/utils/OutputDataUtils.h"
+#include "GUI/Utils/OutputDataUtils.h"
#include <QApplication>
#include <QMessageBox>
diff --git a/GUI/Views/ImportDataWidgets/RealDataPresenter.cpp b/GUI/Views/ImportDataWidgets/RealDataPresenter.cpp
index 298699020e4..17a8ba2c75b 100644
--- a/GUI/Views/ImportDataWidgets/RealDataPresenter.cpp
+++ b/GUI/Views/ImportDataWidgets/RealDataPresenter.cpp
@@ -19,7 +19,7 @@
#include "GUI/Views/ProjectionsWidgets/IntensityDataProjectionsWidget.h"
#include "GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.h"
#include "GUI/Views/SpecularDataWidgets/SpecularDataWidget.h"
-#include "GUI/utils/Error.h"
+#include "GUI/Utils/Error.h"
#include <QAction>
RealDataPresenter::RealDataPresenter(QWidget* parent) : ItemComboWidget(parent)
diff --git a/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp b/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
index c5cb5630d5e..54fbb98f6c0 100644
--- a/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
+++ b/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
@@ -26,8 +26,8 @@
#include "GUI/Views/Main/ProjectManager.h"
#include "GUI/Widgets/Common/ItemViewOverlayButtons.h"
#include "GUI/Widgets/Common/StyledToolBar.h"
-#include "GUI/utils/Error.h"
-#include "GUI/utils/GUIHelpers.h"
+#include "GUI/Utils/Error.h"
+#include "GUI/Utils/GUIHelpers.h"
#include <QFileDialog>
#include <QItemSelectionModel>
#include <QLineEdit>
diff --git a/GUI/Views/InstrumentWidgets/DetectorAlignmentEditor.cpp b/GUI/Views/InstrumentWidgets/DetectorAlignmentEditor.cpp
index 908b7e79007..fe6e877330d 100644
--- a/GUI/Views/InstrumentWidgets/DetectorAlignmentEditor.cpp
+++ b/GUI/Views/InstrumentWidgets/DetectorAlignmentEditor.cpp
@@ -15,7 +15,7 @@
#include "GUI/Views/InstrumentWidgets/DetectorAlignmentEditor.h"
#include "GUI/Models/Instrument/RectangularDetectorItem.h"
#include "GUI/Views/InstrumentWidgets/VectorEditor.h"
-#include "GUI/utils/ComboProperty.h"
+#include "GUI/Utils/ComboProperty.h"
#include <QComboBox>
#include <QDoubleSpinBox>
diff --git a/GUI/Views/InstrumentWidgets/InstrumentLibraryEditor.cpp b/GUI/Views/InstrumentWidgets/InstrumentLibraryEditor.cpp
index 23f5a746e71..2c71f8b4f01 100644
--- a/GUI/Views/InstrumentWidgets/InstrumentLibraryEditor.cpp
+++ b/GUI/Views/InstrumentWidgets/InstrumentLibraryEditor.cpp
@@ -19,7 +19,7 @@
#include "GUI/Views/Main/MainWindow.h"
#include "GUI/Widgets/Common/ItemViewOverlayButtons.h"
#include "GUI/Widgets/Common/StyleUtils.h"
-#include "GUI/utils/ItemDelegateForHTML.h"
+#include "GUI/Utils/ItemDelegateForHTML.h"
#include "ui_InstrumentLibraryEditor.h"
#include <QAction>
#include <QFormLayout>
diff --git a/GUI/Views/IntensityDataWidgets/ColorMapUtils.cpp b/GUI/Views/IntensityDataWidgets/ColorMapUtils.cpp
index 25c669e19dc..4e8a608e281 100644
--- a/GUI/Views/IntensityDataWidgets/ColorMapUtils.cpp
+++ b/GUI/Views/IntensityDataWidgets/ColorMapUtils.cpp
@@ -15,7 +15,7 @@
#include "GUI/Views/IntensityDataWidgets/ColorMapUtils.h"
#include "GUI/Models/Data/IntensityDataItem.h"
#include "GUI/Widgets/Common/StyleUtils.h"
-#include "GUI/utils/Error.h"
+#include "GUI/Utils/Error.h"
using gradient_map_t = QMap<QString, QCPColorGradient::GradientPreset>;
diff --git a/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.cpp b/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.cpp
index d3a76a69faf..0a2c3a9b43b 100644
--- a/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.cpp
+++ b/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.cpp
@@ -20,8 +20,8 @@
#include "GUI/Views/IntensityDataWidgets/SavePlotAssistant.h"
#include "GUI/Views/Main/MainWindow.h"
#include "GUI/Views/Main/ProjectManager.h"
-#include "GUI/utils/ComboProperty.h"
-#include "GUI/utils/GUIHelpers.h"
+#include "GUI/Utils/ComboProperty.h"
+#include "GUI/Utils/GUIHelpers.h"
#include <QAction>
#include <QMouseEvent>
#include <QSettings>
diff --git a/GUI/Views/IntensityDataWidgets/IntensityDataFFTPresenter.cpp b/GUI/Views/IntensityDataWidgets/IntensityDataFFTPresenter.cpp
index 33d3c21b5c3..2d5c1257c85 100644
--- a/GUI/Views/IntensityDataWidgets/IntensityDataFFTPresenter.cpp
+++ b/GUI/Views/IntensityDataWidgets/IntensityDataFFTPresenter.cpp
@@ -16,7 +16,7 @@
#include "Device/Data/DataUtils.h"
#include "GUI/Models/Data/IntensityDataItem.h"
#include "GUI/Models/Session/SessionModel.h"
-#include "GUI/utils/Error.h"
+#include "GUI/Utils/Error.h"
#include <QAction>
#include <QApplication>
#include <QWidget>
diff --git a/GUI/Views/JobWidgets/FitComparisonViewController.cpp b/GUI/Views/JobWidgets/FitComparisonViewController.cpp
index a7f16730f25..4f917ab9f6e 100644
--- a/GUI/Views/JobWidgets/FitComparisonViewController.cpp
+++ b/GUI/Views/JobWidgets/FitComparisonViewController.cpp
@@ -23,7 +23,7 @@
#include "GUI/Models/Job/JobItem.h"
#include "GUI/Models/Session/SessionModel.h"
#include "GUI/Views/IntensityDataWidgets/PropertyRepeater.h"
-#include "GUI/utils/ComboProperty.h"
+#include "GUI/Utils/ComboProperty.h"
namespace {
const double relative_diff_min_1d = 1e-05;
diff --git a/GUI/Views/JobWidgets/JobMessagePanel.cpp b/GUI/Views/JobWidgets/JobMessagePanel.cpp
index 1730525f414..65defb751c5 100644
--- a/GUI/Views/JobWidgets/JobMessagePanel.cpp
+++ b/GUI/Views/JobWidgets/JobMessagePanel.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/JobWidgets/JobMessagePanel.h"
-#include "GUI/utils/mainwindow_constants.h"
+#include "GUI/Utils/mainwindow_constants.h"
#include <QScrollBar>
#include <QStackedWidget>
#include <QTextEdit>
diff --git a/GUI/Views/JobWidgets/JobPropertiesWidget.cpp b/GUI/Views/JobWidgets/JobPropertiesWidget.cpp
index 64d10ecec59..90c5c3fa5e7 100644
--- a/GUI/Views/JobWidgets/JobPropertiesWidget.cpp
+++ b/GUI/Views/JobWidgets/JobPropertiesWidget.cpp
@@ -16,7 +16,7 @@
#include "GUI/Models/Job/JobItem.h"
#include "GUI/Views/JobWidgets/JobPropertiesTableModel.h"
#include "GUI/Widgets/Common/StyleUtils.h"
-#include "GUI/utils/mainwindow_constants.h"
+#include "GUI/Utils/mainwindow_constants.h"
#include <QTabBar>
#include <QTabWidget>
#include <QTextEdit>
diff --git a/GUI/Views/JobWidgets/JobSelectorWidget.cpp b/GUI/Views/JobWidgets/JobSelectorWidget.cpp
index 019c991018d..27d4b7656bb 100644
--- a/GUI/Views/JobWidgets/JobSelectorWidget.cpp
+++ b/GUI/Views/JobWidgets/JobSelectorWidget.cpp
@@ -17,7 +17,7 @@
#include "GUI/Models/Job/JobItem.h"
#include "GUI/Views/JobWidgets/JobListView.h"
#include "GUI/Views/JobWidgets/JobPropertiesWidget.h"
-#include "GUI/utils/mainwindow_constants.h"
+#include "GUI/Utils/mainwindow_constants.h"
#include <QSplitter>
#include <QVBoxLayout>
diff --git a/GUI/Views/JobWidgets/JobViewActivities.cpp b/GUI/Views/JobWidgets/JobViewActivities.cpp
index 8483057ce4a..ca096eb0d8e 100644
--- a/GUI/Views/JobWidgets/JobViewActivities.cpp
+++ b/GUI/Views/JobWidgets/JobViewActivities.cpp
@@ -14,7 +14,7 @@
#include "GUI/Views/JobWidgets/JobViewActivities.h"
#include "Base/Utils/Assert.h"
-#include "GUI/utils/mainwindow_constants.h"
+#include "GUI/Utils/mainwindow_constants.h"
namespace {
QMap<JobViewActivity, QVector<JobViewFlags::Dock>> createActivityMap()
diff --git a/GUI/Views/Loaders/AutomaticDataLoader1D.cpp b/GUI/Views/Loaders/AutomaticDataLoader1D.cpp
index 176f13f49a4..f5989486051 100644
--- a/GUI/Views/Loaders/AutomaticDataLoader1D.cpp
+++ b/GUI/Views/Loaders/AutomaticDataLoader1D.cpp
@@ -18,7 +18,7 @@
#include "GUI/Models/Data/RealDataItem.h"
#include "GUI/Models/Data/SpecularDataItem.h"
#include "GUI/Views/Loaders/AutomaticDataLoader1DResultModel.h"
-#include "GUI/utils/DeserializationException.h"
+#include "GUI/Utils/DeserializationException.h"
QString AutomaticDataLoader1D::name() const
{
diff --git a/GUI/Views/Loaders/QREDataLoader.cpp b/GUI/Views/Loaders/QREDataLoader.cpp
index fe5bce97244..36daf82b051 100644
--- a/GUI/Views/Loaders/QREDataLoader.cpp
+++ b/GUI/Views/Loaders/QREDataLoader.cpp
@@ -20,7 +20,7 @@
#include "GUI/Models/Job/JobItemUtils.h"
#include "GUI/Views/Loaders/QREDataLoaderProperties.h"
#include "GUI/Views/Loaders/QREDataLoaderResultModel.h"
-#include "GUI/utils/DeserializationException.h"
+#include "GUI/Utils/DeserializationException.h"
#include "ui_QREDataLoaderProperties.h"
#include <QFile>
#include <QString>
diff --git a/GUI/Views/Main/AboutDialog.cpp b/GUI/Views/Main/AboutDialog.cpp
index 34bb260716a..55cd6eeabdd 100644
--- a/GUI/Views/Main/AboutDialog.cpp
+++ b/GUI/Views/Main/AboutDialog.cpp
@@ -14,8 +14,8 @@
#include "GUI/Views/Main/AboutDialog.h"
#include "GUI/Widgets/Common/DesignerHelper.h"
-#include "GUI/utils/CustomEventFilters.h"
-#include "GUI/utils/Helpers.h"
+#include "GUI/Utils/CustomEventFilters.h"
+#include "GUI/Utils/Helpers.h"
#include <QDate>
#include <QLabel>
#include <QPushButton>
diff --git a/GUI/Views/Main/ActionManager.cpp b/GUI/Views/Main/ActionManager.cpp
index d7f5822d9e2..713ca242c92 100644
--- a/GUI/Views/Main/ActionManager.cpp
+++ b/GUI/Views/Main/ActionManager.cpp
@@ -23,9 +23,9 @@
#include "GUI/Views/Main/ProjectManager.h"
#include "GUI/Views/Main/PyImportAssistant.h"
#include "GUI/Views/Toplevel/SampleView.h"
-#include "GUI/utils/hostosinfo.h"
-#include "GUI/utils/mainwindow_constants.h"
-#include "GUI/utils/qstringutils.h"
+#include "GUI/Utils/hostosinfo.h"
+#include "GUI/Utils/mainwindow_constants.h"
+#include "GUI/Utils/qstringutils.h"
#include <QDesktopServices>
#include <QDir>
#include <QMenuBar>
diff --git a/GUI/Views/Main/MainWindow.cpp b/GUI/Views/Main/MainWindow.cpp
index b0636d53ad9..11fb6350a3a 100644
--- a/GUI/Views/Main/MainWindow.cpp
+++ b/GUI/Views/Main/MainWindow.cpp
@@ -26,9 +26,9 @@
#include "GUI/Views/Toplevel/SessionModelView.h"
#include "GUI/Views/Toplevel/SimulationView.h"
#include "GUI/Views/Toplevel/WelcomeView.h"
-#include "GUI/utils/Helpers.h"
-#include "GUI/utils/hostosinfo.h"
-#include "GUI/utils/mainwindow_constants.h"
+#include "GUI/Utils/Helpers.h"
+#include "GUI/Utils/hostosinfo.h"
+#include "GUI/Utils/mainwindow_constants.h"
#include <QAction>
#include <QApplication>
#include <QBoxLayout>
diff --git a/GUI/Views/Main/ProjectManager.cpp b/GUI/Views/Main/ProjectManager.cpp
index 8340bcb7b48..5392c37d1b1 100644
--- a/GUI/Views/Main/ProjectManager.cpp
+++ b/GUI/Views/Main/ProjectManager.cpp
@@ -23,10 +23,10 @@
#include "GUI/Views/Main/NewProjectDialog.h"
#include "GUI/Views/Main/SaveService.h"
#include "GUI/Widgets/Info/ProjectLoadProblemDialog.h"
-#include "GUI/utils/Error.h"
-#include "GUI/utils/GUIHelpers.h"
-#include "GUI/utils/MessageService.h"
-#include "GUI/utils/mainwindow_constants.h"
+#include "GUI/Utils/Error.h"
+#include "GUI/Utils/GUIHelpers.h"
+#include "GUI/Utils/MessageService.h"
+#include "GUI/Utils/mainwindow_constants.h"
#include <QApplication>
#include <QDateTime>
#include <QFileDialog>
diff --git a/GUI/Views/Main/PyImportAssistant.cpp b/GUI/Views/Main/PyImportAssistant.cpp
index e05588b543c..088cd221276 100644
--- a/GUI/Views/Main/PyImportAssistant.cpp
+++ b/GUI/Views/Main/PyImportAssistant.cpp
@@ -25,8 +25,8 @@
#include "GUI/Views/Main/ProjectManager.h"
#include "GUI/Widgets/Info/ComboSelectorDialog.h"
#include "GUI/Widgets/Info/DetailedMessageBox.h"
-#include "GUI/utils/GUIHelpers.h"
-#include "GUI/utils/Helpers.h"
+#include "GUI/Utils/GUIHelpers.h"
+#include "GUI/Utils/Helpers.h"
#include "Sample/Multilayer/MultiLayer.h"
#include "Sample/Multilayer/PyImport.h"
#include <QApplication>
diff --git a/GUI/Views/Main/SaveService.cpp b/GUI/Views/Main/SaveService.cpp
index dbc3e6d9cf7..3fa8c735f24 100644
--- a/GUI/Views/Main/SaveService.cpp
+++ b/GUI/Views/Main/SaveService.cpp
@@ -18,7 +18,7 @@
#include "GUI/Models/Project/ProjectUtils.h"
#include "GUI/Views/Main/AutosaveController.h"
#include "GUI/Views/Main/SaveThread.h"
-#include "GUI/utils/Error.h"
+#include "GUI/Utils/Error.h"
#include <QApplication>
#include <QCoreApplication>
#include <QTime>
diff --git a/GUI/Views/MaskWidgets/MaskEditorToolBar.cpp b/GUI/Views/MaskWidgets/MaskEditorToolBar.cpp
index d7295fa05e7..1ab365f5039 100644
--- a/GUI/Views/MaskWidgets/MaskEditorToolBar.cpp
+++ b/GUI/Views/MaskWidgets/MaskEditorToolBar.cpp
@@ -15,7 +15,7 @@
#include "GUI/Views/MaskWidgets/MaskEditorToolBar.h"
#include "Base/Utils/Assert.h"
#include "GUI/Views/MaskWidgets/MaskEditorActions.h"
-#include "GUI/utils/mainwindow_constants.h"
+#include "GUI/Utils/mainwindow_constants.h"
#include <QButtonGroup>
#include <QLabel>
#include <QRadioButton>
diff --git a/GUI/Views/MaskWidgets/MaskGraphicsScene.cpp b/GUI/Views/MaskWidgets/MaskGraphicsScene.cpp
index f37fa65688e..451603f113f 100644
--- a/GUI/Views/MaskWidgets/MaskGraphicsScene.cpp
+++ b/GUI/Views/MaskWidgets/MaskGraphicsScene.cpp
@@ -22,7 +22,7 @@
#include "GUI/Views/MaskWidgets/MaskGraphicsProxy.h"
#include "GUI/Views/MaskWidgets/MaskViewFactory.h"
#include "GUI/Views/MaskWidgets/PolygonView.h"
-#include "GUI/utils/Error.h"
+#include "GUI/Utils/Error.h"
#include <QGraphicsItem>
#include <QGraphicsSceneMoveEvent>
#include <QItemSelection>
diff --git a/GUI/Views/MaskWidgets/MaskViewFactory.cpp b/GUI/Views/MaskWidgets/MaskViewFactory.cpp
index 8bca535f322..7145f429efa 100644
--- a/GUI/Views/MaskWidgets/MaskViewFactory.cpp
+++ b/GUI/Views/MaskWidgets/MaskViewFactory.cpp
@@ -23,7 +23,7 @@
#include "GUI/Views/MaskWidgets/PolygonPointView.h"
#include "GUI/Views/MaskWidgets/PolygonView.h"
#include "GUI/Views/MaskWidgets/RegionOfInterestView.h"
-#include "GUI/utils/Error.h"
+#include "GUI/Utils/Error.h"
#include <boost/polymorphic_cast.hpp>
using boost::polymorphic_downcast;
diff --git a/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp b/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp
index 2c3a7749e62..a67809fe8a2 100644
--- a/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp
+++ b/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp
@@ -24,8 +24,8 @@
#include "GUI/Views/Main/MainWindow.h"
#include "GUI/Views/MaterialEditor/MaterialEditorModel.h"
#include "GUI/Widgets/Common/StyleUtils.h"
-#include "GUI/utils/GUIHelpers.h"
-#include "GUI/utils/mainwindow_constants.h"
+#include "GUI/Utils/GUIHelpers.h"
+#include "GUI/Utils/mainwindow_constants.h"
#include "ui_MaterialEditorDialog.h"
#include <QAction>
diff --git a/GUI/Views/ProjectionsWidgets/ProjectionsToolBar.cpp b/GUI/Views/ProjectionsWidgets/ProjectionsToolBar.cpp
index 2fc05896cdf..42e28806e6b 100644
--- a/GUI/Views/ProjectionsWidgets/ProjectionsToolBar.cpp
+++ b/GUI/Views/ProjectionsWidgets/ProjectionsToolBar.cpp
@@ -14,7 +14,7 @@
#include "GUI/Views/ProjectionsWidgets/ProjectionsToolBar.h"
#include "GUI/Views/ProjectionsWidgets/ProjectionsEditorActions.h"
-#include "GUI/utils/mainwindow_constants.h"
+#include "GUI/Utils/mainwindow_constants.h"
#include <QButtonGroup>
#include <QLabel>
#include <QToolButton>
diff --git a/GUI/Views/ProjectionsWidgets/SaveProjectionsAssistant.cpp b/GUI/Views/ProjectionsWidgets/SaveProjectionsAssistant.cpp
index 00a6e863e9c..4b53a3515b7 100644
--- a/GUI/Views/ProjectionsWidgets/SaveProjectionsAssistant.cpp
+++ b/GUI/Views/ProjectionsWidgets/SaveProjectionsAssistant.cpp
@@ -21,7 +21,7 @@
#include "GUI/Models/Data/MaskItems.h"
#include "GUI/Models/Data/ProjectionItems.h"
#include "GUI/Views/Main/ProjectManager.h"
-#include "GUI/utils/Error.h"
+#include "GUI/Utils/Error.h"
#include <QFileDialog>
#include <QTextStream>
diff --git a/GUI/Views/PropertyEditor/ComponentFlatView.cpp b/GUI/Views/PropertyEditor/ComponentFlatView.cpp
index 243ae1a1668..418b87b7abc 100644
--- a/GUI/Views/PropertyEditor/ComponentFlatView.cpp
+++ b/GUI/Views/PropertyEditor/ComponentFlatView.cpp
@@ -18,7 +18,7 @@
#include "GUI/Models/Session/SessionModel.h"
#include "GUI/Views/PropertyEditor/PropertyEditorFactory.h"
#include "GUI/Views/PropertyEditor/PropertyWidgetItem.h"
-#include "GUI/utils/LayoutUtils.h"
+#include "GUI/Utils/LayoutUtils.h"
#include <QBoxLayout>
#include <QComboBox>
#include <QDataWidgetMapper>
diff --git a/GUI/Views/PropertyEditor/ComponentTreeView.cpp b/GUI/Views/PropertyEditor/ComponentTreeView.cpp
index ded9a0a7de7..16ccc26aa43 100644
--- a/GUI/Views/PropertyEditor/ComponentTreeView.cpp
+++ b/GUI/Views/PropertyEditor/ComponentTreeView.cpp
@@ -18,7 +18,7 @@
#include "GUI/Views/PropertyEditor/ComponentTreeActions.h"
#include "GUI/Views/PropertyEditor/SessionModelDelegate.h"
#include "GUI/Widgets/Common/StyleUtils.h"
-#include "GUI/utils/CustomEventFilters.h"
+#include "GUI/Utils/CustomEventFilters.h"
#include <QBoxLayout>
#include <QStandardItemModel>
#include <QTreeView>
diff --git a/GUI/Views/PropertyEditor/CustomEditors.cpp b/GUI/Views/PropertyEditor/CustomEditors.cpp
index 3143b7d760a..b62b24b5a14 100644
--- a/GUI/Views/PropertyEditor/CustomEditors.cpp
+++ b/GUI/Views/PropertyEditor/CustomEditors.cpp
@@ -20,8 +20,8 @@
#include "GUI/Views/Main/ProjectManager.h"
#include "GUI/Views/MaterialEditor/MaterialEditorDialog.h"
#include "GUI/Widgets/Common/ScientificSpinBox.h"
-#include "GUI/utils/ComboProperty.h"
-#include "GUI/utils/CustomEventFilters.h"
+#include "GUI/Utils/ComboProperty.h"
+#include "GUI/Utils/CustomEventFilters.h"
#include <QApplication>
#include <QBoxLayout>
#include <QCheckBox>
diff --git a/GUI/Views/PropertyEditor/GroupInfoBox.cpp b/GUI/Views/PropertyEditor/GroupInfoBox.cpp
index 4174dc6d689..3356ee4a1d6 100644
--- a/GUI/Views/PropertyEditor/GroupInfoBox.cpp
+++ b/GUI/Views/PropertyEditor/GroupInfoBox.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/PropertyEditor/GroupInfoBox.h"
-#include "GUI/utils/hostosinfo.h"
+#include "GUI/Utils/hostosinfo.h"
#include <QApplication>
#include <QMouseEvent>
#include <QPainter>
diff --git a/GUI/Views/PropertyEditor/MultiComboPropertyEditor.cpp b/GUI/Views/PropertyEditor/MultiComboPropertyEditor.cpp
index bd3b6423dab..d03bcd7b371 100644
--- a/GUI/Views/PropertyEditor/MultiComboPropertyEditor.cpp
+++ b/GUI/Views/PropertyEditor/MultiComboPropertyEditor.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Views/PropertyEditor/MultiComboPropertyEditor.h"
-#include "GUI/utils/ComboProperty.h"
-#include "GUI/utils/CustomEventFilters.h"
+#include "GUI/Utils/ComboProperty.h"
+#include "GUI/Utils/CustomEventFilters.h"
#include <QComboBox>
#include <QEvent>
#include <QLineEdit>
diff --git a/GUI/Views/PropertyEditor/PropertyEditorFactory.cpp b/GUI/Views/PropertyEditor/PropertyEditorFactory.cpp
index a9e2c9ef69b..a80ba0b4d06 100644
--- a/GUI/Views/PropertyEditor/PropertyEditorFactory.cpp
+++ b/GUI/Views/PropertyEditor/PropertyEditorFactory.cpp
@@ -18,7 +18,7 @@
#include "GUI/Models/Session/SessionItem.h"
#include "GUI/Views/PropertyEditor/MultiComboPropertyEditor.h"
#include "GUI/Widgets/Common/ScientificSpinBox.h"
-#include "GUI/utils/ComboProperty.h"
+#include "GUI/Utils/ComboProperty.h"
#include <QLabel>
#include <QLineEdit>
#include <QSpinBox>
diff --git a/GUI/Views/PropertyEditor/SessionModelDelegate.cpp b/GUI/Views/PropertyEditor/SessionModelDelegate.cpp
index d333d11cf8c..442ef91e03b 100644
--- a/GUI/Views/PropertyEditor/SessionModelDelegate.cpp
+++ b/GUI/Views/PropertyEditor/SessionModelDelegate.cpp
@@ -16,7 +16,7 @@
#include "GUI/Models/Session/SessionItem.h"
#include "GUI/Views/PropertyEditor/CustomEditors.h"
#include "GUI/Views/PropertyEditor/PropertyEditorFactory.h"
-#include "GUI/utils/CustomEventFilters.h"
+#include "GUI/Utils/CustomEventFilters.h"
#include <QApplication>
SessionModelDelegate::SessionModelDelegate(QObject* parent) : QStyledItemDelegate(parent) {}
diff --git a/GUI/Views/RealSpaceWidgets/RealSpaceToolBar.cpp b/GUI/Views/RealSpaceWidgets/RealSpaceToolBar.cpp
index c5f461e853b..9287303a57c 100644
--- a/GUI/Views/RealSpaceWidgets/RealSpaceToolBar.cpp
+++ b/GUI/Views/RealSpaceWidgets/RealSpaceToolBar.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/RealSpaceWidgets/RealSpaceToolBar.h"
-#include "GUI/utils/mainwindow_constants.h"
+#include "GUI/Utils/mainwindow_constants.h"
#include <QCheckBox>
#include <QToolButton>
diff --git a/GUI/Views/SampleDesigner/ConnectableView.cpp b/GUI/Views/SampleDesigner/ConnectableView.cpp
index 6b8217956dd..224b2b9937b 100644
--- a/GUI/Views/SampleDesigner/ConnectableView.cpp
+++ b/GUI/Views/SampleDesigner/ConnectableView.cpp
@@ -17,7 +17,7 @@
#include "GUI/Views/SampleDesigner/NodeEditorConnection.h"
#include "GUI/Widgets/Common/DesignerHelper.h"
#include "GUI/Widgets/Common/StyleUtils.h"
-#include "GUI/utils/Error.h"
+#include "GUI/Utils/Error.h"
#include <QObject>
#include <QPainter>
#include <QStyleOptionGraphicsItem>
diff --git a/GUI/Views/SampleDesigner/ILayerView.cpp b/GUI/Views/SampleDesigner/ILayerView.cpp
index 1d507537ebf..0903a1c8874 100644
--- a/GUI/Views/SampleDesigner/ILayerView.cpp
+++ b/GUI/Views/SampleDesigner/ILayerView.cpp
@@ -18,7 +18,7 @@
#include "GUI/Views/SampleDesigner/DesignerScene.h"
#include "GUI/Views/SampleDesigner/MultiLayerView.h"
#include "GUI/Widgets/Common/DesignerHelper.h"
-#include "GUI/utils/Error.h"
+#include "GUI/Utils/Error.h"
#include <QGraphicsSceneMouseEvent>
QLineF MultiLayerCandidate::getInterfaceToScene()
diff --git a/GUI/Views/SampleDesigner/InterferenceForm.cpp b/GUI/Views/SampleDesigner/InterferenceForm.cpp
index 14b9bf131bd..b104d08efe8 100644
--- a/GUI/Views/SampleDesigner/InterferenceForm.cpp
+++ b/GUI/Views/SampleDesigner/InterferenceForm.cpp
@@ -19,7 +19,7 @@
#include "GUI/Views/SampleDesigner/GroupBoxCollapser.h"
#include "GUI/Views/SampleDesigner/SampleEditorController.h"
#include "GUI/Views/SampleDesigner/SelectionContainerForm.h"
-#include "GUI/utils/CustomEventFilters.h"
+#include "GUI/Utils/CustomEventFilters.h"
InterferenceForm::InterferenceForm(QWidget* parent, ParticleLayoutItem* layoutItem,
SampleEditorController* ec)
diff --git a/GUI/Views/SampleDesigner/LayerForm.cpp b/GUI/Views/SampleDesigner/LayerForm.cpp
index 36a833cd6cb..95da2e1e91c 100644
--- a/GUI/Views/SampleDesigner/LayerForm.cpp
+++ b/GUI/Views/SampleDesigner/LayerForm.cpp
@@ -20,7 +20,7 @@
#include "GUI/Views/SampleDesigner/MaterialInplaceForm.h"
#include "GUI/Views/SampleDesigner/ParticleLayoutForm.h"
#include "GUI/Views/SampleDesigner/WidgetMoverButton.h"
-#include "GUI/utils/ActionFactory.h"
+#include "GUI/Utils/ActionFactory.h"
#include <QLineEdit>
#include <QMenu>
diff --git a/GUI/Views/SampleDesigner/MaterialInplaceForm.cpp b/GUI/Views/SampleDesigner/MaterialInplaceForm.cpp
index 4be24ce18cb..12e7dd6d376 100644
--- a/GUI/Views/SampleDesigner/MaterialInplaceForm.cpp
+++ b/GUI/Views/SampleDesigner/MaterialInplaceForm.cpp
@@ -26,7 +26,7 @@
#include "GUI/Views/MaterialEditor/MaterialEditorDialog.h"
#include "GUI/Views/SampleDesigner/LayerEditorUtils.h"
#include "GUI/Views/SampleDesigner/SampleEditorController.h"
-#include "GUI/utils/LayoutUtils.h"
+#include "GUI/Utils/LayoutUtils.h"
#include <QGridLayout>
#include <QLabel>
diff --git a/GUI/Views/SampleDesigner/MesoCrystalForm.cpp b/GUI/Views/SampleDesigner/MesoCrystalForm.cpp
index 47a4a00c5fa..7e417ad23a9 100644
--- a/GUI/Views/SampleDesigner/MesoCrystalForm.cpp
+++ b/GUI/Views/SampleDesigner/MesoCrystalForm.cpp
@@ -19,7 +19,7 @@
#include "GUI/Models/Types/VectorDescriptor.h"
#include "GUI/Views/SampleDesigner/FormLayouter.h"
#include "GUI/Views/SampleDesigner/GroupBoxCollapser.h"
-#include "GUI/utils/ActionFactory.h"
+#include "GUI/Utils/ActionFactory.h"
#include <QAction>
diff --git a/GUI/Views/SampleDesigner/ParticleCompositionForm.cpp b/GUI/Views/SampleDesigner/ParticleCompositionForm.cpp
index 6b13368be1c..2075eb1ef13 100644
--- a/GUI/Views/SampleDesigner/ParticleCompositionForm.cpp
+++ b/GUI/Views/SampleDesigner/ParticleCompositionForm.cpp
@@ -18,7 +18,7 @@
#include "GUI/Views/SampleDesigner/FormLayouter.h"
#include "GUI/Views/SampleDesigner/GroupBoxCollapser.h"
#include "GUI/Views/SampleDesigner/LayerEditorUtils.h"
-#include "GUI/utils/ActionFactory.h"
+#include "GUI/Utils/ActionFactory.h"
#include <QAction>
#include <QPushButton>
diff --git a/GUI/Views/SampleDesigner/ParticleCoreShellForm.cpp b/GUI/Views/SampleDesigner/ParticleCoreShellForm.cpp
index 41a0a99a4b0..9c610fd734a 100644
--- a/GUI/Views/SampleDesigner/ParticleCoreShellForm.cpp
+++ b/GUI/Views/SampleDesigner/ParticleCoreShellForm.cpp
@@ -21,7 +21,7 @@
#include "GUI/Views/SampleDesigner/GroupBoxCollapser.h"
#include "GUI/Views/SampleDesigner/SampleEditorController.h"
#include "GUI/Views/SampleDesigner/SelectionContainerForm.h"
-#include "GUI/utils/ActionFactory.h"
+#include "GUI/Utils/ActionFactory.h"
#include <QAction>
#include <QComboBox>
diff --git a/GUI/Views/SampleDesigner/ParticleForm.cpp b/GUI/Views/SampleDesigner/ParticleForm.cpp
index 30a7a627802..de5a0fcbd69 100644
--- a/GUI/Views/SampleDesigner/ParticleForm.cpp
+++ b/GUI/Views/SampleDesigner/ParticleForm.cpp
@@ -19,7 +19,7 @@
#include "GUI/Views/SampleDesigner/FormLayouter.h"
#include "GUI/Views/SampleDesigner/GroupBoxCollapser.h"
#include "GUI/Views/SampleDesigner/MaterialInplaceForm.h"
-#include "GUI/utils/ActionFactory.h"
+#include "GUI/Utils/ActionFactory.h"
#include <QAction>
diff --git a/GUI/Views/SampleDesigner/ParticleLayoutForm.cpp b/GUI/Views/SampleDesigner/ParticleLayoutForm.cpp
index 2ce5411742e..0f9cf8595f6 100644
--- a/GUI/Views/SampleDesigner/ParticleLayoutForm.cpp
+++ b/GUI/Views/SampleDesigner/ParticleLayoutForm.cpp
@@ -20,7 +20,7 @@
#include "GUI/Views/SampleDesigner/LayerEditorUtils.h"
#include "GUI/Views/SampleDesigner/LayerForm.h"
#include "GUI/Views/SampleDesigner/SampleEditorController.h"
-#include "GUI/utils/ActionFactory.h"
+#include "GUI/Utils/ActionFactory.h"
#include <QAction>
#include <QPushButton>
diff --git a/GUI/Views/SampleDesigner/ParticleLayoutView.cpp b/GUI/Views/SampleDesigner/ParticleLayoutView.cpp
index a90d92e37df..868b76ad75c 100644
--- a/GUI/Views/SampleDesigner/ParticleLayoutView.cpp
+++ b/GUI/Views/SampleDesigner/ParticleLayoutView.cpp
@@ -16,7 +16,7 @@
#include "GUI/Models/Session/SessionItem.h"
#include "GUI/Views/SampleDesigner/ParticleView.h"
#include "GUI/Widgets/Common/DesignerHelper.h"
-#include "GUI/utils/Error.h"
+#include "GUI/Utils/Error.h"
ParticleLayoutView::ParticleLayoutView(QGraphicsItem* parent) : ConnectableView(parent)
{
diff --git a/GUI/Views/SampleDesigner/ParticleView.cpp b/GUI/Views/SampleDesigner/ParticleView.cpp
index 655ef1fd581..b8507e97cc9 100644
--- a/GUI/Views/SampleDesigner/ParticleView.cpp
+++ b/GUI/Views/SampleDesigner/ParticleView.cpp
@@ -18,7 +18,7 @@
#include "GUI/Models/Sample/ParticleItem.h"
#include "GUI/Widgets/Common/DesignerHelper.h"
#include "GUI/Widgets/Common/StyleUtils.h"
-#include "GUI/utils/Error.h"
+#include "GUI/Utils/Error.h"
#include <QObject>
#include <QPainter>
#include <QStyleOptionGraphicsItem>
diff --git a/GUI/Views/SampleDesigner/SampleListView.cpp b/GUI/Views/SampleDesigner/SampleListView.cpp
index edcb9a6c467..6cb05803479 100644
--- a/GUI/Views/SampleDesigner/SampleListView.cpp
+++ b/GUI/Views/SampleDesigner/SampleListView.cpp
@@ -19,7 +19,7 @@
#include "GUI/Models/Sample/SampleListModel.h"
#include "GUI/Models/State/SessionData.h"
#include "GUI/Widgets/Common/ItemViewOverlayButtons.h"
-#include "GUI/utils/ItemDelegateForHTML.h"
+#include "GUI/Utils/ItemDelegateForHTML.h"
#include <QAction>
#include <QDialog>
#include <QDialogButtonBox>
diff --git a/GUI/Views/SampleDesigner/SelectionContainerForm.h b/GUI/Views/SampleDesigner/SelectionContainerForm.h
index 0cac5e243f3..2e9448437ad 100644
--- a/GUI/Views/SampleDesigner/SelectionContainerForm.h
+++ b/GUI/Views/SampleDesigner/SelectionContainerForm.h
@@ -17,8 +17,8 @@
#include "GUI/Views/SampleDesigner/LayerEditorUtils.h"
#include "GUI/Views/SampleDesigner/SampleEditorController.h"
-#include "GUI/utils/CustomEventFilters.h"
-#include "GUI/utils/LayoutUtils.h"
+#include "GUI/Utils/CustomEventFilters.h"
+#include "GUI/Utils/LayoutUtils.h"
#include <QComboBox>
#include <QGridLayout>
diff --git a/GUI/Views/Toplevel/ImportDataView.cpp b/GUI/Views/Toplevel/ImportDataView.cpp
index 5c678a452bc..8706e61cedd 100644
--- a/GUI/Views/Toplevel/ImportDataView.cpp
+++ b/GUI/Views/Toplevel/ImportDataView.cpp
@@ -18,7 +18,7 @@
#include "GUI/Models/Project/ProjectDocument.h"
#include "GUI/Views/ImportDataWidgets/RealDataSelectorWidget.h"
#include "GUI/Views/Main/MainWindow.h"
-#include "GUI/utils/mainwindow_constants.h"
+#include "GUI/Utils/mainwindow_constants.h"
#include <QAction>
#include <QSplitter>
#include <QVBoxLayout>
diff --git a/GUI/Views/Toplevel/ProjectSettingsView.cpp b/GUI/Views/Toplevel/ProjectSettingsView.cpp
index c3c9dea5e49..18db990be59 100644
--- a/GUI/Views/Toplevel/ProjectSettingsView.cpp
+++ b/GUI/Views/Toplevel/ProjectSettingsView.cpp
@@ -19,7 +19,7 @@
#include "GUI/Models/Project/ProjectDocument.h"
#include "GUI/Models/Sample/SampleModel.h"
#include "GUI/Views/SampleDesigner/GroupBoxCollapser.h"
-#include "GUI/utils/qstringutils.h"
+#include "GUI/Utils/qstringutils.h"
#include "ui_ProjectSettingsView.h"
#include <QDir>
#include <QMessageBox>
diff --git a/GUI/Views/Toplevel/WelcomeView.cpp b/GUI/Views/Toplevel/WelcomeView.cpp
index 9e9f9c801bc..bc50160632c 100644
--- a/GUI/Views/Toplevel/WelcomeView.cpp
+++ b/GUI/Views/Toplevel/WelcomeView.cpp
@@ -15,8 +15,8 @@
#include "GUI/Views/Toplevel/WelcomeView.h"
#include "GUI/Views/Main/ProjectManager.h"
#include "GUI/Views/SampleDesigner/GroupBoxCollapser.h"
-#include "GUI/utils/LayoutUtils.h"
-#include "GUI/utils/qstringutils.h"
+#include "GUI/Utils/LayoutUtils.h"
+#include "GUI/Utils/qstringutils.h"
#include "ui_WelcomeView.h"
#include <QCommandLinkButton>
diff --git a/GUI/Widgets/Common/DocksController.cpp b/GUI/Widgets/Common/DocksController.cpp
index f31d7bd7415..49adaaab46a 100644
--- a/GUI/Widgets/Common/DocksController.cpp
+++ b/GUI/Widgets/Common/DocksController.cpp
@@ -14,7 +14,7 @@
#include "GUI/Widgets/Common/DocksController.h"
#include "Base/Utils/Assert.h"
-#include "GUI/utils/Error.h"
+#include "GUI/Utils/Error.h"
#include <QAbstractItemView>
#include <QAction>
#include <QDockWidget>
diff --git a/GUI/Widgets/Common/ItemSelectorWidget.cpp b/GUI/Widgets/Common/ItemSelectorWidget.cpp
index c927d29d897..1922496b4e6 100644
--- a/GUI/Widgets/Common/ItemSelectorWidget.cpp
+++ b/GUI/Widgets/Common/ItemSelectorWidget.cpp
@@ -15,7 +15,7 @@
#include "GUI/Widgets/Common/ItemSelectorWidget.h"
#include "GUI/Models/Session/SessionDecorationModel.h"
#include "GUI/Models/Session/SessionModel.h"
-#include "GUI/utils/mainwindow_constants.h"
+#include "GUI/Utils/mainwindow_constants.h"
#include <QListView>
#include <QVBoxLayout>
diff --git a/GUI/Widgets/Common/ItemStackWidget.cpp b/GUI/Widgets/Common/ItemStackWidget.cpp
index 9e53db2080f..41e1c5d132c 100644
--- a/GUI/Widgets/Common/ItemStackWidget.cpp
+++ b/GUI/Widgets/Common/ItemStackWidget.cpp
@@ -14,7 +14,7 @@
#include "GUI/Widgets/Common/ItemStackWidget.h"
#include "GUI/Models/Session/SessionModel.h"
-#include "GUI/utils/Error.h"
+#include "GUI/Utils/Error.h"
#include <QStackedWidget>
#include <QVBoxLayout>
diff --git a/GUI/Widgets/Common/ModelTreeView.cpp b/GUI/Widgets/Common/ModelTreeView.cpp
index 753a6b9640a..26a5d211130 100644
--- a/GUI/Widgets/Common/ModelTreeView.cpp
+++ b/GUI/Widgets/Common/ModelTreeView.cpp
@@ -16,7 +16,7 @@
#include "GUI/Models/Session/SessionDecorationModel.h"
#include "GUI/Models/Session/SessionModel.h"
#include "GUI/Widgets/Common/StyleUtils.h"
-#include "GUI/utils/Error.h"
+#include "GUI/Utils/Error.h"
#include <QTreeView>
#include <QVBoxLayout>
diff --git a/GUI/Widgets/Common/StyleUtils.cpp b/GUI/Widgets/Common/StyleUtils.cpp
index 39bfe5f8a68..95253d0b88c 100644
--- a/GUI/Widgets/Common/StyleUtils.cpp
+++ b/GUI/Widgets/Common/StyleUtils.cpp
@@ -16,7 +16,7 @@
#include "Base/Utils/Assert.h"
#include "GUI/Widgets/Common/DesignerHelper.h"
#include "GUI/Widgets/Common/detailswidget.h"
-#include "GUI/utils/hostosinfo.h"
+#include "GUI/Utils/hostosinfo.h"
#include <QApplication>
#include <QBoxLayout>
#include <QDialog>
diff --git a/GUI/Widgets/Common/detailsbutton.cpp b/GUI/Widgets/Common/detailsbutton.cpp
index 90408e29563..e2ecff26f7e 100644
--- a/GUI/Widgets/Common/detailsbutton.cpp
+++ b/GUI/Widgets/Common/detailsbutton.cpp
@@ -24,7 +24,7 @@
****************************************************************************/
#include "GUI/Widgets/Common/detailsbutton.h"
-#include "GUI/utils/hostosinfo.h"
+#include "GUI/Utils/hostosinfo.h"
#include <QGraphicsOpacityEffect>
#include <QPaintEvent>
diff --git a/GUI/Widgets/Common/detailswidget.cpp b/GUI/Widgets/Common/detailswidget.cpp
index 233ae82c9ac..23f7565a052 100644
--- a/GUI/Widgets/Common/detailswidget.cpp
+++ b/GUI/Widgets/Common/detailswidget.cpp
@@ -25,7 +25,7 @@
#include "GUI/Widgets/Common/detailswidget.h"
#include "GUI/Widgets/Common/detailsbutton.h"
-#include "GUI/utils/hostosinfo.h"
+#include "GUI/Utils/hostosinfo.h"
#include <QApplication>
#include <QCheckBox>
diff --git a/GUI/Widgets/Info/ProjectLoadProblemDialog.cpp b/GUI/Widgets/Info/ProjectLoadProblemDialog.cpp
index 033ce63c8a3..81942bd1b90 100644
--- a/GUI/Widgets/Info/ProjectLoadProblemDialog.cpp
+++ b/GUI/Widgets/Info/ProjectLoadProblemDialog.cpp
@@ -14,7 +14,7 @@
#include "GUI/Widgets/Info/ProjectLoadProblemDialog.h"
#include "GUI/Widgets/Common/DesignerHelper.h"
-#include "GUI/utils/Helpers.h"
+#include "GUI/Utils/Helpers.h"
#include <QBoxLayout>
#include <QGridLayout>
#include <QLabel>
diff --git a/Tests/Unit/GUI/Comparators.cpp b/Tests/Unit/GUI/Comparators.cpp
index c66d8940df9..ac5ea141a22 100644
--- a/Tests/Unit/GUI/Comparators.cpp
+++ b/Tests/Unit/GUI/Comparators.cpp
@@ -1,5 +1,5 @@
#include "Tests/Unit/GUI/Comparators.h"
-#include "GUI/utils/ComboProperty.h"
+#include "GUI/Utils/ComboProperty.h"
#include <QMetaType>
bool Comparators::m_is_registered = false;
diff --git a/Tests/Unit/GUI/TestAxesItems.cpp b/Tests/Unit/GUI/TestAxesItems.cpp
index 60864ba8040..95c6872f97f 100644
--- a/Tests/Unit/GUI/TestAxesItems.cpp
+++ b/Tests/Unit/GUI/TestAxesItems.cpp
@@ -4,7 +4,7 @@
#include "GUI/Models/Data/AxesItems.h"
#include "GUI/Models/Domain/TransformFromDomain.h"
#include "GUI/Models/Parameter/PropertyItem.h"
-#include "GUI/utils/Error.h"
+#include "GUI/Utils/Error.h"
#include "Tests/GTestWrapper/google_test.h"
class TestAxesItems : public ::testing::Test {
diff --git a/Tests/Unit/GUI/TestComboProperty.cpp b/Tests/Unit/GUI/TestComboProperty.cpp
index 6f525d18551..69441b9d3d0 100644
--- a/Tests/Unit/GUI/TestComboProperty.cpp
+++ b/Tests/Unit/GUI/TestComboProperty.cpp
@@ -1,4 +1,4 @@
-#include "GUI/utils/ComboProperty.h"
+#include "GUI/Utils/ComboProperty.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Tests/Unit/GUI/Comparators.h"
#include "Tests/Unit/GUI/Utils.h"
diff --git a/Tests/Unit/GUI/TestComponentProxyModel.cpp b/Tests/Unit/GUI/TestComponentProxyModel.cpp
index e6a5fb3828a..a4b018e2613 100644
--- a/Tests/Unit/GUI/TestComponentProxyModel.cpp
+++ b/Tests/Unit/GUI/TestComponentProxyModel.cpp
@@ -9,7 +9,7 @@
#include "GUI/Models/Sample/ParticleLayoutItem.h"
#include "GUI/Models/Session/SessionModel.h"
#include "GUI/Models/Types/VectorItem.h"
-#include "GUI/utils/ComboProperty.h"
+#include "GUI/Utils/ComboProperty.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Tests/Unit/GUI/Utils.h"
#include <QSignalSpy>
diff --git a/Tests/Unit/GUI/TestDataItemViews.cpp b/Tests/Unit/GUI/TestDataItemViews.cpp
index ef462212c7a..3ab9c4b7bac 100644
--- a/Tests/Unit/GUI/TestDataItemViews.cpp
+++ b/Tests/Unit/GUI/TestDataItemViews.cpp
@@ -5,9 +5,9 @@
#include "GUI/Models/Data/RealDataModel.h"
#include "GUI/Models/Data/SpecularDataItem.h"
#include "GUI/Models/Project/ProjectDocument.h"
-#include "GUI/utils/ComboProperty.h"
-#include "GUI/utils/Error.h"
-#include "GUI/utils/MessageService.h"
+#include "GUI/Utils/ComboProperty.h"
+#include "GUI/Utils/Error.h"
+#include "GUI/Utils/MessageService.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Tests/Unit/GUI/Utils.h"
diff --git a/Tests/Unit/GUI/TestDetectorItems.cpp b/Tests/Unit/GUI/TestDetectorItems.cpp
index 511c8b35d02..3d25a8077c3 100644
--- a/Tests/Unit/GUI/TestDetectorItems.cpp
+++ b/Tests/Unit/GUI/TestDetectorItems.cpp
@@ -7,7 +7,7 @@
#include "GUI/Models/Instrument/RectangularDetectorItem.h"
#include "GUI/Models/Sample/ResolutionFunctionItems.h"
#include "GUI/Models/Types/VectorItem.h"
-#include "GUI/utils/ComboProperty.h"
+#include "GUI/Utils/ComboProperty.h"
#include "Tests/GTestWrapper/google_test.h"
class TestDetectorItems : public ::testing::Test {
diff --git a/Tests/Unit/GUI/TestGroupItem.cpp b/Tests/Unit/GUI/TestGroupItem.cpp
index 6f41178dd0e..042d8a76318 100644
--- a/Tests/Unit/GUI/TestGroupItem.cpp
+++ b/Tests/Unit/GUI/TestGroupItem.cpp
@@ -3,8 +3,8 @@
#include "GUI/Models/Sample/FormFactorItems.h"
#include "GUI/Models/Session/SessionItemUtils.h"
#include "GUI/Models/Session/SessionModel.h"
-#include "GUI/utils/ComboProperty.h"
-#include "GUI/utils/Error.h"
+#include "GUI/Utils/ComboProperty.h"
+#include "GUI/Utils/Error.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Tests/Unit/GUI/Utils.h"
diff --git a/Tests/Unit/GUI/TestHelpers.cpp b/Tests/Unit/GUI/TestHelpers.cpp
index dd5aeabb2ad..f79f889e7f4 100644
--- a/Tests/Unit/GUI/TestHelpers.cpp
+++ b/Tests/Unit/GUI/TestHelpers.cpp
@@ -1,4 +1,4 @@
-#include "GUI/utils/Helpers.h"
+#include "GUI/Utils/Helpers.h"
#include "Tests/GTestWrapper/google_test.h"
class TestHelpers : public ::testing::Test {
diff --git a/Tests/Unit/GUI/TestMapperCases.cpp b/Tests/Unit/GUI/TestMapperCases.cpp
index d6bf3238a95..fe727eef7d5 100644
--- a/Tests/Unit/GUI/TestMapperCases.cpp
+++ b/Tests/Unit/GUI/TestMapperCases.cpp
@@ -7,7 +7,7 @@
#include "GUI/Models/Sample/SampleModel.h"
#include "GUI/Models/Session/SessionItemUtils.h"
#include "GUI/Models/Session/SimulationOptionsItem.h"
-#include "GUI/utils/ComboProperty.h"
+#include "GUI/Utils/ComboProperty.h"
#include "Tests/GTestWrapper/google_test.h"
#include <QtTest>
diff --git a/Tests/Unit/GUI/TestMessageService.cpp b/Tests/Unit/GUI/TestMessageService.cpp
index 7ecd70d33ac..04048bb5626 100644
--- a/Tests/Unit/GUI/TestMessageService.cpp
+++ b/Tests/Unit/GUI/TestMessageService.cpp
@@ -1,4 +1,4 @@
-#include "GUI/utils/MessageService.h"
+#include "GUI/Utils/MessageService.h"
#include "Tests/GTestWrapper/google_test.h"
#include <QObject>
#include <QString>
diff --git a/Tests/Unit/GUI/TestOutputDataIOService.cpp b/Tests/Unit/GUI/TestOutputDataIOService.cpp
index 414070e3fe1..e6d3272af61 100644
--- a/Tests/Unit/GUI/TestOutputDataIOService.cpp
+++ b/Tests/Unit/GUI/TestOutputDataIOService.cpp
@@ -11,8 +11,8 @@
#include "GUI/Models/Job/JobModelFunctions.h"
#include "GUI/Models/Project/OutputDataIOService.h"
#include "GUI/Models/Project/ProjectUtils.h"
-#include "GUI/utils/Error.h"
-#include "GUI/utils/Helpers.h"
+#include "GUI/Utils/Error.h"
+#include "GUI/Utils/Helpers.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Tests/Unit/GUI/Utils.h"
#include <QTest>
diff --git a/Tests/Unit/GUI/TestProjectDocument.cpp b/Tests/Unit/GUI/TestProjectDocument.cpp
index e4741869740..073c9fd86a9 100644
--- a/Tests/Unit/GUI/TestProjectDocument.cpp
+++ b/Tests/Unit/GUI/TestProjectDocument.cpp
@@ -7,7 +7,7 @@
#include "GUI/Models/Job/JobItemUtils.h"
#include "GUI/Models/Project/ProjectDocument.h"
#include "GUI/Models/Project/ProjectUtils.h"
-#include "GUI/utils/Helpers.h"
+#include "GUI/Utils/Helpers.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Tests/Unit/GUI/Utils.h"
#include <QFileInfo>
diff --git a/Tests/Unit/GUI/TestProjectUtils.cpp b/Tests/Unit/GUI/TestProjectUtils.cpp
index 91706f3ebc2..69cf7f14e56 100644
--- a/Tests/Unit/GUI/TestProjectUtils.cpp
+++ b/Tests/Unit/GUI/TestProjectUtils.cpp
@@ -1,6 +1,6 @@
#include "GUI/Models/Project/ProjectUtils.h"
-#include "GUI/utils/Error.h"
-#include "GUI/utils/ItemFileNameUtils.h"
+#include "GUI/Utils/Error.h"
+#include "GUI/Utils/ItemFileNameUtils.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Utils.h"
#include <QDir>
diff --git a/Tests/Unit/GUI/TestSaveService.cpp b/Tests/Unit/GUI/TestSaveService.cpp
index a196a85c381..cde1d026c21 100644
--- a/Tests/Unit/GUI/TestSaveService.cpp
+++ b/Tests/Unit/GUI/TestSaveService.cpp
@@ -9,8 +9,8 @@
#include "GUI/Models/Project/ProjectUtils.h"
#include "GUI/Views/Main/AutosaveController.h"
#include "GUI/Views/Main/SaveService.h"
-#include "GUI/utils/Error.h"
-#include "GUI/utils/Helpers.h"
+#include "GUI/Utils/Error.h"
+#include "GUI/Utils/Helpers.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Tests/Unit/GUI/Utils.h"
#include <QSignalSpy>
diff --git a/Tests/Unit/GUI/TestSavingSpecularData.cpp b/Tests/Unit/GUI/TestSavingSpecularData.cpp
index 69f1c2d86b3..163fe6d1b0c 100644
--- a/Tests/Unit/GUI/TestSavingSpecularData.cpp
+++ b/Tests/Unit/GUI/TestSavingSpecularData.cpp
@@ -13,8 +13,8 @@
#include "GUI/Models/Job/JobModelFunctions.h"
#include "GUI/Models/Project/OutputDataIOService.h"
#include "GUI/Models/Project/ProjectUtils.h"
-#include "GUI/utils/Error.h"
-#include "GUI/utils/ItemFileNameUtils.h"
+#include "GUI/Utils/Error.h"
+#include "GUI/Utils/ItemFileNameUtils.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Tests/Unit/GUI/Utils.h"
#include <QTest>
diff --git a/Tests/Unit/GUI/TestSessionItemTags.cpp b/Tests/Unit/GUI/TestSessionItemTags.cpp
index 59150426fa8..1accad0f643 100644
--- a/Tests/Unit/GUI/TestSessionItemTags.cpp
+++ b/Tests/Unit/GUI/TestSessionItemTags.cpp
@@ -1,7 +1,7 @@
#include "GUI/Models/Sample/LayerItem.h"
#include "GUI/Models/Sample/ParticleItem.h"
#include "GUI/Models/Session/SessionItemTags.h"
-#include "GUI/utils/Error.h"
+#include "GUI/Utils/Error.h"
#include "Tests/GTestWrapper/google_test.h"
class TestSessionItemTags : public ::testing::Test {
diff --git a/Tests/Unit/GUI/TestSessionItemUtils.cpp b/Tests/Unit/GUI/TestSessionItemUtils.cpp
index 5ce57bc7fd3..d5b824cc11e 100644
--- a/Tests/Unit/GUI/TestSessionItemUtils.cpp
+++ b/Tests/Unit/GUI/TestSessionItemUtils.cpp
@@ -2,7 +2,7 @@
#include "GUI/Models/Session/SessionItemUtils.h"
#include "GUI/Models/Session/SessionModel.h"
#include "GUI/Models/Types/VectorItem.h"
-#include "GUI/utils/ComboProperty.h"
+#include "GUI/Utils/ComboProperty.h"
#include "Tests/GTestWrapper/google_test.h"
class TestSessionItemUtils : public ::testing::Test {
diff --git a/Tests/Unit/GUI/Utils.cpp b/Tests/Unit/GUI/Utils.cpp
index e881923d9b4..6f0c735c969 100644
--- a/Tests/Unit/GUI/Utils.cpp
+++ b/Tests/Unit/GUI/Utils.cpp
@@ -19,7 +19,7 @@
#include "GUI/Models/Data/RealDataItem.h"
#include "GUI/Models/Project/ProjectUtils.h"
#include "GUI/Models/Session/SessionModel.h"
-#include "GUI/utils/Error.h"
+#include "GUI/Utils/Error.h"
#include <QDir>
namespace {
--
GitLab