diff --git a/libuavcan/include/uavcan/can_driver.hpp b/libuavcan/include/uavcan/driver/can.hpp
similarity index 99%
rename from libuavcan/include/uavcan/can_driver.hpp
rename to libuavcan/include/uavcan/driver/can.hpp
index b0f143b602..c43de6ef2a 100644
--- a/libuavcan/include/uavcan/can_driver.hpp
+++ b/libuavcan/include/uavcan/driver/can.hpp
@@ -10,7 +10,7 @@
 #include <string>
 #include <uavcan/stdint.hpp>
 #include <uavcan/impl_constants.hpp>
-#include <uavcan/system_clock.hpp>
+#include <uavcan/driver/system_clock.hpp>
 
 namespace uavcan
 {
diff --git a/libuavcan/include/uavcan/system_clock.hpp b/libuavcan/include/uavcan/driver/system_clock.hpp
similarity index 100%
rename from libuavcan/include/uavcan/system_clock.hpp
rename to libuavcan/include/uavcan/driver/system_clock.hpp
diff --git a/libuavcan/include/uavcan/transport/can_io.hpp b/libuavcan/include/uavcan/transport/can_io.hpp
index 848983fe23..60faca97d7 100644
--- a/libuavcan/include/uavcan/transport/can_io.hpp
+++ b/libuavcan/include/uavcan/transport/can_io.hpp
@@ -11,8 +11,8 @@
 #include <uavcan/dynamic_memory.hpp>
 #include <uavcan/impl_constants.hpp>
 #include <uavcan/util/compile_time.hpp>
-#include <uavcan/can_driver.hpp>
-#include <uavcan/system_clock.hpp>
+#include <uavcan/driver/can.hpp>
+#include <uavcan/driver/system_clock.hpp>
 #include <uavcan/time.hpp>
 
 namespace uavcan
diff --git a/libuavcan/src/can_driver.cpp b/libuavcan/src/driver/can.cpp
similarity index 98%
rename from libuavcan/src/can_driver.cpp
rename to libuavcan/src/driver/can.cpp
index b8042bdf40..caab7a2090 100644
--- a/libuavcan/src/can_driver.cpp
+++ b/libuavcan/src/driver/can.cpp
@@ -5,7 +5,7 @@
 
 #include <cstdio>
 #include <cassert>
-#include <uavcan/can_driver.hpp>
+#include <uavcan/driver/can.hpp>
 
 namespace uavcan
 {
diff --git a/libuavcan/test/clock.hpp b/libuavcan/test/clock.hpp
index f399ece319..4b7accbd32 100644
--- a/libuavcan/test/clock.hpp
+++ b/libuavcan/test/clock.hpp
@@ -5,9 +5,9 @@
 #pragma once
 
 #include <cassert>
-#include <uavcan/system_clock.hpp>
 #include <time.h>
 #include <sys/time.h>
+#include <uavcan/driver/system_clock.hpp>
 
 class SystemClockMock : public uavcan::ISystemClock
 {
diff --git a/libuavcan/test/transport/can/can.hpp b/libuavcan/test/transport/can/can.hpp
index 4a023c72d0..348090c640 100644
--- a/libuavcan/test/transport/can/can.hpp
+++ b/libuavcan/test/transport/can/can.hpp
@@ -10,8 +10,8 @@
 #include <gtest/gtest.h>
 #include <uavcan/transport/can_io.hpp>
 #include <uavcan/transport/frame.hpp>
-#include <uavcan/can_driver.hpp>
-#include <uavcan/system_clock.hpp>
+#include <uavcan/driver/can.hpp>
+#include <uavcan/driver/system_clock.hpp>
 #include "../../clock.hpp"
 
 
diff --git a/libuavcan/test/transport/can/can_driver.cpp b/libuavcan/test/transport/can/can_driver.cpp
index 068530dacf..1970a997cb 100644
--- a/libuavcan/test/transport/can/can_driver.cpp
+++ b/libuavcan/test/transport/can/can_driver.cpp
@@ -4,7 +4,7 @@
 
 #include <gtest/gtest.h>
 #include "can.hpp"
-#include <uavcan/can_driver.hpp>
+#include <uavcan/driver/can.hpp>
 
 TEST(CanFrame, FrameProperties)
 {