diff --git a/GUI/View/Common/DoubleSpinBox.cpp b/GUI/View/Common/DoubleSpinBox.cpp
index 6fe4ce1f66edd75f176f98f24122084fe65e2b35..7cdf15c7e937961ea002fee0cd792a5ee7941483 100644
--- a/GUI/View/Common/DoubleSpinBox.cpp
+++ b/GUI/View/Common/DoubleSpinBox.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/View/Common/DoubleSpinBox.h"
-#include "GUI/View/Tool/EditUtil.h"
+#include "GUI/View/Common/EditUtil.h"
 #include <QWheelEvent>
 
 DoubleSpinBox::DoubleSpinBox(DoubleProperty& d, bool easyScrollable, QWidget* parent)
diff --git a/GUI/View/Tool/EditUtil.cpp b/GUI/View/Common/EditUtil.cpp
similarity index 96%
rename from GUI/View/Tool/EditUtil.cpp
rename to GUI/View/Common/EditUtil.cpp
index 01ab124a97d13ad2a4fbf5501cda4693241d299b..024be7b51e4c3dc837e9cdc656ad56d1f4f9ce0e 100644
--- a/GUI/View/Tool/EditUtil.cpp
+++ b/GUI/View/Common/EditUtil.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Tool/EditUtil.cpp
+//! @file      GUI/View/Common/EditUtil.cpp
 //! @brief     Implements GUIHelpers functions
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Tool/EditUtil.h"
+#include "GUI/View/Common/EditUtil.h"
 #include "Fit/Param/RealLimits.h"
 #include "GUI/View/Common/ScientificSpinBox.h"
 #include <QDoubleSpinBox>
diff --git a/GUI/View/Tool/EditUtil.h b/GUI/View/Common/EditUtil.h
similarity index 84%
rename from GUI/View/Tool/EditUtil.h
rename to GUI/View/Common/EditUtil.h
index 5c8d4cf0b0aed18bb990751625b64cca1a973cf1..ccd8bc51e9c836a1c031704a8672b1fe76e30bf3 100644
--- a/GUI/View/Tool/EditUtil.h
+++ b/GUI/View/Common/EditUtil.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Tool/EditUtil.h
+//! @file      GUI/View/Common/EditUtil.h
 //! @brief     Defines class GUIHelpers functions
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_TOOL_EDITUTIL_H
-#define BORNAGAIN_GUI_VIEW_TOOL_EDITUTIL_H
+#ifndef BORNAGAIN_GUI_VIEW_COMMON_EDITUTIL_H
+#define BORNAGAIN_GUI_VIEW_COMMON_EDITUTIL_H
 
 #include <QWidget>
 
@@ -31,4 +31,4 @@ void configSpinbox(ScientificSpinBox* spinBox, int decimals, const RealLimits& l
 
 } // namespace GUI::View::EditUtil
 
-#endif // BORNAGAIN_GUI_VIEW_TOOL_EDITUTIL_H
+#endif // BORNAGAIN_GUI_VIEW_COMMON_EDITUTIL_H
diff --git a/GUI/View/Tool/WidgetUtils.cpp b/GUI/View/Common/WidgetUtils.cpp
similarity index 98%
rename from GUI/View/Tool/WidgetUtils.cpp
rename to GUI/View/Common/WidgetUtils.cpp
index a1152172f6a617312dc14d2fe1a5298991888dbe..67e0b16adcc9331420cf33a87ebd461ac7d9bff1 100644
--- a/GUI/View/Tool/WidgetUtils.cpp
+++ b/GUI/View/Common/WidgetUtils.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Tool/WidgetUtils.cpp
+//! @file      GUI/View/Common/WidgetUtils.cpp
 //! @brief     Implements GUI::Util namespace
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,11 +12,11 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Tool/WidgetUtils.h"
+#include "GUI/View/Common/WidgetUtils.h"
 #include "GUI/Util/ComboProperty.h"
 #include "GUI/View/Common/DoubleSpinBox.h"
 #include "GUI/View/Common/ScientificSpinBox.h"
