diff --git a/sbs.conf b/sbs.conf
index 1cfeef6fa404b03337b3c732e40651a9a034b04f..c850e117ed522640ac1682bdabffeaa847868c2c 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/spi/SensorSpi.cpp
+            src/shared/drivers/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 511c0cc73c26c310655e8dfcfc5943b9acdb4cee..ee7c428a633d54fbbebe79da648fdc70b61a31dc 100644
--- a/src/entrypoints/dma-lowlevel-test.cpp
+++ b/src/entrypoints/dma-lowlevel-test.cpp
@@ -28,7 +28,7 @@
 #include <sensors/MAX21105.h>
 #include <sensors/MS580301BA07.h>
 
-#include <spi/SensorSpi.h>
+#include <drivers/spi/SensorSpi.h>
 #include <sensors/SensorSampling.h>
 
 using namespace miosix;
diff --git a/src/shared/BusTemplate.h b/src/shared/BusTemplate.h
index 34353da609f8c571eeb43a135d5118db44fa8d17..8da277651e43ea791a74e82136c35b47757fe41a 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 <spi/SensorSpi.h>
+#include <drivers/spi/SensorSpi.h>
 
 static const int csDelay=20;
 
diff --git a/src/shared/boards/AnakinBoard.h b/src/shared/boards/AnakinBoard.h
index 10e4025f5e37f3a7d954b5ea1976c5936f9c0023..cc174044668b1f77fab33f919bc7420a9501f24d 100644
--- a/src/shared/boards/AnakinBoard.h
+++ b/src/shared/boards/AnakinBoard.h
@@ -33,7 +33,7 @@
 #include <sensors/MAX21105.h>
 #include <sensors/MS580301BA07.h>
 
-#include <spi/SensorSpi.h>
+#include <drivers/spi/SensorSpi.h>
 #include <sensors/SensorSampling.h>
 
 typedef miosix::Gpio<GPIOA_BASE, 5> GpioSck;
diff --git a/src/shared/spi/SensorSpi.cpp b/src/shared/drivers/spi/SensorSpi.cpp
similarity index 100%
rename from src/shared/spi/SensorSpi.cpp
rename to src/shared/drivers/spi/SensorSpi.cpp
diff --git a/src/shared/spi/SensorSpi.h b/src/shared/drivers/spi/SensorSpi.h
similarity index 100%
rename from src/shared/spi/SensorSpi.h
rename to src/shared/drivers/spi/SensorSpi.h
diff --git a/src/shared/sensors/Sensor.h b/src/shared/sensors/Sensor.h
index a9f0f21cf8c0b0bb0b47e72f933bf048c883f0c6..15a7cc770baaa870bf444470c594034aa71121be 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 <spi/SensorSpi.h>
+#include <drivers/spi/SensorSpi.h>
 
 /** Sensors class diagram
  *               ________ 
diff --git a/src/shared/sensors/SensorSampling.h b/src/shared/sensors/SensorSampling.h
index 1015ad49ffa5f1891ab46e6e69bb8f9e49bd8d11..7d3fcf17460d733dc21682aedf236021ffd3eaea 100644
--- a/src/shared/sensors/SensorSampling.h
+++ b/src/shared/sensors/SensorSampling.h
@@ -23,7 +23,7 @@
 #define SENSOR_SAMPLING_H
 
 #include <Common.h>
-#include <spi/SensorSpi.h>
+#include <drivers/spi/SensorSpi.h>
 #include <diagnostic/Log.h>
 
 class Sensor;