diff --git a/App/main.cpp b/App/main.cpp
index ef67b107d0e7a24d62430f0e74fd91a5ba7f267c..b58aab127ca49d20100b2d7e128224d723c52b5f 100644
--- a/App/main.cpp
+++ b/App/main.cpp
@@ -17,7 +17,7 @@
 #include "GUI/Application/GlobalSettings.h"
 #include "GUI/Session/SessionData.h"
 #include "GUI/Views/Loaders/DataLoaderUtil.h"
-#include "GUI/mainwindow/mainwindow.h"
+#include "GUI/Views/Main/mainwindow.h"
 #include "GUI/utils/Helpers.h"
 #include "GUI/utils/hostosinfo.h"
 #include "config_build.h"
diff --git a/GUI/Views/ImportDataWidgets/RealDataPropertiesWidget.cpp b/GUI/Views/ImportDataWidgets/RealDataPropertiesWidget.cpp
index 623e20780c89c65372632d76a0448e36038a2416..e4c63ddb6528b8fd91b56811ff3c476100582656 100644
--- a/GUI/Views/ImportDataWidgets/RealDataPropertiesWidget.cpp
+++ b/GUI/Views/ImportDataWidgets/RealDataPropertiesWidget.cpp
@@ -18,7 +18,7 @@
 #include "GUI/Models/Instrument/InstrumentModel.h"
 #include "GUI/Models/Project/LinkInstrumentManager.h"
 #include "GUI/Models/Project/projectdocument.h"
-#include "GUI/mainwindow/mainwindow.h"
+#include "GUI/Views/Main/mainwindow.h"
 #include <QComboBox>
 #include <QLabel>
 #include <QVBoxLayout>
diff --git a/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp b/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
index 6adb8405e4b1f4d662a3c9665cd4b33ac3930573..51ad340b7b955211499f7da1c609116242a3e504 100644
--- a/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
+++ b/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
@@ -18,14 +18,14 @@
 #include "GUI/Widgets/Common/ItemViewOverlayButtons.h"
 #include "GUI/Widgets/Common/StyledToolBar.h"
 #include "GUI/Items/RealDataItem.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Views/Main/projectmanager.h"
 #include "GUI/Models/Data/AbstractDataLoader1D.h"
 #include "GUI/Models/Data/DataLoaders1D.h"
 #include "GUI/Models/Data/RealDataModel.h"
 #include "GUI/Views/ImportDataWidgets/ImportDataUtils.h"
 #include "GUI/Views/ImportDataWidgets/RealDataPropertiesWidget.h"
 #include "GUI/Views/ImportDataWidgets/RealDataTreeModel.h"
-#include "GUI/mainwindow/mainwindow.h"
+#include "GUI/Views/Main/mainwindow.h"
 #include "GUI/utils/Error.h"
 #include "GUI/utils/GUIHelpers.h"
 #include <QFileDialog>
diff --git a/GUI/Views/InstrumentWidgets/InstrumentLibraryEditor.cpp b/GUI/Views/InstrumentWidgets/InstrumentLibraryEditor.cpp
index b09fee36dbac0ab901d9225e80621e4d12d49c66..cca226cdc242a4e9ffb4b70ae8c7681c5f8eab87 100644
--- a/GUI/Views/InstrumentWidgets/InstrumentLibraryEditor.cpp
+++ b/GUI/Views/InstrumentWidgets/InstrumentLibraryEditor.cpp
@@ -18,7 +18,7 @@
 #include "GUI/Widgets/Common/StyleUtils.h"
 #include "GUI/Items/InstrumentItems.h"
 #include "GUI/Session/SessionData.h"
-#include "GUI/mainwindow/mainwindow.h"
+#include "GUI/Views/Main/mainwindow.h"
 #include "GUI/utils/ItemDelegateForHTML.h"
 #include "ui_InstrumentLibraryEditor.h"
 #include <QAction>
diff --git a/GUI/Views/InstrumentWidgets/InstrumentListView.cpp b/GUI/Views/InstrumentWidgets/InstrumentListView.cpp
index 3a6772e5ed559693ee4aafdce1f9d2d9eae000c0..62212679ac5e297637c62fc3f242539a34269c22 100644
--- a/GUI/Views/InstrumentWidgets/InstrumentListView.cpp
+++ b/GUI/Views/InstrumentWidgets/InstrumentListView.cpp
@@ -19,7 +19,7 @@
 #include "GUI/Session/SessionData.h"
 #include "GUI/Views/InstrumentWidgets/InstrumentLibraryEditor.h"
 #include "GUI/Views/InstrumentWidgets/InstrumentListModel.h"
-#include "GUI/mainwindow/mainwindow.h"
+#include "GUI/Views/Main/mainwindow.h"
 #include <QAction>
 #include <QListView>
 #include <QMessageBox>
diff --git a/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.cpp b/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.cpp
index 5f1391f928d7ee9229d03878daf5b3ca14cde7c5..f3b2e2d093b0da84e01b2f4691d917419bfe0ad8 100644
--- a/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.cpp
+++ b/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.cpp
@@ -15,12 +15,12 @@
 #include "GUI/Views/IntensityDataWidgets/IntensityDataCanvas.h"
 #include "GUI/Items/IntensityDataItem.h"
 #include "GUI/Items/RealDataItem.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Views/Main/projectmanager.h"
 #include "GUI/Models/Group/ComboProperty.h"
 #include "GUI/Views/IntensityDataWidgets/ColorMap.h"
 #include "GUI/Views/IntensityDataWidgets/ColorMapCanvas.h"
 #include "GUI/Views/IntensityDataWidgets/SavePlotAssistant.h"
