diff --git a/App/main.cpp b/App/main.cpp
index 42a80b9cbdf62db19175ad579f9cd3a42cd9c9b5..e316ce0c60c61c003634cfb2fc3db1b3d9579d0e 100644
--- a/App/main.cpp
+++ b/App/main.cpp
@@ -16,7 +16,7 @@
 #include "App/MessageHandler.h"
 #include "GUI/Application/GlobalSettings.h"
 #include "GUI/Model/State/SessionData.h"
-#include "GUI/Util/OSInfo.h"
+#include "GUI/View/Tool/OSInfo.h"
 #include "GUI/Util/Path.h"
 #include "GUI/View/Loaders/DataLoaderUtil.h"
 #include "GUI/View/Main/MainWindow.h"
diff --git a/GUI/Util/Path.cpp b/GUI/Util/Path.cpp
index 4a6359147ef2577838e3cfcaf56604327b920454..c37423d0ac4d5ea1211427260a216ba7499cd3a7 100644
--- a/GUI/Util/Path.cpp
+++ b/GUI/Util/Path.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/Util/Path.h"
 #include "BAVersion.h"
-#include "GUI/Util/OSInfo.h"
+#include "GUI/View/Tool/OSInfo.h"
 #include <QDateTime>
 #include <QDir>
 #include <QFileInfo>
diff --git a/GUI/Util/String.cpp b/GUI/Util/String.cpp
index 278c4e8a09f31a3bbb46b4224a7793957727dea3..c0609ad4ff77717770f6a5df46900320395e9da7 100644
--- a/GUI/Util/String.cpp
+++ b/GUI/Util/String.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Util/String.h"
-#include "GUI/Util/OSInfo.h"
+#include "GUI/View/Tool/OSInfo.h"
 #include <QDir>
 
 QStringList GUI::Util::String::fromStdStrings(const std::vector<std::string>& container)
diff --git a/GUI/View/Common/ItemSelectorWidget.cpp b/GUI/View/Common/ItemSelectorWidget.cpp
index a9bd7a3ea44f0bc05ad0ddff9fc8a6303a65c62c..ae2c638f2f29c4370a24297f626567a45316e1ae 100644
--- a/GUI/View/Common/ItemSelectorWidget.cpp
+++ b/GUI/View/Common/ItemSelectorWidget.cpp
@@ -15,7 +15,7 @@
 #include "GUI/View/Common/ItemSelectorWidget.h"
 #include "GUI/Model/Session/SessionDecorationModel.h"
 #include "GUI/Model/Session/SessionModel.h"
-#include "GUI/Util/mainwindow_constants.h"
+#include "GUI/View/Tool/mainwindow_constants.h"
 #include <QListView>
 #include <QVBoxLayout>
 
diff --git a/GUI/View/Fit/FitActivityPanel.cpp b/GUI/View/Fit/FitActivityPanel.cpp
index 45e65e9eeecd2b784d18bf16f88ac91c7dba4646..2acbbab40958803829ce01afbf3946881deb718e 100644
--- a/GUI/View/Fit/FitActivityPanel.cpp
+++ b/GUI/View/Fit/FitActivityPanel.cpp
@@ -15,7 +15,7 @@
 #include "GUI/View/Fit/FitActivityPanel.h"
 #include "GUI/Model/Job/JobItem.h"
 #include "GUI/Model/Job/JobModel.h"
-#include "GUI/Util/mainwindow_constants.h"
+#include "GUI/View/Tool/mainwindow_constants.h"
 #include "GUI/View/Fit/FitSessionController.h"
 #include "GUI/View/Fit/FitSessionManager.h"
 #include "GUI/View/Fit/FitSessionWidget.h"
diff --git a/GUI/View/Fit/FitParameterWidget.cpp b/GUI/View/Fit/FitParameterWidget.cpp
index 7662e1b5a97561e9d2517be5e1013f7dfc74a140..32cf9e20a1676ed116f023a3954c25b1a4604bc6 100644
--- a/GUI/View/Fit/FitParameterWidget.cpp
+++ b/GUI/View/Fit/FitParameterWidget.cpp
@@ -21,7 +21,7 @@
 #include "GUI/Model/Group/FilterPropertyProxy.h"
 #include "GUI/Model/Job/JobItem.h"
 #include "GUI/Model/Job/JobModel.h"
