diff --git a/GUI/View/Main/ActionManager.cpp b/GUI/View/Main/ActionManager.cpp
index cd7112566c5deb6567ada01409633a46ecbe0d2a..c3d7da485d0182ef778160d5c1f7cee33b22af13 100644
--- a/GUI/View/Main/ActionManager.cpp
+++ b/GUI/View/Main/ActionManager.cpp
@@ -21,9 +21,9 @@
 #include "GUI/View/Base/mainwindow_constants.h"
 #include "GUI/View/Main/AboutDialog.h"
 #include "GUI/View/Manager/ProjectManager.h"
-#include "GUI/View/Views/InstrumentView.h"
-#include "GUI/View/Views/JobView.h"
-#include "GUI/View/Views/SampleView.h"
+#include "GUI/View/View/InstrumentView.h"
+#include "GUI/View/View/JobView.h"
+#include "GUI/View/View/SampleView.h"
 #include <QButtonGroup>
 #include <QCheckBox>
 #include <QDesktopServices>
diff --git a/GUI/View/Main/CentralWidget.cpp b/GUI/View/Main/CentralWidget.cpp
index 8970a9604e53be58b153b850a56abaa68826006b..c5987b02e352282ec7c9e4945a59e77afdbcc33b 100644
--- a/GUI/View/Main/CentralWidget.cpp
+++ b/GUI/View/Main/CentralWidget.cpp
@@ -16,11 +16,11 @@
 #include "Base/Util/Assert.h"
 #include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/View/Setup/FrameActions.h"
-#include "GUI/View/Views/DataView.h"
-#include "GUI/View/Views/InstrumentView.h"
-#include "GUI/View/Views/JobView.h"
-#include "GUI/View/Views/SampleView.h"
-#include "GUI/View/Views/SimulationView.h"
+#include "GUI/View/View/DataView.h"
+#include "GUI/View/View/InstrumentView.h"
+#include "GUI/View/View/JobView.h"
+#include "GUI/View/View/SampleView.h"
+#include "GUI/View/View/SimulationView.h"
 #include <QAction>
 #include <QApplication>
 #include <QDir>
diff --git a/GUI/View/Views/DataView.cpp b/GUI/View/View/DataView.cpp
similarity index 89%
rename from GUI/View/Views/DataView.cpp
rename to GUI/View/View/DataView.cpp
index e455510a50ec1bab89eb65dd79ae754fee0b6ef8..cb9dd95079ba2a4239fe07bebff08817d319e7e7 100644
--- a/GUI/View/Views/DataView.cpp
+++ b/GUI/View/View/DataView.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Views/DataView.cpp
+//! @file      GUI/View/View/DataView.cpp
 //! @brief     Implements class DataView.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,9 +12,9 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Views/DataView.h"
+#include "GUI/View/View/DataView.h"
 #include "GUI/View/Frame/StackedFrames.h"
-#include "GUI/View/Views/DatafilesSelector.h"
+#include "GUI/View/View/DatafilesSelector.h"
 #include <QSplitter>
 #include <QVBoxLayout>
 
diff --git a/GUI/View/Views/DataView.h b/GUI/View/View/DataView.h
similarity index 80%
rename from GUI/View/Views/DataView.h
rename to GUI/View/View/DataView.h
index 2cfb6b4b7110c70d74fd0d765b916594805135c5..78aa97ae07dbe4c6500ba3fb5860a5c61dbac84d 100644
--- a/GUI/View/Views/DataView.h
+++ b/GUI/View/View/DataView.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Views/DataView.h
+//! @file      GUI/View/View/DataView.h
 //! @brief     Defines class DataView.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_VIEWS_DATAVIEW_H
-#define BORNAGAIN_GUI_VIEW_VIEWS_DATAVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_VIEW_DATAVIEW_H
+#define BORNAGAIN_GUI_VIEW_VIEW_DATAVIEW_H
 
 #include <QWidget>
 
@@ -25,4 +25,4 @@ public:
     DataView();
 };
 
-#endif // BORNAGAIN_GUI_VIEW_VIEWS_DATAVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_VIEW_DATAVIEW_H
diff --git a/GUI/View/Views/DatafilesSelector.cpp b/GUI/View/View/DatafilesSelector.cpp
similarity index 96%
rename from GUI/View/Views/DatafilesSelector.cpp
rename to GUI/View/View/DatafilesSelector.cpp
index 03890b95a4edf299b35ed4b00753cc7ddc633ef2..5c7840edfaa59a56a09f7e68a77aad070417b7aa 100644
--- a/GUI/View/Views/DatafilesSelector.cpp
+++ b/GUI/View/View/DatafilesSelector.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Views/DatafilesSelector.cpp
+//! @file      GUI/View/View/DatafilesSelector.cpp
 //! @brief     Implements class DatafilesSelector.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Views/DatafilesSelector.h"
