diff --git a/GUI/Models/Data/IntensityDataItem.cpp b/GUI/Models/Data/IntensityDataItem.cpp
index 202ad3ffbc1879f485227cb400c9d7c6b0fce569..9264114dd31f44ad075ae6281cb517b8b5cc9059 100644
--- a/GUI/Models/Data/IntensityDataItem.cpp
+++ b/GUI/Models/Data/IntensityDataItem.cpp
@@ -19,7 +19,7 @@
 #include "GUI/Models/Instrument/MaskItems.h"
 #include "GUI/Models/Job/JobItemUtils.h"
 #include "GUI/Models/Session/SessionModel.h"
-#include "GUI/Models/Trafo/ProjectionItems.h"
+#include "GUI/Models/Data/ProjectionItems.h"
 #include "GUI/utils/Error.h"
 
 namespace {
diff --git a/GUI/Models/Data/MaskUnitsConverter.cpp b/GUI/Models/Data/MaskUnitsConverter.cpp
index 58e5915f27f46dc7dc767808f9bd475a7ba369d1..3fcbfe96f97eeec64ce58a6f00fb0f5a7316d4dd 100644
--- a/GUI/Models/Data/MaskUnitsConverter.cpp
+++ b/GUI/Models/Data/MaskUnitsConverter.cpp
@@ -16,7 +16,7 @@
 #include "Device/Data/DataUtils.h"
 #include "GUI/Models/Data/IntensityDataItem.h"
 #include "GUI/Models/Instrument/MaskItems.h"
-#include "GUI/Models/Trafo/ProjectionItems.h"
+#include "GUI/Models/Data/ProjectionItems.h"
 
 #include <boost/polymorphic_cast.hpp>
 using boost::polymorphic_downcast;
diff --git a/GUI/Models/Trafo/ProjectionItems.cpp b/GUI/Models/Data/ProjectionItems.cpp
similarity index 89%
rename from GUI/Models/Trafo/ProjectionItems.cpp
rename to GUI/Models/Data/ProjectionItems.cpp
index 560c078fc3fc9ae2b30dd8db678c0d6f24b2feef..fb0fb98823b25c6c07c82062e1d4f6da8cece64f 100644
--- a/GUI/Models/Trafo/ProjectionItems.cpp
+++ b/GUI/Models/Data/ProjectionItems.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Models/Trafo/ProjectionItems.cpp
+//! @file      GUI/Models/Data/ProjectionItems.cpp
 //! @brief     Implements items related to projections over color map.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Models/Trafo/ProjectionItems.h"
+#include "GUI/Models/Data/ProjectionItems.h"
 #include "GUI/Models/Instrument/MaskItems.h"
 
 ProjectionContainerItem::ProjectionContainerItem() : SessionItem(M_TYPE)
diff --git a/GUI/Models/Trafo/ProjectionItems.h b/GUI/Models/Data/ProjectionItems.h
similarity index 80%
rename from GUI/Models/Trafo/ProjectionItems.h
rename to GUI/Models/Data/ProjectionItems.h
index ad8237a015921107d6db24be26a84897dcba2ddd..0e83bc007ba6f3cc2c0d5f483ad194415b484acc 100644
--- a/GUI/Models/Trafo/ProjectionItems.h
+++ b/GUI/Models/Data/ProjectionItems.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Models/Trafo/ProjectionItems.h
+//! @file      GUI/Models/Data/ProjectionItems.h
 //! @brief     Defines items related to projections over color map.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_MODELS_TRAFO_PROJECTIONITEMS_H
-#define BORNAGAIN_GUI_MODELS_TRAFO_PROJECTIONITEMS_H
+#ifndef BORNAGAIN_GUI_MODELS_DATA_PROJECTIONITEMS_H
+#define BORNAGAIN_GUI_MODELS_DATA_PROJECTIONITEMS_H
 
 #include "GUI/Models/Session/SessionItem.h"
 
@@ -26,4 +26,4 @@ public:
     ProjectionContainerItem();
 };
 