-#include "GUI/Util/mainwindow_constants.h"
+#include "GUI/View/Tool/mainwindow_constants.h"
 #include "GUI/View/Fit/ParameterTuningWidget.h"
 #include "GUI/View/Info/OverlayLabelController.h"
 #include "GUI/View/PropertyEditor/CustomEventFilters.h"
diff --git a/GUI/View/Fit/FitSessionWidget.cpp b/GUI/View/Fit/FitSessionWidget.cpp
index e68f369148431e221e950f5386d6a314af6e10cb..b5916024e1bbc359420eacf98dfb917a6a289806 100644
--- a/GUI/View/Fit/FitSessionWidget.cpp
+++ b/GUI/View/Fit/FitSessionWidget.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/View/Fit/FitSessionWidget.h"
 #include "GUI/Model/Job/JobItem.h"
-#include "GUI/Util/mainwindow_constants.h"
+#include "GUI/View/Tool/mainwindow_constants.h"
 #include "GUI/View/Fit/FitParameterWidget.h"
 #include "GUI/View/Fit/FitResultsWidget.h"
 #include "GUI/View/Fit/FitSessionController.h"
diff --git a/GUI/View/Fit/JobMessagePanel.cpp b/GUI/View/Fit/JobMessagePanel.cpp
index 7d2f5c9a06942ce77211c2acafa303648f025a3c..3780bd99ead706f0f54968182db616ef089d8937 100644
--- a/GUI/View/Fit/JobMessagePanel.cpp
+++ b/GUI/View/Fit/JobMessagePanel.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/View/Fit/JobMessagePanel.h"
-#include "GUI/Util/mainwindow_constants.h"
+#include "GUI/View/Tool/mainwindow_constants.h"
 #include <QScrollBar>
 #include <QStackedWidget>
 #include <QTextEdit>
diff --git a/GUI/View/Fit/JobRealTimeWidget.cpp b/GUI/View/Fit/JobRealTimeWidget.cpp
index fab732a7d0b379896ab651f324916329f9c3cb63..940d2b2e35550ad500dcafb90db4cc3a78d29bdd 100644
--- a/GUI/View/Fit/JobRealTimeWidget.cpp
+++ b/GUI/View/Fit/JobRealTimeWidget.cpp
@@ -15,7 +15,7 @@
 #include "GUI/View/Fit/JobRealTimeWidget.h"
 #include "GUI/Model/Job/JobItem.h"
 #include "GUI/Model/Job/JobModel.h"
-#include "GUI/Util/mainwindow_constants.h"
+#include "GUI/View/Tool/mainwindow_constants.h"
 #include "GUI/View/Fit/ParameterTuningWidget.h"
 #include <QVBoxLayout>
 
diff --git a/GUI/View/Fit/RunFitControlWidget.cpp b/GUI/View/Fit/RunFitControlWidget.cpp
index 06ff242acfbfd3d3bed8a56ae1bbb2ad892e2908..ddabdf21d83f20e15558555ac57dd14fa9a79ed8 100644
--- a/GUI/View/Fit/RunFitControlWidget.cpp
+++ b/GUI/View/Fit/RunFitControlWidget.cpp
@@ -15,7 +15,7 @@
 #include "GUI/View/Fit/RunFitControlWidget.h"
 #include "GUI/Model/Fit/FitSuiteItem.h"
 #include "GUI/Model/Job/JobItem.h"
-#include "GUI/Util/mainwindow_constants.h"
+#include "GUI/View/Tool/mainwindow_constants.h"
 #include "GUI/View/Info/CautionSign.h"
 #include "GUI/View/Tool/DesignerHelper.h"
 #include <QFont>
