diff --git a/src/lib.rs b/src/lib.rs
index 10cfd1f..d14705a 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,14 +1,12 @@
 mod broker_task;
 mod message;
-mod publication;
-mod subscription;
+mod pub_sub;
 
 use broker_task::{
     AdvertiseRequest, BrokerError, BrokerRequestSender, BrokerResult, BrokerTask, SubscribeRequest,
 };
 pub use message::Message;
-pub use publication::{Publication, PublishError};
-pub use subscription::{Subscription, SubscriptionError};
+pub use pub_sub::*;
 
 use futures::executor::block_on;
 use tokio::sync::oneshot;
diff --git a/src/pub_sub/mod.rs b/src/pub_sub/mod.rs
new file mode 100644
index 0000000..7c59e69
--- /dev/null
+++ b/src/pub_sub/mod.rs
@@ -0,0 +1,5 @@
+mod publication;
+mod subscription;
+
+pub use publication::{Publication, PublishError};
+pub use subscription::{Subscription, SubscriptionError};
diff --git a/src/publication.rs b/src/pub_sub/publication.rs
similarity index 100%
rename from src/publication.rs
rename to src/pub_sub/publication.rs
diff --git a/src/subscription.rs b/src/pub_sub/subscription.rs
similarity index 100%
rename from src/subscription.rs
rename to src/pub_sub/subscription.rs