-#endif // BORNAGAIN_GUI_MODELS_TRAFO_PROJECTIONITEMS_H
+#endif // BORNAGAIN_GUI_MODELS_DATA_PROJECTIONITEMS_H
diff --git a/GUI/Models/Data/RealDataItem.cpp b/GUI/Models/Data/RealDataItem.cpp
index 33744f324bcf30410438c835e67b29e3ca3ba6c3..c2d680f1de9ce4b943a422bcec46113cff949087 100644
--- a/GUI/Models/Data/RealDataItem.cpp
+++ b/GUI/Models/Data/RealDataItem.cpp
@@ -27,7 +27,7 @@
 #include "GUI/Models/Job/JobItem.h"
 #include "GUI/Models/Job/JobItemUtils.h"
 #include "GUI/Models/Job/JobModelFunctions.h"
-#include "GUI/Models/Trafo/ProjectionItems.h"
+#include "GUI/Models/Data/ProjectionItems.h"
 #include "GUI/Models/Varia/ItemFileNameUtils.h"
 #include "GUI/Session/SessionData.h"
 #include "GUI/utils/DeserializationException.h"
diff --git a/GUI/Models/Fit/FitParameterHelper.cpp b/GUI/Models/Fit/FitParameterHelper.cpp
index c914442f5ad07658d378f3388298b70863130770..6eea751ef8241a8c3b9738d73996a1fe4169531f 100644
--- a/GUI/Models/Fit/FitParameterHelper.cpp
+++ b/GUI/Models/Fit/FitParameterHelper.cpp
@@ -16,7 +16,7 @@
 #include "GUI/Models/Fit/FitParameterItems.h"
 #include "GUI/Models/Job/JobItem.h"
 #include "GUI/Models/Job/JobModel.h"
-#include "GUI/Models/Parameter/ParameterTreeItems.h"
+#include "GUI/Models/Fit/ParameterTreeItems.h"
 #include "GUI/Models/Session/ModelPath.h"
 
 //! Creates fit parameter from given ParameterItem, sets starting value to the value
diff --git a/GUI/Models/Fit/FitParameterItems.cpp b/GUI/Models/Fit/FitParameterItems.cpp
index df5d4f740b7baf7c5c009ac67aed91d7e0a10bf9..dc6d982ecd5442aebc449e3792e980bf4bac252b 100644
--- a/GUI/Models/Fit/FitParameterItems.cpp
+++ b/GUI/Models/Fit/FitParameterItems.cpp
@@ -17,7 +17,7 @@
 #include "Fit/Param/Parameters.h"
 #include "GUI/Models/Group/ComboProperty.h"
 #include "GUI/Models/Job/JobItem.h"
-#include "GUI/Models/Parameter/ParameterTreeItems.h"
+#include "GUI/Models/Fit/ParameterTreeItems.h"
 #include "GUI/Models/Session/ModelPath.h"
 #include "GUI/utils/Error.h"
 #include <cmath>
diff --git a/GUI/Models/Parameter/ParameterTreeItems.cpp b/GUI/Models/Fit/ParameterTreeItems.cpp
similarity index 93%
rename from GUI/Models/Parameter/ParameterTreeItems.cpp
rename to GUI/Models/Fit/ParameterTreeItems.cpp
index 7204752bd5a64c6d775a47bfdd41a68b2f6a6611..ce6f97e825b7f4fe676da4b1778ea22d327fc4fb 100644
--- a/GUI/Models/Parameter/ParameterTreeItems.cpp
+++ b/GUI/Models/Fit/ParameterTreeItems.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Models/Parameter/ParameterTreeItems.cpp
+//! @file      GUI/Models/Fit/ParameterTreeItems.cpp
 //! @brief     Implements classes for ParameterTreeItems
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Models/Parameter/ParameterTreeItems.h"
+#include "GUI/Models/Fit/ParameterTreeItems.h"
 #include "GUI/Models/Job/JobItem.h"
 #include "GUI/Models/Session/ModelPath.h"
 #include "GUI/Models/Session/SessionModel.h"
