diff --git a/GUI/View/Plotter/ColorMap.cpp b/GUI/View/Plotter/ColorMap.cpp
index 1d7ab1d74d49905ffdc5ef15b067ccb57c1f2594..220907e44ac10532fc12d0b2500d5d7d10cae14e 100644
--- a/GUI/View/Plotter/ColorMap.cpp
+++ b/GUI/View/Plotter/ColorMap.cpp
@@ -20,9 +20,9 @@
 #include "GUI/Model/Axis/BasicAxisItem.h"
 #include "GUI/Model/Data/Data2DItem.h"
 #include "GUI/Model/Project/ProjectDocument.h"
-#include "GUI/Support/Style/QCP_Util.h"
 #include "GUI/Support/Style/Style.h"
 #include "GUI/View/Base/AppConfig.h"
+#include "GUI/View/Plotter/RangeUtil.h"
 #include <qcustomplot.h>
 
 namespace {
diff --git a/GUI/View/Plotter/ProjectionsPlot.cpp b/GUI/View/Plotter/ProjectionsPlot.cpp
index b25d22fb72fa967c8933df12053b9b0617387e93..00efef0d30f435ab0facf4ce4774a82ff4e4543e 100644
--- a/GUI/View/Plotter/ProjectionsPlot.cpp
+++ b/GUI/View/Plotter/ProjectionsPlot.cpp
@@ -20,8 +20,8 @@
 #include "GUI/Model/Axis/BasicAxisItem.h"
 #include "GUI/Model/Data/Data2DItem.h"
 #include "GUI/Model/Mask/MasksSet.h" // projections
-#include "GUI/Support/Style/QCP_Util.h"
 #include "GUI/Support/Style/Style.h"
+#include "GUI/View/Plotter/RangeUtil.h"
 #include <qcustomplot.h>
 #include <utility>
 
diff --git a/GUI/Support/Style/QCP_Util.cpp b/GUI/View/Plotter/RangeUtil.cpp
similarity index 94%
rename from GUI/Support/Style/QCP_Util.cpp
rename to GUI/View/Plotter/RangeUtil.cpp
index 791bece34bb1f384f1ca6b55421a878e5a0de352..6f9e1afcf1f03915912d9bd704998ba8dbaaae6d 100644
--- a/GUI/Support/Style/QCP_Util.cpp
+++ b/GUI/View/Plotter/RangeUtil.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Support/Style/QCP_Util.cpp
+//! @file      GUI/View/Plotter/RangeUtil.cpp
 //! @brief     Implements namespace QCP_Util.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Support/Style/QCP_Util.h"
+#include "GUI/View/Plotter/RangeUtil.h"
 #include <qcustomplot.h>
 
 void GUI::QCP_Util::setLogz(QCPColorScale* scale, bool isLogz)
diff --git a/GUI/Support/Style/QCP_Util.h b/GUI/View/Plotter/RangeUtil.h
similarity index 81%
rename from GUI/Support/Style/QCP_Util.h
rename to GUI/View/Plotter/RangeUtil.h
index 1d344914bfb698b7c441d025567acb23036ac9c1..535fec4f2e6790643117f547c470246c83baa165 100644
--- a/GUI/Support/Style/QCP_Util.h
+++ b/GUI/View/Plotter/RangeUtil.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Support/Style/QCP_Util.h
+//! @file      GUI/View/Plotter/RangeUtil.h
 //! @brief     Defines namespace QCP_Util.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_SUPPORT_STYLE_QCP_UTIL_H
-#define BORNAGAIN_GUI_SUPPORT_STYLE_QCP_UTIL_H
+#ifndef BORNAGAIN_GUI_VIEW_PLOTTER_RANGEUTIL_H
+#define BORNAGAIN_GUI_VIEW_PLOTTER_RANGEUTIL_H
 
 class QCPAxis;
 class QCPColorScale;
@@ -28,4 +28,4 @@ void setLogz(QCPAxis* axis, bool isLogz);
 
 } // namespace GUI::QCP_Util
 
-#endif // BORNAGAIN_GUI_SUPPORT_STYLE_QCP_UTIL_H
+#endif // BORNAGAIN_GUI_VIEW_PLOTTER_RANGEUTIL_H
diff --git a/GUI/View/Plotter/SpecularPlot.cpp b/GUI/View/Plotter/SpecularPlot.cpp
index 03203d813d829d334aec97d68a453364343d2ebe..29d13bcf37506b0f233ad00168c6a001be4bf053 100644
--- a/GUI/View/Plotter/SpecularPlot.cpp
+++ b/GUI/View/Plotter/SpecularPlot.cpp
@@ -21,8 +21,8 @@
 #include "GUI/Model/Axis/BasicAxisItem.h"
 #include "GUI/Model/Data/Data1DItem.h"
 #include "GUI/Model/Project/ProjectDocument.h"
-#include "GUI/Support/Style/QCP_Util.h"
 #include "GUI/Support/Style/Style.h"
+#include "GUI/View/Plotter/RangeUtil.h"
 
 namespace {