diff --git a/GUI/Model/Axis/AmplitudeAxisItem.cpp b/GUI/Model/Axis/AmplitudeAxisItem.cpp
index f60f0390ffeb4223fcb7750085ed74c824db504b..011b294319fac1d41b424bc4ee7675111ee19152 100644
--- a/GUI/Model/Axis/AmplitudeAxisItem.cpp
+++ b/GUI/Model/Axis/AmplitudeAxisItem.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Model/Axis/AmplitudeAxisItem.h"
-#include "GUI/Support/XML/UtilXML.h"
+#include "GUI/Model/Util/UtilXML.h"
 
 namespace {
 namespace Tag {
diff --git a/GUI/Model/Axis/BasicAxisItem.cpp b/GUI/Model/Axis/BasicAxisItem.cpp
index 1b66e5f8710d26d391f9800a9a7d26d0a6b13f6f..d9b020bddcbdc9dcbabf41b92b8ce549c7ef82b3 100644
--- a/GUI/Model/Axis/BasicAxisItem.cpp
+++ b/GUI/Model/Axis/BasicAxisItem.cpp
@@ -16,7 +16,7 @@
 #include "Base/Axis/MakeScale.h"
 #include "Base/Axis/Scale.h"
 #include "Base/Const/Units.h"
-#include "GUI/Support/XML/UtilXML.h"
+#include "GUI/Model/Util/UtilXML.h"
 
 namespace {
 namespace Tag {
diff --git a/GUI/Model/Axis/PointwiseAxisItem.cpp b/GUI/Model/Axis/PointwiseAxisItem.cpp
index d50e51ea6d130cd4e655f4ac460ef3c926d124d1..2eef88541f4453126591959e095cbc50b5877209 100644
--- a/GUI/Model/Axis/PointwiseAxisItem.cpp
+++ b/GUI/Model/Axis/PointwiseAxisItem.cpp
@@ -19,7 +19,7 @@
 #include "Base/Const/Units.h"
 #include "Device/Data/Datafield.h"
 #include "Device/IO/ReadWriteINT.h"
-#include "GUI/Support/XML/UtilXML.h"
+#include "GUI/Model/Util/UtilXML.h"
 #include <sstream>
 
 namespace {
diff --git a/GUI/Model/Beam/FootprintItems.cpp b/GUI/Model/Beam/FootprintItems.cpp
index 8af3d79d34702220958d93ffda73690e676909c2..7b0c848fc7631ece9a57c84b57fc5363abdd3951 100644
--- a/GUI/Model/Beam/FootprintItems.cpp
+++ b/GUI/Model/Beam/FootprintItems.cpp
@@ -15,7 +15,7 @@
 #include "GUI/Model/Beam/FootprintItems.h"
 #include "Device/Beam/FootprintGauss.h"
 #include "Device/Beam/FootprintSquare.h"
-#include "GUI/Support/XML/UtilXML.h"
+#include "GUI/Model/Util/UtilXML.h"
 
 namespace {
 namespace Tag {
diff --git a/GUI/Model/Data/Data1DItem.cpp b/GUI/Model/Data/Data1DItem.cpp
index a14690c21ed6bed15ba98f29720a4f30c4975deb..e0ff6a0fdea35e4d56f6550c6e3429441943b572 100644
--- a/GUI/Model/Data/Data1DItem.cpp
+++ b/GUI/Model/Data/Data1DItem.cpp
@@ -19,7 +19,7 @@
 #include "Device/Data/Datafield.h"
 #include "GUI/Model/Axis/AmplitudeAxisItem.h"
 #include "GUI/Model/Axis/BasicAxisItem.h"
-#include "GUI/Support/XML/UtilXML.h"
+#include "GUI/Model/Util/UtilXML.h"
 
 namespace {
 namespace Tag {
diff --git a/GUI/Model/Data/Data2DItem.cpp b/GUI/Model/Data/Data2DItem.cpp
index df00526a0f8a0f1b24a54d9433bec1e0fa41af3f..ac7d938f13d3137e746ab767dd44a7769db89780 100644
--- a/GUI/Model/Data/Data2DItem.cpp
+++ b/GUI/Model/Data/Data2DItem.cpp
@@ -21,7 +21,7 @@
 #include "GUI/Model/Axis/BasicAxisItem.h"
 #include "GUI/Model/Mask/MasksQModel.h"
 #include "GUI/Model/Mask/MasksSet.h"
-#include "GUI/Support/XML/UtilXML.h"
+#include "GUI/Model/Util/UtilXML.h"
 
 namespace {
 
diff --git a/GUI/Model/Data/DataItem.cpp b/GUI/Model/Data/DataItem.cpp
index fabee74077b9b75761b7b242e4362ea08888bba9..557d1015a5f967d8f12c1e6d5c75516e5a449405 100644
--- a/GUI/Model/Data/DataItem.cpp
+++ b/GUI/Model/Data/DataItem.cpp
@@ -19,7 +19,7 @@
 #include "Device/IO/IOFactory.h"
 #include "GUI/Model/Axis/AmplitudeAxisItem.h"
 #include "GUI/Model/Axis/BasicAxisItem.h"
-#include "GUI/Support/XML/UtilXML.h"
+#include "GUI/Model/Util/UtilXML.h"
 #include <QFile>
 #include <utility>
 
diff --git a/GUI/Model/Descriptor/AxisProperty.cpp b/GUI/Model/Descriptor/AxisProperty.cpp
index ad3328b5e5f5a107b2fb587e6921c872b4e9678b..5184ce354964fb2858ba45f0df9bc07f82c577f2 100644
--- a/GUI/Model/Descriptor/AxisProperty.cpp
+++ b/GUI/Model/Descriptor/AxisProperty.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/Model/Descriptor/AxisProperty.h"
 #include "Base/Axis/Scale.h"
-#include "GUI/Support/XML/UtilXML.h"
+#include "GUI/Model/Util/UtilXML.h"
 
 namespace {
 namespace Tag {
diff --git a/GUI/Model/Descriptor/DistributionItems.cpp b/GUI/Model/Descriptor/DistributionItems.cpp
index b4f86d4bceedebba83815196a452a800ed8750c5..e2f036473bd11c2ff08e5ddbe0d94b411db6cbde 100644
--- a/GUI/Model/Descriptor/DistributionItems.cpp
+++ b/GUI/Model/Descriptor/DistributionItems.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Model/Descriptor/DistributionItems.h"
-#include "GUI/Support/XML/UtilXML.h"
+#include "GUI/Model/Util/UtilXML.h"
 #include "Param/Distrib/Distributions.h"
 
 namespace {
diff --git a/GUI/Model/Descriptor/DoubleProperty.cpp b/GUI/Model/Descriptor/DoubleProperty.cpp
index 8d10195a5da1f3f7e761c6c8d61ce89298dab875..3d5b9ad4ec28f8d984aac389d81bfc973d12f184 100644
--- a/GUI/Model/Descriptor/DoubleProperty.cpp
+++ b/GUI/Model/Descriptor/DoubleProperty.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Model/Descriptor/DoubleProperty.h"
-#include "GUI/Support/XML/UtilXML.h"
+#include "GUI/Model/Util/UtilXML.h"
 #include <QUuid>
 
 void DoubleProperty::init(const QString& label, const QString& tooltip, double value,
diff --git a/GUI/Model/Descriptor/PolyItem.h b/GUI/Model/Descriptor/PolyItem.h
index fe8ea9e6fb0013c3a38d17f8bb598f0827b31d17..198ec35ed3c13d837aff8e9c48369adf427efcfe 100644
--- a/GUI/Model/Descriptor/PolyItem.h
+++ b/GUI/Model/Descriptor/PolyItem.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_GUI_MODEL_DESCRIPTOR_POLYITEM_H
 #define BORNAGAIN_GUI_MODEL_DESCRIPTOR_POLYITEM_H
 
-#include "GUI/Support/XML/UtilXML.h"
+#include "GUI/Model/Util/UtilXML.h"
 
 //! Holds a polymorphous item. Possible types of the item are specified by a Catalog.
 
diff --git a/GUI/Model/Descriptor/SpanProperty.cpp b/GUI/Model/Descriptor/SpanProperty.cpp
index 0a2a98a7b3565d538e6fcdbc78ab44ba0daa8093..8bcff98e1611659ebcb307a7c2693ad1d4c1904b 100644
--- a/GUI/Model/Descriptor/SpanProperty.cpp
+++ b/GUI/Model/Descriptor/SpanProperty.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Model/Descriptor/SpanProperty.h"
-#include "GUI/Support/XML/UtilXML.h"
+#include "GUI/Model/Util/UtilXML.h"
 
 namespace {
 namespace Tag {
diff --git a/GUI/Model/Descriptor/VectorProperty.cpp b/GUI/Model/Descriptor/VectorProperty.cpp
index fadc1e541c57e21a6b78e105f875b7e6d4430c97..64702e9f0e714294a3f1aeb9bff470b78e41d1d8 100644
--- a/GUI/Model/Descriptor/VectorProperty.cpp
+++ b/GUI/Model/Descriptor/VectorProperty.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Model/Descriptor/VectorProperty.h"
-#include "GUI/Support/XML/UtilXML.h"
+#include "GUI/Model/Util/UtilXML.h"
 #include <QUuid>
 
 namespace {
diff --git a/GUI/Model/Detector/OffspecDetectorItem.cpp b/GUI/Model/Detector/OffspecDetectorItem.cpp
index 32192a0a970fd2e6cfeed34724eab53d014b6c28..72181cdc8704f827fe7906fa9e69ae9001ca4a3b 100644
--- a/GUI/Model/Detector/OffspecDetectorItem.cpp
+++ b/GUI/Model/Detector/OffspecDetectorItem.cpp
@@ -15,7 +15,7 @@
 #include "GUI/Model/Detector/OffspecDetectorItem.h"
 #include "Base/Const/Units.h"
 #include "Device/Detector/OffspecDetector.h"
-#include "GUI/Support/XML/UtilXML.h"
+#include "GUI/Model/Util/UtilXML.h"
 
 namespace {
 namespace Tag {
diff --git a/GUI/Model/Detector/ResolutionFunctionItems.cpp b/GUI/Model/Detector/ResolutionFunctionItems.cpp
index 58a95f45cf28d22199a242f40cbe370dafa1af6a..c05963a141a36fed1a8ee6099ee384acf1f0d4e4 100644
--- a/GUI/Model/Detector/ResolutionFunctionItems.cpp
+++ b/GUI/Model/Detector/ResolutionFunctionItems.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/Model/Detector/ResolutionFunctionItems.h"
 #include "Device/Resolution/ResolutionFunction2DGaussian.h"
-#include "GUI/Support/XML/UtilXML.h"
+#include "GUI/Model/Util/UtilXML.h"
 
 namespace {
 namespace Tag {
diff --git a/GUI/Model/Device/BackgroundItems.cpp b/GUI/Model/Device/BackgroundItems.cpp
index b0748bf9761d310eb1c178b650ebdd21ae2f68d2..0550fd5704ceb4a7bb0ae8b91e07d38788bfebd4 100644
--- a/GUI/Model/Device/BackgroundItems.cpp
+++ b/GUI/Model/Device/BackgroundItems.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Model/Device/BackgroundItems.h"
-#include "GUI/Support/XML/UtilXML.h"
+#include "GUI/Model/Util/UtilXML.h"
 #include "Sim/Background/ConstantBackground.h"
 #include "Sim/Background/PoissonBackground.h"
 
diff --git a/GUI/Model/Device/InstrumentXML.cpp b/GUI/Model/Device/InstrumentXML.cpp
index 93e6c3e2c047b95ed68ea14c1e7279b4621c0022..509b988f260ce5dbe5b48634ea5a351ebfacc980 100644
--- a/GUI/Model/Device/InstrumentXML.cpp
+++ b/GUI/Model/Device/InstrumentXML.cpp
@@ -17,7 +17,7 @@
 #include "GUI/Model/Descriptor/PolyItem.h"
 #include "GUI/Model/Device/InstrumentItems.h"
 #include "GUI/Model/Device/InstrumentsCatalog.h"
-#include "GUI/Support/XML/UtilXML.h"
+#include "GUI/Model/Util/UtilXML.h"
 #include <QFile>
 
 namespace {
diff --git a/GUI/Model/File/DatafileItem.cpp b/GUI/Model/File/DatafileItem.cpp
index 952bba9f99dc15886d109dcf6f95127b37e3a2bf..3e6785c465fdce8b107078ee40a290aa9c9aca85 100644
--- a/GUI/Model/File/DatafileItem.cpp
+++ b/GUI/Model/File/DatafileItem.cpp
@@ -22,7 +22,7 @@
 #include "GUI/Model/Data/Data2DItem.h"
 #include "GUI/Model/Util/Backup.h"
 #include "GUI/Model/Util/Path.h"
-#include "GUI/Support/XML/UtilXML.h"
+#include "GUI/Model/Util/UtilXML.h"
 
 namespace {
 namespace Tag {
diff --git a/GUI/Model/File/DatafilesSet.cpp b/GUI/Model/File/DatafilesSet.cpp
index 10df52d95f3163eba5b1f672229a96129bccfa73..2e2dbe6ee4d6739a5bc6ebc99c040f30424c4487 100644
--- a/GUI/Model/File/DatafilesSet.cpp
+++ b/GUI/Model/File/DatafilesSet.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/Model/File/DatafilesSet.h"
 #include "Base/Util/Assert.h"
-#include "GUI/Support/XML/UtilXML.h"
+#include "GUI/Model/Util/UtilXML.h"
 
 namespace {
 namespace Tag {
diff --git a/GUI/Model/Job/BatchInfo.cpp b/GUI/Model/Job/BatchInfo.cpp
index 429919421a256b2fac222fb5974d1c846ed4bf75..e03679029903901f73b55a57795f87a6c91c9d43 100644
--- a/GUI/Model/Job/BatchInfo.cpp
+++ b/GUI/Model/Job/BatchInfo.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/Model/Job/BatchInfo.h"
 #include "GUI/Model/Job/JobStatus.h"
-#include "GUI/Support/XML/UtilXML.h"
+#include "GUI/Model/Util/UtilXML.h"
 
 namespace {
 namespace Tag {
diff --git a/GUI/Model/Mask/MasksSet.cpp b/GUI/Model/Mask/MasksSet.cpp
index be81f1f132c327e79e82dfe740513d90d770b7c4..d417d7a35f5717dd9fbee65a0bdabc908aa81f1f 100644
--- a/GUI/Model/Mask/MasksSet.cpp
+++ b/GUI/Model/Mask/MasksSet.cpp
@@ -15,7 +15,7 @@
 #include "GUI/Model/Mask/MasksSet.h"
 #include "GUI/Model/Descriptor/PolyItem.h"
 #include "GUI/Model/Mask/MasksCatalog.h"
-#include "GUI/Support/XML/UtilXML.h"
+#include "GUI/Model/Util/UtilXML.h"
 #include <QRegularExpression>
 
 namespace {
diff --git a/GUI/Model/Material/MaterialItem.cpp b/GUI/Model/Material/MaterialItem.cpp
index a5996d227a5769c71a9ca06ceea5ac86f76e295e..3d33d20b92a351dd775149848e04ce71a0291f13 100644
--- a/GUI/Model/Material/MaterialItem.cpp
+++ b/GUI/Model/Material/MaterialItem.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/Model/Material/MaterialItem.h"
 #include "Base/Util/Assert.h"
-#include "GUI/Support/XML/UtilXML.h"
+#include "GUI/Model/Util/UtilXML.h"
 #include "Sample/Material/MaterialFactoryFuncs.h"
 #include <QUuid>
 
diff --git a/GUI/Model/Material/MaterialsSet.cpp b/GUI/Model/Material/MaterialsSet.cpp
index eb1668bc0bf37e77628189c54a4e458f347e2376..81d458198d0592ff4de9544d3e5a9aefa77bb279 100644
--- a/GUI/Model/Material/MaterialsSet.cpp
+++ b/GUI/Model/Material/MaterialsSet.cpp
@@ -15,7 +15,7 @@
 #include "GUI/Model/Material/MaterialsSet.h"
 #include "Base/Util/Assert.h"
 #include "GUI/Model/Material/MaterialItem.h"
-#include "GUI/Support/XML/UtilXML.h"
+#include "GUI/Model/Util/UtilXML.h"
 #include <QColor>
 #include <QUuid>
 #include <random>
diff --git a/GUI/Model/Mini/MinimizerItem.cpp b/GUI/Model/Mini/MinimizerItem.cpp
index 8fb5253b7313147699aa8626ef6dafc7d8a82289..5b9813e7b0e9746a6dde2a65e26cb92464b070eb 100644
--- a/GUI/Model/Mini/MinimizerItem.cpp
+++ b/GUI/Model/Mini/MinimizerItem.cpp
@@ -20,7 +20,7 @@
 #include "Fit/Suite/SimAnMinimizer.h"
 #include "GUI/Model/Mini/MinimizerItemCatalog.h"
 #include "GUI/Model/Mini/MinimizerItems.h"
-#include "GUI/Support/XML/UtilXML.h"
+#include "GUI/Model/Util/UtilXML.h"
 #include "Sim/Fitting/ObjectiveMetric.h"
 #include "Sim/Fitting/ObjectiveMetricUtil.h"
 
diff --git a/GUI/Model/Par/ParameterBackup.cpp b/GUI/Model/Par/ParameterBackup.cpp
index 86254cee12d1a70ba902a54e618d1971c0c5243c..aa6916f7d5b79660d3e10eb9ba27aa4eb9386883 100644
--- a/GUI/Model/Par/ParameterBackup.cpp
+++ b/GUI/Model/Par/ParameterBackup.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Model/Par/ParameterBackup.h"
-#include "GUI/Support/XML/UtilXML.h"
+#include "GUI/Model/Util/UtilXML.h"
 #include <utility>
 
 namespace {
diff --git a/GUI/Model/Par/ParameterTreeItems.cpp b/GUI/Model/Par/ParameterTreeItems.cpp
index c9b9d6e29215d498b97c8f3de89ce8acbc6d81cd..b9cd0eb742670443c1769ee2719d7137dc947189 100644
--- a/GUI/Model/Par/ParameterTreeItems.cpp
+++ b/GUI/Model/Par/ParameterTreeItems.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/Model/Par/ParameterTreeItems.h"
 #include "Base/Util/Assert.h"
-#include "GUI/Support/XML/UtilXML.h"
+#include "GUI/Model/Util/UtilXML.h"
 #include <memory>
 #include <utility>
 
diff --git a/GUI/Model/Project/ProjectDocument.cpp b/GUI/Model/Project/ProjectDocument.cpp
index 937ed176888e78393105ab1057952eaff483041a..e369e032e0d0e78849258e0d6c235be0826afa00 100644
--- a/GUI/Model/Project/ProjectDocument.cpp
+++ b/GUI/Model/Project/ProjectDocument.cpp
@@ -25,7 +25,7 @@
 #include "GUI/Model/Sample/SamplesSet.h"
 #include "GUI/Model/Type/SimulationOptionsItem.h"
 #include "GUI/Model/Util/Path.h"
-#include "GUI/Support/XML/UtilXML.h"
+#include "GUI/Model/Util/UtilXML.h"
 #include <QFile>
 
 BA_GUI_API_ std::unique_ptr<ProjectDocument> gDoc;
diff --git a/GUI/Model/Sample/FormFactorItems.cpp b/GUI/Model/Sample/FormFactorItems.cpp
index 997f3fc17f921628cc690a4264ea6bb3b5a4860f..d143ad8dfd292b4037e6d4692fa1e2545c2ca2aa 100644
--- a/GUI/Model/Sample/FormFactorItems.cpp
+++ b/GUI/Model/Sample/FormFactorItems.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/Model/Sample/FormFactorItems.h"
 #include "Base/Const/Units.h"
-#include "GUI/Support/XML/UtilXML.h"
+#include "GUI/Model/Util/UtilXML.h"
 #include "Sample/HardParticle/HardParticles.h"
 
 namespace {
diff --git a/GUI/Model/Sample/ItemWithMaterial.cpp b/GUI/Model/Sample/ItemWithMaterial.cpp
index 26dadce2d7558908a08f1f592c97feb76024d42d..b80d8e0e7701c119ad18ee02b7e180be322e6f29 100644
--- a/GUI/Model/Sample/ItemWithMaterial.cpp
+++ b/GUI/Model/Sample/ItemWithMaterial.cpp
@@ -16,7 +16,7 @@
 #include "Base/Util/Assert.h"
 #include "GUI/Model/Material/MaterialItem.h"
 #include "GUI/Model/Material/MaterialsSet.h"
-#include "GUI/Support/XML/UtilXML.h"
+#include "GUI/Model/Util/UtilXML.h"
 
 namespace {
 namespace Tag {
diff --git a/GUI/Model/Sample/Lattice2DItems.cpp b/GUI/Model/Sample/Lattice2DItems.cpp
index 7f2315d5a21b33c981668394cbf6a6741151f63d..6d656422e73123140bf1e5be125ab92d72ca0a92 100644
--- a/GUI/Model/Sample/Lattice2DItems.cpp
+++ b/GUI/Model/Sample/Lattice2DItems.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/Model/Sample/Lattice2DItems.h"
 #include "Base/Const/Units.h"
-#include "GUI/Support/XML/UtilXML.h"
+#include "GUI/Model/Util/UtilXML.h"
 #include "Sample/Lattice/Lattice2D.h"
 
 namespace {
diff --git a/GUI/Model/Sample/LayerItem.cpp b/GUI/Model/Sample/LayerItem.cpp
index 8dec502f6ca24fd42d6380765b602f339b4c4cb5..fca83a91d9f320c29cbd3baf9bd038016c7de1b4 100644
--- a/GUI/Model/Sample/LayerItem.cpp
+++ b/GUI/Model/Sample/LayerItem.cpp
@@ -21,7 +21,7 @@
 #include "GUI/Model/Sample/ParticleItem.h"
 #include "GUI/Model/Sample/ParticleLayoutItem.h"
 #include "GUI/Model/Sample/SampleItem.h"
-#include "GUI/Support/XML/UtilXML.h"
+#include "GUI/Model/Util/UtilXML.h"
 
 namespace {
 namespace Tag {
diff --git a/GUI/Model/Sample/ProfileItems.cpp b/GUI/Model/Sample/ProfileItems.cpp
index fbf9b2ea76e766650f0bab86cb9e8b6413fa95f2..6642d28b6c81a317f72afc524ef79461cf958af9 100644
--- a/GUI/Model/Sample/ProfileItems.cpp
+++ b/GUI/Model/Sample/ProfileItems.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/Model/Sample/ProfileItems.h"
 #include "Base/Const/Units.h"
-#include "GUI/Support/XML/UtilXML.h"
+#include "GUI/Model/Util/UtilXML.h"
 
 namespace {
 namespace Tag {
diff --git a/GUI/Model/Sample/RotationItems.cpp b/GUI/Model/Sample/RotationItems.cpp
index ce43cf5d4e148d5318cc1045d6ae6a7ded49b5f0..8b354e19bca79ace470b3856e5036e4f09d5f93f 100644
--- a/GUI/Model/Sample/RotationItems.cpp
+++ b/GUI/Model/Sample/RotationItems.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/Model/Sample/RotationItems.h"
 #include "Base/Const/Units.h"
-#include "GUI/Support/XML/UtilXML.h"
+#include "GUI/Model/Util/UtilXML.h"
 
 namespace {
 namespace Tag {
diff --git a/GUI/Model/Sample/RoughnessItems.cpp b/GUI/Model/Sample/RoughnessItems.cpp
index 0b5bfcec0e16b734c9326ef8ebdd1db2e93d7a8b..b9eebdfd5ee808bd994fbdec43816c49175708e1 100644
--- a/GUI/Model/Sample/RoughnessItems.cpp
+++ b/GUI/Model/Sample/RoughnessItems.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Model/Sample/RoughnessItems.h"
-#include "GUI/Support/XML/UtilXML.h"
+#include "GUI/Model/Util/UtilXML.h"
 
 namespace {
 namespace Tag {
diff --git a/GUI/Model/Sample/SampleItem.cpp b/GUI/Model/Sample/SampleItem.cpp
index e8ee8065c367cd70bbae3e7673dae42ab03ad093..7430215932e400b968bf2b289438b6c4d266704c 100644
--- a/GUI/Model/Sample/SampleItem.cpp
+++ b/GUI/Model/Sample/SampleItem.cpp
@@ -17,7 +17,7 @@
 #include "GUI/Model/Sample/LayerItem.h"
 #include "GUI/Model/Type/PredefinedColors.h"
 #include "GUI/Model/Util/Backup.h"
-#include "GUI/Support/XML/UtilXML.h"
+#include "GUI/Model/Util/UtilXML.h"
 
 namespace {
 namespace Tag {
diff --git a/GUI/Model/Sample/SamplesSet.cpp b/GUI/Model/Sample/SamplesSet.cpp
index c6eb392bc02e1e8b808399926d04795cdaa0ff92..a6565cf1f4b0a810c2b73d614e6b512e8a884686 100644
--- a/GUI/Model/Sample/SamplesSet.cpp
+++ b/GUI/Model/Sample/SamplesSet.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/Model/Sample/SamplesSet.h"
 #include "GUI/Model/Util/Backup.h"
-#include "GUI/Support/XML/UtilXML.h"
+#include "GUI/Model/Util/UtilXML.h"
 
 namespace {
 namespace Tag {
diff --git a/GUI/Model/Tune/FitParameterContainerItem.cpp b/GUI/Model/Tune/FitParameterContainerItem.cpp
index 7c0a0c2034a0758366758f0adfd0e951a53529bf..b4cc89b4db99acee6761bb2d5ceccb58d48bb603 100644
--- a/GUI/Model/Tune/FitParameterContainerItem.cpp
+++ b/GUI/Model/Tune/FitParameterContainerItem.cpp
@@ -16,7 +16,7 @@
 #include "Base/Util/Assert.h"
 #include "Fit/Param/Parameters.h"
 #include "GUI/Model/Par/ParameterTreeItems.h"
-#include "GUI/Support/XML/UtilXML.h"
+#include "GUI/Model/Util/UtilXML.h"
 
 namespace {
 namespace Tag {
diff --git a/GUI/Model/Tune/FitParameterItem.cpp b/GUI/Model/Tune/FitParameterItem.cpp
index 4bd3fa24d257efb137109df09db4b6eeb68eb6d8..a19b5e5f3949a23b2b244562b8470b1691605000 100644
--- a/GUI/Model/Tune/FitParameterItem.cpp
+++ b/GUI/Model/Tune/FitParameterItem.cpp
@@ -15,7 +15,7 @@
 #include "GUI/Model/Tune/FitParameterItem.h"
 #include "Base/Util/Assert.h"
 #include "GUI/Model/Tune/FitParameterLinkItem.h"
-#include "GUI/Support/XML/UtilXML.h"
+#include "GUI/Model/Util/UtilXML.h"
 #include <utility>
 
 namespace {
diff --git a/GUI/Model/Tune/FitParameterLinkItem.cpp b/GUI/Model/Tune/FitParameterLinkItem.cpp
index b3ff2339f6593a8fc037cb1a08f3ad59be850aa7..5480b5e7056ce8d4b5b9a63651676f8763588c4a 100644
--- a/GUI/Model/Tune/FitParameterLinkItem.cpp
+++ b/GUI/Model/Tune/FitParameterLinkItem.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Model/Tune/FitParameterLinkItem.h"
-#include "GUI/Support/XML/UtilXML.h"
+#include "GUI/Model/Util/UtilXML.h"
 
 namespace {
 namespace Tag {
diff --git a/GUI/Model/Tune/FitSuiteItem.cpp b/GUI/Model/Tune/FitSuiteItem.cpp
index e987c5f10e5d6620f36d0c41885574d64c3af003..8b0de643d309405730f6fb7a3270f9696a8ebcb2 100644
--- a/GUI/Model/Tune/FitSuiteItem.cpp
+++ b/GUI/Model/Tune/FitSuiteItem.cpp
@@ -15,7 +15,7 @@
 #include "GUI/Model/Tune/FitSuiteItem.h"
 #include "GUI/Model/Mini/MinimizerItems.h"
 #include "GUI/Model/Tune/FitParameterContainerItem.h"
-#include "GUI/Support/XML/UtilXML.h"
+#include "GUI/Model/Util/UtilXML.h"
 
 namespace {
 namespace Tag {
diff --git a/GUI/Model/Type/ComboProperty.cpp b/GUI/Model/Type/ComboProperty.cpp
index 2c235ec460c5d5da60ea31b32fd8570895b324e7..4e30137775badfc689d3b5d4b2e00b40c6f53983 100644
--- a/GUI/Model/Type/ComboProperty.cpp
+++ b/GUI/Model/Type/ComboProperty.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/Model/Type/ComboProperty.h"
 #include "Base/Util/Assert.h"
-#include "GUI/Support/XML/UtilXML.h"
+#include "GUI/Model/Util/UtilXML.h"
 
 namespace {
 
diff --git a/GUI/Model/Type/SimulationOptionsItem.cpp b/GUI/Model/Type/SimulationOptionsItem.cpp
index 4839c5d34fc45f22b079cb59be79905050c5c340..89be31bdeccf4bca8555f3be057511d27cb8e508 100644
--- a/GUI/Model/Type/SimulationOptionsItem.cpp
+++ b/GUI/Model/Type/SimulationOptionsItem.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Model/Type/SimulationOptionsItem.h"
-#include "GUI/Support/XML/UtilXML.h"
+#include "GUI/Model/Util/UtilXML.h"
 #include <thread>
 
 namespace {
diff --git a/GUI/Support/XML/UtilXML.cpp b/GUI/Model/Util/UtilXML.cpp
similarity index 98%
rename from GUI/Support/XML/UtilXML.cpp
rename to GUI/Model/Util/UtilXML.cpp
index 140cafc5a92a69e9f0ddc0887775ca2014369199..79ddb831bb525f6d6d425d4e6b436d7c9872d27d 100644
--- a/GUI/Support/XML/UtilXML.cpp
+++ b/GUI/Model/Util/UtilXML.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Support/XML/UtilXML.cpp
+//! @file      GUI/Model/Util/UtilXML.cpp
 //! @brief     Implements
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Support/XML/UtilXML.h"
+#include "GUI/Model/Util/UtilXML.h"
 #include "Base/Util/Assert.h"
 #include <QColor>
 #include <QUuid>
diff --git a/GUI/Support/XML/UtilXML.h b/GUI/Model/Util/UtilXML.h
similarity index 94%
rename from GUI/Support/XML/UtilXML.h
rename to GUI/Model/Util/UtilXML.h
index f6ae2b848831b190fe078c46174ff59c9946c079..50b7520f7fbdbeab57402a35224111b8240b8257 100644
--- a/GUI/Support/XML/UtilXML.h
+++ b/GUI/Model/Util/UtilXML.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Support/XML/UtilXML.h
+//! @file      GUI/Model/Util/UtilXML.h
 //! @brief     Defines
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_SUPPORT_XML_UTILXML_H
-#define BORNAGAIN_GUI_SUPPORT_XML_UTILXML_H
+#ifndef BORNAGAIN_GUI_MODEL_UTIL_UTILXML_H
+#define BORNAGAIN_GUI_MODEL_UTIL_UTILXML_H
 
 #include <QXmlStreamReader> // used in every including file, also provides QXmlStreamWriter
 #include <heinz/Complex.h>
@@ -70,4 +70,4 @@ QString readAttributeString(QXmlStreamReader* reader, const QString& attributeNa
 
 } // namespace XML
 
-#endif // BORNAGAIN_GUI_SUPPORT_XML_UTILXML_H
+#endif // BORNAGAIN_GUI_MODEL_UTIL_UTILXML_H
diff --git a/GUI/View/Tuning/PartunerQModel.cpp b/GUI/View/Tuning/PartunerQModel.cpp
index 09ee5037a737c34e6744526991b9080de920972f..debb249bc56fd68a4efac942c2b2987911d8eb99 100644
--- a/GUI/View/Tuning/PartunerQModel.cpp
+++ b/GUI/View/Tuning/PartunerQModel.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/View/Tuning/PartunerQModel.h"
 #include "GUI/Model/Par/ParameterTreeItems.h"
-#include "GUI/Support/XML/UtilXML.h"
+#include "GUI/Model/Util/UtilXML.h"
 #include <QFont>
 #include <QMimeData>
 
diff --git a/Tests/Unit/GUI/Utils.h b/Tests/Unit/GUI/Utils.h
index ca117b7c787e872a7d56f9d55308811765f55640..32d31b0391fa20086bf8c06fa4b5171816df69d5 100644
--- a/Tests/Unit/GUI/Utils.h
+++ b/Tests/Unit/GUI/Utils.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_TESTS_UNIT_GUI_UTILS_H
 #define BORNAGAIN_TESTS_UNIT_GUI_UTILS_H
 
-#include "GUI/Support/XML/UtilXML.h"
+#include "GUI/Model/Util/UtilXML.h"
 #include <QDir>
 
 class Datafield;