diff --git a/Device/Data/DiffUtil.cpp b/Device/Histo/DiffUtil.cpp
similarity index 97%
rename from Device/Data/DiffUtil.cpp
rename to Device/Histo/DiffUtil.cpp
index 20b11bcee82c409e99f6bdf90146026c17f441b9..f34c7d04c551ee32adc11a6608de8d3f29ccf8d4 100644
--- a/Device/Data/DiffUtil.cpp
+++ b/Device/Histo/DiffUtil.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Device/Data/DiffUtil.cpp
+//! @file      Device/Histo/DiffUtil.cpp
 //! @brief     Implements namespace DataUtils.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Device/Data/DiffUtil.h"
+#include "Device/Histo/DiffUtil.h"
 #include "Base/Axis/Bin.h"
 #include "Base/Axis/FixedBinAxis.h"
 #include "Base/Axis/Frame.h"
@@ -20,7 +20,7 @@
 #include "Base/Math/Numeric.h"
 #include "Base/Util/Assert.h"
 #include "Device/Data/Powerfield.h"
-#include "Device/Data/SimulationResult.h"
+#include "Device/Histo/SimulationResult.h"
 #include "Device/IO/IOFactory.h"
 #include <algorithm>
 #include <iostream>
diff --git a/Device/Data/DiffUtil.h b/Device/Histo/DiffUtil.h
similarity index 90%
rename from Device/Data/DiffUtil.h
rename to Device/Histo/DiffUtil.h
index fb5e493a8b11947e1362e467f830ac9b9bd8b3e0..9711f8d3b215b1f4b0fa54dee88561a45694db8f 100644
--- a/Device/Data/DiffUtil.h
+++ b/Device/Histo/DiffUtil.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Device/Data/DiffUtil.h
+//! @file      Device/Histo/DiffUtil.h
 //! @brief     Defines namespace DataUtils.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_DEVICE_DATA_DIFFUTIL_H
-#define BORNAGAIN_DEVICE_DATA_DIFFUTIL_H
+#ifndef BORNAGAIN_DEVICE_HISTO_DIFFUTIL_H
+#define BORNAGAIN_DEVICE_HISTO_DIFFUTIL_H
 
 #include "Device/Data/Powerfield.h"
 #include <memory>
@@ -45,4 +45,4 @@ bool filesAgree(const std::string& datFileName, const std::string& refFileName,
 
 }
 
-#endif // BORNAGAIN_DEVICE_DATA_DIFFUTIL_H
+#endif // BORNAGAIN_DEVICE_HISTO_DIFFUTIL_H
diff --git a/Device/Data/SimulationResult.cpp b/Device/Histo/SimulationResult.cpp
similarity index 97%
rename from Device/Data/SimulationResult.cpp
rename to Device/Histo/SimulationResult.cpp
index 7eac09bb8800db058bb02636df9f235e1720fee7..1879c5225c9f42fc42d2fa95189f540323b8be11 100644
--- a/Device/Data/SimulationResult.cpp
+++ b/Device/Histo/SimulationResult.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Device/Data/SimulationResult.cpp
+//! @file      Device/Histo/SimulationResult.cpp
 //! @brief     Implements class SimulationResult.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Device/Data/SimulationResult.h"
+#include "Device/Histo/SimulationResult.h"
 #include "Base/Axis/IAxis.h"
 #include "Base/Util/Assert.h"
 #include "Device/Data/Powerfield.h"
diff --git a/Device/Data/SimulationResult.h b/Device/Histo/SimulationResult.h
similarity index 93%
rename from Device/Data/SimulationResult.h
rename to Device/Histo/SimulationResult.h
index 37bc40918df423e56c3bdaca76240944710134bb..3e5cd6a2534b3f7fee5715a710c7ef98a31bd3e7 100644
--- a/Device/Data/SimulationResult.h
+++ b/Device/Histo/SimulationResult.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Device/Data/SimulationResult.h
+//! @file      Device/Histo/SimulationResult.h
 //! @brief     Defines class SimulationResult.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_DEVICE_DATA_SIMULATIONRESULT_H
