diff --git a/Core/Fitting/FitObjective.h b/Core/Fitting/FitObjective.h
index ac0afea08b35c56b38116f7dd58cd7d03d1e4f76..dd66a0d61e912b29fda3bdc49181370f102fe14a 100644
--- a/Core/Fitting/FitObjective.h
+++ b/Core/Fitting/FitObjective.h
@@ -17,7 +17,7 @@
 
 #include "Core/Fitting/IterationInfo.h"
 #include "Core/Fitting/SimDataPair.h"
-#include "Device/Intensity/ArrayUtils.h"
+#include "Device/Data/ArrayUtils.h"
 #include "Fit/Minimizer/MinimizerResult.h"
 
 class FitStatus;
diff --git a/Device/Intensity/ArrayUtils.h b/Device/Data/ArrayUtils.h
similarity index 99%
rename from Device/Intensity/ArrayUtils.h
rename to Device/Data/ArrayUtils.h
index 85511b7a34d3b0b9ad6583345a0134caf0aa7303..f433665cae9a06153ce850940822a9b452ec2b03 100644
--- a/Device/Intensity/ArrayUtils.h
+++ b/Device/Data/ArrayUtils.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Device/Intensity/ArrayUtils.h
+//! @file      Device/Data/ArrayUtils.h
 //! @brief     Defines various functions to interact from numpy on Python side
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Device/Histo/Histogram2D.h b/Device/Histo/Histogram2D.h
index 7507cc960e049723753ecd9a58a915748486910e..c26532ea12eaf91b466f03ba840bec02c0dc675b 100644
--- a/Device/Histo/Histogram2D.h
+++ b/Device/Histo/Histogram2D.h
@@ -16,7 +16,7 @@
 #define BORNAGAIN_DEVICE_HISTO_HISTOGRAM2D_H
 
 #include "Device/Histo/IHistogram.h"
-#include "Device/Intensity/ArrayUtils.h"
+#include "Device/Data/ArrayUtils.h"
 
 //! Two dimensional histogram.
 //! @ingroup tools
diff --git a/Device/InputOutput/OutputDataReadWriteINT.cpp b/Device/InputOutput/OutputDataReadWriteINT.cpp
index 1879cd56c20432fc674ccf6b27d0d90b36be5c3d..fbc3d10d599c56f62ec4ef3853c8c53fff4f9e6d 100644
--- a/Device/InputOutput/OutputDataReadWriteINT.cpp
+++ b/Device/InputOutput/OutputDataReadWriteINT.cpp
@@ -15,7 +15,7 @@
 #include "Device/InputOutput/OutputDataReadWriteINT.h"
 #include "Base/Utils/StringUtils.h"
 #include "Device/InputOutput/DataFormatUtils.h"