-#include "GUI/mainwindow/mainwindow.h"
+#include "GUI/Views/Main/mainwindow.h"
 #include "GUI/utils/GUIHelpers.h"
 #include <QAction>
 #include <QMouseEvent>
diff --git a/GUI/Views/JobWidgets/JobProgressAssistant.cpp b/GUI/Views/JobWidgets/JobProgressAssistant.cpp
index dde51f8419da4d8bf3edc8a1c1a37af7f0359dfb..285977d6e70ec4a20f042b3b79136646549aa5be 100644
--- a/GUI/Views/JobWidgets/JobProgressAssistant.cpp
+++ b/GUI/Views/JobWidgets/JobProgressAssistant.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/Views/JobWidgets/JobProgressAssistant.h"
 #include "GUI/Models/Job/JobModel.h"
-#include "GUI/mainwindow/mainwindow.h"
+#include "GUI/Views/Main/mainwindow.h"
 #include <QProgressBar>
 
 JobProgressAssistant::JobProgressAssistant(MainWindow* mainWindow, JobModel* jobModel)
diff --git a/GUI/Views/JobWidgets/JobView.cpp b/GUI/Views/JobWidgets/JobView.cpp
index 00da33d2ff3fed4be14a26dc9cd896fccb89cdf3..3bc966734985eafee2ad1762fee9333e5c14d567 100644
--- a/GUI/Views/JobWidgets/JobView.cpp
+++ b/GUI/Views/JobWidgets/JobView.cpp
@@ -15,7 +15,7 @@
 #include "GUI/Views/JobWidgets/JobView.h"
 #include "GUI/Widgets/Common/DocksController.h"
 #include "GUI/Items/JobItem.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Views/Main/projectmanager.h"
 #include "GUI/Models/Job/JobModel.h"
 #include "GUI/Views/FitWidgets/FitActivityPanel.h"
 #include "GUI/Views/FitWidgets/JobRealTimeWidget.h"
@@ -24,7 +24,7 @@
 #include "GUI/Views/JobWidgets/JobResultsPresenter.h"
 #include "GUI/Views/JobWidgets/JobSelectorWidget.h"
 #include "GUI/Views/JobWidgets/JobViewActivities.h"
-#include "GUI/mainwindow/mainwindow.h"
+#include "GUI/Views/Main/mainwindow.h"
 #include <QMenu>
 
 JobView::JobView(MainWindow* mainWindow, ProjectDocument* document)
diff --git a/GUI/mainwindow/AutosaveController.cpp b/GUI/Views/Main/AutosaveController.cpp
similarity index 97%
rename from GUI/mainwindow/AutosaveController.cpp
rename to GUI/Views/Main/AutosaveController.cpp
index c196767203b6a2f55c2641e34700ada8197d3c48..ac3d2533a6efb9f613db92180b2e37d81aac1aa1 100644
--- a/GUI/mainwindow/AutosaveController.cpp
+++ b/GUI/Views/Main/AutosaveController.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/mainwindow/AutosaveController.cpp
+//! @file      GUI/Views/Main/AutosaveController.cpp
 //! @brief     Implements class AutosaveController
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/mainwindow/AutosaveController.h"
+#include "GUI/Views/Main/AutosaveController.h"
 #include "GUI/Widgets/Common/UpdateTimer.h"
 #include "GUI/Models/Project/ProjectUtils.h"
 #include "GUI/Models/Project/projectdocument.h"
diff --git a/GUI/mainwindow/AutosaveController.h b/GUI/Views/Main/AutosaveController.h
similarity index 89%
rename from GUI/mainwindow/AutosaveController.h
rename to GUI/Views/Main/AutosaveController.h
index 50a1d126e47ab75cac964b6fc5425b7bf9c5fa6a..5a5e4acdcbc129d7381422da9281e01f61b41d16 100644
--- a/GUI/mainwindow/AutosaveController.h
+++ b/GUI/Views/Main/AutosaveController.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/mainwindow/AutosaveController.h
+//! @file      GUI/Views/Main/AutosaveController.h
 //! @brief     Defines class AutosaveController
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_MAINWINDOW_AUTOSAVECONTROLLER_H
-#define BORNAGAIN_GUI_MAINWINDOW_AUTOSAVECONTROLLER_H
+#ifndef BORNAGAIN_GUI_VIEWS_MAIN_AUTOSAVECONTROLLER_H
+#define BORNAGAIN_GUI_VIEWS_MAIN_AUTOSAVECONTROLLER_H
 
 #include <QObject>
 
@@ -59,4 +59,4 @@ private:
     UpdateTimer* m_timer;
 };
 
-#endif // BORNAGAIN_GUI_MAINWINDOW_AUTOSAVECONTROLLER_H
+#endif // BORNAGAIN_GUI_VIEWS_MAIN_AUTOSAVECONTROLLER_H
diff --git a/GUI/mainwindow/PyImportAssistant.cpp b/GUI/Views/Main/PyImportAssistant.cpp
similarity index 98%
rename from GUI/mainwindow/PyImportAssistant.cpp
rename to GUI/Views/Main/PyImportAssistant.cpp
index 7b7c5b2fde7960f0db0cf4967def00381aa1bfac..a2be57f619ea5adaeea21f09138da01f4cd3c2e1 100644
--- a/GUI/mainwindow/PyImportAssistant.cpp
+++ b/GUI/Views/Main/PyImportAssistant.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/mainwindow/PyImportAssistant.cpp
+//! @file      GUI/Views/Main/PyImportAssistant.cpp
 //! @brief     Implements class PyImportAssistant
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -14,14 +14,14 @@
 
 #ifdef BORNAGAIN_PYTHON
 
