diff --git a/GUI/Model/Data/Data2DItem.cpp b/GUI/Model/Data/Data2DItem.cpp
index 50bb82e391ec870d990bfeea9bc5a7fc5500b873..d607f568fa1fa507fea199b59fa2664ca08a0c44 100644
--- a/GUI/Model/Data/Data2DItem.cpp
+++ b/GUI/Model/Data/Data2DItem.cpp
@@ -19,7 +19,7 @@
 #include "Device/Data/Datafield.h"
 #include "GUI/Model/Axis/AmplitudeAxisItem.h"
 #include "GUI/Model/Axis/BasicAxisItem.h"
-#include "GUI/Model/Data/MaskUnitsConverter.h"
+#include "GUI/Model/Mask/MaskUnitsConverter.h"
 #include "GUI/Model/Data/ProjectionItems.h"
 #include "GUI/Support/Util/QCP_Util.h"
 #include <qcustomplot.h>
diff --git a/GUI/Model/Data/ProjectionItems.h b/GUI/Model/Data/ProjectionItems.h
index 6daa9f622bc5fcd92dbd8765b911d0202e8b52fe..d05948a729e71ce3c6730f65df4ec7605c458ce1 100644
--- a/GUI/Model/Data/ProjectionItems.h
+++ b/GUI/Model/Data/ProjectionItems.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_GUI_MODEL_DATA_PROJECTIONITEMS_H
 #define BORNAGAIN_GUI_MODEL_DATA_PROJECTIONITEMS_H
 
-#include "GUI/Model/Data/MaskItems.h"
+#include "GUI/Model/Mask/MaskItems.h"
 #include "GUI/Support/Data/ID.h"
 
 //! A container to hold ProjectionItems, intended to store projections of color map on X, Y axes.
diff --git a/GUI/Model/Detector/DetectorItem.h b/GUI/Model/Detector/DetectorItem.h
index e316dd7579e517eebb4b06020f86a57ed6db8501..ccf57bb9187551b0fcd5a47f2819bd9279310a97 100644
--- a/GUI/Model/Detector/DetectorItem.h
+++ b/GUI/Model/Detector/DetectorItem.h
@@ -17,7 +17,7 @@
 
 #include "Device/Detector/FlatDetector.h"
 #include "GUI/Model/Data/ComboProperty.h"
-#include "GUI/Model/Data/MaskItems.h"
+#include "GUI/Model/Mask/MaskItems.h"
 #include "GUI/Model/Descriptor/SelectionProperty.h"
 #include "GUI/Model/Descriptor/VectorProperty.h"
 #include "GUI/Model/Detector/DetectorItem.h"
diff --git a/GUI/Model/Data/MaskItemCatalog.cpp b/GUI/Model/Mask/MaskItemCatalog.cpp
similarity index 95%
rename from GUI/Model/Data/MaskItemCatalog.cpp
rename to GUI/Model/Mask/MaskItemCatalog.cpp
index 38f675ae0340aca83e8efb275b9fd7fc920c940c..f5a06cbc07199d322b4ddf09c81f71877bdf08d6 100644
--- a/GUI/Model/Data/MaskItemCatalog.cpp
+++ b/GUI/Model/Mask/MaskItemCatalog.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Model/Data/MaskItemCatalog.cpp
+//! @file      GUI/Model/Mask/MaskItemCatalog.cpp
 //! @brief     Implements class MaskItemCatalog
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Model/Data/MaskItemCatalog.h"
-#include "GUI/Model/Data/MaskItems.h"
+#include "GUI/Model/Mask/MaskItemCatalog.h"
+#include "GUI/Model/Mask/MaskItems.h"
 
 MaskItem* MaskItemCatalog::create(Type type)
 {
diff --git a/GUI/Model/Data/MaskItemCatalog.h b/GUI/Model/Mask/MaskItemCatalog.h
similarity index 87%
rename from GUI/Model/Data/MaskItemCatalog.h
rename to GUI/Model/Mask/MaskItemCatalog.h
index df783ecf873751ae4dcea43f0a19661d0512de79..a182f2e290d3c35512c7ce3ca848b3fc5da0d2f6 100644
--- a/GUI/Model/Data/MaskItemCatalog.h
+++ b/GUI/Model/Mask/MaskItemCatalog.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Model/Data/MaskItemCatalog.h
+//! @file      GUI/Model/Mask/MaskItemCatalog.h
 //! @brief     Defines class MaskItemCatalog
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_MODEL_DATA_MASKITEMCATALOG_H
-#define BORNAGAIN_GUI_MODEL_DATA_MASKITEMCATALOG_H
+#ifndef BORNAGAIN_GUI_MODEL_MASK_MASKITEMCATALOG_H
+#define BORNAGAIN_GUI_MODEL_MASK_MASKITEMCATALOG_H
 
 #include "GUI/Support/Type/UiInfo.h"
 #include <QVector>
@@ -49,4 +49,4 @@ public:
     static Type type(const MaskItem* item);
 };
 