+#include "GUI/View/View/DatafilesSelector.h"
 #include "Base/Util/Assert.h"
 #include "GUI/Model/Data/DataItem.h"
 #include "GUI/Model/Files/DatafilesSet.h"
diff --git a/GUI/View/Views/DatafilesSelector.h b/GUI/View/View/DatafilesSelector.h
similarity index 81%
rename from GUI/View/Views/DatafilesSelector.h
rename to GUI/View/View/DatafilesSelector.h
index 55f82060b1c13ce40c8f50beb871876e72289b6d..bbb309d051eacb06b8660cf11e2ac6187e424dde 100644
--- a/GUI/View/Views/DatafilesSelector.h
+++ b/GUI/View/View/DatafilesSelector.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Views/DatafilesSelector.h
+//! @file      GUI/View/View/DatafilesSelector.h
 //! @brief     Defines class DatafilesSelector.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_VIEWS_DATAFILESSELECTOR_H
-#define BORNAGAIN_GUI_VIEW_VIEWS_DATAFILESSELECTOR_H
+#ifndef BORNAGAIN_GUI_VIEW_VIEW_DATAFILESSELECTOR_H
+#define BORNAGAIN_GUI_VIEW_VIEW_DATAFILESSELECTOR_H
 
 #include <QWidget>
 
@@ -38,4 +38,4 @@ private:
     QAction* m_rm_action;
 };
 
-#endif // BORNAGAIN_GUI_VIEW_VIEWS_DATAFILESSELECTOR_H
+#endif // BORNAGAIN_GUI_VIEW_VIEW_DATAFILESSELECTOR_H
diff --git a/GUI/View/Views/InstrumentView.cpp b/GUI/View/View/InstrumentView.cpp
similarity index 98%
rename from GUI/View/Views/InstrumentView.cpp
rename to GUI/View/View/InstrumentView.cpp
index 0f786ecdd24027cbf899a4e132fb808265b7a8c7..66d0754b25ddb85a7cfe8110aed11a105f01ed0f 100644
--- a/GUI/View/Views/InstrumentView.cpp
+++ b/GUI/View/View/InstrumentView.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Views/InstrumentView.cpp
+//! @file      GUI/View/View/InstrumentView.cpp
 //! @brief     Implements class InstrumentView.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Views/InstrumentView.h"
+#include "GUI/View/View/InstrumentView.h"
 #include "Base/Util/Assert.h"
 #include "GUI/Model/Device/InstrumentItems.h"
 #include "GUI/Model/Device/InstrumentsSet.h"
diff --git a/GUI/View/Views/InstrumentView.h b/GUI/View/View/InstrumentView.h
similarity index 85%
rename from GUI/View/Views/InstrumentView.h
rename to GUI/View/View/InstrumentView.h
index b48b4db2b5028739a111ce0601f1f40a14c399bd..11ac2038b2198672bcd2addfaa0bd0c57e4d699c 100644
--- a/GUI/View/Views/InstrumentView.h
+++ b/GUI/View/View/InstrumentView.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Views/InstrumentView.h
+//! @file      GUI/View/View/InstrumentView.h
 //! @brief     Defines class InstrumentView.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_VIEWS_INSTRUMENTVIEW_H
-#define BORNAGAIN_GUI_VIEW_VIEWS_INSTRUMENTVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_VIEW_INSTRUMENTVIEW_H
+#define BORNAGAIN_GUI_VIEW_VIEW_INSTRUMENTVIEW_H
 
 #include <QAction>
 #include <QScrollArea>
@@ -46,4 +46,4 @@ private:
     QAction* m_save_action;
 };
 
-#endif // BORNAGAIN_GUI_VIEW_VIEWS_INSTRUMENTVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_VIEW_INSTRUMENTVIEW_H
diff --git a/GUI/View/Views/JobView.cpp b/GUI/View/View/JobView.cpp
similarity index 98%
rename from GUI/View/Views/JobView.cpp
rename to GUI/View/View/JobView.cpp
index 6a4e6ba1ea2f3dc727dbe9f6a8a3a87765a2a4e5..63c4d7f0b270a83d13f4a0605d1986f1a1e7e1cc 100644
--- a/GUI/View/Views/JobView.cpp
+++ b/GUI/View/View/JobView.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Views/JobView.cpp
+//! @file      GUI/View/View/JobView.cpp
 //! @brief     Implements class JobView.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Views/JobView.h"
+#include "GUI/View/View/JobView.h"
 #include "GUI/Model/Data/DataItem.h"
 #include "GUI/Model/Job/JobItem.h"
 #include "GUI/Model/Job/JobsSet.h"
diff --git a/GUI/View/Views/JobView.h b/GUI/View/View/JobView.h
similarity index 90%
rename from GUI/View/Views/JobView.h
rename to GUI/View/View/JobView.h
index b9269643bd92a7344f771bd1829423c682e5a7fa..71c3a21f402e4df723043291b95059b47b1d0533 100644
--- a/GUI/View/Views/JobView.h
+++ b/GUI/View/View/JobView.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Views/JobView.h
+//! @file      GUI/View/View/JobView.h
 //! @brief     Defines class JobView.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_VIEWS_JOBVIEW_H