diff --git a/GUI/View/Import/ImportDataView.cpp b/GUI/View/Import/ImportDataView.cpp
index 2f8b0085c0e31bb912510e4cd596f7b213f7aed7..62169e3659b968dcb3d8068a475e2b6138a65274 100644
--- a/GUI/View/Import/ImportDataView.cpp
+++ b/GUI/View/Import/ImportDataView.cpp
@@ -16,7 +16,7 @@
 #include "GUI/Model/Data/RealDataItem.h"
 #include "GUI/Model/Data/RealDataModel.h"
 #include "GUI/Model/Project/ProjectDocument.h"
-#include "GUI/Util/mainwindow_constants.h"
+#include "GUI/View/Tool/mainwindow_constants.h"
 #include "GUI/View/Import/RealDataSelectorWidget.h"
 #include <QAction>
 #include <QSplitter>
diff --git a/GUI/View/Instrument/Detail/detailsbutton.cpp b/GUI/View/Instrument/Detail/detailsbutton.cpp
index 012cf13d86060df304f4ae2f5ca13b38663f101b..9b245e5adad241ec41839c0ff78c639bbddebfde 100644
--- a/GUI/View/Instrument/Detail/detailsbutton.cpp
+++ b/GUI/View/Instrument/Detail/detailsbutton.cpp
@@ -24,7 +24,7 @@
 ****************************************************************************/
 
 #include "GUI/View/Instrument/Detail/detailsbutton.h"
-#include "GUI/Util/OSInfo.h"
+#include "GUI/View/Tool/OSInfo.h"
 
 #include <QGraphicsOpacityEffect>
 #include <QPaintEvent>
diff --git a/GUI/View/Instrument/Detail/detailswidget.cpp b/GUI/View/Instrument/Detail/detailswidget.cpp
index ae2c83a5d1407f24c2f3028dd6ee59841f9f92ca..8ecd1338c48f588f1a153f2dcdd2a119246b14fc 100644
--- a/GUI/View/Instrument/Detail/detailswidget.cpp
+++ b/GUI/View/Instrument/Detail/detailswidget.cpp
@@ -24,7 +24,7 @@
 ****************************************************************************/
 
 #include "GUI/View/Instrument/Detail/detailswidget.h"
-#include "GUI/Util/OSInfo.h"
+#include "GUI/View/Tool/OSInfo.h"
 #include "GUI/View/Instrument/Detail/detailsbutton.h"
 
 #include <QApplication>
diff --git a/GUI/View/Instrument/InstrumentLibraryEditor.cpp b/GUI/View/Instrument/InstrumentLibraryEditor.cpp
index 3a9ac22cbc5c7f4822368b0c8a0ffc05bbb883e1..9ca14059f8e454ce39621dce178ea471f1880033 100644
--- a/GUI/View/Instrument/InstrumentLibraryEditor.cpp
+++ b/GUI/View/Instrument/InstrumentLibraryEditor.cpp
@@ -16,7 +16,7 @@
 #include "GUI/Application/GlobalSettings.h"
 #include "GUI/Model/Instrument/InstrumentItems.h"
 #include "GUI/Model/State/SessionData.h"
-#include "GUI/Util/ItemDelegateForHTML.h"
+#include "GUI/View/Tool/ItemDelegateForHTML.h"
 #include "GUI/View/Common/ItemViewOverlayButtons.h"
 #include "GUI/View/Instrument/Detail/CreateDetails.h"
 #include "GUI/View/Tool/StyleUtils.h"
diff --git a/GUI/View/Job/JobPropertiesWidget.cpp b/GUI/View/Job/JobPropertiesWidget.cpp
index e0555271737601a75033e675826781641831c59a..0c003b926232c20d7c2561434757fd3fbe9e8805 100644
--- a/GUI/View/Job/JobPropertiesWidget.cpp
+++ b/GUI/View/Job/JobPropertiesWidget.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/View/Job/JobPropertiesWidget.h"
 #include "GUI/Model/Job/JobItem.h"
-#include "GUI/Util/mainwindow_constants.h"
+#include "GUI/View/Tool/mainwindow_constants.h"
 #include "GUI/View/Job/JobPropertiesTableModel.h"
 #include "GUI/View/Tool/StyleUtils.h"
 #include <QTabBar>
