diff --git a/sbs.conf b/sbs.conf
index c850e117ed522640ac1682bdabffeaa847868c2c..cecf02e0c9d282ccd75f072138fcf288a4d6334a 100644
--- a/sbs.conf
+++ b/sbs.conf
@@ -59,10 +59,10 @@
 # List of Source files (libraries, etc)
 [canbus]
 Type:       srcfiles
-Files:      src/shared/canbus/CanManager.cpp 
-            src/shared/canbus/CanBus.cpp 
-            src/shared/canbus/CanSocket.cpp 
-            src/shared/canbus/CanInterrupt.cpp 
+Files:      src/shared/drivers/canbus/CanManager.cpp 
+            src/shared/drivers/canbus/CanBus.cpp 
+            src/shared/drivers/canbus/CanSocket.cpp 
+            src/shared/drivers/canbus/CanInterrupt.cpp 
 
 # Common files (like event scheduler)
 [shared]
diff --git a/src/entrypoints/anakin-test-canbus.cpp b/src/entrypoints/anakin-test-canbus.cpp
index f1786a96e2520995a9655c5fb1e7bbbe27451db2..2ef66cd103f76d9a1911cb91f5626afe11ce5be4 100644
--- a/src/entrypoints/anakin-test-canbus.cpp
+++ b/src/entrypoints/anakin-test-canbus.cpp
@@ -24,9 +24,9 @@
 
 #include <Common.h>
 #include <BusTemplate.h>
-#include <canbus/CanManager.h>
-#include <canbus/CanSocket.h>
-#include <canbus/CanUtils.h>
+#include <drivers/canbus/CanManager.h>
+#include <drivers/canbus/CanSocket.h>
+#include <drivers/canbus/CanUtils.h>
 
 using namespace miosix;
 
diff --git a/src/entrypoints/canbus-test.cpp b/src/entrypoints/canbus-test.cpp
index 6e2c816570ed0a3b6c6449521002c2fe6a2939e5..46a9e54bd8f962f94f6bf68f7d7aff6d964da23d 100644
--- a/src/entrypoints/canbus-test.cpp
+++ b/src/entrypoints/canbus-test.cpp
@@ -21,9 +21,9 @@
  */
 
 #include <Common.h>
-#include <canbus/CanManager.h>
-#include <canbus/CanSocket.h>
-#include <canbus/CanUtils.h>
+#include <drivers/canbus/CanManager.h>
+#include <drivers/canbus/CanSocket.h>
+#include <drivers/canbus/CanUtils.h>
 #include <sensors/MPU9250.h>
 
 using namespace std;
diff --git a/src/shared/canbus/CanBus.cpp b/src/shared/drivers/canbus/CanBus.cpp
similarity index 100%
rename from src/shared/canbus/CanBus.cpp
rename to src/shared/drivers/canbus/CanBus.cpp
diff --git a/src/shared/canbus/CanBus.h b/src/shared/drivers/canbus/CanBus.h
similarity index 100%
rename from src/shared/canbus/CanBus.h
rename to src/shared/drivers/canbus/CanBus.h
diff --git a/src/shared/canbus/CanInterrupt.cpp b/src/shared/drivers/canbus/CanInterrupt.cpp
similarity index 100%
rename from src/shared/canbus/CanInterrupt.cpp
rename to src/shared/drivers/canbus/CanInterrupt.cpp
diff --git a/src/shared/canbus/CanManager.cpp b/src/shared/drivers/canbus/CanManager.cpp
similarity index 100%
rename from src/shared/canbus/CanManager.cpp
rename to src/shared/drivers/canbus/CanManager.cpp
diff --git a/src/shared/canbus/CanManager.h b/src/shared/drivers/canbus/CanManager.h
similarity index 100%
rename from src/shared/canbus/CanManager.h
rename to src/shared/drivers/canbus/CanManager.h
diff --git a/src/shared/canbus/CanSocket.cpp b/src/shared/drivers/canbus/CanSocket.cpp
similarity index 100%
rename from src/shared/canbus/CanSocket.cpp
rename to src/shared/drivers/canbus/CanSocket.cpp
diff --git a/src/shared/canbus/CanSocket.h b/src/shared/drivers/canbus/CanSocket.h
similarity index 100%
rename from src/shared/canbus/CanSocket.h
rename to src/shared/drivers/canbus/CanSocket.h
diff --git a/src/shared/canbus/CanUtils.h b/src/shared/drivers/canbus/CanUtils.h
similarity index 100%
rename from src/shared/canbus/CanUtils.h
rename to src/shared/drivers/canbus/CanUtils.h