-#define BORNAGAIN_DEVICE_DATA_SIMULATIONRESULT_H
+#ifndef BORNAGAIN_DEVICE_HISTO_SIMULATIONRESULT_H
+#define BORNAGAIN_DEVICE_HISTO_SIMULATIONRESULT_H
 
 #include "Base/Py/PyObject.h"
 #include "Device/Coord/ICoordSystem.h"
@@ -82,4 +82,4 @@ private:
     std::string m_title;
 };
 
-#endif // BORNAGAIN_DEVICE_DATA_SIMULATIONRESULT_H
+#endif // BORNAGAIN_DEVICE_HISTO_SIMULATIONRESULT_H
diff --git a/Device/IO/IOFactory.cpp b/Device/IO/IOFactory.cpp
index ca3750d85f5678de33986af4d76d54831d383a89..66bc1f08310b2338017e3ca8489fee9698663489 100644
--- a/Device/IO/IOFactory.cpp
+++ b/Device/IO/IOFactory.cpp
@@ -15,7 +15,7 @@
 #include "Device/IO/IOFactory.h"
 #include "Base/Util/Assert.h"
 #include "Base/Util/FileSystemUtils.h"
-#include "Device/Data/SimulationResult.h"
+#include "Device/Histo/SimulationResult.h"
 #include "Device/IO/DataFormatUtils.h"
 #include "Device/IO/ReadReflectometry.h"
 #include "Device/IO/ReadWriteINT.h"
diff --git a/GUI/Model/Data/JobItemUtils.cpp b/GUI/Model/Data/JobItemUtils.cpp
index 0d9fc11805f6eb36abaa15beacde85d4f453faff..f97e3e76fe1b99ff8c150c67668cd0e90f1b0405 100644
--- a/GUI/Model/Data/JobItemUtils.cpp
+++ b/GUI/Model/Data/JobItemUtils.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Model/Data/JobItemUtils.h"
-#include "Device/Data/SimulationResult.h"
+#include "Device/Histo/SimulationResult.h"
 #include "GUI/Model/Data/DataItem.h"
 #include "GUI/Model/Device/InstrumentItems.h"
 #include "GUI/Util/CoordName.h"
diff --git a/GUI/Model/Model/JobQueueData.cpp b/GUI/Model/Model/JobQueueData.cpp
index e88a0228cd3207bfc602141493848acb17ff6151..a9a3597565687bd9d6546fb816bfe7200927fbca 100644
--- a/GUI/Model/Model/JobQueueData.cpp
+++ b/GUI/Model/Model/JobQueueData.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Model/Model/JobQueueData.h"
-#include "Device/Data/SimulationResult.h"
+#include "Device/Histo/SimulationResult.h"
 #include "GUI/Model/Job/JobItem.h"
 #include "GUI/Model/Model/JobModel.h"
 #include "GUI/Model/ToCore/SimulationToCore.h"
diff --git a/GUI/Support/Data/JobWorker.cpp b/GUI/Support/Data/JobWorker.cpp
index 5e17f24085fa0586dcbf6f6c907ea87983007c8f..219627695e68791dcd598fd0da5e9e4c296acab2 100644
--- a/GUI/Support/Data/JobWorker.cpp
+++ b/GUI/Support/Data/JobWorker.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Support/Data/JobWorker.h"
-#include "Device/Data/SimulationResult.h"
+#include "Device/Histo/SimulationResult.h"
 #include "Sim/Simulation/ScatteringSimulation.h"
 #include <QDateTime>
 #include <memory>
diff --git a/GUI/View/PlotComparison/FitComparisonController.cpp b/GUI/View/PlotComparison/FitComparisonController.cpp
index ce680e7a8d51935b77e05dcc77acf336a7d3324c..4941159e50556baeff4a2654ea98e6a3bb03fcc4 100644
--- a/GUI/View/PlotComparison/FitComparisonController.cpp
+++ b/GUI/View/PlotComparison/FitComparisonController.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/View/PlotComparison/FitComparisonController.h"
-#include "Device/Data/DiffUtil.h"
+#include "Device/Histo/DiffUtil.h"
 #include "GUI/Model/Data/IntensityDataItem.h"
 #include "GUI/Model/Data/RealDataItem.h"
 #include "GUI/Model/Data/SpecularDataItem.h"