-#include "Device/Intensity/ArrayUtils.h"
+#include "Device/Data/ArrayUtils.h"
 
 OutputData<double>* OutputDataReadWriteINT::readOutputData(std::istream& input_stream) {
     OutputData<double>* result = new OutputData<double>;
diff --git a/Device/InputOutput/OutputDataReadWriteNumpyTXT.cpp b/Device/InputOutput/OutputDataReadWriteNumpyTXT.cpp
index 0e500d9d3562f13fc9803b5ec08105c3f6d4b45e..717da3a86be652971999a1ef60876d679d48af18 100644
--- a/Device/InputOutput/OutputDataReadWriteNumpyTXT.cpp
+++ b/Device/InputOutput/OutputDataReadWriteNumpyTXT.cpp
@@ -15,7 +15,7 @@
 #include "Device/InputOutput/OutputDataReadWriteNumpyTXT.h"
 #include "Base/Utils/StringUtils.h"
 #include "Device/InputOutput/DataFormatUtils.h"
-#include "Device/Intensity/ArrayUtils.h"
+#include "Device/Data/ArrayUtils.h"
 #include <string>
 #include <vector>
 
diff --git a/Device/Instrument/PyArrayImportUtils.cpp b/Device/Instrument/PyArrayImportUtils.cpp
index 7e229a1be38068c5f01f61ef7d18ba12775d73c0..a0f56d465cb686cf0c7ef04dfd854cd46225b5fe 100644
--- a/Device/Instrument/PyArrayImportUtils.cpp
+++ b/Device/Instrument/PyArrayImportUtils.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "Device/Instrument/PyArrayImportUtils.h"
-#include "Device/Intensity/ArrayUtils.h"
+#include "Device/Data/ArrayUtils.h"
 
 OutputData<double>* PyArrayImport::importArrayToOutputData(const std::vector<double>& vec) {
     return ArrayUtils::createData(vec).release();
diff --git a/Tests/Performance/GUI/CsvImportAssistantPerformanceTest.cpp b/Tests/Performance/GUI/CsvImportAssistantPerformanceTest.cpp
index ecd1df62ccdbe9b484fc813e8a6eb96dd7dacd63..5013199da8d4bec966a0fecf1b6e8438e20a4cba 100644
--- a/Tests/Performance/GUI/CsvImportAssistantPerformanceTest.cpp
+++ b/Tests/Performance/GUI/CsvImportAssistantPerformanceTest.cpp
@@ -14,7 +14,7 @@
 
 #include "Tests/Performance/GUI/CsvImportAssistantPerformanceTest.h"
 #include "Device/Histo/IntensityDataIOFactory.h"
-#include "Device/Intensity/ArrayUtils.h"
+#include "Device/Data/ArrayUtils.h"
 #include "GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvImportAssistant.h"
 #include <ctime>
 #include <iostream>
diff --git a/Tests/UnitTests/Core/DataStructure/ArrayUtilsTest.cpp b/Tests/UnitTests/Core/DataStructure/ArrayUtilsTest.cpp
index 96bbb82d1f498c3a8b2664fab498ee224fb464a7..692238912cd616a2fb30d097c929d9b38ea06be0 100644
--- a/Tests/UnitTests/Core/DataStructure/ArrayUtilsTest.cpp
+++ b/Tests/UnitTests/Core/DataStructure/ArrayUtilsTest.cpp
@@ -1,4 +1,4 @@
-#include "Device/Intensity/ArrayUtils.h"
+#include "Device/Data/ArrayUtils.h"
 #include "Tests/GTestWrapper/google_test.h"
 #include <vector>
 
diff --git a/Tests/UnitTests/GUI/TestCsvImportAssistant.cpp b/Tests/UnitTests/GUI/TestCsvImportAssistant.cpp
index f87b66231e8e671dd899a26e936a028a922a628e..e26d642f7b6d52ab1f2cd465f449ebc4102f105c 100644
--- a/Tests/UnitTests/GUI/TestCsvImportAssistant.cpp
+++ b/Tests/UnitTests/GUI/TestCsvImportAssistant.cpp
@@ -1,5 +1,5 @@
 #include "Device/Histo/IntensityDataIOFactory.h"
-#include "Device/Intensity/ArrayUtils.h"
+#include "Device/Data/ArrayUtils.h"
 #include "Device/Unit/AxisNames.h"
 #include "GUI/coregui/Models/JobItemUtils.h"
 #include "GUI/coregui/Models/SpecularDataItem.h"
diff --git a/auto/Wrap/doxygenDevice.i b/auto/Wrap/doxygenDevice.i
index 5e87f65274c85ce8631730f89cf27ebffa4668c3..b4f86984c204a49088472cda2e49d84ceafcc2d1 100644
--- a/auto/Wrap/doxygenDevice.i
+++ b/auto/Wrap/doxygenDevice.i
@@ -2966,19 +2966,19 @@ Returns true if area defined by two bins is inside or on border of polygon (more
 // File: classConvolve_1_1Workspace.xml
 
 
-// File: namespace_0d10.xml
+// File: namespace_0d104.xml
 
 
-// File: namespace_0d104.xml
+// File: namespace_0d11.xml
 
 
-// File: namespace_0d37.xml
+// File: namespace_0d38.xml
 
 
-// File: namespace_0d62.xml
+// File: namespace_0d63.xml
 
 
-// File: namespace_0d68.xml
+// File: namespace_0d69.xml
 
 
 // File: namespaceArrayUtils.xml
@@ -3207,6 +3207,9 @@ for importing 2D array of doubles from python into  OutputData
 // File: IFootprintFactor_8h.xml
 
 
+// File: ArrayUtils_8h.xml
+
+
 // File: CumulativeValue_8cpp.xml
 
 
@@ -3435,9 +3438,6 @@ make Swappable
 // File: VarianceFunctions_8h.xml
 
 
-// File: ArrayUtils_8h.xml
-
-
 // File: IIntensityFunction_8cpp.xml