-#define BORNAGAIN_GUI_VIEW_VIEWS_JOBVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_VIEW_JOBVIEW_H
+#define BORNAGAIN_GUI_VIEW_VIEW_JOBVIEW_H
 
 #include <QActionGroup>
 #include <QMainWindow>
@@ -67,4 +67,4 @@ private:
     QActionGroup m_activity_actions;
 };
 
-#endif // BORNAGAIN_GUI_VIEW_VIEWS_JOBVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_VIEW_JOBVIEW_H
diff --git a/GUI/View/Views/SampleView.cpp b/GUI/View/View/SampleView.cpp
similarity index 99%
rename from GUI/View/Views/SampleView.cpp
rename to GUI/View/View/SampleView.cpp
index 954a3e02e293e4f8e4bd0ea73116f4eeddef6278..f2ee47a9837a83e99a707ec053a845443da9a8e6 100644
--- a/GUI/View/Views/SampleView.cpp
+++ b/GUI/View/View/SampleView.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Views/SampleView.cpp
+//! @file      GUI/View/View/SampleView.cpp
 //! @brief     Implements class SampleView.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Views/SampleView.h"
+#include "GUI/View/View/SampleView.h"
 #include "Base/Util/Vec.h"
 #include "GUI/Model/FromCore/GUIExamplesFactory.h"
 #include "GUI/Model/Project/ProjectDocument.h"
diff --git a/GUI/View/Views/SampleView.h b/GUI/View/View/SampleView.h
similarity index 86%
rename from GUI/View/Views/SampleView.h
rename to GUI/View/View/SampleView.h
index e22e880601a017aa25563d0c854384779962aa1c..a13635219db9467aa82481ee8dc6f3b2a04fd934 100644
--- a/GUI/View/Views/SampleView.h
+++ b/GUI/View/View/SampleView.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Views/SampleView.h
+//! @file      GUI/View/View/SampleView.h
 //! @brief     Defines class SampleView.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_VIEWS_SAMPLEVIEW_H
-#define BORNAGAIN_GUI_VIEW_VIEWS_SAMPLEVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_VIEW_SAMPLEVIEW_H
+#define BORNAGAIN_GUI_VIEW_VIEW_SAMPLEVIEW_H
 
 #include <QAction>
 #include <QWidget>
@@ -48,4 +48,4 @@ private:
     QAction* m_cp_action;
 };
 
-#endif // BORNAGAIN_GUI_VIEW_VIEWS_SAMPLEVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_VIEW_SAMPLEVIEW_H
diff --git a/GUI/View/Views/SimulationView.cpp b/GUI/View/View/SimulationView.cpp
similarity index 99%
rename from GUI/View/Views/SimulationView.cpp
rename to GUI/View/View/SimulationView.cpp
index 27cabe8b7e7fdc97f72b3407e4e1c0f27cf97710..042fc393d70e22583c2f3a025501a230eaf0b949 100644
--- a/GUI/View/Views/SimulationView.cpp
+++ b/GUI/View/View/SimulationView.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Views/SimulationView.cpp
+//! @file      GUI/View/View/SimulationView.cpp
 //! @brief     Implements class SimulationView.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Views/SimulationView.h"
+#include "GUI/View/View/SimulationView.h"
 #include "GUI/Model/Data/DataItem.h"
 #include "GUI/Model/Device/InstrumentsSet.h"
 #include "GUI/Model/Files/DatafilesSet.h"
diff --git a/GUI/View/Views/SimulationView.h b/GUI/View/View/SimulationView.h
similarity index 93%
rename from GUI/View/Views/SimulationView.h
rename to GUI/View/View/SimulationView.h
index d27c9fb6288c7c6f54b87797ae3c02fcac20544f..927fd613d643dd7ff981ec6bd5a16c59ec240f34 100644
--- a/GUI/View/Views/SimulationView.h
+++ b/GUI/View/View/SimulationView.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Views/SimulationView.h
+//! @file      GUI/View/View/SimulationView.h
 //! @brief     Defines class SimulationView.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_VIEWS_SIMULATIONVIEW_H
-#define BORNAGAIN_GUI_VIEW_VIEWS_SIMULATIONVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_VIEW_SIMULATIONVIEW_H
+#define BORNAGAIN_GUI_VIEW_VIEW_SIMULATIONVIEW_H
 
 #include <QCheckBox>
 #include <QComboBox>
@@ -92,4 +92,4 @@ private:
     SimulationOptionsItem* optionsItem() const;
 };
 
-#endif // BORNAGAIN_GUI_VIEW_VIEWS_SIMULATIONVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_VIEW_SIMULATIONVIEW_H