@@ -46,7 +46,7 @@ void ParameterItem::propagateValueToLink(double newValue)
         item->setValue(newValue);
 }
 
-//! Returns corresponding linked item in MultiLayerItem/IsntrumentItem
+//! Returns corresponding linked item in MultiLayerItem/InstrumentItem
 
 SessionItem* ParameterItem::linkedItem()
 {
diff --git a/GUI/Models/Parameter/ParameterTreeItems.h b/GUI/Models/Fit/ParameterTreeItems.h
similarity index 88%
rename from GUI/Models/Parameter/ParameterTreeItems.h
rename to GUI/Models/Fit/ParameterTreeItems.h
index 13fa10873cd62396693660ee0b494e9897995ff9..356c6bae2695810dded932ceeb096da1383076d9 100644
--- a/GUI/Models/Parameter/ParameterTreeItems.h
+++ b/GUI/Models/Fit/ParameterTreeItems.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Models/Parameter/ParameterTreeItems.h
+//! @file      GUI/Models/Fit/ParameterTreeItems.h
 //! @brief     Defines classes for ParameterTreeItems
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_MODELS_PARAMETER_PARAMETERTREEITEMS_H
-#define BORNAGAIN_GUI_MODELS_PARAMETER_PARAMETERTREEITEMS_H
+#ifndef BORNAGAIN_GUI_MODELS_FIT_PARAMETERTREEITEMS_H
+#define BORNAGAIN_GUI_MODELS_FIT_PARAMETERTREEITEMS_H
 
 #include "GUI/Models/Session/SessionItem.h"
 
@@ -60,4 +60,4 @@ public:
     ParameterContainerItem();
 };
 
-#endif // BORNAGAIN_GUI_MODELS_PARAMETER_PARAMETERTREEITEMS_H
+#endif // BORNAGAIN_GUI_MODELS_FIT_PARAMETERTREEITEMS_H
diff --git a/GUI/Models/Fit/ParameterTuningModel.cpp b/GUI/Models/Fit/ParameterTuningModel.cpp
index 70fc7439379bdff862c049ef5f84d894d1f87fca..8df5bbff85588372fcc39d2ae2bf6812befaf96b 100644
--- a/GUI/Models/Fit/ParameterTuningModel.cpp
+++ b/GUI/Models/Fit/ParameterTuningModel.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/Models/Fit/ParameterTuningModel.h"
 #include "GUI/Models/Fit/FitParameterHelper.h"
-#include "GUI/Models/Parameter/ParameterTreeItems.h"
+#include "GUI/Models/Fit/ParameterTreeItems.h"
 #include "GUI/Models/Session/SessionModel.h"
 #include <QMimeData>
 
diff --git a/GUI/Models/Job/JobItem.cpp b/GUI/Models/Job/JobItem.cpp
index 6bd409b9b80f0815e8832264b1fb355f79bca78f..dda6863069ed2a8252969e36b933a9acc53731cd 100644
--- a/GUI/Models/Job/JobItem.cpp
+++ b/GUI/Models/Job/JobItem.cpp
@@ -22,7 +22,7 @@
 #include "GUI/Models/Instrument/InstrumentItems.h"
 #include "GUI/Models/Job/JobItemUtils.h"
 #include "GUI/Models/Material/MaterialItemContainer.h"
-#include "GUI/Models/Parameter/ParameterTreeItems.h"
+#include "GUI/Models/Fit/ParameterTreeItems.h"
 #include "GUI/Models/Sample/MultiLayerItem.h"
 #include "GUI/Models/Varia/ItemFileNameUtils.h"
 #include "GUI/Models/Varia/SimulationOptionsItem.h"
