diff --git a/GUI/CMakeLists.txt b/GUI/CMakeLists.txt
index b3c69226510222d4bedf8ed1a6c6552c57bcd243..0a48b013dc3c03410b8d00c6fe2cc4ae7cf29f64 100644
--- a/GUI/CMakeLists.txt
+++ b/GUI/CMakeLists.txt
@@ -37,6 +37,7 @@ set(include_dirs
${CMAKE_CURRENT_SOURCE_DIR}/Views/CommonWidgets
${CMAKE_CURRENT_SOURCE_DIR}/Views/RealSpaceWidgets
${CMAKE_CURRENT_SOURCE_DIR}/Views/SpecularDataWidgets
+ ${CMAKE_CURRENT_SOURCE_DIR}/Views/Tools
)
set(source_files)
diff --git a/GUI/Views/CommonWidgets/InfoPanelToolBar.h b/GUI/Views/CommonWidgets/InfoPanelToolBar.h
index f59f5a4be241a30e577ef6123407158d9f313af0..bca753304a516a35a402b675ea18abc2a3e6b814 100644
--- a/GUI/Views/CommonWidgets/InfoPanelToolBar.h
+++ b/GUI/Views/CommonWidgets/InfoPanelToolBar.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_INFOPANELTOOLBAR_H
#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_INFOPANELTOOLBAR_H
-#include "GUI/mainwindow/StyledToolBar.h"
+#include "GUI/Views/CommonWidgets/StyledToolBar.h"
class QAction;
diff --git a/GUI/Views/CommonWidgets/ItemComboToolBar.h b/GUI/Views/CommonWidgets/ItemComboToolBar.h
index 5912b31ae979502f36e70f0030faa31d3e0fa944..5d99cc915061e0378c8ab229f7a67171e4281d47 100644
--- a/GUI/Views/CommonWidgets/ItemComboToolBar.h
+++ b/GUI/Views/CommonWidgets/ItemComboToolBar.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_ITEMCOMBOTOOLBAR_H
#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_ITEMCOMBOTOOLBAR_H
-#include "GUI/mainwindow/StyledToolBar.h"
+#include "GUI/Views/CommonWidgets/StyledToolBar.h"
#include <QList>
class QAction;
diff --git a/GUI/Views/CommonWidgets/ItemSelectorWidget.cpp b/GUI/Views/CommonWidgets/ItemSelectorWidget.cpp
index c40f9b3368c9a7d29e0aa1949d7063936afd2693..9d5ea2747144441bb5d6d375e27bad70f575520e 100644
--- a/GUI/Views/CommonWidgets/ItemSelectorWidget.cpp
+++ b/GUI/Views/CommonWidgets/ItemSelectorWidget.cpp
@@ -15,7 +15,7 @@
#include "GUI/Views/CommonWidgets/ItemSelectorWidget.h"
#include "GUI/Models/SessionDecorationModel.h"
#include "GUI/Models/SessionModel.h"
-#include "GUI/mainwindow/mainwindow_constants.h"
+#include "GUI/Views/Tools/mainwindow_constants.h"
#include <QListView>
#include <QVBoxLayout>
diff --git a/GUI/mainwindow/StyledToolBar.cpp b/GUI/Views/CommonWidgets/StyledToolBar.cpp
similarity index 93%
rename from GUI/mainwindow/StyledToolBar.cpp
rename to GUI/Views/CommonWidgets/StyledToolBar.cpp
index 0e6cae7fae258d3000893dea5229a1af9dfc36f2..f85239b0759381b1a1179c50acca8b7644d1ff12 100644
--- a/GUI/mainwindow/StyledToolBar.cpp
+++ b/GUI/Views/CommonWidgets/StyledToolBar.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/mainwindow/StyledToolBar.cpp
+//! @file GUI/Views/CommonWidgets/StyledToolBar.cpp
//! @brief Implements class StyledToolBar
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/mainwindow/StyledToolBar.h"
+#include "GUI/Views/CommonWidgets/StyledToolBar.h"
#include <QLabel>
#include <QStyle>
diff --git a/GUI/mainwindow/StyledToolBar.h b/GUI/Views/CommonWidgets/StyledToolBar.h
similarity index 80%
rename from GUI/mainwindow/StyledToolBar.h
rename to GUI/Views/CommonWidgets/StyledToolBar.h
index f721bbac5acfd62ff62bd51055dd3e33bf06357c..69374bc093ae2903649fe88d91275c4bf553ed2a 100644
--- a/GUI/mainwindow/StyledToolBar.h
+++ b/GUI/Views/CommonWidgets/StyledToolBar.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/mainwindow/StyledToolBar.h
+//! @file GUI/Views/CommonWidgets/StyledToolBar.h
//! @brief Defines class StyledToolBar
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MAINWINDOW_STYLEDTOOLBAR_H
-#define BORNAGAIN_GUI_MAINWINDOW_STYLEDTOOLBAR_H
+#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_STYLEDTOOLBAR_H
+#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_STYLEDTOOLBAR_H
#include <QToolBar>
@@ -32,4 +32,4 @@ protected:
void contextMenuEvent(QContextMenuEvent*);
};
-#endif // BORNAGAIN_GUI_MAINWINDOW_STYLEDTOOLBAR_H
+#endif // BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_STYLEDTOOLBAR_H
diff --git a/GUI/mainwindow/tooltipdatabase.cpp b/GUI/Views/CommonWidgets/tooltipdatabase.cpp
similarity index 96%
rename from GUI/mainwindow/tooltipdatabase.cpp
rename to GUI/Views/CommonWidgets/tooltipdatabase.cpp
index 9f594cf8aeebfd52ebce0dbcbe46ba4dc9c0ca99..560ac207420548659c6e961ad2a38935037852c7 100644
--- a/GUI/mainwindow/tooltipdatabase.cpp
+++ b/GUI/Views/CommonWidgets/tooltipdatabase.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/mainwindow/tooltipdatabase.cpp
+//! @file GUI/Views/CommonWidgets/tooltipdatabase.cpp
//! @brief Implements class ToolTipDataBase
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/mainwindow/tooltipdatabase.h"
+#include "GUI/Views/CommonWidgets/tooltipdatabase.h"
#include "Base/Utils/Assert.h"
#include "GUI/Models/Error.h"
#include <QFile>
@@ -57,7 +57,7 @@ QString ToolTipDataBase::widgetboxToolTip(const QString& className)
void ToolTipDataBase::initDataBase()
{
- QFile file(":/mainwindow/tooltips.xml");
+ QFile file(":/Views/CommonWidgets/tooltips.xml");
if (!file.open(QIODevice::ReadOnly))
throw Error(file.errorString());
diff --git a/GUI/mainwindow/tooltipdatabase.h b/GUI/Views/CommonWidgets/tooltipdatabase.h
similarity index 85%
rename from GUI/mainwindow/tooltipdatabase.h
rename to GUI/Views/CommonWidgets/tooltipdatabase.h
index df104850fc5eddf6ced1bba7906c30f226f49238..9a78b772a115ab37c0b9fc0bbb41747178237d76 100644
--- a/GUI/mainwindow/tooltipdatabase.h
+++ b/GUI/Views/CommonWidgets/tooltipdatabase.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/mainwindow/tooltipdatabase.h
+//! @file GUI/Views/CommonWidgets/tooltipdatabase.h
//! @brief Defines class ToolTipDataBase
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MAINWINDOW_TOOLTIPDATABASE_H
-#define BORNAGAIN_GUI_MAINWINDOW_TOOLTIPDATABASE_H
+#ifndef BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_TOOLTIPDATABASE_H
+#define BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_TOOLTIPDATABASE_H
#include <QMap>
#include <QObject>
@@ -41,4 +41,4 @@ private:
static QMap<QString, QString> m_tagToToolTip;
};
-#endif // BORNAGAIN_GUI_MAINWINDOW_TOOLTIPDATABASE_H
+#endif // BORNAGAIN_GUI_VIEWS_COMMONWIDGETS_TOOLTIPDATABASE_H
diff --git a/GUI/mainwindow/tooltips.xml b/GUI/Views/CommonWidgets/tooltips.xml
similarity index 100%
rename from GUI/mainwindow/tooltips.xml
rename to GUI/Views/CommonWidgets/tooltips.xml
diff --git a/GUI/Views/FitWidgets/FitActivityPanel.cpp b/GUI/Views/FitWidgets/FitActivityPanel.cpp
index 4ceb7f0a91b7997c74430fcb909414e56d50bef6..7a86ef7b8dfbdd692ce4b0443aaa111724291f46 100644
--- a/GUI/Views/FitWidgets/FitActivityPanel.cpp
+++ b/GUI/Views/FitWidgets/FitActivityPanel.cpp
@@ -20,7 +20,7 @@
#include "GUI/Views/FitWidgets/JobMessagePanel.h"
#include "GUI/Views/FitWidgets/JobRealTimeWidget.h"
#include "GUI/Views/FitWidgets/RunFitControlWidget.h"
-#include "GUI/mainwindow/mainwindow_constants.h"
+#include "GUI/Views/Tools/mainwindow_constants.h"
#include <QPushButton>
#include <QVBoxLayout>
diff --git a/GUI/Views/FitWidgets/FitParameterWidget.cpp b/GUI/Views/FitWidgets/FitParameterWidget.cpp
index 7f413f7e18b153600072542e1a4c5da5988cd48c..eeaba7c33fbf880fabc27fec7d2ca8909d22a6f9 100644
--- a/GUI/Views/FitWidgets/FitParameterWidget.cpp
+++ b/GUI/Views/FitWidgets/FitParameterWidget.cpp
@@ -24,7 +24,7 @@
#include "GUI/Views/FitWidgets/ParameterTuningWidget.h"
#include "GUI/Views/InfoWidgets/OverlayLabelController.h"
#include "GUI/Views/SessionModelDelegate.h"
-#include "GUI/mainwindow/mainwindow_constants.h"
+#include "GUI/Views/Tools/mainwindow_constants.h"
#include "GUI/utils/CustomEventFilters.h"
#include <QAction>
#include <QMenu>
diff --git a/GUI/Views/FitWidgets/FitSessionWidget.cpp b/GUI/Views/FitWidgets/FitSessionWidget.cpp
index aff293ab84ac36be699640d7a7128e88dcfc5f76..ac9229333360850f9b3965dbf4e1df512682912b 100644
--- a/GUI/Views/FitWidgets/FitSessionWidget.cpp
+++ b/GUI/Views/FitWidgets/FitSessionWidget.cpp
@@ -19,7 +19,7 @@
#include "GUI/Views/FitWidgets/FitSessionController.h"
#include "GUI/Views/FitWidgets/MinimizerSettingsWidget.h"
#include "GUI/Views/FitWidgets/RunFitControlWidget.h"
-#include "GUI/mainwindow/mainwindow_constants.h"
+#include "GUI/Views/Tools/mainwindow_constants.h"
#include <QTabWidget>
#include <QVBoxLayout>
diff --git a/GUI/Views/FitWidgets/JobMessagePanel.cpp b/GUI/Views/FitWidgets/JobMessagePanel.cpp
index b91bcb38d89d8ef42fb91a8a84fc3d5f766b0287..c88b0c6e1b6800ef7108c81870715abcfc93000f 100644
--- a/GUI/Views/FitWidgets/JobMessagePanel.cpp
+++ b/GUI/Views/FitWidgets/JobMessagePanel.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/FitWidgets/JobMessagePanel.h"
-#include "GUI/mainwindow/mainwindow_constants.h"
+#include "GUI/Views/Tools/mainwindow_constants.h"
#include <QScrollBar>
#include <QStackedWidget>
#include <QTextEdit>
diff --git a/GUI/Views/FitWidgets/JobRealTimeToolBar.h b/GUI/Views/FitWidgets/JobRealTimeToolBar.h
index b4badf4be498b5832a004f048954dad4a353f14d..14c93f65caa32a65cee5a09932d1dfb7930f56f2 100644
--- a/GUI/Views/FitWidgets/JobRealTimeToolBar.h
+++ b/GUI/Views/FitWidgets/JobRealTimeToolBar.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_FITWIDGETS_JOBREALTIMETOOLBAR_H
#define BORNAGAIN_GUI_VIEWS_FITWIDGETS_JOBREALTIMETOOLBAR_H
-#include "GUI/mainwindow/StyledToolBar.h"
+#include "GUI/Views/CommonWidgets/StyledToolBar.h"
class QToolButton;
diff --git a/GUI/Views/FitWidgets/JobRealTimeWidget.cpp b/GUI/Views/FitWidgets/JobRealTimeWidget.cpp
index 5f1b9d4c75dee6edae0be619cdf436062fff4223..4235ff801c11bfc5a112a9d58e52a4ff810f8b3b 100644
--- a/GUI/Views/FitWidgets/JobRealTimeWidget.cpp
+++ b/GUI/Views/FitWidgets/JobRealTimeWidget.cpp
@@ -16,7 +16,7 @@
#include "GUI/Models/JobItem.h"
#include "GUI/Models/JobModel.h"
#include "GUI/Views/FitWidgets/ParameterTuningWidget.h"
-#include "GUI/mainwindow/mainwindow_constants.h"
+#include "GUI/Views/Tools/mainwindow_constants.h"
#include <QVBoxLayout>
namespace {
diff --git a/GUI/Views/FitWidgets/RunFitControlWidget.cpp b/GUI/Views/FitWidgets/RunFitControlWidget.cpp
index 8776a9c034748ee983180160cb666ba39feaaacf..91a5efb4ea417ed08347951d2bf3a822559b5fd8 100644
--- a/GUI/Views/FitWidgets/RunFitControlWidget.cpp
+++ b/GUI/Views/FitWidgets/RunFitControlWidget.cpp
@@ -17,7 +17,7 @@
#include "GUI/Models/JobItem.h"
#include "GUI/Views/CommonWidgets/DesignerHelper.h"
#include "GUI/Views/InfoWidgets/WarningSign.h"
-#include "GUI/mainwindow/mainwindow_constants.h"
+#include "GUI/Views/Tools/mainwindow_constants.h"
#include <QFont>
#include <QHBoxLayout>
#include <QLabel>
diff --git a/GUI/Views/ImportDataView.cpp b/GUI/Views/ImportDataView.cpp
index 1a0855d1b5d039e74efd4e50ecd6000ec51b5095..9a2548bebab2cc9402528392704ea98b3fd8180e 100644
--- a/GUI/Views/ImportDataView.cpp
+++ b/GUI/Views/ImportDataView.cpp
@@ -16,7 +16,7 @@
#include "GUI/Models/RealDataModel.h"
#include "GUI/Views/ImportDataWidgets/RealDataSelectorWidget.h"
#include "GUI/mainwindow/mainwindow.h"
-#include "GUI/mainwindow/mainwindow_constants.h"
+#include "GUI/Views/Tools/mainwindow_constants.h"
#include <QSplitter>
#include <QVBoxLayout>
diff --git a/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp b/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
index 2843086b50b7d47163cac3680038958b8e97683c..c93b88e567d3ef9856483775c1c4b1440f063943 100644
--- a/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
+++ b/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
@@ -23,7 +23,7 @@
#include "GUI/Views/ImportDataWidgets/RealDataPropertiesWidget.h"
#include "GUI/Views/ImportDataWidgets/RealDataTreeModel.h"
#include "GUI/mainwindow/ProjectManagerStore.h"
-#include "GUI/mainwindow/StyledToolBar.h"
+#include "GUI/Views/CommonWidgets/StyledToolBar.h"
#include "GUI/mainwindow/mainwindow.h"
#include "GUI/mainwindow/projectmanager.h"
#include <QApplication>
diff --git a/GUI/Views/InstrumentWidgets/ExtendedDetectorDialog.cpp b/GUI/Views/InstrumentWidgets/ExtendedDetectorDialog.cpp
index 69fe82c4dfec70c8da86e52e18bca767ea61a801..d1086cf642ed6cbe76ed4e708e771c9a2210f365 100644
--- a/GUI/Views/InstrumentWidgets/ExtendedDetectorDialog.cpp
+++ b/GUI/Views/InstrumentWidgets/ExtendedDetectorDialog.cpp
@@ -15,7 +15,7 @@
#include "GUI/Views/InstrumentWidgets/ExtendedDetectorDialog.h"
#include "GUI/Views/InstrumentWidgets/DetectorMaskDelegate.h"
#include "GUI/Views/MaskWidgets/MaskEditor.h"
-#include "GUI/mainwindow/mainwindow_constants.h"
+#include "GUI/Views/Tools/mainwindow_constants.h"
#include "GUI/utils/CustomEventFilters.h"
#include <QPushButton>
#include <QSettings>
diff --git a/GUI/Views/InstrumentWidgets/InstrumentViewToolBar.h b/GUI/Views/InstrumentWidgets/InstrumentViewToolBar.h
index 9e39fd35af2c2013888ef57b6b6d1af3e3cc0e65..190d17e21c460b968f992d775fb33346f374235f 100644
--- a/GUI/Views/InstrumentWidgets/InstrumentViewToolBar.h
+++ b/GUI/Views/InstrumentWidgets/InstrumentViewToolBar.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_INSTRUMENTVIEWTOOLBAR_H
#define BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_INSTRUMENTVIEWTOOLBAR_H
-#include "GUI/mainwindow/StyledToolBar.h"
+#include "GUI/Views/CommonWidgets/StyledToolBar.h"
#include <QList>
class QAction;
diff --git a/GUI/Views/JobWidgets/JobPropertiesWidget.cpp b/GUI/Views/JobWidgets/JobPropertiesWidget.cpp
index 16dce05d415f894ddf04ed4a62f936c8e65b5631..12128c4991c6b18dc07191d9f508578348d35311 100644
--- a/GUI/Views/JobWidgets/JobPropertiesWidget.cpp
+++ b/GUI/Views/JobWidgets/JobPropertiesWidget.cpp
@@ -16,7 +16,7 @@
#include "GUI/Models/JobItem.h"
#include "GUI/Views/CommonWidgets/StyleUtils.h"
#include "GUI/Views/PropertyEditor/ComponentEditor.h"
-#include "GUI/mainwindow/mainwindow_constants.h"
+#include "GUI/Views/Tools/mainwindow_constants.h"
#include <QTabBar>
#include <QTabWidget>
#include <QTextEdit>
diff --git a/GUI/Views/JobWidgets/JobSelectorToolBar.h b/GUI/Views/JobWidgets/JobSelectorToolBar.h
index 5a3be274a27f9bf27fae287065c467bbe9a11d7f..39e1e3f703e7a465b55305a5acb20c7b8255c81e 100644
--- a/GUI/Views/JobWidgets/JobSelectorToolBar.h
+++ b/GUI/Views/JobWidgets/JobSelectorToolBar.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_JOBWIDGETS_JOBSELECTORTOOLBAR_H
#define BORNAGAIN_GUI_VIEWS_JOBWIDGETS_JOBSELECTORTOOLBAR_H
-#include "GUI/mainwindow/StyledToolBar.h"
+#include "GUI/Views/CommonWidgets/StyledToolBar.h"
class QAction;
class QToolButton;
diff --git a/GUI/Views/JobWidgets/JobSelectorWidget.cpp b/GUI/Views/JobWidgets/JobSelectorWidget.cpp
index 16a853fd4d906e90b9bf489a7d141ad66c8e1a35..c05358ac3a023e6463128470fd4e5cba5e65ac36 100644
--- a/GUI/Views/JobWidgets/JobSelectorWidget.cpp
+++ b/GUI/Views/JobWidgets/JobSelectorWidget.cpp
@@ -19,7 +19,7 @@
#include "GUI/Views/JobWidgets/JobPropertiesWidget.h"
#include "GUI/Views/JobWidgets/JobSelectorActions.h"
#include "GUI/Views/JobWidgets/JobSelectorToolBar.h"
-#include "GUI/mainwindow/mainwindow_constants.h"
+#include "GUI/Views/Tools/mainwindow_constants.h"
#include <QHBoxLayout>
#include <QSplitter>
diff --git a/GUI/Views/JobWidgets/JobViewActivities.cpp b/GUI/Views/JobWidgets/JobViewActivities.cpp
index c85303e907f743f688cf0a6769c9851f9a69ed2a..9328dfe78af77c70b9ec622a7ef9bedc58e87ce0 100644
--- a/GUI/Views/JobWidgets/JobViewActivities.cpp
+++ b/GUI/Views/JobWidgets/JobViewActivities.cpp
@@ -14,7 +14,7 @@
#include "GUI/Views/JobWidgets/JobViewActivities.h"
#include "GUI/Models/Error.h"
-#include "GUI/mainwindow/mainwindow_constants.h"
+#include "GUI/Views/Tools/mainwindow_constants.h"
namespace {
JobViewActivities::activity_map_t createActivityMap()
diff --git a/GUI/Views/MaskWidgets/MaskEditorToolBar.cpp b/GUI/Views/MaskWidgets/MaskEditorToolBar.cpp
index f2c2c1570b0824cde440dfeb24c5a488b4d25340..495ae41813897bd1b37b6e78a00143fae96ac900 100644
--- a/GUI/Views/MaskWidgets/MaskEditorToolBar.cpp
+++ b/GUI/Views/MaskWidgets/MaskEditorToolBar.cpp
@@ -15,7 +15,7 @@
#include "GUI/Views/MaskWidgets/MaskEditorToolBar.h"
#include "Base/Utils/Assert.h"
#include "GUI/Views/MaskWidgets/MaskEditorActions.h"
-#include "GUI/mainwindow/mainwindow_constants.h"
+#include "GUI/Views/Tools/mainwindow_constants.h"
#include <QButtonGroup>
#include <QLabel>
#include <QRadioButton>
diff --git a/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp b/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp
index e25d77bc66abfaf87cb135abeea87a5c00469708..b1135d37135446ca070d5bc010bf1c2fb3cb7bb1 100644
--- a/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp
+++ b/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp
@@ -17,7 +17,7 @@
#include "GUI/Models/MaterialModel.h"
#include "GUI/Views/CommonWidgets/StyleUtils.h"
#include "GUI/Views/MaterialEditor/MaterialEditor.h"
-#include "GUI/mainwindow/mainwindow_constants.h"
+#include "GUI/Views/Tools/mainwindow_constants.h"
#include <QAction>
#include <QPushButton>
#include <QSettings>
diff --git a/GUI/Views/ProjectionsWidgets/ProjectionsToolBar.cpp b/GUI/Views/ProjectionsWidgets/ProjectionsToolBar.cpp
index 26553225a500c7a5a85c3ada6af331d1bd08ee4f..ffaffc2605f6c4e845d0fda5238f55df0f7f9492 100644
--- a/GUI/Views/ProjectionsWidgets/ProjectionsToolBar.cpp
+++ b/GUI/Views/ProjectionsWidgets/ProjectionsToolBar.cpp
@@ -14,7 +14,7 @@
#include "GUI/Views/ProjectionsWidgets/ProjectionsToolBar.h"
#include "GUI/Views/ProjectionsWidgets/ProjectionsEditorActions.h"
-#include "GUI/mainwindow/mainwindow_constants.h"
+#include "GUI/Views/Tools/mainwindow_constants.h"
#include <QButtonGroup>
#include <QLabel>
#include <QToolButton>
diff --git a/GUI/Views/RealSpaceWidgets/RealSpaceToolBar.cpp b/GUI/Views/RealSpaceWidgets/RealSpaceToolBar.cpp
index 1e0c21d275f1bc78e98f87d9bdcb3de178da76ea..95248c40ffbd193fab7ceb0294707f7820b18fac 100644
--- a/GUI/Views/RealSpaceWidgets/RealSpaceToolBar.cpp
+++ b/GUI/Views/RealSpaceWidgets/RealSpaceToolBar.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/RealSpaceWidgets/RealSpaceToolBar.h"
-#include "GUI/mainwindow/mainwindow_constants.h"
+#include "GUI/Views/Tools/mainwindow_constants.h"
#include <QCheckBox>
#include <QToolButton>
diff --git a/GUI/Views/RealSpaceWidgets/RealSpaceToolBar.h b/GUI/Views/RealSpaceWidgets/RealSpaceToolBar.h
index 458b13007c53bfcd8cd4aa93cc235763f8c0382e..5366c3756793a827b87773a75e2a3120e665370c 100644
--- a/GUI/Views/RealSpaceWidgets/RealSpaceToolBar.h
+++ b/GUI/Views/RealSpaceWidgets/RealSpaceToolBar.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_REALSPACEWIDGETS_REALSPACETOOLBAR_H
#define BORNAGAIN_GUI_VIEWS_REALSPACEWIDGETS_REALSPACETOOLBAR_H
-#include "GUI/mainwindow/StyledToolBar.h"
+#include "GUI/Views/CommonWidgets/StyledToolBar.h"
class QToolButton;
class QCheckBox;
diff --git a/GUI/Views/SampleDesigner/LayerView.cpp b/GUI/Views/SampleDesigner/LayerView.cpp
index b663809d4942ec2f009ceb7cd2fac056d553b85a..e99e70c84c2f5f527dd8bbffab9fa228bf9ea39c 100644
--- a/GUI/Views/SampleDesigner/LayerView.cpp
+++ b/GUI/Views/SampleDesigner/LayerView.cpp
@@ -17,7 +17,7 @@
#include "GUI/Views/CommonWidgets/DesignerHelper.h"
#include "GUI/Views/SampleDesigner/MultiLayerView.h"
#include "GUI/Views/SampleDesigner/ParticleLayoutView.h"
-#include "GUI/mainwindow/tooltipdatabase.h"
+#include "GUI/Views/CommonWidgets/tooltipdatabase.h"
#include <QPainter>
#include <QStyleOptionGraphicsItem>
diff --git a/GUI/Views/SampleDesigner/SampleToolBar.h b/GUI/Views/SampleDesigner/SampleToolBar.h
index 9798e5cbafc772101a2a63907b399ae51ea819a7..456b56e75ab8de3fedabd7294592c36a0c4e204c 100644
--- a/GUI/Views/SampleDesigner/SampleToolBar.h
+++ b/GUI/Views/SampleDesigner/SampleToolBar.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SAMPLETOOLBAR_H
#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SAMPLETOOLBAR_H
-#include "GUI/mainwindow/StyledToolBar.h"
+#include "GUI/Views/CommonWidgets/StyledToolBar.h"
#include <QTreeView>
class QAction;
diff --git a/GUI/Views/SimulationView.cpp b/GUI/Views/SimulationView.cpp
index e36df010a835255680cff503c503136eab97642c..99878d33bc83b0687630f24ad89ff8de542cafbe 100644
--- a/GUI/Views/SimulationView.cpp
+++ b/GUI/Views/SimulationView.cpp
@@ -14,7 +14,7 @@
#include "GUI/Views/SimulationView.h"
#include "GUI/Views/SimulationWidgets/SimulationSetupWidget.h"
-#include "GUI/mainwindow/StyledToolBar.h"
+#include "GUI/Views/CommonWidgets/StyledToolBar.h"
#include "GUI/mainwindow/mainwindow.h"
#include <QVBoxLayout>
diff --git a/GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.ui b/GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.ui
index a83fb4e0e803b561d13c7ff3ca3a1c25009c835c..6aba9cc673474eaf5fbb6fdf3f36109141e5ad6f 100644
--- a/GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.ui
+++ b/GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.ui
@@ -300,7 +300,7 @@
<customwidget>
<class>StyledToolBar</class>
<extends>QWidget</extends>
- <header>GUI/mainwindow/StyledToolBar.h</header>
+ <header>GUI/Views/CommonWidgets/StyledToolBar.h</header>
<container>1</container>
</customwidget>
</customwidgets>
diff --git a/GUI/mainwindow/mainwindow_constants.h b/GUI/Views/Tools/mainwindow_constants.h
similarity index 90%
rename from GUI/mainwindow/mainwindow_constants.h
rename to GUI/Views/Tools/mainwindow_constants.h
index 990e778a01a23aebfbc475e2849e7a4225cceb8c..72c1123deceb417be6a58136c79871f08baa56ad 100644
--- a/GUI/mainwindow/mainwindow_constants.h
+++ b/GUI/Views/Tools/mainwindow_constants.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/mainwindow/mainwindow_constants.h
+//! @file GUI/Views/Tools/mainwindow_constants.h
//! @brief Defines namespace GUI::Constants
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MAINWINDOW_MAINWINDOW_CONSTANTS_H
-#define BORNAGAIN_GUI_MAINWINDOW_MAINWINDOW_CONSTANTS_H
+#ifndef BORNAGAIN_GUI_VIEWS_TOOLS_MAINWINDOW_CONSTANTS_H
+#define BORNAGAIN_GUI_VIEWS_TOOLS_MAINWINDOW_CONSTANTS_H
#include <QString>
@@ -65,4 +65,4 @@ const int styled_toolbar_height = 25;
} // namespace GUI::Constants
-#endif // BORNAGAIN_GUI_MAINWINDOW_MAINWINDOW_CONSTANTS_H
+#endif // BORNAGAIN_GUI_VIEWS_TOOLS_MAINWINDOW_CONSTANTS_H
diff --git a/GUI/Views/widgetbox/widgetboxcategorylistview.cpp b/GUI/Views/widgetbox/widgetboxcategorylistview.cpp
index e8e55bacbf680682afc93ffc63a8f5b43c4bc6f4..cde05b127c823cb2ce62b76d0c3fd84ba3354d4a 100644
--- a/GUI/Views/widgetbox/widgetboxcategorylistview.cpp
+++ b/GUI/Views/widgetbox/widgetboxcategorylistview.cpp
@@ -41,7 +41,7 @@
#include "GUI/Views/widgetbox/widgetboxcategorylistview.h"
#include "Base/Utils/Assert.h"
-#include "GUI/mainwindow/tooltipdatabase.h"
+#include "GUI/Views/CommonWidgets/tooltipdatabase.h"
#include <QtDesigner/QDesignerFormEditorInterface>
#include <QtDesigner/QDesignerWidgetDataBaseInterface>
diff --git a/GUI/gui.qrc b/GUI/gui.qrc
index f5d890803c8d32c888312f1222709cd67d247826..367f8f5240627a517b8312a6d7a28dc9cea188a9 100644
--- a/GUI/gui.qrc
+++ b/GUI/gui.qrc
@@ -2,7 +2,7 @@
<qresource prefix="/">
<file>images/mode_script.png</file>
<file>images/reset.png</file>
- <file>mainwindow/tooltips.xml</file>
+ <file>Views/CommonWidgets/tooltips.xml</file>
<file>images/treeview-branch-closed.png</file>
<file>images/treeview-branch-end.png</file>
<file>images/treeview-branch-more.png</file>
diff --git a/GUI/mainwindow/actionmanager.cpp b/GUI/mainwindow/actionmanager.cpp
index 5b2ec755c5d7b9864f7cd7204e69a386724dc4c0..a990d815179c79e49422a9bd7f09dbe60d346273 100644
--- a/GUI/mainwindow/actionmanager.cpp
+++ b/GUI/mainwindow/actionmanager.cpp
@@ -20,7 +20,7 @@
#include "GUI/mainwindow/PyImportAssistant.h"
#include "GUI/mainwindow/aboutapplicationdialog.h"
#include "GUI/mainwindow/mainwindow.h"
-#include "GUI/mainwindow/mainwindow_constants.h"
+#include "GUI/Views/Tools/mainwindow_constants.h"
#include "GUI/mainwindow/projectmanager.h"
#include "GUI/utils/hostosinfo.h"
#include "GUI/utils/qstringutils.h"
diff --git a/GUI/mainwindow/mainwindow.cpp b/GUI/mainwindow/mainwindow.cpp
index 29dc3b11881dde02abd0be97aaba6ec09ade6245..883e6ed475914afb336c5a4ebe8d492da01182de 100644
--- a/GUI/mainwindow/mainwindow.cpp
+++ b/GUI/mainwindow/mainwindow.cpp
@@ -24,9 +24,9 @@
#include "GUI/Views/SimulationView.h"
#include "GUI/Views/WelcomeView.h"
#include "GUI/mainwindow/actionmanager.h"
-#include "GUI/mainwindow/mainwindow_constants.h"
+#include "GUI/Views/Tools/mainwindow_constants.h"
#include "GUI/mainwindow/projectmanager.h"
-#include "GUI/mainwindow/tooltipdatabase.h"
+#include "GUI/Views/CommonWidgets/tooltipdatabase.h"
#include "GUI/utils/Helpers.h"
#include "GUI/utils/hostosinfo.h"
#include <QAction>
diff --git a/GUI/mainwindow/projectmanager.cpp b/GUI/mainwindow/projectmanager.cpp
index 9a3d7cb0c5341440f1c58f01dc8fffcdb03cc6d8..eb9d6e069f0b5ec6c2bcdd125fde0765bbeb6954 100644
--- a/GUI/mainwindow/projectmanager.cpp
+++ b/GUI/mainwindow/projectmanager.cpp
@@ -23,7 +23,7 @@
#include "GUI/mainwindow/ProjectUtils.h"
#include "GUI/mainwindow/SaveService.h"
#include "GUI/mainwindow/mainwindow.h"
-#include "GUI/mainwindow/mainwindow_constants.h"
+#include "GUI/Views/Tools/mainwindow_constants.h"
#include "GUI/mainwindow/newprojectdialog.h"
#include "GUI/mainwindow/projectdocument.h"
#include "GUI/utils/MessageService.h"