diff --git a/Core/Export/PyFmt2.cpp b/Core/Export/PyFmt2.cpp
index b2f4fc65b748ccf63db37191f7d2bd33855b508e..d4aa7930f5106e52597b2361f63d81299d556f52 100644
--- a/Core/Export/PyFmt2.cpp
+++ b/Core/Export/PyFmt2.cpp
@@ -17,8 +17,8 @@
 #include "Base/Axis/PointwiseAxis.h"
 #include "Base/Const/Units.h"
 #include "Base/Math/Constants.h"
-#include "Base/Util/Algorithms.h"
 #include "Base/Py/PyFmt.h"
+#include "Base/Util/Algorithms.h"
 #include "Base/Util/StringUtils.h"
 #include "Core/Export/PyFmtLimits.h"
 #include "Device/Mask/Ellipse.h"
diff --git a/Core/Export/SampleToPython.cpp b/Core/Export/SampleToPython.cpp
index ed8632c17c9f1577efa539c57482d8bf46bd653b..46932f75f3a56307172db65006351f8b38f2642b 100644
--- a/Core/Export/SampleToPython.cpp
+++ b/Core/Export/SampleToPython.cpp
@@ -13,8 +13,8 @@
 //  ************************************************************************************************
 
 #include "Core/Export/SampleToPython.h"
-#include "Base/Util/Assert.h"
 #include "Base/Py/PyFmt.h"
+#include "Base/Util/Assert.h"
 #include "Base/Vector/RotMatrix.h"
 #include "Core/Export/ComponentKeyHandler.h"
 #include "Core/Export/MaterialKeyHandler.h"
diff --git a/Core/Export/SimulationToPython.cpp b/Core/Export/SimulationToPython.cpp
index ff43d6b1b2271abd1742e195dafbe45e220786e3..92311368aadde467437ea480a767f71c2844eedc 100644
--- a/Core/Export/SimulationToPython.cpp
+++ b/Core/Export/SimulationToPython.cpp
@@ -13,8 +13,8 @@
 //  ************************************************************************************************
 
 #include "Core/Export/SimulationToPython.h"
-#include "Base/Util/Algorithms.h"
 #include "Base/Py/PyFmt.h"
+#include "Base/Util/Algorithms.h"
 #include "Core/Background/ConstantBackground.h"
 #include "Core/Background/PoissonNoiseBackground.h"
 #include "Core/Export/PyFmt2.h"