-#include "GUI/mainwindow/PyImportAssistant.h"
+#include "GUI/Views/Main/PyImportAssistant.h"
 #include "BABuild.h"
 #include "Base/Utils/Assert.h"
 #include "Base/Utils/SysUtils.h"
 #include "GUI/Application/GlobalSettings.h"
 #include "GUI/Widgets/Info/ComboSelectorDialog.h"
 #include "GUI/Widgets/Info/DetailedMessageBox.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Views/Main/projectmanager.h"
 #include "GUI/Models/Data/GUIObjectBuilder.h"
 #include "GUI/Models/Sample/GUIDomainSampleVisitor.h"
 #include "GUI/Models/Project/ProjectUtils.h"
diff --git a/GUI/mainwindow/PyImportAssistant.h b/GUI/Views/Main/PyImportAssistant.h
similarity index 87%
rename from GUI/mainwindow/PyImportAssistant.h
rename to GUI/Views/Main/PyImportAssistant.h
index 5b85a672ba06db47d7928e15fbe42436394a1f84..b987eb448b2fe21a8a0553274cbb00e503d60815 100644
--- a/GUI/mainwindow/PyImportAssistant.h
+++ b/GUI/Views/Main/PyImportAssistant.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/mainwindow/PyImportAssistant.h
+//! @file      GUI/Views/Main/PyImportAssistant.h
 //! @brief     Implements class PyImportAssistant
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_MAINWINDOW_PYIMPORTASSISTANT_H
-#define BORNAGAIN_GUI_MAINWINDOW_PYIMPORTASSISTANT_H
+#ifndef BORNAGAIN_GUI_VIEWS_MAIN_PYIMPORTASSISTANT_H
+#define BORNAGAIN_GUI_VIEWS_MAIN_PYIMPORTASSISTANT_H
 
 #ifdef BORNAGAIN_PYTHON
 
@@ -47,4 +47,4 @@ private:
 
 #endif // BORNAGAIN_PYTHON
 
-#endif // BORNAGAIN_GUI_MAINWINDOW_PYIMPORTASSISTANT_H
+#endif // BORNAGAIN_GUI_VIEWS_MAIN_PYIMPORTASSISTANT_H
diff --git a/GUI/mainwindow/SaveService.cpp b/GUI/Views/Main/SaveService.cpp
similarity index 96%
rename from GUI/mainwindow/SaveService.cpp
rename to GUI/Views/Main/SaveService.cpp
index caffc8e8afecd039a9aa3f633692ecaa2c16db0d..7eb9d98b4b67bdfbe09d4c684630897c3e0ccd8d 100644
--- a/GUI/mainwindow/SaveService.cpp
+++ b/GUI/Views/Main/SaveService.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/mainwindow/SaveService.cpp
+//! @file      GUI/Views/Main/SaveService.cpp
 //! @brief     Implements class SaveService
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,12 +12,12 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/mainwindow/SaveService.h"
+#include "GUI/Views/Main/SaveService.h"
 #include "Base/Utils/Assert.h"
 #include "GUI/Models/Project/ProjectUtils.h"
 #include "GUI/Models/Project/projectdocument.h"
-#include "GUI/mainwindow/AutosaveController.h"
-#include "GUI/mainwindow/SaveThread.h"
+#include "GUI/Views/Main/AutosaveController.h"
+#include "GUI/Views/Main/SaveThread.h"
 #include "GUI/utils/Error.h"
 #include <QApplication>
 #include <QCoreApplication>
diff --git a/GUI/mainwindow/SaveService.h b/GUI/Views/Main/SaveService.h
similarity index 88%
rename from GUI/mainwindow/SaveService.h
rename to GUI/Views/Main/SaveService.h
index 2dbef3831ae49fcd975933fb003a1d36ecc31bd7..d501b76ecbf27f8960c557caee4400d2be73ba39 100644
--- a/GUI/mainwindow/SaveService.h
+++ b/GUI/Views/Main/SaveService.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/mainwindow/SaveService.h
+//! @file      GUI/Views/Main/SaveService.h
 //! @brief     Defines class SaveService
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_MAINWINDOW_SAVESERVICE_H
-#define BORNAGAIN_GUI_MAINWINDOW_SAVESERVICE_H
+#ifndef BORNAGAIN_GUI_VIEWS_MAIN_SAVESERVICE_H
+#define BORNAGAIN_GUI_VIEWS_MAIN_SAVESERVICE_H
 
 #include <QObject>
 #include <QQueue>
@@ -61,4 +61,4 @@ private:
     ProjectDocument* m_document;
 };
 
-#endif // BORNAGAIN_GUI_MAINWINDOW_SAVESERVICE_H
+#endif // BORNAGAIN_GUI_VIEWS_MAIN_SAVESERVICE_H
diff --git a/GUI/mainwindow/SaveThread.cpp b/GUI/Views/Main/SaveThread.cpp
similarity index 92%
rename from GUI/mainwindow/SaveThread.cpp
rename to GUI/Views/Main/SaveThread.cpp
index 796548688d0dca6b472035cff8bb76f6f3942fd5..3bf98202aab9202e6f019692f54532a10eaaea0f 100644
--- a/GUI/mainwindow/SaveThread.cpp
+++ b/GUI/Views/Main/SaveThread.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/mainwindow/SaveThread.cpp
+//! @file      GUI/Views/Main/SaveThread.cpp
 //! @brief     Defines SaveThread classes
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/mainwindow/SaveThread.h"
+#include "GUI/Views/Main/SaveThread.h"
 #include "Base/Utils/Assert.h"
 #include "GUI/Models/Project/projectdocument.h"
 
