diff --git a/Cargo.toml b/Cargo.toml
index 76c64b11..83fb7602 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,2 +1,2 @@
 [workspace]
-members = ["ruma", "ruma-*", "xtask"]
+members = ["crates/*", "xtask"]
diff --git a/ruma-api-macros/CHANGELOG.md b/crates/ruma-api-macros/CHANGELOG.md
similarity index 100%
rename from ruma-api-macros/CHANGELOG.md
rename to crates/ruma-api-macros/CHANGELOG.md
diff --git a/ruma-api-macros/Cargo.toml b/crates/ruma-api-macros/Cargo.toml
similarity index 100%
rename from ruma-api-macros/Cargo.toml
rename to crates/ruma-api-macros/Cargo.toml
diff --git a/ruma-api-macros/README.md b/crates/ruma-api-macros/README.md
similarity index 100%
rename from ruma-api-macros/README.md
rename to crates/ruma-api-macros/README.md
diff --git a/ruma-api-macros/src/api.rs b/crates/ruma-api-macros/src/api.rs
similarity index 100%
rename from ruma-api-macros/src/api.rs
rename to crates/ruma-api-macros/src/api.rs
diff --git a/ruma-api-macros/src/api/attribute.rs b/crates/ruma-api-macros/src/api/attribute.rs
similarity index 100%
rename from ruma-api-macros/src/api/attribute.rs
rename to crates/ruma-api-macros/src/api/attribute.rs
diff --git a/ruma-api-macros/src/api/metadata.rs b/crates/ruma-api-macros/src/api/metadata.rs
similarity index 100%
rename from ruma-api-macros/src/api/metadata.rs
rename to crates/ruma-api-macros/src/api/metadata.rs
diff --git a/ruma-api-macros/src/api/parse.rs b/crates/ruma-api-macros/src/api/parse.rs
similarity index 100%
rename from ruma-api-macros/src/api/parse.rs
rename to crates/ruma-api-macros/src/api/parse.rs
diff --git a/ruma-api-macros/src/api/request.rs b/crates/ruma-api-macros/src/api/request.rs
similarity index 100%
rename from ruma-api-macros/src/api/request.rs
rename to crates/ruma-api-macros/src/api/request.rs
diff --git a/ruma-api-macros/src/api/request/incoming.rs b/crates/ruma-api-macros/src/api/request/incoming.rs
similarity index 100%
rename from ruma-api-macros/src/api/request/incoming.rs
rename to crates/ruma-api-macros/src/api/request/incoming.rs
diff --git a/ruma-api-macros/src/api/request/outgoing.rs b/crates/ruma-api-macros/src/api/request/outgoing.rs
similarity index 100%
rename from ruma-api-macros/src/api/request/outgoing.rs
rename to crates/ruma-api-macros/src/api/request/outgoing.rs
diff --git a/ruma-api-macros/src/api/response.rs b/crates/ruma-api-macros/src/api/response.rs
similarity index 100%
rename from ruma-api-macros/src/api/response.rs
rename to crates/ruma-api-macros/src/api/response.rs
diff --git a/ruma-api-macros/src/api/response/incoming.rs b/crates/ruma-api-macros/src/api/response/incoming.rs
similarity index 100%
rename from ruma-api-macros/src/api/response/incoming.rs
rename to crates/ruma-api-macros/src/api/response/incoming.rs
diff --git a/ruma-api-macros/src/api/response/outgoing.rs b/crates/ruma-api-macros/src/api/response/outgoing.rs
similarity index 100%
rename from ruma-api-macros/src/api/response/outgoing.rs
rename to crates/ruma-api-macros/src/api/response/outgoing.rs
diff --git a/ruma-api-macros/src/lib.rs b/crates/ruma-api-macros/src/lib.rs
similarity index 100%
rename from ruma-api-macros/src/lib.rs
rename to crates/ruma-api-macros/src/lib.rs
diff --git a/ruma-api-macros/src/util.rs b/crates/ruma-api-macros/src/util.rs
similarity index 100%
rename from ruma-api-macros/src/util.rs
rename to crates/ruma-api-macros/src/util.rs
diff --git a/ruma-api/CHANGELOG.md b/crates/ruma-api/CHANGELOG.md
similarity index 100%
rename from ruma-api/CHANGELOG.md
rename to crates/ruma-api/CHANGELOG.md
diff --git a/ruma-api/Cargo.toml b/crates/ruma-api/Cargo.toml
similarity index 100%
rename from ruma-api/Cargo.toml
rename to crates/ruma-api/Cargo.toml
diff --git a/ruma-api/README.md b/crates/ruma-api/README.md
similarity index 100%
rename from ruma-api/README.md
rename to crates/ruma-api/README.md
diff --git a/ruma-api/src/error.rs b/crates/ruma-api/src/error.rs
similarity index 100%
rename from ruma-api/src/error.rs
rename to crates/ruma-api/src/error.rs
diff --git a/ruma-api/src/lib.rs b/crates/ruma-api/src/lib.rs
similarity index 100%
rename from ruma-api/src/lib.rs
rename to crates/ruma-api/src/lib.rs
diff --git a/ruma-api/tests/conversions.rs b/crates/ruma-api/tests/conversions.rs
similarity index 100%
rename from ruma-api/tests/conversions.rs
rename to crates/ruma-api/tests/conversions.rs
diff --git a/ruma-api/tests/header_override.rs b/crates/ruma-api/tests/header_override.rs
similarity index 100%
rename from ruma-api/tests/header_override.rs
rename to crates/ruma-api/tests/header_override.rs
diff --git a/ruma-api/tests/manual_endpoint_impl.rs b/crates/ruma-api/tests/manual_endpoint_impl.rs
similarity index 100%
rename from ruma-api/tests/manual_endpoint_impl.rs
rename to crates/ruma-api/tests/manual_endpoint_impl.rs
diff --git a/ruma-api/tests/no_fields.rs b/crates/ruma-api/tests/no_fields.rs
similarity index 100%
rename from ruma-api/tests/no_fields.rs
rename to crates/ruma-api/tests/no_fields.rs
diff --git a/ruma-api/tests/optional_headers.rs b/crates/ruma-api/tests/optional_headers.rs
similarity index 100%
rename from ruma-api/tests/optional_headers.rs
rename to crates/ruma-api/tests/optional_headers.rs
diff --git a/ruma-api/tests/ruma_api.rs b/crates/ruma-api/tests/ruma_api.rs
similarity index 100%
rename from ruma-api/tests/ruma_api.rs
rename to crates/ruma-api/tests/ruma_api.rs
diff --git a/ruma-api/tests/ruma_api_lifetime.rs b/crates/ruma-api/tests/ruma_api_lifetime.rs
similarity index 100%
rename from ruma-api/tests/ruma_api_lifetime.rs
rename to crates/ruma-api/tests/ruma_api_lifetime.rs
diff --git a/ruma-api/tests/ruma_api_macros.rs b/crates/ruma-api/tests/ruma_api_macros.rs
similarity index 100%
rename from ruma-api/tests/ruma_api_macros.rs
rename to crates/ruma-api/tests/ruma_api_macros.rs
diff --git a/ruma-api/tests/ui/01-api-sanity-check.rs b/crates/ruma-api/tests/ui/01-api-sanity-check.rs
similarity index 100%
rename from ruma-api/tests/ui/01-api-sanity-check.rs
rename to crates/ruma-api/tests/ui/01-api-sanity-check.rs
diff --git a/ruma-api/tests/ui/02-invalid-path.rs b/crates/ruma-api/tests/ui/02-invalid-path.rs
similarity index 100%
rename from ruma-api/tests/ui/02-invalid-path.rs
rename to crates/ruma-api/tests/ui/02-invalid-path.rs
diff --git a/ruma-api/tests/ui/02-invalid-path.stderr b/crates/ruma-api/tests/ui/02-invalid-path.stderr
similarity index 100%
rename from ruma-api/tests/ui/02-invalid-path.stderr
rename to crates/ruma-api/tests/ui/02-invalid-path.stderr
diff --git a/ruma-api/tests/ui/03-move-value.rs b/crates/ruma-api/tests/ui/03-move-value.rs
similarity index 100%
rename from ruma-api/tests/ui/03-move-value.rs
rename to crates/ruma-api/tests/ui/03-move-value.rs
diff --git a/ruma-api/tests/ui/04-attributes.rs b/crates/ruma-api/tests/ui/04-attributes.rs
similarity index 100%
rename from ruma-api/tests/ui/04-attributes.rs
rename to crates/ruma-api/tests/ui/04-attributes.rs
diff --git a/ruma-api/tests/ui/04-attributes.stderr b/crates/ruma-api/tests/ui/04-attributes.stderr
similarity index 100%
rename from ruma-api/tests/ui/04-attributes.stderr
rename to crates/ruma-api/tests/ui/04-attributes.stderr
diff --git a/ruma-api/tests/ui/05-request-only.rs b/crates/ruma-api/tests/ui/05-request-only.rs
similarity index 100%
rename from ruma-api/tests/ui/05-request-only.rs
rename to crates/ruma-api/tests/ui/05-request-only.rs
diff --git a/ruma-api/tests/ui/06-response-only.rs b/crates/ruma-api/tests/ui/06-response-only.rs
similarity index 100%
rename from ruma-api/tests/ui/06-response-only.rs
rename to crates/ruma-api/tests/ui/06-response-only.rs
diff --git a/ruma-api/tests/ui/07-error-type-attribute.rs b/crates/ruma-api/tests/ui/07-error-type-attribute.rs
similarity index 100%
rename from ruma-api/tests/ui/07-error-type-attribute.rs
rename to crates/ruma-api/tests/ui/07-error-type-attribute.rs
diff --git a/ruma-api/tests/ui/07-error-type-attribute.stderr b/crates/ruma-api/tests/ui/07-error-type-attribute.stderr
similarity index 100%
rename from ruma-api/tests/ui/07-error-type-attribute.stderr
rename to crates/ruma-api/tests/ui/07-error-type-attribute.stderr
diff --git a/ruma-appservice-api/CHANGELOG.md b/crates/ruma-appservice-api/CHANGELOG.md
similarity index 100%
rename from ruma-appservice-api/CHANGELOG.md
rename to crates/ruma-appservice-api/CHANGELOG.md
diff --git a/ruma-appservice-api/Cargo.toml b/crates/ruma-appservice-api/Cargo.toml
similarity index 100%
rename from ruma-appservice-api/Cargo.toml
rename to crates/ruma-appservice-api/Cargo.toml
diff --git a/ruma-appservice-api/README.md b/crates/ruma-appservice-api/README.md
similarity index 100%
rename from ruma-appservice-api/README.md
rename to crates/ruma-appservice-api/README.md
diff --git a/ruma-appservice-api/src/directory.rs b/crates/ruma-appservice-api/src/directory.rs
similarity index 100%
rename from ruma-appservice-api/src/directory.rs
rename to crates/ruma-appservice-api/src/directory.rs
diff --git a/ruma-appservice-api/src/directory/set_room_visibility.rs b/crates/ruma-appservice-api/src/directory/set_room_visibility.rs
similarity index 100%
rename from ruma-appservice-api/src/directory/set_room_visibility.rs
rename to crates/ruma-appservice-api/src/directory/set_room_visibility.rs
diff --git a/ruma-appservice-api/src/event.rs b/crates/ruma-appservice-api/src/event.rs
similarity index 100%
rename from ruma-appservice-api/src/event.rs
rename to crates/ruma-appservice-api/src/event.rs
diff --git a/ruma-appservice-api/src/event/push_events.rs b/crates/ruma-appservice-api/src/event/push_events.rs
similarity index 100%
rename from ruma-appservice-api/src/event/push_events.rs
rename to crates/ruma-appservice-api/src/event/push_events.rs
diff --git a/ruma-appservice-api/src/event/push_events/v1.rs b/crates/ruma-appservice-api/src/event/push_events/v1.rs
similarity index 100%
rename from ruma-appservice-api/src/event/push_events/v1.rs
rename to crates/ruma-appservice-api/src/event/push_events/v1.rs
diff --git a/ruma-appservice-api/src/lib.rs b/crates/ruma-appservice-api/src/lib.rs
similarity index 100%
rename from ruma-appservice-api/src/lib.rs
rename to crates/ruma-appservice-api/src/lib.rs
diff --git a/ruma-appservice-api/src/query.rs b/crates/ruma-appservice-api/src/query.rs
similarity index 100%
rename from ruma-appservice-api/src/query.rs
rename to crates/ruma-appservice-api/src/query.rs
diff --git a/ruma-appservice-api/src/query/query_room_alias.rs b/crates/ruma-appservice-api/src/query/query_room_alias.rs
similarity index 100%
rename from ruma-appservice-api/src/query/query_room_alias.rs
rename to crates/ruma-appservice-api/src/query/query_room_alias.rs
diff --git a/ruma-appservice-api/src/query/query_room_alias/v1.rs b/crates/ruma-appservice-api/src/query/query_room_alias/v1.rs
similarity index 100%
rename from ruma-appservice-api/src/query/query_room_alias/v1.rs
rename to crates/ruma-appservice-api/src/query/query_room_alias/v1.rs
diff --git a/ruma-appservice-api/src/query/query_user_id.rs b/crates/ruma-appservice-api/src/query/query_user_id.rs
similarity index 100%
rename from ruma-appservice-api/src/query/query_user_id.rs
rename to crates/ruma-appservice-api/src/query/query_user_id.rs
diff --git a/ruma-appservice-api/src/query/query_user_id/v1.rs b/crates/ruma-appservice-api/src/query/query_user_id/v1.rs
similarity index 100%
rename from ruma-appservice-api/src/query/query_user_id/v1.rs
rename to crates/ruma-appservice-api/src/query/query_user_id/v1.rs
diff --git a/ruma-appservice-api/src/thirdparty.rs b/crates/ruma-appservice-api/src/thirdparty.rs
similarity index 100%
rename from ruma-appservice-api/src/thirdparty.rs
rename to crates/ruma-appservice-api/src/thirdparty.rs
diff --git a/ruma-appservice-api/src/thirdparty/get_location_for_protocol.rs b/crates/ruma-appservice-api/src/thirdparty/get_location_for_protocol.rs
similarity index 100%
rename from ruma-appservice-api/src/thirdparty/get_location_for_protocol.rs
rename to crates/ruma-appservice-api/src/thirdparty/get_location_for_protocol.rs
diff --git a/ruma-appservice-api/src/thirdparty/get_location_for_protocol/v1.rs b/crates/ruma-appservice-api/src/thirdparty/get_location_for_protocol/v1.rs
similarity index 100%
rename from ruma-appservice-api/src/thirdparty/get_location_for_protocol/v1.rs
rename to crates/ruma-appservice-api/src/thirdparty/get_location_for_protocol/v1.rs
diff --git a/ruma-appservice-api/src/thirdparty/get_location_for_room_alias.rs b/crates/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.rs
rename to crates/ruma-appservice-api/src/thirdparty/get_location_for_room_alias.rs
diff --git a/ruma-appservice-api/src/thirdparty/get_location_for_room_alias/v1.rs b/crates/ruma-appservice-api/src/thirdparty/get_location_for_room_alias/v1.rs
similarity index 100%
rename from ruma-appservice-api/src/thirdparty/get_location_for_room_alias/v1.rs
rename to crates/ruma-appservice-api/src/thirdparty/get_location_for_room_alias/v1.rs
diff --git a/ruma-appservice-api/src/thirdparty/get_protocol.rs b/crates/ruma-appservice-api/src/thirdparty/get_protocol.rs
similarity index 100%
rename from ruma-appservice-api/src/thirdparty/get_protocol.rs
rename to crates/ruma-appservice-api/src/thirdparty/get_protocol.rs
diff --git a/ruma-appservice-api/src/thirdparty/get_protocol/v1.rs b/crates/ruma-appservice-api/src/thirdparty/get_protocol/v1.rs
similarity index 100%
rename from ruma-appservice-api/src/thirdparty/get_protocol/v1.rs
rename to crates/ruma-appservice-api/src/thirdparty/get_protocol/v1.rs
diff --git a/ruma-appservice-api/src/thirdparty/get_user_for_protocol.rs b/crates/ruma-appservice-api/src/thirdparty/get_user_for_protocol.rs
similarity index 100%
rename from ruma-appservice-api/src/thirdparty/get_user_for_protocol.rs
rename to crates/ruma-appservice-api/src/thirdparty/get_user_for_protocol.rs
diff --git a/ruma-appservice-api/src/thirdparty/get_user_for_protocol/v1.rs b/crates/ruma-appservice-api/src/thirdparty/get_user_for_protocol/v1.rs
similarity index 100%
rename from ruma-appservice-api/src/thirdparty/get_user_for_protocol/v1.rs
rename to crates/ruma-appservice-api/src/thirdparty/get_user_for_protocol/v1.rs
diff --git a/ruma-appservice-api/src/thirdparty/get_user_for_user_id.rs b/crates/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.rs
rename to crates/ruma-appservice-api/src/thirdparty/get_user_for_user_id.rs
diff --git a/ruma-appservice-api/src/thirdparty/get_user_for_user_id/v1.rs b/crates/ruma-appservice-api/src/thirdparty/get_user_for_user_id/v1.rs
similarity index 100%
rename from ruma-appservice-api/src/thirdparty/get_user_for_user_id/v1.rs
rename to crates/ruma-appservice-api/src/thirdparty/get_user_for_user_id/v1.rs
diff --git a/ruma-appservice-api/tests/appservice_registration.rs b/crates/ruma-appservice-api/tests/appservice_registration.rs
similarity index 100%
rename from ruma-appservice-api/tests/appservice_registration.rs
rename to crates/ruma-appservice-api/tests/appservice_registration.rs
diff --git a/ruma-client-api/CHANGELOG.md b/crates/ruma-client-api/CHANGELOG.md
similarity index 100%
rename from ruma-client-api/CHANGELOG.md
rename to crates/ruma-client-api/CHANGELOG.md
diff --git a/ruma-client-api/Cargo.toml b/crates/ruma-client-api/Cargo.toml
similarity index 100%
rename from ruma-client-api/Cargo.toml
rename to crates/ruma-client-api/Cargo.toml
diff --git a/ruma-client-api/README.md b/crates/ruma-client-api/README.md
similarity index 100%
rename from ruma-client-api/README.md
rename to crates/ruma-client-api/README.md
diff --git a/ruma-client-api/src/error.rs b/crates/ruma-client-api/src/error.rs
similarity index 100%
rename from ruma-client-api/src/error.rs
rename to crates/ruma-client-api/src/error.rs
diff --git a/ruma-client-api/src/error/kind_serde.rs b/crates/ruma-client-api/src/error/kind_serde.rs
similarity index 100%
rename from ruma-client-api/src/error/kind_serde.rs
rename to crates/ruma-client-api/src/error/kind_serde.rs
diff --git a/ruma-client-api/src/lib.rs b/crates/ruma-client-api/src/lib.rs
similarity index 100%
rename from ruma-client-api/src/lib.rs
rename to crates/ruma-client-api/src/lib.rs
diff --git a/ruma-client-api/src/r0.rs b/crates/ruma-client-api/src/r0.rs
similarity index 100%
rename from ruma-client-api/src/r0.rs
rename to crates/ruma-client-api/src/r0.rs
diff --git a/ruma-client-api/src/r0/account.rs b/crates/ruma-client-api/src/r0/account.rs
similarity index 100%
rename from ruma-client-api/src/r0/account.rs
rename to crates/ruma-client-api/src/r0/account.rs
diff --git a/ruma-client-api/src/r0/account/add_3pid.rs b/crates/ruma-client-api/src/r0/account/add_3pid.rs
similarity index 100%
rename from ruma-client-api/src/r0/account/add_3pid.rs
rename to crates/ruma-client-api/src/r0/account/add_3pid.rs
diff --git a/ruma-client-api/src/r0/account/bind_3pid.rs b/crates/ruma-client-api/src/r0/account/bind_3pid.rs
similarity index 100%
rename from ruma-client-api/src/r0/account/bind_3pid.rs
rename to crates/ruma-client-api/src/r0/account/bind_3pid.rs
diff --git a/ruma-client-api/src/r0/account/change_password.rs b/crates/ruma-client-api/src/r0/account/change_password.rs
similarity index 100%
rename from ruma-client-api/src/r0/account/change_password.rs
rename to crates/ruma-client-api/src/r0/account/change_password.rs
diff --git a/ruma-client-api/src/r0/account/deactivate.rs b/crates/ruma-client-api/src/r0/account/deactivate.rs
similarity index 100%
rename from ruma-client-api/src/r0/account/deactivate.rs
rename to crates/ruma-client-api/src/r0/account/deactivate.rs
diff --git a/ruma-client-api/src/r0/account/delete_3pid.rs b/crates/ruma-client-api/src/r0/account/delete_3pid.rs
similarity index 100%
rename from ruma-client-api/src/r0/account/delete_3pid.rs
rename to crates/ruma-client-api/src/r0/account/delete_3pid.rs
diff --git a/ruma-client-api/src/r0/account/get_username_availability.rs b/crates/ruma-client-api/src/r0/account/get_username_availability.rs
similarity index 100%
rename from ruma-client-api/src/r0/account/get_username_availability.rs
rename to crates/ruma-client-api/src/r0/account/get_username_availability.rs
diff --git a/ruma-client-api/src/r0/account/register.rs b/crates/ruma-client-api/src/r0/account/register.rs
similarity index 100%
rename from ruma-client-api/src/r0/account/register.rs
rename to crates/ruma-client-api/src/r0/account/register.rs
diff --git a/ruma-client-api/src/r0/account/request_3pid_management_token_via_email.rs b/crates/ruma-client-api/src/r0/account/request_3pid_management_token_via_email.rs
similarity index 100%
rename from ruma-client-api/src/r0/account/request_3pid_management_token_via_email.rs
rename to crates/ruma-client-api/src/r0/account/request_3pid_management_token_via_email.rs
diff --git a/ruma-client-api/src/r0/account/request_3pid_management_token_via_msisdn.rs b/crates/ruma-client-api/src/r0/account/request_3pid_management_token_via_msisdn.rs
similarity index 100%
rename from ruma-client-api/src/r0/account/request_3pid_management_token_via_msisdn.rs
rename to crates/ruma-client-api/src/r0/account/request_3pid_management_token_via_msisdn.rs
diff --git a/ruma-client-api/src/r0/account/request_openid_token.rs b/crates/ruma-client-api/src/r0/account/request_openid_token.rs
similarity index 100%
rename from ruma-client-api/src/r0/account/request_openid_token.rs
rename to crates/ruma-client-api/src/r0/account/request_openid_token.rs
diff --git a/ruma-client-api/src/r0/account/request_password_change_token_via_email.rs b/crates/ruma-client-api/src/r0/account/request_password_change_token_via_email.rs
similarity index 100%
rename from ruma-client-api/src/r0/account/request_password_change_token_via_email.rs
rename to crates/ruma-client-api/src/r0/account/request_password_change_token_via_email.rs
diff --git a/ruma-client-api/src/r0/account/request_password_change_token_via_msisdn.rs b/crates/ruma-client-api/src/r0/account/request_password_change_token_via_msisdn.rs
similarity index 100%
rename from ruma-client-api/src/r0/account/request_password_change_token_via_msisdn.rs
rename to crates/ruma-client-api/src/r0/account/request_password_change_token_via_msisdn.rs
diff --git a/ruma-client-api/src/r0/account/request_registration_token_via_email.rs b/crates/ruma-client-api/src/r0/account/request_registration_token_via_email.rs
similarity index 100%
rename from ruma-client-api/src/r0/account/request_registration_token_via_email.rs
rename to crates/ruma-client-api/src/r0/account/request_registration_token_via_email.rs
diff --git a/ruma-client-api/src/r0/account/request_registration_token_via_msisdn.rs b/crates/ruma-client-api/src/r0/account/request_registration_token_via_msisdn.rs
similarity index 100%
rename from ruma-client-api/src/r0/account/request_registration_token_via_msisdn.rs
rename to crates/ruma-client-api/src/r0/account/request_registration_token_via_msisdn.rs
diff --git a/ruma-client-api/src/r0/account/unbind_3pid.rs b/crates/ruma-client-api/src/r0/account/unbind_3pid.rs
similarity index 100%
rename from ruma-client-api/src/r0/account/unbind_3pid.rs
rename to crates/ruma-client-api/src/r0/account/unbind_3pid.rs
diff --git a/ruma-client-api/src/r0/account/whoami.rs b/crates/ruma-client-api/src/r0/account/whoami.rs
similarity index 100%
rename from ruma-client-api/src/r0/account/whoami.rs
rename to crates/ruma-client-api/src/r0/account/whoami.rs
diff --git a/ruma-client-api/src/r0/alias.rs b/crates/ruma-client-api/src/r0/alias.rs
similarity index 100%
rename from ruma-client-api/src/r0/alias.rs
rename to crates/ruma-client-api/src/r0/alias.rs
diff --git a/ruma-client-api/src/r0/alias/create_alias.rs b/crates/ruma-client-api/src/r0/alias/create_alias.rs
similarity index 100%
rename from ruma-client-api/src/r0/alias/create_alias.rs
rename to crates/ruma-client-api/src/r0/alias/create_alias.rs
diff --git a/ruma-client-api/src/r0/alias/delete_alias.rs b/crates/ruma-client-api/src/r0/alias/delete_alias.rs
similarity index 100%
rename from ruma-client-api/src/r0/alias/delete_alias.rs
rename to crates/ruma-client-api/src/r0/alias/delete_alias.rs
diff --git a/ruma-client-api/src/r0/alias/get_alias.rs b/crates/ruma-client-api/src/r0/alias/get_alias.rs
similarity index 100%
rename from ruma-client-api/src/r0/alias/get_alias.rs
rename to crates/ruma-client-api/src/r0/alias/get_alias.rs
diff --git a/ruma-client-api/src/r0/appservice.rs b/crates/ruma-client-api/src/r0/appservice.rs
similarity index 100%
rename from ruma-client-api/src/r0/appservice.rs
rename to crates/ruma-client-api/src/r0/appservice.rs
diff --git a/ruma-client-api/src/r0/appservice/set_room_visibility.rs b/crates/ruma-client-api/src/r0/appservice/set_room_visibility.rs
similarity index 100%
rename from ruma-client-api/src/r0/appservice/set_room_visibility.rs
rename to crates/ruma-client-api/src/r0/appservice/set_room_visibility.rs
diff --git a/ruma-client-api/src/r0/backup.rs b/crates/ruma-client-api/src/r0/backup.rs
similarity index 100%
rename from ruma-client-api/src/r0/backup.rs
rename to crates/ruma-client-api/src/r0/backup.rs
diff --git a/ruma-client-api/src/r0/backup/add_backup_key_session.rs b/crates/ruma-client-api/src/r0/backup/add_backup_key_session.rs
similarity index 100%
rename from ruma-client-api/src/r0/backup/add_backup_key_session.rs
rename to crates/ruma-client-api/src/r0/backup/add_backup_key_session.rs
diff --git a/ruma-client-api/src/r0/backup/add_backup_key_sessions.rs b/crates/ruma-client-api/src/r0/backup/add_backup_key_sessions.rs
similarity index 100%
rename from ruma-client-api/src/r0/backup/add_backup_key_sessions.rs
rename to crates/ruma-client-api/src/r0/backup/add_backup_key_sessions.rs
diff --git a/ruma-client-api/src/r0/backup/add_backup_keys.rs b/crates/ruma-client-api/src/r0/backup/add_backup_keys.rs
similarity index 100%
rename from ruma-client-api/src/r0/backup/add_backup_keys.rs
rename to crates/ruma-client-api/src/r0/backup/add_backup_keys.rs
diff --git a/ruma-client-api/src/r0/backup/create_backup.rs b/crates/ruma-client-api/src/r0/backup/create_backup.rs
similarity index 100%
rename from ruma-client-api/src/r0/backup/create_backup.rs
rename to crates/ruma-client-api/src/r0/backup/create_backup.rs
diff --git a/ruma-client-api/src/r0/backup/delete_backup.rs b/crates/ruma-client-api/src/r0/backup/delete_backup.rs
similarity index 100%
rename from ruma-client-api/src/r0/backup/delete_backup.rs
rename to crates/ruma-client-api/src/r0/backup/delete_backup.rs
diff --git a/ruma-client-api/src/r0/backup/delete_backup_key_session.rs b/crates/ruma-client-api/src/r0/backup/delete_backup_key_session.rs
similarity index 100%
rename from ruma-client-api/src/r0/backup/delete_backup_key_session.rs
rename to crates/ruma-client-api/src/r0/backup/delete_backup_key_session.rs
diff --git a/ruma-client-api/src/r0/backup/delete_backup_key_sessions.rs b/crates/ruma-client-api/src/r0/backup/delete_backup_key_sessions.rs
similarity index 100%
rename from ruma-client-api/src/r0/backup/delete_backup_key_sessions.rs
rename to crates/ruma-client-api/src/r0/backup/delete_backup_key_sessions.rs
diff --git a/ruma-client-api/src/r0/backup/delete_backup_keys.rs b/crates/ruma-client-api/src/r0/backup/delete_backup_keys.rs
similarity index 100%
rename from ruma-client-api/src/r0/backup/delete_backup_keys.rs
rename to crates/ruma-client-api/src/r0/backup/delete_backup_keys.rs
diff --git a/ruma-client-api/src/r0/backup/get_backup.rs b/crates/ruma-client-api/src/r0/backup/get_backup.rs
similarity index 100%
rename from ruma-client-api/src/r0/backup/get_backup.rs
rename to crates/ruma-client-api/src/r0/backup/get_backup.rs
diff --git a/ruma-client-api/src/r0/backup/get_backup_key_session.rs b/crates/ruma-client-api/src/r0/backup/get_backup_key_session.rs
similarity index 100%
rename from ruma-client-api/src/r0/backup/get_backup_key_session.rs
rename to crates/ruma-client-api/src/r0/backup/get_backup_key_session.rs
diff --git a/ruma-client-api/src/r0/backup/get_backup_key_sessions.rs b/crates/ruma-client-api/src/r0/backup/get_backup_key_sessions.rs
similarity index 100%
rename from ruma-client-api/src/r0/backup/get_backup_key_sessions.rs
rename to crates/ruma-client-api/src/r0/backup/get_backup_key_sessions.rs
diff --git a/ruma-client-api/src/r0/backup/get_backup_keys.rs b/crates/ruma-client-api/src/r0/backup/get_backup_keys.rs
similarity index 100%
rename from ruma-client-api/src/r0/backup/get_backup_keys.rs
rename to crates/ruma-client-api/src/r0/backup/get_backup_keys.rs
diff --git a/ruma-client-api/src/r0/backup/get_latest_backup.rs b/crates/ruma-client-api/src/r0/backup/get_latest_backup.rs
similarity index 100%
rename from ruma-client-api/src/r0/backup/get_latest_backup.rs
rename to crates/ruma-client-api/src/r0/backup/get_latest_backup.rs
diff --git a/ruma-client-api/src/r0/backup/update_backup.rs b/crates/ruma-client-api/src/r0/backup/update_backup.rs
similarity index 100%
rename from ruma-client-api/src/r0/backup/update_backup.rs
rename to crates/ruma-client-api/src/r0/backup/update_backup.rs
diff --git a/ruma-client-api/src/r0/capabilities.rs b/crates/ruma-client-api/src/r0/capabilities.rs
similarity index 100%
rename from ruma-client-api/src/r0/capabilities.rs
rename to crates/ruma-client-api/src/r0/capabilities.rs
diff --git a/ruma-client-api/src/r0/capabilities/get_capabilities.rs b/crates/ruma-client-api/src/r0/capabilities/get_capabilities.rs
similarity index 100%
rename from ruma-client-api/src/r0/capabilities/get_capabilities.rs
rename to crates/ruma-client-api/src/r0/capabilities/get_capabilities.rs
diff --git a/ruma-client-api/src/r0/capabilities/iter.rs b/crates/ruma-client-api/src/r0/capabilities/iter.rs
similarity index 100%
rename from ruma-client-api/src/r0/capabilities/iter.rs
rename to crates/ruma-client-api/src/r0/capabilities/iter.rs
diff --git a/ruma-client-api/src/r0/config.rs b/crates/ruma-client-api/src/r0/config.rs
similarity index 100%
rename from ruma-client-api/src/r0/config.rs
rename to crates/ruma-client-api/src/r0/config.rs
diff --git a/ruma-client-api/src/r0/config/get_global_account_data.rs b/crates/ruma-client-api/src/r0/config/get_global_account_data.rs
similarity index 100%
rename from ruma-client-api/src/r0/config/get_global_account_data.rs
rename to crates/ruma-client-api/src/r0/config/get_global_account_data.rs
diff --git a/ruma-client-api/src/r0/config/get_room_account_data.rs b/crates/ruma-client-api/src/r0/config/get_room_account_data.rs
similarity index 100%
rename from ruma-client-api/src/r0/config/get_room_account_data.rs
rename to crates/ruma-client-api/src/r0/config/get_room_account_data.rs
diff --git a/ruma-client-api/src/r0/config/set_global_account_data.rs b/crates/ruma-client-api/src/r0/config/set_global_account_data.rs
similarity index 100%
rename from ruma-client-api/src/r0/config/set_global_account_data.rs
rename to crates/ruma-client-api/src/r0/config/set_global_account_data.rs
diff --git a/ruma-client-api/src/r0/config/set_room_account_data.rs b/crates/ruma-client-api/src/r0/config/set_room_account_data.rs
similarity index 100%
rename from ruma-client-api/src/r0/config/set_room_account_data.rs
rename to crates/ruma-client-api/src/r0/config/set_room_account_data.rs
diff --git a/ruma-client-api/src/r0/contact.rs b/crates/ruma-client-api/src/r0/contact.rs
similarity index 100%
rename from ruma-client-api/src/r0/contact.rs
rename to crates/ruma-client-api/src/r0/contact.rs
diff --git a/ruma-client-api/src/r0/contact/get_contacts.rs b/crates/ruma-client-api/src/r0/contact/get_contacts.rs
similarity index 100%
rename from ruma-client-api/src/r0/contact/get_contacts.rs
rename to crates/ruma-client-api/src/r0/contact/get_contacts.rs
diff --git a/ruma-client-api/src/r0/contact/request_contact_verification_token.rs b/crates/ruma-client-api/src/r0/contact/request_contact_verification_token.rs
similarity index 100%
rename from ruma-client-api/src/r0/contact/request_contact_verification_token.rs
rename to crates/ruma-client-api/src/r0/contact/request_contact_verification_token.rs
diff --git a/ruma-client-api/src/r0/context.rs b/crates/ruma-client-api/src/r0/context.rs
similarity index 100%
rename from ruma-client-api/src/r0/context.rs
rename to crates/ruma-client-api/src/r0/context.rs
diff --git a/ruma-client-api/src/r0/context/get_context.rs b/crates/ruma-client-api/src/r0/context/get_context.rs
similarity index 100%
rename from ruma-client-api/src/r0/context/get_context.rs
rename to crates/ruma-client-api/src/r0/context/get_context.rs
diff --git a/ruma-client-api/src/r0/device.rs b/crates/ruma-client-api/src/r0/device.rs
similarity index 100%
rename from ruma-client-api/src/r0/device.rs
rename to crates/ruma-client-api/src/r0/device.rs
diff --git a/ruma-client-api/src/r0/device/delete_device.rs b/crates/ruma-client-api/src/r0/device/delete_device.rs
similarity index 100%
rename from ruma-client-api/src/r0/device/delete_device.rs
rename to crates/ruma-client-api/src/r0/device/delete_device.rs
diff --git a/ruma-client-api/src/r0/device/delete_devices.rs b/crates/ruma-client-api/src/r0/device/delete_devices.rs
similarity index 100%
rename from ruma-client-api/src/r0/device/delete_devices.rs
rename to crates/ruma-client-api/src/r0/device/delete_devices.rs
diff --git a/ruma-client-api/src/r0/device/get_device.rs b/crates/ruma-client-api/src/r0/device/get_device.rs
similarity index 100%
rename from ruma-client-api/src/r0/device/get_device.rs
rename to crates/ruma-client-api/src/r0/device/get_device.rs
diff --git a/ruma-client-api/src/r0/device/get_devices.rs b/crates/ruma-client-api/src/r0/device/get_devices.rs
similarity index 100%
rename from ruma-client-api/src/r0/device/get_devices.rs
rename to crates/ruma-client-api/src/r0/device/get_devices.rs
diff --git a/ruma-client-api/src/r0/device/update_device.rs b/crates/ruma-client-api/src/r0/device/update_device.rs
similarity index 100%
rename from ruma-client-api/src/r0/device/update_device.rs
rename to crates/ruma-client-api/src/r0/device/update_device.rs
diff --git a/ruma-client-api/src/r0/directory.rs b/crates/ruma-client-api/src/r0/directory.rs
similarity index 100%
rename from ruma-client-api/src/r0/directory.rs
rename to crates/ruma-client-api/src/r0/directory.rs
diff --git a/ruma-client-api/src/r0/directory/get_public_rooms.rs b/crates/ruma-client-api/src/r0/directory/get_public_rooms.rs
similarity index 100%
rename from ruma-client-api/src/r0/directory/get_public_rooms.rs
rename to crates/ruma-client-api/src/r0/directory/get_public_rooms.rs
diff --git a/ruma-client-api/src/r0/directory/get_public_rooms_filtered.rs b/crates/ruma-client-api/src/r0/directory/get_public_rooms_filtered.rs
similarity index 100%
rename from ruma-client-api/src/r0/directory/get_public_rooms_filtered.rs
rename to crates/ruma-client-api/src/r0/directory/get_public_rooms_filtered.rs
diff --git a/ruma-client-api/src/r0/directory/get_room_visibility.rs b/crates/ruma-client-api/src/r0/directory/get_room_visibility.rs
similarity index 100%
rename from ruma-client-api/src/r0/directory/get_room_visibility.rs
rename to crates/ruma-client-api/src/r0/directory/get_room_visibility.rs
diff --git a/ruma-client-api/src/r0/directory/set_room_visibility.rs b/crates/ruma-client-api/src/r0/directory/set_room_visibility.rs
similarity index 100%
rename from ruma-client-api/src/r0/directory/set_room_visibility.rs
rename to crates/ruma-client-api/src/r0/directory/set_room_visibility.rs
diff --git a/ruma-client-api/src/r0/filter.rs b/crates/ruma-client-api/src/r0/filter.rs
similarity index 100%
rename from ruma-client-api/src/r0/filter.rs
rename to crates/ruma-client-api/src/r0/filter.rs
diff --git a/ruma-client-api/src/r0/filter/create_filter.rs b/crates/ruma-client-api/src/r0/filter/create_filter.rs
similarity index 100%
rename from ruma-client-api/src/r0/filter/create_filter.rs
rename to crates/ruma-client-api/src/r0/filter/create_filter.rs
diff --git a/ruma-client-api/src/r0/filter/get_filter.rs b/crates/ruma-client-api/src/r0/filter/get_filter.rs
similarity index 100%
rename from ruma-client-api/src/r0/filter/get_filter.rs
rename to crates/ruma-client-api/src/r0/filter/get_filter.rs
diff --git a/ruma-client-api/src/r0/filter/lazy_load.rs b/crates/ruma-client-api/src/r0/filter/lazy_load.rs
similarity index 100%
rename from ruma-client-api/src/r0/filter/lazy_load.rs
rename to crates/ruma-client-api/src/r0/filter/lazy_load.rs
diff --git a/ruma-client-api/src/r0/filter/url.rs b/crates/ruma-client-api/src/r0/filter/url.rs
similarity index 100%
rename from ruma-client-api/src/r0/filter/url.rs
rename to crates/ruma-client-api/src/r0/filter/url.rs
diff --git a/ruma-client-api/src/r0/keys.rs b/crates/ruma-client-api/src/r0/keys.rs
similarity index 100%
rename from ruma-client-api/src/r0/keys.rs
rename to crates/ruma-client-api/src/r0/keys.rs
diff --git a/ruma-client-api/src/r0/keys/claim_keys.rs b/crates/ruma-client-api/src/r0/keys/claim_keys.rs
similarity index 100%
rename from ruma-client-api/src/r0/keys/claim_keys.rs
rename to crates/ruma-client-api/src/r0/keys/claim_keys.rs
diff --git a/ruma-client-api/src/r0/keys/get_key_changes.rs b/crates/ruma-client-api/src/r0/keys/get_key_changes.rs
similarity index 100%
rename from ruma-client-api/src/r0/keys/get_key_changes.rs
rename to crates/ruma-client-api/src/r0/keys/get_key_changes.rs
diff --git a/ruma-client-api/src/r0/keys/get_keys.rs b/crates/ruma-client-api/src/r0/keys/get_keys.rs
similarity index 100%
rename from ruma-client-api/src/r0/keys/get_keys.rs
rename to crates/ruma-client-api/src/r0/keys/get_keys.rs
diff --git a/ruma-client-api/src/r0/keys/upload_keys.rs b/crates/ruma-client-api/src/r0/keys/upload_keys.rs
similarity index 100%
rename from ruma-client-api/src/r0/keys/upload_keys.rs
rename to crates/ruma-client-api/src/r0/keys/upload_keys.rs
diff --git a/ruma-client-api/src/r0/keys/upload_signatures.rs b/crates/ruma-client-api/src/r0/keys/upload_signatures.rs
similarity index 100%
rename from ruma-client-api/src/r0/keys/upload_signatures.rs
rename to crates/ruma-client-api/src/r0/keys/upload_signatures.rs
diff --git a/ruma-client-api/src/r0/keys/upload_signing_keys.rs b/crates/ruma-client-api/src/r0/keys/upload_signing_keys.rs
similarity index 100%
rename from ruma-client-api/src/r0/keys/upload_signing_keys.rs
rename to crates/ruma-client-api/src/r0/keys/upload_signing_keys.rs
diff --git a/ruma-client-api/src/r0/media.rs b/crates/ruma-client-api/src/r0/media.rs
similarity index 100%
rename from ruma-client-api/src/r0/media.rs
rename to crates/ruma-client-api/src/r0/media.rs
diff --git a/ruma-client-api/src/r0/media/create_content.rs b/crates/ruma-client-api/src/r0/media/create_content.rs
similarity index 100%
rename from ruma-client-api/src/r0/media/create_content.rs
rename to crates/ruma-client-api/src/r0/media/create_content.rs
diff --git a/ruma-client-api/src/r0/media/get_content.rs b/crates/ruma-client-api/src/r0/media/get_content.rs
similarity index 100%
rename from ruma-client-api/src/r0/media/get_content.rs
rename to crates/ruma-client-api/src/r0/media/get_content.rs
diff --git a/ruma-client-api/src/r0/media/get_content_as_filename.rs b/crates/ruma-client-api/src/r0/media/get_content_as_filename.rs
similarity index 100%
rename from ruma-client-api/src/r0/media/get_content_as_filename.rs
rename to crates/ruma-client-api/src/r0/media/get_content_as_filename.rs
diff --git a/ruma-client-api/src/r0/media/get_content_thumbnail.rs b/crates/ruma-client-api/src/r0/media/get_content_thumbnail.rs
similarity index 100%
rename from ruma-client-api/src/r0/media/get_content_thumbnail.rs
rename to crates/ruma-client-api/src/r0/media/get_content_thumbnail.rs
diff --git a/ruma-client-api/src/r0/media/get_media_config.rs b/crates/ruma-client-api/src/r0/media/get_media_config.rs
similarity index 100%
rename from ruma-client-api/src/r0/media/get_media_config.rs
rename to crates/ruma-client-api/src/r0/media/get_media_config.rs
diff --git a/ruma-client-api/src/r0/media/get_media_preview.rs b/crates/ruma-client-api/src/r0/media/get_media_preview.rs
similarity index 100%
rename from ruma-client-api/src/r0/media/get_media_preview.rs
rename to crates/ruma-client-api/src/r0/media/get_media_preview.rs
diff --git a/ruma-client-api/src/r0/membership.rs b/crates/ruma-client-api/src/r0/membership.rs
similarity index 100%
rename from ruma-client-api/src/r0/membership.rs
rename to crates/ruma-client-api/src/r0/membership.rs
diff --git a/ruma-client-api/src/r0/membership/ban_user.rs b/crates/ruma-client-api/src/r0/membership/ban_user.rs
similarity index 100%
rename from ruma-client-api/src/r0/membership/ban_user.rs
rename to crates/ruma-client-api/src/r0/membership/ban_user.rs
diff --git a/ruma-client-api/src/r0/membership/forget_room.rs b/crates/ruma-client-api/src/r0/membership/forget_room.rs
similarity index 100%
rename from ruma-client-api/src/r0/membership/forget_room.rs
rename to crates/ruma-client-api/src/r0/membership/forget_room.rs
diff --git a/ruma-client-api/src/r0/membership/get_member_events.rs b/crates/ruma-client-api/src/r0/membership/get_member_events.rs
similarity index 100%
rename from ruma-client-api/src/r0/membership/get_member_events.rs
rename to crates/ruma-client-api/src/r0/membership/get_member_events.rs
diff --git a/ruma-client-api/src/r0/membership/invite_user.rs b/crates/ruma-client-api/src/r0/membership/invite_user.rs
similarity index 100%
rename from ruma-client-api/src/r0/membership/invite_user.rs
rename to crates/ruma-client-api/src/r0/membership/invite_user.rs
diff --git a/ruma-client-api/src/r0/membership/join_room_by_id.rs b/crates/ruma-client-api/src/r0/membership/join_room_by_id.rs
similarity index 100%
rename from ruma-client-api/src/r0/membership/join_room_by_id.rs
rename to crates/ruma-client-api/src/r0/membership/join_room_by_id.rs
diff --git a/ruma-client-api/src/r0/membership/join_room_by_id_or_alias.rs b/crates/ruma-client-api/src/r0/membership/join_room_by_id_or_alias.rs
similarity index 100%
rename from ruma-client-api/src/r0/membership/join_room_by_id_or_alias.rs
rename to crates/ruma-client-api/src/r0/membership/join_room_by_id_or_alias.rs
diff --git a/ruma-client-api/src/r0/membership/joined_members.rs b/crates/ruma-client-api/src/r0/membership/joined_members.rs
similarity index 100%
rename from ruma-client-api/src/r0/membership/joined_members.rs
rename to crates/ruma-client-api/src/r0/membership/joined_members.rs
diff --git a/ruma-client-api/src/r0/membership/joined_rooms.rs b/crates/ruma-client-api/src/r0/membership/joined_rooms.rs
similarity index 100%
rename from ruma-client-api/src/r0/membership/joined_rooms.rs
rename to crates/ruma-client-api/src/r0/membership/joined_rooms.rs
diff --git a/ruma-client-api/src/r0/membership/kick_user.rs b/crates/ruma-client-api/src/r0/membership/kick_user.rs
similarity index 100%
rename from ruma-client-api/src/r0/membership/kick_user.rs
rename to crates/ruma-client-api/src/r0/membership/kick_user.rs
diff --git a/ruma-client-api/src/r0/membership/leave_room.rs b/crates/ruma-client-api/src/r0/membership/leave_room.rs
similarity index 100%
rename from ruma-client-api/src/r0/membership/leave_room.rs
rename to crates/ruma-client-api/src/r0/membership/leave_room.rs
diff --git a/ruma-client-api/src/r0/membership/unban_user.rs b/crates/ruma-client-api/src/r0/membership/unban_user.rs
similarity index 100%
rename from ruma-client-api/src/r0/membership/unban_user.rs
rename to crates/ruma-client-api/src/r0/membership/unban_user.rs
diff --git a/ruma-client-api/src/r0/message.rs b/crates/ruma-client-api/src/r0/message.rs
similarity index 100%
rename from ruma-client-api/src/r0/message.rs
rename to crates/ruma-client-api/src/r0/message.rs
diff --git a/ruma-client-api/src/r0/message/get_message_events.rs b/crates/ruma-client-api/src/r0/message/get_message_events.rs
similarity index 100%
rename from ruma-client-api/src/r0/message/get_message_events.rs
rename to crates/ruma-client-api/src/r0/message/get_message_events.rs
diff --git a/ruma-client-api/src/r0/message/send_message_event.rs b/crates/ruma-client-api/src/r0/message/send_message_event.rs
similarity index 100%
rename from ruma-client-api/src/r0/message/send_message_event.rs
rename to crates/ruma-client-api/src/r0/message/send_message_event.rs
diff --git a/ruma-client-api/src/r0/presence.rs b/crates/ruma-client-api/src/r0/presence.rs
similarity index 100%
rename from ruma-client-api/src/r0/presence.rs
rename to crates/ruma-client-api/src/r0/presence.rs
diff --git a/ruma-client-api/src/r0/presence/get_presence.rs b/crates/ruma-client-api/src/r0/presence/get_presence.rs
similarity index 100%
rename from ruma-client-api/src/r0/presence/get_presence.rs
rename to crates/ruma-client-api/src/r0/presence/get_presence.rs
diff --git a/ruma-client-api/src/r0/presence/set_presence.rs b/crates/ruma-client-api/src/r0/presence/set_presence.rs
similarity index 100%
rename from ruma-client-api/src/r0/presence/set_presence.rs
rename to crates/ruma-client-api/src/r0/presence/set_presence.rs
diff --git a/ruma-client-api/src/r0/profile.rs b/crates/ruma-client-api/src/r0/profile.rs
similarity index 100%
rename from ruma-client-api/src/r0/profile.rs
rename to crates/ruma-client-api/src/r0/profile.rs
diff --git a/ruma-client-api/src/r0/profile/get_avatar_url.rs b/crates/ruma-client-api/src/r0/profile/get_avatar_url.rs
similarity index 100%
rename from ruma-client-api/src/r0/profile/get_avatar_url.rs
rename to crates/ruma-client-api/src/r0/profile/get_avatar_url.rs
diff --git a/ruma-client-api/src/r0/profile/get_display_name.rs b/crates/ruma-client-api/src/r0/profile/get_display_name.rs
similarity index 100%
rename from ruma-client-api/src/r0/profile/get_display_name.rs
rename to crates/ruma-client-api/src/r0/profile/get_display_name.rs
diff --git a/ruma-client-api/src/r0/profile/get_profile.rs b/crates/ruma-client-api/src/r0/profile/get_profile.rs
similarity index 100%
rename from ruma-client-api/src/r0/profile/get_profile.rs
rename to crates/ruma-client-api/src/r0/profile/get_profile.rs
diff --git a/ruma-client-api/src/r0/profile/set_avatar_url.rs b/crates/ruma-client-api/src/r0/profile/set_avatar_url.rs
similarity index 100%
rename from ruma-client-api/src/r0/profile/set_avatar_url.rs
rename to crates/ruma-client-api/src/r0/profile/set_avatar_url.rs
diff --git a/ruma-client-api/src/r0/profile/set_display_name.rs b/crates/ruma-client-api/src/r0/profile/set_display_name.rs
similarity index 100%
rename from ruma-client-api/src/r0/profile/set_display_name.rs
rename to crates/ruma-client-api/src/r0/profile/set_display_name.rs
diff --git a/ruma-client-api/src/r0/push.rs b/crates/ruma-client-api/src/r0/push.rs
similarity index 100%
rename from ruma-client-api/src/r0/push.rs
rename to crates/ruma-client-api/src/r0/push.rs
diff --git a/ruma-client-api/src/r0/push/delete_pushrule.rs b/crates/ruma-client-api/src/r0/push/delete_pushrule.rs
similarity index 100%
rename from ruma-client-api/src/r0/push/delete_pushrule.rs
rename to crates/ruma-client-api/src/r0/push/delete_pushrule.rs
diff --git a/ruma-client-api/src/r0/push/get_notifications.rs b/crates/ruma-client-api/src/r0/push/get_notifications.rs
similarity index 100%
rename from ruma-client-api/src/r0/push/get_notifications.rs
rename to crates/ruma-client-api/src/r0/push/get_notifications.rs
diff --git a/ruma-client-api/src/r0/push/get_pushers.rs b/crates/ruma-client-api/src/r0/push/get_pushers.rs
similarity index 100%
rename from ruma-client-api/src/r0/push/get_pushers.rs
rename to crates/ruma-client-api/src/r0/push/get_pushers.rs
diff --git a/ruma-client-api/src/r0/push/get_pushrule.rs b/crates/ruma-client-api/src/r0/push/get_pushrule.rs
similarity index 100%
rename from ruma-client-api/src/r0/push/get_pushrule.rs
rename to crates/ruma-client-api/src/r0/push/get_pushrule.rs
diff --git a/ruma-client-api/src/r0/push/get_pushrule_actions.rs b/crates/ruma-client-api/src/r0/push/get_pushrule_actions.rs
similarity index 100%
rename from ruma-client-api/src/r0/push/get_pushrule_actions.rs
rename to crates/ruma-client-api/src/r0/push/get_pushrule_actions.rs
diff --git a/ruma-client-api/src/r0/push/get_pushrule_enabled.rs b/crates/ruma-client-api/src/r0/push/get_pushrule_enabled.rs
similarity index 100%
rename from ruma-client-api/src/r0/push/get_pushrule_enabled.rs
rename to crates/ruma-client-api/src/r0/push/get_pushrule_enabled.rs
diff --git a/ruma-client-api/src/r0/push/get_pushrules_all.rs b/crates/ruma-client-api/src/r0/push/get_pushrules_all.rs
similarity index 100%
rename from ruma-client-api/src/r0/push/get_pushrules_all.rs
rename to crates/ruma-client-api/src/r0/push/get_pushrules_all.rs
diff --git a/ruma-client-api/src/r0/push/get_pushrules_global_scope.rs b/crates/ruma-client-api/src/r0/push/get_pushrules_global_scope.rs
similarity index 100%
rename from ruma-client-api/src/r0/push/get_pushrules_global_scope.rs
rename to crates/ruma-client-api/src/r0/push/get_pushrules_global_scope.rs
diff --git a/ruma-client-api/src/r0/push/set_pusher.rs b/crates/ruma-client-api/src/r0/push/set_pusher.rs
similarity index 100%
rename from ruma-client-api/src/r0/push/set_pusher.rs
rename to crates/ruma-client-api/src/r0/push/set_pusher.rs
diff --git a/ruma-client-api/src/r0/push/set_pushrule.rs b/crates/ruma-client-api/src/r0/push/set_pushrule.rs
similarity index 100%
rename from ruma-client-api/src/r0/push/set_pushrule.rs
rename to crates/ruma-client-api/src/r0/push/set_pushrule.rs
diff --git a/ruma-client-api/src/r0/push/set_pushrule_actions.rs b/crates/ruma-client-api/src/r0/push/set_pushrule_actions.rs
similarity index 100%
rename from ruma-client-api/src/r0/push/set_pushrule_actions.rs
rename to crates/ruma-client-api/src/r0/push/set_pushrule_actions.rs
diff --git a/ruma-client-api/src/r0/push/set_pushrule_enabled.rs b/crates/ruma-client-api/src/r0/push/set_pushrule_enabled.rs
similarity index 100%
rename from ruma-client-api/src/r0/push/set_pushrule_enabled.rs
rename to crates/ruma-client-api/src/r0/push/set_pushrule_enabled.rs
diff --git a/ruma-client-api/src/r0/read_marker.rs b/crates/ruma-client-api/src/r0/read_marker.rs
similarity index 100%
rename from ruma-client-api/src/r0/read_marker.rs
rename to crates/ruma-client-api/src/r0/read_marker.rs
diff --git a/ruma-client-api/src/r0/read_marker/set_read_marker.rs b/crates/ruma-client-api/src/r0/read_marker/set_read_marker.rs
similarity index 100%
rename from ruma-client-api/src/r0/read_marker/set_read_marker.rs
rename to crates/ruma-client-api/src/r0/read_marker/set_read_marker.rs
diff --git a/ruma-client-api/src/r0/receipt.rs b/crates/ruma-client-api/src/r0/receipt.rs
similarity index 100%
rename from ruma-client-api/src/r0/receipt.rs
rename to crates/ruma-client-api/src/r0/receipt.rs
diff --git a/ruma-client-api/src/r0/receipt/create_receipt.rs b/crates/ruma-client-api/src/r0/receipt/create_receipt.rs
similarity index 100%
rename from ruma-client-api/src/r0/receipt/create_receipt.rs
rename to crates/ruma-client-api/src/r0/receipt/create_receipt.rs
diff --git a/ruma-client-api/src/r0/redact.rs b/crates/ruma-client-api/src/r0/redact.rs
similarity index 100%
rename from ruma-client-api/src/r0/redact.rs
rename to crates/ruma-client-api/src/r0/redact.rs
diff --git a/ruma-client-api/src/r0/redact/redact_event.rs b/crates/ruma-client-api/src/r0/redact/redact_event.rs
similarity index 100%
rename from ruma-client-api/src/r0/redact/redact_event.rs
rename to crates/ruma-client-api/src/r0/redact/redact_event.rs
diff --git a/ruma-client-api/src/r0/room.rs b/crates/ruma-client-api/src/r0/room.rs
similarity index 100%
rename from ruma-client-api/src/r0/room.rs
rename to crates/ruma-client-api/src/r0/room.rs
diff --git a/ruma-client-api/src/r0/room/aliases.rs b/crates/ruma-client-api/src/r0/room/aliases.rs
similarity index 100%
rename from ruma-client-api/src/r0/room/aliases.rs
rename to crates/ruma-client-api/src/r0/room/aliases.rs
diff --git a/ruma-client-api/src/r0/room/create_room.rs b/crates/ruma-client-api/src/r0/room/create_room.rs
similarity index 100%
rename from ruma-client-api/src/r0/room/create_room.rs
rename to crates/ruma-client-api/src/r0/room/create_room.rs
diff --git a/ruma-client-api/src/r0/room/get_room_event.rs b/crates/ruma-client-api/src/r0/room/get_room_event.rs
similarity index 100%
rename from ruma-client-api/src/r0/room/get_room_event.rs
rename to crates/ruma-client-api/src/r0/room/get_room_event.rs
diff --git a/ruma-client-api/src/r0/room/report_content.rs b/crates/ruma-client-api/src/r0/room/report_content.rs
similarity index 100%
rename from ruma-client-api/src/r0/room/report_content.rs
rename to crates/ruma-client-api/src/r0/room/report_content.rs
diff --git a/ruma-client-api/src/r0/room/upgrade_room.rs b/crates/ruma-client-api/src/r0/room/upgrade_room.rs
similarity index 100%
rename from ruma-client-api/src/r0/room/upgrade_room.rs
rename to crates/ruma-client-api/src/r0/room/upgrade_room.rs
diff --git a/ruma-client-api/src/r0/search.rs b/crates/ruma-client-api/src/r0/search.rs
similarity index 100%
rename from ruma-client-api/src/r0/search.rs
rename to crates/ruma-client-api/src/r0/search.rs
diff --git a/ruma-client-api/src/r0/search/search_events.rs b/crates/ruma-client-api/src/r0/search/search_events.rs
similarity index 100%
rename from ruma-client-api/src/r0/search/search_events.rs
rename to crates/ruma-client-api/src/r0/search/search_events.rs
diff --git a/ruma-client-api/src/r0/server.rs b/crates/ruma-client-api/src/r0/server.rs
similarity index 100%
rename from ruma-client-api/src/r0/server.rs
rename to crates/ruma-client-api/src/r0/server.rs
diff --git a/ruma-client-api/src/r0/server/get_user_info.rs b/crates/ruma-client-api/src/r0/server/get_user_info.rs
similarity index 100%
rename from ruma-client-api/src/r0/server/get_user_info.rs
rename to crates/ruma-client-api/src/r0/server/get_user_info.rs
diff --git a/ruma-client-api/src/r0/session.rs b/crates/ruma-client-api/src/r0/session.rs
similarity index 100%
rename from ruma-client-api/src/r0/session.rs
rename to crates/ruma-client-api/src/r0/session.rs
diff --git a/ruma-client-api/src/r0/session/get_login_types.rs b/crates/ruma-client-api/src/r0/session/get_login_types.rs
similarity index 100%
rename from ruma-client-api/src/r0/session/get_login_types.rs
rename to crates/ruma-client-api/src/r0/session/get_login_types.rs
diff --git a/ruma-client-api/src/r0/session/get_login_types/login_type_serde.rs b/crates/ruma-client-api/src/r0/session/get_login_types/login_type_serde.rs
similarity index 100%
rename from ruma-client-api/src/r0/session/get_login_types/login_type_serde.rs
rename to crates/ruma-client-api/src/r0/session/get_login_types/login_type_serde.rs
diff --git a/ruma-client-api/src/r0/session/login.rs b/crates/ruma-client-api/src/r0/session/login.rs
similarity index 100%
rename from ruma-client-api/src/r0/session/login.rs
rename to crates/ruma-client-api/src/r0/session/login.rs
diff --git a/ruma-client-api/src/r0/session/login/user_serde.rs b/crates/ruma-client-api/src/r0/session/login/user_serde.rs
similarity index 100%
rename from ruma-client-api/src/r0/session/login/user_serde.rs
rename to crates/ruma-client-api/src/r0/session/login/user_serde.rs
diff --git a/ruma-client-api/src/r0/session/logout.rs b/crates/ruma-client-api/src/r0/session/logout.rs
similarity index 100%
rename from ruma-client-api/src/r0/session/logout.rs
rename to crates/ruma-client-api/src/r0/session/logout.rs
diff --git a/ruma-client-api/src/r0/session/logout_all.rs b/crates/ruma-client-api/src/r0/session/logout_all.rs
similarity index 100%
rename from ruma-client-api/src/r0/session/logout_all.rs
rename to crates/ruma-client-api/src/r0/session/logout_all.rs
diff --git a/ruma-client-api/src/r0/session/sso_login.rs b/crates/ruma-client-api/src/r0/session/sso_login.rs
similarity index 100%
rename from ruma-client-api/src/r0/session/sso_login.rs
rename to crates/ruma-client-api/src/r0/session/sso_login.rs
diff --git a/ruma-client-api/src/r0/session/sso_login_with_provider.rs b/crates/ruma-client-api/src/r0/session/sso_login_with_provider.rs
similarity index 100%
rename from ruma-client-api/src/r0/session/sso_login_with_provider.rs
rename to crates/ruma-client-api/src/r0/session/sso_login_with_provider.rs
diff --git a/ruma-client-api/src/r0/state.rs b/crates/ruma-client-api/src/r0/state.rs
similarity index 100%
rename from ruma-client-api/src/r0/state.rs
rename to crates/ruma-client-api/src/r0/state.rs
diff --git a/ruma-client-api/src/r0/state/get_state_events.rs b/crates/ruma-client-api/src/r0/state/get_state_events.rs
similarity index 100%
rename from ruma-client-api/src/r0/state/get_state_events.rs
rename to crates/ruma-client-api/src/r0/state/get_state_events.rs
diff --git a/ruma-client-api/src/r0/state/get_state_events_for_key.rs b/crates/ruma-client-api/src/r0/state/get_state_events_for_key.rs
similarity index 100%
rename from ruma-client-api/src/r0/state/get_state_events_for_key.rs
rename to crates/ruma-client-api/src/r0/state/get_state_events_for_key.rs
diff --git a/ruma-client-api/src/r0/state/send_state_event.rs b/crates/ruma-client-api/src/r0/state/send_state_event.rs
similarity index 100%
rename from ruma-client-api/src/r0/state/send_state_event.rs
rename to crates/ruma-client-api/src/r0/state/send_state_event.rs
diff --git a/ruma-client-api/src/r0/sync.rs b/crates/ruma-client-api/src/r0/sync.rs
similarity index 100%
rename from ruma-client-api/src/r0/sync.rs
rename to crates/ruma-client-api/src/r0/sync.rs
diff --git a/ruma-client-api/src/r0/sync/sync_events.rs b/crates/ruma-client-api/src/r0/sync/sync_events.rs
similarity index 100%
rename from ruma-client-api/src/r0/sync/sync_events.rs
rename to crates/ruma-client-api/src/r0/sync/sync_events.rs
diff --git a/ruma-client-api/src/r0/tag.rs b/crates/ruma-client-api/src/r0/tag.rs
similarity index 100%
rename from ruma-client-api/src/r0/tag.rs
rename to crates/ruma-client-api/src/r0/tag.rs
diff --git a/ruma-client-api/src/r0/tag/create_tag.rs b/crates/ruma-client-api/src/r0/tag/create_tag.rs
similarity index 100%
rename from ruma-client-api/src/r0/tag/create_tag.rs
rename to crates/ruma-client-api/src/r0/tag/create_tag.rs
diff --git a/ruma-client-api/src/r0/tag/delete_tag.rs b/crates/ruma-client-api/src/r0/tag/delete_tag.rs
similarity index 100%
rename from ruma-client-api/src/r0/tag/delete_tag.rs
rename to crates/ruma-client-api/src/r0/tag/delete_tag.rs
diff --git a/ruma-client-api/src/r0/tag/get_tags.rs b/crates/ruma-client-api/src/r0/tag/get_tags.rs
similarity index 100%
rename from ruma-client-api/src/r0/tag/get_tags.rs
rename to crates/ruma-client-api/src/r0/tag/get_tags.rs
diff --git a/ruma-client-api/src/r0/thirdparty.rs b/crates/ruma-client-api/src/r0/thirdparty.rs
similarity index 100%
rename from ruma-client-api/src/r0/thirdparty.rs
rename to crates/ruma-client-api/src/r0/thirdparty.rs
diff --git a/ruma-client-api/src/r0/thirdparty/get_location_for_protocol.rs b/crates/ruma-client-api/src/r0/thirdparty/get_location_for_protocol.rs
similarity index 100%
rename from ruma-client-api/src/r0/thirdparty/get_location_for_protocol.rs
rename to crates/ruma-client-api/src/r0/thirdparty/get_location_for_protocol.rs
diff --git a/ruma-client-api/src/r0/thirdparty/get_location_for_room_alias.rs b/crates/ruma-client-api/src/r0/thirdparty/get_location_for_room_alias.rs
similarity index 100%
rename from ruma-client-api/src/r0/thirdparty/get_location_for_room_alias.rs
rename to crates/ruma-client-api/src/r0/thirdparty/get_location_for_room_alias.rs
diff --git a/ruma-client-api/src/r0/thirdparty/get_protocol.rs b/crates/ruma-client-api/src/r0/thirdparty/get_protocol.rs
similarity index 100%
rename from ruma-client-api/src/r0/thirdparty/get_protocol.rs
rename to crates/ruma-client-api/src/r0/thirdparty/get_protocol.rs
diff --git a/ruma-client-api/src/r0/thirdparty/get_protocols.rs b/crates/ruma-client-api/src/r0/thirdparty/get_protocols.rs
similarity index 100%
rename from ruma-client-api/src/r0/thirdparty/get_protocols.rs
rename to crates/ruma-client-api/src/r0/thirdparty/get_protocols.rs
diff --git a/ruma-client-api/src/r0/thirdparty/get_user_for_protocol.rs b/crates/ruma-client-api/src/r0/thirdparty/get_user_for_protocol.rs
similarity index 100%
rename from ruma-client-api/src/r0/thirdparty/get_user_for_protocol.rs
rename to crates/ruma-client-api/src/r0/thirdparty/get_user_for_protocol.rs
diff --git a/ruma-client-api/src/r0/thirdparty/get_user_for_user_id.rs b/crates/ruma-client-api/src/r0/thirdparty/get_user_for_user_id.rs
similarity index 100%
rename from ruma-client-api/src/r0/thirdparty/get_user_for_user_id.rs
rename to crates/ruma-client-api/src/r0/thirdparty/get_user_for_user_id.rs
diff --git a/ruma-client-api/src/r0/to_device.rs b/crates/ruma-client-api/src/r0/to_device.rs
similarity index 100%
rename from ruma-client-api/src/r0/to_device.rs
rename to crates/ruma-client-api/src/r0/to_device.rs
diff --git a/ruma-client-api/src/r0/to_device/send_event_to_device.rs b/crates/ruma-client-api/src/r0/to_device/send_event_to_device.rs
similarity index 100%
rename from ruma-client-api/src/r0/to_device/send_event_to_device.rs
rename to crates/ruma-client-api/src/r0/to_device/send_event_to_device.rs
diff --git a/ruma-client-api/src/r0/typing.rs b/crates/ruma-client-api/src/r0/typing.rs
similarity index 100%
rename from ruma-client-api/src/r0/typing.rs
rename to crates/ruma-client-api/src/r0/typing.rs
diff --git a/ruma-client-api/src/r0/typing/create_typing_event.rs b/crates/ruma-client-api/src/r0/typing/create_typing_event.rs
similarity index 100%
rename from ruma-client-api/src/r0/typing/create_typing_event.rs
rename to crates/ruma-client-api/src/r0/typing/create_typing_event.rs
diff --git a/ruma-client-api/src/r0/uiaa.rs b/crates/ruma-client-api/src/r0/uiaa.rs
similarity index 100%
rename from ruma-client-api/src/r0/uiaa.rs
rename to crates/ruma-client-api/src/r0/uiaa.rs
diff --git a/ruma-client-api/src/r0/user_directory.rs b/crates/ruma-client-api/src/r0/user_directory.rs
similarity index 100%
rename from ruma-client-api/src/r0/user_directory.rs
rename to crates/ruma-client-api/src/r0/user_directory.rs
diff --git a/ruma-client-api/src/r0/user_directory/search_users.rs b/crates/ruma-client-api/src/r0/user_directory/search_users.rs
similarity index 100%
rename from ruma-client-api/src/r0/user_directory/search_users.rs
rename to crates/ruma-client-api/src/r0/user_directory/search_users.rs
diff --git a/ruma-client-api/src/r0/voip.rs b/crates/ruma-client-api/src/r0/voip.rs
similarity index 100%
rename from ruma-client-api/src/r0/voip.rs
rename to crates/ruma-client-api/src/r0/voip.rs
diff --git a/ruma-client-api/src/r0/voip/get_turn_server_info.rs b/crates/ruma-client-api/src/r0/voip/get_turn_server_info.rs
similarity index 100%
rename from ruma-client-api/src/r0/voip/get_turn_server_info.rs
rename to crates/ruma-client-api/src/r0/voip/get_turn_server_info.rs
diff --git a/ruma-client-api/src/unversioned.rs b/crates/ruma-client-api/src/unversioned.rs
similarity index 100%
rename from ruma-client-api/src/unversioned.rs
rename to crates/ruma-client-api/src/unversioned.rs
diff --git a/ruma-client-api/src/unversioned/discover_homeserver.rs b/crates/ruma-client-api/src/unversioned/discover_homeserver.rs
similarity index 100%
rename from ruma-client-api/src/unversioned/discover_homeserver.rs
rename to crates/ruma-client-api/src/unversioned/discover_homeserver.rs
diff --git a/ruma-client-api/src/unversioned/get_supported_versions.rs b/crates/ruma-client-api/src/unversioned/get_supported_versions.rs
similarity index 100%
rename from ruma-client-api/src/unversioned/get_supported_versions.rs
rename to crates/ruma-client-api/src/unversioned/get_supported_versions.rs
diff --git a/ruma-client/.gitignore b/crates/ruma-client/.gitignore
similarity index 100%
rename from ruma-client/.gitignore
rename to crates/ruma-client/.gitignore
diff --git a/ruma-client/CHANGELOG.md b/crates/ruma-client/CHANGELOG.md
similarity index 100%
rename from ruma-client/CHANGELOG.md
rename to crates/ruma-client/CHANGELOG.md
diff --git a/ruma-client/Cargo.toml b/crates/ruma-client/Cargo.toml
similarity index 100%
rename from ruma-client/Cargo.toml
rename to crates/ruma-client/Cargo.toml
diff --git a/ruma-client/README.md b/crates/ruma-client/README.md
similarity index 100%
rename from ruma-client/README.md
rename to crates/ruma-client/README.md
diff --git a/ruma-client/build.rs b/crates/ruma-client/build.rs
similarity index 100%
rename from ruma-client/build.rs
rename to crates/ruma-client/build.rs
diff --git a/ruma-client/examples/hello_isahc.rs b/crates/ruma-client/examples/hello_isahc.rs
similarity index 100%
rename from ruma-client/examples/hello_isahc.rs
rename to crates/ruma-client/examples/hello_isahc.rs
diff --git a/ruma-client/examples/hello_world.rs b/crates/ruma-client/examples/hello_world.rs
similarity index 100%
rename from ruma-client/examples/hello_world.rs
rename to crates/ruma-client/examples/hello_world.rs
diff --git a/ruma-client/examples/message_log.rs b/crates/ruma-client/examples/message_log.rs
similarity index 100%
rename from ruma-client/examples/message_log.rs
rename to crates/ruma-client/examples/message_log.rs
diff --git a/ruma-client/src/client_api.rs b/crates/ruma-client/src/client_api.rs
similarity index 100%
rename from ruma-client/src/client_api.rs
rename to crates/ruma-client/src/client_api.rs
diff --git a/ruma-client/src/error.rs b/crates/ruma-client/src/error.rs
similarity index 100%
rename from ruma-client/src/error.rs
rename to crates/ruma-client/src/error.rs
diff --git a/ruma-client/src/http_client.rs b/crates/ruma-client/src/http_client.rs
similarity index 100%
rename from ruma-client/src/http_client.rs
rename to crates/ruma-client/src/http_client.rs
diff --git a/ruma-client/src/http_client/hyper.rs b/crates/ruma-client/src/http_client/hyper.rs
similarity index 100%
rename from ruma-client/src/http_client/hyper.rs
rename to crates/ruma-client/src/http_client/hyper.rs
diff --git a/ruma-client/src/http_client/isahc.rs b/crates/ruma-client/src/http_client/isahc.rs
similarity index 100%
rename from ruma-client/src/http_client/isahc.rs
rename to crates/ruma-client/src/http_client/isahc.rs
diff --git a/ruma-client/src/http_client/reqwest.rs b/crates/ruma-client/src/http_client/reqwest.rs
similarity index 100%
rename from ruma-client/src/http_client/reqwest.rs
rename to crates/ruma-client/src/http_client/reqwest.rs
diff --git a/ruma-client/src/lib.rs b/crates/ruma-client/src/lib.rs
similarity index 100%
rename from ruma-client/src/lib.rs
rename to crates/ruma-client/src/lib.rs
diff --git a/ruma-client/src/session.rs b/crates/ruma-client/src/session.rs
similarity index 100%
rename from ruma-client/src/session.rs
rename to crates/ruma-client/src/session.rs
diff --git a/ruma-common/CHANGELOG.md b/crates/ruma-common/CHANGELOG.md
similarity index 100%
rename from ruma-common/CHANGELOG.md
rename to crates/ruma-common/CHANGELOG.md
diff --git a/ruma-common/Cargo.toml b/crates/ruma-common/Cargo.toml
similarity index 100%
rename from ruma-common/Cargo.toml
rename to crates/ruma-common/Cargo.toml
diff --git a/ruma-common/README.md b/crates/ruma-common/README.md
similarity index 100%
rename from ruma-common/README.md
rename to crates/ruma-common/README.md
diff --git a/ruma-common/src/authentication.rs b/crates/ruma-common/src/authentication.rs
similarity index 100%
rename from ruma-common/src/authentication.rs
rename to crates/ruma-common/src/authentication.rs
diff --git a/ruma-common/src/directory.rs b/crates/ruma-common/src/directory.rs
similarity index 100%
rename from ruma-common/src/directory.rs
rename to crates/ruma-common/src/directory.rs
diff --git a/ruma-common/src/encryption.rs b/crates/ruma-common/src/encryption.rs
similarity index 100%
rename from ruma-common/src/encryption.rs
rename to crates/ruma-common/src/encryption.rs
diff --git a/ruma-common/src/lib.rs b/crates/ruma-common/src/lib.rs
similarity index 100%
rename from ruma-common/src/lib.rs
rename to crates/ruma-common/src/lib.rs
diff --git a/ruma-common/src/power_levels.rs b/crates/ruma-common/src/power_levels.rs
similarity index 100%
rename from ruma-common/src/power_levels.rs
rename to crates/ruma-common/src/power_levels.rs
diff --git a/ruma-common/src/presence.rs b/crates/ruma-common/src/presence.rs
similarity index 100%
rename from ruma-common/src/presence.rs
rename to crates/ruma-common/src/presence.rs
diff --git a/ruma-common/src/push.rs b/crates/ruma-common/src/push.rs
similarity index 100%
rename from ruma-common/src/push.rs
rename to crates/ruma-common/src/push.rs
diff --git a/ruma-common/src/push/action.rs b/crates/ruma-common/src/push/action.rs
similarity index 100%
rename from ruma-common/src/push/action.rs
rename to crates/ruma-common/src/push/action.rs
diff --git a/ruma-common/src/push/condition.rs b/crates/ruma-common/src/push/condition.rs
similarity index 100%
rename from ruma-common/src/push/condition.rs
rename to crates/ruma-common/src/push/condition.rs
diff --git a/ruma-common/src/push/condition/room_member_count_is.rs b/crates/ruma-common/src/push/condition/room_member_count_is.rs
similarity index 100%
rename from ruma-common/src/push/condition/room_member_count_is.rs
rename to crates/ruma-common/src/push/condition/room_member_count_is.rs
diff --git a/ruma-common/src/push/iter.rs b/crates/ruma-common/src/push/iter.rs
similarity index 100%
rename from ruma-common/src/push/iter.rs
rename to crates/ruma-common/src/push/iter.rs
diff --git a/ruma-common/src/push/predefined.rs b/crates/ruma-common/src/push/predefined.rs
similarity index 100%
rename from ruma-common/src/push/predefined.rs
rename to crates/ruma-common/src/push/predefined.rs
diff --git a/ruma-common/src/thirdparty.rs b/crates/ruma-common/src/thirdparty.rs
similarity index 100%
rename from ruma-common/src/thirdparty.rs
rename to crates/ruma-common/src/thirdparty.rs
diff --git a/ruma-events-macros/CHANGELOG.md b/crates/ruma-events-macros/CHANGELOG.md
similarity index 100%
rename from ruma-events-macros/CHANGELOG.md
rename to crates/ruma-events-macros/CHANGELOG.md
diff --git a/ruma-events-macros/Cargo.toml b/crates/ruma-events-macros/Cargo.toml
similarity index 100%
rename from ruma-events-macros/Cargo.toml
rename to crates/ruma-events-macros/Cargo.toml
diff --git a/ruma-events-macros/README.md b/crates/ruma-events-macros/README.md
similarity index 100%
rename from ruma-events-macros/README.md
rename to crates/ruma-events-macros/README.md
diff --git a/ruma-events-macros/src/event.rs b/crates/ruma-events-macros/src/event.rs
similarity index 100%
rename from ruma-events-macros/src/event.rs
rename to crates/ruma-events-macros/src/event.rs
diff --git a/ruma-events-macros/src/event_content.rs b/crates/ruma-events-macros/src/event_content.rs
similarity index 100%
rename from ruma-events-macros/src/event_content.rs
rename to crates/ruma-events-macros/src/event_content.rs
diff --git a/ruma-events-macros/src/event_enum.rs b/crates/ruma-events-macros/src/event_enum.rs
similarity index 100%
rename from ruma-events-macros/src/event_enum.rs
rename to crates/ruma-events-macros/src/event_enum.rs
diff --git a/ruma-events-macros/src/event_parse.rs b/crates/ruma-events-macros/src/event_parse.rs
similarity index 100%
rename from ruma-events-macros/src/event_parse.rs
rename to crates/ruma-events-macros/src/event_parse.rs
diff --git a/ruma-events-macros/src/lib.rs b/crates/ruma-events-macros/src/lib.rs
similarity index 100%
rename from ruma-events-macros/src/lib.rs
rename to crates/ruma-events-macros/src/lib.rs
diff --git a/ruma-events/CHANGELOG.md b/crates/ruma-events/CHANGELOG.md
similarity index 100%
rename from ruma-events/CHANGELOG.md
rename to crates/ruma-events/CHANGELOG.md
diff --git a/ruma-events/Cargo.toml b/crates/ruma-events/Cargo.toml
similarity index 100%
rename from ruma-events/Cargo.toml
rename to crates/ruma-events/Cargo.toml
diff --git a/ruma-events/README.md b/crates/ruma-events/README.md
similarity index 100%
rename from ruma-events/README.md
rename to crates/ruma-events/README.md
diff --git a/ruma-events/benches/event_deserialize.rs b/crates/ruma-events/benches/event_deserialize.rs
similarity index 100%
rename from ruma-events/benches/event_deserialize.rs
rename to crates/ruma-events/benches/event_deserialize.rs
diff --git a/ruma-events/src/call.rs b/crates/ruma-events/src/call.rs
similarity index 100%
rename from ruma-events/src/call.rs
rename to crates/ruma-events/src/call.rs
diff --git a/ruma-events/src/call/answer.rs b/crates/ruma-events/src/call/answer.rs
similarity index 100%
rename from ruma-events/src/call/answer.rs
rename to crates/ruma-events/src/call/answer.rs
diff --git a/ruma-events/src/call/candidates.rs b/crates/ruma-events/src/call/candidates.rs
similarity index 100%
rename from ruma-events/src/call/candidates.rs
rename to crates/ruma-events/src/call/candidates.rs
diff --git a/ruma-events/src/call/hangup.rs b/crates/ruma-events/src/call/hangup.rs
similarity index 100%
rename from ruma-events/src/call/hangup.rs
rename to crates/ruma-events/src/call/hangup.rs
diff --git a/ruma-events/src/call/invite.rs b/crates/ruma-events/src/call/invite.rs
similarity index 100%
rename from ruma-events/src/call/invite.rs
rename to crates/ruma-events/src/call/invite.rs
diff --git a/ruma-events/src/custom.rs b/crates/ruma-events/src/custom.rs
similarity index 100%
rename from ruma-events/src/custom.rs
rename to crates/ruma-events/src/custom.rs
diff --git a/ruma-events/src/direct.rs b/crates/ruma-events/src/direct.rs
similarity index 100%
rename from ruma-events/src/direct.rs
rename to crates/ruma-events/src/direct.rs
diff --git a/ruma-events/src/dummy.rs b/crates/ruma-events/src/dummy.rs
similarity index 100%
rename from ruma-events/src/dummy.rs
rename to crates/ruma-events/src/dummy.rs
diff --git a/ruma-events/src/enums.rs b/crates/ruma-events/src/enums.rs
similarity index 100%
rename from ruma-events/src/enums.rs
rename to crates/ruma-events/src/enums.rs
diff --git a/ruma-events/src/error.rs b/crates/ruma-events/src/error.rs
similarity index 100%
rename from ruma-events/src/error.rs
rename to crates/ruma-events/src/error.rs
diff --git a/ruma-events/src/event_kinds.rs b/crates/ruma-events/src/event_kinds.rs
similarity index 100%
rename from ruma-events/src/event_kinds.rs
rename to crates/ruma-events/src/event_kinds.rs
diff --git a/ruma-events/src/event_type.rs b/crates/ruma-events/src/event_type.rs
similarity index 100%
rename from ruma-events/src/event_type.rs
rename to crates/ruma-events/src/event_type.rs
diff --git a/ruma-events/src/forwarded_room_key.rs b/crates/ruma-events/src/forwarded_room_key.rs
similarity index 100%
rename from ruma-events/src/forwarded_room_key.rs
rename to crates/ruma-events/src/forwarded_room_key.rs
diff --git a/ruma-events/src/fully_read.rs b/crates/ruma-events/src/fully_read.rs
similarity index 100%
rename from ruma-events/src/fully_read.rs
rename to crates/ruma-events/src/fully_read.rs
diff --git a/ruma-events/src/ignored_user_list.rs b/crates/ruma-events/src/ignored_user_list.rs
similarity index 100%
rename from ruma-events/src/ignored_user_list.rs
rename to crates/ruma-events/src/ignored_user_list.rs
diff --git a/ruma-events/src/key.rs b/crates/ruma-events/src/key.rs
similarity index 100%
rename from ruma-events/src/key.rs
rename to crates/ruma-events/src/key.rs
diff --git a/ruma-events/src/key/verification.rs b/crates/ruma-events/src/key/verification.rs
similarity index 100%
rename from ruma-events/src/key/verification.rs
rename to crates/ruma-events/src/key/verification.rs
diff --git a/ruma-events/src/key/verification/accept.rs b/crates/ruma-events/src/key/verification/accept.rs
similarity index 100%
rename from ruma-events/src/key/verification/accept.rs
rename to crates/ruma-events/src/key/verification/accept.rs
diff --git a/ruma-events/src/key/verification/cancel.rs b/crates/ruma-events/src/key/verification/cancel.rs
similarity index 100%
rename from ruma-events/src/key/verification/cancel.rs
rename to crates/ruma-events/src/key/verification/cancel.rs
diff --git a/ruma-events/src/key/verification/done.rs b/crates/ruma-events/src/key/verification/done.rs
similarity index 100%
rename from ruma-events/src/key/verification/done.rs
rename to crates/ruma-events/src/key/verification/done.rs
diff --git a/ruma-events/src/key/verification/key.rs b/crates/ruma-events/src/key/verification/key.rs
similarity index 100%
rename from ruma-events/src/key/verification/key.rs
rename to crates/ruma-events/src/key/verification/key.rs
diff --git a/ruma-events/src/key/verification/mac.rs b/crates/ruma-events/src/key/verification/mac.rs
similarity index 100%
rename from ruma-events/src/key/verification/mac.rs
rename to crates/ruma-events/src/key/verification/mac.rs
diff --git a/ruma-events/src/key/verification/ready.rs b/crates/ruma-events/src/key/verification/ready.rs
similarity index 100%
rename from ruma-events/src/key/verification/ready.rs
rename to crates/ruma-events/src/key/verification/ready.rs
diff --git a/ruma-events/src/key/verification/request.rs b/crates/ruma-events/src/key/verification/request.rs
similarity index 100%
rename from ruma-events/src/key/verification/request.rs
rename to crates/ruma-events/src/key/verification/request.rs
diff --git a/ruma-events/src/key/verification/start.rs b/crates/ruma-events/src/key/verification/start.rs
similarity index 100%
rename from ruma-events/src/key/verification/start.rs
rename to crates/ruma-events/src/key/verification/start.rs
diff --git a/ruma-events/src/lib.rs b/crates/ruma-events/src/lib.rs
similarity index 100%
rename from ruma-events/src/lib.rs
rename to crates/ruma-events/src/lib.rs
diff --git a/ruma-events/src/pdu.rs b/crates/ruma-events/src/pdu.rs
similarity index 100%
rename from ruma-events/src/pdu.rs
rename to crates/ruma-events/src/pdu.rs
diff --git a/ruma-events/src/policy.rs b/crates/ruma-events/src/policy.rs
similarity index 100%
rename from ruma-events/src/policy.rs
rename to crates/ruma-events/src/policy.rs
diff --git a/ruma-events/src/policy/rule.rs b/crates/ruma-events/src/policy/rule.rs
similarity index 100%
rename from ruma-events/src/policy/rule.rs
rename to crates/ruma-events/src/policy/rule.rs
diff --git a/ruma-events/src/policy/rule/room.rs b/crates/ruma-events/src/policy/rule/room.rs
similarity index 100%
rename from ruma-events/src/policy/rule/room.rs
rename to crates/ruma-events/src/policy/rule/room.rs
diff --git a/ruma-events/src/policy/rule/server.rs b/crates/ruma-events/src/policy/rule/server.rs
similarity index 100%
rename from ruma-events/src/policy/rule/server.rs
rename to crates/ruma-events/src/policy/rule/server.rs
diff --git a/ruma-events/src/policy/rule/user.rs b/crates/ruma-events/src/policy/rule/user.rs
similarity index 100%
rename from ruma-events/src/policy/rule/user.rs
rename to crates/ruma-events/src/policy/rule/user.rs
diff --git a/ruma-events/src/presence.rs b/crates/ruma-events/src/presence.rs
similarity index 100%
rename from ruma-events/src/presence.rs
rename to crates/ruma-events/src/presence.rs
diff --git a/ruma-events/src/push_rules.rs b/crates/ruma-events/src/push_rules.rs
similarity index 100%
rename from ruma-events/src/push_rules.rs
rename to crates/ruma-events/src/push_rules.rs
diff --git a/ruma-events/src/reaction.rs b/crates/ruma-events/src/reaction.rs
similarity index 100%
rename from ruma-events/src/reaction.rs
rename to crates/ruma-events/src/reaction.rs
diff --git a/ruma-events/src/receipt.rs b/crates/ruma-events/src/receipt.rs
similarity index 100%
rename from ruma-events/src/receipt.rs
rename to crates/ruma-events/src/receipt.rs
diff --git a/ruma-events/src/relation.rs b/crates/ruma-events/src/relation.rs
similarity index 100%
rename from ruma-events/src/relation.rs
rename to crates/ruma-events/src/relation.rs
diff --git a/ruma-events/src/room.rs b/crates/ruma-events/src/room.rs
similarity index 100%
rename from ruma-events/src/room.rs
rename to crates/ruma-events/src/room.rs
diff --git a/ruma-events/src/room/aliases.rs b/crates/ruma-events/src/room/aliases.rs
similarity index 100%
rename from ruma-events/src/room/aliases.rs
rename to crates/ruma-events/src/room/aliases.rs
diff --git a/ruma-events/src/room/avatar.rs b/crates/ruma-events/src/room/avatar.rs
similarity index 100%
rename from ruma-events/src/room/avatar.rs
rename to crates/ruma-events/src/room/avatar.rs
diff --git a/ruma-events/src/room/canonical_alias.rs b/crates/ruma-events/src/room/canonical_alias.rs
similarity index 100%
rename from ruma-events/src/room/canonical_alias.rs
rename to crates/ruma-events/src/room/canonical_alias.rs
diff --git a/ruma-events/src/room/create.rs b/crates/ruma-events/src/room/create.rs
similarity index 100%
rename from ruma-events/src/room/create.rs
rename to crates/ruma-events/src/room/create.rs
diff --git a/ruma-events/src/room/encrypted.rs b/crates/ruma-events/src/room/encrypted.rs
similarity index 100%
rename from ruma-events/src/room/encrypted.rs
rename to crates/ruma-events/src/room/encrypted.rs
diff --git a/ruma-events/src/room/encryption.rs b/crates/ruma-events/src/room/encryption.rs
similarity index 100%
rename from ruma-events/src/room/encryption.rs
rename to crates/ruma-events/src/room/encryption.rs
diff --git a/ruma-events/src/room/guest_access.rs b/crates/ruma-events/src/room/guest_access.rs
similarity index 100%
rename from ruma-events/src/room/guest_access.rs
rename to crates/ruma-events/src/room/guest_access.rs
diff --git a/ruma-events/src/room/history_visibility.rs b/crates/ruma-events/src/room/history_visibility.rs
similarity index 100%
rename from ruma-events/src/room/history_visibility.rs
rename to crates/ruma-events/src/room/history_visibility.rs
diff --git a/ruma-events/src/room/join_rules.rs b/crates/ruma-events/src/room/join_rules.rs
similarity index 100%
rename from ruma-events/src/room/join_rules.rs
rename to crates/ruma-events/src/room/join_rules.rs
diff --git a/ruma-events/src/room/member.rs b/crates/ruma-events/src/room/member.rs
similarity index 100%
rename from ruma-events/src/room/member.rs
rename to crates/ruma-events/src/room/member.rs
diff --git a/ruma-events/src/room/message.rs b/crates/ruma-events/src/room/message.rs
similarity index 100%
rename from ruma-events/src/room/message.rs
rename to crates/ruma-events/src/room/message.rs
diff --git a/ruma-events/src/room/message/content_serde.rs b/crates/ruma-events/src/room/message/content_serde.rs
similarity index 100%
rename from ruma-events/src/room/message/content_serde.rs
rename to crates/ruma-events/src/room/message/content_serde.rs
diff --git a/ruma-events/src/room/message/feedback.rs b/crates/ruma-events/src/room/message/feedback.rs
similarity index 100%
rename from ruma-events/src/room/message/feedback.rs
rename to crates/ruma-events/src/room/message/feedback.rs
diff --git a/ruma-events/src/room/name.rs b/crates/ruma-events/src/room/name.rs
similarity index 100%
rename from ruma-events/src/room/name.rs
rename to crates/ruma-events/src/room/name.rs
diff --git a/ruma-events/src/room/pinned_events.rs b/crates/ruma-events/src/room/pinned_events.rs
similarity index 100%
rename from ruma-events/src/room/pinned_events.rs
rename to crates/ruma-events/src/room/pinned_events.rs
diff --git a/ruma-events/src/room/power_levels.rs b/crates/ruma-events/src/room/power_levels.rs
similarity index 100%
rename from ruma-events/src/room/power_levels.rs
rename to crates/ruma-events/src/room/power_levels.rs
diff --git a/ruma-events/src/room/redaction.rs b/crates/ruma-events/src/room/redaction.rs
similarity index 100%
rename from ruma-events/src/room/redaction.rs
rename to crates/ruma-events/src/room/redaction.rs
diff --git a/ruma-events/src/room/relationships.rs b/crates/ruma-events/src/room/relationships.rs
similarity index 100%
rename from ruma-events/src/room/relationships.rs
rename to crates/ruma-events/src/room/relationships.rs
diff --git a/ruma-events/src/room/server_acl.rs b/crates/ruma-events/src/room/server_acl.rs
similarity index 100%
rename from ruma-events/src/room/server_acl.rs
rename to crates/ruma-events/src/room/server_acl.rs
diff --git a/ruma-events/src/room/third_party_invite.rs b/crates/ruma-events/src/room/third_party_invite.rs
similarity index 100%
rename from ruma-events/src/room/third_party_invite.rs
rename to crates/ruma-events/src/room/third_party_invite.rs
diff --git a/ruma-events/src/room/tombstone.rs b/crates/ruma-events/src/room/tombstone.rs
similarity index 100%
rename from ruma-events/src/room/tombstone.rs
rename to crates/ruma-events/src/room/tombstone.rs
diff --git a/ruma-events/src/room/topic.rs b/crates/ruma-events/src/room/topic.rs
similarity index 100%
rename from ruma-events/src/room/topic.rs
rename to crates/ruma-events/src/room/topic.rs
diff --git a/ruma-events/src/room_key.rs b/crates/ruma-events/src/room_key.rs
similarity index 100%
rename from ruma-events/src/room_key.rs
rename to crates/ruma-events/src/room_key.rs
diff --git a/ruma-events/src/room_key_request.rs b/crates/ruma-events/src/room_key_request.rs
similarity index 100%
rename from ruma-events/src/room_key_request.rs
rename to crates/ruma-events/src/room_key_request.rs
diff --git a/ruma-events/src/sticker.rs b/crates/ruma-events/src/sticker.rs
similarity index 100%
rename from ruma-events/src/sticker.rs
rename to crates/ruma-events/src/sticker.rs
diff --git a/ruma-events/src/tag.rs b/crates/ruma-events/src/tag.rs
similarity index 100%
rename from ruma-events/src/tag.rs
rename to crates/ruma-events/src/tag.rs
diff --git a/ruma-events/src/typing.rs b/crates/ruma-events/src/typing.rs
similarity index 100%
rename from ruma-events/src/typing.rs
rename to crates/ruma-events/src/typing.rs
diff --git a/ruma-events/tests/custom.rs b/crates/ruma-events/tests/custom.rs
similarity index 100%
rename from ruma-events/tests/custom.rs
rename to crates/ruma-events/tests/custom.rs
diff --git a/ruma-events/tests/enums.rs b/crates/ruma-events/tests/enums.rs
similarity index 100%
rename from ruma-events/tests/enums.rs
rename to crates/ruma-events/tests/enums.rs
diff --git a/ruma-events/tests/ephemeral_event.rs b/crates/ruma-events/tests/ephemeral_event.rs
similarity index 100%
rename from ruma-events/tests/ephemeral_event.rs
rename to crates/ruma-events/tests/ephemeral_event.rs
diff --git a/ruma-events/tests/event.rs b/crates/ruma-events/tests/event.rs
similarity index 100%
rename from ruma-events/tests/event.rs
rename to crates/ruma-events/tests/event.rs
diff --git a/ruma-events/tests/event_content.rs b/crates/ruma-events/tests/event_content.rs
similarity index 100%
rename from ruma-events/tests/event_content.rs
rename to crates/ruma-events/tests/event_content.rs
diff --git a/ruma-events/tests/event_content_enum.rs b/crates/ruma-events/tests/event_content_enum.rs
similarity index 100%
rename from ruma-events/tests/event_content_enum.rs
rename to crates/ruma-events/tests/event_content_enum.rs
diff --git a/ruma-events/tests/event_enums.rs b/crates/ruma-events/tests/event_enums.rs
similarity index 100%
rename from ruma-events/tests/event_enums.rs
rename to crates/ruma-events/tests/event_enums.rs
diff --git a/ruma-events/tests/initial_state.rs b/crates/ruma-events/tests/initial_state.rs
similarity index 100%
rename from ruma-events/tests/initial_state.rs
rename to crates/ruma-events/tests/initial_state.rs
diff --git a/ruma-events/tests/message_event.rs b/crates/ruma-events/tests/message_event.rs
similarity index 100%
rename from ruma-events/tests/message_event.rs
rename to crates/ruma-events/tests/message_event.rs
diff --git a/ruma-events/tests/pdu.rs b/crates/ruma-events/tests/pdu.rs
similarity index 100%
rename from ruma-events/tests/pdu.rs
rename to crates/ruma-events/tests/pdu.rs
diff --git a/ruma-events/tests/redacted.rs b/crates/ruma-events/tests/redacted.rs
similarity index 100%
rename from ruma-events/tests/redacted.rs
rename to crates/ruma-events/tests/redacted.rs
diff --git a/ruma-events/tests/redaction.rs b/crates/ruma-events/tests/redaction.rs
similarity index 100%
rename from ruma-events/tests/redaction.rs
rename to crates/ruma-events/tests/redaction.rs
diff --git a/ruma-events/tests/room_message.rs b/crates/ruma-events/tests/room_message.rs
similarity index 100%
rename from ruma-events/tests/room_message.rs
rename to crates/ruma-events/tests/room_message.rs
diff --git a/ruma-events/tests/state_event.rs b/crates/ruma-events/tests/state_event.rs
similarity index 100%
rename from ruma-events/tests/state_event.rs
rename to crates/ruma-events/tests/state_event.rs
diff --git a/ruma-events/tests/stripped.rs b/crates/ruma-events/tests/stripped.rs
similarity index 100%
rename from ruma-events/tests/stripped.rs
rename to crates/ruma-events/tests/stripped.rs
diff --git a/ruma-events/tests/to_device.rs b/crates/ruma-events/tests/to_device.rs
similarity index 100%
rename from ruma-events/tests/to_device.rs
rename to crates/ruma-events/tests/to_device.rs
diff --git a/ruma-events/tests/ui/01-content-sanity-check.rs b/crates/ruma-events/tests/ui/01-content-sanity-check.rs
similarity index 100%
rename from ruma-events/tests/ui/01-content-sanity-check.rs
rename to crates/ruma-events/tests/ui/01-content-sanity-check.rs
diff --git a/ruma-events/tests/ui/02-no-event-type.rs b/crates/ruma-events/tests/ui/02-no-event-type.rs
similarity index 100%
rename from ruma-events/tests/ui/02-no-event-type.rs
rename to crates/ruma-events/tests/ui/02-no-event-type.rs
diff --git a/ruma-events/tests/ui/02-no-event-type.stderr b/crates/ruma-events/tests/ui/02-no-event-type.stderr
similarity index 100%
rename from ruma-events/tests/ui/02-no-event-type.stderr
rename to crates/ruma-events/tests/ui/02-no-event-type.stderr
diff --git a/ruma-events/tests/ui/03-invalid-event-type.rs b/crates/ruma-events/tests/ui/03-invalid-event-type.rs
similarity index 100%
rename from ruma-events/tests/ui/03-invalid-event-type.rs
rename to crates/ruma-events/tests/ui/03-invalid-event-type.rs
diff --git a/ruma-events/tests/ui/03-invalid-event-type.stderr b/crates/ruma-events/tests/ui/03-invalid-event-type.stderr
similarity index 100%
rename from ruma-events/tests/ui/03-invalid-event-type.stderr
rename to crates/ruma-events/tests/ui/03-invalid-event-type.stderr
diff --git a/ruma-events/tests/ui/04-event-sanity-check.rs b/crates/ruma-events/tests/ui/04-event-sanity-check.rs
similarity index 100%
rename from ruma-events/tests/ui/04-event-sanity-check.rs
rename to crates/ruma-events/tests/ui/04-event-sanity-check.rs
diff --git a/ruma-events/tests/ui/05-named-fields.rs b/crates/ruma-events/tests/ui/05-named-fields.rs
similarity index 100%
rename from ruma-events/tests/ui/05-named-fields.rs
rename to crates/ruma-events/tests/ui/05-named-fields.rs
diff --git a/ruma-events/tests/ui/05-named-fields.stderr b/crates/ruma-events/tests/ui/05-named-fields.stderr
similarity index 100%
rename from ruma-events/tests/ui/05-named-fields.stderr
rename to crates/ruma-events/tests/ui/05-named-fields.stderr
diff --git a/ruma-events/tests/ui/06-no-content-field.rs b/crates/ruma-events/tests/ui/06-no-content-field.rs
similarity index 100%
rename from ruma-events/tests/ui/06-no-content-field.rs
rename to crates/ruma-events/tests/ui/06-no-content-field.rs
diff --git a/ruma-events/tests/ui/06-no-content-field.stderr b/crates/ruma-events/tests/ui/06-no-content-field.stderr
similarity index 100%
rename from ruma-events/tests/ui/06-no-content-field.stderr
rename to crates/ruma-events/tests/ui/06-no-content-field.stderr
diff --git a/ruma-events/tests/ui/07-enum-sanity-check.rs b/crates/ruma-events/tests/ui/07-enum-sanity-check.rs
similarity index 100%
rename from ruma-events/tests/ui/07-enum-sanity-check.rs
rename to crates/ruma-events/tests/ui/07-enum-sanity-check.rs
diff --git a/ruma-events/tests/ui/08-enum-invalid-path.rs b/crates/ruma-events/tests/ui/08-enum-invalid-path.rs
similarity index 100%
rename from ruma-events/tests/ui/08-enum-invalid-path.rs
rename to crates/ruma-events/tests/ui/08-enum-invalid-path.rs
diff --git a/ruma-events/tests/ui/08-enum-invalid-path.stderr b/crates/ruma-events/tests/ui/08-enum-invalid-path.stderr
similarity index 100%
rename from ruma-events/tests/ui/08-enum-invalid-path.stderr
rename to crates/ruma-events/tests/ui/08-enum-invalid-path.stderr
diff --git a/ruma-events/tests/ui/09-enum-invalid-kind.rs b/crates/ruma-events/tests/ui/09-enum-invalid-kind.rs
similarity index 100%
rename from ruma-events/tests/ui/09-enum-invalid-kind.rs
rename to crates/ruma-events/tests/ui/09-enum-invalid-kind.rs
diff --git a/ruma-events/tests/ui/09-enum-invalid-kind.stderr b/crates/ruma-events/tests/ui/09-enum-invalid-kind.stderr
similarity index 100%
rename from ruma-events/tests/ui/09-enum-invalid-kind.stderr
rename to crates/ruma-events/tests/ui/09-enum-invalid-kind.stderr
diff --git a/ruma-federation-api/CHANGELOG.md b/crates/ruma-federation-api/CHANGELOG.md
similarity index 100%
rename from ruma-federation-api/CHANGELOG.md
rename to crates/ruma-federation-api/CHANGELOG.md
diff --git a/ruma-federation-api/Cargo.toml b/crates/ruma-federation-api/Cargo.toml
similarity index 100%
rename from ruma-federation-api/Cargo.toml
rename to crates/ruma-federation-api/Cargo.toml
diff --git a/ruma-federation-api/README.md b/crates/ruma-federation-api/README.md
similarity index 100%
rename from ruma-federation-api/README.md
rename to crates/ruma-federation-api/README.md
diff --git a/ruma-federation-api/src/authorization.rs b/crates/ruma-federation-api/src/authorization.rs
similarity index 100%
rename from ruma-federation-api/src/authorization.rs
rename to crates/ruma-federation-api/src/authorization.rs
diff --git a/ruma-federation-api/src/authorization/get_event_authorization.rs b/crates/ruma-federation-api/src/authorization/get_event_authorization.rs
similarity index 100%
rename from ruma-federation-api/src/authorization/get_event_authorization.rs
rename to crates/ruma-federation-api/src/authorization/get_event_authorization.rs
diff --git a/ruma-federation-api/src/authorization/get_event_authorization/v1.rs b/crates/ruma-federation-api/src/authorization/get_event_authorization/v1.rs
similarity index 100%
rename from ruma-federation-api/src/authorization/get_event_authorization/v1.rs
rename to crates/ruma-federation-api/src/authorization/get_event_authorization/v1.rs
diff --git a/ruma-federation-api/src/backfill.rs b/crates/ruma-federation-api/src/backfill.rs
similarity index 100%
rename from ruma-federation-api/src/backfill.rs
rename to crates/ruma-federation-api/src/backfill.rs
diff --git a/ruma-federation-api/src/backfill/get_backfill.rs b/crates/ruma-federation-api/src/backfill/get_backfill.rs
similarity index 100%
rename from ruma-federation-api/src/backfill/get_backfill.rs
rename to crates/ruma-federation-api/src/backfill/get_backfill.rs
diff --git a/ruma-federation-api/src/backfill/get_backfill/v1.rs b/crates/ruma-federation-api/src/backfill/get_backfill/v1.rs
similarity index 100%
rename from ruma-federation-api/src/backfill/get_backfill/v1.rs
rename to crates/ruma-federation-api/src/backfill/get_backfill/v1.rs
diff --git a/ruma-federation-api/src/device.rs b/crates/ruma-federation-api/src/device.rs
similarity index 100%
rename from ruma-federation-api/src/device.rs
rename to crates/ruma-federation-api/src/device.rs
diff --git a/ruma-federation-api/src/device/get_devices.rs b/crates/ruma-federation-api/src/device/get_devices.rs
similarity index 100%
rename from ruma-federation-api/src/device/get_devices.rs
rename to crates/ruma-federation-api/src/device/get_devices.rs
diff --git a/ruma-federation-api/src/device/get_devices/v1.rs b/crates/ruma-federation-api/src/device/get_devices/v1.rs
similarity index 100%
rename from ruma-federation-api/src/device/get_devices/v1.rs
rename to crates/ruma-federation-api/src/device/get_devices/v1.rs
diff --git a/ruma-federation-api/src/directory.rs b/crates/ruma-federation-api/src/directory.rs
similarity index 100%
rename from ruma-federation-api/src/directory.rs
rename to crates/ruma-federation-api/src/directory.rs
diff --git a/ruma-federation-api/src/directory/get_public_rooms.rs b/crates/ruma-federation-api/src/directory/get_public_rooms.rs
similarity index 100%
rename from ruma-federation-api/src/directory/get_public_rooms.rs
rename to crates/ruma-federation-api/src/directory/get_public_rooms.rs
diff --git a/ruma-federation-api/src/directory/get_public_rooms/v1.rs b/crates/ruma-federation-api/src/directory/get_public_rooms/v1.rs
similarity index 100%
rename from ruma-federation-api/src/directory/get_public_rooms/v1.rs
rename to crates/ruma-federation-api/src/directory/get_public_rooms/v1.rs
diff --git a/ruma-federation-api/src/directory/get_public_rooms_filtered.rs b/crates/ruma-federation-api/src/directory/get_public_rooms_filtered.rs
similarity index 100%
rename from ruma-federation-api/src/directory/get_public_rooms_filtered.rs
rename to crates/ruma-federation-api/src/directory/get_public_rooms_filtered.rs
diff --git a/ruma-federation-api/src/directory/get_public_rooms_filtered/v1.rs b/crates/ruma-federation-api/src/directory/get_public_rooms_filtered/v1.rs
similarity index 100%
rename from ruma-federation-api/src/directory/get_public_rooms_filtered/v1.rs
rename to crates/ruma-federation-api/src/directory/get_public_rooms_filtered/v1.rs
diff --git a/ruma-federation-api/src/discovery.rs b/crates/ruma-federation-api/src/discovery.rs
similarity index 100%
rename from ruma-federation-api/src/discovery.rs
rename to crates/ruma-federation-api/src/discovery.rs
diff --git a/ruma-federation-api/src/discovery/discover_homeserver.rs b/crates/ruma-federation-api/src/discovery/discover_homeserver.rs
similarity index 100%
rename from ruma-federation-api/src/discovery/discover_homeserver.rs
rename to crates/ruma-federation-api/src/discovery/discover_homeserver.rs
diff --git a/ruma-federation-api/src/discovery/get_remote_server_keys.rs b/crates/ruma-federation-api/src/discovery/get_remote_server_keys.rs
similarity index 100%
rename from ruma-federation-api/src/discovery/get_remote_server_keys.rs
rename to crates/ruma-federation-api/src/discovery/get_remote_server_keys.rs
diff --git a/ruma-federation-api/src/discovery/get_remote_server_keys/v2.rs b/crates/ruma-federation-api/src/discovery/get_remote_server_keys/v2.rs
similarity index 100%
rename from ruma-federation-api/src/discovery/get_remote_server_keys/v2.rs
rename to crates/ruma-federation-api/src/discovery/get_remote_server_keys/v2.rs
diff --git a/ruma-federation-api/src/discovery/get_remote_server_keys_batch.rs b/crates/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.rs
rename to crates/ruma-federation-api/src/discovery/get_remote_server_keys_batch.rs
diff --git a/ruma-federation-api/src/discovery/get_remote_server_keys_batch/v2.rs b/crates/ruma-federation-api/src/discovery/get_remote_server_keys_batch/v2.rs
similarity index 100%
rename from ruma-federation-api/src/discovery/get_remote_server_keys_batch/v2.rs
rename to crates/ruma-federation-api/src/discovery/get_remote_server_keys_batch/v2.rs
diff --git a/ruma-federation-api/src/discovery/get_server_keys.rs b/crates/ruma-federation-api/src/discovery/get_server_keys.rs
similarity index 100%
rename from ruma-federation-api/src/discovery/get_server_keys.rs
rename to crates/ruma-federation-api/src/discovery/get_server_keys.rs
diff --git a/ruma-federation-api/src/discovery/get_server_keys/v2.rs b/crates/ruma-federation-api/src/discovery/get_server_keys/v2.rs
similarity index 100%
rename from ruma-federation-api/src/discovery/get_server_keys/v2.rs
rename to crates/ruma-federation-api/src/discovery/get_server_keys/v2.rs
diff --git a/ruma-federation-api/src/discovery/get_server_version.rs b/crates/ruma-federation-api/src/discovery/get_server_version.rs
similarity index 100%
rename from ruma-federation-api/src/discovery/get_server_version.rs
rename to crates/ruma-federation-api/src/discovery/get_server_version.rs
diff --git a/ruma-federation-api/src/discovery/get_server_version/v1.rs b/crates/ruma-federation-api/src/discovery/get_server_version/v1.rs
similarity index 100%
rename from ruma-federation-api/src/discovery/get_server_version/v1.rs
rename to crates/ruma-federation-api/src/discovery/get_server_version/v1.rs
diff --git a/ruma-federation-api/src/event.rs b/crates/ruma-federation-api/src/event.rs
similarity index 100%
rename from ruma-federation-api/src/event.rs
rename to crates/ruma-federation-api/src/event.rs
diff --git a/ruma-federation-api/src/event/get_event.rs b/crates/ruma-federation-api/src/event/get_event.rs
similarity index 100%
rename from ruma-federation-api/src/event/get_event.rs
rename to crates/ruma-federation-api/src/event/get_event.rs
diff --git a/ruma-federation-api/src/event/get_event/v1.rs b/crates/ruma-federation-api/src/event/get_event/v1.rs
similarity index 100%
rename from ruma-federation-api/src/event/get_event/v1.rs
rename to crates/ruma-federation-api/src/event/get_event/v1.rs
diff --git a/ruma-federation-api/src/event/get_missing_events.rs b/crates/ruma-federation-api/src/event/get_missing_events.rs
similarity index 100%
rename from ruma-federation-api/src/event/get_missing_events.rs
rename to crates/ruma-federation-api/src/event/get_missing_events.rs
diff --git a/ruma-federation-api/src/event/get_missing_events/v1.rs b/crates/ruma-federation-api/src/event/get_missing_events/v1.rs
similarity index 100%
rename from ruma-federation-api/src/event/get_missing_events/v1.rs
rename to crates/ruma-federation-api/src/event/get_missing_events/v1.rs
diff --git a/ruma-federation-api/src/event/get_room_state.rs b/crates/ruma-federation-api/src/event/get_room_state.rs
similarity index 100%
rename from ruma-federation-api/src/event/get_room_state.rs
rename to crates/ruma-federation-api/src/event/get_room_state.rs
diff --git a/ruma-federation-api/src/event/get_room_state/v1.rs b/crates/ruma-federation-api/src/event/get_room_state/v1.rs
similarity index 100%
rename from ruma-federation-api/src/event/get_room_state/v1.rs
rename to crates/ruma-federation-api/src/event/get_room_state/v1.rs
diff --git a/ruma-federation-api/src/event/get_room_state_ids.rs b/crates/ruma-federation-api/src/event/get_room_state_ids.rs
similarity index 100%
rename from ruma-federation-api/src/event/get_room_state_ids.rs
rename to crates/ruma-federation-api/src/event/get_room_state_ids.rs
diff --git a/ruma-federation-api/src/event/get_room_state_ids/v1.rs b/crates/ruma-federation-api/src/event/get_room_state_ids/v1.rs
similarity index 100%
rename from ruma-federation-api/src/event/get_room_state_ids/v1.rs
rename to crates/ruma-federation-api/src/event/get_room_state_ids/v1.rs
diff --git a/ruma-federation-api/src/keys.rs b/crates/ruma-federation-api/src/keys.rs
similarity index 100%
rename from ruma-federation-api/src/keys.rs
rename to crates/ruma-federation-api/src/keys.rs
diff --git a/ruma-federation-api/src/keys/claim_keys.rs b/crates/ruma-federation-api/src/keys/claim_keys.rs
similarity index 100%
rename from ruma-federation-api/src/keys/claim_keys.rs
rename to crates/ruma-federation-api/src/keys/claim_keys.rs
diff --git a/ruma-federation-api/src/keys/claim_keys/v1.rs b/crates/ruma-federation-api/src/keys/claim_keys/v1.rs
similarity index 100%
rename from ruma-federation-api/src/keys/claim_keys/v1.rs
rename to crates/ruma-federation-api/src/keys/claim_keys/v1.rs
diff --git a/ruma-federation-api/src/keys/get_keys.rs b/crates/ruma-federation-api/src/keys/get_keys.rs
similarity index 100%
rename from ruma-federation-api/src/keys/get_keys.rs
rename to crates/ruma-federation-api/src/keys/get_keys.rs
diff --git a/ruma-federation-api/src/keys/get_keys/v1.rs b/crates/ruma-federation-api/src/keys/get_keys/v1.rs
similarity index 100%
rename from ruma-federation-api/src/keys/get_keys/v1.rs
rename to crates/ruma-federation-api/src/keys/get_keys/v1.rs
diff --git a/ruma-federation-api/src/lib.rs b/crates/ruma-federation-api/src/lib.rs
similarity index 100%
rename from ruma-federation-api/src/lib.rs
rename to crates/ruma-federation-api/src/lib.rs
diff --git a/ruma-federation-api/src/membership.rs b/crates/ruma-federation-api/src/membership.rs
similarity index 100%
rename from ruma-federation-api/src/membership.rs
rename to crates/ruma-federation-api/src/membership.rs
diff --git a/ruma-federation-api/src/membership/create_invite.rs b/crates/ruma-federation-api/src/membership/create_invite.rs
similarity index 100%
rename from ruma-federation-api/src/membership/create_invite.rs
rename to crates/ruma-federation-api/src/membership/create_invite.rs
diff --git a/ruma-federation-api/src/membership/create_invite/v1.rs b/crates/ruma-federation-api/src/membership/create_invite/v1.rs
similarity index 100%
rename from ruma-federation-api/src/membership/create_invite/v1.rs
rename to crates/ruma-federation-api/src/membership/create_invite/v1.rs
diff --git a/ruma-federation-api/src/membership/create_invite/v2.rs b/crates/ruma-federation-api/src/membership/create_invite/v2.rs
similarity index 100%
rename from ruma-federation-api/src/membership/create_invite/v2.rs
rename to crates/ruma-federation-api/src/membership/create_invite/v2.rs
diff --git a/ruma-federation-api/src/membership/create_join_event.rs b/crates/ruma-federation-api/src/membership/create_join_event.rs
similarity index 100%
rename from ruma-federation-api/src/membership/create_join_event.rs
rename to crates/ruma-federation-api/src/membership/create_join_event.rs
diff --git a/ruma-federation-api/src/membership/create_join_event/v1.rs b/crates/ruma-federation-api/src/membership/create_join_event/v1.rs
similarity index 100%
rename from ruma-federation-api/src/membership/create_join_event/v1.rs
rename to crates/ruma-federation-api/src/membership/create_join_event/v1.rs
diff --git a/ruma-federation-api/src/membership/create_join_event/v2.rs b/crates/ruma-federation-api/src/membership/create_join_event/v2.rs
similarity index 100%
rename from ruma-federation-api/src/membership/create_join_event/v2.rs
rename to crates/ruma-federation-api/src/membership/create_join_event/v2.rs
diff --git a/ruma-federation-api/src/membership/create_join_event_template.rs b/crates/ruma-federation-api/src/membership/create_join_event_template.rs
similarity index 100%
rename from ruma-federation-api/src/membership/create_join_event_template.rs
rename to crates/ruma-federation-api/src/membership/create_join_event_template.rs
diff --git a/ruma-federation-api/src/membership/create_join_event_template/v1.rs b/crates/ruma-federation-api/src/membership/create_join_event_template/v1.rs
similarity index 100%
rename from ruma-federation-api/src/membership/create_join_event_template/v1.rs
rename to crates/ruma-federation-api/src/membership/create_join_event_template/v1.rs
diff --git a/ruma-federation-api/src/membership/create_leave_event.rs b/crates/ruma-federation-api/src/membership/create_leave_event.rs
similarity index 100%
rename from ruma-federation-api/src/membership/create_leave_event.rs
rename to crates/ruma-federation-api/src/membership/create_leave_event.rs
diff --git a/ruma-federation-api/src/membership/create_leave_event/v1.rs b/crates/ruma-federation-api/src/membership/create_leave_event/v1.rs
similarity index 100%
rename from ruma-federation-api/src/membership/create_leave_event/v1.rs
rename to crates/ruma-federation-api/src/membership/create_leave_event/v1.rs
diff --git a/ruma-federation-api/src/membership/create_leave_event/v2.rs b/crates/ruma-federation-api/src/membership/create_leave_event/v2.rs
similarity index 100%
rename from ruma-federation-api/src/membership/create_leave_event/v2.rs
rename to crates/ruma-federation-api/src/membership/create_leave_event/v2.rs
diff --git a/ruma-federation-api/src/membership/get_leave_event.rs b/crates/ruma-federation-api/src/membership/get_leave_event.rs
similarity index 100%
rename from ruma-federation-api/src/membership/get_leave_event.rs
rename to crates/ruma-federation-api/src/membership/get_leave_event.rs
diff --git a/ruma-federation-api/src/membership/get_leave_event/v1.rs b/crates/ruma-federation-api/src/membership/get_leave_event/v1.rs
similarity index 100%
rename from ruma-federation-api/src/membership/get_leave_event/v1.rs
rename to crates/ruma-federation-api/src/membership/get_leave_event/v1.rs
diff --git a/ruma-federation-api/src/openid.rs b/crates/ruma-federation-api/src/openid.rs
similarity index 100%
rename from ruma-federation-api/src/openid.rs
rename to crates/ruma-federation-api/src/openid.rs
diff --git a/ruma-federation-api/src/openid/get_openid_userinfo.rs b/crates/ruma-federation-api/src/openid/get_openid_userinfo.rs
similarity index 100%
rename from ruma-federation-api/src/openid/get_openid_userinfo.rs
rename to crates/ruma-federation-api/src/openid/get_openid_userinfo.rs
diff --git a/ruma-federation-api/src/openid/get_openid_userinfo/v1.rs b/crates/ruma-federation-api/src/openid/get_openid_userinfo/v1.rs
similarity index 100%
rename from ruma-federation-api/src/openid/get_openid_userinfo/v1.rs
rename to crates/ruma-federation-api/src/openid/get_openid_userinfo/v1.rs
diff --git a/ruma-federation-api/src/query.rs b/crates/ruma-federation-api/src/query.rs
similarity index 100%
rename from ruma-federation-api/src/query.rs
rename to crates/ruma-federation-api/src/query.rs
diff --git a/ruma-federation-api/src/query/get_custom_information.rs b/crates/ruma-federation-api/src/query/get_custom_information.rs
similarity index 100%
rename from ruma-federation-api/src/query/get_custom_information.rs
rename to crates/ruma-federation-api/src/query/get_custom_information.rs
diff --git a/ruma-federation-api/src/query/get_custom_information/v1.rs b/crates/ruma-federation-api/src/query/get_custom_information/v1.rs
similarity index 100%
rename from ruma-federation-api/src/query/get_custom_information/v1.rs
rename to crates/ruma-federation-api/src/query/get_custom_information/v1.rs
diff --git a/ruma-federation-api/src/query/get_profile_information.rs b/crates/ruma-federation-api/src/query/get_profile_information.rs
similarity index 100%
rename from ruma-federation-api/src/query/get_profile_information.rs
rename to crates/ruma-federation-api/src/query/get_profile_information.rs
diff --git a/ruma-federation-api/src/query/get_profile_information/v1.rs b/crates/ruma-federation-api/src/query/get_profile_information/v1.rs
similarity index 100%
rename from ruma-federation-api/src/query/get_profile_information/v1.rs
rename to crates/ruma-federation-api/src/query/get_profile_information/v1.rs
diff --git a/ruma-federation-api/src/query/get_room_information.rs b/crates/ruma-federation-api/src/query/get_room_information.rs
similarity index 100%
rename from ruma-federation-api/src/query/get_room_information.rs
rename to crates/ruma-federation-api/src/query/get_room_information.rs
diff --git a/ruma-federation-api/src/query/get_room_information/v1.rs b/crates/ruma-federation-api/src/query/get_room_information/v1.rs
similarity index 100%
rename from ruma-federation-api/src/query/get_room_information/v1.rs
rename to crates/ruma-federation-api/src/query/get_room_information/v1.rs
diff --git a/ruma-federation-api/src/serde.rs b/crates/ruma-federation-api/src/serde.rs
similarity index 100%
rename from ruma-federation-api/src/serde.rs
rename to crates/ruma-federation-api/src/serde.rs
diff --git a/ruma-federation-api/src/serde/pdu_process_response.rs b/crates/ruma-federation-api/src/serde/pdu_process_response.rs
similarity index 100%
rename from ruma-federation-api/src/serde/pdu_process_response.rs
rename to crates/ruma-federation-api/src/serde/pdu_process_response.rs
diff --git a/ruma-federation-api/src/serde/v1_pdu.rs b/crates/ruma-federation-api/src/serde/v1_pdu.rs
similarity index 100%
rename from ruma-federation-api/src/serde/v1_pdu.rs
rename to crates/ruma-federation-api/src/serde/v1_pdu.rs
diff --git a/ruma-federation-api/src/thirdparty.rs b/crates/ruma-federation-api/src/thirdparty.rs
similarity index 100%
rename from ruma-federation-api/src/thirdparty.rs
rename to crates/ruma-federation-api/src/thirdparty.rs
diff --git a/ruma-federation-api/src/thirdparty/bind_callback.rs b/crates/ruma-federation-api/src/thirdparty/bind_callback.rs
similarity index 100%
rename from ruma-federation-api/src/thirdparty/bind_callback.rs
rename to crates/ruma-federation-api/src/thirdparty/bind_callback.rs
diff --git a/ruma-federation-api/src/thirdparty/bind_callback/v1.rs b/crates/ruma-federation-api/src/thirdparty/bind_callback/v1.rs
similarity index 100%
rename from ruma-federation-api/src/thirdparty/bind_callback/v1.rs
rename to crates/ruma-federation-api/src/thirdparty/bind_callback/v1.rs
diff --git a/ruma-federation-api/src/thirdparty/exchange_invite.rs b/crates/ruma-federation-api/src/thirdparty/exchange_invite.rs
similarity index 100%
rename from ruma-federation-api/src/thirdparty/exchange_invite.rs
rename to crates/ruma-federation-api/src/thirdparty/exchange_invite.rs
diff --git a/ruma-federation-api/src/thirdparty/exchange_invite/v1.rs b/crates/ruma-federation-api/src/thirdparty/exchange_invite/v1.rs
similarity index 100%
rename from ruma-federation-api/src/thirdparty/exchange_invite/v1.rs
rename to crates/ruma-federation-api/src/thirdparty/exchange_invite/v1.rs
diff --git a/ruma-federation-api/src/transactions.rs b/crates/ruma-federation-api/src/transactions.rs
similarity index 100%
rename from ruma-federation-api/src/transactions.rs
rename to crates/ruma-federation-api/src/transactions.rs
diff --git a/ruma-federation-api/src/transactions/edu.rs b/crates/ruma-federation-api/src/transactions/edu.rs
similarity index 100%
rename from ruma-federation-api/src/transactions/edu.rs
rename to crates/ruma-federation-api/src/transactions/edu.rs
diff --git a/ruma-federation-api/src/transactions/send_transaction_message.rs b/crates/ruma-federation-api/src/transactions/send_transaction_message.rs
similarity index 100%
rename from ruma-federation-api/src/transactions/send_transaction_message.rs
rename to crates/ruma-federation-api/src/transactions/send_transaction_message.rs
diff --git a/ruma-federation-api/src/transactions/send_transaction_message/v1.rs b/crates/ruma-federation-api/src/transactions/send_transaction_message/v1.rs
similarity index 100%
rename from ruma-federation-api/src/transactions/send_transaction_message/v1.rs
rename to crates/ruma-federation-api/src/transactions/send_transaction_message/v1.rs
diff --git a/ruma-identifiers-macros/Cargo.toml b/crates/ruma-identifiers-macros/Cargo.toml
similarity index 100%
rename from ruma-identifiers-macros/Cargo.toml
rename to crates/ruma-identifiers-macros/Cargo.toml
diff --git a/ruma-identifiers-macros/src/lib.rs b/crates/ruma-identifiers-macros/src/lib.rs
similarity index 100%
rename from ruma-identifiers-macros/src/lib.rs
rename to crates/ruma-identifiers-macros/src/lib.rs
diff --git a/ruma-identifiers-validation/CHANGELOG.md b/crates/ruma-identifiers-validation/CHANGELOG.md
similarity index 100%
rename from ruma-identifiers-validation/CHANGELOG.md
rename to crates/ruma-identifiers-validation/CHANGELOG.md
diff --git a/ruma-identifiers-validation/Cargo.toml b/crates/ruma-identifiers-validation/Cargo.toml
similarity index 100%
rename from ruma-identifiers-validation/Cargo.toml
rename to crates/ruma-identifiers-validation/Cargo.toml
diff --git a/ruma-identifiers-validation/src/device_key_id.rs b/crates/ruma-identifiers-validation/src/device_key_id.rs
similarity index 100%
rename from ruma-identifiers-validation/src/device_key_id.rs
rename to crates/ruma-identifiers-validation/src/device_key_id.rs
diff --git a/ruma-identifiers-validation/src/error.rs b/crates/ruma-identifiers-validation/src/error.rs
similarity index 100%
rename from ruma-identifiers-validation/src/error.rs
rename to crates/ruma-identifiers-validation/src/error.rs
diff --git a/ruma-identifiers-validation/src/event_id.rs b/crates/ruma-identifiers-validation/src/event_id.rs
similarity index 100%
rename from ruma-identifiers-validation/src/event_id.rs
rename to crates/ruma-identifiers-validation/src/event_id.rs
diff --git a/ruma-identifiers-validation/src/key_id.rs b/crates/ruma-identifiers-validation/src/key_id.rs
similarity index 100%
rename from ruma-identifiers-validation/src/key_id.rs
rename to crates/ruma-identifiers-validation/src/key_id.rs
diff --git a/ruma-identifiers-validation/src/lib.rs b/crates/ruma-identifiers-validation/src/lib.rs
similarity index 100%
rename from ruma-identifiers-validation/src/lib.rs
rename to crates/ruma-identifiers-validation/src/lib.rs
diff --git a/ruma-identifiers-validation/src/mxc_uri.rs b/crates/ruma-identifiers-validation/src/mxc_uri.rs
similarity index 100%
rename from ruma-identifiers-validation/src/mxc_uri.rs
rename to crates/ruma-identifiers-validation/src/mxc_uri.rs
diff --git a/ruma-identifiers-validation/src/room_alias_id.rs b/crates/ruma-identifiers-validation/src/room_alias_id.rs
similarity index 100%
rename from ruma-identifiers-validation/src/room_alias_id.rs
rename to crates/ruma-identifiers-validation/src/room_alias_id.rs
diff --git a/ruma-identifiers-validation/src/room_id.rs b/crates/ruma-identifiers-validation/src/room_id.rs
similarity index 100%
rename from ruma-identifiers-validation/src/room_id.rs
rename to crates/ruma-identifiers-validation/src/room_id.rs
diff --git a/ruma-identifiers-validation/src/room_id_or_alias_id.rs b/crates/ruma-identifiers-validation/src/room_id_or_alias_id.rs
similarity index 100%
rename from ruma-identifiers-validation/src/room_id_or_alias_id.rs
rename to crates/ruma-identifiers-validation/src/room_id_or_alias_id.rs
diff --git a/ruma-identifiers-validation/src/room_version_id.rs b/crates/ruma-identifiers-validation/src/room_version_id.rs
similarity index 100%
rename from ruma-identifiers-validation/src/room_version_id.rs
rename to crates/ruma-identifiers-validation/src/room_version_id.rs
diff --git a/ruma-identifiers-validation/src/server_name.rs b/crates/ruma-identifiers-validation/src/server_name.rs
similarity index 100%
rename from ruma-identifiers-validation/src/server_name.rs
rename to crates/ruma-identifiers-validation/src/server_name.rs
diff --git a/ruma-identifiers-validation/src/user_id.rs b/crates/ruma-identifiers-validation/src/user_id.rs
similarity index 100%
rename from ruma-identifiers-validation/src/user_id.rs
rename to crates/ruma-identifiers-validation/src/user_id.rs
diff --git a/ruma-identifiers/CHANGELOG.md b/crates/ruma-identifiers/CHANGELOG.md
similarity index 100%
rename from ruma-identifiers/CHANGELOG.md
rename to crates/ruma-identifiers/CHANGELOG.md
diff --git a/ruma-identifiers/Cargo.toml b/crates/ruma-identifiers/Cargo.toml
similarity index 100%
rename from ruma-identifiers/Cargo.toml
rename to crates/ruma-identifiers/Cargo.toml
diff --git a/ruma-identifiers/README.md b/crates/ruma-identifiers/README.md
similarity index 100%
rename from ruma-identifiers/README.md
rename to crates/ruma-identifiers/README.md
diff --git a/ruma-identifiers/src/crypto_algorithms.rs b/crates/ruma-identifiers/src/crypto_algorithms.rs
similarity index 100%
rename from ruma-identifiers/src/crypto_algorithms.rs
rename to crates/ruma-identifiers/src/crypto_algorithms.rs
diff --git a/ruma-identifiers/src/device_key_id.rs b/crates/ruma-identifiers/src/device_key_id.rs
similarity index 100%
rename from ruma-identifiers/src/device_key_id.rs
rename to crates/ruma-identifiers/src/device_key_id.rs
diff --git a/ruma-identifiers/src/event_id.rs b/crates/ruma-identifiers/src/event_id.rs
similarity index 100%
rename from ruma-identifiers/src/event_id.rs
rename to crates/ruma-identifiers/src/event_id.rs
diff --git a/ruma-identifiers/src/key_id.rs b/crates/ruma-identifiers/src/key_id.rs
similarity index 100%
rename from ruma-identifiers/src/key_id.rs
rename to crates/ruma-identifiers/src/key_id.rs
diff --git a/ruma-identifiers/src/lib.rs b/crates/ruma-identifiers/src/lib.rs
similarity index 100%
rename from ruma-identifiers/src/lib.rs
rename to crates/ruma-identifiers/src/lib.rs
diff --git a/ruma-identifiers/src/macros.rs b/crates/ruma-identifiers/src/macros.rs
similarity index 100%
rename from ruma-identifiers/src/macros.rs
rename to crates/ruma-identifiers/src/macros.rs
diff --git a/ruma-identifiers/src/mxc_uri.rs b/crates/ruma-identifiers/src/mxc_uri.rs
similarity index 100%
rename from ruma-identifiers/src/mxc_uri.rs
rename to crates/ruma-identifiers/src/mxc_uri.rs
diff --git a/ruma-identifiers/src/opaque_ids.rs b/crates/ruma-identifiers/src/opaque_ids.rs
similarity index 100%
rename from ruma-identifiers/src/opaque_ids.rs
rename to crates/ruma-identifiers/src/opaque_ids.rs
diff --git a/ruma-identifiers/src/room_alias_id.rs b/crates/ruma-identifiers/src/room_alias_id.rs
similarity index 100%
rename from ruma-identifiers/src/room_alias_id.rs
rename to crates/ruma-identifiers/src/room_alias_id.rs
diff --git a/ruma-identifiers/src/room_id.rs b/crates/ruma-identifiers/src/room_id.rs
similarity index 100%
rename from ruma-identifiers/src/room_id.rs
rename to crates/ruma-identifiers/src/room_id.rs
diff --git a/ruma-identifiers/src/room_id_or_room_alias_id.rs b/crates/ruma-identifiers/src/room_id_or_room_alias_id.rs
similarity index 100%
rename from ruma-identifiers/src/room_id_or_room_alias_id.rs
rename to crates/ruma-identifiers/src/room_id_or_room_alias_id.rs
diff --git a/ruma-identifiers/src/room_version_id.rs b/crates/ruma-identifiers/src/room_version_id.rs
similarity index 100%
rename from ruma-identifiers/src/room_version_id.rs
rename to crates/ruma-identifiers/src/room_version_id.rs
diff --git a/ruma-identifiers/src/server_name.rs b/crates/ruma-identifiers/src/server_name.rs
similarity index 100%
rename from ruma-identifiers/src/server_name.rs
rename to crates/ruma-identifiers/src/server_name.rs
diff --git a/ruma-identifiers/src/signatures.rs b/crates/ruma-identifiers/src/signatures.rs
similarity index 100%
rename from ruma-identifiers/src/signatures.rs
rename to crates/ruma-identifiers/src/signatures.rs
diff --git a/ruma-identifiers/src/user_id.rs b/crates/ruma-identifiers/src/user_id.rs
similarity index 100%
rename from ruma-identifiers/src/user_id.rs
rename to crates/ruma-identifiers/src/user_id.rs
diff --git a/ruma-identifiers/tests/id-macros.rs b/crates/ruma-identifiers/tests/id-macros.rs
similarity index 100%
rename from ruma-identifiers/tests/id-macros.rs
rename to crates/ruma-identifiers/tests/id-macros.rs
diff --git a/ruma-identifiers/tests/ui/01-valid-id-macros.rs b/crates/ruma-identifiers/tests/ui/01-valid-id-macros.rs
similarity index 100%
rename from ruma-identifiers/tests/ui/01-valid-id-macros.rs
rename to crates/ruma-identifiers/tests/ui/01-valid-id-macros.rs
diff --git a/ruma-identifiers/tests/ui/02-invalid-id-macros.rs b/crates/ruma-identifiers/tests/ui/02-invalid-id-macros.rs
similarity index 100%
rename from ruma-identifiers/tests/ui/02-invalid-id-macros.rs
rename to crates/ruma-identifiers/tests/ui/02-invalid-id-macros.rs
diff --git a/ruma-identifiers/tests/ui/02-invalid-id-macros.stderr b/crates/ruma-identifiers/tests/ui/02-invalid-id-macros.stderr
similarity index 100%
rename from ruma-identifiers/tests/ui/02-invalid-id-macros.stderr
rename to crates/ruma-identifiers/tests/ui/02-invalid-id-macros.stderr
diff --git a/ruma-identity-service-api/CHANGELOG.md b/crates/ruma-identity-service-api/CHANGELOG.md
similarity index 100%
rename from ruma-identity-service-api/CHANGELOG.md
rename to crates/ruma-identity-service-api/CHANGELOG.md
diff --git a/ruma-identity-service-api/Cargo.toml b/crates/ruma-identity-service-api/Cargo.toml
similarity index 100%
rename from ruma-identity-service-api/Cargo.toml
rename to crates/ruma-identity-service-api/Cargo.toml
diff --git a/ruma-identity-service-api/README.md b/crates/ruma-identity-service-api/README.md
similarity index 100%
rename from ruma-identity-service-api/README.md
rename to crates/ruma-identity-service-api/README.md
diff --git a/ruma-identity-service-api/src/association.rs b/crates/ruma-identity-service-api/src/association.rs
similarity index 100%
rename from ruma-identity-service-api/src/association.rs
rename to crates/ruma-identity-service-api/src/association.rs
diff --git a/ruma-identity-service-api/src/association/email.rs b/crates/ruma-identity-service-api/src/association/email.rs
similarity index 100%
rename from ruma-identity-service-api/src/association/email.rs
rename to crates/ruma-identity-service-api/src/association/email.rs
diff --git a/ruma-identity-service-api/src/association/email/create_email_validation_session.rs b/crates/ruma-identity-service-api/src/association/email/create_email_validation_session.rs
similarity index 100%
rename from ruma-identity-service-api/src/association/email/create_email_validation_session.rs
rename to crates/ruma-identity-service-api/src/association/email/create_email_validation_session.rs
diff --git a/ruma-identity-service-api/src/association/email/create_email_validation_session/v2.rs b/crates/ruma-identity-service-api/src/association/email/create_email_validation_session/v2.rs
similarity index 100%
rename from ruma-identity-service-api/src/association/email/create_email_validation_session/v2.rs
rename to crates/ruma-identity-service-api/src/association/email/create_email_validation_session/v2.rs
diff --git a/ruma-identity-service-api/src/association/email/validate_email.rs b/crates/ruma-identity-service-api/src/association/email/validate_email.rs
similarity index 100%
rename from ruma-identity-service-api/src/association/email/validate_email.rs
rename to crates/ruma-identity-service-api/src/association/email/validate_email.rs
diff --git a/ruma-identity-service-api/src/association/email/validate_email/v2.rs b/crates/ruma-identity-service-api/src/association/email/validate_email/v2.rs
similarity index 100%
rename from ruma-identity-service-api/src/association/email/validate_email/v2.rs
rename to crates/ruma-identity-service-api/src/association/email/validate_email/v2.rs
diff --git a/ruma-identity-service-api/src/association/email/validate_email_by_end_user.rs b/crates/ruma-identity-service-api/src/association/email/validate_email_by_end_user.rs
similarity index 100%
rename from ruma-identity-service-api/src/association/email/validate_email_by_end_user.rs
rename to crates/ruma-identity-service-api/src/association/email/validate_email_by_end_user.rs
diff --git a/ruma-identity-service-api/src/association/email/validate_email_by_end_user/v2.rs b/crates/ruma-identity-service-api/src/association/email/validate_email_by_end_user/v2.rs
similarity index 100%
rename from ruma-identity-service-api/src/association/email/validate_email_by_end_user/v2.rs
rename to crates/ruma-identity-service-api/src/association/email/validate_email_by_end_user/v2.rs
diff --git a/ruma-identity-service-api/src/association/msisdn.rs b/crates/ruma-identity-service-api/src/association/msisdn.rs
similarity index 100%
rename from ruma-identity-service-api/src/association/msisdn.rs
rename to crates/ruma-identity-service-api/src/association/msisdn.rs
diff --git a/ruma-identity-service-api/src/association/msisdn/create_msisdn_validation_session.rs b/crates/ruma-identity-service-api/src/association/msisdn/create_msisdn_validation_session.rs
similarity index 100%
rename from ruma-identity-service-api/src/association/msisdn/create_msisdn_validation_session.rs
rename to crates/ruma-identity-service-api/src/association/msisdn/create_msisdn_validation_session.rs
diff --git a/ruma-identity-service-api/src/association/msisdn/create_msisdn_validation_session/v2.rs b/crates/ruma-identity-service-api/src/association/msisdn/create_msisdn_validation_session/v2.rs
similarity index 100%
rename from ruma-identity-service-api/src/association/msisdn/create_msisdn_validation_session/v2.rs
rename to crates/ruma-identity-service-api/src/association/msisdn/create_msisdn_validation_session/v2.rs
diff --git a/ruma-identity-service-api/src/association/msisdn/validate_msisdn.rs b/crates/ruma-identity-service-api/src/association/msisdn/validate_msisdn.rs
similarity index 100%
rename from ruma-identity-service-api/src/association/msisdn/validate_msisdn.rs
rename to crates/ruma-identity-service-api/src/association/msisdn/validate_msisdn.rs
diff --git a/ruma-identity-service-api/src/association/msisdn/validate_msisdn/v2.rs b/crates/ruma-identity-service-api/src/association/msisdn/validate_msisdn/v2.rs
similarity index 100%
rename from ruma-identity-service-api/src/association/msisdn/validate_msisdn/v2.rs
rename to crates/ruma-identity-service-api/src/association/msisdn/validate_msisdn/v2.rs
diff --git a/ruma-identity-service-api/src/association/msisdn/validate_msisdn_by_phone_number.rs b/crates/ruma-identity-service-api/src/association/msisdn/validate_msisdn_by_phone_number.rs
similarity index 100%
rename from ruma-identity-service-api/src/association/msisdn/validate_msisdn_by_phone_number.rs
rename to crates/ruma-identity-service-api/src/association/msisdn/validate_msisdn_by_phone_number.rs
diff --git a/ruma-identity-service-api/src/association/msisdn/validate_msisdn_by_phone_number/v2.rs b/crates/ruma-identity-service-api/src/association/msisdn/validate_msisdn_by_phone_number/v2.rs
similarity index 100%
rename from ruma-identity-service-api/src/association/msisdn/validate_msisdn_by_phone_number/v2.rs
rename to crates/ruma-identity-service-api/src/association/msisdn/validate_msisdn_by_phone_number/v2.rs
diff --git a/ruma-identity-service-api/src/authentication.rs b/crates/ruma-identity-service-api/src/authentication.rs
similarity index 100%
rename from ruma-identity-service-api/src/authentication.rs
rename to crates/ruma-identity-service-api/src/authentication.rs
diff --git a/ruma-identity-service-api/src/authentication/get_account_information.rs b/crates/ruma-identity-service-api/src/authentication/get_account_information.rs
similarity index 100%
rename from ruma-identity-service-api/src/authentication/get_account_information.rs
rename to crates/ruma-identity-service-api/src/authentication/get_account_information.rs
diff --git a/ruma-identity-service-api/src/authentication/get_account_information/v2.rs b/crates/ruma-identity-service-api/src/authentication/get_account_information/v2.rs
similarity index 100%
rename from ruma-identity-service-api/src/authentication/get_account_information/v2.rs
rename to crates/ruma-identity-service-api/src/authentication/get_account_information/v2.rs
diff --git a/ruma-identity-service-api/src/authentication/logout.rs b/crates/ruma-identity-service-api/src/authentication/logout.rs
similarity index 100%
rename from ruma-identity-service-api/src/authentication/logout.rs
rename to crates/ruma-identity-service-api/src/authentication/logout.rs
diff --git a/ruma-identity-service-api/src/authentication/logout/v2.rs b/crates/ruma-identity-service-api/src/authentication/logout/v2.rs
similarity index 100%
rename from ruma-identity-service-api/src/authentication/logout/v2.rs
rename to crates/ruma-identity-service-api/src/authentication/logout/v2.rs
diff --git a/ruma-identity-service-api/src/authentication/register.rs b/crates/ruma-identity-service-api/src/authentication/register.rs
similarity index 100%
rename from ruma-identity-service-api/src/authentication/register.rs
rename to crates/ruma-identity-service-api/src/authentication/register.rs
diff --git a/ruma-identity-service-api/src/authentication/register/v2.rs b/crates/ruma-identity-service-api/src/authentication/register/v2.rs
similarity index 100%
rename from ruma-identity-service-api/src/authentication/register/v2.rs
rename to crates/ruma-identity-service-api/src/authentication/register/v2.rs
diff --git a/ruma-identity-service-api/src/keys.rs b/crates/ruma-identity-service-api/src/keys.rs
similarity index 100%
rename from ruma-identity-service-api/src/keys.rs
rename to crates/ruma-identity-service-api/src/keys.rs
diff --git a/ruma-identity-service-api/src/keys/check_public_key_validity.rs b/crates/ruma-identity-service-api/src/keys/check_public_key_validity.rs
similarity index 100%
rename from ruma-identity-service-api/src/keys/check_public_key_validity.rs
rename to crates/ruma-identity-service-api/src/keys/check_public_key_validity.rs
diff --git a/ruma-identity-service-api/src/keys/check_public_key_validity/v2.rs b/crates/ruma-identity-service-api/src/keys/check_public_key_validity/v2.rs
similarity index 100%
rename from ruma-identity-service-api/src/keys/check_public_key_validity/v2.rs
rename to crates/ruma-identity-service-api/src/keys/check_public_key_validity/v2.rs
diff --git a/ruma-identity-service-api/src/keys/get_public_key.rs b/crates/ruma-identity-service-api/src/keys/get_public_key.rs
similarity index 100%
rename from ruma-identity-service-api/src/keys/get_public_key.rs
rename to crates/ruma-identity-service-api/src/keys/get_public_key.rs
diff --git a/ruma-identity-service-api/src/keys/get_public_key/v2.rs b/crates/ruma-identity-service-api/src/keys/get_public_key/v2.rs
similarity index 100%
rename from ruma-identity-service-api/src/keys/get_public_key/v2.rs
rename to crates/ruma-identity-service-api/src/keys/get_public_key/v2.rs
diff --git a/ruma-identity-service-api/src/keys/validate_ephemeral_key.rs b/crates/ruma-identity-service-api/src/keys/validate_ephemeral_key.rs
similarity index 100%
rename from ruma-identity-service-api/src/keys/validate_ephemeral_key.rs
rename to crates/ruma-identity-service-api/src/keys/validate_ephemeral_key.rs
diff --git a/ruma-identity-service-api/src/keys/validate_ephemeral_key/v2.rs b/crates/ruma-identity-service-api/src/keys/validate_ephemeral_key/v2.rs
similarity index 100%
rename from ruma-identity-service-api/src/keys/validate_ephemeral_key/v2.rs
rename to crates/ruma-identity-service-api/src/keys/validate_ephemeral_key/v2.rs
diff --git a/ruma-identity-service-api/src/lib.rs b/crates/ruma-identity-service-api/src/lib.rs
similarity index 100%
rename from ruma-identity-service-api/src/lib.rs
rename to crates/ruma-identity-service-api/src/lib.rs
diff --git a/ruma-identity-service-api/src/lookup.rs b/crates/ruma-identity-service-api/src/lookup.rs
similarity index 100%
rename from ruma-identity-service-api/src/lookup.rs
rename to crates/ruma-identity-service-api/src/lookup.rs
diff --git a/ruma-identity-service-api/src/lookup/get_hash_parameters.rs b/crates/ruma-identity-service-api/src/lookup/get_hash_parameters.rs
similarity index 100%
rename from ruma-identity-service-api/src/lookup/get_hash_parameters.rs
rename to crates/ruma-identity-service-api/src/lookup/get_hash_parameters.rs
diff --git a/ruma-identity-service-api/src/lookup/get_hash_parameters/v2.rs b/crates/ruma-identity-service-api/src/lookup/get_hash_parameters/v2.rs
similarity index 100%
rename from ruma-identity-service-api/src/lookup/get_hash_parameters/v2.rs
rename to crates/ruma-identity-service-api/src/lookup/get_hash_parameters/v2.rs
diff --git a/ruma-identity-service-api/src/lookup/lookup_3pid.rs b/crates/ruma-identity-service-api/src/lookup/lookup_3pid.rs
similarity index 100%
rename from ruma-identity-service-api/src/lookup/lookup_3pid.rs
rename to crates/ruma-identity-service-api/src/lookup/lookup_3pid.rs
diff --git a/ruma-identity-service-api/src/lookup/lookup_3pid/v2.rs b/crates/ruma-identity-service-api/src/lookup/lookup_3pid/v2.rs
similarity index 100%
rename from ruma-identity-service-api/src/lookup/lookup_3pid/v2.rs
rename to crates/ruma-identity-service-api/src/lookup/lookup_3pid/v2.rs
diff --git a/ruma-identity-service-api/src/status.rs b/crates/ruma-identity-service-api/src/status.rs
similarity index 100%
rename from ruma-identity-service-api/src/status.rs
rename to crates/ruma-identity-service-api/src/status.rs
diff --git a/ruma-identity-service-api/src/status/v2.rs b/crates/ruma-identity-service-api/src/status/v2.rs
similarity index 100%
rename from ruma-identity-service-api/src/status/v2.rs
rename to crates/ruma-identity-service-api/src/status/v2.rs
diff --git a/ruma-identity-service-api/src/tos.rs b/crates/ruma-identity-service-api/src/tos.rs
similarity index 100%
rename from ruma-identity-service-api/src/tos.rs
rename to crates/ruma-identity-service-api/src/tos.rs
diff --git a/ruma-identity-service-api/src/tos/accept_terms_of_service.rs b/crates/ruma-identity-service-api/src/tos/accept_terms_of_service.rs
similarity index 100%
rename from ruma-identity-service-api/src/tos/accept_terms_of_service.rs
rename to crates/ruma-identity-service-api/src/tos/accept_terms_of_service.rs
diff --git a/ruma-identity-service-api/src/tos/accept_terms_of_service/v2.rs b/crates/ruma-identity-service-api/src/tos/accept_terms_of_service/v2.rs
similarity index 100%
rename from ruma-identity-service-api/src/tos/accept_terms_of_service/v2.rs
rename to crates/ruma-identity-service-api/src/tos/accept_terms_of_service/v2.rs
diff --git a/ruma-identity-service-api/src/tos/get_terms_of_service.rs b/crates/ruma-identity-service-api/src/tos/get_terms_of_service.rs
similarity index 100%
rename from ruma-identity-service-api/src/tos/get_terms_of_service.rs
rename to crates/ruma-identity-service-api/src/tos/get_terms_of_service.rs
diff --git a/ruma-identity-service-api/src/tos/get_terms_of_service/v2.rs b/crates/ruma-identity-service-api/src/tos/get_terms_of_service/v2.rs
similarity index 100%
rename from ruma-identity-service-api/src/tos/get_terms_of_service/v2.rs
rename to crates/ruma-identity-service-api/src/tos/get_terms_of_service/v2.rs
diff --git a/ruma-push-gateway-api/CHANGELOG.md b/crates/ruma-push-gateway-api/CHANGELOG.md
similarity index 100%
rename from ruma-push-gateway-api/CHANGELOG.md
rename to crates/ruma-push-gateway-api/CHANGELOG.md
diff --git a/ruma-push-gateway-api/Cargo.toml b/crates/ruma-push-gateway-api/Cargo.toml
similarity index 100%
rename from ruma-push-gateway-api/Cargo.toml
rename to crates/ruma-push-gateway-api/Cargo.toml
diff --git a/ruma-push-gateway-api/README.md b/crates/ruma-push-gateway-api/README.md
similarity index 100%
rename from ruma-push-gateway-api/README.md
rename to crates/ruma-push-gateway-api/README.md
diff --git a/ruma-push-gateway-api/src/lib.rs b/crates/ruma-push-gateway-api/src/lib.rs
similarity index 100%
rename from ruma-push-gateway-api/src/lib.rs
rename to crates/ruma-push-gateway-api/src/lib.rs
diff --git a/ruma-push-gateway-api/src/send_event_notification.rs b/crates/ruma-push-gateway-api/src/send_event_notification.rs
similarity index 100%
rename from ruma-push-gateway-api/src/send_event_notification.rs
rename to crates/ruma-push-gateway-api/src/send_event_notification.rs
diff --git a/ruma-push-gateway-api/src/send_event_notification/v1.rs b/crates/ruma-push-gateway-api/src/send_event_notification/v1.rs
similarity index 100%
rename from ruma-push-gateway-api/src/send_event_notification/v1.rs
rename to crates/ruma-push-gateway-api/src/send_event_notification/v1.rs
diff --git a/ruma-serde-macros/Cargo.toml b/crates/ruma-serde-macros/Cargo.toml
similarity index 100%
rename from ruma-serde-macros/Cargo.toml
rename to crates/ruma-serde-macros/Cargo.toml
diff --git a/ruma-serde-macros/src/attr.rs b/crates/ruma-serde-macros/src/attr.rs
similarity index 100%
rename from ruma-serde-macros/src/attr.rs
rename to crates/ruma-serde-macros/src/attr.rs
diff --git a/ruma-serde-macros/src/case.rs b/crates/ruma-serde-macros/src/case.rs
similarity index 100%
rename from ruma-serde-macros/src/case.rs
rename to crates/ruma-serde-macros/src/case.rs
diff --git a/ruma-serde-macros/src/deserialize_from_cow_str.rs b/crates/ruma-serde-macros/src/deserialize_from_cow_str.rs
similarity index 100%
rename from ruma-serde-macros/src/deserialize_from_cow_str.rs
rename to crates/ruma-serde-macros/src/deserialize_from_cow_str.rs
diff --git a/ruma-serde-macros/src/display_as_ref_str.rs b/crates/ruma-serde-macros/src/display_as_ref_str.rs
similarity index 100%
rename from ruma-serde-macros/src/display_as_ref_str.rs
rename to crates/ruma-serde-macros/src/display_as_ref_str.rs
diff --git a/ruma-serde-macros/src/enum_as_ref_str.rs b/crates/ruma-serde-macros/src/enum_as_ref_str.rs
similarity index 100%
rename from ruma-serde-macros/src/enum_as_ref_str.rs
rename to crates/ruma-serde-macros/src/enum_as_ref_str.rs
diff --git a/ruma-serde-macros/src/enum_from_string.rs b/crates/ruma-serde-macros/src/enum_from_string.rs
similarity index 100%
rename from ruma-serde-macros/src/enum_from_string.rs
rename to crates/ruma-serde-macros/src/enum_from_string.rs
diff --git a/ruma-serde-macros/src/lib.rs b/crates/ruma-serde-macros/src/lib.rs
similarity index 100%
rename from ruma-serde-macros/src/lib.rs
rename to crates/ruma-serde-macros/src/lib.rs
diff --git a/ruma-serde-macros/src/outgoing.rs b/crates/ruma-serde-macros/src/outgoing.rs
similarity index 100%
rename from ruma-serde-macros/src/outgoing.rs
rename to crates/ruma-serde-macros/src/outgoing.rs
diff --git a/ruma-serde-macros/src/serialize_as_ref_str.rs b/crates/ruma-serde-macros/src/serialize_as_ref_str.rs
similarity index 100%
rename from ruma-serde-macros/src/serialize_as_ref_str.rs
rename to crates/ruma-serde-macros/src/serialize_as_ref_str.rs
diff --git a/ruma-serde-macros/src/util.rs b/crates/ruma-serde-macros/src/util.rs
similarity index 100%
rename from ruma-serde-macros/src/util.rs
rename to crates/ruma-serde-macros/src/util.rs
diff --git a/ruma-serde/CHANGELOG.md b/crates/ruma-serde/CHANGELOG.md
similarity index 100%
rename from ruma-serde/CHANGELOG.md
rename to crates/ruma-serde/CHANGELOG.md
diff --git a/ruma-serde/Cargo.toml b/crates/ruma-serde/Cargo.toml
similarity index 100%
rename from ruma-serde/Cargo.toml
rename to crates/ruma-serde/Cargo.toml
diff --git a/ruma-serde/README.md b/crates/ruma-serde/README.md
similarity index 100%
rename from ruma-serde/README.md
rename to crates/ruma-serde/README.md
diff --git a/ruma-serde/src/buf.rs b/crates/ruma-serde/src/buf.rs
similarity index 100%
rename from ruma-serde/src/buf.rs
rename to crates/ruma-serde/src/buf.rs
diff --git a/ruma-serde/src/can_be_empty.rs b/crates/ruma-serde/src/can_be_empty.rs
similarity index 100%
rename from ruma-serde/src/can_be_empty.rs
rename to crates/ruma-serde/src/can_be_empty.rs
diff --git a/ruma-serde/src/canonical_json.rs b/crates/ruma-serde/src/canonical_json.rs
similarity index 100%
rename from ruma-serde/src/canonical_json.rs
rename to crates/ruma-serde/src/canonical_json.rs
diff --git a/ruma-serde/src/canonical_json/value.rs b/crates/ruma-serde/src/canonical_json/value.rs
similarity index 100%
rename from ruma-serde/src/canonical_json/value.rs
rename to crates/ruma-serde/src/canonical_json/value.rs
diff --git a/ruma-serde/src/cow.rs b/crates/ruma-serde/src/cow.rs
similarity index 100%
rename from ruma-serde/src/cow.rs
rename to crates/ruma-serde/src/cow.rs
diff --git a/ruma-serde/src/duration.rs b/crates/ruma-serde/src/duration.rs
similarity index 100%
rename from ruma-serde/src/duration.rs
rename to crates/ruma-serde/src/duration.rs
diff --git a/ruma-serde/src/duration/opt_ms.rs b/crates/ruma-serde/src/duration/opt_ms.rs
similarity index 100%
rename from ruma-serde/src/duration/opt_ms.rs
rename to crates/ruma-serde/src/duration/opt_ms.rs
diff --git a/ruma-serde/src/duration/secs.rs b/crates/ruma-serde/src/duration/secs.rs
similarity index 100%
rename from ruma-serde/src/duration/secs.rs
rename to crates/ruma-serde/src/duration/secs.rs
diff --git a/ruma-serde/src/empty.rs b/crates/ruma-serde/src/empty.rs
similarity index 100%
rename from ruma-serde/src/empty.rs
rename to crates/ruma-serde/src/empty.rs
diff --git a/ruma-serde/src/json_string.rs b/crates/ruma-serde/src/json_string.rs
similarity index 100%
rename from ruma-serde/src/json_string.rs
rename to crates/ruma-serde/src/json_string.rs
diff --git a/ruma-serde/src/lib.rs b/crates/ruma-serde/src/lib.rs
similarity index 100%
rename from ruma-serde/src/lib.rs
rename to crates/ruma-serde/src/lib.rs
diff --git a/ruma-serde/src/raw.rs b/crates/ruma-serde/src/raw.rs
similarity index 100%
rename from ruma-serde/src/raw.rs
rename to crates/ruma-serde/src/raw.rs
diff --git a/ruma-serde/src/single_element_seq.rs b/crates/ruma-serde/src/single_element_seq.rs
similarity index 100%
rename from ruma-serde/src/single_element_seq.rs
rename to crates/ruma-serde/src/single_element_seq.rs
diff --git a/ruma-serde/src/strings.rs b/crates/ruma-serde/src/strings.rs
similarity index 100%
rename from ruma-serde/src/strings.rs
rename to crates/ruma-serde/src/strings.rs
diff --git a/ruma-serde/src/test.rs b/crates/ruma-serde/src/test.rs
similarity index 100%
rename from ruma-serde/src/test.rs
rename to crates/ruma-serde/src/test.rs
diff --git a/ruma-serde/src/time.rs b/crates/ruma-serde/src/time.rs
similarity index 100%
rename from ruma-serde/src/time.rs
rename to crates/ruma-serde/src/time.rs
diff --git a/ruma-serde/src/time/ms_since_unix_epoch.rs b/crates/ruma-serde/src/time/ms_since_unix_epoch.rs
similarity index 100%
rename from ruma-serde/src/time/ms_since_unix_epoch.rs
rename to crates/ruma-serde/src/time/ms_since_unix_epoch.rs
diff --git a/ruma-serde/src/time/opt_ms_since_unix_epoch.rs b/crates/ruma-serde/src/time/opt_ms_since_unix_epoch.rs
similarity index 100%
rename from ruma-serde/src/time/opt_ms_since_unix_epoch.rs
rename to crates/ruma-serde/src/time/opt_ms_since_unix_epoch.rs
diff --git a/ruma-serde/src/time/opt_s_since_unix_epoch.rs b/crates/ruma-serde/src/time/opt_s_since_unix_epoch.rs
similarity index 100%
rename from ruma-serde/src/time/opt_s_since_unix_epoch.rs
rename to crates/ruma-serde/src/time/opt_s_since_unix_epoch.rs
diff --git a/ruma-serde/src/time/s_since_unix_epoch.rs b/crates/ruma-serde/src/time/s_since_unix_epoch.rs
similarity index 100%
rename from ruma-serde/src/time/s_since_unix_epoch.rs
rename to crates/ruma-serde/src/time/s_since_unix_epoch.rs
diff --git a/ruma-serde/src/urlencoded.rs b/crates/ruma-serde/src/urlencoded.rs
similarity index 100%
rename from ruma-serde/src/urlencoded.rs
rename to crates/ruma-serde/src/urlencoded.rs
diff --git a/ruma-serde/src/urlencoded/de.rs b/crates/ruma-serde/src/urlencoded/de.rs
similarity index 100%
rename from ruma-serde/src/urlencoded/de.rs
rename to crates/ruma-serde/src/urlencoded/de.rs
diff --git a/ruma-serde/src/urlencoded/de/val_or_vec.rs b/crates/ruma-serde/src/urlencoded/de/val_or_vec.rs
similarity index 100%
rename from ruma-serde/src/urlencoded/de/val_or_vec.rs
rename to crates/ruma-serde/src/urlencoded/de/val_or_vec.rs
diff --git a/ruma-serde/src/urlencoded/ser.rs b/crates/ruma-serde/src/urlencoded/ser.rs
similarity index 100%
rename from ruma-serde/src/urlencoded/ser.rs
rename to crates/ruma-serde/src/urlencoded/ser.rs
diff --git a/ruma-serde/src/urlencoded/ser/key.rs b/crates/ruma-serde/src/urlencoded/ser/key.rs
similarity index 100%
rename from ruma-serde/src/urlencoded/ser/key.rs
rename to crates/ruma-serde/src/urlencoded/ser/key.rs
diff --git a/ruma-serde/src/urlencoded/ser/pair.rs b/crates/ruma-serde/src/urlencoded/ser/pair.rs
similarity index 100%
rename from ruma-serde/src/urlencoded/ser/pair.rs
rename to crates/ruma-serde/src/urlencoded/ser/pair.rs
diff --git a/ruma-serde/src/urlencoded/ser/part.rs b/crates/ruma-serde/src/urlencoded/ser/part.rs
similarity index 100%
rename from ruma-serde/src/urlencoded/ser/part.rs
rename to crates/ruma-serde/src/urlencoded/ser/part.rs
diff --git a/ruma-serde/src/urlencoded/ser/value.rs b/crates/ruma-serde/src/urlencoded/ser/value.rs
similarity index 100%
rename from ruma-serde/src/urlencoded/ser/value.rs
rename to crates/ruma-serde/src/urlencoded/ser/value.rs
diff --git a/ruma-serde/tests/empty_strings.rs b/crates/ruma-serde/tests/empty_strings.rs
similarity index 100%
rename from ruma-serde/tests/empty_strings.rs
rename to crates/ruma-serde/tests/empty_strings.rs
diff --git a/ruma-serde/tests/enum_derive.rs b/crates/ruma-serde/tests/enum_derive.rs
similarity index 100%
rename from ruma-serde/tests/enum_derive.rs
rename to crates/ruma-serde/tests/enum_derive.rs
diff --git a/ruma-serde/tests/url_deserialize.rs b/crates/ruma-serde/tests/url_deserialize.rs
similarity index 100%
rename from ruma-serde/tests/url_deserialize.rs
rename to crates/ruma-serde/tests/url_deserialize.rs
diff --git a/ruma-serde/tests/url_serialize.rs b/crates/ruma-serde/tests/url_serialize.rs
similarity index 100%
rename from ruma-serde/tests/url_serialize.rs
rename to crates/ruma-serde/tests/url_serialize.rs
diff --git a/ruma-signatures/CHANGELOG.md b/crates/ruma-signatures/CHANGELOG.md
similarity index 100%
rename from ruma-signatures/CHANGELOG.md
rename to crates/ruma-signatures/CHANGELOG.md
diff --git a/ruma-signatures/Cargo.toml b/crates/ruma-signatures/Cargo.toml
similarity index 100%
rename from ruma-signatures/Cargo.toml
rename to crates/ruma-signatures/Cargo.toml
diff --git a/ruma-signatures/README.md b/crates/ruma-signatures/README.md
similarity index 100%
rename from ruma-signatures/README.md
rename to crates/ruma-signatures/README.md
diff --git a/ruma-signatures/src/functions.rs b/crates/ruma-signatures/src/functions.rs
similarity index 100%
rename from ruma-signatures/src/functions.rs
rename to crates/ruma-signatures/src/functions.rs
diff --git a/ruma-signatures/src/keys.rs b/crates/ruma-signatures/src/keys.rs
similarity index 100%
rename from ruma-signatures/src/keys.rs
rename to crates/ruma-signatures/src/keys.rs
diff --git a/ruma-signatures/src/lib.rs b/crates/ruma-signatures/src/lib.rs
similarity index 100%
rename from ruma-signatures/src/lib.rs
rename to crates/ruma-signatures/src/lib.rs
diff --git a/ruma-signatures/src/signatures.rs b/crates/ruma-signatures/src/signatures.rs
similarity index 100%
rename from ruma-signatures/src/signatures.rs
rename to crates/ruma-signatures/src/signatures.rs
diff --git a/ruma-signatures/src/verification.rs b/crates/ruma-signatures/src/verification.rs
similarity index 100%
rename from ruma-signatures/src/verification.rs
rename to crates/ruma-signatures/src/verification.rs
diff --git a/ruma/Cargo.toml b/crates/ruma/Cargo.toml
similarity index 100%
rename from ruma/Cargo.toml
rename to crates/ruma/Cargo.toml
diff --git a/ruma/README.md b/crates/ruma/README.md
similarity index 100%
rename from ruma/README.md
rename to crates/ruma/README.md
diff --git a/ruma/src/lib.rs b/crates/ruma/src/lib.rs
similarity index 100%
rename from ruma/src/lib.rs
rename to crates/ruma/src/lib.rs
diff --git a/ruma/tests/outgoing.rs b/crates/ruma/tests/outgoing.rs
similarity index 100%
rename from ruma/tests/outgoing.rs
rename to crates/ruma/tests/outgoing.rs