-#include "GUI/View/Tool/EditUtil.h"
+#include "GUI/View/Common/EditUtil.h"
 #include <QCheckBox>
 #include <QFormLayout>
 #include <QLabel>
diff --git a/GUI/View/Tool/WidgetUtils.h b/GUI/View/Common/WidgetUtils.h
similarity index 97%
rename from GUI/View/Tool/WidgetUtils.h
rename to GUI/View/Common/WidgetUtils.h
index 25ad21c2623880bf6d5c538ba923d6a2d9f7a63c..b81f3690747e90dbe99b833462b857912ca1142a 100644
--- a/GUI/View/Tool/WidgetUtils.h
+++ b/GUI/View/Common/WidgetUtils.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Tool/WidgetUtils.h
+//! @file      GUI/View/Common/WidgetUtils.h
 //! @brief     Defines GUI::Util namespace
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_TOOL_WIDGETUTILS_H
-#define BORNAGAIN_GUI_VIEW_TOOL_WIDGETUTILS_H
+#ifndef BORNAGAIN_GUI_VIEW_COMMON_WIDGETUTILS_H
+#define BORNAGAIN_GUI_VIEW_COMMON_WIDGETUTILS_H
 
 #include "Fit/Param/RealLimits.h"
 #include "GUI/Model/Descriptor/SelectionProperty.h"
@@ -154,4 +154,4 @@ QDoubleSpinBox* createDoubleSpinbox(std::function<double()> getter,
                                     bool easyScrollable = true);
 } // namespace GUI::Util
 
-#endif // BORNAGAIN_GUI_VIEW_TOOL_WIDGETUTILS_H
+#endif // BORNAGAIN_GUI_VIEW_COMMON_WIDGETUTILS_H
diff --git a/GUI/View/Device/AxisPropertyForm.cpp b/GUI/View/Device/AxisPropertyForm.cpp
index 7609540360b2c6178368ccc898bd428c0404bc15..57f4f702cb0ae4b20e4a6be1220c4b14721f2238 100644
--- a/GUI/View/Device/AxisPropertyForm.cpp
+++ b/GUI/View/Device/AxisPropertyForm.cpp
@@ -17,7 +17,7 @@
 #include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/View/Common/DoubleSpinBox.h"
 #include "GUI/View/Tool/GroupBoxCollapser.h"
-#include "GUI/View/Tool/WidgetUtils.h"
+#include "GUI/View/Common/WidgetUtils.h"
 #include <QFormLayout>
 #include <QGroupBox>
 #include <QSpinBox>
diff --git a/GUI/View/Device/BackgroundForm.cpp b/GUI/View/Device/BackgroundForm.cpp
index f9db31631b0e3d97028725c5bbc28248707d486d..f9ebc106f3fbf4023f25025116039486279cb7a2 100644
--- a/GUI/View/Device/BackgroundForm.cpp
+++ b/GUI/View/Device/BackgroundForm.cpp
@@ -17,7 +17,7 @@
 #include "GUI/Model/Device/InstrumentItems.h"
 #include "GUI/View/Common/DoubleSpinBox.h"
 #include "GUI/View/Tool/GroupBoxCollapser.h"
-#include "GUI/View/Tool/WidgetUtils.h"
+#include "GUI/View/Common/WidgetUtils.h"
 #include <QFormLayout>
 
 BackgroundForm::BackgroundForm(QWidget* parent, InstrumentItem* instrument)
diff --git a/GUI/View/Device/DetectorAlignmentForm.cpp b/GUI/View/Device/DetectorAlignmentForm.cpp
index 7741be0e3f671d7691a0405f7fe445cc5b09cf1e..b3a6ff5412ace2027f2cd27e32c2b5dc6fd0546b 100644
--- a/GUI/View/Device/DetectorAlignmentForm.cpp
+++ b/GUI/View/Device/DetectorAlignmentForm.cpp
@@ -15,7 +15,7 @@
 #include "GUI/View/Device/DetectorAlignmentForm.h"
 #include "GUI/Model/Device/RectangularDetectorItem.h"
 #include "GUI/View/Common/DoubleSpinBox.h"