diff --git a/GUI/View/PlotComparison/FitComparisonViewController.cpp b/GUI/View/PlotComparison/FitComparisonViewController.cpp
index 0f913c0754e0c236964ee787863a996c1de40b11..e2a4b4334a067567d2326f051e82c35f3866ad12 100644
--- a/GUI/View/PlotComparison/FitComparisonViewController.cpp
+++ b/GUI/View/PlotComparison/FitComparisonViewController.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/View/PlotComparison/FitComparisonViewController.h"
-#include "Device/Data/DiffUtil.h"
+#include "Device/Histo/DiffUtil.h"
 #include "GUI/Model/Data/Data1DViewItem.h"
 #include "GUI/Model/Data/DataPropertyContainer.h"
 #include "GUI/Model/Data/RealDataItem.h"
diff --git a/Sim/Fitting/SimDataPair.h b/Sim/Fitting/SimDataPair.h
index b053469073b6c1f3fc222ae7276d878acc23a839..571b91a8d73ce3c788970dcf6240d2cee0813b19 100644
--- a/Sim/Fitting/SimDataPair.h
+++ b/Sim/Fitting/SimDataPair.h
@@ -20,7 +20,7 @@
 #ifndef BORNAGAIN_SIM_FITTING_SIMDATAPAIR_H
 #define BORNAGAIN_SIM_FITTING_SIMDATAPAIR_H
 
-#include "Device/Data/SimulationResult.h"
+#include "Device/Histo/SimulationResult.h"
 #include "Sim/Fitting/FitTypes.h"
 
 class Powerfield;
diff --git a/Sim/Simulation/DepthProbeSimulation.cpp b/Sim/Simulation/DepthProbeSimulation.cpp
index 39882b41d06f7730fe6a1c909770784f465ed944..9e60a7ef0137bf4669a685c4c1215f5ba7b30c96 100644
--- a/Sim/Simulation/DepthProbeSimulation.cpp
+++ b/Sim/Simulation/DepthProbeSimulation.cpp
@@ -19,7 +19,7 @@
 #include "Device/Beam/Beam.h"
 #include "Device/Beam/IFootprintFactor.h"
 #include "Device/Coord/CoordSystem2D.h"
-#include "Device/Data/SimulationResult.h"
+#include "Device/Histo/SimulationResult.h"
 #include "Param/Distrib/Distributions.h"
 #include "Resample/Flux/IFlux.h"
 #include "Sim/Background/IBackground.h"
diff --git a/Sim/Simulation/ISimulation.cpp b/Sim/Simulation/ISimulation.cpp
index ee80ea5b7219342e1d38481da07e47cb4bedae85..4577d9386b3296b112c3fde888f13a40516b4973 100644
--- a/Sim/Simulation/ISimulation.cpp
+++ b/Sim/Simulation/ISimulation.cpp
@@ -16,7 +16,7 @@
 #include "Base/Progress/ProgressHandler.h"
 #include "Base/Util/Assert.h"
 #include "Base/Util/StringUtils.h"
-#include "Device/Data/SimulationResult.h"
+#include "Device/Histo/SimulationResult.h"
 #include "Resample/Options/SimulationOptions.h"
 #include "Resample/Processed/ReSample.h"
 #include "Sample/Multilayer/MultiLayer.h"
diff --git a/Sim/Simulation/OffspecSimulation.cpp b/Sim/Simulation/OffspecSimulation.cpp
index 5884a0fb60be601cf1d60e09224b329e44dbfe39..786253e6dec216bfcf0677c94631f1ea23c93c6d 100644
--- a/Sim/Simulation/OffspecSimulation.cpp
+++ b/Sim/Simulation/OffspecSimulation.cpp
@@ -20,7 +20,7 @@
 #include "Device/Beam/Beam.h"
 #include "Device/Coord/CoordSystem2D.h"
 #include "Device/Data/Powerfield.h"
-#include "Device/Data/SimulationResult.h"
+#include "Device/Histo/SimulationResult.h"
 #include "Device/Detector/RectangularDetector.h"
 #include "Device/Detector/SphericalDetector.h"
 #include "Param/Distrib/Distributions.h"