diff --git a/GUI/View/Job/JobSelectorWidget.cpp b/GUI/View/Job/JobSelectorWidget.cpp
index a1f1ed522fc2fedef185decd49eff33e8c66748a..2b1b6eb8fb6422d010ebbfdf50e158a1d7505787 100644
--- a/GUI/View/Job/JobSelectorWidget.cpp
+++ b/GUI/View/Job/JobSelectorWidget.cpp
@@ -15,7 +15,7 @@
 #include "GUI/View/Job/JobSelectorWidget.h"
 #include "Base/Utils/Assert.h"
 #include "GUI/Model/Job/JobItem.h"
-#include "GUI/Util/mainwindow_constants.h"
+#include "GUI/View/Tool/mainwindow_constants.h"
 #include "GUI/View/Job/JobListView.h"
 #include "GUI/View/Job/JobPropertiesWidget.h"
 #include <QSplitter>
diff --git a/GUI/View/Job/JobViewActivities.cpp b/GUI/View/Job/JobViewActivities.cpp
index ffc4fc46de74a4d7ac29a6af24656d44f31309bf..769eea7fcb92a4618353de49f7db774ba9fabbab 100644
--- a/GUI/View/Job/JobViewActivities.cpp
+++ b/GUI/View/Job/JobViewActivities.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/View/Job/JobViewActivities.h"
 #include "Base/Utils/Assert.h"