diff --git a/GUI/mainwindow/SaveThread.h b/GUI/Views/Main/SaveThread.h
similarity index 84%
rename from GUI/mainwindow/SaveThread.h
rename to GUI/Views/Main/SaveThread.h
index 401509fbe677a36384051bec2720f7ddc19628c1..a712b6a453421c6edd73f460894f83186c979946 100644
--- a/GUI/mainwindow/SaveThread.h
+++ b/GUI/Views/Main/SaveThread.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/mainwindow/SaveThread.h
+//! @file      GUI/Views/Main/SaveThread.h
 //! @brief     Defines SaveThread classes
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_MAINWINDOW_SAVETHREAD_H
-#define BORNAGAIN_GUI_MAINWINDOW_SAVETHREAD_H
+#ifndef BORNAGAIN_GUI_VIEWS_MAIN_SAVETHREAD_H
+#define BORNAGAIN_GUI_VIEWS_MAIN_SAVETHREAD_H
 
 #include <QObject>
 #include <QThread>
@@ -40,4 +40,4 @@ private:
     QString m_projectFile;
 };
 
-#endif // BORNAGAIN_GUI_MAINWINDOW_SAVETHREAD_H
+#endif // BORNAGAIN_GUI_VIEWS_MAIN_SAVETHREAD_H
diff --git a/GUI/mainwindow/aboutapplicationdialog.cpp b/GUI/Views/Main/aboutapplicationdialog.cpp
similarity index 97%
rename from GUI/mainwindow/aboutapplicationdialog.cpp
rename to GUI/Views/Main/aboutapplicationdialog.cpp
index 746a5530edda78bb21f0e2ee905e0a00def61c26..f518dfeffce983f3120ea5c9942156eae31d6936 100644
--- a/GUI/mainwindow/aboutapplicationdialog.cpp
+++ b/GUI/Views/Main/aboutapplicationdialog.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/mainwindow/aboutapplicationdialog.cpp
+//! @file      GUI/Views/Main/aboutapplicationdialog.cpp
 //! @brief     Implements class AboutApplicationDialog
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/mainwindow/aboutapplicationdialog.h"
+#include "GUI/Views/Main/aboutapplicationdialog.h"
 #include "GUI/Widgets/Common/DesignerHelper.h"
 #include "GUI/utils/CustomEventFilters.h"
 #include "GUI/utils/Helpers.h"
diff --git a/GUI/mainwindow/aboutapplicationdialog.h b/GUI/Views/Main/aboutapplicationdialog.h
similarity index 79%
rename from GUI/mainwindow/aboutapplicationdialog.h
rename to GUI/Views/Main/aboutapplicationdialog.h
index cefa83707f03b4e42762a1b2cc7562a09d1ca921..8e0a0fbe5e33b8e6d37b3db4a2393b8ffd440297 100644
--- a/GUI/mainwindow/aboutapplicationdialog.h
+++ b/GUI/Views/Main/aboutapplicationdialog.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/mainwindow/aboutapplicationdialog.h
+//! @file      GUI/Views/Main/aboutapplicationdialog.h
 //! @brief     Defines class AboutApplicationDialog
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_MAINWINDOW_ABOUTAPPLICATIONDIALOG_H
-#define BORNAGAIN_GUI_MAINWINDOW_ABOUTAPPLICATIONDIALOG_H
+#ifndef BORNAGAIN_GUI_VIEWS_MAIN_ABOUTAPPLICATIONDIALOG_H
+#define BORNAGAIN_GUI_VIEWS_MAIN_ABOUTAPPLICATIONDIALOG_H
 
 #include <QDialog>
 
@@ -32,4 +32,4 @@ private:
     QBoxLayout* createButtonLayout();
 };
 
-#endif // BORNAGAIN_GUI_MAINWINDOW_ABOUTAPPLICATIONDIALOG_H
+#endif // BORNAGAIN_GUI_VIEWS_MAIN_ABOUTAPPLICATIONDIALOG_H
diff --git a/GUI/mainwindow/actionmanager.cpp b/GUI/Views/Main/actionmanager.cpp
similarity index 97%
rename from GUI/mainwindow/actionmanager.cpp
rename to GUI/Views/Main/actionmanager.cpp
index 85da1e1a462ef2a3d6f4386ec628144a684aef17..de27bbbd2595a94cfcdbc33d3cdfde7b3a4498f9 100644
--- a/GUI/mainwindow/actionmanager.cpp
+++ b/GUI/Views/Main/actionmanager.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/mainwindow/actionmanager.cpp
+//! @file      GUI/Views/Main/actionmanager.cpp
 //! @brief     Implements class ActionManager
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,16 +12,16 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/mainwindow/actionmanager.h"
+#include "GUI/Views/Main/actionmanager.h"
 #include "Base/Utils/Assert.h"
 #include "Base/Utils/SysUtils.h"
 #include "GUI/Application/GlobalSettings.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Views/Main/projectmanager.h"
 #include "GUI/Views/JobWidgets/JobView.h"
 #include "GUI/Views/Toplevel/SampleView.h"
-#include "GUI/mainwindow/mainwindow.h"
-#include "GUI/mainwindow/PyImportAssistant.h"
-#include "GUI/mainwindow/aboutapplicationdialog.h"
+#include "GUI/Views/Main/mainwindow.h"
+#include "GUI/Views/Main/PyImportAssistant.h"
+#include "GUI/Views/Main/aboutapplicationdialog.h"
 #include "GUI/Session/SessionData.h"
 #include "GUI/utils/hostosinfo.h"
 #include "GUI/utils/mainwindow_constants.h"
