diff --git a/GUI/View/Widget/SetView.cpp b/GUI/View/Modelview/SetView.cpp
similarity index 93%
rename from GUI/View/Widget/SetView.cpp
rename to GUI/View/Modelview/SetView.cpp
index df5763bd6a3c0c566aa2ffe7a38aa753468ec8ea..96d4ae96faa74d99b7f51f68d196d8c89a654fda 100644
--- a/GUI/View/Widget/SetView.cpp
+++ b/GUI/View/Modelview/SetView.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Widget/SetView.cpp
+//! @file      GUI/View/Modelview/SetView.cpp
 //! @brief     Implements class SetView.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Widget/SetView.h"
+#include "GUI/View/Modelview/SetView.h"
 #include "GUI/Model/Type/SetWithModel.h"
 #include "GUI/View/Widget/ListItemDelegate.h"
 
diff --git a/GUI/View/Widget/SetView.h b/GUI/View/Modelview/SetView.h
similarity index 81%
rename from GUI/View/Widget/SetView.h
rename to GUI/View/Modelview/SetView.h
index 519a0498df30a1d51e08a738db33c80c5c9900af..8c1ce33d4527a3b4ffd54f98ed0e4b5610d5dc5e 100644
--- a/GUI/View/Widget/SetView.h
+++ b/GUI/View/Modelview/SetView.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Widget/SetView.h
+//! @file      GUI/View/Modelview/SetView.h
 //! @brief     Defines class SetView.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_WIDGET_SETVIEW_H
-#define BORNAGAIN_GUI_VIEW_WIDGET_SETVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_MODELVIEW_SETVIEW_H
+#define BORNAGAIN_GUI_VIEW_MODELVIEW_SETVIEW_H
 
 #include <QListView>
 
@@ -27,4 +27,4 @@ public:
             QSizePolicy policy = {QSizePolicy::Preferred, QSizePolicy::Expanding});
 };
 
-#endif // BORNAGAIN_GUI_VIEW_WIDGET_SETVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_MODELVIEW_SETVIEW_H
diff --git a/GUI/View/Views/DatafilesSelector.cpp b/GUI/View/Views/DatafilesSelector.cpp
index b9d22d49bddc83776149cd3eba6e2f4a0a36a27e..d0b021d03295dfe6cc92d40c9618f839f05a0515 100644
--- a/GUI/View/Views/DatafilesSelector.cpp
+++ b/GUI/View/Views/DatafilesSelector.cpp
@@ -20,9 +20,9 @@
 #include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/View/Frame/StackedFrames.h"
 #include "GUI/View/Loader/DataLoader.h"
+#include "GUI/View/Modelview/SetView.h"
 #include "GUI/View/Setup/FrameActions.h"
 #include "GUI/View/Widget/ListItemDelegate.h"
-#include "GUI/View/Widget/SetView.h"
 #include "GUI/View/Widget/StyledToolbar.h"
 #include <QBoxLayout>
 #include <QMenu>
diff --git a/GUI/View/Views/InstrumentView.cpp b/GUI/View/Views/InstrumentView.cpp
index fbf4ae54c9dec806b8fea0cbfb2fa0d7aaca7217..dd2ab1fc29c13c6ef8234b5555351f09c939a8d8 100644
--- a/GUI/View/Views/InstrumentView.cpp
+++ b/GUI/View/Views/InstrumentView.cpp
@@ -23,9 +23,9 @@
 #include "GUI/View/Instrument/SpecularInstrumentEditor.h"
 #include "GUI/View/Layout/ApplicationSettings.h"
 #include "GUI/View/Loader/ComponentRW.h"
+#include "GUI/View/Modelview/SetView.h"
 #include "GUI/View/Setup/FrameActions.h"
 #include "GUI/View/Widget/GroupBoxes.h"
-#include "GUI/View/Widget/SetView.h"
 #include "GUI/View/Widget/StyledToolbar.h"
 #include <QFormLayout>
 #include <QLineEdit>
diff --git a/GUI/View/Views/SampleView.cpp b/GUI/View/Views/SampleView.cpp
index ca4efb28f282979aefe1971c35701f7c188d1597..89311358e14aacd50bc364872399d9ed10ed5896 100644
--- a/GUI/View/Views/SampleView.cpp
+++ b/GUI/View/Views/SampleView.cpp
@@ -22,12 +22,12 @@
 #include "GUI/Model/Sample/SamplesSet.h"
 #include "GUI/View/Layout/mainwindow_constants.h"
 #include "GUI/View/Manager/PyImportAssistant.h"
+#include "GUI/View/Modelview/SetView.h"
 #include "GUI/View/Realspace/RealspacePanel.h"
 #include "GUI/View/Realspace/RealspaceWidget.h"
 #include "GUI/View/Sample/SampleEditor.h"
 #include "GUI/View/Sample/ScriptPanel.h"
 #include "GUI/View/Setup/FrameActions.h"
-#include "GUI/View/Widget/SetView.h"
 #include "GUI/View/Widget/StyledToolbar.h"
 #include <QBoxLayout>
 #include <QMenu>