-#include "GUI/Util/mainwindow_constants.h"
+#include "GUI/View/Tool/mainwindow_constants.h"
 
 namespace {
 QMap<JobViewActivity, QVector<JobViewFlags::Dock>> createActivityMap()
diff --git a/GUI/View/Main/ActionManager.cpp b/GUI/View/Main/ActionManager.cpp
index 6c95c166dbe35cf1d259e5084100bbfd95cc63c0..7bea79deb62fa7cae97d2c1a658c1115977c6dfd 100644
--- a/GUI/View/Main/ActionManager.cpp
+++ b/GUI/View/Main/ActionManager.cpp
@@ -17,9 +17,9 @@
 #include "Base/Utils/SysUtils.h"
 #include "GUI/Application/GlobalSettings.h"
 #include "GUI/Model/State/SessionData.h"
-#include "GUI/Util/OSInfo.h"
+#include "GUI/View/Tool/OSInfo.h"
 #include "GUI/Util/Path.h"
-#include "GUI/Util/mainwindow_constants.h"
+#include "GUI/View/Tool/mainwindow_constants.h"
 #include "GUI/View/Job/JobView.h"
 #include "GUI/View/Main/AboutDialog.h"
 #include "GUI/View/Main/MainWindow.h"
diff --git a/GUI/View/Main/MainWindow.cpp b/GUI/View/Main/MainWindow.cpp
index 52265bd3fd72654503245c10a0d70b87c5a0d546..94f2867f0268d6b82df128016a1957170300b33a 100644
--- a/GUI/View/Main/MainWindow.cpp
+++ b/GUI/View/Main/MainWindow.cpp
@@ -16,9 +16,9 @@
 #include "GUI/Application/GlobalSettings.h"
 #include "GUI/Model/Job/JobModel.h"
 #include "GUI/Model/State/SessionData.h"
-#include "GUI/Util/OSInfo.h"
+#include "GUI/View/Tool/OSInfo.h"
 #include "GUI/Util/Path.h"
-#include "GUI/Util/mainwindow_constants.h"
+#include "GUI/View/Tool/mainwindow_constants.h"
 #include "GUI/View/Import/ImportDataView.h"
 #include "GUI/View/Instrument/InstrumentView.h"
 #include "GUI/View/Job/JobView.h"
diff --git a/GUI/View/Main/ProjectManager.cpp b/GUI/View/Main/ProjectManager.cpp
index 7326942bee1da923636a1ac42856949a86354940..77c97e8a9800f01ee56571e97f7d41ab1680081d 100644
--- a/GUI/View/Main/ProjectManager.cpp
+++ b/GUI/View/Main/ProjectManager.cpp
@@ -20,7 +20,7 @@
 #include "GUI/Model/State/SessionData.h"
 #include "GUI/Util/Error.h"
 #include "GUI/Util/MessageService.h"
-#include "GUI/Util/mainwindow_constants.h"
+#include "GUI/View/Tool/mainwindow_constants.h"
 #include "GUI/View/Info/ProjectLoadProblemDialog.h"
 #include "GUI/View/Main/MainWindow.h"
 #include "GUI/View/Main/NewProjectDialog.h"
diff --git a/GUI/View/Mask/MaskEditorToolBar.cpp b/GUI/View/Mask/MaskEditorToolBar.cpp
index dee68f3614df54e7af52ea41150bdf9a4653a537..8945717bd48a6a9fc1b31c57eca05e5741e9c95b 100644
--- a/GUI/View/Mask/MaskEditorToolBar.cpp
+++ b/GUI/View/Mask/MaskEditorToolBar.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/View/Mask/MaskEditorToolBar.h"
 #include "Base/Utils/Assert.h"
-#include "GUI/Util/mainwindow_constants.h"
+#include "GUI/View/Tool/mainwindow_constants.h"
 #include "GUI/View/Mask/MaskEditorActions.h"
 #include <QButtonGroup>
 #include <QLabel>
diff --git a/GUI/View/MaterialEditor/MaterialEditorDialog.cpp b/GUI/View/MaterialEditor/MaterialEditorDialog.cpp
index 39b001ca1111b1c1aa48648e4f5abca4dfa6dc63..e4fc16cd5f3c5114781169321be1fc33369441c1 100644
--- a/GUI/View/MaterialEditor/MaterialEditorDialog.cpp
+++ b/GUI/View/MaterialEditor/MaterialEditorDialog.cpp
@@ -22,7 +22,7 @@
 #include "GUI/Model/Sample/ItemWithMaterial.h"
 #include "GUI/Model/Sample/SampleModel.h"
 #include "GUI/Model/Types/VectorItem.h"
-#include "GUI/Util/mainwindow_constants.h"
+#include "GUI/View/Tool/mainwindow_constants.h"
 #include "GUI/View/MaterialEditor/MaterialEditorModel.h"
 #include "GUI/View/Tool/EditUtil.h"
 #include "GUI/View/Tool/StyleUtils.h"
diff --git a/GUI/View/Projection/ProjectionsToolBar.cpp b/GUI/View/Projection/ProjectionsToolBar.cpp
index e494144af1f46dbd8e15cbfa409575c52c586b83..f8c5836a41e72a69ec5c899a61994e855ed3c939 100644
--- a/GUI/View/Projection/ProjectionsToolBar.cpp
+++ b/GUI/View/Projection/ProjectionsToolBar.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/View/Projection/ProjectionsToolBar.h"
-#include "GUI/Util/mainwindow_constants.h"
+#include "GUI/View/Tool/mainwindow_constants.h"
 #include "GUI/View/Projection/ProjectionsEditorActions.h"
 #include <QButtonGroup>
 #include <QLabel>
diff --git a/GUI/View/PropertyEditor/ComponentFlatView.cpp b/GUI/View/PropertyEditor/ComponentFlatView.cpp
index 58e8b6ec639f990d5362e08b0d1352d028a6dfd4..49305e695afc47ab3d0f37e858014c9e0eb0c751 100644
--- a/GUI/View/PropertyEditor/ComponentFlatView.cpp
+++ b/GUI/View/PropertyEditor/ComponentFlatView.cpp
@@ -16,7 +16,7 @@
 #include "GUI/Model/Component/ComponentUtils.h"
 #include "GUI/Model/Group/GroupItem.h"
 #include "GUI/Model/Session/SessionModel.h"
-#include "GUI/Util/LayoutUtils.h"
+#include "GUI/View/Tool/LayoutUtils.h"
 #include "GUI/View/PropertyEditor/PropertyEditorFactory.h"
 #include "GUI/View/PropertyEditor/PropertyWidgetItem.h"
 #include <QBoxLayout>
diff --git a/GUI/View/PropertyEditor/GroupInfoBox.cpp b/GUI/View/PropertyEditor/GroupInfoBox.cpp
index 45b72cc999a9a31806e614725ef76ab87d05cbe0..234592e2ed40376aba66b63e38f17eefe5b737ce 100644
--- a/GUI/View/PropertyEditor/GroupInfoBox.cpp
+++ b/GUI/View/PropertyEditor/GroupInfoBox.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/View/PropertyEditor/GroupInfoBox.h"
-#include "GUI/Util/OSInfo.h"
+#include "GUI/View/Tool/OSInfo.h"
 #include <QApplication>
 #include <QMouseEvent>
 #include <QPainter>
diff --git a/GUI/View/SampleDesigner/MaterialInplaceForm.cpp b/GUI/View/SampleDesigner/MaterialInplaceForm.cpp
index 95f1ceb2d7e8a9295449d6cf86a9e4f84c9ee787..a719bff604c618f99302b0fcca72e897aa9d3d00 100644
--- a/GUI/View/SampleDesigner/MaterialInplaceForm.cpp
+++ b/GUI/View/SampleDesigner/MaterialInplaceForm.cpp
@@ -22,7 +22,7 @@
 #include "GUI/Model/State/SessionData.h"
 #include "GUI/Model/Types/DoubleDescriptor.h"
 #include "GUI/Model/Types/VectorDescriptor.h"
-#include "GUI/Util/LayoutUtils.h"
+#include "GUI/View/Tool/LayoutUtils.h"
 #include "GUI/View/SampleDesigner/DoubleLineEdit.h"
 #include "GUI/View/SampleDesigner/DoubleSpinBox.h"
 #include "GUI/View/MaterialEditor/MaterialEditorDialog.h"
diff --git a/GUI/View/SampleDesigner/SampleListView.cpp b/GUI/View/SampleDesigner/SampleListView.cpp
index 8cbb43df354a5e41e422c4e10a27bb80c6e02ffe..782be800525238d457fdad420a05b1c420308e54 100644
--- a/GUI/View/SampleDesigner/SampleListView.cpp
+++ b/GUI/View/SampleDesigner/SampleListView.cpp
@@ -18,7 +18,7 @@
 #include "GUI/Model/Sample/MultiLayerItem.h"
 #include "GUI/Model/Sample/SampleListModel.h"
 #include "GUI/Model/State/SessionData.h"
-#include "GUI/Util/ItemDelegateForHTML.h"
+#include "GUI/View/Tool/ItemDelegateForHTML.h"
 #include "GUI/View/Common/ItemViewOverlayButtons.h"
 #include <QAction>
 #include <QDialog>
diff --git a/GUI/View/SampleDesigner/SelectionContainerForm.h b/GUI/View/SampleDesigner/SelectionContainerForm.h
index a694c1c9a54956c0cf2ed4499cfb9a683e66e2f4..56597e3a76027af06329b17a8a58ba96dccecc4d 100644
--- a/GUI/View/SampleDesigner/SelectionContainerForm.h
+++ b/GUI/View/SampleDesigner/SelectionContainerForm.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SELECTIONCONTAINERFORM_H
 #define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SELECTIONCONTAINERFORM_H
 
-#include "GUI/Util/LayoutUtils.h"
+#include "GUI/View/Tool/LayoutUtils.h"
 #include "GUI/View/PropertyEditor/CustomEventFilters.h"
 #include "GUI/View/SampleDesigner/LayerEditorUtils.h"
 #include "GUI/View/SampleDesigner/SampleEditorController.h"
diff --git a/GUI/Util/ItemDelegateForHTML.cpp b/GUI/View/Tool/ItemDelegateForHTML.cpp
similarity index 97%
rename from GUI/Util/ItemDelegateForHTML.cpp
rename to GUI/View/Tool/ItemDelegateForHTML.cpp
index 665ce54fad7660b18cb1ecb32da8b3a874873591..40f14e8d72ea5f8a2807e91d21a41e5ffc83907e 100644
--- a/GUI/Util/ItemDelegateForHTML.cpp
+++ b/GUI/View/Tool/ItemDelegateForHTML.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Util/ItemDelegateForHTML.cpp
+//! @file      GUI/View/Tool/ItemDelegateForHTML.cpp
 //! @brief     Implements class ItemDelegateForHTML
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 
-#include "GUI/Util/ItemDelegateForHTML.h"
+#include "GUI/View/Tool/ItemDelegateForHTML.h"
 #include <QAbstractItemView>
 #include <QAbstractTextDocumentLayout>
 #include <QApplication>
diff --git a/GUI/Util/ItemDelegateForHTML.h b/GUI/View/Tool/ItemDelegateForHTML.h
similarity index 84%
rename from GUI/Util/ItemDelegateForHTML.h
rename to GUI/View/Tool/ItemDelegateForHTML.h
index 33355ccab5c91cadcafed0c0fb804584e4bbdfca..d200575dcc3be179857df8bc31fd3e37a61d4e60 100644
--- a/GUI/Util/ItemDelegateForHTML.h
+++ b/GUI/View/Tool/ItemDelegateForHTML.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Util/ItemDelegateForHTML.h
+//! @file      GUI/View/Tool/ItemDelegateForHTML.h
 //! @brief     Defines class ItemDelegateForHTML
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_UTIL_ITEMDELEGATEFORHTML_H
-#define BORNAGAIN_GUI_UTIL_ITEMDELEGATEFORHTML_H
+#ifndef BORNAGAIN_GUI_VIEW_TOOL_ITEMDELEGATEFORHTML_H
+#define BORNAGAIN_GUI_VIEW_TOOL_ITEMDELEGATEFORHTML_H
 
 #include <QStyledItemDelegate>
 
@@ -35,4 +35,4 @@ private:
 };
 
 