diff --git a/GUI/mainwindow/actionmanager.h b/GUI/Views/Main/actionmanager.h
similarity index 90%
rename from GUI/mainwindow/actionmanager.h
rename to GUI/Views/Main/actionmanager.h
index 8e2772a207ef36f72d909c1a80a22c143bb23a7b..56a4aabdc8f36f349076dd20461e28826fe3bab3 100644
--- a/GUI/mainwindow/actionmanager.h
+++ b/GUI/Views/Main/actionmanager.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/mainwindow/actionmanager.h
+//! @file      GUI/Views/Main/actionmanager.h
 //! @brief     Defines class ActionManager
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_MAINWINDOW_ACTIONMANAGER_H
-#define BORNAGAIN_GUI_MAINWINDOW_ACTIONMANAGER_H
+#ifndef BORNAGAIN_GUI_VIEWS_MAIN_ACTIONMANAGER_H
+#define BORNAGAIN_GUI_VIEWS_MAIN_ACTIONMANAGER_H
 
 #include <QObject>
 
@@ -71,4 +71,4 @@ private:
     void createGlobalShortcuts();
 };
 
-#endif // BORNAGAIN_GUI_MAINWINDOW_ACTIONMANAGER_H
+#endif // BORNAGAIN_GUI_VIEWS_MAIN_ACTIONMANAGER_H
diff --git a/GUI/mainwindow/mainwindow.cpp b/GUI/Views/Main/mainwindow.cpp
similarity index 98%
rename from GUI/mainwindow/mainwindow.cpp
rename to GUI/Views/Main/mainwindow.cpp
index e1296511e5ff650ca23548cf4927a203da80b86e..81971e0b8c843c73e071453d6ad9146620790003 100644
--- a/GUI/mainwindow/mainwindow.cpp
+++ b/GUI/Views/Main/mainwindow.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/mainwindow/mainwindow.cpp
+//! @file      GUI/Views/Main/mainwindow.cpp
 //! @brief     Implements class MainWindow
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,9 +12,9 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/mainwindow/mainwindow.h"
+#include "GUI/Views/Main/mainwindow.h"
 #include "GUI/Application/GlobalSettings.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Views/Main/projectmanager.h"
 #include "GUI/Models/Job/JobModel.h"
 #include "GUI/Session/SessionData.h"
 #include "GUI/Views/InstrumentWidgets/InstrumentView.h"
@@ -25,7 +25,7 @@
 #include "GUI/Views/Toplevel/SessionModelView.h"
 #include "GUI/Views/Toplevel/SimulationView.h"
 #include "GUI/Views/Toplevel/WelcomeView.h"
-#include "GUI/mainwindow/actionmanager.h"
+#include "GUI/Views/Main/actionmanager.h"
 #include "GUI/utils/Helpers.h"
 #include "GUI/utils/hostosinfo.h"
 #include "GUI/utils/mainwindow_constants.h"
diff --git a/GUI/mainwindow/mainwindow.h b/GUI/Views/Main/mainwindow.h
similarity index 94%
rename from GUI/mainwindow/mainwindow.h
rename to GUI/Views/Main/mainwindow.h
index 36af64a96ed197f666bc68272ddc8e699a5aaa14..ddff9ee845c866c2fc7423e6622130d4f6c3c578 100644
--- a/GUI/mainwindow/mainwindow.h
+++ b/GUI/Views/Main/mainwindow.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/mainwindow/mainwindow.h
+//! @file      GUI/Views/Main/mainwindow.h
 //! @brief     Defines class MainWindow
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_MAINWINDOW_MAINWINDOW_H
-#define BORNAGAIN_GUI_MAINWINDOW_MAINWINDOW_H
+#ifndef BORNAGAIN_GUI_VIEWS_MAIN_MAINWINDOW_H
+#define BORNAGAIN_GUI_VIEWS_MAIN_MAINWINDOW_H
 
 #include <QMainWindow>
 
@@ -113,4 +113,4 @@ private:
 
 #define baWin (MainWindow::instance())
 
-#endif // BORNAGAIN_GUI_MAINWINDOW_MAINWINDOW_H
+#endif // BORNAGAIN_GUI_VIEWS_MAIN_MAINWINDOW_H
diff --git a/GUI/mainwindow/newprojectdialog.cpp b/GUI/Views/Main/newprojectdialog.cpp
similarity index 98%
rename from GUI/mainwindow/newprojectdialog.cpp
rename to GUI/Views/Main/newprojectdialog.cpp
index 567549b836a65f4314decbc828c2f41d29f71624..00680944557a37923ca5a19a74c8a8f5aaacf1df 100644
--- a/GUI/mainwindow/newprojectdialog.cpp
+++ b/GUI/Views/Main/newprojectdialog.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/mainwindow/newprojectdialog.cpp
+//! @file      GUI/Views/Main/newprojectdialog.cpp
 //! @brief     Implements class NewProjectDialog
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/mainwindow/newprojectdialog.h"
+#include "GUI/Views/Main/newprojectdialog.h"
 #include "GUI/Application/GlobalSettings.h"
 #include "GUI/Models/Project/projectdocument.h"
 #include <QFileDialog>