diff --git a/GUI/Models/Job/JobModel.cpp b/GUI/Models/Job/JobModel.cpp
index bb37500ac238ea067684205611e2d9463a447889..735951f5a24b6f12f369c9a20c8324b130c0e941 100644
--- a/GUI/Models/Job/JobModel.cpp
+++ b/GUI/Models/Job/JobModel.cpp
@@ -22,7 +22,7 @@
 #include "GUI/Models/Job/JobModelFunctions.h"
 #include "GUI/Models/Job/JobQueueData.h"
 #include "GUI/Models/Job/ParameterTreeUtils.h"
-#include "GUI/Models/Parameter/ParameterTreeItems.h"
+#include "GUI/Models/Fit/ParameterTreeItems.h"
 #include "GUI/Models/Sample/MultiLayerItem.h"
 #include "GUI/utils/Helpers.h"
 
diff --git a/GUI/Models/Job/ParameterTreeUtils.cpp b/GUI/Models/Job/ParameterTreeUtils.cpp
index f54060d91c8f2edd5f4a4690172df9b16b91b408..0535ee4a225cfb7b86de7cda845b9481764d79f9 100644
--- a/GUI/Models/Job/ParameterTreeUtils.cpp
+++ b/GUI/Models/Job/ParameterTreeUtils.cpp
@@ -17,7 +17,7 @@
 #include "GUI/Models/Instrument/InstrumentItems.h"
 #include "GUI/Models/Job/JobItem.h"
 #include "GUI/Models/Material/MaterialItemContainer.h"
-#include "GUI/Models/Parameter/ParameterTreeItems.h"
+#include "GUI/Models/Fit/ParameterTreeItems.h"
 #include "GUI/Models/Parameter/PropertyItem.h"
 #include "GUI/Models/Sample/MultiLayerItem.h"
 #include "GUI/Models/Session/ModelPath.h"
diff --git a/GUI/Models/Session/SessionItem.cpp b/GUI/Models/Session/SessionItem.cpp
index a76e7f8d0ec22aebbd0f303bb186132c029b33a8..db36d6b0dfb6e36cfcd1cf3df76d0a198eababa3 100644
--- a/GUI/Models/Session/SessionItem.cpp
+++ b/GUI/Models/Session/SessionItem.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Models/Group/GroupItem.h"
-#include "GUI/Models/Parameter/ParameterTreeItems.h"
+#include "GUI/Models/Fit/ParameterTreeItems.h"
 #include "GUI/Models/Parameter/PropertyItem.h"
 #include "GUI/Models/Session/SessionItemData.h"
 #include "GUI/Models/Session/SessionItemTags.h"
diff --git a/GUI/Models/Varia/ItemCatalog.cpp b/GUI/Models/Varia/ItemCatalog.cpp
index 9c756a7c154fe90ede182c176c5004d29b5d1a7d..a03e2a92a941f7d35318fc3080bb2de4ac78442d 100644
--- a/GUI/Models/Varia/ItemCatalog.cpp
+++ b/GUI/Models/Varia/ItemCatalog.cpp
@@ -38,7 +38,7 @@
 #include "GUI/Models/Material/MaterialDataItems.h"
 #include "GUI/Models/Material/MaterialItem.h"
 #include "GUI/Models/Material/MaterialItemContainer.h"
-#include "GUI/Models/Parameter/ParameterTreeItems.h"
+#include "GUI/Models/Fit/ParameterTreeItems.h"
 #include "GUI/Models/Parameter/PropertyItem.h"
 #include "GUI/Models/Sample/FTDecayFunctionItems.h"
 #include "GUI/Models/Sample/FTDistributionItems.h"
@@ -54,7 +54,7 @@
 #include "GUI/Models/Sample/ParticleItem.h"
 #include "GUI/Models/Sample/ParticleLayoutItem.h"
 #include "GUI/Models/Sample/ResolutionFunctionItems.h"
-#include "GUI/Models/Trafo/ProjectionItems.h"
+#include "GUI/Models/Data/ProjectionItems.h"
 #include "GUI/Models/Trafo/RotationItems.h"
 #include "GUI/Models/Trafo/TransformationItem.h"
 #include "GUI/Models/Types/VectorItem.h"