-#endif // BORNAGAIN_GUI_UTIL_ITEMDELEGATEFORHTML_H
\ No newline at end of file
+#endif // BORNAGAIN_GUI_VIEW_TOOL_ITEMDELEGATEFORHTML_H
\ No newline at end of file
diff --git a/GUI/Util/LayoutUtils.cpp b/GUI/View/Tool/LayoutUtils.cpp
similarity index 98%
rename from GUI/Util/LayoutUtils.cpp
rename to GUI/View/Tool/LayoutUtils.cpp
index b1bcbe2f58024bbaaed3e8738fd7ef9bbcbbf379..4f2db938fac653ca67e9573db3c3a545e42ffa0f 100644
--- a/GUI/Util/LayoutUtils.cpp
+++ b/GUI/View/Tool/LayoutUtils.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Util/LayoutUtils.cpp
+//! @file      GUI/View/Tool/LayoutUtils.cpp
 //! @brief     Implements LayoutUtils namespace
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Util/LayoutUtils.h"
+#include "GUI/View/Tool/LayoutUtils.h"
 #include <QBoxLayout>
 #include <QGridLayout>
 #include <QLayoutItem>
diff --git a/GUI/Util/LayoutUtils.h b/GUI/View/Tool/LayoutUtils.h
similarity index 88%
rename from GUI/Util/LayoutUtils.h
rename to GUI/View/Tool/LayoutUtils.h
index 343ea025cf0e7a02ca8d72e0cf0758ed46e5aba8..d771f1198edcc486bd6444b11f80dd9eb4e2f5a1 100644
--- a/GUI/Util/LayoutUtils.h
+++ b/GUI/View/Tool/LayoutUtils.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Util/LayoutUtils.h
+//! @file      GUI/View/Tool/LayoutUtils.h
 //! @brief     Defines namespace GUI::Util::Layout
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_UTIL_LAYOUTUTILS_H
-#define BORNAGAIN_GUI_UTIL_LAYOUTUTILS_H
+#ifndef BORNAGAIN_GUI_VIEW_TOOL_LAYOUTUTILS_H
+#define BORNAGAIN_GUI_VIEW_TOOL_LAYOUTUTILS_H
 
 class QLayout;
 class QGridLayout;