-#endif // BORNAGAIN_GUI_MODEL_DATA_MASKITEMCATALOG_H
+#endif // BORNAGAIN_GUI_MODEL_MASK_MASKITEMCATALOG_H
diff --git a/GUI/Model/Data/MaskItems.cpp b/GUI/Model/Mask/MaskItems.cpp
similarity index 99%
rename from GUI/Model/Data/MaskItems.cpp
rename to GUI/Model/Mask/MaskItems.cpp
index 53d582ec48d9c1c81828074626afa929f45f9efd..f2e4157e2265d47c822ddf05f583b3305f472632 100644
--- a/GUI/Model/Data/MaskItems.cpp
+++ b/GUI/Model/Mask/MaskItems.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Model/Data/MaskItems.cpp
+//! @file      GUI/Model/Mask/MaskItems.cpp
 //! @brief     Implements MaskItems classes
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Model/Data/MaskItems.h"
+#include "GUI/Model/Mask/MaskItems.h"
 #include "Device/Mask/Ellipse.h"
 #include "Device/Mask/InfinitePlane.h"
 #include "Device/Mask/Line.h"
diff --git a/GUI/Model/Data/MaskItems.h b/GUI/Model/Mask/MaskItems.h
similarity index 97%
rename from GUI/Model/Data/MaskItems.h
rename to GUI/Model/Mask/MaskItems.h
index e8d9ad20b58ae933c461e7f26fed324b56f92289..283007cb6c5fb592ac9eceb8ced5c8b9f406d3b7 100644
--- a/GUI/Model/Data/MaskItems.h
+++ b/GUI/Model/Mask/MaskItems.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Model/Data/MaskItems.h
+//! @file      GUI/Model/Mask/MaskItems.h
 //! @brief     Defines MaskItems classes
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,12 +12,12 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_MODEL_DATA_MASKITEMS_H
-#define BORNAGAIN_GUI_MODEL_DATA_MASKITEMS_H
+#ifndef BORNAGAIN_GUI_MODEL_MASK_MASKITEMS_H
+#define BORNAGAIN_GUI_MODEL_MASK_MASKITEMS_H
 
 #include "Base/Types/OwningVector.h"
 #include "Base/Util/Assert.h"
-#include "GUI/Model/Data/MaskItemCatalog.h"
+#include "GUI/Model/Mask/MaskItemCatalog.h"
 #include "GUI/Model/Descriptor/SelectionProperty.h"
 #include <QAbstractListModel>
 #include <QItemSelectionModel>
@@ -314,4 +314,4 @@ public:
     MaskContainerItem* maskContainer = nullptr;
 };
 
