diff --git a/GUI/View/SampleDesigner/LayerForm.cpp b/GUI/View/SampleDesigner/LayerForm.cpp
index 2ccdd1c5068b914536c0e08c4fdbf2ca87a64330..bf105a202fb6e680e9528b051c531a31ab042107 100644
--- a/GUI/View/SampleDesigner/LayerForm.cpp
+++ b/GUI/View/SampleDesigner/LayerForm.cpp
@@ -19,11 +19,11 @@
 #include "GUI/Model/Sample/MaterialModel.h"
 #include "GUI/Model/Sample/SampleItem.h"
 #include "GUI/Support/Util/ActionFactory.h"
-#include "GUI/Support/Util/WidgetMoverButton.h"
 #include "GUI/View/Numeric/NumWidgetUtil.h"
 #include "GUI/View/SampleDesigner/HeinzFormLayout.h"
 #include "GUI/View/SampleDesigner/MaterialInplaceForm.h"
 #include "GUI/View/SampleDesigner/ParticleLayoutForm.h"
+#include "GUI/View/Tool/WidgetMoverButton.h"
 #include <QLineEdit>
 #include <QMenu>
 #include <QPushButton>
diff --git a/GUI/Support/Util/WidgetMoverButton.cpp b/GUI/View/Tool/WidgetMoverButton.cpp
similarity index 98%
rename from GUI/Support/Util/WidgetMoverButton.cpp
rename to GUI/View/Tool/WidgetMoverButton.cpp
index 0347e39025548598a555cce35d67d1b99dce0252..99c43ab96fdc1273df1ab5af38de7edcccc2a448 100644
--- a/GUI/Support/Util/WidgetMoverButton.cpp
+++ b/GUI/View/Tool/WidgetMoverButton.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Support/Util/WidgetMoverButton.cpp
+//! @file      GUI/View/Tool/WidgetMoverButton.cpp
 //! @brief     Implements class WidgetMoverButton.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Support/Util/WidgetMoverButton.h"
+#include "GUI/View/Tool/WidgetMoverButton.h"
 #include "Base/Util/Assert.h"
 #include <QLayout>
 #include <QMouseEvent>
diff --git a/GUI/Support/Util/WidgetMoverButton.h b/GUI/View/Tool/WidgetMoverButton.h
similarity index 91%
rename from GUI/Support/Util/WidgetMoverButton.h
rename to GUI/View/Tool/WidgetMoverButton.h
index 11e62d9a24fe72a229e82d4e79d87743bdd80107..d044fc2a7d695000204601e4bad2cde129ae8f4a 100644
--- a/GUI/Support/Util/WidgetMoverButton.h
+++ b/GUI/View/Tool/WidgetMoverButton.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Support/Util/WidgetMoverButton.h
+//! @file      GUI/View/Tool/WidgetMoverButton.h
 //! @brief     Defines class WidgetMoverButton.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_SUPPORT_UTIL_WIDGETMOVERBUTTON_H
-#define BORNAGAIN_GUI_SUPPORT_UTIL_WIDGETMOVERBUTTON_H
+#ifndef BORNAGAIN_GUI_VIEW_TOOL_WIDGETMOVERBUTTON_H
+#define BORNAGAIN_GUI_VIEW_TOOL_WIDGETMOVERBUTTON_H
 
 #include <QMap>
 #include <QTimer>
@@ -71,4 +71,4 @@ private:
 };
 
 
-#endif // BORNAGAIN_GUI_SUPPORT_UTIL_WIDGETMOVERBUTTON_H
+#endif // BORNAGAIN_GUI_VIEW_TOOL_WIDGETMOVERBUTTON_H