diff --git a/Device/Histo/HistoUtils.cpp b/Device/Histo/HistoUtils.cpp
index 89cd850ab0f4437b11618a72ba4a73bc659f43cc..a44512186a19f6e0865160f338cec62731ab448d 100644
--- a/Device/Histo/HistoUtils.cpp
+++ b/Device/Histo/HistoUtils.cpp
@@ -81,7 +81,8 @@ double DataUtils::Histo::getRelativeDifference(const IHistogram& dat, const IHis
 
 //! Returns true is relative difference is below threshold; prints informative output
 bool DataUtils::Histo::checkRelativeDifference(const OutputData<double>& dat,
-                                              const OutputData<double>& ref, const double threshold)
+                                               const OutputData<double>& ref,
+                                               const double threshold)
 {
     const std::unique_ptr<const IHistogram> histo(IHistogram::createHistogram(dat));
     if (histo->getMinimum() == 0 && histo->getMaximum() == 0) {
diff --git a/GUI/Model/BaseItem/GroupItemController.cpp b/GUI/Model/BaseItem/GroupItemController.cpp
index 91450b9a8c784105976f568d7793ebb655c4f7ee..55a81b701f16925933c2ad0f9465543954a24a61 100644
--- a/GUI/Model/BaseItem/GroupItemController.cpp
+++ b/GUI/Model/BaseItem/GroupItemController.cpp
@@ -14,8 +14,8 @@
 
 #include "GUI/Model/BaseItem/GroupItemController.h"
 
-#include "GUI/Model/MakeItem/ItemFactory.h"
 #include "GUI/Model/BaseItem/SessionItem.h"
+#include "GUI/Model/MakeItem/ItemFactory.h"
 #include "GUI/Util/ComboProperty.h"
 #include <utility>
 
diff --git a/GUI/Model/BaseItem/SessionItem.cpp b/GUI/Model/BaseItem/SessionItem.cpp
index 4ba4116c8f2b73d7fe818cbc9ef9cffd61bf3218..27b2d182f36425831a09f30a0312ffb6c636c7e2 100644
--- a/GUI/Model/BaseItem/SessionItem.cpp
+++ b/GUI/Model/BaseItem/SessionItem.cpp
@@ -12,9 +12,9 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Model/MakeItem/ItemFactory.h"
 #include "GUI/Model/BaseItem/GroupItem.h"
 #include "GUI/Model/BaseItem/PropertyItem.h"
+#include "GUI/Model/MakeItem/ItemFactory.h"
 #include "GUI/Model/Model/SessionModel.h"
 #include "GUI/Support/Data/SessionFlags.h"
 #include "GUI/Support/Data/SessionItemData.h"
diff --git a/GUI/Model/Item/BeamItems.cpp b/GUI/Model/Item/BeamItems.cpp
index 8604f1c2e19db34e1c1a4b48d1b59c94bdab16fc..d8157c29e478288700e04c00b199413770169c0f 100644
--- a/GUI/Model/Item/BeamItems.cpp
+++ b/GUI/Model/Item/BeamItems.cpp
@@ -16,11 +16,11 @@
 #include "Base/Axis/IAxis.h"
 #include "Base/Const/Units.h"
 #include "Device/Beam/Beam.h"
-#include "GUI/Model/Item/PointwiseAxisItem.h"
 #include "GUI/Model/BaseItem/GroupItem.h"
 #include "GUI/Model/Item/BeamAngleItems.h"
 #include "GUI/Model/Item/BeamWavelengthItem.h"
 #include "GUI/Model/Item/FootprintItems.h"
+#include "GUI/Model/Item/PointwiseAxisItem.h"
 #include "GUI/Model/Item/VectorItem.h"
 #include <cmath>
 
diff --git a/GUI/Model/Item/BeamItems.h b/GUI/Model/Item/BeamItems.h
index 1e9182385dfe4d4d803a9d5dfebc667d005def7f..73315555c4b4601d242116f0aaf0eec5115fa723 100644
--- a/GUI/Model/Item/BeamItems.h
+++ b/GUI/Model/Item/BeamItems.h
@@ -15,8 +15,8 @@
 #ifndef BORNAGAIN_GUI_MODEL_ITEM_BEAMITEMS_H
 #define BORNAGAIN_GUI_MODEL_ITEM_BEAMITEMS_H
 
-#include "GUI/Model/Item/SpecularBeamInclinationItem.h"
 #include "GUI/Model/BaseItem/SessionItem.h"
+#include "GUI/Model/Item/SpecularBeamInclinationItem.h"
 #include <heinz/Vectors3D.h>
 
 class BasicAxisItem;
diff --git a/GUI/Model/Item/Data1DViewItem.cpp b/GUI/Model/Item/Data1DViewItem.cpp
index 4208df3396184b9149cd4e01024ac9438cba2b34..832ba9135711e7f6a234f999d1f1139b825dc6df 100644
--- a/GUI/Model/Item/Data1DViewItem.cpp
+++ b/GUI/Model/Item/Data1DViewItem.cpp
@@ -14,11 +14,11 @@
 
 #include "GUI/Model/Item/Data1DViewItem.h"
 #include "GUI/Model/Item/AxesItems.h"
-#include "GUI/Model/Item/JobItem.h"
+#include "GUI/Model/Item/DataItem.h"
 #include "GUI/Model/Item/DataProperties.h"
 #include "GUI/Model/Item/DataPropertyContainer.h"
 #include "GUI/Model/Item/DataViewUtils.h"
-#include "GUI/Model/Item/DataItem.h"
+#include "GUI/Model/Item/JobItem.h"
 #include "GUI/Util/ComboProperty.h"
 #include "GUI/Util/Error.h"
 
diff --git a/GUI/Model/Item/Data1DViewItem.h b/GUI/Model/Item/Data1DViewItem.h
index 0313060d43536989c70afbcce4697aa0e6c66fed..47a0dd0b123c332fab4c6550c8768dea5b1b0c2d 100644
--- a/GUI/Model/Item/Data1DViewItem.h
+++ b/GUI/Model/Item/Data1DViewItem.h
@@ -15,8 +15,8 @@
 #ifndef BORNAGAIN_GUI_MODEL_ITEM_DATA1DVIEWITEM_H
 #define BORNAGAIN_GUI_MODEL_ITEM_DATA1DVIEWITEM_H
 
-#include "GUI/Model/Group/SelectionDescriptor.h"
 #include "GUI/Model/BaseItem/SessionItem.h"
+#include "GUI/Model/Group/SelectionDescriptor.h"
 
 class AmplitudeAxisItem;
 class BasicAxisItem;
diff --git a/GUI/Model/Item/DataItem.h b/GUI/Model/Item/DataItem.h
index 341842f22e1334c8296cd3e26dc1327d5c934075..f6f301f864f14e08062db7deacb581cd20c263b3 100644
--- a/GUI/Model/Item/DataItem.h
+++ b/GUI/Model/Item/DataItem.h
@@ -16,8 +16,8 @@
 #define BORNAGAIN_GUI_MODEL_ITEM_DATAITEM_H
 
 #include "Device/Data/OutputData.h"
-#include "GUI/Model/Group/SelectionDescriptor.h"
 #include "GUI/Model/BaseItem/SessionItem.h"
+#include "GUI/Model/Group/SelectionDescriptor.h"
 #include "GUI/Support/IO/SaveLoadInterface.h"
 #include <QDateTime>
 #include <mutex>
diff --git a/GUI/Model/Item/DataProperties.cpp b/GUI/Model/Item/DataProperties.cpp
index f4d3759e1cd8a7c6f554d072f0372f4c90ee1449..9dcf1959c71b5161652a0ca3a3c915b53d04e2dd 100644
--- a/GUI/Model/Item/DataProperties.cpp
+++ b/GUI/Model/Item/DataProperties.cpp
@@ -13,9 +13,9 @@
 //  ************************************************************************************************
 
 #include "GUI/Model/Item/DataProperties.h"
-#include "GUI/Model/Item/JobItem.h"
-#include "GUI/Model/Item/InstrumentItems.h"
 #include "GUI/Model/Item/DataItem.h"
+#include "GUI/Model/Item/InstrumentItems.h"
+#include "GUI/Model/Item/JobItem.h"
 #include "GUI/Model/Model/SessionModel.h"
 #include "GUI/Util/ComboProperty.h"
 #include "GUI/Util/Error.h"
diff --git a/GUI/Model/Item/DataPropertyContainer.cpp b/GUI/Model/Item/DataPropertyContainer.cpp
index 7e821351e7262cfaafada1bbf4c6d51806078777..ec12fcc31acd2107bd6468977cb03ae9719ae14f 100644
--- a/GUI/Model/Item/DataPropertyContainer.cpp
+++ b/GUI/Model/Item/DataPropertyContainer.cpp
@@ -13,8 +13,8 @@
 //  ************************************************************************************************
 
 #include "GUI/Model/Item/DataPropertyContainer.h"
-#include "GUI/Model/Item/DataProperties.h"
 #include "GUI/Model/Item/DataItem.h"
+#include "GUI/Model/Item/DataProperties.h"
 #include "GUI/Util/Error.h"
 
 DataPropertyContainer::DataPropertyContainer()
diff --git a/GUI/Model/Item/DataViewUtils.cpp b/GUI/Model/Item/DataViewUtils.cpp
index 06f58f5957d2d58973f26b25d0c89cfb1109e99f..aab2550b32bb7b90ba0a598c864256c553a92794 100644
--- a/GUI/Model/Item/DataViewUtils.cpp
+++ b/GUI/Model/Item/DataViewUtils.cpp
@@ -14,10 +14,10 @@
 
 #include "GUI/Model/Item/DataViewUtils.h"
 #include "Device/Coord/ICoordSystem.h"
-#include "GUI/Model/Item/JobItem.h"
-#include "GUI/Model/Item/InstrumentItems.h"
 #include "GUI/Model/Item/Data1DViewItem.h"
 #include "GUI/Model/Item/DataItem.h"
+#include "GUI/Model/Item/InstrumentItems.h"
+#include "GUI/Model/Item/JobItem.h"
 #include "GUI/Util/CoordName.h"
 
 namespace {
diff --git a/GUI/Model/Item/DetectorItems.cpp b/GUI/Model/Item/DetectorItems.cpp
index a11270f256458ed0468a6b1889053fa62b3ae1a3..1f4ef2e282acf77a3118d1ece4704b5535cf81e6 100644
--- a/GUI/Model/Item/DetectorItems.cpp
+++ b/GUI/Model/Item/DetectorItems.cpp
@@ -17,9 +17,9 @@
 #include "Device/Mask/IShape2D.h"
 #include "Device/Resolution/ResolutionFunction2DGaussian.h"
 #include "GUI/Model/Group/GroupInfo.h"
+#include "GUI/Model/Item/MaskItems.h"
 #include "GUI/Model/Item/ResolutionFunctionItems.h"
 #include "GUI/Model/Item/SphericalDetectorItem.h"
-#include "GUI/Model/Item/MaskItems.h"
 #include "GUI/Model/Model/SessionModel.h"
 
 namespace {
diff --git a/GUI/Model/Item/InstrumentItems.cpp b/GUI/Model/Item/InstrumentItems.cpp
index 8a8b9ae31c6ad0c90d1b2333bc495fca3a0589c9..eb5144414e043154b6835c3db7f2ba9bc4df1904 100644
--- a/GUI/Model/Item/InstrumentItems.cpp
+++ b/GUI/Model/Item/InstrumentItems.cpp
@@ -21,12 +21,12 @@
 #include "Device/Coord/CoordSystem2D.h"
 #include "Device/Detector/RectangularDetector.h"
 #include "Device/Detector/SphericalDetector.h"
-#include "GUI/Model/Item/PointwiseAxisItem.h"
-#include "GUI/Model/Item/RealDataItem.h"
 #include "GUI/Model/BaseItem/GroupItem.h"
 #include "GUI/Model/Item/BackgroundItems.h"
 #include "GUI/Model/Item/BeamWavelengthItem.h"
 #include "GUI/Model/Item/DetectorItems.h"
+#include "GUI/Model/Item/PointwiseAxisItem.h"
+#include "GUI/Model/Item/RealDataItem.h"
 #include "GUI/Model/Item/RectangularDetectorItem.h"
 #include "GUI/Model/Item/SphericalDetectorItem.h"
 #include "GUI/Model/Item/VectorItem.h"
diff --git a/GUI/Model/Item/InterferenceItems.cpp b/GUI/Model/Item/InterferenceItems.cpp
index c0094b9a4d019635ba138b8be4e9080a456df1a2..dfe0026e93a1c2152679bcb5e83f7bee8c6c5268 100644
--- a/GUI/Model/Item/InterferenceItems.cpp
+++ b/GUI/Model/Item/InterferenceItems.cpp
@@ -14,12 +14,12 @@
 
 #include "GUI/Model/Item/InterferenceItems.h"
 #include "Base/Const/Units.h"
-#include "GUI/Model/MakeItem/FTDecayFunctionItemCatalogs.h"
 #include "GUI/Model/Item/FTDecayFunctionItems.h"
-#include "GUI/Model/MakeItem/FTDistributionItemCatalogs.h"
 #include "GUI/Model/Item/FTDistributionItems.h"
-#include "GUI/Model/MakeItem/Lattice2DItemCatalog.h"
 #include "GUI/Model/Item/Lattice2DItems.h"
+#include "GUI/Model/MakeItem/FTDecayFunctionItemCatalogs.h"
+#include "GUI/Model/MakeItem/FTDistributionItemCatalogs.h"
+#include "GUI/Model/MakeItem/Lattice2DItemCatalog.h"
 #include "GUI/Model/Types/UIntDescriptor.h"
 #include "GUI/Model/XML/Serializer.h"
 #include "Sample/Aggregate/Interferences.h"
diff --git a/GUI/Model/Item/JobFunctions.cpp b/GUI/Model/Item/JobFunctions.cpp
index 52d74716c161675cbf3c7e76a319351d326129f2..900c1a62fa26ed766493ec68aba87c3db0b1958a 100644
--- a/GUI/Model/Item/JobFunctions.cpp
+++ b/GUI/Model/Item/JobFunctions.cpp
@@ -15,19 +15,19 @@
 #include "GUI/Model/Item/JobFunctions.h"
 #include "Base/Util/Assert.h"
 #include "Device/Instrument/Instrument.h"
-#include "GUI/Model/Item/PointwiseAxisItem.h"
-#include "GUI/Model/Item/IntensityDataItem.h"
-#include "GUI/Model/Item/RealDataItem.h"
-#include "GUI/Model/Item/SpecularDataItem.h"
+#include "GUI/Model/Item/Data1DViewItem.h"
+#include "GUI/Model/Item/DataPropertyContainer.h"
 #include "GUI/Model/Item/FitSuiteItem.h"
-#include "GUI/Model/Item/JobItem.h"
-#include "GUI/Model/Item/MinimizerItem.h"
 #include "GUI/Model/Item/InstrumentItems.h"
+#include "GUI/Model/Item/IntensityDataItem.h"
+#include "GUI/Model/Item/ItemWithMaterial.h"
+#include "GUI/Model/Item/JobItem.h"
 #include "GUI/Model/Item/JobItemUtils.h"
 #include "GUI/Model/Item/MaterialItem.h"
-#include "GUI/Model/Item/Data1DViewItem.h"
-#include "GUI/Model/Item/DataPropertyContainer.h"
-#include "GUI/Model/Item/ItemWithMaterial.h"
+#include "GUI/Model/Item/MinimizerItem.h"
+#include "GUI/Model/Item/PointwiseAxisItem.h"
+#include "GUI/Model/Item/RealDataItem.h"
+#include "GUI/Model/Item/SpecularDataItem.h"
 #include "GUI/Support/IO/ItemFileNameUtils.h"
 #include "GUI/Util/Error.h"
 #include "GUI/Util/Path.h"
diff --git a/GUI/Model/Item/JobItem.cpp b/GUI/Model/Item/JobItem.cpp
index 329b1ba03acf6e74d9f4c49eda0617d5fd10496c..558690711ed3a04f157f98354457c41f97cdc1af 100644
--- a/GUI/Model/Item/JobItem.cpp
+++ b/GUI/Model/Item/JobItem.cpp
@@ -14,14 +14,14 @@
 
 #include "GUI/Model/Item/JobItem.h"
 #include "Base/Util/Assert.h"
-#include "GUI/Model/Item/IntensityDataItem.h"
-#include "GUI/Model/Item/RealDataItem.h"
-#include "GUI/Model/Item/SpecularDataItem.h"
+#include "GUI/Model/Item/Data1DViewItem.h"
 #include "GUI/Model/Item/FitSuiteItem.h"
 #include "GUI/Model/Item/InstrumentItems.h"
-#include "GUI/Model/Item/JobItemUtils.h"
-#include "GUI/Model/Item/Data1DViewItem.h"
+#include "GUI/Model/Item/IntensityDataItem.h"
 #include "GUI/Model/Item/ItemWithMaterial.h"
+#include "GUI/Model/Item/JobItemUtils.h"
+#include "GUI/Model/Item/RealDataItem.h"
+#include "GUI/Model/Item/SpecularDataItem.h"
 #include "GUI/Support/Data/XML.h"
 #include "GUI/Support/IO/ItemFileNameUtils.h"
 #include "GUI/Util/DeserializationException.h"
diff --git a/GUI/Model/Item/JobItem.h b/GUI/Model/Item/JobItem.h
index 66d1af3797e5c075f0a16a981526f4769ccee3d2..1d3418bda7ea2c58864b2cd5fc73aa5d81a1999c 100644
--- a/GUI/Model/Item/JobItem.h
+++ b/GUI/Model/Item/JobItem.h
@@ -15,12 +15,12 @@
 #ifndef BORNAGAIN_GUI_MODEL_ITEM_JOBITEM_H
 #define BORNAGAIN_GUI_MODEL_ITEM_JOBITEM_H
 
+#include "GUI/Model/BaseItem/SessionItem.h"
+#include "GUI/Model/Item/MultiLayerItem.h"
 #include "GUI/Model/Item/ParameterTreeItems.h"
 #include "GUI/Model/Model/MaterialModel.h"
-#include "GUI/Model/Item/MultiLayerItem.h"
-#include "GUI/Model/BaseItem/SessionItem.h"
 #include "GUI/Model/Model/SessionModel.h" // call to model() from templated fct
-#include "GUI/Support/Data/JobStatus.h"     // enum cannot be forward declared
+#include "GUI/Support/Data/JobStatus.h"   // enum cannot be forward declared
 #include "GUI/Support/Data/SimulationOptionsItem.h"
 #include <QDateTime>
 #include <optional>
diff --git a/GUI/Model/Item/JobItemUtils.cpp b/GUI/Model/Item/JobItemUtils.cpp
index d66ac1aa0e46fec475a261e7652f8a700702498f..7cfcd6d91b7f2a9c6cd07e5523ff4b51cdea4469 100644
--- a/GUI/Model/Item/JobItemUtils.cpp
+++ b/GUI/Model/Item/JobItemUtils.cpp
@@ -15,8 +15,8 @@
 #include "GUI/Model/Item/JobItemUtils.h"
 #include "Core/Simulation/ISimulation.h"
 #include "Device/Histo/SimulationResult.h"
-#include "GUI/Model/Item/InstrumentItems.h"
 #include "GUI/Model/Item/DataItem.h"
+#include "GUI/Model/Item/InstrumentItems.h"
 #include "GUI/Util/CoordName.h"
 
 namespace {
diff --git a/GUI/Model/Item/LayerRoughnessItems.cpp b/GUI/Model/Item/LayerRoughnessItems.cpp
index ea99394fa918c3215073dc0b28965cebae9a19cb..fcfb6fe7ecb2d5b85a5518151bb2dbe4080e52cc 100644
--- a/GUI/Model/Item/LayerRoughnessItems.cpp
+++ b/GUI/Model/Item/LayerRoughnessItems.cpp
@@ -14,9 +14,9 @@
 
 #include "GUI/Model/Item/LayerRoughnessItems.h"
 
+#include "GUI/Model/Model/SessionXML.h"
 #include "GUI/Model/Types/DoubleDescriptor.h"
 #include "GUI/Model/XML/Serializer.h"
-#include "GUI/Model/Model/SessionXML.h"
 
 using namespace GUI::Session::XML;
 
diff --git a/GUI/Model/Item/MesoCrystalItem.cpp b/GUI/Model/Item/MesoCrystalItem.cpp
index aa978db5a4063e4535cac1af7b0acdf41381177d..f58cf465186440410dad32d0ffcddfd587bba06b 100644
--- a/GUI/Model/Item/MesoCrystalItem.cpp
+++ b/GUI/Model/Item/MesoCrystalItem.cpp
@@ -13,12 +13,12 @@
 //  ************************************************************************************************
 
 #include "GUI/Model/Item/MesoCrystalItem.h"
-#include "GUI/Model/MakeItem/FormFactorItemCatalog.h"
 #include "GUI/Model/Item/FormFactorItems.h"
-#include "GUI/Model/MakeItem/ItemWithParticlesCatalog.h"
 #include "GUI/Model/Item/ParticleCompositionItem.h"
 #include "GUI/Model/Item/ParticleCoreShellItem.h"
 #include "GUI/Model/Item/ParticleItem.h"
+#include "GUI/Model/MakeItem/FormFactorItemCatalog.h"
+#include "GUI/Model/MakeItem/ItemWithParticlesCatalog.h"
 #include "GUI/Model/MakeItem/RotationItemCatalog.h"
 #include "GUI/Model/XML/Serializer.h"
 #include "GUI/Util/Error.h"
diff --git a/GUI/Model/Item/MinimizerItem.h b/GUI/Model/Item/MinimizerItem.h
index e5ca8958582aec9db704a049a97b22cac20088ff..835c7ffa2e4fc80d516e706c158264d612db254b 100644
--- a/GUI/Model/Item/MinimizerItem.h
+++ b/GUI/Model/Item/MinimizerItem.h
@@ -15,8 +15,8 @@
 #ifndef BORNAGAIN_GUI_MODEL_ITEM_MINIMIZERITEM_H
 #define BORNAGAIN_GUI_MODEL_ITEM_MINIMIZERITEM_H
 
-#include "GUI/Model/Group/SelectionDescriptor.h"
 #include "GUI/Model/BaseItem/SessionItem.h"
+#include "GUI/Model/Group/SelectionDescriptor.h"
 #include "GUI/Model/Types/DoubleDescriptor.h"
 #include "GUI/Model/Types/UIntDescriptor.h"
 #include <variant>
diff --git a/GUI/Model/Item/MultiLayerItem.cpp b/GUI/Model/Item/MultiLayerItem.cpp
index 7299837459b3141974ef585cfeeb4d3a45e5dd40..863d5b8b0981650f68a4873b3171924f1fe16551 100644
--- a/GUI/Model/Item/MultiLayerItem.cpp
+++ b/GUI/Model/Item/MultiLayerItem.cpp
@@ -14,8 +14,8 @@
 
 #include "GUI/Model/Item/MultiLayerItem.h"
 #include "GUI/Model/Item/LayerItem.h"
-#include "GUI/Model/XML/Serializer.h"
 #include "GUI/Model/Model/SessionXML.h"
+#include "GUI/Model/XML/Serializer.h"
 #include <QXmlStreamWriter>
 
 MultiLayerItem::MultiLayerItem()
diff --git a/GUI/Model/Item/ParticleCompositionItem.cpp b/GUI/Model/Item/ParticleCompositionItem.cpp
index 461c5abd5f32ab416705fc5ce1d40ca7cb4b2822..732ac9924be318a4795dae04e1151f2cebe9c9b9 100644
--- a/GUI/Model/Item/ParticleCompositionItem.cpp
+++ b/GUI/Model/Item/ParticleCompositionItem.cpp
@@ -13,10 +13,10 @@
 //  ************************************************************************************************
 
 #include "GUI/Model/Item/ParticleCompositionItem.h"
-#include "GUI/Model/MakeItem/ItemWithParticlesCatalog.h"
 #include "GUI/Model/Item/MesoCrystalItem.h"
 #include "GUI/Model/Item/ParticleCoreShellItem.h"
 #include "GUI/Model/Item/ParticleItem.h"
+#include "GUI/Model/MakeItem/ItemWithParticlesCatalog.h"
 #include "GUI/Model/MakeItem/RotationItemCatalog.h"
 #include "GUI/Model/XML/Serializer.h"
 #include "Sample/Particle/MesoCrystal.h"
diff --git a/GUI/Model/Item/ParticleCoreShellItem.cpp b/GUI/Model/Item/ParticleCoreShellItem.cpp
index dc7c81f2c4e17696a9ff86835168cd8174d32c10..26bf682d0c1d4d8f7082a2797a1843b30c27e7af 100644
--- a/GUI/Model/Item/ParticleCoreShellItem.cpp
+++ b/GUI/Model/Item/ParticleCoreShellItem.cpp
@@ -13,10 +13,10 @@
 //  ************************************************************************************************
 
 #include "GUI/Model/Item/ParticleCoreShellItem.h"
-#include "GUI/Model/Model/MaterialModel.h"
 #include "GUI/Model/Item/ParticleItem.h"
-#include "GUI/Model/Types/DoubleDescriptor.h"
 #include "GUI/Model/Item/VectorItem.h"
+#include "GUI/Model/Model/MaterialModel.h"
+#include "GUI/Model/Types/DoubleDescriptor.h"
 #include "GUI/Support/Type/VariantUtil.h"
 #include "GUI/Util/Error.h"
 #include "Sample/Particle/Particle.h"
diff --git a/GUI/Model/Item/ParticleItem.cpp b/GUI/Model/Item/ParticleItem.cpp
index 7a9d4dce5a2494f1dd5a381ed94b9ae535a7a18e..19883f6a362ffcf3f453f04c929624620eeabb4c 100644
--- a/GUI/Model/Item/ParticleItem.cpp
+++ b/GUI/Model/Item/ParticleItem.cpp
@@ -13,10 +13,10 @@
 //  ************************************************************************************************
 
 #include "GUI/Model/Item/ParticleItem.h"
-#include "GUI/Model/Item/MaterialItem.h"
-#include "GUI/Model/MakeItem/FormFactorItemCatalog.h"
 #include "GUI/Model/Item/FormFactorItems.h"
+#include "GUI/Model/Item/MaterialItem.h"
 #include "GUI/Model/Item/ParticleCoreShellItem.h"
+#include "GUI/Model/MakeItem/FormFactorItemCatalog.h"
 #include "GUI/Model/MakeItem/RotationItemCatalog.h"
 #include "GUI/Model/XML/Serializer.h"
 #include "Sample/Particle/Particle.h"
diff --git a/GUI/Model/Item/ParticleLayoutItem.cpp b/GUI/Model/Item/ParticleLayoutItem.cpp
index 170a3e4d6be6093ca5611e3b827cb3c995abf2da..e1586325f7e75545609b4fbfb36ecc4f1a18950d 100644
--- a/GUI/Model/Item/ParticleLayoutItem.cpp
+++ b/GUI/Model/Item/ParticleLayoutItem.cpp
@@ -13,13 +13,13 @@
 //  ************************************************************************************************
 
 #include "GUI/Model/Item/ParticleLayoutItem.h"
-#include "GUI/Model/MakeItem/InterferenceItemCatalog.h"
 #include "GUI/Model/Item/InterferenceItems.h"
-#include "GUI/Model/MakeItem/ItemWithParticlesCatalog.h"
 #include "GUI/Model/Item/Lattice2DItems.h"
 #include "GUI/Model/Item/MesoCrystalItem.h"
 #include "GUI/Model/Item/ParticleCompositionItem.h"
 #include "GUI/Model/Item/ParticleItem.h"
+#include "GUI/Model/MakeItem/InterferenceItemCatalog.h"
+#include "GUI/Model/MakeItem/ItemWithParticlesCatalog.h"
 #include "GUI/Model/XML/Serializer.h"
 
 ParticleLayoutItem::ParticleLayoutItem()
diff --git a/GUI/Model/Item/RealDataItem.cpp b/GUI/Model/Item/RealDataItem.cpp
index 3a708629072b4b6b71a8bdf72de7f8ab626958ed..36c026ed828ee6deec6f9ac7742c68c738e071d4 100644
--- a/GUI/Model/Item/RealDataItem.cpp
+++ b/GUI/Model/Item/RealDataItem.cpp
@@ -14,13 +14,13 @@
 
 #include "GUI/Model/Item/RealDataItem.h"
 #include "Device/Data/DataUtils.h"
+#include "GUI/Model/Item/InstrumentItems.h"
 #include "GUI/Model/Item/IntensityDataItem.h"
-#include "GUI/Model/Item/SpecularDataItem.h"
 #include "GUI/Model/Item/JobItem.h"
-#include "GUI/Model/Item/InstrumentItems.h"
 #include "GUI/Model/Item/JobItemUtils.h"
 #include "GUI/Model/Item/MaskItems.h"
 #include "GUI/Model/Item/ProjectionItems.h"
+#include "GUI/Model/Item/SpecularDataItem.h"
 #include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/Model/State/SessionData.h"
 #include "GUI/Support/IO/AbstractDataLoader1D.h"
diff --git a/GUI/Model/Item/SpecularBeamInclinationItem.cpp b/GUI/Model/Item/SpecularBeamInclinationItem.cpp
index c672edf66d90070095ff1873a5903dc5d1cc1e34..f943ff318d80009a0365b5f9f26489f2582483df 100644
--- a/GUI/Model/Item/SpecularBeamInclinationItem.cpp
+++ b/GUI/Model/Item/SpecularBeamInclinationItem.cpp
@@ -14,8 +14,8 @@
 
 #include "GUI/Model/Item/SpecularBeamInclinationItem.h"
 #include "Base/Const/Units.h"
-#include "GUI/Model/Item/PointwiseAxisItem.h"
 #include "GUI/Model/BaseItem/GroupItem.h"
+#include "GUI/Model/Item/PointwiseAxisItem.h"
 
 namespace {
 
diff --git a/GUI/Model/MakeItem/ItemCatalog.cpp b/GUI/Model/MakeItem/ItemCatalog.cpp
index bc2e4e1f088a8768bda36758e02289d66be6c8ce..0876d2680da5a43b88e419626f084cb7e39e0744 100644
--- a/GUI/Model/MakeItem/ItemCatalog.cpp
+++ b/GUI/Model/MakeItem/ItemCatalog.cpp
@@ -14,40 +14,40 @@
 
 #include "GUI/Model/MakeItem/ItemCatalog.h"
 #include "Base/Util/Assert.h"
-#include "GUI/Model/Item/PointwiseAxisItem.h"
-#include "GUI/Model/Item/IntensityDataItem.h"
-#include "GUI/Model/Item/RealDataItem.h"
-#include "GUI/Model/Item/SpecularDataItem.h"
-#include "GUI/Model/Item/FitParameterContainerItem.h"
-#include "GUI/Model/Item/FitParameterItem.h"
-#include "GUI/Model/Item/FitParameterLinkItem.h"
-#include "GUI/Model/Item/FitSuiteItem.h"
-#include "GUI/Model/Item/JobItem.h"
-#include "GUI/Model/Item/MinimizerItem.h"
-#include "GUI/Model/Item/ParameterTreeItems.h"
+#include "GUI/Model/BaseItem/PropertyItem.h"
 #include "GUI/Model/Item/BackgroundItems.h"
 #include "GUI/Model/Item/BeamAngleItems.h"
 #include "GUI/Model/Item/BeamWavelengthItem.h"
-#include "GUI/Model/Item/FootprintItems.h"
-#include "GUI/Model/Item/InstrumentItems.h"
-#include "GUI/Model/Item/RectangularDetectorItem.h"
-#include "GUI/Model/Item/ResolutionFunctionItems.h"
-#include "GUI/Model/Item/SpecularBeamInclinationItem.h"
-#include "GUI/Model/Item/SphericalDetectorItem.h"
-#include "GUI/Model/Item/MaskItems.h"
-#include "GUI/Model/Item/ProjectionItems.h"
 #include "GUI/Model/Item/Data1DViewItem.h"
 #include "GUI/Model/Item/DataProperties.h"
 #include "GUI/Model/Item/DataPropertyContainer.h"
+#include "GUI/Model/Item/FitParameterContainerItem.h"
+#include "GUI/Model/Item/FitParameterItem.h"
+#include "GUI/Model/Item/FitParameterLinkItem.h"
+#include "GUI/Model/Item/FitSuiteItem.h"
+#include "GUI/Model/Item/FootprintItems.h"
 #include "GUI/Model/Item/FormFactorItems.h"
+#include "GUI/Model/Item/InstrumentItems.h"
+#include "GUI/Model/Item/IntensityDataItem.h"
 #include "GUI/Model/Item/InterferenceItems.h"
+#include "GUI/Model/Item/JobItem.h"
+#include "GUI/Model/Item/MaskItems.h"
 #include "GUI/Model/Item/MesoCrystalItem.h"
+#include "GUI/Model/Item/MinimizerItem.h"
+#include "GUI/Model/Item/ParameterTreeItems.h"
 #include "GUI/Model/Item/ParticleCompositionItem.h"
 #include "GUI/Model/Item/ParticleCoreShellItem.h"
 #include "GUI/Model/Item/ParticleItem.h"
 #include "GUI/Model/Item/ParticleLayoutItem.h"
-#include "GUI/Model/BaseItem/PropertyItem.h"
+#include "GUI/Model/Item/PointwiseAxisItem.h"
+#include "GUI/Model/Item/ProjectionItems.h"
+#include "GUI/Model/Item/RealDataItem.h"
 #include "GUI/Model/Item/RealLimitsItems.h"
+#include "GUI/Model/Item/RectangularDetectorItem.h"
+#include "GUI/Model/Item/ResolutionFunctionItems.h"
+#include "GUI/Model/Item/SpecularBeamInclinationItem.h"
+#include "GUI/Model/Item/SpecularDataItem.h"
+#include "GUI/Model/Item/SphericalDetectorItem.h"
 #include "GUI/Model/Item/VectorItem.h"
 
 ItemCatalog::ItemCatalog()
diff --git a/GUI/Model/MakeItem/ItemFactory.cpp b/GUI/Model/MakeItem/ItemFactory.cpp
index 228754a94b08200e26e5ebbda87974129bd582d5..841a38ba82cd5555a4f60cef4bf1df6df6913e8a 100644
--- a/GUI/Model/MakeItem/ItemFactory.cpp
+++ b/GUI/Model/MakeItem/ItemFactory.cpp
@@ -13,8 +13,8 @@
 //  ************************************************************************************************
 
 #include "GUI/Model/MakeItem/ItemFactory.h"
-#include "GUI/Model/MakeItem/ItemCatalog.h"
 #include "GUI/Model/BaseItem/SessionItem.h"
+#include "GUI/Model/MakeItem/ItemCatalog.h"
 
 SessionItem* GUI::Model::ItemFactory::CreateItem(const QString& model_name, SessionItem* parent)
 {
diff --git a/GUI/Model/Model/ApplicationModels.cpp b/GUI/Model/Model/ApplicationModels.cpp
index 4b55501d17e94c5fc875c8656a4bceb3efc36095..5077e34a98dfe7ea69e832f7f27d8e144a5c1d77 100644
--- a/GUI/Model/Model/ApplicationModels.cpp
+++ b/GUI/Model/Model/ApplicationModels.cpp
@@ -13,9 +13,9 @@
 //  ************************************************************************************************
 
 #include "GUI/Model/Model/ApplicationModels.h"
-#include "GUI/Model/Model/RealDataModel.h"
 #include "GUI/Model/Model/InstrumentModel.h"
 #include "GUI/Model/Model/JobModel.h"
+#include "GUI/Model/Model/RealDataModel.h"
 #include "GUI/Model/Model/SampleModel.h"
 #include "GUI/Support/Data/SimulationOptionsItem.h"
 #include "GUI/Util/DeserializationException.h"
diff --git a/GUI/Model/Model/FitParameterModel.cpp b/GUI/Model/Model/FitParameterModel.cpp
index 7d129ee741bb1ec49b2f3bc216c4bedcc6aecc43..5230a803f31ac76f5e97cc912a1ca02bda1fb889 100644
--- a/GUI/Model/Model/FitParameterModel.cpp
+++ b/GUI/Model/Model/FitParameterModel.cpp
@@ -14,9 +14,9 @@
 
 #include "GUI/Model/Model/FitParameterModel.h"
 #include "GUI/Model/Item/FitParameterContainerItem.h"
-#include "GUI/Model/Model/FitParameterHelper.h"
 #include "GUI/Model/Item/FitParameterItem.h"
 #include "GUI/Model/Item/FitParameterLinkItem.h"
+#include "GUI/Model/Model/FitParameterHelper.h"
 #include "GUI/Model/Model/JobModel.h"
 #include "GUI/Model/Model/ModelPath.h"
 #include "GUI/Model/Model/SessionXML.h"
diff --git a/GUI/Model/Model/InstrumentModel.cpp b/GUI/Model/Model/InstrumentModel.cpp
index 334872cf539e61fb15737a7f5f08476eb8bed428..8f2f47a70d51643b11ce76db4c857d0649a86508 100644
--- a/GUI/Model/Model/InstrumentModel.cpp
+++ b/GUI/Model/Model/InstrumentModel.cpp
@@ -13,9 +13,9 @@
 //  ************************************************************************************************
 
 #include "GUI/Model/Model/InstrumentModel.h"
-#include "GUI/Model/Item/PointwiseAxisItem.h"
 #include "GUI/Model/BaseItem/GroupItem.h"
 #include "GUI/Model/Item/InstrumentItems.h"
+#include "GUI/Model/Item/PointwiseAxisItem.h"
 #include "GUI/Model/Model/SessionXML.h"
 #include "GUI/Util/String.h"
 
diff --git a/GUI/Model/Model/JobModel.cpp b/GUI/Model/Model/JobModel.cpp
index ed34e7e7f39eb2b6b1740a5b0184647dde926600..f11c9ac34e4f58ff100c2c3b35e5b459c91a2cdb 100644
--- a/GUI/Model/Model/JobModel.cpp
+++ b/GUI/Model/Model/JobModel.cpp
@@ -13,17 +13,17 @@
 //  ************************************************************************************************
 
 #include "GUI/Model/Model/JobModel.h"
-#include "GUI/Model/Item/PointwiseAxisItem.h"
-#include "GUI/Model/Item/IntensityDataItem.h"
-#include "GUI/Model/Item/RealDataItem.h"
-#include "GUI/Model/Item/JobItem.h"
 #include "GUI/Model/Item/InstrumentItems.h"
-#include "GUI/Model/Item/JobFunctions.h"
-#include "GUI/Model/Model/JobQueueData.h"
-#include "GUI/Model/OfItem/ParameterTreeUtils.h"
+#include "GUI/Model/Item/IntensityDataItem.h"
 #include "GUI/Model/Item/ItemWithMaterial.h"
+#include "GUI/Model/Item/JobFunctions.h"
+#include "GUI/Model/Item/JobItem.h"
 #include "GUI/Model/Item/MultiLayerItem.h"
+#include "GUI/Model/Item/PointwiseAxisItem.h"
+#include "GUI/Model/Item/RealDataItem.h"
+#include "GUI/Model/Model/JobQueueData.h"
 #include "GUI/Model/Model/SessionXML.h"
+#include "GUI/Model/OfItem/ParameterTreeUtils.h"
 
 JobModel::JobModel(QObject* parent)
     : SessionModel(GUI::Session::XML::JobModelTag, parent)
diff --git a/GUI/Model/Model/ParameterTuningModel.cpp b/GUI/Model/Model/ParameterTuningModel.cpp
index 39e72b083805fecfe4d8c48f4a36c9a76c36c1a6..388cb1e7382d02fa81ccedcc394c9731d3b4893e 100644
--- a/GUI/Model/Model/ParameterTuningModel.cpp
+++ b/GUI/Model/Model/ParameterTuningModel.cpp
@@ -13,8 +13,8 @@
 //  ************************************************************************************************
 
 #include "GUI/Model/Model/ParameterTuningModel.h"
-#include "GUI/Model/Model/FitParameterHelper.h"
 #include "GUI/Model/Item/ParameterTreeItems.h"
+#include "GUI/Model/Model/FitParameterHelper.h"
 #include "GUI/Model/Model/SessionXML.h"
 #include <QMimeData>
 
diff --git a/GUI/Model/Model/RealDataModel.cpp b/GUI/Model/Model/RealDataModel.cpp
index 504f2dd3045141d1b986167c7c874243bd1fa4a4..3eba4339c61b10febc9b8d04c083980f6b3d817c 100644
--- a/GUI/Model/Model/RealDataModel.cpp
+++ b/GUI/Model/Model/RealDataModel.cpp
@@ -13,8 +13,8 @@
 //  ************************************************************************************************
 
 #include "GUI/Model/Model/RealDataModel.h"
-#include "GUI/Model/Item/RealDataItem.h"
 #include "GUI/Model/Item/DataItem.h"
+#include "GUI/Model/Item/RealDataItem.h"
 #include "GUI/Model/Model/SessionXML.h"
 
 RealDataModel::RealDataModel(QObject* parent)
diff --git a/GUI/Model/Model/SessionModel.cpp b/GUI/Model/Model/SessionModel.cpp
index c0a0b013ef4bbcaca4a11549a57c67869449d05c..8011e772f198b955b973e9651f9c7323ce2607c0 100644
--- a/GUI/Model/Model/SessionModel.cpp
+++ b/GUI/Model/Model/SessionModel.cpp
@@ -13,9 +13,9 @@
 //  ************************************************************************************************
 
 #include "GUI/Model/Model/SessionModel.h"
-#include "GUI/Model/MakeItem/ItemFactory.h"
-#include "GUI/Model/Item/MaterialItem.h"
 #include "GUI/Model/BaseItem/SessionItem.h"
+#include "GUI/Model/Item/MaterialItem.h"
+#include "GUI/Model/MakeItem/ItemFactory.h"
 #include "GUI/Model/Model/SessionXML.h"
 #include "GUI/Support/Data/SessionFlags.h"
 #include "GUI/Support/Data/SessionItemTags.h"
diff --git a/GUI/Model/OfItem/ParameterTreeUtils.cpp b/GUI/Model/OfItem/ParameterTreeUtils.cpp
index 5c637edba4c19745b6e42d08e61867f57810c5ca..c9f03a59b36de0cbab7b88027d4a732445a4c627 100644
--- a/GUI/Model/OfItem/ParameterTreeUtils.cpp
+++ b/GUI/Model/OfItem/ParameterTreeUtils.cpp
@@ -13,26 +13,26 @@
 //  ************************************************************************************************
 
 #include "GUI/Model/OfItem/ParameterTreeUtils.h"
-#include "GUI/Model/Item/JobItem.h"
-#include "GUI/Model/Item/ParameterTreeItems.h"
+#include "GUI/Model/BaseItem/PropertyItem.h"
 #include "GUI/Model/Item/InstrumentItems.h"
-#include "GUI/Model/Item/MaterialItem.h"
-#include "GUI/Model/MakeItem/FTDecayFunctionItemCatalogs.h"
-#include "GUI/Model/MakeItem/FTDistributionItemCatalogs.h"
-#include "GUI/Model/MakeItem/FormFactorItemCatalog.h"
-#include "GUI/Model/MakeItem/InterferenceItemCatalog.h"
 #include "GUI/Model/Item/InterferenceItems.h"
-#include "GUI/Model/MakeItem/ItemWithParticlesCatalog.h"
-#include "GUI/Model/MakeItem/Lattice2DItemCatalog.h"
+#include "GUI/Model/Item/JobItem.h"
 #include "GUI/Model/Item/LayerItem.h"
+#include "GUI/Model/Item/MaterialItem.h"
 #include "GUI/Model/Item/MesoCrystalItem.h"
 #include "GUI/Model/Item/MultiLayerItem.h"
+#include "GUI/Model/Item/ParameterTreeItems.h"
 #include "GUI/Model/Item/ParticleCompositionItem.h"
 #include "GUI/Model/Item/ParticleCoreShellItem.h"
 #include "GUI/Model/Item/ParticleItem.h"
 #include "GUI/Model/Item/ParticleLayoutItem.h"
+#include "GUI/Model/MakeItem/FTDecayFunctionItemCatalogs.h"
+#include "GUI/Model/MakeItem/FTDistributionItemCatalogs.h"
+#include "GUI/Model/MakeItem/FormFactorItemCatalog.h"
+#include "GUI/Model/MakeItem/InterferenceItemCatalog.h"
+#include "GUI/Model/MakeItem/ItemWithParticlesCatalog.h"
+#include "GUI/Model/MakeItem/Lattice2DItemCatalog.h"
 #include "GUI/Model/MakeItem/RotationItemCatalog.h"
-#include "GUI/Model/BaseItem/PropertyItem.h"
 
 namespace {
 
diff --git a/GUI/Model/Project/LinkInstrumentManager.cpp b/GUI/Model/Project/LinkInstrumentManager.cpp
index a07cc8d4afac9a17ed497c17a4a9896ce9c287b1..66b9b83c2d6992948bf99b98a439b7ff0739cc82 100644
--- a/GUI/Model/Project/LinkInstrumentManager.cpp
+++ b/GUI/Model/Project/LinkInstrumentManager.cpp
@@ -13,10 +13,10 @@
 //  ************************************************************************************************
 
 #include "GUI/Model/Project/LinkInstrumentManager.h"
-#include "GUI/Model/Item/RealDataItem.h"
-#include "GUI/Model/Model/RealDataModel.h"
 #include "GUI/Model/Item/InstrumentItems.h"
+#include "GUI/Model/Item/RealDataItem.h"
 #include "GUI/Model/Model/InstrumentModel.h"
+#include "GUI/Model/Model/RealDataModel.h"
 #include <QMessageBox>
 #include <QPushButton>
 
diff --git a/GUI/Model/Project/ProjectDocument.cpp b/GUI/Model/Project/ProjectDocument.cpp
index 500885d5447186d0382f2a5e5eabbdc503322b0d..3177a4a08a47bfa2ca461cf677fcf75b1c58e7fe 100644
--- a/GUI/Model/Project/ProjectDocument.cpp
+++ b/GUI/Model/Project/ProjectDocument.cpp
@@ -13,14 +13,14 @@
 //  ************************************************************************************************
 
 #include "GUI/Model/Project/ProjectDocument.h"
+#include "GUI/Model/Item/ItemWithMaterial.h"
 #include "GUI/Model/Item/MaterialItem.h"
-#include "GUI/Model/Model/MaterialModel.h"
+#include "GUI/Model/Item/MultiLayerItem.h"
 #include "GUI/Model/Model/JobModel.h"
+#include "GUI/Model/Model/MaterialModel.h"
+#include "GUI/Model/Model/SampleModel.h"
 #include "GUI/Model/Project/LinkInstrumentManager.h"
 #include "GUI/Model/Project/OutputDataIOService.h"
-#include "GUI/Model/Item/ItemWithMaterial.h"
-#include "GUI/Model/Item/MultiLayerItem.h"
-#include "GUI/Model/Model/SampleModel.h"
 #include "GUI/Model/XML/Serializer.h"
 #include "GUI/Support/Data/SimulationOptionsItem.h"
 #include "GUI/Support/Data/XML.h"
diff --git a/GUI/Model/Project/ProjectDocument.h b/GUI/Model/Project/ProjectDocument.h
index 7bb9828f649ca097304c06466e7503248d284392..a67ae373ae8ab80acf6e746558046ae79f87104c 100644
--- a/GUI/Model/Project/ProjectDocument.h
+++ b/GUI/Model/Project/ProjectDocument.h
@@ -15,8 +15,8 @@
 #ifndef BORNAGAIN_GUI_MODEL_PROJECT_PROJECTDOCUMENT_H
 #define BORNAGAIN_GUI_MODEL_PROJECT_PROJECTDOCUMENT_H
 
-#include "GUI/Model/Model/MaterialModel.h"
 #include "GUI/Model/Model/ApplicationModels.h"
+#include "GUI/Model/Model/MaterialModel.h"
 #include "GUI/Model/Model/SampleModel.h"
 #include "GUI/Support/Data/SimulationOptionsItem.h"
 #include <QObject>
diff --git a/GUI/Model/To/ToDomain.cpp b/GUI/Model/To/ToDomain.cpp
index 080e5dd6392e426f1d0bb335ec08a7cb2c3b9951..29c08dbad62d80442ac90347a0a254e76842874a 100644
--- a/GUI/Model/To/ToDomain.cpp
+++ b/GUI/Model/To/ToDomain.cpp
@@ -13,10 +13,10 @@
 //  ************************************************************************************************
 
 #include "GUI/Model/To/ToDomain.h"
-#include "GUI/Model/Item/MaterialItem.h"
 #include "GUI/Model/Item/InterferenceItems.h"
 #include "GUI/Model/Item/LayerItem.h"
 #include "GUI/Model/Item/LayerRoughnessItems.h"
+#include "GUI/Model/Item/MaterialItem.h"
 #include "GUI/Model/Item/MesoCrystalItem.h"
 #include "GUI/Model/Item/MultiLayerItem.h"
 #include "GUI/Model/Item/ParticleCompositionItem.h"
diff --git a/GUI/View/Fit/FilterPropertyProxy.cpp b/GUI/View/Fit/FilterPropertyProxy.cpp
index 7546d865271a8ee408cc26f1fa45a1d874012440..601059be375f407153e7a50e425cb1dd5a282a8c 100644
--- a/GUI/View/Fit/FilterPropertyProxy.cpp
+++ b/GUI/View/Fit/FilterPropertyProxy.cpp
@@ -15,8 +15,8 @@
 #include "GUI/View/Fit/FilterPropertyProxy.h"
 #include "GUI/Model/BaseItem/GroupItem.h"
 #include "GUI/Model/BaseItem/PropertyItem.h"
-#include "GUI/Model/Model/SessionModel.h"
 #include "GUI/Model/Item/VectorItem.h"
+#include "GUI/Model/Model/SessionModel.h"
 #include "GUI/Support/Data/SessionFlags.h"
 
 int FilterPropertyProxy::columnCount(const QModelIndex& parent) const
diff --git a/GUI/View/Fit/FitObjectiveBuilder.cpp b/GUI/View/Fit/FitObjectiveBuilder.cpp
index 7a7d029b45ae4bdc09b60713d1a28ea3e7e7b0a8..3ec9e32d3de5cb9a9b48d30fc842ff00ea70b553 100644
--- a/GUI/View/Fit/FitObjectiveBuilder.cpp
+++ b/GUI/View/Fit/FitObjectiveBuilder.cpp
@@ -18,12 +18,12 @@
 #include "Core/Simulation/ISimulation.h"
 #include "Fit/Kernel/Minimizer.h"
 #include "Fit/Minimizer/IMinimizer.h"
-#include "GUI/Model/Item/RealDataItem.h"
+#include "GUI/Model/Item/DataItem.h"
 #include "GUI/Model/Item/FitParameterContainerItem.h"
 #include "GUI/Model/Item/FitSuiteItem.h"
 #include "GUI/Model/Item/JobItem.h"
 #include "GUI/Model/Item/MinimizerItem.h"
-#include "GUI/Model/Item/DataItem.h"
+#include "GUI/Model/Item/RealDataItem.h"
 #include "GUI/Model/To/DomainSimulationBuilder.h"
 #include "GUI/Util/Error.h"
 #include "GUI/View/Fit/GUIFitObserver.h"
diff --git a/GUI/View/Fit/FitParameterWidget.cpp b/GUI/View/Fit/FitParameterWidget.cpp
index 723c592fbaf5e3fbe24c7d7bb30f1af05b06655a..4bca75a1c5701c30e2e0e0c52995ca0f0ff7f4ef 100644
--- a/GUI/View/Fit/FitParameterWidget.cpp
+++ b/GUI/View/Fit/FitParameterWidget.cpp
@@ -14,13 +14,13 @@
 
 #include "GUI/View/Fit/FitParameterWidget.h"
 #include "GUI/Model/Item/FitParameterContainerItem.h"
-#include "GUI/Model/Model/FitParameterHelper.h"
 #include "GUI/Model/Item/FitParameterItem.h"
 #include "GUI/Model/Item/FitParameterLinkItem.h"
-#include "GUI/Model/Model/FitParameterModel.h"
 #include "GUI/Model/Item/FitSuiteItem.h"
 #include "GUI/Model/Item/JobItem.h"
 #include "GUI/Model/Item/ParameterTreeItems.h"
+#include "GUI/Model/Model/FitParameterHelper.h"
+#include "GUI/Model/Model/FitParameterModel.h"
 #include "GUI/Model/Model/JobModel.h"
 #include "GUI/View/Fit/FilterPropertyProxy.h"
 #include "GUI/View/Fit/FitParameterDelegate.h"
diff --git a/GUI/View/Fit/FitSessionController.cpp b/GUI/View/Fit/FitSessionController.cpp
index ab7c7901d0a00e6323db65822f89d3158d9d4ae5..a7fb2dc49bc9290937db203f06011d7b174486a4 100644
--- a/GUI/View/Fit/FitSessionController.cpp
+++ b/GUI/View/Fit/FitSessionController.cpp
@@ -13,10 +13,10 @@
 //  ************************************************************************************************
 
 #include "GUI/View/Fit/FitSessionController.h"
-#include "GUI/Model/Item/IntensityDataItem.h"
 #include "GUI/Model/Item/FitParameterContainerItem.h"
 #include "GUI/Model/Item/FitParameterItem.h"
 #include "GUI/Model/Item/FitSuiteItem.h"
+#include "GUI/Model/Item/IntensityDataItem.h"
 #include "GUI/Model/Item/JobItem.h"
 #include "GUI/Util/Error.h"
 #include "GUI/Util/Path.h"
diff --git a/GUI/View/Fit/ParameterTuningWidget.cpp b/GUI/View/Fit/ParameterTuningWidget.cpp
index e3500328933b6faa54a10d9e4a416a1e1fbab55a..7182c583e085360032ca36f5ce6685d62bf04a84 100644
--- a/GUI/View/Fit/ParameterTuningWidget.cpp
+++ b/GUI/View/Fit/ParameterTuningWidget.cpp
@@ -16,8 +16,8 @@
 #include "GUI/Model/Item/IntensityDataItem.h"
 #include "GUI/Model/Item/JobItem.h"
 #include "GUI/Model/Item/ParameterTreeItems.h"
-#include "GUI/Model/Model/ParameterTuningModel.h"
 #include "GUI/Model/Model/JobModel.h"
+#include "GUI/Model/Model/ParameterTuningModel.h"
 #include "GUI/Util/Error.h"
 #include "GUI/View/Common/StyledToolBar.h"
 #include "GUI/View/Fit/ParameterTuningDelegate.h"
diff --git a/GUI/View/FromDomain/FromDomain.cpp b/GUI/View/FromDomain/FromDomain.cpp
index f28cc86f215accdb706e0d639f5f8f2ef48fe075..15eb5b693901a29dbd517e101a3435f237e64184 100644
--- a/GUI/View/FromDomain/FromDomain.cpp
+++ b/GUI/View/FromDomain/FromDomain.cpp
@@ -37,14 +37,14 @@
 #include "GUI/Model/Item/BeamAngleItems.h"
 #include "GUI/Model/Item/BeamWavelengthItem.h"
 #include "GUI/Model/Item/InstrumentItems.h"
-#include "GUI/Model/Item/RectangularDetectorItem.h"
-#include "GUI/Model/Item/ResolutionFunctionItems.h"
-#include "GUI/Model/Item/SphericalDetectorItem.h"
-#include "GUI/Model/Item/MaskItems.h"
 #include "GUI/Model/Item/LayerItem.h"
+#include "GUI/Model/Item/MaskItems.h"
 #include "GUI/Model/Item/MesoCrystalItem.h"
 #include "GUI/Model/Item/ParticleItem.h"
 #include "GUI/Model/Item/ParticleLayoutItem.h"
+#include "GUI/Model/Item/RectangularDetectorItem.h"
+#include "GUI/Model/Item/ResolutionFunctionItems.h"
+#include "GUI/Model/Item/SphericalDetectorItem.h"
 #include "GUI/Util/Error.h"
 #include "Param/Distrib/Distributions.h"
 #include "Param/Distrib/RangedDistributions.h"
diff --git a/GUI/View/FromDomain/GUISampleBuilder.cpp b/GUI/View/FromDomain/GUISampleBuilder.cpp
index e06e7b4cdf87be836ee1c4d2cdad20315aec11c9..171f90512be27f225d8cb245dd063e729d932a03 100644
--- a/GUI/View/FromDomain/GUISampleBuilder.cpp
+++ b/GUI/View/FromDomain/GUISampleBuilder.cpp
@@ -13,15 +13,15 @@
 //  ************************************************************************************************
 
 #include "GUI/View/FromDomain/GUISampleBuilder.h"
-#include "GUI/Model/Item/MaterialItem.h"
-#include "GUI/Model/Model/MaterialModel.h"
 #include "GUI/Model/Item/LayerItem.h"
+#include "GUI/Model/Item/MaterialItem.h"
 #include "GUI/Model/Item/MesoCrystalItem.h"
 #include "GUI/Model/Item/MultiLayerItem.h"
 #include "GUI/Model/Item/ParticleCompositionItem.h"
 #include "GUI/Model/Item/ParticleCoreShellItem.h"
 #include "GUI/Model/Item/ParticleItem.h"
 #include "GUI/Model/Item/ParticleLayoutItem.h"
+#include "GUI/Model/Model/MaterialModel.h"
 #include "GUI/Model/Types/DoubleDescriptor.h"
 #include "GUI/View/FromDomain/FromDomain.h"
 #include "Sample/Aggregate/ParticleLayout.h"
diff --git a/GUI/View/Import/RealDataMaskWidget.cpp b/GUI/View/Import/RealDataMaskWidget.cpp
index a0cc01cf11756b1055407e5a0569d6e5ad46f97d..6bbdf39057dde197a7daefff26f2a69a40636fbc 100644
--- a/GUI/View/Import/RealDataMaskWidget.cpp
+++ b/GUI/View/Import/RealDataMaskWidget.cpp
@@ -14,8 +14,8 @@
 
 #include "GUI/View/Import/RealDataMaskWidget.h"
 #include "GUI/Model/Item/IntensityDataItem.h"
-#include "GUI/Model/Item/RealDataItem.h"
 #include "GUI/Model/Item/MaskItems.h"
+#include "GUI/Model/Item/RealDataItem.h"
 #include "GUI/View/Mask/MaskEditor.h"
 #include <QAction>
 #include <QBoxLayout>
diff --git a/GUI/View/Import/RealDataPropertiesWidget.cpp b/GUI/View/Import/RealDataPropertiesWidget.cpp
index 4df6d7cb1dea51de5305d63cc6aa058e3677d9d7..4087f201f541dd8eb412eb42aaedea74d7688e58 100644
--- a/GUI/View/Import/RealDataPropertiesWidget.cpp
+++ b/GUI/View/Import/RealDataPropertiesWidget.cpp
@@ -13,8 +13,8 @@
 //  ************************************************************************************************
 
 #include "GUI/View/Import/RealDataPropertiesWidget.h"
-#include "GUI/Model/Item/RealDataItem.h"
 #include "GUI/Model/Item/InstrumentItems.h"
+#include "GUI/Model/Item/RealDataItem.h"
 #include "GUI/Model/Model/InstrumentModel.h"
 #include "GUI/Model/Project/LinkInstrumentManager.h"
 #include "GUI/Model/Project/ProjectDocument.h"
diff --git a/GUI/View/Import/SpecularDataImportWidget.cpp b/GUI/View/Import/SpecularDataImportWidget.cpp
index 8a9ee378b9cdb5310e5ca7a7a513c823324bcd79..9a668ef5c39b12bf1e8b98bee640fff3f762a68a 100644
--- a/GUI/View/Import/SpecularDataImportWidget.cpp
+++ b/GUI/View/Import/SpecularDataImportWidget.cpp
@@ -13,9 +13,9 @@
 //  ************************************************************************************************
 
 #include "GUI/View/Import/SpecularDataImportWidget.h"
+#include "GUI/Model/Item/InstrumentItems.h"
 #include "GUI/Model/Item/RealDataItem.h"
 #include "GUI/Model/Item/SpecularDataItem.h"
-#include "GUI/Model/Item/InstrumentItems.h"
 #include "GUI/Support/IO/AbstractDataLoaderResultModel.h"
 #include "GUI/Support/IO/DataLoaders1D.h"
 #include "GUI/View/Global/Globals.h"
diff --git a/GUI/View/Instrument/DistributionPlot.cpp b/GUI/View/Instrument/DistributionPlot.cpp
index efd1787a61d9b6d26a966402fc2a4b34cea8a40d..4be24a6ce6d0e871757ebcae2927e77cb11c738e 100644
--- a/GUI/View/Instrument/DistributionPlot.cpp
+++ b/GUI/View/Instrument/DistributionPlot.cpp
@@ -13,8 +13,8 @@
 //  ************************************************************************************************
 
 #include "GUI/View/Instrument/DistributionPlot.h"
-#include "GUI/Model/Item/ResolutionItems.h"
 #include "GUI/Model/Item/RealLimitsItems.h"
+#include "GUI/Model/Item/ResolutionItems.h"
 #include "GUI/View/Info/CautionSign.h"
 #include "Param/Distrib/Distributions.h"
 #include <QLabel>
diff --git a/GUI/View/Instrument/InclinationAnglesEditor.cpp b/GUI/View/Instrument/InclinationAnglesEditor.cpp
index b140aabe6ef5d90ce9936584a6003175f4e2e130..ca7d5ad1c05935ce69ce3dbeb1a13c653e2e7169 100644
--- a/GUI/View/Instrument/InclinationAnglesEditor.cpp
+++ b/GUI/View/Instrument/InclinationAnglesEditor.cpp
@@ -13,8 +13,8 @@
 //  ************************************************************************************************
 
 #include "GUI/View/Instrument/InclinationAnglesEditor.h"
-#include "GUI/Model/Item/PointwiseAxisItem.h"
 #include "GUI/Model/BaseItem/GroupItem.h"
+#include "GUI/Model/Item/PointwiseAxisItem.h"
 #include "GUI/Model/Item/SpecularBeamInclinationItem.h"
 #include "GUI/View/Instrument/DistributionEditor.h"
 #include "GUI/View/Instrument/SphericalAxisEditor.h"
diff --git a/GUI/View/Job/JobResultsPresenter.cpp b/GUI/View/Job/JobResultsPresenter.cpp
index c516ac44ee3cddda20c25e39d98c304a1be49e5c..2010f9eadba7679a9704852dc572729d412703eb 100644
--- a/GUI/View/Job/JobResultsPresenter.cpp
+++ b/GUI/View/Job/JobResultsPresenter.cpp
@@ -13,8 +13,8 @@
 //  ************************************************************************************************
 
 #include "GUI/View/Job/JobResultsPresenter.h"
-#include "GUI/Model/Item/JobItem.h"
 #include "GUI/Model/Item/InstrumentItems.h"
+#include "GUI/Model/Item/JobItem.h"
 #include "GUI/View/Job/JobViewActivities.h"
 #include "GUI/View/Plot2D/IntensityDataWidget.h"
 #include "GUI/View/PlotComparison/FitComparisonWidget.h"
diff --git a/GUI/View/Mask/MaskGraphicsScene.cpp b/GUI/View/Mask/MaskGraphicsScene.cpp
index 32f54c2f78f4bc301eada98f79d89e0ca333f75d..98c719c9b97469cdb57ae75f5f1696467e828c50 100644
--- a/GUI/View/Mask/MaskGraphicsScene.cpp
+++ b/GUI/View/Mask/MaskGraphicsScene.cpp
@@ -14,9 +14,9 @@
 
 #include "GUI/View/Mask/MaskGraphicsScene.h"
 #include "GUI/Model/BaseItem/GroupItem.h"
+#include "GUI/Model/BaseItem/PropertyItem.h"
 #include "GUI/Model/Item/MaskItems.h"
 #include "GUI/Model/Item/ProjectionItems.h"
-#include "GUI/Model/BaseItem/PropertyItem.h"
 #include "GUI/Model/Model/SessionModel.h"
 #include "GUI/Util/Error.h"
 #include "GUI/View/Mask/ColorMapSceneAdaptor.h"
diff --git a/GUI/View/Mask/MaskViewFactory.cpp b/GUI/View/Mask/MaskViewFactory.cpp
index 17e455eb5497a2f1069ab3e60fbf1fee6a0b0aa5..5e131598bd522e5132f8f85c037a9a1018111c3c 100644
--- a/GUI/View/Mask/MaskViewFactory.cpp
+++ b/GUI/View/Mask/MaskViewFactory.cpp
@@ -13,9 +13,9 @@
 //  ************************************************************************************************
 
 #include "GUI/View/Mask/MaskViewFactory.h"
+#include "GUI/Model/BaseItem/SessionItem.h"
 #include "GUI/Model/Item/MaskItems.h"
 #include "GUI/Model/Item/ProjectionItems.h"
-#include "GUI/Model/BaseItem/SessionItem.h"
 #include "GUI/Util/Error.h"
 #include "GUI/View/Mask/EllipseView.h"
 #include "GUI/View/Mask/LineViews.h"
diff --git a/GUI/View/MaterialEditor/MaterialEditorDialog.cpp b/GUI/View/MaterialEditor/MaterialEditorDialog.cpp
index 36acac7672f97b10e3d4ad3cd7b0edebe9bf67de..16c95abecff61c876b245cde70673e483acf7fec 100644
--- a/GUI/View/MaterialEditor/MaterialEditorDialog.cpp
+++ b/GUI/View/MaterialEditor/MaterialEditorDialog.cpp
@@ -14,13 +14,13 @@
 
 #include "GUI/View/MaterialEditor/MaterialEditorDialog.h"
 #include "GUI/Application/ApplicationSettings.h"
+#include "GUI/Model/Item/ItemWithMaterial.h"
 #include "GUI/Model/Item/MaterialItem.h"
+#include "GUI/Model/Item/VectorItem.h"
 #include "GUI/Model/Model/MaterialModel.h"
-#include "GUI/Model/Project/ProjectDocument.h"
-#include "GUI/Model/Item/ItemWithMaterial.h"
 #include "GUI/Model/Model/SampleModel.h"
+#include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/Model/Types/DoubleDescriptor.h"
-#include "GUI/Model/Item/VectorItem.h"
 #include "GUI/View/MaterialEditor/MaterialEditorModel.h"
 #include "GUI/View/Tool/EditUtil.h"
 #include "GUI/View/Tool/StyleUtils.h"
diff --git a/GUI/View/MaterialEditor/MaterialEditorModel.cpp b/GUI/View/MaterialEditor/MaterialEditorModel.cpp
index 18df7d083d4115b886303c9060e9df0a93dd6fb6..780b6bf77e840186154f445de0ad05b3747f230b 100644
--- a/GUI/View/MaterialEditor/MaterialEditorModel.cpp
+++ b/GUI/View/MaterialEditor/MaterialEditorModel.cpp
@@ -14,9 +14,9 @@
 
 #include "GUI/View/MaterialEditor/MaterialEditorModel.h"
 #include "GUI/Model/Item/MaterialItem.h"
+#include "GUI/Model/Item/VectorItem.h"
 #include "GUI/Model/Model/MaterialModel.h"
 #include "GUI/Model/Types/DoubleDescriptor.h"
-#include "GUI/Model/Item/VectorItem.h"
 #include <QApplication>
 #include <QFontMetrics>
 #include <QPixmap>
diff --git a/GUI/View/PlotComparison/FitComparisonController.cpp b/GUI/View/PlotComparison/FitComparisonController.cpp
index 02b99bc97f05255fa2671a5697a2ade287f0822c..ea39bb4974cc28c2dbf91ff5f3113846ae261f24 100644
--- a/GUI/View/PlotComparison/FitComparisonController.cpp
+++ b/GUI/View/PlotComparison/FitComparisonController.cpp
@@ -16,9 +16,9 @@
 #include "Device/Data/DataUtils.h"
 #include "GUI/Model/Item/AxesItems.h"
 #include "GUI/Model/Item/IntensityDataItem.h"
+#include "GUI/Model/Item/JobItem.h"
 #include "GUI/Model/Item/RealDataItem.h"
 #include "GUI/Model/Item/SpecularDataItem.h"
-#include "GUI/Model/Item/JobItem.h"
 #include "GUI/View/PlotComparison/PropertyRepeater.h"
 
 namespace {
diff --git a/GUI/View/PlotComparison/FitComparisonViewController.cpp b/GUI/View/PlotComparison/FitComparisonViewController.cpp
index 964c904f26f331c8b58f0fd46790cba1fe8023f0..a3f86edf34cdc9b1d87f25ce34942d8abed10244 100644
--- a/GUI/View/PlotComparison/FitComparisonViewController.cpp
+++ b/GUI/View/PlotComparison/FitComparisonViewController.cpp
@@ -15,11 +15,11 @@
 #include "GUI/View/PlotComparison/FitComparisonViewController.h"
 #include "Device/Data/DataUtils.h"
 #include "GUI/Model/Item/AxesItems.h"
-#include "GUI/Model/Item/RealDataItem.h"
-#include "GUI/Model/Item/SpecularDataItem.h"
-#include "GUI/Model/Item/JobItem.h"
 #include "GUI/Model/Item/Data1DViewItem.h"
 #include "GUI/Model/Item/DataPropertyContainer.h"
+#include "GUI/Model/Item/JobItem.h"
+#include "GUI/Model/Item/RealDataItem.h"
+#include "GUI/Model/Item/SpecularDataItem.h"
 #include "GUI/Util/ComboProperty.h"
 #include "GUI/View/PlotComparison/PropertyRepeater.h"
 
diff --git a/GUI/View/PlotComparison/FitComparisonWidget.cpp b/GUI/View/PlotComparison/FitComparisonWidget.cpp
index 79e5fb5fcdc8b9c80fb2ec7a2113cc1d11630472..9fc3e9d6a2b77fb0154acf2e0fb092505504706c 100644
--- a/GUI/View/PlotComparison/FitComparisonWidget.cpp
+++ b/GUI/View/PlotComparison/FitComparisonWidget.cpp
@@ -13,10 +13,10 @@
 //  ************************************************************************************************
 
 #include "GUI/View/PlotComparison/FitComparisonWidget.h"
-#include "GUI/Model/Item/IntensityDataItem.h"
-#include "GUI/Model/Item/RealDataItem.h"
 #include "GUI/Model/Item/FitSuiteItem.h"
+#include "GUI/Model/Item/IntensityDataItem.h"
 #include "GUI/Model/Item/JobItem.h"
+#include "GUI/Model/Item/RealDataItem.h"
 #include "GUI/Util/ActionFactory.h"
 #include "GUI/View/PlotComparison/FitComparisonController.h"
 #include "GUI/View/PlotComparison/FitFlowWidget.h"
diff --git a/GUI/View/PlotComparison/FitComparisonWidget1D.cpp b/GUI/View/PlotComparison/FitComparisonWidget1D.cpp
index 3323b1a4d1e3f2be47e678fb3c66df550418857b..700422b4c069d3c347e38fb6a5831ded0cdcc5ce 100644
--- a/GUI/View/PlotComparison/FitComparisonWidget1D.cpp
+++ b/GUI/View/PlotComparison/FitComparisonWidget1D.cpp
@@ -13,10 +13,10 @@
 //  ************************************************************************************************
 
 #include "GUI/View/PlotComparison/FitComparisonWidget1D.h"
-#include "GUI/Model/Item/RealDataItem.h"
+#include "GUI/Model/Item/Data1DViewItem.h"
 #include "GUI/Model/Item/FitSuiteItem.h"
 #include "GUI/Model/Item/JobItem.h"
-#include "GUI/Model/Item/Data1DViewItem.h"
+#include "GUI/Model/Item/RealDataItem.h"
 #include "GUI/Util/ActionFactory.h"
 #include "GUI/View/PlotComparison/FitComparisonViewController.h"
 #include "GUI/View/PlotComparison/FitFlowWidget.h"
diff --git a/GUI/View/PlotComparison/Plot1D.cpp b/GUI/View/PlotComparison/Plot1D.cpp
index c205fbf65c0fef306bc82af06c775a8b5bbdd1fe..2fd278c5256089134137f51427f28dd66b539877 100644
--- a/GUI/View/PlotComparison/Plot1D.cpp
+++ b/GUI/View/PlotComparison/Plot1D.cpp
@@ -15,9 +15,9 @@
 #include "GUI/View/PlotComparison/Plot1D.h"
 #include "GUI/Model/Item/AxesItems.h"
 #include "GUI/Model/Item/Data1DViewItem.h"
+#include "GUI/Model/Item/DataItem.h"
 #include "GUI/Model/Item/DataProperties.h"
 #include "GUI/Model/Item/DataPropertyContainer.h"
-#include "GUI/Model/Item/DataItem.h"
 #include "GUI/View/PlotUtil/PlotConstants.h"
 #include "GUI/View/PlotUtil/PlotEventInfo.h"
 #include "GUI/View/PlotUtil/RangeUtils.h"
diff --git a/GUI/View/PropertyEditor/SpecularDataPropertyWidget.cpp b/GUI/View/PropertyEditor/SpecularDataPropertyWidget.cpp
index 0d6a673842594eaf8abe1e984ef0d73fa9062928..01f274097b4a0a764978cb44b0a4f01543f3e70b 100644
--- a/GUI/View/PropertyEditor/SpecularDataPropertyWidget.cpp
+++ b/GUI/View/PropertyEditor/SpecularDataPropertyWidget.cpp
@@ -14,8 +14,8 @@
 
 #include "GUI/View/PropertyEditor/SpecularDataPropertyWidget.h"
 #include "GUI/Model/Item/AxesItems.h"
-#include "GUI/Model/Item/SpecularDataItem.h"
 #include "GUI/Model/Item/Data1DViewItem.h"
+#include "GUI/Model/Item/SpecularDataItem.h"
 #include "GUI/Util/ComboProperty.h"
 #include "GUI/View/Edit/DoubleSpinBox.h"
 #include "GUI/View/Tool/LayoutUtils.h"
diff --git a/GUI/View/Realspace/RealSpaceBuilderUtils.cpp b/GUI/View/Realspace/RealSpaceBuilderUtils.cpp
index f10927ebc67b519f04a483f35c59f642ed2d6da4..2ea80bf6019692e90de23a1b7eb2dd78337e10dd 100644
--- a/GUI/View/Realspace/RealSpaceBuilderUtils.cpp
+++ b/GUI/View/Realspace/RealSpaceBuilderUtils.cpp
@@ -16,12 +16,12 @@
 #include "Base/Const/Units.h"
 #include "Base/Util/Assert.h"
 #include "GUI/Model/Item/MaterialItem.h"
-#include "GUI/Model/Model/MaterialModel.h"
 #include "GUI/Model/Item/MesoCrystalItem.h"
 #include "GUI/Model/Item/ParticleCompositionItem.h"
 #include "GUI/Model/Item/ParticleCoreShellItem.h"
 #include "GUI/Model/Item/ParticleItem.h"
 #include "GUI/Model/Item/ParticleLayoutItem.h"
+#include "GUI/Model/Model/MaterialModel.h"
 #include "GUI/Model/Types/DoubleDescriptor.h"
 #include "GUI/View/Realspace/Particle3DContainer.h"
 #include "GUI/View/Realspace/RealSpaceBuilder.h"
diff --git a/GUI/View/SampleDesigner/LayerForm.cpp b/GUI/View/SampleDesigner/LayerForm.cpp
index c203c9571afc47ac04e4e74909948c162c68c2ec..ba606e6885e240b5d99e9344566b36ac0e4a9052 100644
--- a/GUI/View/SampleDesigner/LayerForm.cpp
+++ b/GUI/View/SampleDesigner/LayerForm.cpp
@@ -13,10 +13,10 @@
 //  ************************************************************************************************
 
 #include "GUI/View/SampleDesigner/LayerForm.h"
-#include "GUI/Model/Item/MaterialItem.h"
-#include "GUI/Model/Model/MaterialModel.h"
 #include "GUI/Model/Item/LayerItem.h"
+#include "GUI/Model/Item/MaterialItem.h"
 #include "GUI/Model/Item/MultiLayerItem.h"
+#include "GUI/Model/Model/MaterialModel.h"
 #include "GUI/Util/ActionFactory.h"
 #include "GUI/View/SampleDesigner/MaterialInplaceForm.h"
 #include "GUI/View/SampleDesigner/ParticleLayoutForm.h"
diff --git a/GUI/View/SampleDesigner/LayerOrientedSampleEditor.cpp b/GUI/View/SampleDesigner/LayerOrientedSampleEditor.cpp
index 56b0b22c760f36eb376e587f87166b51a925fbf9..903173d840abde8ea99d558e87c7d67ab760f19a 100644
--- a/GUI/View/SampleDesigner/LayerOrientedSampleEditor.cpp
+++ b/GUI/View/SampleDesigner/LayerOrientedSampleEditor.cpp
@@ -14,9 +14,9 @@
 
 #include "GUI/View/SampleDesigner/LayerOrientedSampleEditor.h"
 #include "GUI/Application/ApplicationSettings.h"
-#include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/Model/Item/LayerItem.h"
 #include "GUI/Model/Item/MultiLayerItem.h"
+#include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/View/Common/StyledToolBar.h"
 #include "GUI/View/SampleDesigner/LayerEditorUtils.h"
 #include "GUI/View/SampleDesigner/MultiLayerForm.h"
diff --git a/GUI/View/SampleDesigner/MaterialInplaceForm.cpp b/GUI/View/SampleDesigner/MaterialInplaceForm.cpp
index 1220db2ec564894c4507c8eeadfea919056ca6f4..bee4f43434be61618a004b23ca98f900b8213b25 100644
--- a/GUI/View/SampleDesigner/MaterialInplaceForm.cpp
+++ b/GUI/View/SampleDesigner/MaterialInplaceForm.cpp
@@ -14,9 +14,9 @@
 
 #include "GUI/View/SampleDesigner/MaterialInplaceForm.h"
 #include "Base/Util/Assert.h"
+#include "GUI/Model/Item/ItemWithMaterial.h"
 #include "GUI/Model/Item/MaterialItem.h"
 #include "GUI/Model/Model/MaterialModel.h"
-#include "GUI/Model/Item/ItemWithMaterial.h"
 #include "GUI/Model/Types/DoubleDescriptor.h"
 #include "GUI/Model/Types/VectorDescriptor.h"
 #include "GUI/View/Edit/DoubleLineEdit.h"
diff --git a/GUI/View/SampleDesigner/ParticleCoreShellForm.cpp b/GUI/View/SampleDesigner/ParticleCoreShellForm.cpp
index 57fbcf334dc6cadf3eb145a9c7ce2c1a4e4bd3b1..aac2456127854a712b6e7e9224e93436bf6498b6 100644
--- a/GUI/View/SampleDesigner/ParticleCoreShellForm.cpp
+++ b/GUI/View/SampleDesigner/ParticleCoreShellForm.cpp
@@ -13,10 +13,10 @@
 //  ************************************************************************************************
 
 #include "GUI/View/SampleDesigner/ParticleCoreShellForm.h"
-#include "GUI/Model/MakeItem/FormFactorItemCatalog.h"
 #include "GUI/Model/Item/FormFactorItems.h"
 #include "GUI/Model/Item/ParticleCoreShellItem.h"
 #include "GUI/Model/Item/ParticleItem.h"
+#include "GUI/Model/MakeItem/FormFactorItemCatalog.h"
 #include "GUI/Model/Types/VectorDescriptor.h"
 #include "GUI/Util/ActionFactory.h"
 #include "GUI/View/SampleDesigner/FormLayouter.h"
diff --git a/GUI/View/SampleDesigner/ParticleForm.cpp b/GUI/View/SampleDesigner/ParticleForm.cpp
index 3cb815a70bf05a1e7a180cc7729becca32f89adb..dd4989cf1b775025683c45eba6e74cea4e04972b 100644
--- a/GUI/View/SampleDesigner/ParticleForm.cpp
+++ b/GUI/View/SampleDesigner/ParticleForm.cpp
@@ -13,9 +13,9 @@
 //  ************************************************************************************************
 
 #include "GUI/View/SampleDesigner/ParticleForm.h"
-#include "GUI/Model/MakeItem/FormFactorItemCatalog.h"
 #include "GUI/Model/Item/FormFactorItems.h"
 #include "GUI/Model/Item/ParticleItem.h"
+#include "GUI/Model/MakeItem/FormFactorItemCatalog.h"
 #include "GUI/Model/Types/VectorDescriptor.h"
 #include "GUI/Util/ActionFactory.h"
 #include "GUI/View/SampleDesigner/FormLayouter.h"
diff --git a/GUI/View/SampleDesigner/SampleEditorController.cpp b/GUI/View/SampleDesigner/SampleEditorController.cpp
index d98177aede6c4b5df1aa168c16d15df4cf75832b..b10490892346c93719e59b98f2f6da87326083d2 100644
--- a/GUI/View/SampleDesigner/SampleEditorController.cpp
+++ b/GUI/View/SampleDesigner/SampleEditorController.cpp
@@ -13,9 +13,6 @@
 //  ************************************************************************************************
 
 #include "GUI/View/SampleDesigner/SampleEditorController.h"
-#include "GUI/Model/Model/MaterialModel.h"
-#include "GUI/Model/Project/ProjectDocument.h"
-#include "GUI/Model/MakeItem/FormFactorItemCatalog.h"
 #include "GUI/Model/Item/InterferenceItems.h"
 #include "GUI/Model/Item/LayerItem.h"
 #include "GUI/Model/Item/MesoCrystalItem.h"
@@ -24,6 +21,9 @@
 #include "GUI/Model/Item/ParticleCoreShellItem.h"
 #include "GUI/Model/Item/ParticleItem.h"
 #include "GUI/Model/Item/ParticleLayoutItem.h"
+#include "GUI/Model/MakeItem/FormFactorItemCatalog.h"
+#include "GUI/Model/Model/MaterialModel.h"
+#include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/Model/Types/UIntDescriptor.h"
 #include "GUI/View/Edit/DoubleSpinBox.h"
 #include "GUI/View/SampleDesigner/InterferenceForm.h"
diff --git a/GUI/View/SampleDesigner/SampleEditorController.h b/GUI/View/SampleDesigner/SampleEditorController.h
index 1b3eaf715a506c820dd83512953ecf7480291a65..84d63ba7b98078ab5151bdf18e92ad54ea62498e 100644
--- a/GUI/View/SampleDesigner/SampleEditorController.h
+++ b/GUI/View/SampleDesigner/SampleEditorController.h
@@ -15,9 +15,9 @@
 #ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SAMPLEEDITORCONTROLLER_H
 #define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SAMPLEEDITORCONTROLLER_H
 
+#include "GUI/Model/Item/SampleItem.h"
 #include "GUI/Model/MakeItem/FormFactorItemCatalog.h"
 #include "GUI/Model/MakeItem/ItemWithParticlesCatalog.h"
-#include "GUI/Model/Item/SampleItem.h"
 #include <QUndoStack>
 
 class MultiLayerItem;
diff --git a/GUI/View/SampleDesigner/SampleListView.cpp b/GUI/View/SampleDesigner/SampleListView.cpp
index a7f3346d51308f2be66dc5774e1b7a839f2631c4..529db44a365683b5656e6fcf02e2768c4191a29e 100644
--- a/GUI/View/SampleDesigner/SampleListView.cpp
+++ b/GUI/View/SampleDesigner/SampleListView.cpp
@@ -15,8 +15,8 @@
 #include "GUI/View/SampleDesigner/SampleListView.h"
 #include "Base/Util/SysUtils.h"
 #include "GUI/Application/ApplicationSettings.h"
-#include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/Model/Item/MultiLayerItem.h"
+#include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/View/Common/ItemViewOverlayButtons.h"
 #include "GUI/View/FromDomain/GUIExamplesFactory.h"
 #include "GUI/View/SampleDesigner/SampleListModel.h"
diff --git a/GUI/View/SampleDesigner/SampleView.cpp b/GUI/View/SampleDesigner/SampleView.cpp
index 53379800cefd8811e1eb5f9af5ba1ff6e1c8343c..8b5f459cba9ade3a5d360e9ff4172f6b8a75be67 100644
--- a/GUI/View/SampleDesigner/SampleView.cpp
+++ b/GUI/View/SampleDesigner/SampleView.cpp
@@ -13,12 +13,12 @@
 //  ************************************************************************************************
 
 #include "GUI/View/SampleDesigner/SampleView.h"
-#include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/Model/Item/ItemWithParticles.h"
 #include "GUI/Model/Item/LayerItem.h"
 #include "GUI/Model/Item/MultiLayerItem.h"
 #include "GUI/Model/Item/ParticleLayoutItem.h"
 #include "GUI/Model/Model/SampleModel.h"
+#include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/View/Common/DocksController.h"
 #include "GUI/View/Common/StyledToolBar.h"
 #include "GUI/View/Realspace/RealSpaceCanvas.h"
diff --git a/GUI/View/Tool/DataItemUtils.cpp b/GUI/View/Tool/DataItemUtils.cpp
index 89138a4f4112c7c844cf357c2d24eaedd074300b..d20447d37c59f056c0d9ff005bb65e5548f8dbd7 100644
--- a/GUI/View/Tool/DataItemUtils.cpp
+++ b/GUI/View/Tool/DataItemUtils.cpp
@@ -14,9 +14,9 @@
 
 #include "GUI/View/Tool/DataItemUtils.h"
 #include "GUI/Model/Item/IntensityDataItem.h"
+#include "GUI/Model/Item/JobItem.h"
 #include "GUI/Model/Item/RealDataItem.h"
 #include "GUI/Model/Item/SpecularDataItem.h"
-#include "GUI/Model/Item/JobItem.h"
 
 namespace {
 
diff --git a/GUI/View/Toplevel/SessionModelView.cpp b/GUI/View/Toplevel/SessionModelView.cpp
index 99b8b4beb16b32296d8d92c0931fbf992eb408f0..ed5b8c86cc32ef8c394b31cfe6b226ab0d512660 100644
--- a/GUI/View/Toplevel/SessionModelView.cpp
+++ b/GUI/View/Toplevel/SessionModelView.cpp
@@ -13,11 +13,11 @@
 //  ************************************************************************************************
 
 #include "GUI/View/Toplevel/SessionModelView.h"
-#include "GUI/Model/Model/RealDataModel.h"
+#include "GUI/Model/Item/ItemWithMaterial.h"
 #include "GUI/Model/Model/InstrumentModel.h"
-#include "GUI/Model/Model/MaterialModel.h"
 #include "GUI/Model/Model/JobModel.h"
-#include "GUI/Model/Item/ItemWithMaterial.h"
+#include "GUI/Model/Model/MaterialModel.h"
+#include "GUI/Model/Model/RealDataModel.h"
 #include "GUI/Model/Model/SampleModel.h"
 #include "GUI/Util/ComboProperty.h"
 #include "GUI/View/Project/ProjectManager.h"
diff --git a/GUI/View/Toplevel/SimulationView.cpp b/GUI/View/Toplevel/SimulationView.cpp
index 164339672159ed5a4a5c2da3d46a5f60fc28b4a0..e916298befe976120fb533c4a13eadebbab581f6 100644
--- a/GUI/View/Toplevel/SimulationView.cpp
+++ b/GUI/View/Toplevel/SimulationView.cpp
@@ -13,15 +13,15 @@
 //  ************************************************************************************************
 
 #include "GUI/View/Toplevel/SimulationView.h"
-#include "GUI/Model/Item/RealDataItem.h"
-#include "GUI/Model/Model/RealDataModel.h"
-#include "GUI/Model/Item/JobItem.h"
 #include "GUI/Model/Item/InstrumentItems.h"
+#include "GUI/Model/Item/JobItem.h"
+#include "GUI/Model/Item/MultiLayerItem.h"
+#include "GUI/Model/Item/RealDataItem.h"
 #include "GUI/Model/Model/InstrumentModel.h"
 #include "GUI/Model/Model/JobModel.h"
-#include "GUI/Model/Project/ProjectDocument.h"
-#include "GUI/Model/Item/MultiLayerItem.h"
+#include "GUI/Model/Model/RealDataModel.h"
 #include "GUI/Model/Model/SampleModel.h"
+#include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/Model/Sample/SampleValidator.h"
 #include "GUI/Support/Data/SimulationOptionsItem.h"
 #include "GUI/View/Global/Globals.h"
diff --git a/Sample/Correlations/FTDecay1D.cpp b/Sample/Correlations/FTDecay1D.cpp
index c61a5b7c2f0be119c5ef7ff34d2c8f26ddd34358..0b942329c230402358e70851906458d198681e9a 100644
--- a/Sample/Correlations/FTDecay1D.cpp
+++ b/Sample/Correlations/FTDecay1D.cpp
@@ -14,8 +14,8 @@
 
 #include "Sample/Correlations/FTDecay1D.h"
 #include "Base/Math/Functions.h"
-#include "Base/Util/Assert.h"
 #include "Base/Py/PyFmt.h"
+#include "Base/Util/Assert.h"
 #include <algorithm>
 
 //  ************************************************************************************************
diff --git a/Sample/Correlations/FTDecay2D.cpp b/Sample/Correlations/FTDecay2D.cpp
index 3c0504da85bc91375b1dea4fb39c421d3499405a..896669ef4ef832295143f62c071549633fd509c7 100644
--- a/Sample/Correlations/FTDecay2D.cpp
+++ b/Sample/Correlations/FTDecay2D.cpp
@@ -14,8 +14,8 @@
 
 #include "Sample/Correlations/FTDecay2D.h"
 #include "Base/Math/Functions.h"
-#include "Base/Util/Assert.h"
 #include "Base/Py/PyFmt.h"
+#include "Base/Util/Assert.h"
 #include <algorithm>
 
 //  ************************************************************************************************
diff --git a/Sample/Correlations/FTDistributions1D.cpp b/Sample/Correlations/FTDistributions1D.cpp
index 3ba3987b085cb17f2366fb605cc396baa5d6ebd7..b5825f9e9937ed57222f110339a27740aa97ad9c 100644
--- a/Sample/Correlations/FTDistributions1D.cpp
+++ b/Sample/Correlations/FTDistributions1D.cpp
@@ -15,8 +15,8 @@
 #include "Sample/Correlations/FTDistributions1D.h"
 #include "Base/Math/Constants.h"
 #include "Base/Math/Functions.h"
-#include "Base/Util/Assert.h"
 #include "Base/Py/PyFmt.h"
+#include "Base/Util/Assert.h"
 #include <limits>
 
 namespace {
diff --git a/Sample/Correlations/FTDistributions2D.cpp b/Sample/Correlations/FTDistributions2D.cpp
index c66c553fbc4c52e55936375bbd4f14544f7f1cdc..acb41867785696f38852c89f27d854de68333f60 100644
--- a/Sample/Correlations/FTDistributions2D.cpp
+++ b/Sample/Correlations/FTDistributions2D.cpp
@@ -15,8 +15,8 @@
 #include "Sample/Correlations/FTDistributions2D.h"
 #include "Base/Math/Bessel.h"
 #include "Base/Math/IntegratorGK.h"
-#include "Base/Util/Assert.h"
 #include "Base/Py/PyFmt.h"
+#include "Base/Util/Assert.h"
 #include <limits>
 
 //  ************************************************************************************************
diff --git a/Tests/Functional/GUI/Check.cpp b/Tests/Functional/GUI/Check.cpp
index 403d7b687b77a5687c2bf66e30df2b3bd71bd459..3078c9c60bb28978f6415d50299d41737085789d 100644
--- a/Tests/Functional/GUI/Check.cpp
+++ b/Tests/Functional/GUI/Check.cpp
@@ -20,9 +20,9 @@
 #include "Device/Histo/IntensityDataIOFactory.h"
 #include "Device/Histo/SimulationResult.h"
 #include "GUI/Model/Item/InstrumentItems.h"
+#include "GUI/Model/Item/MultiLayerItem.h"
 #include "GUI/Model/Model/InstrumentModel.h"
 #include "GUI/Model/Model/MaterialModel.h"
-#include "GUI/Model/Item/MultiLayerItem.h"
 #include "GUI/Model/Model/SampleModel.h"
 #include "GUI/Model/To/DomainSimulationBuilder.h"
 #include "GUI/Support/Data/SimulationOptionsItem.h"
diff --git a/Tests/Functional/PyEmbedded/Tests.cpp b/Tests/Functional/PyEmbedded/Tests.cpp
index 8cffa32c68c3137790ca4271df8ef0085f0c314a..d3f1a87c7ec213f9c00e1b7cf0ff2b0c9ca7021c 100644
--- a/Tests/Functional/PyEmbedded/Tests.cpp
+++ b/Tests/Functional/PyEmbedded/Tests.cpp
@@ -14,8 +14,8 @@
 #include "BABuild.h"
 #include "BAVersion.h"
 #include "Base/Py/PyCore.h"
-#include "Base/Py/PyUtils.h"
 #include "Base/Py/PyFmt.h"
+#include "Base/Py/PyUtils.h"
 #include "Base/Util/SysUtils.h"
 #include "Core/Export/ExportToPython.h"
 #include "Sample/Multilayer/MultiLayer.h"
diff --git a/Tests/Unit/GUI/TestAxesItems.cpp b/Tests/Unit/GUI/TestAxesItems.cpp
index 9d6776d869150d4fb5b38a1572551fe3e773e253..622d93e48082f707425a304fe0db6479ca00b636 100644
--- a/Tests/Unit/GUI/TestAxesItems.cpp
+++ b/Tests/Unit/GUI/TestAxesItems.cpp
@@ -1,8 +1,8 @@
 #include "Base/Axis/FixedBinAxis.h"
 #include "Base/Axis/VariableBinAxis.h"
 #include "Base/Const/Units.h"
-#include "GUI/Model/Item/AxesItems.h"
 #include "GUI/Model/BaseItem/PropertyItem.h"
+#include "GUI/Model/Item/AxesItems.h"
 #include "GUI/Util/Error.h"
 #include "GUI/View/FromDomain/FromDomain.h"
 #include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/Unit/GUI/TestDataItemViews.cpp b/Tests/Unit/GUI/TestDataItemViews.cpp
index 7b6fa5e3741432abbdc21543935d50bf206741a2..5207ca829ffc9b849bd7f91c75fa033ef01a7c1b 100644
--- a/Tests/Unit/GUI/TestDataItemViews.cpp
+++ b/Tests/Unit/GUI/TestDataItemViews.cpp
@@ -1,7 +1,7 @@
-#include "GUI/Model/Model/RealDataModel.h"
-#include "GUI/Model/Item/SpecularDataItem.h"
 #include "GUI/Model/Item/DataProperties.h"
 #include "GUI/Model/Item/DataPropertyContainer.h"
+#include "GUI/Model/Item/SpecularDataItem.h"
+#include "GUI/Model/Model/RealDataModel.h"
 #include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/Util/ComboProperty.h"
 #include "GUI/Util/Error.h"
diff --git a/Tests/Unit/GUI/TestDetectorItems.cpp b/Tests/Unit/GUI/TestDetectorItems.cpp
index 3f72dc001ac16125017e80a24a885e208af2942a..895abfe4e3bee2ef1d17add4005c21f81c231039 100644
--- a/Tests/Unit/GUI/TestDetectorItems.cpp
+++ b/Tests/Unit/GUI/TestDetectorItems.cpp
@@ -3,10 +3,10 @@
 #include "Device/Resolution/ConvolutionDetectorResolution.h"
 #include "Device/Resolution/ResolutionFunction2DGaussian.h"
 #include "GUI/Model/Item/InstrumentItems.h"
-#include "GUI/Model/Model/InstrumentModel.h"
 #include "GUI/Model/Item/RectangularDetectorItem.h"
 #include "GUI/Model/Item/ResolutionFunctionItems.h"
 #include "GUI/Model/Item/VectorItem.h"
+#include "GUI/Model/Model/InstrumentModel.h"
 #include "GUI/Util/ComboProperty.h"
 #include "Tests/GTestWrapper/google_test.h"
 
diff --git a/Tests/Unit/GUI/TestFitParameterModel.cpp b/Tests/Unit/GUI/TestFitParameterModel.cpp
index 846d75d63e97a12e06fa3932177a71feca6fc9a8..2e2cf5a3b3bc5948c66abd43d9ef094e6a37685e 100644
--- a/Tests/Unit/GUI/TestFitParameterModel.cpp
+++ b/Tests/Unit/GUI/TestFitParameterModel.cpp
@@ -1,8 +1,8 @@
 #include "GUI/Model/Item/FitParameterContainerItem.h"
 #include "GUI/Model/Item/FitParameterItem.h"
 #include "GUI/Model/Item/FitParameterLinkItem.h"
-#include "GUI/Model/Model/FitParameterModel.h"
 #include "GUI/Model/Item/FitSuiteItem.h"
+#include "GUI/Model/Model/FitParameterModel.h"
 #include "GUI/Model/Model/JobModel.h"
 #include "Tests/GTestWrapper/google_test.h"
 
diff --git a/Tests/Unit/GUI/TestGroupItem.cpp b/Tests/Unit/GUI/TestGroupItem.cpp
index 8f39ab9738f81812b42a7b5461db993239d56106..224b9f6b32b86b839a0f3ae9774d5a36a2c4fe63 100644
--- a/Tests/Unit/GUI/TestGroupItem.cpp
+++ b/Tests/Unit/GUI/TestGroupItem.cpp
@@ -1,6 +1,6 @@
 #include "GUI/Model/BaseItem/GroupItem.h"
-#include "GUI/Model/Item/ResolutionItems.h"
 #include "GUI/Model/Item/FormFactorItems.h"
+#include "GUI/Model/Item/ResolutionItems.h"
 #include "GUI/Model/Model/SessionModel.h"
 #include "GUI/Support/Type/VariantUtil.h"
 #include "GUI/Util/ComboProperty.h"
diff --git a/Tests/Unit/GUI/TestLinkInstrument.cpp b/Tests/Unit/GUI/TestLinkInstrument.cpp
index c3015b91f75d493256b995725842717a2741ae27..8a01eac87c97557316cd26620282b9b61e228fed 100644
--- a/Tests/Unit/GUI/TestLinkInstrument.cpp
+++ b/Tests/Unit/GUI/TestLinkInstrument.cpp
@@ -1,10 +1,10 @@
 #include "GUI/Model/Item/AxesItems.h"
-#include "GUI/Model/Item/RealDataItem.h"
-#include "GUI/Model/Model/RealDataModel.h"
 #include "GUI/Model/Item/InstrumentItems.h"
-#include "GUI/Model/Model/InstrumentModel.h"
 #include "GUI/Model/Item/JobItemUtils.h"
+#include "GUI/Model/Item/RealDataItem.h"
 #include "GUI/Model/Item/RectangularDetectorItem.h"
+#include "GUI/Model/Model/InstrumentModel.h"
+#include "GUI/Model/Model/RealDataModel.h"
 #include "GUI/Model/Project/LinkInstrumentManager.h"
 #include "GUI/Model/Project/ProjectDocument.h"
 #include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/Unit/GUI/TestOutputDataIOService.cpp b/Tests/Unit/GUI/TestOutputDataIOService.cpp
index b89ffa4ed7ed07e147ba75781130c70e32397cee..7df1fc522953072b8e5ef8c26e650e4b4bef7bf9 100644
--- a/Tests/Unit/GUI/TestOutputDataIOService.cpp
+++ b/Tests/Unit/GUI/TestOutputDataIOService.cpp
@@ -1,12 +1,12 @@
 #include "Device/Histo/IntensityDataIOFactory.h"
 #include "GUI/Model/Item/IntensityDataItem.h"
-#include "GUI/Model/Item/RealDataItem.h"
-#include "GUI/Model/Model/RealDataModel.h"
+#include "GUI/Model/Item/JobFunctions.h"
 #include "GUI/Model/Item/JobItem.h"
 #include "GUI/Model/Item/JobItemUtils.h"
+#include "GUI/Model/Item/RealDataItem.h"
 #include "GUI/Model/Model/ApplicationModels.h"
 #include "GUI/Model/Model/JobModel.h"
-#include "GUI/Model/Item/JobFunctions.h"
+#include "GUI/Model/Model/RealDataModel.h"
 #include "GUI/Model/Project/OutputDataIOService.h"
 #include "GUI/Support/IO/ImportDataInfo.h"
 #include "GUI/Support/IO/ProjectUtils.h"
diff --git a/Tests/Unit/GUI/TestProjectDocument.cpp b/Tests/Unit/GUI/TestProjectDocument.cpp
index 2b913286f98f7a866abd36c077c9ace26f8a265d..770ba369b16f1474a279fdc30e4250c6919efefc 100644
--- a/Tests/Unit/GUI/TestProjectDocument.cpp
+++ b/Tests/Unit/GUI/TestProjectDocument.cpp
@@ -1,9 +1,9 @@
+#include "GUI/Model/Item/InstrumentItems.h"
 #include "GUI/Model/Item/IntensityDataItem.h"
+#include "GUI/Model/Item/JobItemUtils.h"
 #include "GUI/Model/Item/RealDataItem.h"
-#include "GUI/Model/Model/RealDataModel.h"
-#include "GUI/Model/Item/InstrumentItems.h"
 #include "GUI/Model/Model/InstrumentModel.h"
-#include "GUI/Model/Item/JobItemUtils.h"
+#include "GUI/Model/Model/RealDataModel.h"
 #include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/Support/IO/ProjectUtils.h"
 #include "GUI/Util/Path.h"
diff --git a/Tests/Unit/GUI/TestRealDataModel.cpp b/Tests/Unit/GUI/TestRealDataModel.cpp
index 2ac40299d42f7e908b55ca01025a081355ad1411..b1dbe5f2c221737b9c02384a05ad40d2bc82d83c 100644
--- a/Tests/Unit/GUI/TestRealDataModel.cpp
+++ b/Tests/Unit/GUI/TestRealDataModel.cpp
@@ -1,7 +1,7 @@
 #include "Base/Axis/PointwiseAxis.h"
+#include "GUI/Model/Item/DataItem.h"
 #include "GUI/Model/Item/RealDataItem.h"
 #include "GUI/Model/Model/RealDataModel.h"
-#include "GUI/Model/Item/DataItem.h"
 #include "Tests/GTestWrapper/google_test.h"
 #include <QSignalSpy>
 
diff --git a/Tests/Unit/GUI/TestRealSpaceBuilderUtils.cpp b/Tests/Unit/GUI/TestRealSpaceBuilderUtils.cpp
index 94e46af95262c72db97670e66e6ad93aa9327227..0b8c202be6f56fdbf3b852846c00bf777b4f7b23 100644
--- a/Tests/Unit/GUI/TestRealSpaceBuilderUtils.cpp
+++ b/Tests/Unit/GUI/TestRealSpaceBuilderUtils.cpp
@@ -1,8 +1,8 @@
-#include "GUI/Model/Model/MaterialModel.h"
-#include "GUI/Model/Model/ApplicationModels.h"
 #include "GUI/Model/Item/FormFactorItems.h"
 #include "GUI/Model/Item/ParticleItem.h"
 #include "GUI/Model/Item/ParticleLayoutItem.h"
+#include "GUI/Model/Model/ApplicationModels.h"
+#include "GUI/Model/Model/MaterialModel.h"
 #include "GUI/Model/Model/SampleModel.h"
 #include "GUI/View/Realspace/Particle3DContainer.h"
 #include "GUI/View/Realspace/RealSpaceBuilder.h"
diff --git a/Tests/Unit/GUI/TestSaveService.cpp b/Tests/Unit/GUI/TestSaveService.cpp
index 94121245fdc924e494d58ae08c96ff41c4e66bc8..4c2d2bd345c3de6d78595e5d9b595e811ad9939a 100644
--- a/Tests/Unit/GUI/TestSaveService.cpp
+++ b/Tests/Unit/GUI/TestSaveService.cpp
@@ -1,9 +1,9 @@
+#include "GUI/Model/Item/InstrumentItems.h"
 #include "GUI/Model/Item/IntensityDataItem.h"
+#include "GUI/Model/Item/JobItemUtils.h"
 #include "GUI/Model/Item/RealDataItem.h"
-#include "GUI/Model/Model/RealDataModel.h"
-#include "GUI/Model/Item/InstrumentItems.h"
 #include "GUI/Model/Model/InstrumentModel.h"
-#include "GUI/Model/Item/JobItemUtils.h"
+#include "GUI/Model/Model/RealDataModel.h"
 #include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/Support/IO/ProjectUtils.h"
 #include "GUI/Util/Error.h"
diff --git a/Tests/Unit/GUI/TestSavingSpecularData.cpp b/Tests/Unit/GUI/TestSavingSpecularData.cpp
index fd26410beacd45f4535a03bddbc5912d1b8f5429..03a2829c42c05f68c59f92485d2c900a848276b9 100644
--- a/Tests/Unit/GUI/TestSavingSpecularData.cpp
+++ b/Tests/Unit/GUI/TestSavingSpecularData.cpp
@@ -1,14 +1,14 @@
 #include "Base/Axis/PointwiseAxis.h"
 #include "Device/Histo/IntensityDataIOFactory.h"
-#include "GUI/Model/Item/PointwiseAxisItem.h"
-#include "GUI/Model/Item/IntensityDataItem.h"
-#include "GUI/Model/Item/JobItem.h"
 #include "GUI/Model/BaseItem/GroupItem.h"
 #include "GUI/Model/Item/InstrumentItems.h"
-#include "GUI/Model/Model/InstrumentModel.h"
+#include "GUI/Model/Item/IntensityDataItem.h"
+#include "GUI/Model/Item/JobFunctions.h"
+#include "GUI/Model/Item/JobItem.h"
+#include "GUI/Model/Item/PointwiseAxisItem.h"
 #include "GUI/Model/Model/ApplicationModels.h"
+#include "GUI/Model/Model/InstrumentModel.h"
 #include "GUI/Model/Model/JobModel.h"
-#include "GUI/Model/Item/JobFunctions.h"
 #include "GUI/Model/Project/OutputDataIOService.h"
 #include "GUI/Support/IO/ItemFileNameUtils.h"
 #include "GUI/Support/IO/ProjectUtils.h"
diff --git a/Tests/Unit/GUI/TestSessionItemUtils.cpp b/Tests/Unit/GUI/TestSessionItemUtils.cpp
index 8ef8c830e6afd36a8f8f785c24453a2f03a58e45..a44424e1411ad5d5895f35e8f1029babe268a9db 100644
--- a/Tests/Unit/GUI/TestSessionItemUtils.cpp
+++ b/Tests/Unit/GUI/TestSessionItemUtils.cpp
@@ -1,6 +1,6 @@
 #include "GUI/Model/BaseItem/PropertyItem.h"
-#include "GUI/Model/Model/SessionModel.h"
 #include "GUI/Model/Item/VectorItem.h"
+#include "GUI/Model/Model/SessionModel.h"
 #include "GUI/Support/Type/VariantUtil.h"
 #include "GUI/Util/ComboProperty.h"
 #include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/Unit/GUI/TestSessionModel.cpp b/Tests/Unit/GUI/TestSessionModel.cpp
index 46de7f3ba92a84698e6b4500eed3401ccfa77e12..57386f86d0f122b8a6be1d9a9e4006290f38e976 100644
--- a/Tests/Unit/GUI/TestSessionModel.cpp
+++ b/Tests/Unit/GUI/TestSessionModel.cpp
@@ -1,14 +1,14 @@
-#include "GUI/Model/Item/JobItem.h"
+#include "GUI/Model/BaseItem/PropertyItem.h"
 #include "GUI/Model/Item/InstrumentItems.h"
-#include "GUI/Model/Model/InstrumentModel.h"
-#include "GUI/Model/Item/MaskItems.h"
-#include "GUI/Model/Model/MaterialModel.h"
-#include "GUI/Model/Model/JobModel.h"
+#include "GUI/Model/Item/JobItem.h"
 #include "GUI/Model/Item/LayerItem.h"
+#include "GUI/Model/Item/MaskItems.h"
 #include "GUI/Model/Item/MultiLayerItem.h"
-#include "GUI/Model/Model/SampleModel.h"
-#include "GUI/Model/BaseItem/PropertyItem.h"
 #include "GUI/Model/Item/VectorItem.h"
+#include "GUI/Model/Model/InstrumentModel.h"
+#include "GUI/Model/Model/JobModel.h"
+#include "GUI/Model/Model/MaterialModel.h"
+#include "GUI/Model/Model/SampleModel.h"
 #include "GUI/Support/Data/SessionItemTags.h"
 #include "Tests/GTestWrapper/google_test.h"
 #include <QSignalSpy>
diff --git a/Tests/Unit/GUI/TestSessionXML.cpp b/Tests/Unit/GUI/TestSessionXML.cpp
index 311537af4c818e11b27465f1c6213177a7bf84f6..c8439c5e350fbb9ee115466c3dc2c9c8e77ebcc4 100644
--- a/Tests/Unit/GUI/TestSessionXML.cpp
+++ b/Tests/Unit/GUI/TestSessionXML.cpp
@@ -1,17 +1,17 @@
+#include "GUI/Model/BaseItem/PropertyItem.h"
 #include "GUI/Model/Item/BackgroundItems.h"
-#include "GUI/Model/Item/InstrumentItems.h"
-#include "GUI/Model/Model/InstrumentModel.h"
-#include "GUI/Model/Model/JobModel.h"
 #include "GUI/Model/Item/FormFactorItems.h"
+#include "GUI/Model/Item/InstrumentItems.h"
 #include "GUI/Model/Item/LayerItem.h"
 #include "GUI/Model/Item/MultiLayerItem.h"
 #include "GUI/Model/Item/ParticleItem.h"
 #include "GUI/Model/Item/ParticleLayoutItem.h"
+#include "GUI/Model/Model/InstrumentModel.h"
+#include "GUI/Model/Model/JobModel.h"
 #include "GUI/Model/Model/SampleModel.h"
-#include "GUI/Model/BaseItem/PropertyItem.h"
 #include "GUI/Model/Model/SessionModel.h"
-#include "GUI/Model/XML/Serializer.h"
 #include "GUI/Model/Model/SessionXML.h"
+#include "GUI/Model/XML/Serializer.h"
 #include "Tests/GTestWrapper/google_test.h"
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>