diff --git a/libuavcan/include/uavcan/time.hpp b/libuavcan/include/uavcan/time.hpp
index 29b27547d6..df725a41bb 100644
--- a/libuavcan/include/uavcan/time.hpp
+++ b/libuavcan/include/uavcan/time.hpp
@@ -174,7 +174,7 @@ public:
 
     UtcTime& operator=(const Timestamp& ts)
     {
-        *this = UtcTime::fromUSec(ts.husec * Timestamp::USEC_PER_LSB);
+        *this = fromUSec(ts.husec * Timestamp::USEC_PER_LSB);
         return *this;
     }
 
diff --git a/libuavcan/src/fatal_error.cpp b/libuavcan/src/internal/fatal_error.cpp
similarity index 100%
rename from libuavcan/src/fatal_error.cpp
rename to libuavcan/src/internal/fatal_error.cpp
diff --git a/libuavcan/src/marshal/bit_array_copy.c b/libuavcan/src/internal/marshal/bit_array_copy.c
similarity index 100%
rename from libuavcan/src/marshal/bit_array_copy.c
rename to libuavcan/src/internal/marshal/bit_array_copy.c
diff --git a/libuavcan/src/marshal/bit_stream.cpp b/libuavcan/src/internal/marshal/bit_stream.cpp
similarity index 100%
rename from libuavcan/src/marshal/bit_stream.cpp
rename to libuavcan/src/internal/marshal/bit_stream.cpp
diff --git a/libuavcan/src/marshal/float_spec.cpp b/libuavcan/src/internal/marshal/float_spec.cpp
similarity index 100%
rename from libuavcan/src/marshal/float_spec.cpp
rename to libuavcan/src/internal/marshal/float_spec.cpp
diff --git a/libuavcan/src/scheduler.cpp b/libuavcan/src/internal/node/scheduler.cpp
similarity index 100%
rename from libuavcan/src/scheduler.cpp
rename to libuavcan/src/internal/node/scheduler.cpp
diff --git a/libuavcan/src/transport/can_io.cpp b/libuavcan/src/internal/transport/can_io.cpp
similarity index 100%
rename from libuavcan/src/transport/can_io.cpp
rename to libuavcan/src/internal/transport/can_io.cpp
diff --git a/libuavcan/src/transport/crc.cpp b/libuavcan/src/internal/transport/crc.cpp
similarity index 100%
rename from libuavcan/src/transport/crc.cpp
rename to libuavcan/src/internal/transport/crc.cpp
diff --git a/libuavcan/src/transport/dispatcher.cpp b/libuavcan/src/internal/transport/dispatcher.cpp
similarity index 100%
rename from libuavcan/src/transport/dispatcher.cpp
rename to libuavcan/src/internal/transport/dispatcher.cpp
diff --git a/libuavcan/src/transport/transfer.cpp b/libuavcan/src/internal/transport/transfer.cpp
similarity index 100%
rename from libuavcan/src/transport/transfer.cpp
rename to libuavcan/src/internal/transport/transfer.cpp
diff --git a/libuavcan/src/transport/transfer_buffer.cpp b/libuavcan/src/internal/transport/transfer_buffer.cpp
similarity index 100%
rename from libuavcan/src/transport/transfer_buffer.cpp
rename to libuavcan/src/internal/transport/transfer_buffer.cpp
diff --git a/libuavcan/src/transport/transfer_listener.cpp b/libuavcan/src/internal/transport/transfer_listener.cpp
similarity index 100%
rename from libuavcan/src/transport/transfer_listener.cpp
rename to libuavcan/src/internal/transport/transfer_listener.cpp
diff --git a/libuavcan/src/transport/transfer_receiver.cpp b/libuavcan/src/internal/transport/transfer_receiver.cpp
similarity index 100%
rename from libuavcan/src/transport/transfer_receiver.cpp
rename to libuavcan/src/internal/transport/transfer_receiver.cpp
diff --git a/libuavcan/src/transport/transfer_sender.cpp b/libuavcan/src/internal/transport/transfer_sender.cpp
similarity index 100%
rename from libuavcan/src/transport/transfer_sender.cpp
rename to libuavcan/src/internal/transport/transfer_sender.cpp
diff --git a/libuavcan/test/common.hpp b/libuavcan/test/clock.hpp
similarity index 85%
rename from libuavcan/test/common.hpp
rename to libuavcan/test/clock.hpp
index e8fd7b030f..d3475ce743 100644
--- a/libuavcan/test/common.hpp
+++ b/libuavcan/test/clock.hpp
@@ -5,7 +5,6 @@
 #pragma once
 
 #include <cassert>
-#include <uavcan/can_driver.hpp>
 #include <uavcan/system_clock.hpp>
 #include <time.h>
 #include <sys/time.h>