diff --git a/GUI/mainwindow/newprojectdialog.h b/GUI/Views/Main/newprojectdialog.h
similarity index 88%
rename from GUI/mainwindow/newprojectdialog.h
rename to GUI/Views/Main/newprojectdialog.h
index ea6a1b7f21e0ddfdc2981840789d347e30b995fa..4c2dd98ea3ca366916ef80d805ab6a50d76d0af7 100644
--- a/GUI/mainwindow/newprojectdialog.h
+++ b/GUI/Views/Main/newprojectdialog.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/mainwindow/newprojectdialog.h
+//! @file      GUI/Views/Main/newprojectdialog.h
 //! @brief     Defines class NewProjectDialog
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_MAINWINDOW_NEWPROJECTDIALOG_H
-#define BORNAGAIN_GUI_MAINWINDOW_NEWPROJECTDIALOG_H
+#ifndef BORNAGAIN_GUI_VIEWS_MAIN_NEWPROJECTDIALOG_H
+#define BORNAGAIN_GUI_VIEWS_MAIN_NEWPROJECTDIALOG_H
 
 #include <QDialog>
 #include <QLineEdit>
@@ -56,4 +56,4 @@ private:
     bool m_valid_projectPath;
 };
 
-#endif // BORNAGAIN_GUI_MAINWINDOW_NEWPROJECTDIALOG_H
+#endif // BORNAGAIN_GUI_VIEWS_MAIN_NEWPROJECTDIALOG_H
diff --git a/GUI/mainwindow/projectmanager.cpp b/GUI/Views/Main/projectmanager.cpp
similarity index 98%
rename from GUI/mainwindow/projectmanager.cpp
rename to GUI/Views/Main/projectmanager.cpp
index a7a824ea6b435996144d16df3d1be807e1988077..d53145445671f28536618ebce6dec383b7bcdb30 100644
--- a/GUI/mainwindow/projectmanager.cpp
+++ b/GUI/Views/Main/projectmanager.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/mainwindow/projectmanager.cpp
+//! @file      GUI/Views/Main/projectmanager.cpp
 //! @brief     Implements class ProjectManager
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,17 +12,17 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Views/Main/projectmanager.h"
 #include "Base/Utils/Assert.h"
 #include "GUI/Application/GlobalSettings.h"
 #include "GUI/Widgets/Info/ProjectLoadProblemDialog.h"
 #include "GUI/Models/Data/ApplicationModels.h"
 #include "GUI/Models/Project/ProjectUtils.h"
 #include "GUI/Models/Project/projectdocument.h"
-#include "GUI/mainwindow/mainwindow.h"
-#include "GUI/mainwindow/SaveService.h"
+#include "GUI/Views/Main/mainwindow.h"
+#include "GUI/Views/Main/SaveService.h"
 #include "GUI/Session/SessionData.h"
-#include "GUI/mainwindow/newprojectdialog.h"
+#include "GUI/Views/Main/newprojectdialog.h"
 #include "GUI/utils/Error.h"
 #include "GUI/utils/GUIHelpers.h"
 #include "GUI/utils/MessageService.h"
diff --git a/GUI/mainwindow/projectmanager.h b/GUI/Views/Main/projectmanager.h
similarity index 93%
rename from GUI/mainwindow/projectmanager.h
rename to GUI/Views/Main/projectmanager.h
index 5fa29dfe31fe1da1baaca6383036a80f95850e45..cc715f8443bd2d5ce5f96dc1f43e20672c80c284 100644
--- a/GUI/mainwindow/projectmanager.h
+++ b/GUI/Views/Main/projectmanager.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/mainwindow/projectmanager.h
+//! @file      GUI/Views/Main/projectmanager.h
 //! @brief     Defines class ProjectManager
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_MAINWINDOW_PROJECTMANAGER_H
-#define BORNAGAIN_GUI_MAINWINDOW_PROJECTMANAGER_H
+#ifndef BORNAGAIN_GUI_VIEWS_MAIN_PROJECTMANAGER_H
+#define BORNAGAIN_GUI_VIEWS_MAIN_PROJECTMANAGER_H
 
 #include "GUI/Models/Project/projectdocument.h"
 #include <QObject>
@@ -99,4 +99,4 @@ private:
     static ProjectManager* s_instance;
 };
 
-#endif // BORNAGAIN_GUI_MAINWINDOW_PROJECTMANAGER_H
+#endif // BORNAGAIN_GUI_VIEWS_MAIN_PROJECTMANAGER_H
diff --git a/GUI/Views/MaskWidgets/MaskEditorCanvas.cpp b/GUI/Views/MaskWidgets/MaskEditorCanvas.cpp
index bd597bf730841d466ba4baa0fc326cfb1c0c94f3..e14f478d7cc80231e6c7c158f028943953a6ab9f 100644
--- a/GUI/Views/MaskWidgets/MaskEditorCanvas.cpp
+++ b/GUI/Views/MaskWidgets/MaskEditorCanvas.cpp
@@ -15,7 +15,7 @@
 #include "GUI/Views/MaskWidgets/MaskEditorCanvas.h"
 #include "GUI/Items/IntensityDataItem.h"
 #include "GUI/Items/MaskItems.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Views/Main/projectmanager.h"
 #include "GUI/Views/IntensityDataWidgets/ColorMap.h"
 #include "GUI/Views/IntensityDataWidgets/PlotStatusLabel.h"
 #include "GUI/Views/IntensityDataWidgets/SavePlotAssistant.h"
diff --git a/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp b/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp
index 9ee1499121e69e9c9c86cea9f640f76b10ea345d..9cd0254f6e44ee4cb9e14b84514b2829c3a269da 100644
--- a/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp
+++ b/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp
@@ -23,7 +23,7 @@
 #include "GUI/Models/Sample/SampleModel.h"
 #include "GUI/Models/Project/projectdocument.h"
 #include "GUI/Views/MaterialEditor/MaterialEditorModel.h"
