diff --git a/GUI/View/Mask/MaskEditorActions.h b/GUI/View/Mask/MaskEditorActions.h
index e83a69914e2e47c20a93e4ce59c5551c2f940a31..32b16fd705b0bfa39dd60d66721841c4dcf567f8 100644
--- a/GUI/View/Mask/MaskEditorActions.h
+++ b/GUI/View/Mask/MaskEditorActions.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_GUI_VIEW_MASK_MASKEDITORACTIONS_H
 #define BORNAGAIN_GUI_VIEW_MASK_MASKEDITORACTIONS_H
 
-#include "GUI/View/Mask/MaskEditorFlags.h"
+#include "GUI/View/Scene/MaskEditorFlags.h"
 #include <QList>
 #include <QModelIndex>
 #include <QObject>
diff --git a/GUI/View/Mask/MaskEditorCanvas.h b/GUI/View/Mask/MaskEditorCanvas.h
index 2bb10e9cc5ef3118963b55281e7be94be79435d9..b66730ae2facf5a1f4130fe76244e968e351d8fb 100644
--- a/GUI/View/Mask/MaskEditorCanvas.h
+++ b/GUI/View/Mask/MaskEditorCanvas.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_GUI_VIEW_MASK_MASKEDITORCANVAS_H
 #define BORNAGAIN_GUI_VIEW_MASK_MASKEDITORCANVAS_H
 
-#include "GUI/View/Mask/MaskEditorFlags.h"
+#include "GUI/View/Scene/MaskEditorFlags.h"
 #include <QWidget>
 
 class Data2DItem;
diff --git a/GUI/View/Mask/MaskEditorToolbar.h b/GUI/View/Mask/MaskEditorToolbar.h
index 349f2fe1596fc60a134c7c2430199f797a804bf7..1bc97b78e2223bb97c8f077638b6926df6f135f2 100644
--- a/GUI/View/Mask/MaskEditorToolbar.h
+++ b/GUI/View/Mask/MaskEditorToolbar.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_GUI_VIEW_MASK_MASKEDITORTOOLBAR_H
 #define BORNAGAIN_GUI_VIEW_MASK_MASKEDITORTOOLBAR_H
 
-#include "GUI/View/Mask/MaskEditorFlags.h"
+#include "GUI/View/Scene/MaskEditorFlags.h"
 #include <QToolBar>
 
 class MaskEditorActions;
diff --git a/GUI/View/Projection/ProjectionsEditorCanvas.h b/GUI/View/Projection/ProjectionsEditorCanvas.h
index 96b27b77c8674c344ae3838869aeaf3d20b10d5a..bf5fe9acc93d514ced6171727619cb6b52df2498 100644
--- a/GUI/View/Projection/ProjectionsEditorCanvas.h
+++ b/GUI/View/Projection/ProjectionsEditorCanvas.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_GUI_VIEW_PROJECTION_PROJECTIONSEDITORCANVAS_H
 #define BORNAGAIN_GUI_VIEW_PROJECTION_PROJECTIONSEDITORCANVAS_H
 
-#include "GUI/View/Mask/MaskEditorFlags.h"
+#include "GUI/View/Scene/MaskEditorFlags.h"
 #include <QWidget>
 #include <memory>
 
diff --git a/GUI/View/Projection/ProjectionsWidget.cpp b/GUI/View/Projection/ProjectionsWidget.cpp
index c0e9d86c6e39312458605ada972752a83aa327cd..f197c5022b6e8d1fa87b260ce15ec18e609daeb9 100644
--- a/GUI/View/Projection/ProjectionsWidget.cpp
+++ b/GUI/View/Projection/ProjectionsWidget.cpp
@@ -14,8 +14,8 @@
 
 #include "GUI/View/Projection/ProjectionsWidget.h"
 #include "GUI/Model/Data/Data2DItem.h"
-#include "GUI/View/Mask/MaskEditorFlags.h"
 #include "GUI/View/Plotter/ProjectionsPlot.h"
+#include "GUI/View/Scene/MaskEditorFlags.h"
 #include <QTabWidget>
 #include <QVBoxLayout>
 
diff --git a/GUI/View/Projection/ProjectionsWidget.h b/GUI/View/Projection/ProjectionsWidget.h
index 60e7d67420e124c92c6bdcd320899d281f783fb8..e58b6bc90b2ce7bd709b0c6de71f66f38de9a2e2 100644
--- a/GUI/View/Projection/ProjectionsWidget.h
+++ b/GUI/View/Projection/ProjectionsWidget.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_GUI_VIEW_PROJECTION_PROJECTIONSWIDGET_H
 #define BORNAGAIN_GUI_VIEW_PROJECTION_PROJECTIONSWIDGET_H
 
-#include "GUI/View/Mask/MaskEditorFlags.h"
+#include "GUI/View/Scene/MaskEditorFlags.h"
 
 class Data2DItem;
 class ProjectionsPlot;