-#include "GUI/View/Tool/WidgetUtils.h"
+#include "GUI/View/Common/WidgetUtils.h"
 #include <QComboBox>
 #include <QFormLayout>
 #include <QLabel>
diff --git a/GUI/View/Device/FootprintForm.cpp b/GUI/View/Device/FootprintForm.cpp
index 88cb6ffe4b3201c1208dcb1e1e2983a69dd39ab2..6ed1375ee01850411dc57139433e359ebed5d5c5 100644
--- a/GUI/View/Device/FootprintForm.cpp
+++ b/GUI/View/Device/FootprintForm.cpp
@@ -17,7 +17,7 @@
 #include "GUI/Model/Device/InstrumentItems.h"
 #include "GUI/View/Common/DoubleSpinBox.h"
 #include "GUI/View/Tool/GroupBoxCollapser.h"
-#include "GUI/View/Tool/WidgetUtils.h"
+#include "GUI/View/Common/WidgetUtils.h"
 #include <QFormLayout>
 
 FootprintForm::FootprintForm(QWidget* parent, ScanItem* item)
diff --git a/GUI/View/Device/ResolutionForm.cpp b/GUI/View/Device/ResolutionForm.cpp
index d59b77f7038fbf2feaca1f0b92ebc554c9c635f7..1f2cc717be7324050c598da6531ecd6cf077bea1 100644
--- a/GUI/View/Device/ResolutionForm.cpp
+++ b/GUI/View/Device/ResolutionForm.cpp
@@ -17,7 +17,7 @@
 #include "GUI/Model/Device/ResolutionFunctionItems.h"
 #include "GUI/View/Common/DoubleSpinBox.h"
 #include "GUI/View/Tool/GroupBoxCollapser.h"
-#include "GUI/View/Tool/WidgetUtils.h"
+#include "GUI/View/Common/WidgetUtils.h"
 #include <QFormLayout>
 #include <QGroupBox>
 
diff --git a/GUI/View/Fit/MinimizerSettingsWidget.cpp b/GUI/View/Fit/MinimizerSettingsWidget.cpp
index 4917468437b0d80a2af64aac46cfaa7d9d6ada6d..dcd4c19821c30fb848d53fdcd1020f0259d7d027 100644
--- a/GUI/View/Fit/MinimizerSettingsWidget.cpp
+++ b/GUI/View/Fit/MinimizerSettingsWidget.cpp
@@ -20,7 +20,7 @@
 #include "GUI/View/Common/DoubleSpinBox.h"
 #include "GUI/View/Common/SafeSpinBox.h"
 #include "GUI/View/Tool/LayoutUtils.h"
-#include "GUI/View/Tool/WidgetUtils.h"
+#include "GUI/View/Common/WidgetUtils.h"
 #include <QComboBox>
 #include <QFormLayout>
 #include <QPushButton>
diff --git a/GUI/View/Instrument/DetectorEditor.cpp b/GUI/View/Instrument/DetectorEditor.cpp
index 80073a9fc313a09cf26e726c644e657516084348..9e17312263010bf2f052e53e96845fdbd1bafe66 100644
--- a/GUI/View/Instrument/DetectorEditor.cpp
+++ b/GUI/View/Instrument/DetectorEditor.cpp
@@ -19,7 +19,7 @@
 #include "GUI/View/Device/RectangularDetectorForm.h"
 #include "GUI/View/Device/SphericalDetectorForm.h"
 #include "GUI/View/Tool/GroupBoxCollapser.h"
-#include "GUI/View/Tool/WidgetUtils.h"
+#include "GUI/View/Common/WidgetUtils.h"
 #include <QFormLayout>
 
 