-#endif // BORNAGAIN_GUI_MODEL_DATA_MASKITEMS_H
+#endif // BORNAGAIN_GUI_MODEL_MASK_MASKITEMS_H
diff --git a/GUI/Model/Data/MaskResultsPresenter.cpp b/GUI/Model/Mask/MaskResultsPresenter.cpp
similarity index 96%
rename from GUI/Model/Data/MaskResultsPresenter.cpp
rename to GUI/Model/Mask/MaskResultsPresenter.cpp
index ee931fed6cb17e43b8d3c4a668d08df38170a494..8aa1cdd74d81868ff7563e5137d6e3eb30bb9c21 100644
--- a/GUI/Model/Data/MaskResultsPresenter.cpp
+++ b/GUI/Model/Mask/MaskResultsPresenter.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Model/Data/MaskResultsPresenter.cpp
+//! @file      GUI/Model/Mask/MaskResultsPresenter.cpp
 //! @brief     Implements class MaskResultsPresenter
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,12 +12,12 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Model/Data/MaskResultsPresenter.h"
+#include "GUI/Model/Mask/MaskResultsPresenter.h"
 #include "Device/Data/Datafield.h"
 #include "Device/Mask/DetectorMask.h"
 #include "Device/Mask/IShape2D.h"
 #include "GUI/Model/Data/Data2DItem.h"
-#include "GUI/Model/Data/MaskItems.h"
+#include "GUI/Model/Mask/MaskItems.h"
 #include <QVBoxLayout>
 
 MaskResultsPresenter::MaskResultsPresenter(QWidget* parent)
diff --git a/GUI/Model/Data/MaskResultsPresenter.h b/GUI/Model/Mask/MaskResultsPresenter.h
similarity index 86%
rename from GUI/Model/Data/MaskResultsPresenter.h
rename to GUI/Model/Mask/MaskResultsPresenter.h
index 72ab3630bc63c45030ae7574270c614b6879250f..defd1a2c47b77e33d8a91eae049afcd1f02e836b 100644
--- a/GUI/Model/Data/MaskResultsPresenter.h
+++ b/GUI/Model/Mask/MaskResultsPresenter.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Model/Data/MaskResultsPresenter.h
+//! @file      GUI/Model/Mask/MaskResultsPresenter.h
 //! @brief     Defines class MaskResultsPresenter
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_MODEL_DATA_MASKRESULTSPRESENTER_H
-#define BORNAGAIN_GUI_MODEL_DATA_MASKRESULTSPRESENTER_H
+#ifndef BORNAGAIN_GUI_MODEL_MASK_MASKRESULTSPRESENTER_H
+#define BORNAGAIN_GUI_MODEL_MASK_MASKRESULTSPRESENTER_H
 
 #include "GUI/View/Mask/MaskEditorFlags.h"
 #include <QModelIndex>
@@ -49,4 +49,4 @@ private:
     bool m_interpolation_flag_backup;
 };
 
-#endif // BORNAGAIN_GUI_MODEL_DATA_MASKRESULTSPRESENTER_H
+#endif // BORNAGAIN_GUI_MODEL_MASK_MASKRESULTSPRESENTER_H
diff --git a/GUI/Model/Data/MaskUnitsConverter.cpp b/GUI/Model/Mask/MaskUnitsConverter.cpp
similarity index 97%
rename from GUI/Model/Data/MaskUnitsConverter.cpp
rename to GUI/Model/Mask/MaskUnitsConverter.cpp
index f55d02fc97a2092991fb3702efddc50c9ac208b4..e661b7645c7da5d829d37921fcf22e9a0a41b072 100644
--- a/GUI/Model/Data/MaskUnitsConverter.cpp
+++ b/GUI/Model/Mask/MaskUnitsConverter.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Model/Data/MaskUnitsConverter.cpp
+//! @file      GUI/Model/Mask/MaskUnitsConverter.cpp
 //! @brief     Implements class MaskUnitsConverter
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Model/Data/MaskUnitsConverter.h"
+#include "GUI/Model/Mask/MaskUnitsConverter.h"
 #include "Base/Axis/FrameUtil.h"
 #include "Device/Data/Datafield.h"
 #include "GUI/Model/Data/Data2DItem.h"