diff --git a/GUI/View/Mask/MaskEditorFlags.h b/GUI/View/Scene/MaskEditorFlags.h
similarity index 86%
rename from GUI/View/Mask/MaskEditorFlags.h
rename to GUI/View/Scene/MaskEditorFlags.h
index 4135e5ed8105f0f0e04ece3088b6c295c38762f2..4ddc0379cdc592cc08740b0a465e192ed3cbe7d7 100644
--- a/GUI/View/Mask/MaskEditorFlags.h
+++ b/GUI/View/Scene/MaskEditorFlags.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Mask/MaskEditorFlags.h
+//! @file      GUI/View/Scene/MaskEditorFlags.h
 //! @brief     Defines class MaskEditorFlags.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_MASK_MASKEDITORFLAGS_H
-#define BORNAGAIN_GUI_VIEW_MASK_MASKEDITORFLAGS_H
+#ifndef BORNAGAIN_GUI_VIEW_SCENE_MASKEDITORFLAGS_H
+#define BORNAGAIN_GUI_VIEW_SCENE_MASKEDITORFLAGS_H
 
 #include <QWidget>
 
@@ -46,4 +46,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(MaskEditorFlags::Activity)
 Q_DECLARE_OPERATORS_FOR_FLAGS(MaskEditorFlags::Stacking)
 Q_DECLARE_OPERATORS_FOR_FLAGS(MaskEditorFlags::MaskValue)
 
-#endif // BORNAGAIN_GUI_VIEW_MASK_MASKEDITORFLAGS_H
+#endif // BORNAGAIN_GUI_VIEW_SCENE_MASKEDITORFLAGS_H
diff --git a/GUI/View/Scene/MaskGraphicsScene.h b/GUI/View/Scene/MaskGraphicsScene.h
index 0ae946b8c81081a857c778e147e209a5c99c54cd..fa56a0f02aa930d356724cf5dfecdb602f479030 100644
--- a/GUI/View/Scene/MaskGraphicsScene.h
+++ b/GUI/View/Scene/MaskGraphicsScene.h
@@ -15,8 +15,8 @@
 #ifndef BORNAGAIN_GUI_VIEW_SCENE_MASKGRAPHICSSCENE_H
 #define BORNAGAIN_GUI_VIEW_SCENE_MASKGRAPHICSSCENE_H
 
-#include "GUI/View/Mask/MaskEditorFlags.h"
 #include "GUI/View/ProShape/MaskType.h"
+#include "GUI/View/Scene/MaskEditorFlags.h"
 #include <QGraphicsScene>
 #include <memory>
 
diff --git a/GUI/View/Scene/MaskGraphicsView.h b/GUI/View/Scene/MaskGraphicsView.h
index 021b3644e542def82d7e47745ca10f559413a4a6..f85b3350d20f8479b737392c7a8ce805c8dda7fb 100644
--- a/GUI/View/Scene/MaskGraphicsView.h
+++ b/GUI/View/Scene/MaskGraphicsView.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_GUI_VIEW_SCENE_MASKGRAPHICSVIEW_H
 #define BORNAGAIN_GUI_VIEW_SCENE_MASKGRAPHICSVIEW_H
 
-#include "GUI/View/Mask/MaskEditorFlags.h"
+#include "GUI/View/Scene/MaskEditorFlags.h"
 #include <QGraphicsView>
 
 class MaskGraphicsScene;
diff --git a/GUI/View/Setup/MaskEditorPropertyPanel.h b/GUI/View/Setup/MaskEditorPropertyPanel.h
index 9c8b3075989b23ed0328a4bebf195b4cd706b9e7..8dfbc74346ddaf4b48b91b079146ddd48df3ec45 100644
--- a/GUI/View/Setup/MaskEditorPropertyPanel.h
+++ b/GUI/View/Setup/MaskEditorPropertyPanel.h
@@ -16,7 +16,7 @@
 #define BORNAGAIN_GUI_VIEW_SETUP_MASKEDITORPROPERTYPANEL_H
 
 #include "GUI/View/Access/DataAccessWidget.h"
-#include "GUI/View/Mask/MaskEditorFlags.h"
+#include "GUI/View/Scene/MaskEditorFlags.h"
 #include <QFormLayout>
 #include <QListView>
 #include <QModelIndex>
diff --git a/GUI/View/Setup/ProjectionsToolbar.h b/GUI/View/Setup/ProjectionsToolbar.h
index d509ba023d417ab97a254c3771bd56e7ef9d4e03..2fc7993b25fa5caab25948116df3ca93492f24ca 100644
--- a/GUI/View/Setup/ProjectionsToolbar.h
+++ b/GUI/View/Setup/ProjectionsToolbar.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_GUI_VIEW_SETUP_PROJECTIONSTOOLBAR_H
 #define BORNAGAIN_GUI_VIEW_SETUP_PROJECTIONSTOOLBAR_H
 
-#include "GUI/View/Mask/MaskEditorFlags.h"
+#include "GUI/View/Scene/MaskEditorFlags.h"
 #include <QToolBar>
 
 class ProjectionActions;