diff --git a/services/tunnelbroker/rust-notifications/src/lib.rs b/services/tunnelbroker/rust-notifications/src/lib.rs
--- a/services/tunnelbroker/rust-notifications/src/lib.rs
+++ b/services/tunnelbroker/rust-notifications/src/lib.rs
@@ -4,8 +4,7 @@
 use lazy_static::lazy_static;
 use log::info;
 use tokio::runtime::Runtime;
-pub mod apns;
-pub mod fcm;
+pub mod notifications;
 
 #[cxx::bridge]
 mod ffi {
@@ -58,7 +57,7 @@
   message: &str,
   sandbox: bool,
 ) -> Result<apns_status> {
-  RUNTIME.block_on(apns::send_by_a2_client(
+  RUNTIME.block_on(notifications::apns::send_by_a2_client(
     certificate_path,
     certificate_password,
     device_token,
@@ -74,7 +73,7 @@
   message_title: &str,
   message_body: &str,
 ) -> Result<fcm_status> {
-  RUNTIME.block_on(fcm::send_by_fcm_client(
+  RUNTIME.block_on(notifications::fcm::send_by_fcm_client(
     fcm_api_key,
     device_registration_id,
     message_title,
diff --git a/services/tunnelbroker/rust-notifications/src/apns.rs b/services/tunnelbroker/rust-notifications/src/notifications/apns.rs
rename from services/tunnelbroker/rust-notifications/src/apns.rs
rename to services/tunnelbroker/rust-notifications/src/notifications/apns.rs
diff --git a/services/tunnelbroker/rust-notifications/src/fcm.rs b/services/tunnelbroker/rust-notifications/src/notifications/fcm.rs
rename from services/tunnelbroker/rust-notifications/src/fcm.rs
rename to services/tunnelbroker/rust-notifications/src/notifications/fcm.rs
diff --git a/services/tunnelbroker/rust-notifications/src/notifications/mod.rs b/services/tunnelbroker/rust-notifications/src/notifications/mod.rs
new file mode 100644
--- /dev/null
+++ b/services/tunnelbroker/rust-notifications/src/notifications/mod.rs
@@ -0,0 +1,2 @@
+pub mod apns;
+pub mod fcm;