diff --git a/GUI/Model/Data/MaskUnitsConverter.h b/GUI/Model/Mask/MaskUnitsConverter.h
similarity index 87%
rename from GUI/Model/Data/MaskUnitsConverter.h
rename to GUI/Model/Mask/MaskUnitsConverter.h
index 7732bf3b2e9ae58f63d4afdc80234e3db1e2a347..efa494dedbd07fd1006f43edbee9a105fc75e34c 100644
--- a/GUI/Model/Data/MaskUnitsConverter.h
+++ b/GUI/Model/Mask/MaskUnitsConverter.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Model/Data/MaskUnitsConverter.h
+//! @file      GUI/Model/Mask/MaskUnitsConverter.h
 //! @brief     Defines class MaskUnitsConverter
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_MODEL_DATA_MASKUNITSCONVERTER_H
-#define BORNAGAIN_GUI_MODEL_DATA_MASKUNITSCONVERTER_H
+#ifndef BORNAGAIN_GUI_MODEL_MASK_MASKUNITSCONVERTER_H
+#define BORNAGAIN_GUI_MODEL_MASK_MASKUNITSCONVERTER_H
 
 class Data2DItem;
 class Datafield;
@@ -47,4 +47,4 @@ private:
     EConvertionDirection m_direction;
 };
 
-#endif // BORNAGAIN_GUI_MODEL_DATA_MASKUNITSCONVERTER_H
+#endif // BORNAGAIN_GUI_MODEL_MASK_MASKUNITSCONVERTER_H
diff --git a/GUI/View/Import/RealDataMaskWidget.cpp b/GUI/View/Import/RealDataMaskWidget.cpp
index d33b59cfe1ae8d3f2abc196193c5036f4554b4dd..ea983b56c8d22d494798d8115c65a7f81335176f 100644
--- a/GUI/View/Import/RealDataMaskWidget.cpp
+++ b/GUI/View/Import/RealDataMaskWidget.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/View/Import/RealDataMaskWidget.h"
 #include "GUI/Model/Data/Data2DItem.h"
-#include "GUI/Model/Data/MaskItems.h"
+#include "GUI/Model/Mask/MaskItems.h"
 #include "GUI/View/Mask/MaskEditorActions.h"
 #include "GUI/View/Mask/MaskEditorCanvas.h"
 #include "GUI/View/Mask/MaskEditorPropertyPanel.h"
diff --git a/GUI/View/Mask/MaskAllView.cpp b/GUI/View/Mask/MaskAllView.cpp
index 2ea56b88c9191e2a5ec24617bfe2a2ec5bfe2b90..43c5d81735174ad34f918cf7b72c65db10c05a9f 100644
--- a/GUI/View/Mask/MaskAllView.cpp
+++ b/GUI/View/Mask/MaskAllView.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/View/Mask/MaskAllView.h"
-#include "GUI/Model/Data/MaskItems.h"
+#include "GUI/Model/Mask/MaskItems.h"
 #include "GUI/View/Shape/SceneAdaptor.h"
 #include <QBrush>
 #include <QPainter>
diff --git a/GUI/View/Mask/MaskContainerView.cpp b/GUI/View/Mask/MaskContainerView.cpp
index 4bfb2c3d46a122d8ee39d5c41e7d299ec6c9f427..c0782988c9548562812f13f7c42854505314ba0c 100644
--- a/GUI/View/Mask/MaskContainerView.cpp
+++ b/GUI/View/Mask/MaskContainerView.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/View/Mask/MaskContainerView.h"
-#include "GUI/Model/Data/MaskItems.h"
+#include "GUI/Model/Mask/MaskItems.h"
 #include "GUI/Model/Data/ProjectionItems.h"
 #include "GUI/View/Shape/SceneAdaptor.h"
 #include <QBrush>
diff --git a/GUI/View/Mask/MaskDrawingContext.cpp b/GUI/View/Mask/MaskDrawingContext.cpp
index c2e5cbd67f343468d0da1910873f08b3262d3554..adb8a9c4757276de09dcec8474ffa289210015a1 100644
--- a/GUI/View/Mask/MaskDrawingContext.cpp
+++ b/GUI/View/Mask/MaskDrawingContext.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/View/Mask/MaskDrawingContext.h"
-#include "GUI/Model/Data/MaskItems.h"
+#include "GUI/Model/Mask/MaskItems.h"
 
 MaskDrawingContext::MaskDrawingContext()
     : m_current_activity(MaskEditorFlags::PAN_ZOOM_MODE)