diff --git a/Sim/Simulation/ScatteringSimulation.cpp b/Sim/Simulation/ScatteringSimulation.cpp
index dec3b08e1836720fb097590a980ad7fdb098d8a2..5b775662e95c7c17ebe56d31a9e437a3f621388d 100644
--- a/Sim/Simulation/ScatteringSimulation.cpp
+++ b/Sim/Simulation/ScatteringSimulation.cpp
@@ -17,7 +17,7 @@
 #include "Base/Util/Assert.h"
 #include "Device/Coord/CoordSystem2D.h"
 #include "Device/Data/Powerfield.h"
-#include "Device/Data/SimulationResult.h"
+#include "Device/Histo/SimulationResult.h"
 #include "Device/Detector/IDetector.h"
 #include "Resample/Element/DiffuseElement.h"
 
diff --git a/Sim/Simulation/SpecularSimulation.cpp b/Sim/Simulation/SpecularSimulation.cpp
index fdae0bd5212450e9ee21e3e517daa1c936701a4c..c8fa76a77ce37746c13d3ed65d243325567fafd6 100644
--- a/Sim/Simulation/SpecularSimulation.cpp
+++ b/Sim/Simulation/SpecularSimulation.cpp
@@ -18,7 +18,7 @@
 #include "Device/Beam/IFootprintFactor.h"
 #include "Device/Coord/CoordSystem1D.h"
 #include "Device/Data/Powerfield.h"
-#include "Device/Data/SimulationResult.h"
+#include "Device/Histo/SimulationResult.h"
 #include "Param/Distrib/Distributions.h"
 #include "Resample/Element/SpecularElement.h"
 #include "Resample/Processed/ReSample.h"
diff --git a/Tests/Functional/Core/Consistence/CompareTwoReferences.cpp b/Tests/Functional/Core/Consistence/CompareTwoReferences.cpp
index e8e945b3b1cd145bbb27ae67b9b98aedca4d77b8..850c2f83283346650219174617ba398cd30cfc76 100644
--- a/Tests/Functional/Core/Consistence/CompareTwoReferences.cpp
+++ b/Tests/Functional/Core/Consistence/CompareTwoReferences.cpp
@@ -15,7 +15,7 @@
 #include "BATesting.h"
 #include "Base/Util/Assert.h"
 #include "Base/Util/FileSystemUtils.h"
-#include "Device/Data/DiffUtil.h"
+#include "Device/Histo/DiffUtil.h"
 #include "Device/Data/Powerfield.h"
 #include "Device/IO/IOFactory.h"
 #include <iostream>
diff --git a/Tests/Functional/Core/Consistence/ConsistenceTests.cpp b/Tests/Functional/Core/Consistence/ConsistenceTests.cpp
index 80a6dac0989c754e70e6f4b2dc511bc8dfa926f5..d5b3ca4ae2204faf2642ae28e9b14b8c8e67992f 100644
--- a/Tests/Functional/Core/Consistence/ConsistenceTests.cpp
+++ b/Tests/Functional/Core/Consistence/ConsistenceTests.cpp
@@ -16,7 +16,7 @@
 // some other tests, coincide within reasonable numeric error margins.
 
 #include "Device/Data/Powerfield.h"
-#include "Device/Data/SimulationResult.h"
+#include "Device/Histo/SimulationResult.h"
 #include "Sample/StandardSamples/CylindersAndPrismsBuilder.h"
 #include "Sample/StandardSamples/PlainMultiLayerBySLDBuilder.h"
 #include "Sim/Simulation/ScatteringSimulation.h"
diff --git a/Tests/Functional/Core/CoreSpecial/CoreIOPathTest.cpp b/Tests/Functional/Core/CoreSpecial/CoreIOPathTest.cpp
index 98e90a155d86b5492c5907ab0ac8e2cacd274737..9578d113743d9be3de63f2c7722e61c90c14390f 100644
--- a/Tests/Functional/Core/CoreSpecial/CoreIOPathTest.cpp
+++ b/Tests/Functional/Core/CoreSpecial/CoreIOPathTest.cpp
@@ -15,7 +15,7 @@
 #include "BATesting.h"
 #include "Base/Axis/FixedBinAxis.h"
 #include "Base/Util/FileSystemUtils.h"