diff --git a/GUI/Models/Varia/ItemFileNameUtils.cpp b/GUI/Models/Varia/ItemFileNameUtils.cpp
index 64578d3a91acc9d9f31af6c338168fb9ede6a7db..79c4615cb54f7e62b5b6322aeda4421dd8d02bcd 100644
--- a/GUI/Models/Varia/ItemFileNameUtils.cpp
+++ b/GUI/Models/Varia/ItemFileNameUtils.cpp
@@ -19,6 +19,7 @@
 #include "GUI/utils/Helpers.h"
 
 namespace {
+
 const QString jobdata_file_prefix = "jobdata";
 const QString refdata_file_prefix = "refdata";
 const QString realdata_file_prefix = "realdata";
@@ -26,9 +27,15 @@ const QString instrument_file_prefix = "instrdata";
 const QString nativedata_file_prefix = "nativedata";
 
 //! Constructs the name of the file for intensity data.
-QString intensityDataFileName(const QString& itemName, const QString& prefix);
+QString intensityDataFileName(const QString& itemName, const QString& prefix)
+{
+    QString bodyName = GUI::Helpers::getValidFileName(itemName);
+    return QString("%1_%2_0.int.gz").arg(prefix).arg(bodyName);
+}
+
 } // namespace
 
+
 //! Constructs the name of the file with simulated intensities.
 
 QString GUI::Model::FilenameUtils::jobResultsFileName(const JobItem& jobItem)
@@ -77,11 +84,3 @@ QStringList GUI::Model::FilenameUtils::nonXMLFileNameFilters()
 
     return result;
 }
-
-namespace {
-QString intensityDataFileName(const QString& itemName, const QString& prefix)
-{
-    QString bodyName = GUI::Helpers::getValidFileName(itemName);
-    return QString("%1_%2_0.int.gz").arg(prefix).arg(bodyName);
-}
-} // namespace
diff --git a/GUI/Views/FitWidgets/FitParameterWidget.cpp b/GUI/Views/FitWidgets/FitParameterWidget.cpp
index d07e0510335791b24e4f272b1d8ca215fd6bf461..c05178960f0497d13d99f572cd9c9516654500ca 100644
--- a/GUI/Views/FitWidgets/FitParameterWidget.cpp
+++ b/GUI/Views/FitWidgets/FitParameterWidget.cpp
@@ -20,7 +20,7 @@
 #include "GUI/Models/Job/JobItem.h"
 #include "GUI/Models/Job/JobModel.h"
 #include "GUI/Models/Parameter/FilterPropertyProxy.h"
-#include "GUI/Models/Parameter/ParameterTreeItems.h"
+#include "GUI/Models/Fit/ParameterTreeItems.h"
 #include "GUI/Views/FitWidgets/ParameterTuningWidget.h"
 #include "GUI/Views/PropertyEditor/SessionModelDelegate.h"
 #include "GUI/Widgets/Info/OverlayLabelController.h"
diff --git a/GUI/Views/FitWidgets/ParameterTuningDelegate.cpp b/GUI/Views/FitWidgets/ParameterTuningDelegate.cpp
index f5bcb19061557f8e1abaab6f3eeb8101aef45dfe..84adfb115e6ec4ff94ab7dae1140307d63ce4426 100644
--- a/GUI/Views/FitWidgets/ParameterTuningDelegate.cpp
+++ b/GUI/Views/FitWidgets/ParameterTuningDelegate.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Views/FitWidgets/ParameterTuningDelegate.h"
-#include "GUI/Models/Parameter/ParameterTreeItems.h"
+#include "GUI/Models/Fit/ParameterTreeItems.h"
 #include "GUI/Models/Fit/ParameterTuningModel.h"
 #include "GUI/Models/Session/ModelPath.h"
 #include "GUI/Models/Session/SessionItemUtils.h"
