diff --git a/GUI/View/FitControl/MinimizerEditor.cpp b/GUI/View/FitControl/MinimizerEditor.cpp
index 057b7d2fa2d36845fa71898757d51a17e00c5c12..ac263aeaadb956832e5a2de8f0a4a3b8839e1d93 100644
--- a/GUI/View/FitControl/MinimizerEditor.cpp
+++ b/GUI/View/FitControl/MinimizerEditor.cpp
@@ -18,9 +18,9 @@
 #include "GUI/Model/Job/JobItem.h"
 #include "GUI/Model/Mini/MinimizerItems.h"
 #include "GUI/Model/Project/ProjectDocument.h"
+#include "GUI/View/Layout/LayoutUtil.h"
 #include "GUI/View/Numeric/ComboUtil.h"
 #include "GUI/View/Numeric/NumWidgetUtil.h"
-#include "GUI/View/Tool/LayoutUtil.h"
 #include <QSpinBox>
 #include <QStandardItemModel>
 
diff --git a/GUI/View/Tool/LayoutUtil.cpp b/GUI/View/Layout/LayoutUtil.cpp
similarity index 92%
rename from GUI/View/Tool/LayoutUtil.cpp
rename to GUI/View/Layout/LayoutUtil.cpp
index c99a918671a72d98a6cf865b9f45c197fd1cc734..77dbc769331827a3056a0f554d3d5fbb65176129 100644
--- a/GUI/View/Tool/LayoutUtil.cpp
+++ b/GUI/View/Layout/LayoutUtil.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Tool/LayoutUtil.cpp
+//! @file      GUI/View/Layout/LayoutUtil.cpp
 //! @brief     Implements namespace LayoutUtils.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Tool/LayoutUtil.h"
+#include "GUI/View/Layout/LayoutUtil.h"
 #include <QLayoutItem>
 #include <QWidget>
 
diff --git a/GUI/View/Tool/LayoutUtil.h b/GUI/View/Layout/LayoutUtil.h
similarity index 80%
rename from GUI/View/Tool/LayoutUtil.h
rename to GUI/View/Layout/LayoutUtil.h
index 2e1d6ab46a4ca79b6f5d7a0b927e510505f278e1..c3f7788aadf253d9c1a72660bf7935fe78e0a724 100644
--- a/GUI/View/Tool/LayoutUtil.h
+++ b/GUI/View/Layout/LayoutUtil.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Tool/LayoutUtil.h
+//! @file      GUI/View/Layout/LayoutUtil.h
 //! @brief     Defines namespace GUI::Util::Layout.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_TOOL_LAYOUTUTIL_H
-#define BORNAGAIN_GUI_VIEW_TOOL_LAYOUTUTIL_H
+#ifndef BORNAGAIN_GUI_VIEW_LAYOUT_LAYOUTUTIL_H
+#define BORNAGAIN_GUI_VIEW_LAYOUT_LAYOUTUTIL_H
 
 #include <QLayout>
 
@@ -24,4 +24,4 @@ void clearLayout(QLayout* layout, bool deleteWidgets = true);
 
 } // namespace GUI::Util::Layout
 
-#endif // BORNAGAIN_GUI_VIEW_TOOL_LAYOUTUTIL_H
+#endif // BORNAGAIN_GUI_VIEW_LAYOUT_LAYOUTUTIL_H
diff --git a/GUI/View/Sample/MaterialInplaceForm.cpp b/GUI/View/Sample/MaterialInplaceForm.cpp
index fadd537b0fc06ef3509732108803cd91aefde9a8..dd068afceffb140eb8f763f58372a847d6626fc4 100644
--- a/GUI/View/Sample/MaterialInplaceForm.cpp
+++ b/GUI/View/Sample/MaterialInplaceForm.cpp
@@ -20,13 +20,13 @@
 #include "GUI/Model/Sample/LayerItem.h"
 #include "GUI/Model/Sample/SampleItem.h"
 #include "GUI/Support/XML/Backup.h"
+#include "GUI/View/Layout/LayoutUtil.h"
 #include "GUI/View/Material/MaterialEditorDialog.h"
 #include "GUI/View/Numeric/DoubleSpinBox.h"
 #include "GUI/View/Sample/LayerEditorUtil.h"
 #include "GUI/View/Sample/SampleEditorController.h"
 #include "GUI/View/Sample/SampleForm.h"
 #include "GUI/View/Tool/Globals.h"
-#include "GUI/View/Tool/LayoutUtil.h"
 #include <QLabel>
 #include <QPushButton>
 
diff --git a/GUI/View/Sample/SampleForm.cpp b/GUI/View/Sample/SampleForm.cpp
index 9a96268f335f42ad67c87302ce4e83fc858bf794..161096b982b379f6e5f8589c993a1cd94e0e3f88 100644
--- a/GUI/View/Sample/SampleForm.cpp
+++ b/GUI/View/Sample/SampleForm.cpp
@@ -15,6 +15,7 @@
 #include "GUI/View/Sample/SampleForm.h"
 #include "GUI/Model/Sample/SampleItem.h"
 #include "GUI/View/Layout/ApplicationSettings.h"