-#include "Device/Data/DiffUtil.h"
+#include "Device/Histo/DiffUtil.h"
 #include "Device/IO/IOFactory.h"
 #include "Tests/GTestWrapper/google_test.h"
 #include <filesystem>
diff --git a/Tests/Functional/Core/CoreSpecial/FourierTransformationTest.cpp b/Tests/Functional/Core/CoreSpecial/FourierTransformationTest.cpp
index 8e53cf07d83b680156be7ecca71ffc633bfee65f..99c9b4ac4cdebfaa6e159acf3e615e8693fcbfc8 100644
--- a/Tests/Functional/Core/CoreSpecial/FourierTransformationTest.cpp
+++ b/Tests/Functional/Core/CoreSpecial/FourierTransformationTest.cpp
@@ -15,7 +15,7 @@
 #include "BATesting.h"
 #include "Base/Util/FileSystemUtils.h"
 #include "Device/Data/DataUtils.h"
-#include "Device/Data/DiffUtil.h"
+#include "Device/Histo/DiffUtil.h"
 #include "Device/IO/IOFactory.h"
 #include "Tests/GTestWrapper/google_test.h"
 #include <iostream>
diff --git a/Tests/Functional/Core/SuitePersist/Check.cpp b/Tests/Functional/Core/SuitePersist/Check.cpp
index b86add46ecdd9a373cc3c052177b98c048b7a19c..3124d1119e52ad96f1240a731c59003dcfccd0c1 100644
--- a/Tests/Functional/Core/SuitePersist/Check.cpp
+++ b/Tests/Functional/Core/SuitePersist/Check.cpp
@@ -16,9 +16,9 @@
 #include "BATesting.h"
 #include "Base/Util/Assert.h"
 #include "Base/Util/FileSystemUtils.h"
-#include "Device/Data/DiffUtil.h"
+#include "Device/Histo/DiffUtil.h"
 #include "Device/Data/Powerfield.h"
-#include "Device/Data/SimulationResult.h"
+#include "Device/Histo/SimulationResult.h"
 #include "Device/IO/IOFactory.h"
 #include "Sim/Simulation/ISimulation.h"
 #include <iostream>
diff --git a/Tests/Functional/GUI/Check.cpp b/Tests/Functional/GUI/Check.cpp
index 7b457638ffefdf040c67043009402139bc19b164..fa7e309591382e6b16f23878be38a92e3bdb810a 100644
--- a/Tests/Functional/GUI/Check.cpp
+++ b/Tests/Functional/GUI/Check.cpp
@@ -15,9 +15,9 @@
 #include "BABuild.h"
 #include "BATesting.h"
 #include "Base/Util/FileSystemUtils.h"
-#include "Device/Data/DiffUtil.h"
+#include "Device/Histo/DiffUtil.h"
 #include "Device/Data/Powerfield.h"
-#include "Device/Data/SimulationResult.h"
+#include "Device/Histo/SimulationResult.h"
 #include "Device/IO/IOFactory.h"
 #include "GUI/Model/Device/InstrumentCollection.h"
 #include "GUI/Model/FromCore/ItemizeSample.h"
diff --git a/Tests/Functional/Py/Suite/Check.cpp b/Tests/Functional/Py/Suite/Check.cpp
index 6bb0f752b2bc2611fbac8ada52ff20a85636d88a..ed261dccb4044bfd38456197261c7b0184c5d649 100644
--- a/Tests/Functional/Py/Suite/Check.cpp
+++ b/Tests/Functional/Py/Suite/Check.cpp
@@ -15,9 +15,9 @@
 #include "BABuild.h"
 #include "BATesting.h"
 #include "Base/Util/FileSystemUtils.h"
-#include "Device/Data/DiffUtil.h"
+#include "Device/Histo/DiffUtil.h"
 #include "Device/Data/Powerfield.h"
-#include "Device/Data/SimulationResult.h"
+#include "Device/Histo/SimulationResult.h"
 #include "Device/IO/IOFactory.h"
 #include "Sim/Export/ExportToPython.h"
 #include "Sim/Simulation/ISimulation.h"