diff --git a/GUI/Views/FitWidgets/ParameterTuningWidget.cpp b/GUI/Views/FitWidgets/ParameterTuningWidget.cpp
index 930aa720d1988504c2579bac3b9d8804c96f6d03..db102ce55ac810040a3a4bed3a770904262c672f 100644
--- a/GUI/Views/FitWidgets/ParameterTuningWidget.cpp
+++ b/GUI/Views/FitWidgets/ParameterTuningWidget.cpp
@@ -16,7 +16,7 @@
 #include "GUI/Models/Data/IntensityDataItem.h"
 #include "GUI/Models/Job/JobItem.h"
 #include "GUI/Models/Job/JobModel.h"
-#include "GUI/Models/Parameter/ParameterTreeItems.h"
+#include "GUI/Models/Fit/ParameterTreeItems.h"
 #include "GUI/Models/Fit/ParameterTuningModel.h"
 #include "GUI/Views/FitWidgets/JobRealTimeToolBar.h"
 #include "GUI/Views/FitWidgets/ParameterTuningDelegate.h"
diff --git a/GUI/Views/MaskWidgets/MaskContainerView.cpp b/GUI/Views/MaskWidgets/MaskContainerView.cpp
index cd007e0d51f77d5a48fd6302bde1e33e5d16d08e..8c2f894265f6d5c5ea1d9b26fdd9a734d66c173c 100644
--- a/GUI/Views/MaskWidgets/MaskContainerView.cpp
+++ b/GUI/Views/MaskWidgets/MaskContainerView.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/Views/MaskWidgets/MaskContainerView.h"
 #include "GUI/Models/Instrument/MaskItems.h"
-#include "GUI/Models/Trafo/ProjectionItems.h"
+#include "GUI/Models/Data/ProjectionItems.h"
 #include "GUI/Views/MaskWidgets/ISceneAdaptor.h"
 #include <QBrush>
 #include <QPainter>
diff --git a/GUI/Views/MaskWidgets/MaskGraphicsScene.cpp b/GUI/Views/MaskWidgets/MaskGraphicsScene.cpp
index b60573cc8e92600e716f40b9fc773b12553bd0c9..1cb302d8eac7de04f34c37e00614d00adfda3765 100644
--- a/GUI/Views/MaskWidgets/MaskGraphicsScene.cpp
+++ b/GUI/Views/MaskWidgets/MaskGraphicsScene.cpp
@@ -17,7 +17,7 @@
 #include "GUI/Models/Instrument/MaskItems.h"
 #include "GUI/Models/Parameter/PropertyItem.h"
 #include "GUI/Models/Session/SessionModel.h"
-#include "GUI/Models/Trafo/ProjectionItems.h"
+#include "GUI/Models/Data/ProjectionItems.h"
 #include "GUI/Views/MaskWidgets/ColorMapSceneAdaptor.h"
 #include "GUI/Views/MaskWidgets/MaskGraphicsProxy.h"
 #include "GUI/Views/MaskWidgets/MaskViewFactory.h"
diff --git a/GUI/Views/MaskWidgets/MaskViewFactory.cpp b/GUI/Views/MaskWidgets/MaskViewFactory.cpp
index 387f4419ee00be1e045119946922004101434264..56ef4e073947ef64d5976f344be1d859179fb06f 100644
--- a/GUI/Views/MaskWidgets/MaskViewFactory.cpp
+++ b/GUI/Views/MaskWidgets/MaskViewFactory.cpp
@@ -15,7 +15,7 @@
 #include "GUI/Views/MaskWidgets/MaskViewFactory.h"
 #include "GUI/Models/Instrument/MaskItems.h"
 #include "GUI/Models/Session/SessionItem.h"
-#include "GUI/Models/Trafo/ProjectionItems.h"
+#include "GUI/Models/Data/ProjectionItems.h"
 #include "GUI/Views/MaskWidgets/EllipseView.h"
 #include "GUI/Views/MaskWidgets/LineViews.h"
 #include "GUI/Views/MaskWidgets/MaskAllView.h"
