diff --git a/src/interface/can.rs b/src/interface/can.rs
new file mode 100644
index 0000000..e69de29
diff --git a/src/interface/mod.rs b/src/interface/mod.rs
index f7a6a76..e2e5df7 100644
--- a/src/interface/mod.rs
+++ b/src/interface/mod.rs
@@ -1,2 +1,3 @@
 pub mod tcp;
 pub mod udp;
+pub mod can;
diff --git a/src/interface/tcp.rs b/src/interface/tcp.rs
index 04bb136..c78b3e7 100644
--- a/src/interface/tcp.rs
+++ b/src/interface/tcp.rs
@@ -11,7 +11,7 @@ use satrs::{
     tmtc::{CcsdsDistributor, CcsdsError, ReceivesCcsdsTc, TmPacketSourceCore},
 };
 
-use crate::ccsds::CcsdsReceiver;
+use crate::tmtc::ccsds::CcsdsReceiver;
 
 #[derive(Default, Clone)]
 pub struct SyncTcpTmSource {
diff --git a/src/main.rs b/src/main.rs
index 60a36d5..d69c994 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -16,7 +16,7 @@ use satrs::{
 use ops_sat_rs::config::tasks::FREQ_MS_PUS_STACK;
 
 use crate::{
-    ccsds::CcsdsReceiver,
+    tmtc::ccsds::CcsdsReceiver,
     logger::setup_logger,
     interface::tcp::{SyncTcpTmSource, TcpTask},
     tmtc::PusTcSourceProviderDynamic,
@@ -26,15 +26,13 @@ use crate::pus::{PusReceiver, PusTcMpscRouter};
 use crate::pus::stack::PusStack;
 use crate::pus::test::create_test_service_dynamic;
 use crate::requests::GenericRequestRouter;
-use crate::tm_funnel::TmFunnelDynamic;
+use crate::tmtc::tm_funnel::TmFunnelDynamic;
 use crate::tmtc::TcSourceTaskDynamic;
 
-mod ccsds;
 mod logger;
 mod tmtc;
 mod requests;
 mod pus;
-mod tm_funnel;
 mod interface;
 
 #[allow(dead_code)]
diff --git a/src/ccsds.rs b/src/tmtc/ccsds.rs
similarity index 100%
rename from src/ccsds.rs
rename to src/tmtc/ccsds.rs
diff --git a/src/tmtc.rs b/src/tmtc/mod.rs
similarity index 98%
rename from src/tmtc.rs
rename to src/tmtc/mod.rs
index b9f1809..41dcaae 100644
--- a/src/tmtc.rs
+++ b/src/tmtc/mod.rs
@@ -10,6 +10,9 @@ use satrs::spacepackets::ecss::PusPacket;
 use crate::pus::PusReceiver;
 use thiserror::Error;
 
+pub mod tm_funnel;
+pub mod ccsds;
+
 #[derive(Debug, Clone, PartialEq, Eq, Error)]
 pub enum MpscStoreAndSendError {
     #[error("Store error: {0}")]
diff --git a/src/tm_funnel.rs b/src/tmtc/tm_funnel.rs
similarity index 100%
rename from src/tm_funnel.rs
rename to src/tmtc/tm_funnel.rs