diff --git a/GUI/View/Tool/UpdateTimer.cpp b/GUI/Support/Thread/UpdateTimer.cpp
similarity index 94%
rename from GUI/View/Tool/UpdateTimer.cpp
rename to GUI/Support/Thread/UpdateTimer.cpp
index 547017fb4701398d8fdcb3f08840eb1c872f2b68..92c549a719841e90639fdb9a6884250f8828aa14 100644
--- a/GUI/View/Tool/UpdateTimer.cpp
+++ b/GUI/Support/Thread/UpdateTimer.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Tool/UpdateTimer.cpp
+//! @file      GUI/Support/Thread/UpdateTimer.cpp
 //! @brief     Implements class UpdateTimer.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Tool/UpdateTimer.h"
+#include "GUI/Support/Thread/UpdateTimer.h"
 
 UpdateTimer::UpdateTimer(int timerInterval, QObject* parent)
     : QObject(parent)
diff --git a/GUI/View/Tool/UpdateTimer.h b/GUI/Support/Thread/UpdateTimer.h
similarity index 86%
rename from GUI/View/Tool/UpdateTimer.h
rename to GUI/Support/Thread/UpdateTimer.h
index 86414856b4fd24e592e259cba064daba33f16b27..dd7b09744417e0d6f307d95d35702aa53b292f59 100644
--- a/GUI/View/Tool/UpdateTimer.h
+++ b/GUI/Support/Thread/UpdateTimer.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Tool/UpdateTimer.h
+//! @file      GUI/Support/Thread/UpdateTimer.h
 //! @brief     Defines class UpdateTimer.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_TOOL_UPDATETIMER_H
-#define BORNAGAIN_GUI_VIEW_TOOL_UPDATETIMER_H
+#ifndef BORNAGAIN_GUI_SUPPORT_THREAD_UPDATETIMER_H
+#define BORNAGAIN_GUI_SUPPORT_THREAD_UPDATETIMER_H
 
 #include <QObject>
 #include <QTimer>
@@ -48,4 +48,4 @@ private:
     QTimer* m_timer;
 };
 
-#endif // BORNAGAIN_GUI_VIEW_TOOL_UPDATETIMER_H
+#endif // BORNAGAIN_GUI_SUPPORT_THREAD_UPDATETIMER_H
diff --git a/GUI/View/Manager/AutosaveController.cpp b/GUI/View/Manager/AutosaveController.cpp
index 18a71d58a35d4dddcb56afb26e62e36fc7c40f04..39dc6c350c7c67793420dd66e131e630f99d3faa 100644
--- a/GUI/View/Manager/AutosaveController.cpp
+++ b/GUI/View/Manager/AutosaveController.cpp
@@ -15,7 +15,7 @@
 #include "GUI/View/Manager/AutosaveController.h"
 #include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/Model/Project/ProjectUtil.h"
-#include "GUI/View/Tool/UpdateTimer.h"
+#include "GUI/Support/Thread/UpdateTimer.h"
 #include <QDir>
 
 AutosaveController::AutosaveController(QObject* parent, int update_interval_msec)
diff --git a/GUI/View/Plotter/ScientificPlot.cpp b/GUI/View/Plotter/ScientificPlot.cpp
index 4e8f21b90176197be760baa8922e848e81dfe3e3..646d2da7db7a07cdbc1d9878f9a3eea79e7952c9 100644
--- a/GUI/View/Plotter/ScientificPlot.cpp
+++ b/GUI/View/Plotter/ScientificPlot.cpp
@@ -13,8 +13,8 @@
 //  ************************************************************************************************
 
 #include "GUI/View/Plotter/ScientificPlot.h"
+#include "GUI/Support/Thread/UpdateTimer.h"
 #include "GUI/View/Plotter/PlotEventHelper.h"
-#include "GUI/View/Tool/UpdateTimer.h"
 #include <QEvent>
 #include <qcustomplot.h>
 
diff --git a/GUI/View/Sample/ScriptPanel.cpp b/GUI/View/Sample/ScriptPanel.cpp
index 469f20e1bbad2c68ceac0fb560b103030b599538..62488da2523f9a6187f43c07cd4b8e92c9c29b2e 100644
--- a/GUI/View/Sample/ScriptPanel.cpp
+++ b/GUI/View/Sample/ScriptPanel.cpp
@@ -16,9 +16,9 @@
 #include "GUI/Model/Sample/SampleItem.h"
 #include "GUI/Model/ToCore/SampleToCore.h"
 #include "GUI/Support/Style/Style.h"
+#include "GUI/Support/Thread/UpdateTimer.h"
 #include "GUI/View/Info/CautionSign.h"
 #include "GUI/View/Info/PythonSyntaxHighlighter.h"
-#include "GUI/View/Tool/UpdateTimer.h"
 #include "Sample/Multilayer/MultiLayer.h"
 #include "Sim/Export/ExportToPython.h"
 #include <QScrollBar>
diff --git a/Tests/Unit/GUI/TestUpdateTimer.cpp b/Tests/Unit/GUI/TestUpdateTimer.cpp
index 935885603fc2b2fe189eabc799235fd56be353e6..bb2edb64e27912ab225cade1f253875a780b1819 100644
--- a/Tests/Unit/GUI/TestUpdateTimer.cpp
+++ b/Tests/Unit/GUI/TestUpdateTimer.cpp
@@ -1,4 +1,4 @@
-#include "GUI/View/Tool/UpdateTimer.h"
+#include "GUI/Support/Thread/UpdateTimer.h"
 
 #include "Tests/GTestWrapper/google_test.h"
 #include <QSignalSpy>