-#include "GUI/mainwindow/mainwindow.h"
+#include "GUI/Views/Main/mainwindow.h"
 #include "GUI/utils/GUIHelpers.h"
 #include "GUI/utils/mainwindow_constants.h"
 #include "ui_MaterialEditorDialog.h"
diff --git a/GUI/Views/ProjectionsWidgets/SaveProjectionsAssistant.cpp b/GUI/Views/ProjectionsWidgets/SaveProjectionsAssistant.cpp
index d5d8f2ed379a018b44a527077f3a14f34f9ba031..0ac51c564a20a0fb14aaa014a62b865d914e5930 100644
--- a/GUI/Views/ProjectionsWidgets/SaveProjectionsAssistant.cpp
+++ b/GUI/Views/ProjectionsWidgets/SaveProjectionsAssistant.cpp
@@ -20,7 +20,7 @@
 #include "GUI/Items/IntensityDataItem.h"
 #include "GUI/Items/MaskItems.h"
 #include "GUI/Items/ProjectionItems.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Views/Main/projectmanager.h"
 #include "GUI/utils/Error.h"
 #include <QFileDialog>
 #include <QTextStream>
diff --git a/GUI/Views/PropertyEditor/CustomEditors.cpp b/GUI/Views/PropertyEditor/CustomEditors.cpp
index a225034b3f1fa2c11551d44495f70a57b9168b64..7c400acdf87a78a89ecf1f060eb40fd672ecab5b 100644
--- a/GUI/Views/PropertyEditor/CustomEditors.cpp
+++ b/GUI/Views/PropertyEditor/CustomEditors.cpp
@@ -18,7 +18,7 @@
 #include "GUI/Widgets/Common/ScientificSpinBox.h"
 #include "GUI/Items/MaterialItemUtils.h"
 #include "GUI/Session/SessionData.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Views/Main/projectmanager.h"
 #include "GUI/Models/Group/ComboProperty.h"
 #include "GUI/Views/MaterialEditor/MaterialEditorDialog.h"
 #include "GUI/utils/CustomEventFilters.h"
diff --git a/GUI/Views/RealSpaceWidgets/RealSpaceCanvas.cpp b/GUI/Views/RealSpaceWidgets/RealSpaceCanvas.cpp
index 9da5431cd65ddca16f8c96155dbd6089e716e513..6a349c3a688df8edc87aea46efee89881fea564e 100644
--- a/GUI/Views/RealSpaceWidgets/RealSpaceCanvas.cpp
+++ b/GUI/Views/RealSpaceWidgets/RealSpaceCanvas.cpp
@@ -16,7 +16,7 @@
 #include "GUI/Application/GlobalSettings.h"
 #include "GUI/Widgets/Info/CautionSign.h"
 #include "GUI/Items/SessionItemUtils.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Views/Main/projectmanager.h"
 #include "GUI/Models/Parameter/FilterPropertyProxy.h"
 #include "GUI/Models/Sample/SampleModel.h"
 #include "GUI/Views/RealSpaceWidgets/RealSpaceBuilder.h"
diff --git a/GUI/Views/SpecularDataWidgets/SpecularDataCanvas.cpp b/GUI/Views/SpecularDataWidgets/SpecularDataCanvas.cpp
index 9386ff6aad7260e2382bb223cf4cc087e89283f2..f1b1f8d5d30161a01de3ac9ecf5c0874a80ade6d 100644
--- a/GUI/Views/SpecularDataWidgets/SpecularDataCanvas.cpp
+++ b/GUI/Views/SpecularDataWidgets/SpecularDataCanvas.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/Views/SpecularDataWidgets/SpecularDataCanvas.h"
 #include "GUI/Items/SpecularDataItem.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Views/Main/projectmanager.h"
 #include "GUI/Views/IntensityDataWidgets/SavePlotAssistant.h"
 #include "GUI/Views/SpecularDataWidgets/SpecularPlotCanvas.h"
 #include <qcustomplot.h>
diff --git a/GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.cpp b/GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.cpp
index d9979b713bb69ada9ed196416a99ffbbb611917e..bbcb5e7a97f8f694ccb061f5921ffb69b3d7b238 100644
--- a/GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.cpp
+++ b/GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.cpp
@@ -20,7 +20,7 @@
 #include "GUI/Models/Data/AbstractDataLoaderResultModel.h"
 #include "GUI/Models/Data/DataLoaders1D.h"
 #include "GUI/Views/Loaders/DataLoaderUtil.h"
-#include "GUI/mainwindow/mainwindow.h"
+#include "GUI/Views/Main/mainwindow.h"
 #include "ui_SpecularDataImportWidget.h"
 #include <QAction>
 #include <QBoxLayout>
diff --git a/GUI/Views/Toplevel/ImportDataView.cpp b/GUI/Views/Toplevel/ImportDataView.cpp
index 9659bf847a0aab44d43f9557300d4bdcf4ef79dc..cd723d635be84ac1f79cc60c096222fe13599007 100644
--- a/GUI/Views/Toplevel/ImportDataView.cpp
+++ b/GUI/Views/Toplevel/ImportDataView.cpp
@@ -17,7 +17,7 @@
 #include "GUI/Models/Data/RealDataModel.h"
 #include "GUI/Models/Project/projectdocument.h"
 #include "GUI/Views/ImportDataWidgets/RealDataSelectorWidget.h"
-#include "GUI/mainwindow/mainwindow.h"
+#include "GUI/Views/Main/mainwindow.h"
 #include "GUI/utils/mainwindow_constants.h"
 #include <QAction>
 #include <QSplitter>