diff --git a/GUI/View/Instrument/DistributionEditor.cpp b/GUI/View/Instrument/DistributionEditor.cpp
index 9ce07aefb8709668585ecfa9f32387b729892483..60e24f600758676d561c97b398d04b8dc1828a2c 100644
--- a/GUI/View/Instrument/DistributionEditor.cpp
+++ b/GUI/View/Instrument/DistributionEditor.cpp
@@ -22,7 +22,7 @@
 #include "GUI/View/Common/ScientificSpinBox.h"
 #include "GUI/View/Instrument/DistributionPlot.h"
 #include "GUI/View/Tool/GroupBoxCollapser.h"
-#include "GUI/View/Tool/WidgetUtils.h"
+#include "GUI/View/Common/WidgetUtils.h"
 #include <QComboBox>
 #include <QFormLayout>
 #include <QStackedLayout>
diff --git a/GUI/View/Instrument/OffspecDetectorEditor.cpp b/GUI/View/Instrument/OffspecDetectorEditor.cpp
index e8f2c158bd2b29276b42600a2a16ac046020786f..3411059ce1918ab2399fba70c0867a6f9a912007 100644
--- a/GUI/View/Instrument/OffspecDetectorEditor.cpp
+++ b/GUI/View/Instrument/OffspecDetectorEditor.cpp
@@ -17,7 +17,7 @@
 #include "GUI/Model/Device/SphericalDetectorItem.h"
 #include "GUI/View/Device/SphericalDetectorForm.h"
 #include "GUI/View/Tool/GroupBoxCollapser.h"
-#include "GUI/View/Tool/WidgetUtils.h"
+#include "GUI/View/Common/WidgetUtils.h"
 #include <QFormLayout>
 
 
diff --git a/GUI/View/Instrument/PolarizationAnalysisEditor.cpp b/GUI/View/Instrument/PolarizationAnalysisEditor.cpp
index bb579a131d5929078914cd4c0ba146e14389258d..901e0074d6bdbd3a30f22561e87fd52d472cbd1c 100644
--- a/GUI/View/Instrument/PolarizationAnalysisEditor.cpp
+++ b/GUI/View/Instrument/PolarizationAnalysisEditor.cpp
@@ -16,7 +16,7 @@
 #include "GUI/Model/Device/InstrumentItems.h"
 #include "GUI/View/Common/DoubleSpinBox.h"
 #include "GUI/View/Tool/GroupBoxCollapser.h"
-#include "GUI/View/Tool/WidgetUtils.h"
+#include "GUI/View/Common/WidgetUtils.h"
 #include <QCheckBox>
 #include <QFormLayout>
 #include <QLabel>
diff --git a/GUI/View/Mask/MaskEditorPropertyPanel.cpp b/GUI/View/Mask/MaskEditorPropertyPanel.cpp
index 7aa5f7545be7a49a589063340e32af807a60951b..6d2b81b2277285a1829bd858ad7da1681662b81e 100644
--- a/GUI/View/Mask/MaskEditorPropertyPanel.cpp
+++ b/GUI/View/Mask/MaskEditorPropertyPanel.cpp
@@ -18,7 +18,7 @@
 #include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/View/Common/DoubleSpinBox.h"
 #include "GUI/View/Plot2D/IntensityDataPropertyWidget.h"
-#include "GUI/View/Tool/EditUtil.h"
+#include "GUI/View/Common/EditUtil.h"
 #include "GUI/View/Tool/GroupBoxCollapser.h"
 #include "GUI/View/Tool/LayoutUtils.h"
 #include <QCheckBox>
diff --git a/GUI/View/MaterialEditor/MaterialEditorDialog.cpp b/GUI/View/MaterialEditor/MaterialEditorDialog.cpp
index 96361a486d8dbc40bde535de299ff380407eb074..bfb908209d61a45488c3279dc722b408f4a0e0c1 100644
--- a/GUI/View/MaterialEditor/MaterialEditorDialog.cpp
+++ b/GUI/View/MaterialEditor/MaterialEditorDialog.cpp
@@ -20,7 +20,7 @@
 #include "GUI/Model/Sample/SampleItem.h"
 #include "GUI/View/Common/StyledToolbar.h"
 #include "GUI/View/MaterialEditor/MaterialEditorModel.h"