diff --git a/Tests/Functional/Suite/RunTest.cpp b/Tests/Functional/Suite/RunTest.cpp
index b30166ee8a426fd0c66fa24ce6db212f03989d90..b3e24b20727267bc839f80e1a7b157f3f10fac0e 100644
--- a/Tests/Functional/Suite/RunTest.cpp
+++ b/Tests/Functional/Suite/RunTest.cpp
@@ -14,7 +14,7 @@
 
 #include "Tests/Functional/Suite/RunTest.h"
 #include "Base/Axis/IAxis.h"
-#include "Device/Data/SimulationResult.h"
+#include "Device/Histo/SimulationResult.h"
 #include "Tests/Functional/Suite/TestSuite.h" // provides F_TEST macros to be executed by gtest
 #include <iostream>
 
diff --git a/Tests/Unit/GUI/Utils.cpp b/Tests/Unit/GUI/Utils.cpp
index 97ea561673dbdb6ac2f19b0b186b3cecb9c2cb38..8a5404815e06436e8324959b4f63430245e5ebfc 100644
--- a/Tests/Unit/GUI/Utils.cpp
+++ b/Tests/Unit/GUI/Utils.cpp
@@ -14,7 +14,7 @@
 
 #include "Tests/Unit/GUI/Utils.h"
 #include "Base/Axis/FixedBinAxis.h"
-#include "Device/Data/DiffUtil.h"
+#include "Device/Histo/DiffUtil.h"
 #include "Device/IO/IOFactory.h"
 #include "GUI/Model/Data/RealDataItem.h"
 #include "GUI/Model/Model/SessionModel.h"
diff --git a/Tests/Unit/Sim/SpecularSimulationTest.cpp b/Tests/Unit/Sim/SpecularSimulationTest.cpp
index 8f6899f207a542c7e5b5ab7f0ce7892dc8ad2656..b887fe6bfa73db291ab8e6dcc91a91462d67cbcb 100644
--- a/Tests/Unit/Sim/SpecularSimulationTest.cpp
+++ b/Tests/Unit/Sim/SpecularSimulationTest.cpp
@@ -5,7 +5,7 @@
 #include "Base/Math/Constants.h"
 #include "Device/Beam/Beam.h"
 #include "Device/Data/Powerfield.h"
-#include "Device/Data/SimulationResult.h"
+#include "Device/Histo/SimulationResult.h"
 #include "Device/Detector/IDetector.h"
 #include "Param/Distrib/Distributions.h"
 #include "Sample/Material/MaterialFactoryFuncs.h"
diff --git a/Wrap/Swig/libBornAgainDevice.i b/Wrap/Swig/libBornAgainDevice.i
index 9e2ef71de9ea16abd10a7bbbd87a9010f77c0f34..71fb240566dd5a466bdf3249c130fbe4491c2827 100644
--- a/Wrap/Swig/libBornAgainDevice.i
+++ b/Wrap/Swig/libBornAgainDevice.i
@@ -28,8 +28,8 @@
 #include "Device/Beam/FootprintGauss.h"
 #include "Device/Beam/FootprintSquare.h"
 #include "Device/Data/DataUtils.h"
-#include "Device/Data/DiffUtil.h"
-#include "Device/Data/SimulationResult.h"
+#include "Device/Histo/DiffUtil.h"
+#include "Device/Histo/SimulationResult.h"
 #include "Device/Detector/RectangularDetector.h"
 #include "Device/Detector/SphericalDetector.h"
 #include "Device/IO/IOFactory.h"
@@ -57,7 +57,7 @@
 %newobject DataUtils::Data::importArrayToPowerfield;
 
 %include "Device/Data/Powerfield.h"
-%include "Device/Data/DiffUtil.h"
+%include "Device/Histo/DiffUtil.h"
 %include "Device/Data/DataUtils.h"
 
 %include "Device/Beam/Beam.h"
@@ -82,4 +82,4 @@
 
 %include "Device/Data/DataUtils.h"
 %include "Device/IO/IOFactory.h"
-%include "Device/Data/SimulationResult.h"
+%include "Device/Histo/SimulationResult.h"