@@ -41,4 +41,4 @@ QWidget* placeHolder();
 
 } // namespace GUI::Util::Layout
 
-#endif // BORNAGAIN_GUI_UTIL_LAYOUTUTILS_H
+#endif // BORNAGAIN_GUI_VIEW_TOOL_LAYOUTUTILS_H
diff --git a/GUI/Util/OSInfo.h b/GUI/View/Tool/OSInfo.h
similarity index 94%
rename from GUI/Util/OSInfo.h
rename to GUI/View/Tool/OSInfo.h
index cf3add26990532f1aa8c1eea2dba88cc728a9208..52cf45e03fb1e8ac61313299e2bbd73e0902bf62 100644
--- a/GUI/Util/OSInfo.h
+++ b/GUI/View/Tool/OSInfo.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Util/OSInfo.h
+//! @file      GUI/View/Tool/OSInfo.h
 //! @brief     Defines namespace GUI::Util::OS
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_UTIL_OSINFO_H
-#define BORNAGAIN_GUI_UTIL_OSINFO_H
+#ifndef BORNAGAIN_GUI_VIEW_TOOL_OSINFO_H
+#define BORNAGAIN_GUI_VIEW_TOOL_OSINFO_H
 
 #include <QString>
 
@@ -113,4 +113,4 @@ bool HostOsInfo::isAnyUnixHost()
 
 } // namespace GUI::Util::OS
 