+#include "GUI/View/Layout/LayoutUtil.h"
 #include "GUI/View/Sample/CompoundForm.h"
 #include "GUI/View/Sample/CoreAndShellForm.h"
 #include "GUI/View/Sample/HeinzFormLayout.h"
@@ -24,7 +25,6 @@
 #include "GUI/View/Sample/ParticleLayoutForm.h"
 #include "GUI/View/Sample/SampleEditorController.h"
 #include "GUI/View/Tool/ActionFactory.h"
-#include "GUI/View/Tool/LayoutUtil.h"
 #include "GUI/View/Widget/GroupBoxes.h"
 #include <QBoxLayout>
 #include <QLabel>
diff --git a/GUI/View/Sample/SelectionContainerForm.cpp b/GUI/View/Sample/SelectionContainerForm.cpp
index 99cf3a2d386419639ca6957913fe6a3095f65df7..364cc977bd26faa372aa5514cf6c01062ab15956 100644
--- a/GUI/View/Sample/SelectionContainerForm.cpp
+++ b/GUI/View/Sample/SelectionContainerForm.cpp
@@ -17,7 +17,7 @@
 #include "GUI/Model/Sample/ProfileItems.h"
 #include "GUI/Model/Sample/RotationItems.h"
 #include "GUI/Model/Sample/RoughnessItems.h"
-#include "GUI/View/Tool/LayoutUtil.h"
+#include "GUI/View/Layout/LayoutUtil.h"
 
 ISelectionContainerForm::ISelectionContainerForm(QWidget* parent, SampleEditorController* ec)
     : QWidget(parent)
diff --git a/GUI/View/Setup/AxesPanel.cpp b/GUI/View/Setup/AxesPanel.cpp
index 1c546a67e63b0e562e2f89e37d96dff4b4605202..1e61c7e6e4f51277527c42856e6decee95505569 100644
--- a/GUI/View/Setup/AxesPanel.cpp
+++ b/GUI/View/Setup/AxesPanel.cpp
@@ -20,9 +20,9 @@
 #include "GUI/Model/Job/DataSource.h"
 #include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/Support/Data/ComboProperty.h"
+#include "GUI/View/Layout/LayoutUtil.h"
 #include "GUI/View/Numeric/ComboUtil.h"
 #include "GUI/View/Numeric/NumWidgetUtil.h"
-#include "GUI/View/Tool/LayoutUtil.h"
 #include "GUI/View/Widget/GroupBoxes.h"
 #include <QCheckBox>
 #include <QFormLayout>
diff --git a/GUI/View/Setup/AxisPanel.cpp b/GUI/View/Setup/AxisPanel.cpp
index ad504826d2efd4b2d767a4985ea7dd19bb7148ff..06d90a3eb9fd36d9837c17ab3187b3baa58ca3e2 100644
--- a/GUI/View/Setup/AxisPanel.cpp
+++ b/GUI/View/Setup/AxisPanel.cpp
@@ -24,9 +24,9 @@
 #include "GUI/Model/Job/DataSource.h"
 #include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/Support/Data/ComboProperty.h"
+#include "GUI/View/Layout/LayoutUtil.h"
 #include "GUI/View/Numeric/DoubleSpinBox.h"
 #include "GUI/View/Numeric/NumWidgetUtil.h"
-#include "GUI/View/Tool/LayoutUtil.h"
 #include "GUI/View/Widget/GroupBoxes.h"
 #include <QAction>
 #include <QCheckBox>
diff --git a/GUI/View/Setup/MasksPanel.cpp b/GUI/View/Setup/MasksPanel.cpp
index eced7ace42c930505d7675663c025f129659bdd9..01a789f83949790ed3f61345d9e115d6ac1e8150 100644
--- a/GUI/View/Setup/MasksPanel.cpp
+++ b/GUI/View/Setup/MasksPanel.cpp
@@ -18,8 +18,8 @@
 #include "GUI/Model/Mask/MasksQModel.h"
 #include "GUI/Model/Mask/MasksSet.h"
 #include "GUI/Model/Project/ProjectDocument.h"
+#include "GUI/View/Layout/LayoutUtil.h"
 #include "GUI/View/Numeric/DoubleSpinBox.h"
-#include "GUI/View/Tool/LayoutUtil.h"
 #include "GUI/View/Widget/GroupBoxes.h"
 #include <QCheckBox>
 #include <QLineEdit>
diff --git a/GUI/View/Views/ProjectsView.cpp b/GUI/View/Views/ProjectsView.cpp
index 5490696e4c371faf36b3455ed409801bea2ef958..a68d2dad786bd32c23bfd08a369b78d3b02b3c41 100644
--- a/GUI/View/Views/ProjectsView.cpp
+++ b/GUI/View/Views/ProjectsView.cpp
@@ -14,8 +14,8 @@
 
 #include "GUI/View/Views/ProjectsView.h"
 #include "GUI/Support/Util/Path.h"
+#include "GUI/View/Layout/LayoutUtil.h"
 #include "GUI/View/Manager/ProjectManager.h"
-#include "GUI/View/Tool/LayoutUtil.h"
 #include "GUI/View/Widget/GroupBoxes.h"
 #include "GUI/View/Widget/StyledToolbar.h"
 #include <QCommandLinkButton>