diff --git a/sbs.conf b/sbs.conf
index f78b8b937624b320c55d23c99d1429e8718fb83a..1cfeef6fa404b03337b3c732e40651a9a034b04f 100644
--- a/sbs.conf
+++ b/sbs.conf
@@ -68,7 +68,7 @@ Files:      src/shared/canbus/CanManager.cpp
 [shared]
 Type:       srcfiles
 Files:      src/shared/events/Scheduler.cpp
-            src/shared/DMA/DMA.cpp
+            src/shared/spi/SensorSpi.cpp
             src/shared/diagnostic/CpuMeter.cpp
 
 [i2c]
diff --git a/src/entrypoints/dma-lowlevel-test.cpp b/src/entrypoints/dma-lowlevel-test.cpp
index a77a1d25b833a0a29e5de072b2262a0b401bf9ed..511c0cc73c26c310655e8dfcfc5943b9acdb4cee 100644
--- a/src/entrypoints/dma-lowlevel-test.cpp
+++ b/src/entrypoints/dma-lowlevel-test.cpp
@@ -28,8 +28,8 @@
 #include <sensors/MAX21105.h>
 #include <sensors/MS580301BA07.h>
 
-#include <DMA/DMA.h>
-#include <DMA/SensorSampling.h>
+#include <spi/SensorSpi.h>
+#include <sensors/SensorSampling.h>
 
 using namespace miosix;
 
diff --git a/src/shared/BusTemplate.h b/src/shared/BusTemplate.h
index 2a52ea0315b9936051c5cc08edc0beb99a4e24df..34353da609f8c571eeb43a135d5118db44fa8d17 100644
--- a/src/shared/BusTemplate.h
+++ b/src/shared/BusTemplate.h
@@ -32,7 +32,7 @@
 #include <Singleton.h>
 #include "i2c/stm32f2_f4_i2c.h"
 #include <util/software_i2c.h>
-#include <DMA/DMA.h>
+#include <spi/SensorSpi.h>
 
 static const int csDelay=20;
 
diff --git a/src/shared/boards/AnakinBoard.h b/src/shared/boards/AnakinBoard.h
index 1d4929f795146121daa3035a88c2ba7d45aac759..10e4025f5e37f3a7d954b5ea1976c5936f9c0023 100644
--- a/src/shared/boards/AnakinBoard.h
+++ b/src/shared/boards/AnakinBoard.h
@@ -33,8 +33,8 @@
 #include <sensors/MAX21105.h>
 #include <sensors/MS580301BA07.h>
 
-#include <DMA/DMA.h>
-#include <DMA/SensorSampling.h>
+#include <spi/SensorSpi.h>
+#include <sensors/SensorSampling.h>
 
 typedef miosix::Gpio<GPIOA_BASE, 5> GpioSck;
 typedef miosix::Gpio<GPIOA_BASE, 6> GpioMiso;
diff --git a/src/shared/sensors/Sensor.h b/src/shared/sensors/Sensor.h
index a6a57c526c5ab4fef98949ff7c35f35444f75540..a9f0f21cf8c0b0bb0b47e72f933bf048c883f0c6 100644
--- a/src/shared/sensors/Sensor.h
+++ b/src/shared/sensors/Sensor.h
@@ -27,7 +27,7 @@
 #include <Common.h>
 #include <math/Vec3.h>
 #include <math/Quaternion.h>
-#include <DMA/DMA.h>
+#include <spi/SensorSpi.h>
 
 /** Sensors class diagram
  *               ________ 
diff --git a/src/shared/DMA/SensorSampling.h b/src/shared/sensors/SensorSampling.h
similarity index 98%
rename from src/shared/DMA/SensorSampling.h
rename to src/shared/sensors/SensorSampling.h
index 1a741f6331796317c7a236012658234c8b72cdc5..1015ad49ffa5f1891ab46e6e69bb8f9e49bd8d11 100644
--- a/src/shared/DMA/SensorSampling.h
+++ b/src/shared/sensors/SensorSampling.h
@@ -23,7 +23,7 @@
 #define SENSOR_SAMPLING_H
 
 #include <Common.h>
-#include <DMA/DMA.h>
+#include <spi/SensorSpi.h>
 #include <diagnostic/Log.h>
 
 class Sensor;
diff --git a/src/shared/DMA/DMA.cpp b/src/shared/spi/SensorSpi.cpp
similarity index 99%
rename from src/shared/DMA/DMA.cpp
rename to src/shared/spi/SensorSpi.cpp
index bd2ae0e51d541a18f1ef5a994a1df51a34d3c8af..843cc4b827cfc1e0df87216cdc99db818d557558 100644
--- a/src/shared/DMA/DMA.cpp
+++ b/src/shared/spi/SensorSpi.cpp
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-#include "DMA.h"
+#include "SensorSpi.h"
 #include <kernel/scheduler/scheduler.h>
 
 using namespace std;
diff --git a/src/shared/DMA/DMA.h b/src/shared/spi/SensorSpi.h
similarity index 98%
rename from src/shared/DMA/DMA.h
rename to src/shared/spi/SensorSpi.h
index dbaba8eba2f05ae8ea45be917ce045f909ed9e85..8c71a1a386adc104abb865145d772f64ca5d476b 100644
--- a/src/shared/DMA/DMA.h
+++ b/src/shared/spi/SensorSpi.h
@@ -20,8 +20,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef SPI_DRIVER_H
-#define SPI_DRIVER_H
+#ifndef SENSOR_SPI_H
+#define SENSOR_SPI_H
 
 #include <Common.h>
 
@@ -145,4 +145,4 @@ private:
     std::vector<uint8_t> fromPeripheral;
 };
 
-#endif //SPI_DRIVER_H
+#endif //SENSOR_SPI_H