diff --git a/core/src/nodes/mod.rs b/core/src/nodes.rs
similarity index 100%
rename from core/src/nodes/mod.rs
rename to core/src/nodes.rs
diff --git a/core/src/nodes/tasks/mod.rs b/core/src/nodes/tasks.rs
similarity index 100%
rename from core/src/nodes/tasks/mod.rs
rename to core/src/nodes/tasks.rs
diff --git a/core/src/transport/mod.rs b/core/src/transport.rs
similarity index 100%
rename from core/src/transport/mod.rs
rename to core/src/transport.rs
diff --git a/core/src/upgrade/mod.rs b/core/src/upgrade.rs
similarity index 100%
rename from core/src/upgrade/mod.rs
rename to core/src/upgrade.rs
diff --git a/protocols/secio/src/codec/mod.rs b/protocols/secio/src/codec.rs
similarity index 100%
rename from protocols/secio/src/codec/mod.rs
rename to protocols/secio/src/codec.rs
diff --git a/protocols/secio/src/exchange/mod.rs b/protocols/secio/src/exchange.rs
similarity index 96%
rename from protocols/secio/src/exchange/mod.rs
rename to protocols/secio/src/exchange.rs
index 5fdecbb8..c1a9bad6 100644
--- a/protocols/secio/src/exchange/mod.rs
+++ b/protocols/secio/src/exchange.rs
@@ -23,10 +23,10 @@
 use futures::prelude::*;
 use crate::SecioError;
 
-#[path = "impl_ring.rs"]
+#[path = "exchange/impl_ring.rs"]
 #[cfg(not(any(target_os = "emscripten", target_os = "unknown")))]
 mod platform;
-#[path = "impl_webcrypto.rs"]
+#[path = "exchange/impl_webcrypto.rs"]
 #[cfg(any(target_os = "emscripten", target_os = "unknown"))]
 mod platform;
 
diff --git a/swarm/src/protocols_handler/mod.rs b/swarm/src/protocols_handler.rs
similarity index 100%
rename from swarm/src/protocols_handler/mod.rs
rename to swarm/src/protocols_handler.rs