diff --git a/GUI/Views/Toplevel/SampleView.cpp b/GUI/Views/Toplevel/SampleView.cpp
index 0ac036c7a08173f72db060e5cbccd64376cb6367..498d606533c427577297e18087f1f45c48b67307 100644
--- a/GUI/Views/Toplevel/SampleView.cpp
+++ b/GUI/Views/Toplevel/SampleView.cpp
@@ -27,7 +27,7 @@
 #include "GUI/Views/SampleDesigner/SampleToolBox.h"
 #include "GUI/Views/SampleDesigner/SampleTreeWidget.h"
 #include "GUI/Views/SampleDesigner/ScriptPanel.h"
-#include "GUI/mainwindow/mainwindow.h"
+#include "GUI/Views/Main/mainwindow.h"
 
 #include <QBoxLayout>
 #include <QDockWidget>
diff --git a/GUI/Views/Toplevel/SessionModelView.cpp b/GUI/Views/Toplevel/SessionModelView.cpp
index 8de65fa7014f7ae21b702e734c807123f467f742..d9568a1c718721160246d5a1e069e86e1cb83e07 100644
--- a/GUI/Views/Toplevel/SessionModelView.cpp
+++ b/GUI/Views/Toplevel/SessionModelView.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/Views/Toplevel/SessionModelView.h"
 #include "GUI/Widgets/Common/ModelTreeView.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Views/Main/projectmanager.h"
 #include "GUI/Models/Data/RealDataModel.h"
 #include "GUI/Models/Instrument/InstrumentModel.h"
 #include "GUI/Models/Job/JobModel.h"
@@ -22,7 +22,7 @@
 #include "GUI/Models/Sample/SampleModel.h"
 #include "GUI/Views/PropertyEditor/SessionModelDelegate.h"
 #include "GUI/Views/Toplevel/TestView.h"
-#include "GUI/mainwindow/mainwindow.h"
+#include "GUI/Views/Main/mainwindow.h"
 #include <QToolBar>
 #include <QToolButton>
 #include <QVBoxLayout>
diff --git a/GUI/Views/Toplevel/SimulationView.cpp b/GUI/Views/Toplevel/SimulationView.cpp
index cf7b38bf14f78a9e28246c69f6136671f2945e74..e84d14176bf3efd5173a06611878594f2f96619f 100644
--- a/GUI/Views/Toplevel/SimulationView.cpp
+++ b/GUI/Views/Toplevel/SimulationView.cpp
@@ -30,8 +30,8 @@
 #include "GUI/Models/Project/projectdocument.h"
 #include "GUI/Views/SampleDesigner/GroupBoxCollapser.h"
 #include "GUI/Views/SimulationWidgets/PythonScriptWidget.h"
-#include "GUI/mainwindow/projectmanager.h"
-#include "GUI/mainwindow/mainwindow.h"
+#include "GUI/Views/Main/projectmanager.h"
+#include "GUI/Views/Main/mainwindow.h"
 #include "ui_SimulationView.h"
 #include <QButtonGroup>
 #include <QMessageBox>
diff --git a/GUI/Views/Toplevel/TestView.cpp b/GUI/Views/Toplevel/TestView.cpp
index 2b7314b68fabb8ccb53d9a7da16e272ce030c811..8b68fef812144375a1df346df7994a0217fcd167 100644
--- a/GUI/Views/Toplevel/TestView.cpp
+++ b/GUI/Views/Toplevel/TestView.cpp
@@ -23,7 +23,7 @@
 #include "GUI/Views/PropertyEditor/TestComponentView.h"
 #include "GUI/Views/RealSpaceWidgets/RealSpaceWidget.h"
 #include "GUI/Views/SpecularDataWidgets/Plot1DCanvas.h"
-#include "GUI/mainwindow/mainwindow.h"
+#include "GUI/Views/Main/mainwindow.h"
 
 #include <qAccordion/contentpane.h>
 
diff --git a/GUI/Views/Toplevel/WelcomeView.cpp b/GUI/Views/Toplevel/WelcomeView.cpp
index ba2e47d512d0c85f862c9eee2f98808db709e37d..cb180785029265b36edfeceaabb1afe0ec365550 100644
--- a/GUI/Views/Toplevel/WelcomeView.cpp
+++ b/GUI/Views/Toplevel/WelcomeView.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Views/Toplevel/WelcomeView.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Views/Main/projectmanager.h"
 #include "GUI/Views/SampleDesigner/GroupBoxCollapser.h"
 #include "GUI/utils/LayoutUtils.h"
 #include "GUI/utils/qstringutils.h"
diff --git a/Tests/Unit/GUI/TestSaveService.cpp b/Tests/Unit/GUI/TestSaveService.cpp
index 4a61dbc8a68327d7031eded7f057da090450f156..8253a150906650d780795f683932cea9385363d6 100644
--- a/Tests/Unit/GUI/TestSaveService.cpp
+++ b/Tests/Unit/GUI/TestSaveService.cpp
@@ -7,8 +7,8 @@
 #include "GUI/Models/Instrument/InstrumentModel.h"
 #include "GUI/Models/Project/ProjectUtils.h"
 #include "GUI/Models/Project/projectdocument.h"
-#include "GUI/mainwindow/AutosaveController.h"
-#include "GUI/mainwindow/SaveService.h"
+#include "GUI/Views/Main/AutosaveController.h"
+#include "GUI/Views/Main/SaveService.h"
 #include "GUI/utils/Error.h"
 #include "GUI/utils/Helpers.h"
 #include "Tests/GTestWrapper/google_test.h"