diff --git a/Cargo.toml b/Cargo.toml
index 1a13de8f..1229e72a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -24,6 +24,7 @@ float_cmp_const = "warn"
 get_unwrap = "warn"
 lossy_float_literal = "warn"
 mem_forget = "warn"
+mod_module_files = "warn"
 mutex_atomic = "warn"
 negative_feature_names = "warn"
 pub_without_shorthand = "warn"
diff --git a/src/api/mod.rs b/src/api.rs
similarity index 100%
rename from src/api/mod.rs
rename to src/api.rs
diff --git a/src/api/client_server/mod.rs b/src/api/client_server.rs
similarity index 100%
rename from src/api/client_server/mod.rs
rename to src/api/client_server.rs
diff --git a/src/api/ruma_wrapper/mod.rs b/src/api/ruma_wrapper.rs
similarity index 100%
rename from src/api/ruma_wrapper/mod.rs
rename to src/api/ruma_wrapper.rs
diff --git a/src/config/mod.rs b/src/config.rs
similarity index 100%
rename from src/config/mod.rs
rename to src/config.rs
diff --git a/src/database/mod.rs b/src/database.rs
similarity index 100%
rename from src/database/mod.rs
rename to src/database.rs
diff --git a/src/database/key_value/mod.rs b/src/database/key_value.rs
similarity index 100%
rename from src/database/key_value/mod.rs
rename to src/database/key_value.rs
diff --git a/src/database/key_value/rooms/mod.rs b/src/database/key_value/rooms.rs
similarity index 100%
rename from src/database/key_value/rooms/mod.rs
rename to src/database/key_value/rooms.rs
diff --git a/src/database/key_value/rooms/edus/mod.rs b/src/database/key_value/rooms/edus.rs
similarity index 100%
rename from src/database/key_value/rooms/edus/mod.rs
rename to src/database/key_value/rooms/edus.rs
diff --git a/src/service/mod.rs b/src/service.rs
similarity index 100%
rename from src/service/mod.rs
rename to src/service.rs
diff --git a/src/service/account_data/mod.rs b/src/service/account_data.rs
similarity index 100%
rename from src/service/account_data/mod.rs
rename to src/service/account_data.rs
diff --git a/src/service/admin/mod.rs b/src/service/admin.rs
similarity index 100%
rename from src/service/admin/mod.rs
rename to src/service/admin.rs
diff --git a/src/service/appservice/mod.rs b/src/service/appservice.rs
similarity index 100%
rename from src/service/appservice/mod.rs
rename to src/service/appservice.rs
diff --git a/src/service/globals/mod.rs b/src/service/globals.rs
similarity index 100%
rename from src/service/globals/mod.rs
rename to src/service/globals.rs
diff --git a/src/service/key_backups/mod.rs b/src/service/key_backups.rs
similarity index 100%
rename from src/service/key_backups/mod.rs
rename to src/service/key_backups.rs
diff --git a/src/service/media/mod.rs b/src/service/media.rs
similarity index 100%
rename from src/service/media/mod.rs
rename to src/service/media.rs
diff --git a/src/service/pusher/mod.rs b/src/service/pusher.rs
similarity index 100%
rename from src/service/pusher/mod.rs
rename to src/service/pusher.rs
diff --git a/src/service/rooms/mod.rs b/src/service/rooms.rs
similarity index 100%
rename from src/service/rooms/mod.rs
rename to src/service/rooms.rs
diff --git a/src/service/rooms/alias/mod.rs b/src/service/rooms/alias.rs
similarity index 100%
rename from src/service/rooms/alias/mod.rs
rename to src/service/rooms/alias.rs
diff --git a/src/service/rooms/auth_chain/mod.rs b/src/service/rooms/auth_chain.rs
similarity index 100%
rename from src/service/rooms/auth_chain/mod.rs
rename to src/service/rooms/auth_chain.rs
diff --git a/src/service/rooms/directory/mod.rs b/src/service/rooms/directory.rs
similarity index 100%
rename from src/service/rooms/directory/mod.rs
rename to src/service/rooms/directory.rs
diff --git a/src/service/rooms/edus/mod.rs b/src/service/rooms/edus.rs
similarity index 100%
rename from src/service/rooms/edus/mod.rs
rename to src/service/rooms/edus.rs
diff --git a/src/service/rooms/edus/read_receipt/mod.rs b/src/service/rooms/edus/read_receipt.rs
similarity index 100%
rename from src/service/rooms/edus/read_receipt/mod.rs
rename to src/service/rooms/edus/read_receipt.rs
diff --git a/src/service/rooms/edus/typing/mod.rs b/src/service/rooms/edus/typing.rs
similarity index 100%
rename from src/service/rooms/edus/typing/mod.rs
rename to src/service/rooms/edus/typing.rs
diff --git a/src/service/rooms/event_handler/mod.rs b/src/service/rooms/event_handler.rs
similarity index 100%
rename from src/service/rooms/event_handler/mod.rs
rename to src/service/rooms/event_handler.rs
diff --git a/src/service/rooms/lazy_loading/mod.rs b/src/service/rooms/lazy_loading.rs
similarity index 100%
rename from src/service/rooms/lazy_loading/mod.rs
rename to src/service/rooms/lazy_loading.rs
diff --git a/src/service/rooms/metadata/mod.rs b/src/service/rooms/metadata.rs
similarity index 100%
rename from src/service/rooms/metadata/mod.rs
rename to src/service/rooms/metadata.rs
diff --git a/src/service/rooms/outlier/mod.rs b/src/service/rooms/outlier.rs
similarity index 100%
rename from src/service/rooms/outlier/mod.rs
rename to src/service/rooms/outlier.rs
diff --git a/src/service/rooms/pdu_metadata/mod.rs b/src/service/rooms/pdu_metadata.rs
similarity index 100%
rename from src/service/rooms/pdu_metadata/mod.rs
rename to src/service/rooms/pdu_metadata.rs
diff --git a/src/service/rooms/search/mod.rs b/src/service/rooms/search.rs
similarity index 100%
rename from src/service/rooms/search/mod.rs
rename to src/service/rooms/search.rs
diff --git a/src/service/rooms/short/mod.rs b/src/service/rooms/short.rs
similarity index 100%
rename from src/service/rooms/short/mod.rs
rename to src/service/rooms/short.rs
diff --git a/src/service/rooms/spaces/mod.rs b/src/service/rooms/spaces.rs
similarity index 100%
rename from src/service/rooms/spaces/mod.rs
rename to src/service/rooms/spaces.rs
diff --git a/src/service/rooms/state/mod.rs b/src/service/rooms/state.rs
similarity index 100%
rename from src/service/rooms/state/mod.rs
rename to src/service/rooms/state.rs
diff --git a/src/service/rooms/state_accessor/mod.rs b/src/service/rooms/state_accessor.rs
similarity index 100%
rename from src/service/rooms/state_accessor/mod.rs
rename to src/service/rooms/state_accessor.rs
diff --git a/src/service/rooms/state_cache/mod.rs b/src/service/rooms/state_cache.rs
similarity index 100%
rename from src/service/rooms/state_cache/mod.rs
rename to src/service/rooms/state_cache.rs
diff --git a/src/service/rooms/state_compressor/mod.rs b/src/service/rooms/state_compressor.rs
similarity index 100%
rename from src/service/rooms/state_compressor/mod.rs
rename to src/service/rooms/state_compressor.rs
diff --git a/src/service/rooms/threads/mod.rs b/src/service/rooms/threads.rs
similarity index 100%
rename from src/service/rooms/threads/mod.rs
rename to src/service/rooms/threads.rs
diff --git a/src/service/rooms/timeline/mod.rs b/src/service/rooms/timeline.rs
similarity index 100%
rename from src/service/rooms/timeline/mod.rs
rename to src/service/rooms/timeline.rs
diff --git a/src/service/rooms/user/mod.rs b/src/service/rooms/user.rs
similarity index 100%
rename from src/service/rooms/user/mod.rs
rename to src/service/rooms/user.rs
diff --git a/src/service/sending/mod.rs b/src/service/sending.rs
similarity index 100%
rename from src/service/sending/mod.rs
rename to src/service/sending.rs
diff --git a/src/service/transaction_ids/mod.rs b/src/service/transaction_ids.rs
similarity index 100%
rename from src/service/transaction_ids/mod.rs
rename to src/service/transaction_ids.rs
diff --git a/src/service/uiaa/mod.rs b/src/service/uiaa.rs
similarity index 100%
rename from src/service/uiaa/mod.rs
rename to src/service/uiaa.rs
diff --git a/src/service/users/mod.rs b/src/service/users.rs
similarity index 100%
rename from src/service/users/mod.rs
rename to src/service/users.rs
diff --git a/src/utils/mod.rs b/src/utils.rs
similarity index 100%
rename from src/utils/mod.rs
rename to src/utils.rs