diff --git a/GUI/Models/Data/IntensityDataItem.cpp b/GUI/Models/Data/IntensityDataItem.cpp
index 5bcf51dd9f46b55ca7ae20623e28c6faf1d5c64e..6e1d5f12749a5106764c99675c3056216a99e24c 100644
--- a/GUI/Models/Data/IntensityDataItem.cpp
+++ b/GUI/Models/Data/IntensityDataItem.cpp
@@ -15,9 +15,9 @@
 #include "GUI/Models/Data/IntensityDataItem.h"
 #include "GUI/Models/Data/AxesItems.h"
 #include "GUI/Models/Data/ImportDataInfo.h"
+#include "GUI/Models/Data/MaskItems.h"
 #include "GUI/Models/Data/MaskUnitsConverter.h"
 #include "GUI/Models/Data/ProjectionItems.h"
-#include "GUI/Models/Instrument/MaskItems.h"
 #include "GUI/Models/Job/JobItemUtils.h"
 #include "GUI/Models/Session/SessionModel.h"
 #include "GUI/utils/Error.h"
diff --git a/GUI/Models/Instrument/MaskItems.cpp b/GUI/Models/Data/MaskItems.cpp
similarity index 99%
rename from GUI/Models/Instrument/MaskItems.cpp
rename to GUI/Models/Data/MaskItems.cpp
index 21ba316eb6c10fa94beea7ed55325696084af9bf..67365d1864b679e8855534f13b5fa6214073ee61 100644
--- a/GUI/Models/Instrument/MaskItems.cpp
+++ b/GUI/Models/Data/MaskItems.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Models/Instrument/MaskItems.cpp
+//! @file      GUI/Models/Data/MaskItems.cpp
 //! @brief     Implements MaskItems classes
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Models/Instrument/MaskItems.h"
+#include "GUI/Models/Data/MaskItems.h"
 #include "Device/Mask/Ellipse.h"
 #include "Device/Mask/InfinitePlane.h"
 #include "Device/Mask/Line.h"
diff --git a/GUI/Models/Instrument/MaskItems.h b/GUI/Models/Data/MaskItems.h
similarity index 96%
rename from GUI/Models/Instrument/MaskItems.h
rename to GUI/Models/Data/MaskItems.h
index cea5a2b7dd3e47f4efd90a915652f5ec45478908..9b9be89c90ae8733ce85ea98ab027fed08b337ac 100644
--- a/GUI/Models/Instrument/MaskItems.h
+++ b/GUI/Models/Data/MaskItems.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Models/Instrument/MaskItems.h
+//! @file      GUI/Models/Data/MaskItems.h
 //! @brief     Defines MaskItems classes
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_MODELS_INSTRUMENT_MASKITEMS_H
-#define BORNAGAIN_GUI_MODELS_INSTRUMENT_MASKITEMS_H
+#ifndef BORNAGAIN_GUI_MODELS_DATA_MASKITEMS_H
+#define BORNAGAIN_GUI_MODELS_DATA_MASKITEMS_H
 
 #include "GUI/Models/Session/SessionItem.h"
 
@@ -188,4 +188,4 @@ public:
     virtual std::unique_ptr<IShape2D> createShape(double scale) const override;
 };
 
-#endif // BORNAGAIN_GUI_MODELS_INSTRUMENT_MASKITEMS_H
+#endif // BORNAGAIN_GUI_MODELS_DATA_MASKITEMS_H
diff --git a/GUI/Models/Data/MaskUnitsConverter.cpp b/GUI/Models/Data/MaskUnitsConverter.cpp
index 07b63a98bf0400cbcfccb803e1b77610ad8bc536..2a0eddd39ddd69b66e1f006dece6e24e0615f497 100644
--- a/GUI/Models/Data/MaskUnitsConverter.cpp
+++ b/GUI/Models/Data/MaskUnitsConverter.cpp
@@ -15,8 +15,8 @@
 #include "GUI/Models/Data/MaskUnitsConverter.h"
 #include "Device/Data/DataUtils.h"
 #include "GUI/Models/Data/IntensityDataItem.h"
+#include "GUI/Models/Data/MaskItems.h"
 #include "GUI/Models/Data/ProjectionItems.h"