@@ -83,14 +82,6 @@ public:
     }
 };
 
-
-enum FrameType { STD, EXT };
-static uavcan::CanFrame makeCanFrame(uint32_t id, const std::string& str_data, FrameType type)
-{
-    id |= (type == EXT) ? uavcan::CanFrame::FlagEFF : 0;
-    return uavcan::CanFrame(id, reinterpret_cast<const uint8_t*>(str_data.c_str()), str_data.length());
-}
-
 static bool areTimestampsClose(int64_t a, int64_t b, int64_t precision_usec = 10000)
 {
     return std::abs(a - b) < precision_usec;
diff --git a/libuavcan/test/dynamic_memory.cpp b/libuavcan/test/internal/dynamic_memory.cpp
similarity index 100%
rename from libuavcan/test/dynamic_memory.cpp
rename to libuavcan/test/internal/dynamic_memory.cpp
diff --git a/libuavcan/test/linked_list.cpp b/libuavcan/test/internal/linked_list.cpp
similarity index 100%
rename from libuavcan/test/linked_list.cpp
rename to libuavcan/test/internal/linked_list.cpp
diff --git a/libuavcan/test/map.cpp b/libuavcan/test/internal/map.cpp
similarity index 100%
rename from libuavcan/test/map.cpp
rename to libuavcan/test/internal/map.cpp
diff --git a/libuavcan/test/marshal/array.cpp b/libuavcan/test/internal/marshal/array.cpp
similarity index 100%
rename from libuavcan/test/marshal/array.cpp
rename to libuavcan/test/internal/marshal/array.cpp
diff --git a/libuavcan/test/marshal/bit_stream.cpp b/libuavcan/test/internal/marshal/bit_stream.cpp
similarity index 100%
rename from libuavcan/test/marshal/bit_stream.cpp
rename to libuavcan/test/internal/marshal/bit_stream.cpp
diff --git a/libuavcan/test/marshal/float_spec.cpp b/libuavcan/test/internal/marshal/float_spec.cpp
similarity index 100%
rename from libuavcan/test/marshal/float_spec.cpp
rename to libuavcan/test/internal/marshal/float_spec.cpp
diff --git a/libuavcan/test/marshal/integer_spec.cpp b/libuavcan/test/internal/marshal/integer_spec.cpp
similarity index 100%
rename from libuavcan/test/marshal/integer_spec.cpp
rename to libuavcan/test/internal/marshal/integer_spec.cpp
diff --git a/libuavcan/test/marshal/scalar_codec.cpp b/libuavcan/test/internal/marshal/scalar_codec.cpp
similarity index 100%
rename from libuavcan/test/marshal/scalar_codec.cpp
rename to libuavcan/test/internal/marshal/scalar_codec.cpp
diff --git a/libuavcan/test/marshal/type_util.cpp b/libuavcan/test/internal/marshal/type_util.cpp
similarity index 100%
rename from libuavcan/test/marshal/type_util.cpp
rename to libuavcan/test/internal/marshal/type_util.cpp
diff --git a/libuavcan/test/node/scheduler.cpp b/libuavcan/test/internal/node/scheduler.cpp
similarity index 98%
rename from libuavcan/test/node/scheduler.cpp
rename to libuavcan/test/internal/node/scheduler.cpp
index 894e990904..5f99a4e04f 100644
--- a/libuavcan/test/node/scheduler.cpp
+++ b/libuavcan/test/internal/node/scheduler.cpp
@@ -5,8 +5,8 @@
 #include <gtest/gtest.h>
 #include <uavcan/timer.hpp>
 #include <uavcan/util/method_binder.hpp>
-#include "../common.hpp"
-#include "../transport/can/iface_mock.hpp"
+#include "../../clock.hpp"
+#include "../transport/can/can.hpp"
 
 struct TimerCallCounter
 {
diff --git a/libuavcan/test/transport/can/iface_mock.hpp b/libuavcan/test/internal/transport/can/can.hpp
similarity index 92%
rename from libuavcan/test/transport/can/iface_mock.hpp
rename to libuavcan/test/internal/transport/can/can.hpp
index 27c9716070..b800bdeaa4 100644
--- a/libuavcan/test/transport/can/iface_mock.hpp
+++ b/libuavcan/test/internal/transport/can/can.hpp
@@ -4,12 +4,15 @@
 
 #pragma once
 
+#include <cassert>
 #include <queue>
 #include <vector>
 #include <gtest/gtest.h>
 #include <uavcan/internal/transport/can_io.hpp>
 #include <uavcan/internal/transport/transfer.hpp>
-#include "../../common.hpp"
+#include <uavcan/can_driver.hpp>
+#include <uavcan/system_clock.hpp>
+#include "../../../clock.hpp"
 
 
 class CanIfaceMock : public uavcan::ICanIface
@@ -155,3 +158,10 @@ public:
     uavcan::ICanIface* getIface(int iface_index) { return &ifaces.at(iface_index); }
     int getNumIfaces() const { return ifaces.size(); }
 };
+
+enum FrameType { STD, EXT };
+static uavcan::CanFrame makeCanFrame(uint32_t id, const std::string& str_data, FrameType type)
+{
+    id |= (type == EXT) ? uavcan::CanFrame::FlagEFF : 0;
+    return uavcan::CanFrame(id, reinterpret_cast<const uint8_t*>(str_data.c_str()), str_data.length());
+}
diff --git a/libuavcan/test/can_driver.cpp b/libuavcan/test/internal/transport/can/can_driver.cpp
similarity index 98%
rename from libuavcan/test/can_driver.cpp
rename to libuavcan/test/internal/transport/can/can_driver.cpp
index 1805d05369..068530dacf 100644
--- a/libuavcan/test/can_driver.cpp
+++ b/libuavcan/test/internal/transport/can/can_driver.cpp
@@ -3,7 +3,7 @@
  */
 
 #include <gtest/gtest.h>
-#include "common.hpp"
+#include "can.hpp"
 #include <uavcan/can_driver.hpp>
 
 TEST(CanFrame, FrameProperties)
diff --git a/libuavcan/test/transport/can/iface_mock.cpp b/libuavcan/test/internal/transport/can/iface_mock.cpp
similarity index 98%
rename from libuavcan/test/transport/can/iface_mock.cpp
rename to libuavcan/test/internal/transport/can/iface_mock.cpp
index 02ee98b97e..d2edaa132e 100644
--- a/libuavcan/test/transport/can/iface_mock.cpp
+++ b/libuavcan/test/internal/transport/can/iface_mock.cpp
@@ -3,7 +3,7 @@
  */
 
 #include <gtest/gtest.h>
-#include "iface_mock.hpp"
+#include "can.hpp"
 
 TEST(CanIOManager, CanDriverMock)
 {
diff --git a/libuavcan/test/transport/can/io.cpp b/libuavcan/test/internal/transport/can/io.cpp
similarity index 99%
rename from libuavcan/test/transport/can/io.cpp
rename to libuavcan/test/internal/transport/can/io.cpp
index ce8e624fbb..ede5f1fc9a 100644
--- a/libuavcan/test/transport/can/io.cpp
+++ b/libuavcan/test/internal/transport/can/io.cpp
@@ -3,7 +3,7 @@
  */
 
 #include <gtest/gtest.h>
-#include "iface_mock.hpp"
+#include "can.hpp"
 
 
 static bool rxFrameEquals(const uavcan::CanRxFrame& rxframe, const uavcan::CanFrame& frame,
diff --git a/libuavcan/test/transport/can/tx_queue.cpp b/libuavcan/test/internal/transport/can/tx_queue.cpp
similarity index 99%
rename from libuavcan/test/transport/can/tx_queue.cpp
rename to libuavcan/test/internal/transport/can/tx_queue.cpp
index f8fb19ec75..9cc23fca59 100644
--- a/libuavcan/test/transport/can/tx_queue.cpp
+++ b/libuavcan/test/internal/transport/can/tx_queue.cpp
@@ -4,7 +4,7 @@
 
 #include <gtest/gtest.h>
 #include <uavcan/internal/transport/can_io.hpp>
-#include "../../common.hpp"
+#include "can.hpp"
 
 
 static int getQueueLength(uavcan::CanTxQueue& queue)
diff --git a/libuavcan/test/transport/crc.cpp b/libuavcan/test/internal/transport/crc.cpp
similarity index 100%
rename from libuavcan/test/transport/crc.cpp
rename to libuavcan/test/internal/transport/crc.cpp
diff --git a/libuavcan/test/transport/dispatcher.cpp b/libuavcan/test/internal/transport/dispatcher.cpp
similarity index 99%
rename from libuavcan/test/transport/dispatcher.cpp
rename to libuavcan/test/internal/transport/dispatcher.cpp
index cb55b91b47..e49f08ae65 100644
--- a/libuavcan/test/transport/dispatcher.cpp
+++ b/libuavcan/test/internal/transport/dispatcher.cpp
@@ -5,7 +5,7 @@
 #include <memory>
 #include <gtest/gtest.h>
 #include "transfer_test_helpers.hpp"
-#include "can/iface_mock.hpp"
+#include "can/can.hpp"
 #include <uavcan/internal/transport/dispatcher.hpp>
 
 
diff --git a/libuavcan/test/transport/incoming_transfer.cpp b/libuavcan/test/internal/transport/incoming_transfer.cpp
similarity index 100%
rename from libuavcan/test/transport/incoming_transfer.cpp
rename to libuavcan/test/internal/transport/incoming_transfer.cpp
diff --git a/libuavcan/test/transport/outgoing_transfer_registry.cpp b/libuavcan/test/internal/transport/outgoing_transfer_registry.cpp
similarity index 100%
rename from libuavcan/test/transport/outgoing_transfer_registry.cpp
rename to libuavcan/test/internal/transport/outgoing_transfer_registry.cpp
diff --git a/libuavcan/test/transport/transfer.cpp b/libuavcan/test/internal/transport/transfer.cpp
similarity index 99%
rename from libuavcan/test/transport/transfer.cpp
rename to libuavcan/test/internal/transport/transfer.cpp
index 9101d0c4c8..43209b3c08 100644
--- a/libuavcan/test/transport/transfer.cpp
+++ b/libuavcan/test/internal/transport/transfer.cpp
@@ -5,7 +5,8 @@
 #include <string>
 #include <gtest/gtest.h>
 #include <uavcan/internal/transport/transfer.hpp>
-#include "../common.hpp"
+#include "../../clock.hpp"
+#include "can/can.hpp"
 
 
 TEST(Transfer, TransferID)
diff --git a/libuavcan/test/transport/transfer_buffer.cpp b/libuavcan/test/internal/transport/transfer_buffer.cpp
similarity index 100%
rename from libuavcan/test/transport/transfer_buffer.cpp
rename to libuavcan/test/internal/transport/transfer_buffer.cpp
diff --git a/libuavcan/test/transport/transfer_listener.cpp b/libuavcan/test/internal/transport/transfer_listener.cpp
similarity index 100%
rename from libuavcan/test/transport/transfer_listener.cpp
rename to libuavcan/test/internal/transport/transfer_listener.cpp
diff --git a/libuavcan/test/transport/transfer_receiver.cpp b/libuavcan/test/internal/transport/transfer_receiver.cpp
similarity index 100%
rename from libuavcan/test/transport/transfer_receiver.cpp
rename to libuavcan/test/internal/transport/transfer_receiver.cpp
diff --git a/libuavcan/test/transport/transfer_sender.cpp b/libuavcan/test/internal/transport/transfer_sender.cpp
similarity index 99%
rename from libuavcan/test/transport/transfer_sender.cpp
rename to libuavcan/test/internal/transport/transfer_sender.cpp
index cf34b0f807..c3537d0a43 100644
--- a/libuavcan/test/transport/transfer_sender.cpp
+++ b/libuavcan/test/internal/transport/transfer_sender.cpp
@@ -5,7 +5,7 @@
 #include <algorithm>
 #include <gtest/gtest.h>
 #include "transfer_test_helpers.hpp"
-#include "can/iface_mock.hpp"
+#include "can/can.hpp"
 #include <uavcan/internal/transport/transfer_sender.hpp>
 
 
diff --git a/libuavcan/test/transport/transfer_test_helpers.cpp b/libuavcan/test/internal/transport/transfer_test_helpers.cpp
similarity index 100%
rename from libuavcan/test/transport/transfer_test_helpers.cpp
rename to libuavcan/test/internal/transport/transfer_test_helpers.cpp
diff --git a/libuavcan/test/transport/transfer_test_helpers.hpp b/libuavcan/test/internal/transport/transfer_test_helpers.hpp
similarity index 100%
rename from libuavcan/test/transport/transfer_test_helpers.hpp
rename to libuavcan/test/internal/transport/transfer_test_helpers.hpp
diff --git a/libuavcan/test/publisher.cpp b/libuavcan/test/publisher.cpp
index 17f193f52d..5ffc6b814a 100644
--- a/libuavcan/test/publisher.cpp
+++ b/libuavcan/test/publisher.cpp
@@ -5,8 +5,8 @@
 #include <gtest/gtest.h>
 #include <uavcan/publisher.hpp>
 #include <uavcan/mavlink/Message.hpp>
-#include "common.hpp"
-#include "transport/can/iface_mock.hpp"
+#include "clock.hpp"
+#include "internal/transport/can/can.hpp"
 
 
 TEST(Publisher, Basic)
diff --git a/libuavcan/test/subscriber.cpp b/libuavcan/test/subscriber.cpp
index 94df084930..aede222a25 100644
--- a/libuavcan/test/subscriber.cpp
+++ b/libuavcan/test/subscriber.cpp
@@ -7,8 +7,8 @@
 #include <uavcan/util/method_binder.hpp>
 #include <uavcan/mavlink/Message.hpp>
 #include <root_ns_a/EmptyMessage.hpp>
-#include "common.hpp"
-#include "transport/can/iface_mock.hpp"
+#include "clock.hpp"
+#include "internal/transport/can/can.hpp"
 
 
 template <typename DataType>