diff --git a/GUI/View/Mask/MaskEditorActions.cpp b/GUI/View/Mask/MaskEditorActions.cpp
index 3d398867fea4da282ea7a3df74ac1d3a54333553..ad54ca2d8ae3a5908151d072036c967210087d2b 100644
--- a/GUI/View/Mask/MaskEditorActions.cpp
+++ b/GUI/View/Mask/MaskEditorActions.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/View/Mask/MaskEditorActions.h"
-#include "GUI/Model/Data/MaskItems.h"
+#include "GUI/Model/Mask/MaskItems.h"
 #include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/Support/Util/ActionFactory.h"
 #include <QAction>
diff --git a/GUI/View/Mask/MaskEditorCanvas.cpp b/GUI/View/Mask/MaskEditorCanvas.cpp
index 5706be28722158ea38d475ddae04123e58218df9..08b6c589d0f228f6803045f6262bec006441153d 100644
--- a/GUI/View/Mask/MaskEditorCanvas.cpp
+++ b/GUI/View/Mask/MaskEditorCanvas.cpp
@@ -14,11 +14,11 @@
 
 #include "GUI/View/Mask/MaskEditorCanvas.h"
 #include "GUI/Model/Data/Data2DItem.h"
-#include "GUI/Model/Data/MaskItems.h"
+#include "GUI/Model/Mask/MaskItems.h"
 #include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/View/Mask/MaskGraphicsScene.h"
 #include "GUI/View/Mask/MaskGraphicsView.h"
-#include "GUI/Model/Data/MaskResultsPresenter.h"
+#include "GUI/Model/Mask/MaskResultsPresenter.h"
 #include "GUI/View/PlotScale/SavePlotAssistant.h"
 #include "GUI/View/PlotUtil/ColorMap.h"
 #include "GUI/View/PlotUtil/PlotStatusLabel.h"
diff --git a/GUI/View/Mask/MaskEditorPropertyPanel.cpp b/GUI/View/Mask/MaskEditorPropertyPanel.cpp
index fc04da00df284e11ae802f12e26c6d24a624db0d..97f0b5dab536678e3d7d1c60a07a41e0219e2dac 100644
--- a/GUI/View/Mask/MaskEditorPropertyPanel.cpp
+++ b/GUI/View/Mask/MaskEditorPropertyPanel.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/View/Mask/MaskEditorPropertyPanel.h"
 #include "GUI/Model/Data/Data2DItem.h"
-#include "GUI/Model/Data/MaskItems.h"
+#include "GUI/Model/Mask/MaskItems.h"
 #include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/Support/Style/GroupBoxCollapser.h"
 #include "GUI/Support/Tool/LayoutUtil.h"
diff --git a/GUI/View/Mask/MaskGraphicsScene.cpp b/GUI/View/Mask/MaskGraphicsScene.cpp
index e2549a9f2205e4b140bc1ac87f8b435f29968844..8f4d37a68b58d34758d4971328c1814b49012101 100644
--- a/GUI/View/Mask/MaskGraphicsScene.cpp
+++ b/GUI/View/Mask/MaskGraphicsScene.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/View/Mask/MaskGraphicsScene.h"
 #include "GUI/Model/Data/Data2DItem.h"
-#include "GUI/Model/Data/MaskItems.h"
+#include "GUI/Model/Mask/MaskItems.h"
 #include "GUI/Model/Data/ProjectionItems.h"
 #include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/View/Mask/MaskGraphicsProxy.h"
diff --git a/GUI/View/Mask/MaskViewFactory.cpp b/GUI/View/Mask/MaskViewFactory.cpp
index 944f483459da5d5fbb030909d267c3f20a623bf4..3f5aef886f204e360491df106599eb0588f2efb8 100644
--- a/GUI/View/Mask/MaskViewFactory.cpp
+++ b/GUI/View/Mask/MaskViewFactory.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/View/Mask/MaskViewFactory.h"
-#include "GUI/Model/Data/MaskItems.h"
+#include "GUI/Model/Mask/MaskItems.h"
 #include "GUI/Model/Data/ProjectionItems.h"
 #include "GUI/View/Mask/MaskAllView.h"
 #include "GUI/View/Mask/MaskContainerView.h"
