diff --git a/GUI/Model/BaseItem/SessionItem.h b/GUI/Model/BaseItem/SessionItem.h
index 003c54fce98eae577bb29f9f349ff7b9830996ed..4e0d3430459994ac7c1743664265a044698f0a22 100644
--- a/GUI/Model/BaseItem/SessionItem.h
+++ b/GUI/Model/BaseItem/SessionItem.h
@@ -18,7 +18,7 @@
#include "Base/Util/Assert.h"
#include "Fit/Param/RealLimits.h"
#include "GUI/Model/BaseItem/ModelMapper.h" // no forward declare, used too often
-#include "GUI/Model/XML/Serialize.h"
+#include "GUI/Support/XML/Serialize.h"
#include "Wrap/WinDllMacros.h"
#include <QStringList>
#include <memory>
diff --git a/GUI/Model/Descriptor/AxisProperty.cpp b/GUI/Model/Descriptor/AxisProperty.cpp
index f254089a13bbc12214481dc370b5ffe540a97d57..0d79c3c628c45f3587178c2e9ba79d24db5dd1aa 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/Util/Assert.h"
-#include "GUI/Model/XML/Serialize.h"
+#include "GUI/Support/XML/Serialize.h"
void AxisProperty::initNbins(const QString& label, const QString& tooltip, uint n,
const variant<QString, Unit>& unit)
diff --git a/GUI/Model/Descriptor/DistributionItems.cpp b/GUI/Model/Descriptor/DistributionItems.cpp
index 3dd7e2cf5276661a4ab15a473447b827c8d8a2bd..d27dfe86cf73396178f5f650042848ebf27f64f7 100644
--- a/GUI/Model/Descriptor/DistributionItems.cpp
+++ b/GUI/Model/Descriptor/DistributionItems.cpp
@@ -14,7 +14,7 @@
#include "GUI/Model/Descriptor/DistributionItems.h"
#include "GUI/Model/Descriptor/DoubleDescriptor.h"
-#include "GUI/Model/XML/Serialize.h"
+#include "GUI/Support/XML/Serialize.h"
#include "GUI/Support/Type/GroupInfo.h"
#include "Param/Distrib/Distributions.h"
#include "Param/Distrib/RangedDistributions.h"
diff --git a/GUI/Model/Descriptor/DoubleProperty.cpp b/GUI/Model/Descriptor/DoubleProperty.cpp
index 298b51742a612db63fa120be045f411c63ab6b9b..928b7083f681d050db1ef73bf8a9606e1d31a4b0 100644
--- a/GUI/Model/Descriptor/DoubleProperty.cpp
+++ b/GUI/Model/Descriptor/DoubleProperty.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Model/Descriptor/DoubleProperty.h"
-#include "GUI/Model/XML/Serialize.h"
-#include "GUI/Support/Data/XML.h"
+#include "GUI/Support/XML/Serialize.h"
+#include "GUI/Support/XML/UtilXML.h"
#include <QUuid>
void DoubleProperty::init(const QString& label, const QString& tooltip, double value,
diff --git a/GUI/Model/Descriptor/SelectionProperty.h b/GUI/Model/Descriptor/SelectionProperty.h
index 7e7dacaa125d6d6433d578120619dcb0ab5ec2b9..8b2d7634650f98a36fb68d800a63458227bf1abe 100644
--- a/GUI/Model/Descriptor/SelectionProperty.h
+++ b/GUI/Model/Descriptor/SelectionProperty.h
@@ -16,7 +16,7 @@
#define BORNAGAIN_GUI_MODEL_DESCRIPTOR_SELECTIONPROPERTY_H
#include "GUI/Model/Descriptor/SelectionDescriptor.h"
-#include "GUI/Model/XML/Streamer.h"
+#include "GUI/Support/XML/Streamer.h"
// #baMigration docu
template <typename T>
diff --git a/GUI/Model/Descriptor/UIntProperty.cpp b/GUI/Model/Descriptor/UIntProperty.cpp
index 805164bb9d7756954dd1f68b834096f9ffcd625a..4a64ce1b69dd0464b7ee171a228c97e34b1c9f57 100644
--- a/GUI/Model/Descriptor/UIntProperty.cpp
+++ b/GUI/Model/Descriptor/UIntProperty.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Model/Descriptor/UIntProperty.h"
-#include "GUI/Model/XML/Serialize.h"
-#include "GUI/Support/Data/XML.h"
+#include "GUI/Support/XML/Serialize.h"
+#include "GUI/Support/XML/UtilXML.h"
#include <QUuid>
void UIntProperty::init(const QString& label, const QString& tooltip, uint value,
diff --git a/GUI/Model/Descriptor/VectorProperty.cpp b/GUI/Model/Descriptor/VectorProperty.cpp
index 5c4141b9776300965d7f08d126bf4b5fbb2a916c..58f16b960e471e957fc6e26955523acefa6f63b9 100644
--- a/GUI/Model/Descriptor/VectorProperty.cpp
+++ b/GUI/Model/Descriptor/VectorProperty.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Model/Descriptor/VectorProperty.h"
-#include "GUI/Model/XML/Serialize.h"
-#include "GUI/Support/Data/XML.h"
+#include "GUI/Support/XML/Serialize.h"
+#include "GUI/Support/XML/UtilXML.h"
#include <QUuid>
void VectorProperty::init(const QString& label, const QString& tooltip,
diff --git a/GUI/Model/Device/AxesItems.cpp b/GUI/Model/Device/AxesItems.cpp
index 15e9e34a382047057df99946159777416b0184f3..1a44a919c41cabbe014e5d7bc485de40f215d491 100644
--- a/GUI/Model/Device/AxesItems.cpp
+++ b/GUI/Model/Device/AxesItems.cpp
@@ -14,7 +14,7 @@
#include "GUI/Model/Device/AxesItems.h"
#include "Base/Axis/FixedBinAxis.h"
-#include "GUI/Model/XML/Serialize.h"
+#include "GUI/Support/XML/Serialize.h"
const int max_detector_pixels = 65536;
diff --git a/GUI/Model/Device/BackgroundItems.cpp b/GUI/Model/Device/BackgroundItems.cpp
index 3e1d06ed9b07ae3fc00445540dda70d21f080545..c5dc828ae2de3634fa912842651ffdd68280d0e8 100644
--- a/GUI/Model/Device/BackgroundItems.cpp
+++ b/GUI/Model/Device/BackgroundItems.cpp
@@ -16,7 +16,7 @@
#include "Core/Background/ConstantBackground.h"
#include "Core/Background/PoissonBackground.h"
#include "GUI/Model/Descriptor/DoubleDescriptor.h"
-#include "GUI/Model/XML/Serialize.h"
+#include "GUI/Support/XML/Serialize.h"
ConstantBackgroundItem::ConstantBackgroundItem()
{
diff --git a/GUI/Model/Device/BeamAngleItems.cpp b/GUI/Model/Device/BeamAngleItems.cpp
index b844a4b66b48b2bcd94fb1127b7bf78c6f34d191..96cd49321e44cd4041892346f9f10c8e3f77f121 100644
--- a/GUI/Model/Device/BeamAngleItems.cpp
+++ b/GUI/Model/Device/BeamAngleItems.cpp
@@ -15,7 +15,7 @@
#include "GUI/Model/Device/BeamAngleItems.h"
#include "Base/Const/Units.h"
#include "GUI/Model/CatDevice/DistributionItemCatalog.h"
-#include "GUI/Model/XML/Serialize.h"
+#include "GUI/Support/XML/Serialize.h"
BeamAzimuthalAngleItem::BeamAzimuthalAngleItem()
{
diff --git a/GUI/Model/Device/BeamDistributionItem.cpp b/GUI/Model/Device/BeamDistributionItem.cpp
index 79d8bba66bffd67272db15f791f9353665e16378..bfa96273aaa899f7aa8d9013d4ec9f4cb808f461 100644
--- a/GUI/Model/Device/BeamDistributionItem.cpp
+++ b/GUI/Model/Device/BeamDistributionItem.cpp
@@ -16,7 +16,7 @@
#include "GUI/Model/BaseItem/GroupItem.h"
#include "GUI/Model/CatDevice/DistributionItemCatalog.h"
#include "GUI/Model/Descriptor/DoubleDescriptor.h"
-#include "GUI/Model/XML/Serialize.h"
+#include "GUI/Support/XML/Serialize.h"
#include "Param/Distrib/Distributions.h"
std::unique_ptr<ParameterDistribution> BeamDistributionItem::getParameterDistributionForName(
diff --git a/GUI/Model/Device/BeamItems.cpp b/GUI/Model/Device/BeamItems.cpp
index fdf7e8c40b73596d66468cb6ac1e4e0a4e514498..406d137a881c54db509fca178be06bd33d1a0ae3 100644
--- a/GUI/Model/Device/BeamItems.cpp
+++ b/GUI/Model/Device/BeamItems.cpp
@@ -21,7 +21,7 @@
#include "GUI/Model/Device/BeamWavelengthItem.h"
#include "GUI/Model/Device/FootprintItems.h"
#include "GUI/Model/Device/PointwiseAxisItem.h"
-#include "GUI/Model/XML/Serialize.h"
+#include "GUI/Support/XML/Serialize.h"
#include <cmath>
namespace {
diff --git a/GUI/Model/Device/BeamWavelengthItem.cpp b/GUI/Model/Device/BeamWavelengthItem.cpp
index c1398aa1bace32b837896e2c7c6896081a4911f0..658b7e305cd85d2d7ec681dec69d188d8a4af737 100644
--- a/GUI/Model/Device/BeamWavelengthItem.cpp
+++ b/GUI/Model/Device/BeamWavelengthItem.cpp
@@ -14,7 +14,7 @@
#include "GUI/Model/Device/BeamWavelengthItem.h"
#include "GUI/Model/CatDevice/DistributionItemCatalog.h"
-#include "GUI/Model/XML/Serialize.h"
+#include "GUI/Support/XML/Serialize.h"
namespace {
diff --git a/GUI/Model/Device/FootprintItems.cpp b/GUI/Model/Device/FootprintItems.cpp
index 6dc8d3aeeebfa5eab1696d0eb16b3d67fc4449eb..959575bb6d770449f2c717faff8137e22adbd987 100644
--- a/GUI/Model/Device/FootprintItems.cpp
+++ b/GUI/Model/Device/FootprintItems.cpp
@@ -15,7 +15,7 @@
#include "GUI/Model/Device/FootprintItems.h"
#include "Device/Beam/FootprintGauss.h"
#include "Device/Beam/FootprintSquare.h"
-#include "GUI/Model/XML/Serialize.h"
+#include "GUI/Support/XML/Serialize.h"
std::unique_ptr<IFootprintFactor> FootprintNoneItem::createFootprint() const
{
diff --git a/GUI/Model/Device/InstrumentItems.cpp b/GUI/Model/Device/InstrumentItems.cpp
index a27f974ab6f8ee9a86a7e75ac570f54b658d41c2..eaa641d9d41572f416f0bf900aad943893523c88 100644
--- a/GUI/Model/Device/InstrumentItems.cpp
+++ b/GUI/Model/Device/InstrumentItems.cpp
@@ -31,8 +31,8 @@
#include "GUI/Model/Device/PointwiseAxisItem.h"
#include "GUI/Model/Device/RectangularDetectorItem.h"
#include "GUI/Model/Device/SphericalDetectorItem.h"
-#include "GUI/Model/XML/Serialize.h"
-#include "GUI/Model/XML/XMLUtil.h"
+#include "GUI/Support/XML/Serialize.h"
+#include "GUI/Support/XML/Backup.h"
#include "GUI/Util/CoordName.h"
#include "GUI/Util/Error.h"
#include "GUI/Util/String.h"
diff --git a/GUI/Model/Device/InstrumentLibrary.cpp b/GUI/Model/Device/InstrumentLibrary.cpp
index 80712c0fa4c5a2f78a89f9748ddd01e2fd1cfa70..4d02b56e9b9325efe1e137d55a1b0b4de387a575 100644
--- a/GUI/Model/Device/InstrumentLibrary.cpp
+++ b/GUI/Model/Device/InstrumentLibrary.cpp
@@ -14,7 +14,7 @@
#include "GUI/Model/Device/InstrumentLibrary.h"
#include "GUI/Model/Device/InstrumentItems.h"
-#include "GUI/Model/XML/Serialize.h"
+#include "GUI/Support/XML/Serialize.h"
#include "GUI/Util/DeserializationException.h"
#include "GUI/Util/Path.h"
#include <QFile>
diff --git a/GUI/Model/Device/MaskItems.cpp b/GUI/Model/Device/MaskItems.cpp
index d1796379ccefc3451e7ccdcda6404cc88a458c98..feac8805972fe79529b53853f24d4065c1141947 100644
--- a/GUI/Model/Device/MaskItems.cpp
+++ b/GUI/Model/Device/MaskItems.cpp
@@ -21,7 +21,7 @@
#include "GUI/Model/CatDevice/MaskItemCatalog.h"
#include "GUI/Model/Descriptor/DoubleDescriptor.h"
#include "GUI/Model/Model/SessionModel.h"
-#include "GUI/Model/XML/Serialize.h"
+#include "GUI/Support/XML/Serialize.h"
MaskContainerItem::MaskContainerItem()
: SessionItem(M_TYPE)
diff --git a/GUI/Model/Device/PointwiseAxisItem.cpp b/GUI/Model/Device/PointwiseAxisItem.cpp
index 9b688ee3b1e4a1fda90ecfe2879caac1c5740387..bdd309666ab8fd36e94191923299a811e7a47e51 100644
--- a/GUI/Model/Device/PointwiseAxisItem.cpp
+++ b/GUI/Model/Device/PointwiseAxisItem.cpp
@@ -19,7 +19,7 @@
#include "Device/Histo/IntensityDataIOFactory.h"
#include "Device/InputOutput/OutputDataReadWriteINT.h"
#include "GUI/Model/Device/InstrumentItems.h"
-#include "GUI/Model/XML/Serialize.h"
+#include "GUI/Support/XML/Serialize.h"
PointwiseAxisItem::PointwiseAxisItem()
: BasicAxisItem(M_TYPE)
diff --git a/GUI/Model/Device/RectangularDetectorItem.cpp b/GUI/Model/Device/RectangularDetectorItem.cpp
index 52d01627e7b31f96d82e5137a4f25c69d55a610b..8c3b1d12501f657ad9961a1eacf3f8253abc1dfc 100644
--- a/GUI/Model/Device/RectangularDetectorItem.cpp
+++ b/GUI/Model/Device/RectangularDetectorItem.cpp
@@ -17,8 +17,8 @@
#include "GUI/Model/CatDevice/ResolutionFunctionItemCatalog.h"
#include "GUI/Model/Device/AxesItems.h"
#include "GUI/Model/Device/ResolutionFunctionItems.h"
-#include "GUI/Model/XML/Serialize.h"
-#include "GUI/Support/Data/XML.h"
+#include "GUI/Support/XML/Serialize.h"
+#include "GUI/Support/XML/UtilXML.h"
#include "GUI/Util/ComboProperty.h"
#include "GUI/Util/Error.h"
diff --git a/GUI/Model/Device/ResolutionFunctionItems.cpp b/GUI/Model/Device/ResolutionFunctionItems.cpp
index 41c787c10cdf246a9cf0bd61e15e401d671d8b1c..0d7fd46dbae074fcffee82ce03359596be527f72 100644
--- a/GUI/Model/Device/ResolutionFunctionItems.cpp
+++ b/GUI/Model/Device/ResolutionFunctionItems.cpp
@@ -14,7 +14,7 @@
#include "GUI/Model/Device/ResolutionFunctionItems.h"
#include "Device/Resolution/ResolutionFunction2DGaussian.h"
-#include "GUI/Model/XML/Serialize.h"
+#include "GUI/Support/XML/Serialize.h"
std::unique_ptr<IResolutionFunction2D>
ResolutionFunctionNoneItem::createResolutionFunction(double) const
diff --git a/GUI/Model/Device/SpecularBeamInclinationItem.cpp b/GUI/Model/Device/SpecularBeamInclinationItem.cpp
index 3f918f7ea1f3e6aa02e801224d4de4b177f7c01e..630d8d9e5f0655b622e51a82905cf61d12431bb5 100644
--- a/GUI/Model/Device/SpecularBeamInclinationItem.cpp
+++ b/GUI/Model/Device/SpecularBeamInclinationItem.cpp
@@ -17,7 +17,7 @@
#include "Base/Const/Units.h"
#include "GUI/Model/CatDevice/DistributionItemCatalog.h"
#include "GUI/Model/Device/PointwiseAxisItem.h"
-#include "GUI/Model/XML/Serialize.h"
+#include "GUI/Support/XML/Serialize.h"
namespace {
diff --git a/GUI/Model/Device/SphericalDetectorItem.cpp b/GUI/Model/Device/SphericalDetectorItem.cpp
index 47d0a106f03542d8258c9588a65c5961e64e3bdd..a39dd637631005b72665c2cb870f83ca3aef5650 100644
--- a/GUI/Model/Device/SphericalDetectorItem.cpp
+++ b/GUI/Model/Device/SphericalDetectorItem.cpp
@@ -16,7 +16,7 @@
#include "Base/Const/Units.h"
#include "Device/Detector/SphericalDetector.h"
#include "GUI/Model/CatDevice/ResolutionFunctionItemCatalog.h"
-#include "GUI/Model/XML/Serialize.h"
+#include "GUI/Support/XML/Serialize.h"
#include "ResolutionFunctionItems.h"
namespace {
diff --git a/GUI/Model/Job/JobItem.cpp b/GUI/Model/Job/JobItem.cpp
index 066aee2cbac432673041a9c2a21159bd3ef80500..17178302ae40e33d1ceb2adda1836340b382d2ea 100644
--- a/GUI/Model/Job/JobItem.cpp
+++ b/GUI/Model/Job/JobItem.cpp
@@ -23,8 +23,8 @@
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Job/FitSuiteItem.h"
#include "GUI/Model/Sample/ItemWithMaterial.h"
-#include "GUI/Model/XML/Streamer.h"
-#include "GUI/Support/Data/XML.h"
+#include "GUI/Support/XML/Streamer.h"
+#include "GUI/Support/XML/UtilXML.h"
#include "GUI/Support/IO/ItemFileNameUtils.h"
#include "GUI/Util/DeserializationException.h"
#include "GUI/Util/Error.h"
diff --git a/GUI/Model/Job/ParameterTreeItems.cpp b/GUI/Model/Job/ParameterTreeItems.cpp
index 7977d82ea836a5e578cd51891e44a18fc4c5c2c0..47fb58bd6ef697989e4a1afd85daf98c4e9f374b 100644
--- a/GUI/Model/Job/ParameterTreeItems.cpp
+++ b/GUI/Model/Job/ParameterTreeItems.cpp
@@ -17,7 +17,7 @@
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Sample/MaterialItem.h"
#include "GUI/Model/Sample/MaterialItems.h"
-#include "GUI/Support/Data/XML.h"
+#include "GUI/Support/XML/UtilXML.h"
#include "GUI/Util/DeserializationException.h"
#include "GUI/Util/Path.h"
#include <QXmlStreamReader>
diff --git a/GUI/Model/Model/SessionXML.cpp b/GUI/Model/Model/SessionXML.cpp
index f8109a78a66c8ad8464a698543b37fad0d2beae6..8fa89ce1e69453092e2773d5b95a8283d3c5b0d2 100644
--- a/GUI/Model/Model/SessionXML.cpp
+++ b/GUI/Model/Model/SessionXML.cpp
@@ -18,7 +18,7 @@
#include "GUI/Model/Sample/MaterialItem.h"
#include "GUI/Support/Data/SessionFlags.h"
#include "GUI/Support/Data/SessionItemTags.h"
-#include "GUI/Support/Data/XML.h"
+#include "GUI/Support/XML/UtilXML.h"
#include "GUI/Util/ComboProperty.h"
#include "GUI/Util/DeserializationException.h"
#include "GUI/Util/Error.h"
diff --git a/GUI/Model/Project/ProjectDocument.cpp b/GUI/Model/Project/ProjectDocument.cpp
index 7816978ea6973eb8272ad0c2601b1a621aebf5b9..f1764b21b029d813d080060f062b1407ec02a72a 100644
--- a/GUI/Model/Project/ProjectDocument.cpp
+++ b/GUI/Model/Project/ProjectDocument.cpp
@@ -22,9 +22,9 @@
#include "GUI/Model/Sample/ItemWithMaterial.h"
#include "GUI/Model/Sample/MaterialItem.h"
#include "GUI/Model/Sample/MultiLayerItem.h"
-#include "GUI/Model/XML/Streamer.h"
+#include "GUI/Support/XML/Streamer.h"
#include "GUI/Support/Data/SimulationOptionsItem.h"
-#include "GUI/Support/Data/XML.h"
+#include "GUI/Support/XML/UtilXML.h"
#include "GUI/Support/IO/ProjectUtils.h"
#include "GUI/Util/DeserializationException.h"
#include "GUI/Util/Error.h"
diff --git a/GUI/Model/Sample/FormFactorItems.h b/GUI/Model/Sample/FormFactorItems.h
index 20e2c87ed59991fb7fb409f1dbdf229db5945f1d..90ef61b55a1a060a7faec9c917bc98354defbe61 100644
--- a/GUI/Model/Sample/FormFactorItems.h
+++ b/GUI/Model/Sample/FormFactorItems.h
@@ -16,7 +16,7 @@
#define BORNAGAIN_GUI_MODEL_SAMPLE_FORMFACTORITEMS_H
#include "GUI/Model/Descriptor/DoubleProperty.h"
-#include "GUI/Model/XML/Serialize.h"
+#include "GUI/Support/XML/Serialize.h"
#include <QVector>
#include <memory>
diff --git a/GUI/Model/Sample/InterferenceItems.cpp b/GUI/Model/Sample/InterferenceItems.cpp
index 3924e1af71f80a29659995b2fb7d91025ac9a817..917059a938bb749720f79ff92107c22ae346d8f4 100644
--- a/GUI/Model/Sample/InterferenceItems.cpp
+++ b/GUI/Model/Sample/InterferenceItems.cpp
@@ -19,7 +19,7 @@
#include "GUI/Model/Descriptor/UIntDescriptor.h"
#include "GUI/Model/Sample/Lattice2DItems.h"
#include "GUI/Model/Sample/ProfileItems.h"
-#include "GUI/Model/XML/Serialize.h"
+#include "GUI/Support/XML/Serialize.h"
#include "Sample/Aggregate/Interferences.h"
InterferenceItem::InterferenceItem()
diff --git a/GUI/Model/Sample/ItemWithParticles.cpp b/GUI/Model/Sample/ItemWithParticles.cpp
index 35343572f8a2e2fd068bb66795dcb3d2fe8db513..a6c1ab67f0294fcc14c09d9feed926ac4a5062ef 100644
--- a/GUI/Model/Sample/ItemWithParticles.cpp
+++ b/GUI/Model/Sample/ItemWithParticles.cpp
@@ -15,7 +15,7 @@
#include "GUI/Model/Sample/ItemWithParticles.h"
#include "Base/Vector/RotMatrix.h"
#include "GUI/Model/CatSample/RotationItemCatalog.h"
-#include "GUI/Model/XML/Serialize.h"
+#include "GUI/Support/XML/Serialize.h"
#include "Sample/Particle/IParticle.h"
#include "Sample/Scattering/Rotations.h"
diff --git a/GUI/Model/Sample/Lattice2DItems.cpp b/GUI/Model/Sample/Lattice2DItems.cpp
index 06f2d8373443c029a93963a016f81f17419a28ad..7332d18dcafbdad4b376cac128d2ff83e6284293 100644
--- a/GUI/Model/Sample/Lattice2DItems.cpp
+++ b/GUI/Model/Sample/Lattice2DItems.cpp
@@ -15,7 +15,7 @@
#include "GUI/Model/Sample/Lattice2DItems.h"
#include "Base/Const/Units.h"
#include "Base/Util/Assert.h"
-#include "GUI/Model/XML/Serialize.h"
+#include "GUI/Support/XML/Serialize.h"
#include "Sample/Lattice/Lattice2D.h"
Lattice2DItem::Lattice2DItem()
diff --git a/GUI/Model/Sample/LayerRoughnessItems.cpp b/GUI/Model/Sample/LayerRoughnessItems.cpp
index 5bea59c62bbe10e433727301f62dd8b50d8e64f2..6312fd3cb0de2c725f64fede046ce94870209614 100644
--- a/GUI/Model/Sample/LayerRoughnessItems.cpp
+++ b/GUI/Model/Sample/LayerRoughnessItems.cpp
@@ -14,7 +14,7 @@
#include "GUI/Model/Sample/LayerRoughnessItems.h"
#include "GUI/Model/Descriptor/DoubleDescriptor.h"
-#include "GUI/Model/XML/Serialize.h"
+#include "GUI/Support/XML/Serialize.h"
namespace {
namespace Tags {
diff --git a/GUI/Model/Sample/MaterialItem.cpp b/GUI/Model/Sample/MaterialItem.cpp
index 70af3fc8e508f052885862781f0a1c4ee712506a..deaf9385c845d55f8baaa198b467b71048faa084 100644
--- a/GUI/Model/Sample/MaterialItem.cpp
+++ b/GUI/Model/Sample/MaterialItem.cpp
@@ -15,8 +15,8 @@
#include "GUI/Model/Sample/MaterialItem.h"
#include "Base/Util/Assert.h"
#include "GUI/Model/Descriptor/VectorDescriptor.h"
-#include "GUI/Model/XML/Serialize.h"
-#include "GUI/Support/Data/XML.h"
+#include "GUI/Support/XML/Serialize.h"
+#include "GUI/Support/XML/UtilXML.h"
#include "GUI/Util/DeserializationException.h"
#include "Sample/Material/MaterialFactoryFuncs.h"
#include <QColor>
diff --git a/GUI/Model/Sample/MaterialItems.cpp b/GUI/Model/Sample/MaterialItems.cpp
index 4627756a1e5095bda4e0bad62264562ad9cbc947..a5c0519a638bcfc838cb638b43537f389aa62ea7 100644
--- a/GUI/Model/Sample/MaterialItems.cpp
+++ b/GUI/Model/Sample/MaterialItems.cpp
@@ -15,7 +15,7 @@
#include "GUI/Model/Sample/MaterialItems.h"
#include "Base/Util/Assert.h"
#include "GUI/Model/Sample/MaterialItem.h"
-#include "GUI/Model/XML/Serialize.h"
+#include "GUI/Support/XML/Serialize.h"
#include <QColor>
#include <QUuid>
#include <random>
diff --git a/GUI/Model/Sample/MesoCrystalItem.cpp b/GUI/Model/Sample/MesoCrystalItem.cpp
index b585ab5cfd95c3ec1fbf4afc1541472ff04da28c..054ca435d0ffad664888c46b24f1d8f0c68a7106 100644
--- a/GUI/Model/Sample/MesoCrystalItem.cpp
+++ b/GUI/Model/Sample/MesoCrystalItem.cpp
@@ -20,7 +20,7 @@
#include "GUI/Model/Sample/ParticleCompositionItem.h"
#include "GUI/Model/Sample/ParticleCoreShellItem.h"
#include "GUI/Model/Sample/ParticleItem.h"
-#include "GUI/Model/XML/Serialize.h"
+#include "GUI/Support/XML/Serialize.h"
#include "GUI/Util/Error.h"
#include "Sample/Particle/Crystal.h"
#include "Sample/Particle/IBornFF.h"
diff --git a/GUI/Model/Sample/MultiLayerItem.cpp b/GUI/Model/Sample/MultiLayerItem.cpp
index 4bf3b0c0a7c73b30d3b4c8c488c5f2259c72f7cd..bc89073d2dd6db47712e7e857b46fb67f3222619 100644
--- a/GUI/Model/Sample/MultiLayerItem.cpp
+++ b/GUI/Model/Sample/MultiLayerItem.cpp
@@ -14,8 +14,8 @@
#include "GUI/Model/Sample/MultiLayerItem.h"
#include "GUI/Model/Sample/LayerItem.h"
-#include "GUI/Model/XML/Serialize.h"
-#include "GUI/Model/XML/XMLUtil.h"
+#include "GUI/Support/XML/Serialize.h"
+#include "GUI/Support/XML/Backup.h"
#include <QXmlStreamWriter>
MultiLayerItem::MultiLayerItem()
diff --git a/GUI/Model/Sample/MultiLayerItems.cpp b/GUI/Model/Sample/MultiLayerItems.cpp
index 0b6d76557aa3d0cddddc00f3dfed02761b75b88c..3aa5f76b58bb0a2ebef9dc7647bc65a6152efe93 100644
--- a/GUI/Model/Sample/MultiLayerItems.cpp
+++ b/GUI/Model/Sample/MultiLayerItems.cpp
@@ -15,7 +15,7 @@
#include "GUI/Model/Sample/MultiLayerItems.h"
#include "GUI/Model/Sample/ItemWithMaterial.h"
#include "GUI/Model/Sample/MultiLayerItem.h"
-#include "GUI/Model/XML/Serialize.h"
+#include "GUI/Support/XML/Serialize.h"
#include <QApplication>
MultiLayerItems::~MultiLayerItems()
diff --git a/GUI/Model/Sample/ParticleCompositionItem.cpp b/GUI/Model/Sample/ParticleCompositionItem.cpp
index 206107f01d58c8a5f8c2d41d1b31262ffb819ece..2993eb5a047f8ba0bfe506a6ca421b153d1ef26f 100644
--- a/GUI/Model/Sample/ParticleCompositionItem.cpp
+++ b/GUI/Model/Sample/ParticleCompositionItem.cpp
@@ -18,7 +18,7 @@
#include "GUI/Model/Sample/MesoCrystalItem.h"
#include "GUI/Model/Sample/ParticleCoreShellItem.h"
#include "GUI/Model/Sample/ParticleItem.h"
-#include "GUI/Model/XML/Serialize.h"
+#include "GUI/Support/XML/Serialize.h"
#include "Sample/Particle/MesoCrystal.h"
#include "Sample/Particle/Particle.h"
#include "Sample/Particle/ParticleCoreShell.h"
diff --git a/GUI/Model/Sample/ParticleItem.cpp b/GUI/Model/Sample/ParticleItem.cpp
index 7906d7d89d4958de79bab18cbaa2ad97d0bd9499..7a34bbecd9c4181db98628533777127e333fc56b 100644
--- a/GUI/Model/Sample/ParticleItem.cpp
+++ b/GUI/Model/Sample/ParticleItem.cpp
@@ -18,7 +18,7 @@
#include "GUI/Model/Sample/FormFactorItems.h"
#include "GUI/Model/Sample/MaterialItem.h"
#include "GUI/Model/Sample/ParticleCoreShellItem.h"
-#include "GUI/Model/XML/Serialize.h"
+#include "GUI/Support/XML/Serialize.h"
#include "Sample/Particle/Particle.h"
#include "Sample/Scattering/Rotations.h"
diff --git a/GUI/Model/Sample/ParticleLayoutItem.cpp b/GUI/Model/Sample/ParticleLayoutItem.cpp
index dbd061079b6c2d79221aa782fce34c1d7276ba53..64bfe97a4002f6f107530a6d6452b9b411ae19aa 100644
--- a/GUI/Model/Sample/ParticleLayoutItem.cpp
+++ b/GUI/Model/Sample/ParticleLayoutItem.cpp
@@ -20,7 +20,7 @@
#include "GUI/Model/Sample/MesoCrystalItem.h"
#include "GUI/Model/Sample/ParticleCompositionItem.h"
#include "GUI/Model/Sample/ParticleItem.h"
-#include "GUI/Model/XML/Serialize.h"
+#include "GUI/Support/XML/Serialize.h"
ParticleLayoutItem::ParticleLayoutItem(const MaterialItems* materials)
: m_materials(materials)
diff --git a/GUI/Model/Sample/ProfileItems.cpp b/GUI/Model/Sample/ProfileItems.cpp
index 137afe51966762f7553b82fc2752c4d887153955..f1210eda24b9a2ccf50a0797240d65159b3be9d9 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/Model/XML/Serialize.h"
+#include "GUI/Support/XML/Serialize.h"
Profile1DItem::Profile1DItem()
{
diff --git a/GUI/Model/Sample/RotationItems.cpp b/GUI/Model/Sample/RotationItems.cpp
index 0d9a2067f773230764b491dcefcc621a6d59d0f6..8733fdecc60e9b23308f835d0ae8a6e9100c3a52 100644
--- a/GUI/Model/Sample/RotationItems.cpp
+++ b/GUI/Model/Sample/RotationItems.cpp
@@ -15,7 +15,7 @@
#include "GUI/Model/Sample/RotationItems.h"
#include "Base/Const/Units.h"
#include "Base/Vector/RotMatrix.h"
-#include "GUI/Model/XML/Serialize.h"
+#include "GUI/Support/XML/Serialize.h"
#include "Sample/Scattering/Rotations.h"
using namespace Units;
diff --git a/GUI/Support/Data/SimulationOptionsItem.cpp b/GUI/Support/Data/SimulationOptionsItem.cpp
index 2f56daf18371387671ebddff910127bb7e0f647f..34aafa24768ce6678dfbe8644c38ea3d31d61606 100644
--- a/GUI/Support/Data/SimulationOptionsItem.cpp
+++ b/GUI/Support/Data/SimulationOptionsItem.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Support/Data/SimulationOptionsItem.h"
-#include "GUI/Support/Data/XML.h"
+#include "GUI/Support/XML/UtilXML.h"
#include "GUI/Util/DeserializationException.h"
#include <QXmlStreamWriter>
#include <thread>
diff --git a/GUI/Model/XML/XMLUtil.h b/GUI/Support/XML/Backup.h
similarity index 85%
rename from GUI/Model/XML/XMLUtil.h
rename to GUI/Support/XML/Backup.h
index 121c3e07e0674be13c82c728a4e222625be7d560..a81d77de98b16eebbb2aa442eb49f842430463d1 100644
--- a/GUI/Model/XML/XMLUtil.h
+++ b/GUI/Support/XML/Backup.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/XML/XMLUtil.h
+//! @file GUI/Support/XML/Backup.h
//! @brief Defines GUI::Util namespace
//!
//! @homepage http://www.bornagainproject.org
@@ -12,11 +12,11 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODEL_XML_XMLUTIL_H
-#define BORNAGAIN_GUI_MODEL_XML_XMLUTIL_H
+#ifndef BORNAGAIN_GUI_SUPPORT_XML_BACKUP_H
+#define BORNAGAIN_GUI_SUPPORT_XML_BACKUP_H
#include "Base/Util/Assert.h"
-#include "GUI/Model/XML/Streamer.h"
+#include "GUI/Support/XML/Streamer.h"
namespace GUI::Util {
@@ -50,4 +50,4 @@ void copyContents(const T* source, T* dest)
} // namespace GUI::Util
-#endif // BORNAGAIN_GUI_MODEL_XML_XMLUTIL_H
+#endif // BORNAGAIN_GUI_SUPPORT_XML_BACKUP_H
diff --git a/GUI/Model/XML/Serialize.cpp b/GUI/Support/XML/Serialize.cpp
similarity index 97%
rename from GUI/Model/XML/Serialize.cpp
rename to GUI/Support/XML/Serialize.cpp
index 7ab12a9feb32a4bec9b5064d9e352788936cb4d5..1ae690c48b72ce3cc97f66ba1858b66226b1b3ed 100644
--- a/GUI/Model/XML/Serialize.cpp
+++ b/GUI/Support/XML/Serialize.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/XML/Serialize.cpp
+//! @file GUI/Support/XML/Serialize.cpp
//! @brief Implements class Streamer
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#include "GUI/Model/XML/Serialize.h"
-#include "GUI/Support/Data/XML.h"
+#include "GUI/Support/XML/Serialize.h"
+#include "GUI/Support/XML/UtilXML.h"
#include <QColor>
void Serialize::rwValue(Streamer& s, const QString& tag, bool& val)
diff --git a/GUI/Model/XML/Serialize.h b/GUI/Support/XML/Serialize.h
similarity index 96%
rename from GUI/Model/XML/Serialize.h
rename to GUI/Support/XML/Serialize.h
index 427c9f04e4eba87298a710f46de05a6cc98cf2fe..dceff9b69f084bfd854437030e63045668fd2392 100644
--- a/GUI/Model/XML/Serialize.h
+++ b/GUI/Support/XML/Serialize.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/XML/Serialize.h
+//! @file GUI/Support/XML/Serialize.h
//! @brief Defines class Streamer
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODEL_XML_SERIALIZE_H
-#define BORNAGAIN_GUI_MODEL_XML_SERIALIZE_H
+#ifndef BORNAGAIN_GUI_SUPPORT_XML_SERIALIZE_H
+#define BORNAGAIN_GUI_SUPPORT_XML_SERIALIZE_H
-#include "GUI/Model/XML/Streamer.h"
+#include "GUI/Support/XML/Streamer.h"
#include <memory>
//! Functions to serialize various data types.
@@ -184,4 +184,4 @@ void Serialize::rwInitializable(Streamer& s, const QString& tag, std::unique_ptr
}
}
-#endif // BORNAGAIN_GUI_MODEL_XML_SERIALIZE_H
+#endif // BORNAGAIN_GUI_SUPPORT_XML_SERIALIZE_H
diff --git a/GUI/Model/XML/Streamer.cpp b/GUI/Support/XML/Streamer.cpp
similarity index 95%
rename from GUI/Model/XML/Streamer.cpp
rename to GUI/Support/XML/Streamer.cpp
index 2461f0ddfca5bda6d4a2176fcb787ac14dd5ea15..83527fa14ddbdd62f06ac2d58831aa45f1555e72 100644
--- a/GUI/Model/XML/Streamer.cpp
+++ b/GUI/Support/XML/Streamer.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/XML/Streamer.cpp
+//! @file GUI/Support/XML/Streamer.cpp
//! @brief Implements class Streamer
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#include "GUI/Model/XML/Streamer.h"
-#include "GUI/Support/Data/XML.h"
+#include "GUI/Support/XML/Streamer.h"
+#include "GUI/Support/XML/UtilXML.h"
#include "GUI/Util/DeserializationException.h"
void Streamer::writeVersion(unsigned version) const
diff --git a/GUI/Model/XML/Streamer.h b/GUI/Support/XML/Streamer.h
similarity index 94%
rename from GUI/Model/XML/Streamer.h
rename to GUI/Support/XML/Streamer.h
index 69edec3b3866661ab7f3404f245a9ab2ca538c2f..483bf709161d59af6a027be7effa17c25a0472b8 100644
--- a/GUI/Model/XML/Streamer.h
+++ b/GUI/Support/XML/Streamer.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/XML/Streamer.h
+//! @file GUI/Support/XML/Streamer.h
//! @brief Defines class Streamer
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODEL_XML_STREAMER_H
-#define BORNAGAIN_GUI_MODEL_XML_STREAMER_H
+#ifndef BORNAGAIN_GUI_SUPPORT_XML_STREAMER_H
+#define BORNAGAIN_GUI_SUPPORT_XML_STREAMER_H
#include "Base/Util/Assert.h"
#include <QXmlStreamWriter> // used in every including file
@@ -102,4 +102,4 @@ void Streamer::read(const QString& tag, typename Catalog::CatalogedType*& p,
gotoEndElementOfTag(tag);
}
-#endif // BORNAGAIN_GUI_MODEL_XML_STREAMER_H
+#endif // BORNAGAIN_GUI_SUPPORT_XML_STREAMER_H
diff --git a/GUI/Support/Data/XML.cpp b/GUI/Support/XML/UtilXML.cpp
similarity index 98%
rename from GUI/Support/Data/XML.cpp
rename to GUI/Support/XML/UtilXML.cpp
index 5cf92825dd92b31e94b39c3391b56f634950e55d..9da1c38fc80a65a90094a8b33684ace45158c2d0 100644
--- a/GUI/Support/Data/XML.cpp
+++ b/GUI/Support/XML/UtilXML.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Support/Data/XML.cpp
+//! @file GUI/Support/XML/UtilXML.cpp
//! @brief Implements
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Support/Data/XML.h"
+#include "GUI/Support/XML/UtilXML.h"
#include "Base/Util/Assert.h"
#include "GUI/Util/ComboProperty.h"
#include "GUI/Util/DeserializationException.h"
diff --git a/GUI/Support/Data/XML.h b/GUI/Support/XML/UtilXML.h
similarity index 94%
rename from GUI/Support/Data/XML.h
rename to GUI/Support/XML/UtilXML.h
index 79d06470043827478d3924a6b2d37e0bdf4895f6..66eae02d76d387c7144b6130129d09c5421b31a3 100644
--- a/GUI/Support/Data/XML.h
+++ b/GUI/Support/XML/UtilXML.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Support/Data/XML.h
+//! @file GUI/Support/XML/UtilXML.h
//! @brief Defines
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_SUPPORT_DATA_XML_H
-#define BORNAGAIN_GUI_SUPPORT_DATA_XML_H
+#ifndef BORNAGAIN_GUI_SUPPORT_XML_UTILXML_H
+#define BORNAGAIN_GUI_SUPPORT_XML_UTILXML_H
#include <QVariant>
#include <QXmlStreamWriter> // used in every including file
@@ -76,4 +76,4 @@ void assertExpectedTag(QXmlStreamReader* reader, const QString& tag);
} // namespace GUI::Session::XML
-#endif // BORNAGAIN_GUI_SUPPORT_DATA_XML_H
+#endif // BORNAGAIN_GUI_SUPPORT_XML_UTILXML_H
diff --git a/GUI/View/Instrument/DistributionEditor.cpp b/GUI/View/Instrument/DistributionEditor.cpp
index 91ccc41c259da27726e6f0c957554a5a5f71c9a1..87f5683d63b882e98172f632d20153a19d84bb80 100644
--- a/GUI/View/Instrument/DistributionEditor.cpp
+++ b/GUI/View/Instrument/DistributionEditor.cpp
@@ -16,8 +16,8 @@
#include "GUI/Model/CatDevice/DistributionItemCatalog.h"
#include "GUI/Model/Descriptor/DistributionItems.h"
#include "GUI/Model/Device/BeamDistributionItem.h"
-#include "GUI/Model/XML/Streamer.h"
-#include "GUI/Model/XML/XMLUtil.h"
+#include "GUI/Support/XML/Streamer.h"
+#include "GUI/Support/XML/Backup.h"
#include "GUI/View/Instrument/DistributionForms.h"
#include "GUI/View/Instrument/EditDistributionDialog.h"
#include "GUI/View/PropertyEditor/GroupInfoBox.h"
diff --git a/GUI/View/SampleDesigner/MaterialInplaceForm.cpp b/GUI/View/SampleDesigner/MaterialInplaceForm.cpp
index 604642203e269702925a37eb98a4e778c5f170c2..539cb2da06d73241c7604ab19bbc927c094f51a7 100644
--- a/GUI/View/SampleDesigner/MaterialInplaceForm.cpp
+++ b/GUI/View/SampleDesigner/MaterialInplaceForm.cpp
@@ -20,7 +20,7 @@
#include "GUI/Model/Sample/MaterialItem.h"
#include "GUI/Model/Sample/MaterialItems.h"
#include "GUI/Model/Sample/MultiLayerItem.h"
-#include "GUI/Model/XML/XMLUtil.h"
+#include "GUI/Support/XML/Backup.h"
#include "GUI/View/Edit/DoubleLineEdit.h"
#include "GUI/View/Edit/DoubleSpinBox.h"
#include "GUI/View/Global/Globals.h"
diff --git a/GUI/View/SampleDesigner/SampleEditorCommands.cpp b/GUI/View/SampleDesigner/SampleEditorCommands.cpp
index 11b97ffb492138d549517d111f308f8b743d3f45..ad23273aa5b5b2385d89fc6424ff9cbccf724b77 100644
--- a/GUI/View/SampleDesigner/SampleEditorCommands.cpp
+++ b/GUI/View/SampleDesigner/SampleEditorCommands.cpp
@@ -15,7 +15,7 @@
#include "GUI/View/SampleDesigner/SampleEditorCommands.h"
#include "GUI/Model/Sample/LayerItem.h"
#include "GUI/Model/Sample/MultiLayerItem.h"
-#include "GUI/Model/XML/Streamer.h"
+#include "GUI/Support/XML/Streamer.h"
#include "GUI/View/SampleDesigner/MultiLayerForm.h"
#include "GUI/View/SampleDesigner/SampleEditorController.h"
#include <utility>
diff --git a/Tests/Unit/GUI/TestMaterialItems.cpp b/Tests/Unit/GUI/TestMaterialItems.cpp
index f607684bb11372f94363e534c60464df449ad0be..0e787fac156df2af29c67d1d56ea4448f8603b63 100644
--- a/Tests/Unit/GUI/TestMaterialItems.cpp
+++ b/Tests/Unit/GUI/TestMaterialItems.cpp
@@ -1,7 +1,7 @@
#include "GUI/Model/Descriptor/DoubleDescriptor.h"
#include "GUI/Model/Sample/MaterialItem.h"
#include "GUI/Model/Sample/MaterialItems.h"
-#include "GUI/Model/XML/XMLUtil.h"
+#include "GUI/Support/XML/Backup.h"
#include "Tests/GTestWrapper/google_test.h"
#include <memory>
diff --git a/Tests/Unit/GUI/TestSessionXML.cpp b/Tests/Unit/GUI/TestSessionXML.cpp
index 36722c1e924de90a531c7241eb6e2672c1c7a022..df4b08d920f244f78c742416ac3096e8dcbc5385 100644
--- a/Tests/Unit/GUI/TestSessionXML.cpp
+++ b/Tests/Unit/GUI/TestSessionXML.cpp
@@ -10,8 +10,8 @@
#include "GUI/Model/Sample/MultiLayerItem.h"
#include "GUI/Model/Sample/ParticleItem.h"
#include "GUI/Model/Sample/ParticleLayoutItem.h"
-#include "GUI/Model/XML/Streamer.h"
-#include "GUI/Model/XML/XMLUtil.h"
+#include "GUI/Support/XML/Streamer.h"
+#include "GUI/Support/XML/Backup.h"
#include "Tests/GTestWrapper/google_test.h"
#include <QXmlStreamReader>
#include <QXmlStreamWriter>
diff --git a/Tests/Unit/GUI/Utils.h b/Tests/Unit/GUI/Utils.h
index 6220db32194c58469541dddab60a9c7162a2be0f..4c331fb4d7e38aa1aab51b34926f4388f6599771 100644
--- a/Tests/Unit/GUI/Utils.h
+++ b/Tests/Unit/GUI/Utils.h
@@ -18,7 +18,7 @@
#include "GUI/Model/BaseItem/PropertyItem.h"
#include "GUI/Model/Model/SessionXML.h"
-#include "GUI/Support/Data/XML.h"
+#include "GUI/Support/XML/UtilXML.h"
#include <QString>
#include <QXmlStreamWriter>