diff --git a/Base/Pixel/Pixel.cpp b/Base/Axis/Pixel.cpp
similarity index 96%
rename from Base/Pixel/Pixel.cpp
rename to Base/Axis/Pixel.cpp
index c96b71897ab4aa2600098a15dff5714804343fb7..1042c322971eaffe853d52a34bd38c15b40dd0f1 100644
--- a/Base/Pixel/Pixel.cpp
+++ b/Base/Axis/Pixel.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Base/Pixel/Pixel.cpp
+//! @file      Base/Axis/Pixel.cpp
 //! @brief     Implements class Pixel.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Base/Pixel/Pixel.h"
+#include "Base/Axis/Pixel.h"
 #include "Base/Axis/Bin.h"
 #include "Base/Vector/GisasDirection.h"
 
diff --git a/Base/Pixel/Pixel.h b/Base/Axis/Pixel.h
similarity index 84%
rename from Base/Pixel/Pixel.h
rename to Base/Axis/Pixel.h
index 29a8c0bfd754671e3a2da3ff03c978ebed280a60..5438c06c0c0fead033b27913ebbc3f51468752f0 100644
--- a/Base/Pixel/Pixel.h
+++ b/Base/Axis/Pixel.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Base/Pixel/Pixel.h
+//! @file      Base/Axis/Pixel.h
 //! @brief     Defines and implements interface Pixel.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -15,14 +15,14 @@
 #ifdef SWIG
 #error no need to expose this header to Swig
 #endif // SWIG
-#ifndef BORNAGAIN_BASE_PIXEL_PIXEL_H
-#define BORNAGAIN_BASE_PIXEL_PIXEL_H
+#ifndef BORNAGAIN_BASE_AXIS_PIXEL_H
+#define BORNAGAIN_BASE_AXIS_PIXEL_H
 
 #include <heinz/Vectors3D.h>
 
 class Bin1D;
 
-//! A rectangular pixel in a two-dimensional SphericalDetector.
+//! A rectangular pixel in a two-dimensional detector.
 
 class Pixel {
 public:
@@ -42,4 +42,4 @@ private:
     mutable double m_solid_angle;
 };
 
-#endif // BORNAGAIN_BASE_PIXEL_PIXEL_H
+#endif // BORNAGAIN_BASE_AXIS_PIXEL_H
diff --git a/Device/Detector/Detector2D.cpp b/Device/Detector/Detector2D.cpp
index 85306fae4b79a765ec2b773cffe42d9b8cbe13bc..2d81e9a19e6acc87cc79c27ea6a3ce6500c9e7d1 100644
--- a/Device/Detector/Detector2D.cpp
+++ b/Device/Detector/Detector2D.cpp
@@ -16,7 +16,7 @@
 #include "Base/Axis/Frame.h"
 #include "Base/Axis/MakeScale.h"
 #include "Base/Axis/Scale.h"
-#include "Base/Pixel/Pixel.h"
+#include "Base/Axis/Pixel.h"
 #include "Base/Util/Assert.h"
 #include "Device/Beam/Beam.h"
 #include "Device/Resolution/IDetectorResolution.h"
diff --git a/Device/Detector/OffspecDetector.cpp b/Device/Detector/OffspecDetector.cpp
index f71ceae177f67b9efebcc663bf76d48671b24e55..a5f13a6a719121affb75f9004ca92eb3c55e8f4f 100644
--- a/Device/Detector/OffspecDetector.cpp
+++ b/Device/Detector/OffspecDetector.cpp
@@ -15,7 +15,7 @@
 #include "Device/Detector/OffspecDetector.h"
 #include "Base/Axis/MakeScale.h"
 #include "Base/Axis/Scale.h"
-#include "Base/Pixel/Pixel.h"
+#include "Base/Axis/Pixel.h"
 #include "Base/Util/Assert.h"
 #include <iostream>
 
diff --git a/Device/Detector/SphericalDetector.cpp b/Device/Detector/SphericalDetector.cpp
index 65b8b4bdd13b626e136db6d8b6a25d67bf661ee9..eb7dd2b042d4fafd9620397b15599f5790494803 100644
--- a/Device/Detector/SphericalDetector.cpp
+++ b/Device/Detector/SphericalDetector.cpp
@@ -16,7 +16,7 @@
 #include "Base/Axis/Frame.h"
 #include "Base/Axis/MakeScale.h"
 #include "Base/Axis/Scale.h"
-#include "Base/Pixel/Pixel.h"
+#include "Base/Axis/Pixel.h"
 #include "Device/Beam/Beam.h"
 #include "Device/Resolution/IDetectorResolution.h"
 #include <stdexcept>
diff --git a/Resample/Element/DiffuseElement.cpp b/Resample/Element/DiffuseElement.cpp
index 86898c76e9d70be95e677f21526bfedcba38c3b6..a746063d3ab24019486a8f65f2501387401572e4 100644
--- a/Resample/Element/DiffuseElement.cpp
+++ b/Resample/Element/DiffuseElement.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "Resample/Element/DiffuseElement.h"
-#include "Base/Pixel/Pixel.h"
+#include "Base/Axis/Pixel.h"
 #include "Base/Vector/GisasDirection.h"
 #include "Base/Vector/WavevectorInfo.h"
 #include "Resample/Flux/IFlux.h"
diff --git a/Sim/Simulation/OffspecSimulation.cpp b/Sim/Simulation/OffspecSimulation.cpp
index 6b62482c588ca9d8e27f6e87b30f6b651e6dd340..842a39e66f7052c59353661ee68fde6dd05f42ef 100644
--- a/Sim/Simulation/OffspecSimulation.cpp
+++ b/Sim/Simulation/OffspecSimulation.cpp
@@ -15,7 +15,7 @@
 #include "Sim/Simulation/OffspecSimulation.h"
 #include "Base/Axis/Frame.h"
 #include "Base/Axis/Scale.h"
-#include "Base/Pixel/Pixel.h"
+#include "Base/Axis/Pixel.h"
 #include "Base/Progress/ProgressHandler.h"
 #include "Base/Util/Assert.h"
 #include "Device/Beam/IFootprint.h"
diff --git a/Sim/Simulation/ScatteringSimulation.cpp b/Sim/Simulation/ScatteringSimulation.cpp
index e31afb477cb420f43dd04c7e661c69d9ac8a6808..51ff1e6fae0fb40bc3636f9ecbdf11ca58b87713 100644
--- a/Sim/Simulation/ScatteringSimulation.cpp
+++ b/Sim/Simulation/ScatteringSimulation.cpp
@@ -15,7 +15,7 @@
 #include "Sim/Simulation/ScatteringSimulation.h"
 #include "Base/Axis/Frame.h"
 #include "Base/Axis/Scale.h"
-#include "Base/Pixel/Pixel.h"
+#include "Base/Axis/Pixel.h"
 #include "Base/Progress/ProgressHandler.h"
 #include "Base/Util/Assert.h"
 #include "Device/Beam/Beam.h"