diff --git a/include/sta/intf/can/controller.hpp b/include/sta/can/controller.hpp
similarity index 90%
rename from include/sta/intf/can/controller.hpp
rename to include/sta/can/controller.hpp
index 389dee0..9abca01 100644
--- a/include/sta/intf/can/controller.hpp
+++ b/include/sta/can/controller.hpp
@@ -2,8 +2,8 @@
  * @file
  * @brief CAN controller driver interface.
  */
-#ifndef STA_INTF_CAN_CONTROLLER_HPP
-#define STA_INTF_CAN_CONTROLLER_HPP
+#ifndef STA_CAN_CONTROLLER_HPP
+#define STA_CAN_CONTROLLER_HPP
 
 /**
  * @defgroup can CAN
@@ -17,8 +17,8 @@
  */
 
 
-#include <sta/intf/can/filter.hpp>
-#include <sta/intf/can/headers.hpp>
+#include <sta/can/filter.hpp>
+#include <sta/can/headers.hpp>
 
 
 namespace sta
@@ -92,4 +92,4 @@ namespace sta
 } // namespace sta
 
 
-#endif // STA_INTF_CAN_CONTROLLER_HPP
+#endif // STA_CAN_CONTROLLER_HPP
diff --git a/include/sta/intf/can/filter.hpp b/include/sta/can/filter.hpp
similarity index 85%
rename from include/sta/intf/can/filter.hpp
rename to include/sta/can/filter.hpp
index ef832f5..a38c6d1 100644
--- a/include/sta/intf/can/filter.hpp
+++ b/include/sta/can/filter.hpp
@@ -2,10 +2,10 @@
  * @file
  * @brief CAN message filter types.
  */
-#ifndef STA_INFT_CAN_FILTER_HPP
-#define STA_INFT_CAN_FILTER_HPP
+#ifndef STA_CAN_FILTER_HPP
+#define STA_CAN_FILTER_HPP
 
-#include <sta/intf/can/id.hpp>
+#include <sta/can/id.hpp>
 
 #include <cstdint>
 
@@ -46,4 +46,4 @@ namespace sta
 } // namespace sta
 
 
-#endif // STA_INFT_CAN_FILTER_HPP
+#endif // STA_CAN_FILTER_HPP
diff --git a/include/sta/intf/can/headers.hpp b/include/sta/can/headers.hpp
similarity index 85%
rename from include/sta/intf/can/headers.hpp
rename to include/sta/can/headers.hpp
index 6ece67e..a7667dc 100644
--- a/include/sta/intf/can/headers.hpp
+++ b/include/sta/can/headers.hpp
@@ -2,10 +2,10 @@
  * @file
  * @brief CAN frame headers.
  */
-#ifndef STA_INTF_CAN_HEADERS_HPP
-#define STA_INTF_CAN_HEADERS_HPP
+#ifndef STA_CAN_HEADERS_HPP
+#define STA_CAN_HEADERS_HPP
 
-#include <sta/intf/can/id.hpp>
+#include <sta/can/id.hpp>
 
 #include <cstdint>
 
@@ -45,4 +45,4 @@ namespace sta
 } // namespace sta
 
 
-#endif // STA_INTF_CAN_HEADERS_HPP
+#endif // STA_CAN_HEADERS_HPP
diff --git a/include/sta/intf/can/id.hpp b/include/sta/can/id.hpp
similarity index 96%
rename from include/sta/intf/can/id.hpp
rename to include/sta/can/id.hpp
index 4a453e3..f0202bd 100644
--- a/include/sta/intf/can/id.hpp
+++ b/include/sta/can/id.hpp
@@ -2,8 +2,8 @@
  * @file
  * @brief CAN frame ID types.
  */
-#ifndef STA_INTF_CAN_ID_HPP
-#define STA_INTF_CAN_ID_HPP
+#ifndef STA_CAN_ID_HPP
+#define STA_CAN_ID_HPP
 
 #include <cstdint>
 
@@ -115,4 +115,4 @@ namespace sta
 #define CAN_EID_MAX     UINT32_C(0x3FFFF)
 
 
-#endif // STA_INTF_CAN_ID_HPP
+#endif // STA_CAN_ID_HPP
diff --git a/include/sta/intf/can/subscribable.hpp b/include/sta/can/subscribable.hpp
similarity index 89%
rename from include/sta/intf/can/subscribable.hpp
rename to include/sta/can/subscribable.hpp
index 3e8583d..87bdeef 100644
--- a/include/sta/intf/can/subscribable.hpp
+++ b/include/sta/can/subscribable.hpp
@@ -2,11 +2,11 @@
  * @file
  * @brief Subscription interface for CAN controller drivers.
  */
-#ifndef STA_INTF_CAN_SUBSCRIBABLE_HPP
-#define STA_INTF_CAN_SUBSCRIBABLE_HPP
+#ifndef STA_CAN_SUBSCRIBABLE_HPP
+#define STA_CAN_SUBSCRIBABLE_HPP
 
-#include <sta/intf/can/filter.hpp>
-#include <sta/intf/can/headers.hpp>
+#include <sta/can/filter.hpp>
+#include <sta/can/headers.hpp>
 
 
 namespace sta
@@ -98,7 +98,7 @@ namespace sta
 } // namespace sta
 
 
-#include <sta/intf/can/subscribable.tpp>
+#include <sta/can/subscribable.tpp>
 
 
-#endif // STA_INTF_CAN_SUBSCRIBABLE_HPP
+#endif // STA_CAN_SUBSCRIBABLE_HPP
diff --git a/include/sta/intf/can/subscribable.tpp b/include/sta/can/subscribable.tpp
similarity index 92%
rename from include/sta/intf/can/subscribable.tpp
rename to include/sta/can/subscribable.tpp
index 83cbe64..e50008c 100644
--- a/include/sta/intf/can/subscribable.tpp
+++ b/include/sta/can/subscribable.tpp
@@ -1,12 +1,12 @@
 /**
  * @brief Implementation of template class CanController<T>.
  */
-#ifndef STA_INTF_CAN_SUBSCRIBABLE_TPP
-#define STA_INTF_CAN_SUBSCRIBABLE_TPP
+#ifndef STA_CAN_SUBSCRIBABLE_TPP
+#define STA_CAN_SUBSCRIBABLE_TPP
 
-#ifndef STA_INTF_CAN_SUBSCRIBABLE_HPP
+#ifndef STA_CAN_SUBSCRIBABLE_HPP
 #error "Direct use of internal header. Use <sta/intf/can/subscribable.hpp> instead"
-#endif // !STA_INTF_CAN_SUBSCRIBABLE_HPP
+#endif // !STA_CAN_SUBSCRIBABLE_HPP
 
 #ifndef STA_STDLIB_DISABLE
 #  include <algorithm> // fill_n
@@ -117,4 +117,4 @@ namespace sta
 } // namespace sta
 
 
-#endif // STA_INTF_CAN_SUBSCRIBABLE_TPP
+#endif // STA_CAN_SUBSCRIBABLE_TPP
diff --git a/src/can/id.cpp b/src/can/id.cpp
index e9138bb..829d4a4 100644
--- a/src/can/id.cpp
+++ b/src/can/id.cpp
@@ -1,4 +1,4 @@
-#include <sta/intf/can/id.hpp>
+#include <sta/can/id.hpp>
 
 
 namespace sta