-#include "GUI/Models/Instrument/MaskItems.h"
 
 #include <boost/polymorphic_cast.hpp>
 using boost::polymorphic_downcast;
diff --git a/GUI/Models/Data/ProjectionItems.cpp b/GUI/Models/Data/ProjectionItems.cpp
index fb0fb98823b25c6c07c82062e1d4f6da8cece64f..4455d8950bae3fd480e73bbcc57fe50a61ec272b 100644
--- a/GUI/Models/Data/ProjectionItems.cpp
+++ b/GUI/Models/Data/ProjectionItems.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Models/Data/ProjectionItems.h"
-#include "GUI/Models/Instrument/MaskItems.h"
+#include "GUI/Models/Data/MaskItems.h"
 
 ProjectionContainerItem::ProjectionContainerItem() : SessionItem(M_TYPE)
 {
diff --git a/GUI/Models/Data/RealDataItem.cpp b/GUI/Models/Data/RealDataItem.cpp
index 5a868dcd2c19392c5590c0e3e22e9528f2c8c4ba..bbd7b4e22e1bff148d20d07452db72994ed9e65a 100644
--- a/GUI/Models/Data/RealDataItem.cpp
+++ b/GUI/Models/Data/RealDataItem.cpp
@@ -19,12 +19,12 @@
 #include "GUI/Models/Data/DataLoaders1D.h"
 #include "GUI/Models/Data/ImportDataInfo.h"
 #include "GUI/Models/Data/IntensityDataItem.h"
+#include "GUI/Models/Data/MaskItems.h"
 #include "GUI/Models/Data/ProjectionItems.h"
 #include "GUI/Models/Data/RealDataModel.h"
 #include "GUI/Models/Data/SpecularDataItem.h"
 #include "GUI/Models/Instrument/InstrumentItems.h"
 #include "GUI/Models/Instrument/InstrumentModel.h"
-#include "GUI/Models/Instrument/MaskItems.h"
 #include "GUI/Models/Job/JobItem.h"
 #include "GUI/Models/Job/JobItemUtils.h"
 #include "GUI/Models/Job/JobModelFunctions.h"
diff --git a/GUI/Models/Domain/TransformFromDomain.cpp b/GUI/Models/Domain/TransformFromDomain.cpp
index 9d699ba99a2112095786509d8e03c580ab0af3c3..ada2ce597cc2cbc89648a2018fba54cb57f97793 100644
--- a/GUI/Models/Domain/TransformFromDomain.cpp
+++ b/GUI/Models/Domain/TransformFromDomain.cpp
@@ -33,11 +33,11 @@
 #include "Device/Resolution/ResolutionFunction2DGaussian.h"
 #include "Device/Resolution/ScanResolution.h"
 #include "GUI/Models/Data/AxesItems.h"
+#include "GUI/Models/Data/MaskItems.h"
 #include "GUI/Models/Instrument/BackgroundItems.h"
 #include "GUI/Models/Instrument/BeamAngleItems.h"
 #include "GUI/Models/Instrument/BeamWavelengthItem.h"
 #include "GUI/Models/Instrument/InstrumentItems.h"
-#include "GUI/Models/Instrument/MaskItems.h"
 #include "GUI/Models/Instrument/RectangularDetectorItem.h"
 #include "GUI/Models/Instrument/SphericalDetectorItem.h"
 #include "GUI/Models/Sample/FTDecayFunctionItems.h"
diff --git a/GUI/Models/Group/ItemCatalog.cpp b/GUI/Models/Group/ItemCatalog.cpp
index 20f82aa15f5aeb68240df5cace31622cf3bbf5cd..44c2861d3854591bcc5175aa002539f8e3b2d89d 100644
--- a/GUI/Models/Group/ItemCatalog.cpp
+++ b/GUI/Models/Group/ItemCatalog.cpp
@@ -18,6 +18,7 @@
 #include "GUI/Models/Data/DataProperties.h"
 #include "GUI/Models/Data/DataPropertyContainer.h"
 #include "GUI/Models/Data/IntensityDataItem.h"
+#include "GUI/Models/Data/MaskItems.h"
 #include "GUI/Models/Data/PointwiseAxisItem.h"
 #include "GUI/Models/Data/ProjectionItems.h"
 #include "GUI/Models/Data/RealDataItem.h"
@@ -32,7 +33,6 @@
 #include "GUI/Models/Instrument/BeamWavelengthItem.h"
 #include "GUI/Models/Instrument/FootprintItems.h"
 #include "GUI/Models/Instrument/InstrumentItems.h"
-#include "GUI/Models/Instrument/MaskItems.h"
 #include "GUI/Models/Instrument/RectangularDetectorItem.h"
 #include "GUI/Models/Instrument/SpecularBeamInclinationItem.h"
 #include "GUI/Models/Instrument/SphericalDetectorItem.h"
diff --git a/GUI/Models/Instrument/DetectorItems.cpp b/GUI/Models/Instrument/DetectorItems.cpp
index 12a846a0b420765fc920102a55be65a962c5a0c7..c4087fd109d5a8424be467e66712ac96d94e7c4c 100644
--- a/GUI/Models/Instrument/DetectorItems.cpp
+++ b/GUI/Models/Instrument/DetectorItems.cpp
@@ -16,8 +16,8 @@
 #include "Device/Detector/IDetector2D.h"
 #include "Device/Mask/IShape2D.h"
 #include "Device/Resolution/ResolutionFunction2DGaussian.h"
+#include "GUI/Models/Data/MaskItems.h"
 #include "GUI/Models/Group/GroupInfo.h"
-#include "GUI/Models/Instrument/MaskItems.h"
 #include "GUI/Models/Instrument/SphericalDetectorItem.h"
 #include "GUI/Models/Sample/ResolutionFunctionItems.h"
 #include "GUI/Models/Session/SessionModel.h"
diff --git a/GUI/Views/ImportDataWidgets/RealDataMaskWidget.cpp b/GUI/Views/ImportDataWidgets/RealDataMaskWidget.cpp
index 08a7149c7828ab9aa976fe281f267de77ee7f656..35fe116addf75298f1ab05b894fc4193e9956252 100644
--- a/GUI/Views/ImportDataWidgets/RealDataMaskWidget.cpp
+++ b/GUI/Views/ImportDataWidgets/RealDataMaskWidget.cpp
@@ -14,8 +14,8 @@
 
 #include "GUI/Views/ImportDataWidgets/RealDataMaskWidget.h"
 #include "GUI/Models/Data/IntensityDataItem.h"
+#include "GUI/Models/Data/MaskItems.h"
 #include "GUI/Models/Data/RealDataItem.h"
-#include "GUI/Models/Instrument/MaskItems.h"
 #include "GUI/Views/MaskWidgets/MaskEditor.h"
 #include <QAction>
 #include <QBoxLayout>
diff --git a/GUI/Views/MaskWidgets/EllipseView.cpp b/GUI/Views/MaskWidgets/EllipseView.cpp
index cd2f51cb5d0bd69a0953620f6508633eb27c927a..c5a1c38b17c9a9f38948987f3f7a65d41151a1cb 100644
--- a/GUI/Views/MaskWidgets/EllipseView.cpp
+++ b/GUI/Views/MaskWidgets/EllipseView.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Views/MaskWidgets/EllipseView.h"
-#include "GUI/Models/Instrument/MaskItems.h"
+#include "GUI/Models/Data/MaskItems.h"
 #include <QGraphicsSceneMouseEvent>
 #include <QPainter>
 
diff --git a/GUI/Views/MaskWidgets/IShape2DView.cpp b/GUI/Views/MaskWidgets/IShape2DView.cpp
index 426f84479e700df67b6ebc7e6270e8c89373a24e..90374fa24cfc9c49ad444f67a8e89dfcab5bd974 100644
--- a/GUI/Views/MaskWidgets/IShape2DView.cpp
+++ b/GUI/Views/MaskWidgets/IShape2DView.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Views/MaskWidgets/IShape2DView.h"
-#include "GUI/Models/Instrument/MaskItems.h"
+#include "GUI/Models/Data/MaskItems.h"
 #include "GUI/Views/MaskWidgets/ISceneAdaptor.h"
 #include <QAction>
 #include <QGraphicsScene>
diff --git a/GUI/Views/MaskWidgets/LineViews.cpp b/GUI/Views/MaskWidgets/LineViews.cpp
index 68cf9ff0ff135e8dc828b0d91b393f968efa7db7..d0526b61584d7cbe8153a97c1e68006c523d7514 100644
--- a/GUI/Views/MaskWidgets/LineViews.cpp
+++ b/GUI/Views/MaskWidgets/LineViews.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Views/MaskWidgets/LineViews.h"
-#include "GUI/Models/Instrument/MaskItems.h"
+#include "GUI/Models/Data/MaskItems.h"
 #include "GUI/Views/MaskWidgets/ColorMapSceneAdaptor.h"
 #include <QCursor>
 #include <QPainter>
diff --git a/GUI/Views/MaskWidgets/MaskAllView.cpp b/GUI/Views/MaskWidgets/MaskAllView.cpp
index bafa148ea87da5761eb65df21eed230ce4acaecd..e9167f94720a4fa08ea66928852eef26162bce56 100644
--- a/GUI/Views/MaskWidgets/MaskAllView.cpp
+++ b/GUI/Views/MaskWidgets/MaskAllView.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Views/MaskWidgets/MaskAllView.h"
-#include "GUI/Models/Instrument/MaskItems.h"
+#include "GUI/Models/Data/MaskItems.h"
 #include "GUI/Views/MaskWidgets/ColorMapSceneAdaptor.h"
 #include <QBrush>
 #include <QPainter>
diff --git a/GUI/Views/MaskWidgets/MaskContainerView.cpp b/GUI/Views/MaskWidgets/MaskContainerView.cpp
index 04d178157817e9551b244b63d96049bdf75d1e78..9659c85a19abf219cbeb3de3cfca2c1a038a1216 100644
--- a/GUI/Views/MaskWidgets/MaskContainerView.cpp
+++ b/GUI/Views/MaskWidgets/MaskContainerView.cpp
@@ -13,8 +13,8 @@
 //  ************************************************************************************************
 
 #include "GUI/Views/MaskWidgets/MaskContainerView.h"
+#include "GUI/Models/Data/MaskItems.h"
 #include "GUI/Models/Data/ProjectionItems.h"
-#include "GUI/Models/Instrument/MaskItems.h"
 #include "GUI/Views/MaskWidgets/ISceneAdaptor.h"
 #include <QBrush>
 #include <QPainter>
diff --git a/GUI/Views/MaskWidgets/MaskDrawingContext.cpp b/GUI/Views/MaskWidgets/MaskDrawingContext.cpp
index a91313ee50c0d818b7cb0ca343a352d333b6d60d..0d87b04d53296a8dc43c5766aaadcc9e1bf3ca9f 100644
--- a/GUI/Views/MaskWidgets/MaskDrawingContext.cpp
+++ b/GUI/Views/MaskWidgets/MaskDrawingContext.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Views/MaskWidgets/MaskDrawingContext.h"
-#include "GUI/Models/Instrument/MaskItems.h"
+#include "GUI/Models/Data/MaskItems.h"
 
 MaskDrawingContext::MaskDrawingContext()
     : m_current_activity(MaskEditorFlags::PAN_ZOOM_MODE)
diff --git a/GUI/Views/MaskWidgets/MaskEditor.cpp b/GUI/Views/MaskWidgets/MaskEditor.cpp
index 528ee6049ded680bb2feb48f97e508799cc9bd05..13939a92ab9716cf7c7f07ae98a90547c5428689 100644
--- a/GUI/Views/MaskWidgets/MaskEditor.cpp
+++ b/GUI/Views/MaskWidgets/MaskEditor.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Views/MaskWidgets/MaskEditor.h"
-#include "GUI/Models/Instrument/MaskItems.h"
+#include "GUI/Models/Data/MaskItems.h"
 #include "GUI/Models/Session/SessionModel.h"
 #include "GUI/Views/MaskWidgets/MaskEditorActions.h"
 #include "GUI/Views/MaskWidgets/MaskEditorCanvas.h"
diff --git a/GUI/Views/MaskWidgets/MaskEditorActions.cpp b/GUI/Views/MaskWidgets/MaskEditorActions.cpp
index 538bec61cca4540147f0d8a52f7a363b1b2e9834..9cb0b6b9d7efb17f5528ec515edd4b2479b18588 100644
--- a/GUI/Views/MaskWidgets/MaskEditorActions.cpp
+++ b/GUI/Views/MaskWidgets/MaskEditorActions.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Views/MaskWidgets/MaskEditorActions.h"
-#include "GUI/Models/Instrument/MaskItems.h"
+#include "GUI/Models/Data/MaskItems.h"
 #include "GUI/Models/Session/SessionModel.h"
 #include <QAction>
 #include <QItemSelectionModel>
diff --git a/GUI/Views/MaskWidgets/MaskEditorCanvas.cpp b/GUI/Views/MaskWidgets/MaskEditorCanvas.cpp
index f9945e88f7bb10afbfe6624b5b8c816865380f3c..74cd68f35c37db42d89e0448c173342fe2b1bf50 100644
--- a/GUI/Views/MaskWidgets/MaskEditorCanvas.cpp
+++ b/GUI/Views/MaskWidgets/MaskEditorCanvas.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/Views/MaskWidgets/MaskEditorCanvas.h"
 #include "GUI/Models/Data/IntensityDataItem.h"
-#include "GUI/Models/Instrument/MaskItems.h"
+#include "GUI/Models/Data/MaskItems.h"
 #include "GUI/Views/IntensityDataWidgets/ColorMap.h"
 #include "GUI/Views/IntensityDataWidgets/PlotStatusLabel.h"
 #include "GUI/Views/IntensityDataWidgets/SavePlotAssistant.h"
diff --git a/GUI/Views/MaskWidgets/MaskGraphicsScene.cpp b/GUI/Views/MaskWidgets/MaskGraphicsScene.cpp
index 8cb5ea7656a46b48f4dbdbffc7707bd35fff902b..f37fa65688e3f5ac5fc62950c86489a7b7be9e7a 100644
--- a/GUI/Views/MaskWidgets/MaskGraphicsScene.cpp
+++ b/GUI/Views/MaskWidgets/MaskGraphicsScene.cpp
@@ -13,9 +13,9 @@
 //  ************************************************************************************************
 
 #include "GUI/Views/MaskWidgets/MaskGraphicsScene.h"
+#include "GUI/Models/Data/MaskItems.h"
 #include "GUI/Models/Data/ProjectionItems.h"
 #include "GUI/Models/Group/GroupItem.h"
-#include "GUI/Models/Instrument/MaskItems.h"
 #include "GUI/Models/Parameter/PropertyItem.h"
 #include "GUI/Models/Session/SessionModel.h"
 #include "GUI/Views/MaskWidgets/ColorMapSceneAdaptor.h"
diff --git a/GUI/Views/MaskWidgets/MaskResultsPresenter.cpp b/GUI/Views/MaskWidgets/MaskResultsPresenter.cpp
index 8b7682579ac515dbdaebddc3e01fa13f190b932d..05ea9f5ae4a814b0bf9e5883c7be3113ad1485cb 100644
--- a/GUI/Views/MaskWidgets/MaskResultsPresenter.cpp
+++ b/GUI/Views/MaskWidgets/MaskResultsPresenter.cpp
@@ -15,7 +15,7 @@
 #include "GUI/Views/MaskWidgets/MaskResultsPresenter.h"
 #include "Device/Mask/DetectorMask.h"
 #include "GUI/Models/Data/IntensityDataItem.h"
-#include "GUI/Models/Instrument/MaskItems.h"
+#include "GUI/Models/Data/MaskItems.h"
 #include "GUI/Models/Session/SessionModel.h"
 #include <QVBoxLayout>
 
diff --git a/GUI/Views/MaskWidgets/MaskViewFactory.cpp b/GUI/Views/MaskWidgets/MaskViewFactory.cpp
index 16d4f6bb09e616bcf76f6ba86b888a04f245b4a7..8bca535f3228700ca5355f29321f4f4018a98bb3 100644
--- a/GUI/Views/MaskWidgets/MaskViewFactory.cpp
+++ b/GUI/Views/MaskWidgets/MaskViewFactory.cpp
@@ -13,8 +13,8 @@
 //  ************************************************************************************************
 
 #include "GUI/Views/MaskWidgets/MaskViewFactory.h"
+#include "GUI/Models/Data/MaskItems.h"
 #include "GUI/Models/Data/ProjectionItems.h"
-#include "GUI/Models/Instrument/MaskItems.h"
 #include "GUI/Models/Session/SessionItem.h"
 #include "GUI/Views/MaskWidgets/EllipseView.h"
 #include "GUI/Views/MaskWidgets/LineViews.h"
diff --git a/GUI/Views/MaskWidgets/PolygonPointView.cpp b/GUI/Views/MaskWidgets/PolygonPointView.cpp
index 6e13a8c9b752998b6ce7dd0d922e1647f71bab01..5081c7a213a592f1bd9469a43d9b4ceed4883965 100644
--- a/GUI/Views/MaskWidgets/PolygonPointView.cpp
+++ b/GUI/Views/MaskWidgets/PolygonPointView.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Views/MaskWidgets/PolygonPointView.h"
-#include "GUI/Models/Instrument/MaskItems.h"
+#include "GUI/Models/Data/MaskItems.h"
 #include <QGraphicsSceneMouseEvent>
 #include <QPainter>
 
diff --git a/GUI/Views/MaskWidgets/PolygonView.cpp b/GUI/Views/MaskWidgets/PolygonView.cpp
index a0ea01d014df8f45733c1db84d1eebf3f008b893..6748f95e3b9e635b9d58a895055044a549d5adcc 100644
--- a/GUI/Views/MaskWidgets/PolygonView.cpp
+++ b/GUI/Views/MaskWidgets/PolygonView.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Views/MaskWidgets/PolygonView.h"
-#include "GUI/Models/Instrument/MaskItems.h"
+#include "GUI/Models/Data/MaskItems.h"
 #include "GUI/Views/MaskWidgets/PolygonPointView.h"
 #include <QCursor>
 #include <QPainter>
diff --git a/GUI/Views/MaskWidgets/RectangleView.cpp b/GUI/Views/MaskWidgets/RectangleView.cpp
index 021b3248fe7957de619894baa68a2deed01a7e16..85dfb0ba0dfadd67df7a998a6c2622377f78dd6e 100644
--- a/GUI/Views/MaskWidgets/RectangleView.cpp
+++ b/GUI/Views/MaskWidgets/RectangleView.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Views/MaskWidgets/RectangleView.h"
-#include "GUI/Models/Instrument/MaskItems.h"
+#include "GUI/Models/Data/MaskItems.h"
 #include <QGraphicsSceneMouseEvent>
 #include <QPainter>
 
diff --git a/GUI/Views/MaskWidgets/RegionOfInterestView.cpp b/GUI/Views/MaskWidgets/RegionOfInterestView.cpp
index f9032362a0387476f9e145667fe08858fc1fe853..6f597452060294b757a5f17da6e5e2b4343348b0 100644
--- a/GUI/Views/MaskWidgets/RegionOfInterestView.cpp
+++ b/GUI/Views/MaskWidgets/RegionOfInterestView.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Views/MaskWidgets/RegionOfInterestView.h"
-#include "GUI/Models/Instrument/MaskItems.h"
+#include "GUI/Models/Data/MaskItems.h"
 #include "GUI/Views/MaskWidgets/ISceneAdaptor.h"
 #include <QPainter>
 
diff --git a/GUI/Views/ProjectionsWidgets/ProjectionsEditorCanvas.cpp b/GUI/Views/ProjectionsWidgets/ProjectionsEditorCanvas.cpp
index 724a549e5a429e6862fd7e74ca2549d580aa1a9a..f54711006716fbee93a62b8115cd05e62eec5f4a 100644
--- a/GUI/Views/ProjectionsWidgets/ProjectionsEditorCanvas.cpp
+++ b/GUI/Views/ProjectionsWidgets/ProjectionsEditorCanvas.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/Views/ProjectionsWidgets/ProjectionsEditorCanvas.h"
 #include "GUI/Models/Data/IntensityDataItem.h"
-#include "GUI/Models/Instrument/MaskItems.h"
+#include "GUI/Models/Data/MaskItems.h"
 #include "GUI/Models/Session/SessionModel.h"
 #include "GUI/Views/IntensityDataWidgets/ColorMap.h"
 #include "GUI/Views/IntensityDataWidgets/PlotStatusLabel.h"
diff --git a/GUI/Views/ProjectionsWidgets/ProjectionsPlot.cpp b/GUI/Views/ProjectionsWidgets/ProjectionsPlot.cpp
index 83b6293aabcbadeddec9be9a5db5314cb844c6fb..4f31bb5bf55d3ab94ba5986e6de5a064e84390be 100644
--- a/GUI/Views/ProjectionsWidgets/ProjectionsPlot.cpp
+++ b/GUI/Views/ProjectionsWidgets/ProjectionsPlot.cpp
@@ -17,8 +17,8 @@
 #include "Device/Histo/Histogram2D.h"
 #include "GUI/Models/Data/AxesItems.h"
 #include "GUI/Models/Data/IntensityDataItem.h"
+#include "GUI/Models/Data/MaskItems.h"
 #include "GUI/Models/Data/ProjectionItems.h"
-#include "GUI/Models/Instrument/MaskItems.h"
 #include "GUI/Views/IntensityDataWidgets/ColorMapUtils.h"
 #include "GUI/Views/IntensityDataWidgets/PlotConstants.h"
 #include <qcustomplot.h>
diff --git a/GUI/Views/ProjectionsWidgets/ProjectionsWidget.cpp b/GUI/Views/ProjectionsWidgets/ProjectionsWidget.cpp
index 05a14da10e24a9d40ec75b621527a699c437ecf8..ae85053c4251213206b37d4ec9905cddda613fee 100644
--- a/GUI/Views/ProjectionsWidgets/ProjectionsWidget.cpp
+++ b/GUI/Views/ProjectionsWidgets/ProjectionsWidget.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Views/ProjectionsWidgets/ProjectionsWidget.h"
-#include "GUI/Models/Instrument/MaskItems.h"
+#include "GUI/Models/Data/MaskItems.h"
 #include "GUI/Views/ProjectionsWidgets/ProjectionsPlot.h"
 #include <QTabWidget>
 #include <QVBoxLayout>
diff --git a/GUI/Views/ProjectionsWidgets/SaveProjectionsAssistant.cpp b/GUI/Views/ProjectionsWidgets/SaveProjectionsAssistant.cpp
index 41489bf44b44ebfe572f179e8bba3178201375ef..00a6e863e9c97145bb080a8fdbeec8486ca26ea8 100644
--- a/GUI/Views/ProjectionsWidgets/SaveProjectionsAssistant.cpp
+++ b/GUI/Views/ProjectionsWidgets/SaveProjectionsAssistant.cpp
@@ -18,8 +18,8 @@
 #include "Device/Histo/Histogram2D.h"
 #include "GUI/Application/GlobalSettings.h"
 #include "GUI/Models/Data/IntensityDataItem.h"
+#include "GUI/Models/Data/MaskItems.h"
 #include "GUI/Models/Data/ProjectionItems.h"
-#include "GUI/Models/Instrument/MaskItems.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 41b596899461fef42980a903dcdc6e1e4f851c75..3c66eb4dbb7f74cfe2a04569e9e9d11c6f88bd3d 100644
--- a/Tests/Unit/GUI/TestMapperForItem.cpp
+++ b/Tests/Unit/GUI/TestMapperForItem.cpp
@@ -1,5 +1,5 @@
+#include "GUI/Models/Data/MaskItems.h"
 #include "GUI/Models/Data/ProjectionItems.h"
-#include "GUI/Models/Instrument/MaskItems.h"
 #include "GUI/Models/Sample/LayerItem.h"
 #include "GUI/Models/Sample/MultiLayerItem.h"
 #include "GUI/Models/Sample/SampleModel.h"
diff --git a/Tests/Unit/GUI/TestSessionModel.cpp b/Tests/Unit/GUI/TestSessionModel.cpp
index e1c5a48f2173b2485172096572ecf63ed8ec3706..7378af4e75110c1b52ce55564cc5224231de37b6 100644
--- a/Tests/Unit/GUI/TestSessionModel.cpp
+++ b/Tests/Unit/GUI/TestSessionModel.cpp
@@ -1,6 +1,6 @@
+#include "GUI/Models/Data/MaskItems.h"
 #include "GUI/Models/Instrument/InstrumentItems.h"
 #include "GUI/Models/Instrument/InstrumentModel.h"
-#include "GUI/Models/Instrument/MaskItems.h"
 #include "GUI/Models/Job/JobItem.h"
 #include "GUI/Models/Job/JobModel.h"
 #include "GUI/Models/Material/MaterialModel.h"