-#include "GUI/View/Tool/EditUtil.h"
+#include "GUI/View/Common/EditUtil.h"
 #include "GUI/View/Tool/StyleUtils.h"
 #include "GUI/View/Tool/mainwindow_constants.h"
 #include "ui_MaterialEditorDialog.h"
diff --git a/GUI/View/Plot2D/IntensityDataPropertyWidget.cpp b/GUI/View/Plot2D/IntensityDataPropertyWidget.cpp
index 94a296a48cbbe99bd64468ca0f2a2925b9fb4416..806235ffc79a511290d8a4da49a6a17da70e5a7b 100644
--- a/GUI/View/Plot2D/IntensityDataPropertyWidget.cpp
+++ b/GUI/View/Plot2D/IntensityDataPropertyWidget.cpp
@@ -19,7 +19,7 @@
 #include "GUI/Util/ComboProperty.h"
 #include "GUI/View/Common/DoubleSpinBox.h"
 #include "GUI/View/Tool/LayoutUtils.h"
-#include "GUI/View/Tool/WidgetUtils.h"
+#include "GUI/View/Common/WidgetUtils.h"
 #include <QCheckBox>
 #include <QFormLayout>
 #include <QGroupBox>
diff --git a/GUI/View/PlotSpecular/SpecularDataPropertyWidget.cpp b/GUI/View/PlotSpecular/SpecularDataPropertyWidget.cpp
index 048f2749788914ce3b6073d8695655c969be141c..2d325c78199e287b9a8bc95da620e9e1549fe1c6 100644
--- a/GUI/View/PlotSpecular/SpecularDataPropertyWidget.cpp
+++ b/GUI/View/PlotSpecular/SpecularDataPropertyWidget.cpp
@@ -19,7 +19,7 @@
 #include "GUI/Util/ComboProperty.h"
 #include "GUI/View/Common/DoubleSpinBox.h"
 #include "GUI/View/Tool/LayoutUtils.h"
-#include "GUI/View/Tool/WidgetUtils.h"
+#include "GUI/View/Common/WidgetUtils.h"
 #include <QAction>
 #include <QCheckBox>
 #include <QFormLayout>
diff --git a/GUI/View/SampleDesigner/InterferenceForm.cpp b/GUI/View/SampleDesigner/InterferenceForm.cpp
index d9446cfdf6ea5a7a37e6c194d066350bad0aa824..0b1a774e064922475675400d21ed4789b3d91f3f 100644
--- a/GUI/View/SampleDesigner/InterferenceForm.cpp
+++ b/GUI/View/SampleDesigner/InterferenceForm.cpp
@@ -22,7 +22,7 @@
 #include "GUI/View/SampleDesigner/SampleEditorController.h"
 #include "GUI/View/SampleDesigner/SelectionContainerForm.h"
 #include "GUI/View/Tool/GroupBoxCollapser.h"
-#include "GUI/View/Tool/WidgetUtils.h"
+#include "GUI/View/Common/WidgetUtils.h"
 
 InterferenceForm::InterferenceForm(QWidget* parent, ParticleLayoutItem* layoutItem,
                                    SampleEditorController* ec)
diff --git a/GUI/View/SampleDesigner/LayerForm.cpp b/GUI/View/SampleDesigner/LayerForm.cpp
index 8ecb1782e517c16cbfef521e549160e928923ce5..49be12cbea6b80a13dc07b77e7835a78fa00ac8d 100644
--- a/GUI/View/SampleDesigner/LayerForm.cpp
+++ b/GUI/View/SampleDesigner/LayerForm.cpp
@@ -22,7 +22,7 @@
 #include "GUI/View/SampleDesigner/ParticleLayoutForm.h"
 #include "GUI/View/SampleDesigner/WidgetMoverButton.h"
 #include "GUI/View/Tool/GroupBoxCollapser.h"
-#include "GUI/View/Tool/WidgetUtils.h"
+#include "GUI/View/Common/WidgetUtils.h"
 #include <QLineEdit>
 #include <QMenu>
 #include <QPushButton>