diff --git a/GUI/View/Mask/RegionOfInterestView.cpp b/GUI/View/Mask/RegionOfInterestView.cpp
index 9e5a54482bd8345e195ce30d9cfc5cb0bb06ac24..801040020da2955b6d46bf6521f6467dee68b977 100644
--- a/GUI/View/Mask/RegionOfInterestView.cpp
+++ b/GUI/View/Mask/RegionOfInterestView.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/View/Mask/RegionOfInterestView.h"
-#include "GUI/Model/Data/MaskItems.h"
+#include "GUI/Model/Mask/MaskItems.h"
 #include "GUI/View/Shape/SceneAdaptor.h"
 #include <QPainter>
 
diff --git a/GUI/View/Projection/ProjectionsEditorCanvas.cpp b/GUI/View/Projection/ProjectionsEditorCanvas.cpp
index b952443c8361214c4eb1a1f340e94f80c6c9ea6d..0332757b0e8bd9f8e0d29e90e929242c71da57ac 100644
--- a/GUI/View/Projection/ProjectionsEditorCanvas.cpp
+++ b/GUI/View/Projection/ProjectionsEditorCanvas.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/View/Projection/ProjectionsEditorCanvas.h"
 #include "GUI/Model/Data/Data2DItem.h"
-#include "GUI/Model/Data/MaskItems.h"
+#include "GUI/Model/Mask/MaskItems.h"
 #include "GUI/Model/Data/ProjectionItems.h"
 #include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/View/Mask/MaskGraphicsScene.h"
diff --git a/GUI/View/Projection/ProjectionsPlot.cpp b/GUI/View/Projection/ProjectionsPlot.cpp
index 4c7385ec562802d5d9545911029b9a86c6ef1768..5ee74fe233c17bc04de031459164115d2f4f7205 100644
--- a/GUI/View/Projection/ProjectionsPlot.cpp
+++ b/GUI/View/Projection/ProjectionsPlot.cpp
@@ -18,7 +18,7 @@
 #include "GUI/Model/Axis/AmplitudeAxisItem.h"
 #include "GUI/Model/Axis/BasicAxisItem.h"
 #include "GUI/Model/Data/Data2DItem.h"
-#include "GUI/Model/Data/MaskItems.h"
+#include "GUI/Model/Mask/MaskItems.h"
 #include "GUI/Model/Data/ProjectionItems.h"
 #include "GUI/Support/Util/QCP_Util.h"
 #include "GUI/View/PlotScale/RangeUtil.h"
diff --git a/GUI/View/Projection/ProjectionsWidget.cpp b/GUI/View/Projection/ProjectionsWidget.cpp
index 2801da19ed0552681ca477704c7fd142fcf0993e..a412b64d3b3d152f61239c2a0ce2f7f6d710537a 100644
--- a/GUI/View/Projection/ProjectionsWidget.cpp
+++ b/GUI/View/Projection/ProjectionsWidget.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/View/Projection/ProjectionsWidget.h"
 #include "GUI/Model/Data/Data2DItem.h"
-#include "GUI/Model/Data/MaskItems.h"
+#include "GUI/Model/Mask/MaskItems.h"
 #include "GUI/View/Projection/ProjectionsPlot.h"
 #include <QTabWidget>
 #include <QVBoxLayout>
diff --git a/GUI/View/Projection/SaveProjectionsAssistant.cpp b/GUI/View/Projection/SaveProjectionsAssistant.cpp
index b042544ebed84effe27bb0fdfe442ed9acbd18a5..5fff9bf82ccf6b96479b93e2bb72cc7fe43732e2 100644
--- a/GUI/View/Projection/SaveProjectionsAssistant.cpp
+++ b/GUI/View/Projection/SaveProjectionsAssistant.cpp
@@ -17,7 +17,7 @@
 #include "Base/Py/PyFmt.h"
 #include "Device/Data/Datafield.h"
 #include "GUI/Model/Data/Data2DItem.h"
