diff --git a/GUI/View/Scene/MaskGraphicsScene.cpp b/GUI/View/Scene/MaskGraphicsScene.cpp
index 2eb5b5cb01b663a7f33f502c837604ee7622268b..8767b2c095486727ba8016fc121d31ffcbf1f9b1 100644
--- a/GUI/View/Scene/MaskGraphicsScene.cpp
+++ b/GUI/View/Scene/MaskGraphicsScene.cpp
@@ -18,10 +18,10 @@
 #include "GUI/Model/Mask/MaskContainerModel.h"
 #include "GUI/Model/Mask/MaskItems.h"
 #include "GUI/Model/Project/ProjectDocument.h"
-#include "GUI/View/Mask/MaskViewFactory.h"
 #include "GUI/View/Plotter/ColorMap.h"
 #include "GUI/View/ProShape/SceneAdaptor.h"
 #include "GUI/View/Scene/MaskGraphicsProxy.h"
+#include "GUI/View/Scene/MaskViewFactory.h"
 #include "GUI/View/Shape/PolygonDisplay.h"
 #include <QGraphicsSceneContextMenuEvent>
 #include <QItemSelection>
diff --git a/GUI/View/Mask/MaskViewFactory.cpp b/GUI/View/Scene/MaskViewFactory.cpp
similarity index 95%
rename from GUI/View/Mask/MaskViewFactory.cpp
rename to GUI/View/Scene/MaskViewFactory.cpp
index f1aa6e6e44e3abe4ccaf77363d1f053a9ac70190..b38ea941cbb74cdbea93d38680b60165d29c1d13 100644
--- a/GUI/View/Mask/MaskViewFactory.cpp
+++ b/GUI/View/Scene/MaskViewFactory.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Mask/MaskViewFactory.cpp
+//! @file      GUI/View/Scene/MaskViewFactory.cpp
 //! @brief     Implements class MaskViewFactory.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Mask/MaskViewFactory.h"
+#include "GUI/View/Scene/MaskViewFactory.h"
 #include "Base/Util/Assert.h"
 #include "GUI/Model/Mask/MaskItems.h"
 #include "GUI/Model/Mask/ProjectionItems.h"
diff --git a/GUI/View/Mask/MaskViewFactory.h b/GUI/View/Scene/MaskViewFactory.h
similarity index 79%
rename from GUI/View/Mask/MaskViewFactory.h
rename to GUI/View/Scene/MaskViewFactory.h
index 21feb55a0deb85469ff4ce5b83f7fefecc905c9c..264ba7f37ab6fe1cf6f14073d08ae59f5c730175 100644
--- a/GUI/View/Mask/MaskViewFactory.h
+++ b/GUI/View/Scene/MaskViewFactory.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Mask/MaskViewFactory.h
+//! @file      GUI/View/Scene/MaskViewFactory.h
 //! @brief     Defines class MaskViewFactory.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_MASK_MASKVIEWFACTORY_H
-#define BORNAGAIN_GUI_VIEW_MASK_MASKVIEWFACTORY_H
+#ifndef BORNAGAIN_GUI_VIEW_SCENE_MASKVIEWFACTORY_H
+#define BORNAGAIN_GUI_VIEW_SCENE_MASKVIEWFACTORY_H
 
 class IShapeDisplay;
 class MaskRoot;
@@ -25,4 +25,4 @@ IShapeDisplay* createMaskView(MaskRoot* item);
 
 } // namespace MaskViewFactory
 
-#endif // BORNAGAIN_GUI_VIEW_MASK_MASKVIEWFACTORY_H
+#endif // BORNAGAIN_GUI_VIEW_SCENE_MASKVIEWFACTORY_H