diff --git a/ruma-appservice-api/src/event/push_events/mod.rs b/ruma-appservice-api/src/event/push_events.rs
similarity index 100%
rename from ruma-appservice-api/src/event/push_events/mod.rs
rename to ruma-appservice-api/src/event/push_events.rs
diff --git a/ruma-appservice-api/src/query/query_room_alias/mod.rs b/ruma-appservice-api/src/query/query_room_alias.rs
similarity index 100%
rename from ruma-appservice-api/src/query/query_room_alias/mod.rs
rename to ruma-appservice-api/src/query/query_room_alias.rs
diff --git a/ruma-appservice-api/src/query/query_user_id/mod.rs b/ruma-appservice-api/src/query/query_user_id.rs
similarity index 100%
rename from ruma-appservice-api/src/query/query_user_id/mod.rs
rename to ruma-appservice-api/src/query/query_user_id.rs
diff --git a/ruma-appservice-api/src/thirdparty/get_location_for_protocol/mod.rs b/ruma-appservice-api/src/thirdparty/get_location_for_protocol.rs
similarity index 100%
rename from ruma-appservice-api/src/thirdparty/get_location_for_protocol/mod.rs
rename to ruma-appservice-api/src/thirdparty/get_location_for_protocol.rs
diff --git a/ruma-appservice-api/src/thirdparty/get_location_for_room_alias/mod.rs b/ruma-appservice-api/src/thirdparty/get_location_for_room_alias.rs
similarity index 100%
rename from ruma-appservice-api/src/thirdparty/get_location_for_room_alias/mod.rs
rename to ruma-appservice-api/src/thirdparty/get_location_for_room_alias.rs
diff --git a/ruma-appservice-api/src/thirdparty/get_protocol/mod.rs b/ruma-appservice-api/src/thirdparty/get_protocol.rs
similarity index 100%
rename from ruma-appservice-api/src/thirdparty/get_protocol/mod.rs
rename to ruma-appservice-api/src/thirdparty/get_protocol.rs
diff --git a/ruma-appservice-api/src/thirdparty/get_user_for_protocol/mod.rs b/ruma-appservice-api/src/thirdparty/get_user_for_protocol.rs
similarity index 100%
rename from ruma-appservice-api/src/thirdparty/get_user_for_protocol/mod.rs
rename to ruma-appservice-api/src/thirdparty/get_user_for_protocol.rs
diff --git a/ruma-appservice-api/src/thirdparty/get_user_for_user_id/mod.rs b/ruma-appservice-api/src/thirdparty/get_user_for_user_id.rs
similarity index 100%
rename from ruma-appservice-api/src/thirdparty/get_user_for_user_id/mod.rs
rename to ruma-appservice-api/src/thirdparty/get_user_for_user_id.rs
diff --git a/ruma-federation-api/src/authorization/get_event_authorization/mod.rs b/ruma-federation-api/src/authorization/get_event_authorization.rs
similarity index 100%
rename from ruma-federation-api/src/authorization/get_event_authorization/mod.rs
rename to ruma-federation-api/src/authorization/get_event_authorization.rs
diff --git a/ruma-federation-api/src/backfill/get_backfill/mod.rs b/ruma-federation-api/src/backfill/get_backfill.rs
similarity index 100%
rename from ruma-federation-api/src/backfill/get_backfill/mod.rs
rename to ruma-federation-api/src/backfill/get_backfill.rs
diff --git a/ruma-federation-api/src/device/get_devices/mod.rs b/ruma-federation-api/src/device/get_devices.rs
similarity index 100%
rename from ruma-federation-api/src/device/get_devices/mod.rs
rename to ruma-federation-api/src/device/get_devices.rs
diff --git a/ruma-federation-api/src/directory/get_public_rooms/mod.rs b/ruma-federation-api/src/directory/get_public_rooms.rs
similarity index 100%
rename from ruma-federation-api/src/directory/get_public_rooms/mod.rs
rename to ruma-federation-api/src/directory/get_public_rooms.rs
diff --git a/ruma-federation-api/src/discovery/get_remote_server_keys/mod.rs b/ruma-federation-api/src/discovery/get_remote_server_keys.rs
similarity index 100%
rename from ruma-federation-api/src/discovery/get_remote_server_keys/mod.rs
rename to ruma-federation-api/src/discovery/get_remote_server_keys.rs
diff --git a/ruma-federation-api/src/discovery/get_remote_server_keys_batch/mod.rs b/ruma-federation-api/src/discovery/get_remote_server_keys_batch.rs
similarity index 100%
rename from ruma-federation-api/src/discovery/get_remote_server_keys_batch/mod.rs
rename to ruma-federation-api/src/discovery/get_remote_server_keys_batch.rs
diff --git a/ruma-federation-api/src/discovery/get_server_keys/mod.rs b/ruma-federation-api/src/discovery/get_server_keys.rs
similarity index 100%
rename from ruma-federation-api/src/discovery/get_server_keys/mod.rs
rename to ruma-federation-api/src/discovery/get_server_keys.rs
diff --git a/ruma-federation-api/src/discovery/get_server_version/mod.rs b/ruma-federation-api/src/discovery/get_server_version.rs
similarity index 100%
rename from ruma-federation-api/src/discovery/get_server_version/mod.rs
rename to ruma-federation-api/src/discovery/get_server_version.rs
diff --git a/ruma-federation-api/src/keys/claim_keys/mod.rs b/ruma-federation-api/src/keys/claim_keys.rs
similarity index 100%
rename from ruma-federation-api/src/keys/claim_keys/mod.rs
rename to ruma-federation-api/src/keys/claim_keys.rs
diff --git a/ruma-federation-api/src/keys/get_keys/mod.rs b/ruma-federation-api/src/keys/get_keys.rs
similarity index 100%
rename from ruma-federation-api/src/keys/get_keys/mod.rs
rename to ruma-federation-api/src/keys/get_keys.rs
diff --git a/ruma-federation-api/src/membership/create_join_event/mod.rs b/ruma-federation-api/src/membership/create_join_event.rs
similarity index 100%
rename from ruma-federation-api/src/membership/create_join_event/mod.rs
rename to ruma-federation-api/src/membership/create_join_event.rs
diff --git a/ruma-federation-api/src/membership/create_join_event_template/mod.rs b/ruma-federation-api/src/membership/create_join_event_template.rs
similarity index 100%
rename from ruma-federation-api/src/membership/create_join_event_template/mod.rs
rename to ruma-federation-api/src/membership/create_join_event_template.rs
diff --git a/ruma-federation-api/src/openid/get_openid_userinfo/mod.rs b/ruma-federation-api/src/openid/get_openid_userinfo.rs
similarity index 100%
rename from ruma-federation-api/src/openid/get_openid_userinfo/mod.rs
rename to ruma-federation-api/src/openid/get_openid_userinfo.rs
diff --git a/ruma-federation-api/src/query/get_profile_information/mod.rs b/ruma-federation-api/src/query/get_profile_information.rs
similarity index 100%
rename from ruma-federation-api/src/query/get_profile_information/mod.rs
rename to ruma-federation-api/src/query/get_profile_information.rs
diff --git a/ruma-federation-api/src/query/get_room_information/mod.rs b/ruma-federation-api/src/query/get_room_information.rs
similarity index 100%
rename from ruma-federation-api/src/query/get_room_information/mod.rs
rename to ruma-federation-api/src/query/get_room_information.rs
diff --git a/ruma-federation-api/src/transactions/send_transaction_message/mod.rs b/ruma-federation-api/src/transactions/send_transaction_message.rs
similarity index 100%
rename from ruma-federation-api/src/transactions/send_transaction_message/mod.rs
rename to ruma-federation-api/src/transactions/send_transaction_message.rs