diff --git a/src/entrypoints/anakin-test-dma.cpp b/src/entrypoints/anakin-test-dma.cpp
index 820023085ebb0e78fea33f1f2e85179c9b067d89..e5f4f09d5b50a28b9a4451fadb45396d4da46151 100644
--- a/src/entrypoints/anakin-test-dma.cpp
+++ b/src/entrypoints/anakin-test-dma.cpp
@@ -23,7 +23,7 @@
 #include <Common.h>
 #include <Leds.h>
 #include <boards/AnakinBoard.h>
-#include <log/Log.h>
+#include <diagnostic/Log.h>
 
 using namespace miosix;
 
diff --git a/src/shared/DMA/SensorSampling.h b/src/shared/DMA/SensorSampling.h
index 10ac318587d884ced8990df9d92fc2eec4293cea..1a741f6331796317c7a236012658234c8b72cdc5 100644
--- a/src/shared/DMA/SensorSampling.h
+++ b/src/shared/DMA/SensorSampling.h
@@ -24,7 +24,7 @@
 
 #include <Common.h>
 #include <DMA/DMA.h>
-#include <log/Log.h>
+#include <diagnostic/Log.h>
 
 class Sensor;
 class DMASensorSampler
diff --git a/src/shared/boards/Board.h b/src/shared/boards/Board.h
index 92c353d791379220bc2bfc7daede4e04b2cdadfa..89020e9a0533466ffa1cf1342f8a1f9634979035 100644
--- a/src/shared/boards/Board.h
+++ b/src/shared/boards/Board.h
@@ -27,7 +27,7 @@
 #include <BusTemplate.h>
 #include <Singleton.h>
 #include <sensors/Sensor.h>
-#include <log/Log.h>
+#include <diagnostic/Log.h>
 
 enum DataType
 {
diff --git a/src/shared/log/Log.h b/src/shared/diagnostic/Log.h
similarity index 100%
rename from src/shared/log/Log.h
rename to src/shared/diagnostic/Log.h
diff --git a/src/shared/logging/logger.hpp b/src/shared/diagnostic/logger.hpp
similarity index 100%
rename from src/shared/logging/logger.hpp
rename to src/shared/diagnostic/logger.hpp
diff --git a/src/shared/logging/logger_example.cpp b/src/shared/diagnostic/logger_example.cpp
similarity index 100%
rename from src/shared/logging/logger_example.cpp
rename to src/shared/diagnostic/logger_example.cpp