-#endif // BORNAGAIN_GUI_UTIL_OSINFO_H
+#endif // BORNAGAIN_GUI_VIEW_TOOL_OSINFO_H
diff --git a/GUI/View/Tool/StyleUtils.cpp b/GUI/View/Tool/StyleUtils.cpp
index 5d4d1b9132de9106566c1897cd767386271d69a5..088af7e685332452081ca59cbc2edaa14f6841e7 100644
--- a/GUI/View/Tool/StyleUtils.cpp
+++ b/GUI/View/Tool/StyleUtils.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/View/Tool/StyleUtils.h"
 #include "Base/Utils/Assert.h"
-#include "GUI/Util/OSInfo.h"
+#include "GUI/View/Tool/OSInfo.h"
 #include "GUI/View/Tool/DesignerHelper.h"
 #include <QApplication>
 #include <QBoxLayout>
diff --git a/GUI/Util/mainwindow_constants.h b/GUI/View/Tool/mainwindow_constants.h
similarity index 90%
rename from GUI/Util/mainwindow_constants.h
rename to GUI/View/Tool/mainwindow_constants.h
index 0e6bc68e786b3f48b79d9856aa858e1a94c30f7b..b278003ba7eecce19d5dfe2e525430eda3f5fbc0 100644
--- a/GUI/Util/mainwindow_constants.h
+++ b/GUI/View/Tool/mainwindow_constants.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Util/mainwindow_constants.h
+//! @file      GUI/View/Tool/mainwindow_constants.h
 //! @brief     Defines namespace GUI::Constants
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_UTIL_MAINWINDOW_CONSTANTS_H
-#define BORNAGAIN_GUI_UTIL_MAINWINDOW_CONSTANTS_H
+#ifndef BORNAGAIN_GUI_VIEW_TOOL_MAINWINDOW_CONSTANTS_H
+#define BORNAGAIN_GUI_VIEW_TOOL_MAINWINDOW_CONSTANTS_H
 
 #include <QString>
 
@@ -65,4 +65,4 @@ const int styled_toolbar_height = 25;
 
 } // namespace GUI::Constants
 
-#endif // BORNAGAIN_GUI_UTIL_MAINWINDOW_CONSTANTS_H
+#endif // BORNAGAIN_GUI_VIEW_TOOL_MAINWINDOW_CONSTANTS_H
diff --git a/GUI/View/Toplevel/WelcomeView.cpp b/GUI/View/Toplevel/WelcomeView.cpp
index 12781b03193c94af5009f013206536e11bf55d87..4acf14c8d5c77450344b262998b3a0cff9217173 100644
--- a/GUI/View/Toplevel/WelcomeView.cpp
+++ b/GUI/View/Toplevel/WelcomeView.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/View/Toplevel/WelcomeView.h"
-#include "GUI/Util/LayoutUtils.h"
+#include "GUI/View/Tool/LayoutUtils.h"
 #include "GUI/Util/Path.h"
 #include "GUI/View/Main/ProjectManager.h"
 #include "GUI/View/Tool/GroupBoxCollapser.h"