diff --git a/GUI/Views/ProjectionsWidgets/IntensityDataProjectionsWidget.cpp b/GUI/Views/ProjectionsWidgets/IntensityDataProjectionsWidget.cpp
index 96efe85d4feaa791874a07beaa70bdc934d53ee3..80f4605a624ccd8edf083a9e16cc4eb7e7b65df1 100644
--- a/GUI/Views/ProjectionsWidgets/IntensityDataProjectionsWidget.cpp
+++ b/GUI/Views/ProjectionsWidgets/IntensityDataProjectionsWidget.cpp
@@ -15,7 +15,7 @@
 #include "GUI/Views/ProjectionsWidgets/IntensityDataProjectionsWidget.h"
 #include "GUI/Models/Data/DataItemUtils.h"
 #include "GUI/Models/Data/IntensityDataItem.h"
-#include "GUI/Models/Trafo/ProjectionItems.h"
+#include "GUI/Models/Data/ProjectionItems.h"
 #include "GUI/Views/ProjectionsWidgets/ProjectionsEditor.h"
 #include <QVBoxLayout>
 
diff --git a/GUI/Views/ProjectionsWidgets/ProjectionsPlot.cpp b/GUI/Views/ProjectionsWidgets/ProjectionsPlot.cpp
index e1d0de9de05d818ef6fe980241290dc8266874ea..25bf88d389dbcdd536041320f16f07942c0b1403 100644
--- a/GUI/Views/ProjectionsWidgets/ProjectionsPlot.cpp
+++ b/GUI/Views/ProjectionsWidgets/ProjectionsPlot.cpp
@@ -18,7 +18,7 @@
 #include "GUI/Models/Data/AxesItems.h"
 #include "GUI/Models/Data/IntensityDataItem.h"
 #include "GUI/Models/Instrument/MaskItems.h"
-#include "GUI/Models/Trafo/ProjectionItems.h"
+#include "GUI/Models/Data/ProjectionItems.h"
 #include "GUI/Views/IntensityDataWidgets/ColorMapUtils.h"
 #include "GUI/Views/IntensityDataWidgets/PlotConstants.h"
 #include <qcustomplot.h>
diff --git a/GUI/Views/ProjectionsWidgets/SaveProjectionsAssistant.cpp b/GUI/Views/ProjectionsWidgets/SaveProjectionsAssistant.cpp
index f8eb8a4202a4870fef948c65eef5ffdf805f104c..a45ad5b737fc67837a1d01d74aa364d489544704 100644
--- a/GUI/Views/ProjectionsWidgets/SaveProjectionsAssistant.cpp
+++ b/GUI/Views/ProjectionsWidgets/SaveProjectionsAssistant.cpp
@@ -19,7 +19,7 @@
 #include "GUI/Application/GlobalSettings.h"
 #include "GUI/Models/Data/IntensityDataItem.h"
 #include "GUI/Models/Instrument/MaskItems.h"
-#include "GUI/Models/Trafo/ProjectionItems.h"
+#include "GUI/Models/Data/ProjectionItems.h"
 #include "GUI/Views/Main/ProjectManager.h"
 #include "GUI/utils/Error.h"
 #include <QFileDialog>
diff --git a/Tests/Unit/GUI/TestMapperForItem.cpp b/Tests/Unit/GUI/TestMapperForItem.cpp
index 074ad0c2b3b7417d710d7f779b6842c2e53973a0..0c1680c5575825e9873fb0c0bd632f76b1c0d467 100644
--- a/Tests/Unit/GUI/TestMapperForItem.cpp
+++ b/Tests/Unit/GUI/TestMapperForItem.cpp
@@ -3,7 +3,7 @@
 #include "GUI/Models/Sample/MultiLayerItem.h"
 #include "GUI/Models/Sample/SampleModel.h"
 #include "GUI/Models/Session/SessionItemUtils.h"
-#include "GUI/Models/Trafo/ProjectionItems.h"
+#include "GUI/Models/Data/ProjectionItems.h"
 #include "GUI/Models/Types/DoubleDescriptor.h"
 #include "Tests/GTestWrapper/google_test.h"
 #include <memory>