-#include "GUI/Model/Data/MaskItems.h"
+#include "GUI/Model/Mask/MaskItems.h"
 #include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/Support/Style/ApplicationSettings.h"
 #include <QFileDialog>
diff --git a/GUI/View/Shape/EllipseView.cpp b/GUI/View/Shape/EllipseView.cpp
index 9fcc24b62a0b5b0b858ce971dcb82dde3943391a..667cb3f22b263b7d75c3a6c53effadf77770cc17 100644
--- a/GUI/View/Shape/EllipseView.cpp
+++ b/GUI/View/Shape/EllipseView.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/View/Shape/EllipseView.h"
-#include "GUI/Model/Data/MaskItems.h"
+#include "GUI/Model/Mask/MaskItems.h"
 #include <QGraphicsSceneMouseEvent>
 #include <QPainter>
 
diff --git a/GUI/View/Shape/IShape2DView.cpp b/GUI/View/Shape/IShape2DView.cpp
index 82e59ca8f5c913f42f65e0e5f36616f31f9c737e..c24b43ef392f64307868233581c2f3610c90f5e8 100644
--- a/GUI/View/Shape/IShape2DView.cpp
+++ b/GUI/View/Shape/IShape2DView.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/View/Shape/IShape2DView.h"
-#include "GUI/Model/Data/MaskItems.h"
+#include "GUI/Model/Mask/MaskItems.h"
 #include "GUI/View/Shape/SceneAdaptor.h"
 #include <QAction>
 #include <QGraphicsScene>
diff --git a/GUI/View/Shape/LineViews.cpp b/GUI/View/Shape/LineViews.cpp
index 532285e56ccf228bfb9738634750763811482997..a0d342a2d4a02417ca0a06093d4e8dd8fea6f31c 100644
--- a/GUI/View/Shape/LineViews.cpp
+++ b/GUI/View/Shape/LineViews.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/View/Shape/LineViews.h"
-#include "GUI/Model/Data/MaskItems.h"
+#include "GUI/Model/Mask/MaskItems.h"
 #include "GUI/View/Shape/SceneAdaptor.h"
 #include <QCursor>
 #include <QPainter>
diff --git a/GUI/View/Shape/PolygonPointView.cpp b/GUI/View/Shape/PolygonPointView.cpp
index 23651ced4f2db2bef3ae69c38606ad909746ad60..96e34b8b13541080ed8e2623b9f897d059c944f9 100644
--- a/GUI/View/Shape/PolygonPointView.cpp
+++ b/GUI/View/Shape/PolygonPointView.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/View/Shape/PolygonPointView.h"
-#include "GUI/Model/Data/MaskItems.h"
+#include "GUI/Model/Mask/MaskItems.h"
 #include <QGraphicsSceneMouseEvent>
 #include <QPainter>
 
diff --git a/GUI/View/Shape/PolygonView.cpp b/GUI/View/Shape/PolygonView.cpp
index 4d480dab428a1b59e572b00101487fc6be3eca2d..29cd87358b1c3c2292579119964d662fe034eca4 100644
--- a/GUI/View/Shape/PolygonView.cpp
+++ b/GUI/View/Shape/PolygonView.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/View/Shape/PolygonView.h"
-#include "GUI/Model/Data/MaskItems.h"
+#include "GUI/Model/Mask/MaskItems.h"
 #include "GUI/View/Shape/PolygonPointView.h"
 #include <QCursor>
 #include <QPainter>
diff --git a/GUI/View/Shape/RectangleView.cpp b/GUI/View/Shape/RectangleView.cpp
index 99c435741c67534b6a915e75a381741144dfa93e..51a04def80548d3eaa983e28117bdcff6716cc5d 100644
--- a/GUI/View/Shape/RectangleView.cpp
+++ b/GUI/View/Shape/RectangleView.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/View/Shape/RectangleView.h"
-#include "GUI/Model/Data/MaskItems.h"
+#include "GUI/Model/Mask/MaskItems.h"
 #include <QGraphicsSceneMouseEvent>
 #include <QPainter>