diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 517a939b..59a4a11e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -83,7 +83,7 @@ jobs: - name: Check run: | - cd matrix_sdk/examples/wasm_command_bot + cd crates/matrix_sdk/examples/wasm_command_bot cargo check --target wasm32-unknown-unknown test-appservice: @@ -121,19 +121,19 @@ jobs: uses: actions-rs/cargo@v1 with: command: clippy - args: --manifest-path matrix_sdk_appservice/Cargo.toml ${{ matrix.cargo_args }} -- -D warnings + args: --manifest-path crates/matrix_sdk_appservice/Cargo.toml ${{ matrix.cargo_args }} -- -D warnings - name: Build uses: actions-rs/cargo@v1 with: command: build - args: --manifest-path matrix_sdk_appservice/Cargo.toml ${{ matrix.cargo_args }} + args: --manifest-path crates/matrix_sdk_appservice/Cargo.toml ${{ matrix.cargo_args }} - name: Test uses: actions-rs/cargo@v1 with: command: test - args: --manifest-path matrix_sdk_appservice/Cargo.toml ${{ matrix.cargo_args }} + args: --manifest-path crates/matrix_sdk_appservice/Cargo.toml ${{ matrix.cargo_args }} test-features: name: ${{ matrix.name }} @@ -197,13 +197,13 @@ jobs: uses: actions-rs/cargo@v1 with: command: check - args: --manifest-path matrix_sdk/Cargo.toml ${{ matrix.cargo_args }} + args: --manifest-path crates/matrix_sdk/Cargo.toml ${{ matrix.cargo_args }} - name: Test uses: actions-rs/cargo@v1 with: command: test - args: --manifest-path matrix_sdk/Cargo.toml ${{ matrix.cargo_args }} + args: --manifest-path crates/matrix_sdk/Cargo.toml ${{ matrix.cargo_args }} test: name: ${{ matrix.name }} diff --git a/Cargo.toml b/Cargo.toml index 07953e68..337c98b3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,11 +1,11 @@ [workspace] members = [ - "matrix_sdk", - "matrix_qrcode", - "matrix_sdk_base", - "matrix_sdk_test", - "matrix_sdk_test_macros", - "matrix_sdk_crypto", - "matrix_sdk_common", - "matrix_sdk_appservice" + "crates/matrix_sdk", + "crates/matrix_qrcode", + "crates/matrix_sdk_base", + "crates/matrix_sdk_test", + "crates/matrix_sdk_test_macros", + "crates/matrix_sdk_crypto", + "crates/matrix_sdk_common", + "crates/matrix_sdk_appservice" ] diff --git a/Makefile b/Makefile deleted file mode 100644 index 5e38baf0..00000000 --- a/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -all: build - -build: - cargo build -test: - cargo test - -coverage: - cargo tarpaulin -v - -clean: - cargo clean - -format: - cargo fmt - -.PHONY: clean test coverage diff --git a/matrix_qrcode/Cargo.toml b/crates/matrix_qrcode/Cargo.toml similarity index 100% rename from matrix_qrcode/Cargo.toml rename to crates/matrix_qrcode/Cargo.toml diff --git a/matrix_qrcode/README.md b/crates/matrix_qrcode/README.md similarity index 100% rename from matrix_qrcode/README.md rename to crates/matrix_qrcode/README.md diff --git a/matrix_qrcode/data/self-no-master.png b/crates/matrix_qrcode/data/self-no-master.png similarity index 100% rename from matrix_qrcode/data/self-no-master.png rename to crates/matrix_qrcode/data/self-no-master.png diff --git a/matrix_qrcode/data/self-verification.png b/crates/matrix_qrcode/data/self-verification.png similarity index 100% rename from matrix_qrcode/data/self-verification.png rename to crates/matrix_qrcode/data/self-verification.png diff --git a/matrix_qrcode/data/verification.png b/crates/matrix_qrcode/data/verification.png similarity index 100% rename from matrix_qrcode/data/verification.png rename to crates/matrix_qrcode/data/verification.png diff --git a/matrix_qrcode/src/error.rs b/crates/matrix_qrcode/src/error.rs similarity index 100% rename from matrix_qrcode/src/error.rs rename to crates/matrix_qrcode/src/error.rs diff --git a/matrix_qrcode/src/lib.rs b/crates/matrix_qrcode/src/lib.rs similarity index 100% rename from matrix_qrcode/src/lib.rs rename to crates/matrix_qrcode/src/lib.rs diff --git a/matrix_qrcode/src/types.rs b/crates/matrix_qrcode/src/types.rs similarity index 100% rename from matrix_qrcode/src/types.rs rename to crates/matrix_qrcode/src/types.rs diff --git a/matrix_qrcode/src/utils.rs b/crates/matrix_qrcode/src/utils.rs similarity index 100% rename from matrix_qrcode/src/utils.rs rename to crates/matrix_qrcode/src/utils.rs diff --git a/matrix_sdk/Cargo.toml b/crates/matrix_sdk/Cargo.toml similarity index 100% rename from matrix_sdk/Cargo.toml rename to crates/matrix_sdk/Cargo.toml diff --git a/matrix_sdk/README.md b/crates/matrix_sdk/README.md similarity index 98% rename from matrix_sdk/README.md rename to crates/matrix_sdk/README.md index 80898baf..bc8ec120 100644 --- a/matrix_sdk/README.md +++ b/crates/matrix_sdk/README.md @@ -80,5 +80,5 @@ The `RUST_LOG` variable also supports a more advanced syntax for filtering log output more precisely, for instance with crate-level granularity. For more information on this, check out the [tracing_subscriber documentation]. -[examples]: https://github.com/matrix-org/matrix-rust-sdk/tree/master/matrix_sdk/examples +[examples]: https://github.com/matrix-org/matrix-rust-sdk/tree/master/crates/matrix_sdk/examples [tracing_subscriber documentation]: https://tracing.rs/tracing_subscriber/filter/struct.envfilter diff --git a/matrix_sdk/examples/autojoin.rs b/crates/matrix_sdk/examples/autojoin.rs similarity index 100% rename from matrix_sdk/examples/autojoin.rs rename to crates/matrix_sdk/examples/autojoin.rs diff --git a/matrix_sdk/examples/command_bot.rs b/crates/matrix_sdk/examples/command_bot.rs similarity index 100% rename from matrix_sdk/examples/command_bot.rs rename to crates/matrix_sdk/examples/command_bot.rs diff --git a/matrix_sdk/examples/cross_signing_bootstrap.rs b/crates/matrix_sdk/examples/cross_signing_bootstrap.rs similarity index 100% rename from matrix_sdk/examples/cross_signing_bootstrap.rs rename to crates/matrix_sdk/examples/cross_signing_bootstrap.rs diff --git a/matrix_sdk/examples/emoji_verification.rs b/crates/matrix_sdk/examples/emoji_verification.rs similarity index 100% rename from matrix_sdk/examples/emoji_verification.rs rename to crates/matrix_sdk/examples/emoji_verification.rs diff --git a/matrix_sdk/examples/get_profiles.rs b/crates/matrix_sdk/examples/get_profiles.rs similarity index 100% rename from matrix_sdk/examples/get_profiles.rs rename to crates/matrix_sdk/examples/get_profiles.rs diff --git a/matrix_sdk/examples/image_bot.rs b/crates/matrix_sdk/examples/image_bot.rs similarity index 100% rename from matrix_sdk/examples/image_bot.rs rename to crates/matrix_sdk/examples/image_bot.rs diff --git a/matrix_sdk/examples/login.rs b/crates/matrix_sdk/examples/login.rs similarity index 100% rename from matrix_sdk/examples/login.rs rename to crates/matrix_sdk/examples/login.rs diff --git a/matrix_sdk/examples/wasm_command_bot/.gitignore b/crates/matrix_sdk/examples/wasm_command_bot/.gitignore similarity index 100% rename from matrix_sdk/examples/wasm_command_bot/.gitignore rename to crates/matrix_sdk/examples/wasm_command_bot/.gitignore diff --git a/matrix_sdk/examples/wasm_command_bot/Cargo.toml b/crates/matrix_sdk/examples/wasm_command_bot/Cargo.toml similarity index 100% rename from matrix_sdk/examples/wasm_command_bot/Cargo.toml rename to crates/matrix_sdk/examples/wasm_command_bot/Cargo.toml diff --git a/matrix_sdk/examples/wasm_command_bot/README.md b/crates/matrix_sdk/examples/wasm_command_bot/README.md similarity index 100% rename from matrix_sdk/examples/wasm_command_bot/README.md rename to crates/matrix_sdk/examples/wasm_command_bot/README.md diff --git a/matrix_sdk/examples/wasm_command_bot/index.js b/crates/matrix_sdk/examples/wasm_command_bot/index.js similarity index 100% rename from matrix_sdk/examples/wasm_command_bot/index.js rename to crates/matrix_sdk/examples/wasm_command_bot/index.js diff --git a/matrix_sdk/examples/wasm_command_bot/package.json b/crates/matrix_sdk/examples/wasm_command_bot/package.json similarity index 100% rename from matrix_sdk/examples/wasm_command_bot/package.json rename to crates/matrix_sdk/examples/wasm_command_bot/package.json diff --git a/matrix_sdk/examples/wasm_command_bot/src/lib.rs b/crates/matrix_sdk/examples/wasm_command_bot/src/lib.rs similarity index 100% rename from matrix_sdk/examples/wasm_command_bot/src/lib.rs rename to crates/matrix_sdk/examples/wasm_command_bot/src/lib.rs diff --git a/matrix_sdk/examples/wasm_command_bot/webpack.config.js b/crates/matrix_sdk/examples/wasm_command_bot/webpack.config.js similarity index 100% rename from matrix_sdk/examples/wasm_command_bot/webpack.config.js rename to crates/matrix_sdk/examples/wasm_command_bot/webpack.config.js diff --git a/matrix_sdk/src/client.rs b/crates/matrix_sdk/src/client.rs similarity index 100% rename from matrix_sdk/src/client.rs rename to crates/matrix_sdk/src/client.rs diff --git a/matrix_sdk/src/error.rs b/crates/matrix_sdk/src/error.rs similarity index 100% rename from matrix_sdk/src/error.rs rename to crates/matrix_sdk/src/error.rs diff --git a/matrix_sdk/src/event_handler.rs b/crates/matrix_sdk/src/event_handler.rs similarity index 100% rename from matrix_sdk/src/event_handler.rs rename to crates/matrix_sdk/src/event_handler.rs diff --git a/matrix_sdk/src/http_client.rs b/crates/matrix_sdk/src/http_client.rs similarity index 100% rename from matrix_sdk/src/http_client.rs rename to crates/matrix_sdk/src/http_client.rs diff --git a/matrix_sdk/src/identities/devices.rs b/crates/matrix_sdk/src/identities/devices.rs similarity index 100% rename from matrix_sdk/src/identities/devices.rs rename to crates/matrix_sdk/src/identities/devices.rs diff --git a/matrix_sdk/src/identities/mod.rs b/crates/matrix_sdk/src/identities/mod.rs similarity index 100% rename from matrix_sdk/src/identities/mod.rs rename to crates/matrix_sdk/src/identities/mod.rs diff --git a/matrix_sdk/src/identities/users.rs b/crates/matrix_sdk/src/identities/users.rs similarity index 100% rename from matrix_sdk/src/identities/users.rs rename to crates/matrix_sdk/src/identities/users.rs diff --git a/matrix_sdk/src/lib.rs b/crates/matrix_sdk/src/lib.rs similarity index 100% rename from matrix_sdk/src/lib.rs rename to crates/matrix_sdk/src/lib.rs diff --git a/matrix_sdk/src/room/common.rs b/crates/matrix_sdk/src/room/common.rs similarity index 100% rename from matrix_sdk/src/room/common.rs rename to crates/matrix_sdk/src/room/common.rs diff --git a/matrix_sdk/src/room/invited.rs b/crates/matrix_sdk/src/room/invited.rs similarity index 100% rename from matrix_sdk/src/room/invited.rs rename to crates/matrix_sdk/src/room/invited.rs diff --git a/matrix_sdk/src/room/joined.rs b/crates/matrix_sdk/src/room/joined.rs similarity index 100% rename from matrix_sdk/src/room/joined.rs rename to crates/matrix_sdk/src/room/joined.rs diff --git a/matrix_sdk/src/room/left.rs b/crates/matrix_sdk/src/room/left.rs similarity index 100% rename from matrix_sdk/src/room/left.rs rename to crates/matrix_sdk/src/room/left.rs diff --git a/matrix_sdk/src/room/mod.rs b/crates/matrix_sdk/src/room/mod.rs similarity index 100% rename from matrix_sdk/src/room/mod.rs rename to crates/matrix_sdk/src/room/mod.rs diff --git a/matrix_sdk/src/room_member.rs b/crates/matrix_sdk/src/room_member.rs similarity index 100% rename from matrix_sdk/src/room_member.rs rename to crates/matrix_sdk/src/room_member.rs diff --git a/matrix_sdk/src/verification/mod.rs b/crates/matrix_sdk/src/verification/mod.rs similarity index 100% rename from matrix_sdk/src/verification/mod.rs rename to crates/matrix_sdk/src/verification/mod.rs diff --git a/matrix_sdk/src/verification/qrcode.rs b/crates/matrix_sdk/src/verification/qrcode.rs similarity index 100% rename from matrix_sdk/src/verification/qrcode.rs rename to crates/matrix_sdk/src/verification/qrcode.rs diff --git a/matrix_sdk/src/verification/requests.rs b/crates/matrix_sdk/src/verification/requests.rs similarity index 100% rename from matrix_sdk/src/verification/requests.rs rename to crates/matrix_sdk/src/verification/requests.rs diff --git a/matrix_sdk/src/verification/sas.rs b/crates/matrix_sdk/src/verification/sas.rs similarity index 100% rename from matrix_sdk/src/verification/sas.rs rename to crates/matrix_sdk/src/verification/sas.rs diff --git a/matrix_sdk_appservice/Cargo.toml b/crates/matrix_sdk_appservice/Cargo.toml similarity index 100% rename from matrix_sdk_appservice/Cargo.toml rename to crates/matrix_sdk_appservice/Cargo.toml diff --git a/matrix_sdk_appservice/examples/appservice_autojoin.rs b/crates/matrix_sdk_appservice/examples/appservice_autojoin.rs similarity index 100% rename from matrix_sdk_appservice/examples/appservice_autojoin.rs rename to crates/matrix_sdk_appservice/examples/appservice_autojoin.rs diff --git a/matrix_sdk_appservice/src/error.rs b/crates/matrix_sdk_appservice/src/error.rs similarity index 100% rename from matrix_sdk_appservice/src/error.rs rename to crates/matrix_sdk_appservice/src/error.rs diff --git a/matrix_sdk_appservice/src/lib.rs b/crates/matrix_sdk_appservice/src/lib.rs similarity index 100% rename from matrix_sdk_appservice/src/lib.rs rename to crates/matrix_sdk_appservice/src/lib.rs diff --git a/matrix_sdk_appservice/src/webserver/mod.rs b/crates/matrix_sdk_appservice/src/webserver/mod.rs similarity index 100% rename from matrix_sdk_appservice/src/webserver/mod.rs rename to crates/matrix_sdk_appservice/src/webserver/mod.rs diff --git a/matrix_sdk_appservice/src/webserver/warp.rs b/crates/matrix_sdk_appservice/src/webserver/warp.rs similarity index 100% rename from matrix_sdk_appservice/src/webserver/warp.rs rename to crates/matrix_sdk_appservice/src/webserver/warp.rs diff --git a/matrix_sdk_appservice/tests/registration.yaml b/crates/matrix_sdk_appservice/tests/registration.yaml similarity index 100% rename from matrix_sdk_appservice/tests/registration.yaml rename to crates/matrix_sdk_appservice/tests/registration.yaml diff --git a/matrix_sdk_appservice/tests/tests.rs b/crates/matrix_sdk_appservice/tests/tests.rs similarity index 100% rename from matrix_sdk_appservice/tests/tests.rs rename to crates/matrix_sdk_appservice/tests/tests.rs diff --git a/matrix_sdk_base/.cargo/config b/crates/matrix_sdk_base/.cargo/config similarity index 100% rename from matrix_sdk_base/.cargo/config rename to crates/matrix_sdk_base/.cargo/config diff --git a/matrix_sdk_base/Cargo.toml b/crates/matrix_sdk_base/Cargo.toml similarity index 100% rename from matrix_sdk_base/Cargo.toml rename to crates/matrix_sdk_base/Cargo.toml diff --git a/matrix_sdk_base/README.md b/crates/matrix_sdk_base/README.md similarity index 100% rename from matrix_sdk_base/README.md rename to crates/matrix_sdk_base/README.md diff --git a/matrix_sdk_base/examples/state_inspector.rs b/crates/matrix_sdk_base/examples/state_inspector.rs similarity index 100% rename from matrix_sdk_base/examples/state_inspector.rs rename to crates/matrix_sdk_base/examples/state_inspector.rs diff --git a/matrix_sdk_base/examples/syntaxes.bin b/crates/matrix_sdk_base/examples/syntaxes.bin similarity index 100% rename from matrix_sdk_base/examples/syntaxes.bin rename to crates/matrix_sdk_base/examples/syntaxes.bin diff --git a/matrix_sdk_base/examples/themes.bin b/crates/matrix_sdk_base/examples/themes.bin similarity index 100% rename from matrix_sdk_base/examples/themes.bin rename to crates/matrix_sdk_base/examples/themes.bin diff --git a/matrix_sdk_base/src/client.rs b/crates/matrix_sdk_base/src/client.rs similarity index 100% rename from matrix_sdk_base/src/client.rs rename to crates/matrix_sdk_base/src/client.rs diff --git a/matrix_sdk_base/src/error.rs b/crates/matrix_sdk_base/src/error.rs similarity index 100% rename from matrix_sdk_base/src/error.rs rename to crates/matrix_sdk_base/src/error.rs diff --git a/matrix_sdk_base/src/lib.rs b/crates/matrix_sdk_base/src/lib.rs similarity index 100% rename from matrix_sdk_base/src/lib.rs rename to crates/matrix_sdk_base/src/lib.rs diff --git a/matrix_sdk_base/src/media.rs b/crates/matrix_sdk_base/src/media.rs similarity index 100% rename from matrix_sdk_base/src/media.rs rename to crates/matrix_sdk_base/src/media.rs diff --git a/matrix_sdk_base/src/rooms/members.rs b/crates/matrix_sdk_base/src/rooms/members.rs similarity index 100% rename from matrix_sdk_base/src/rooms/members.rs rename to crates/matrix_sdk_base/src/rooms/members.rs diff --git a/matrix_sdk_base/src/rooms/mod.rs b/crates/matrix_sdk_base/src/rooms/mod.rs similarity index 100% rename from matrix_sdk_base/src/rooms/mod.rs rename to crates/matrix_sdk_base/src/rooms/mod.rs diff --git a/matrix_sdk_base/src/rooms/normal.rs b/crates/matrix_sdk_base/src/rooms/normal.rs similarity index 100% rename from matrix_sdk_base/src/rooms/normal.rs rename to crates/matrix_sdk_base/src/rooms/normal.rs diff --git a/matrix_sdk_base/src/session.rs b/crates/matrix_sdk_base/src/session.rs similarity index 100% rename from matrix_sdk_base/src/session.rs rename to crates/matrix_sdk_base/src/session.rs diff --git a/matrix_sdk_base/src/store/ambiguity_map.rs b/crates/matrix_sdk_base/src/store/ambiguity_map.rs similarity index 100% rename from matrix_sdk_base/src/store/ambiguity_map.rs rename to crates/matrix_sdk_base/src/store/ambiguity_map.rs diff --git a/matrix_sdk_base/src/store/memory_store.rs b/crates/matrix_sdk_base/src/store/memory_store.rs similarity index 100% rename from matrix_sdk_base/src/store/memory_store.rs rename to crates/matrix_sdk_base/src/store/memory_store.rs diff --git a/matrix_sdk_base/src/store/mod.rs b/crates/matrix_sdk_base/src/store/mod.rs similarity index 100% rename from matrix_sdk_base/src/store/mod.rs rename to crates/matrix_sdk_base/src/store/mod.rs diff --git a/matrix_sdk_base/src/store/sled_store/mod.rs b/crates/matrix_sdk_base/src/store/sled_store/mod.rs similarity index 100% rename from matrix_sdk_base/src/store/sled_store/mod.rs rename to crates/matrix_sdk_base/src/store/sled_store/mod.rs diff --git a/matrix_sdk_base/src/store/sled_store/store_key.rs b/crates/matrix_sdk_base/src/store/sled_store/store_key.rs similarity index 100% rename from matrix_sdk_base/src/store/sled_store/store_key.rs rename to crates/matrix_sdk_base/src/store/sled_store/store_key.rs diff --git a/matrix_sdk_common/Cargo.toml b/crates/matrix_sdk_common/Cargo.toml similarity index 100% rename from matrix_sdk_common/Cargo.toml rename to crates/matrix_sdk_common/Cargo.toml diff --git a/matrix_sdk_common/README.md b/crates/matrix_sdk_common/README.md similarity index 100% rename from matrix_sdk_common/README.md rename to crates/matrix_sdk_common/README.md diff --git a/matrix_sdk_common/src/deserialized_responses.rs b/crates/matrix_sdk_common/src/deserialized_responses.rs similarity index 100% rename from matrix_sdk_common/src/deserialized_responses.rs rename to crates/matrix_sdk_common/src/deserialized_responses.rs diff --git a/matrix_sdk_common/src/executor.rs b/crates/matrix_sdk_common/src/executor.rs similarity index 100% rename from matrix_sdk_common/src/executor.rs rename to crates/matrix_sdk_common/src/executor.rs diff --git a/matrix_sdk_common/src/lib.rs b/crates/matrix_sdk_common/src/lib.rs similarity index 100% rename from matrix_sdk_common/src/lib.rs rename to crates/matrix_sdk_common/src/lib.rs diff --git a/matrix_sdk_common/src/locks.rs b/crates/matrix_sdk_common/src/locks.rs similarity index 100% rename from matrix_sdk_common/src/locks.rs rename to crates/matrix_sdk_common/src/locks.rs diff --git a/matrix_sdk_crypto/Cargo.toml b/crates/matrix_sdk_crypto/Cargo.toml similarity index 100% rename from matrix_sdk_crypto/Cargo.toml rename to crates/matrix_sdk_crypto/Cargo.toml diff --git a/matrix_sdk_crypto/README.md b/crates/matrix_sdk_crypto/README.md similarity index 100% rename from matrix_sdk_crypto/README.md rename to crates/matrix_sdk_crypto/README.md diff --git a/matrix_sdk_crypto/benches/README.md b/crates/matrix_sdk_crypto/benches/README.md similarity index 100% rename from matrix_sdk_crypto/benches/README.md rename to crates/matrix_sdk_crypto/benches/README.md diff --git a/matrix_sdk_crypto/benches/crypto_bench.rs b/crates/matrix_sdk_crypto/benches/crypto_bench.rs similarity index 100% rename from matrix_sdk_crypto/benches/crypto_bench.rs rename to crates/matrix_sdk_crypto/benches/crypto_bench.rs diff --git a/matrix_sdk_crypto/benches/keys_claim.json b/crates/matrix_sdk_crypto/benches/keys_claim.json similarity index 100% rename from matrix_sdk_crypto/benches/keys_claim.json rename to crates/matrix_sdk_crypto/benches/keys_claim.json diff --git a/matrix_sdk_crypto/benches/keys_query.json b/crates/matrix_sdk_crypto/benches/keys_query.json similarity index 100% rename from matrix_sdk_crypto/benches/keys_query.json rename to crates/matrix_sdk_crypto/benches/keys_query.json diff --git a/matrix_sdk_crypto/benches/keys_query_2000_members.json b/crates/matrix_sdk_crypto/benches/keys_query_2000_members.json similarity index 100% rename from matrix_sdk_crypto/benches/keys_query_2000_members.json rename to crates/matrix_sdk_crypto/benches/keys_query_2000_members.json diff --git a/matrix_sdk_crypto/src/error.rs b/crates/matrix_sdk_crypto/src/error.rs similarity index 100% rename from matrix_sdk_crypto/src/error.rs rename to crates/matrix_sdk_crypto/src/error.rs diff --git a/matrix_sdk_crypto/src/file_encryption/attachments.rs b/crates/matrix_sdk_crypto/src/file_encryption/attachments.rs similarity index 100% rename from matrix_sdk_crypto/src/file_encryption/attachments.rs rename to crates/matrix_sdk_crypto/src/file_encryption/attachments.rs diff --git a/matrix_sdk_crypto/src/file_encryption/key_export.rs b/crates/matrix_sdk_crypto/src/file_encryption/key_export.rs similarity index 100% rename from matrix_sdk_crypto/src/file_encryption/key_export.rs rename to crates/matrix_sdk_crypto/src/file_encryption/key_export.rs diff --git a/matrix_sdk_crypto/src/file_encryption/mod.rs b/crates/matrix_sdk_crypto/src/file_encryption/mod.rs similarity index 100% rename from matrix_sdk_crypto/src/file_encryption/mod.rs rename to crates/matrix_sdk_crypto/src/file_encryption/mod.rs diff --git a/matrix_sdk_crypto/src/gossiping/machine.rs b/crates/matrix_sdk_crypto/src/gossiping/machine.rs similarity index 100% rename from matrix_sdk_crypto/src/gossiping/machine.rs rename to crates/matrix_sdk_crypto/src/gossiping/machine.rs diff --git a/matrix_sdk_crypto/src/gossiping/mod.rs b/crates/matrix_sdk_crypto/src/gossiping/mod.rs similarity index 100% rename from matrix_sdk_crypto/src/gossiping/mod.rs rename to crates/matrix_sdk_crypto/src/gossiping/mod.rs diff --git a/matrix_sdk_crypto/src/identities/device.rs b/crates/matrix_sdk_crypto/src/identities/device.rs similarity index 100% rename from matrix_sdk_crypto/src/identities/device.rs rename to crates/matrix_sdk_crypto/src/identities/device.rs diff --git a/matrix_sdk_crypto/src/identities/manager.rs b/crates/matrix_sdk_crypto/src/identities/manager.rs similarity index 100% rename from matrix_sdk_crypto/src/identities/manager.rs rename to crates/matrix_sdk_crypto/src/identities/manager.rs diff --git a/matrix_sdk_crypto/src/identities/mod.rs b/crates/matrix_sdk_crypto/src/identities/mod.rs similarity index 100% rename from matrix_sdk_crypto/src/identities/mod.rs rename to crates/matrix_sdk_crypto/src/identities/mod.rs diff --git a/matrix_sdk_crypto/src/identities/user.rs b/crates/matrix_sdk_crypto/src/identities/user.rs similarity index 100% rename from matrix_sdk_crypto/src/identities/user.rs rename to crates/matrix_sdk_crypto/src/identities/user.rs diff --git a/matrix_sdk_crypto/src/lib.rs b/crates/matrix_sdk_crypto/src/lib.rs similarity index 100% rename from matrix_sdk_crypto/src/lib.rs rename to crates/matrix_sdk_crypto/src/lib.rs diff --git a/matrix_sdk_crypto/src/machine.rs b/crates/matrix_sdk_crypto/src/machine.rs similarity index 100% rename from matrix_sdk_crypto/src/machine.rs rename to crates/matrix_sdk_crypto/src/machine.rs diff --git a/matrix_sdk_crypto/src/olm/account.rs b/crates/matrix_sdk_crypto/src/olm/account.rs similarity index 100% rename from matrix_sdk_crypto/src/olm/account.rs rename to crates/matrix_sdk_crypto/src/olm/account.rs diff --git a/matrix_sdk_crypto/src/olm/group_sessions/inbound.rs b/crates/matrix_sdk_crypto/src/olm/group_sessions/inbound.rs similarity index 100% rename from matrix_sdk_crypto/src/olm/group_sessions/inbound.rs rename to crates/matrix_sdk_crypto/src/olm/group_sessions/inbound.rs diff --git a/matrix_sdk_crypto/src/olm/group_sessions/mod.rs b/crates/matrix_sdk_crypto/src/olm/group_sessions/mod.rs similarity index 100% rename from matrix_sdk_crypto/src/olm/group_sessions/mod.rs rename to crates/matrix_sdk_crypto/src/olm/group_sessions/mod.rs diff --git a/matrix_sdk_crypto/src/olm/group_sessions/outbound.rs b/crates/matrix_sdk_crypto/src/olm/group_sessions/outbound.rs similarity index 100% rename from matrix_sdk_crypto/src/olm/group_sessions/outbound.rs rename to crates/matrix_sdk_crypto/src/olm/group_sessions/outbound.rs diff --git a/matrix_sdk_crypto/src/olm/mod.rs b/crates/matrix_sdk_crypto/src/olm/mod.rs similarity index 100% rename from matrix_sdk_crypto/src/olm/mod.rs rename to crates/matrix_sdk_crypto/src/olm/mod.rs diff --git a/matrix_sdk_crypto/src/olm/session.rs b/crates/matrix_sdk_crypto/src/olm/session.rs similarity index 100% rename from matrix_sdk_crypto/src/olm/session.rs rename to crates/matrix_sdk_crypto/src/olm/session.rs diff --git a/matrix_sdk_crypto/src/olm/signing/mod.rs b/crates/matrix_sdk_crypto/src/olm/signing/mod.rs similarity index 100% rename from matrix_sdk_crypto/src/olm/signing/mod.rs rename to crates/matrix_sdk_crypto/src/olm/signing/mod.rs diff --git a/matrix_sdk_crypto/src/olm/signing/pk_signing.rs b/crates/matrix_sdk_crypto/src/olm/signing/pk_signing.rs similarity index 100% rename from matrix_sdk_crypto/src/olm/signing/pk_signing.rs rename to crates/matrix_sdk_crypto/src/olm/signing/pk_signing.rs diff --git a/matrix_sdk_crypto/src/olm/utility.rs b/crates/matrix_sdk_crypto/src/olm/utility.rs similarity index 100% rename from matrix_sdk_crypto/src/olm/utility.rs rename to crates/matrix_sdk_crypto/src/olm/utility.rs diff --git a/matrix_sdk_crypto/src/requests.rs b/crates/matrix_sdk_crypto/src/requests.rs similarity index 100% rename from matrix_sdk_crypto/src/requests.rs rename to crates/matrix_sdk_crypto/src/requests.rs diff --git a/matrix_sdk_crypto/src/session_manager/group_sessions.rs b/crates/matrix_sdk_crypto/src/session_manager/group_sessions.rs similarity index 100% rename from matrix_sdk_crypto/src/session_manager/group_sessions.rs rename to crates/matrix_sdk_crypto/src/session_manager/group_sessions.rs diff --git a/matrix_sdk_crypto/src/session_manager/mod.rs b/crates/matrix_sdk_crypto/src/session_manager/mod.rs similarity index 100% rename from matrix_sdk_crypto/src/session_manager/mod.rs rename to crates/matrix_sdk_crypto/src/session_manager/mod.rs diff --git a/matrix_sdk_crypto/src/session_manager/sessions.rs b/crates/matrix_sdk_crypto/src/session_manager/sessions.rs similarity index 100% rename from matrix_sdk_crypto/src/session_manager/sessions.rs rename to crates/matrix_sdk_crypto/src/session_manager/sessions.rs diff --git a/matrix_sdk_crypto/src/store/caches.rs b/crates/matrix_sdk_crypto/src/store/caches.rs similarity index 100% rename from matrix_sdk_crypto/src/store/caches.rs rename to crates/matrix_sdk_crypto/src/store/caches.rs diff --git a/matrix_sdk_crypto/src/store/memorystore.rs b/crates/matrix_sdk_crypto/src/store/memorystore.rs similarity index 100% rename from matrix_sdk_crypto/src/store/memorystore.rs rename to crates/matrix_sdk_crypto/src/store/memorystore.rs diff --git a/matrix_sdk_crypto/src/store/mod.rs b/crates/matrix_sdk_crypto/src/store/mod.rs similarity index 100% rename from matrix_sdk_crypto/src/store/mod.rs rename to crates/matrix_sdk_crypto/src/store/mod.rs diff --git a/matrix_sdk_crypto/src/store/pickle_key.rs b/crates/matrix_sdk_crypto/src/store/pickle_key.rs similarity index 100% rename from matrix_sdk_crypto/src/store/pickle_key.rs rename to crates/matrix_sdk_crypto/src/store/pickle_key.rs diff --git a/matrix_sdk_crypto/src/store/sled.rs b/crates/matrix_sdk_crypto/src/store/sled.rs similarity index 100% rename from matrix_sdk_crypto/src/store/sled.rs rename to crates/matrix_sdk_crypto/src/store/sled.rs diff --git a/matrix_sdk_crypto/src/utilities.rs b/crates/matrix_sdk_crypto/src/utilities.rs similarity index 100% rename from matrix_sdk_crypto/src/utilities.rs rename to crates/matrix_sdk_crypto/src/utilities.rs diff --git a/matrix_sdk_crypto/src/verification/cache.rs b/crates/matrix_sdk_crypto/src/verification/cache.rs similarity index 100% rename from matrix_sdk_crypto/src/verification/cache.rs rename to crates/matrix_sdk_crypto/src/verification/cache.rs diff --git a/matrix_sdk_crypto/src/verification/event_enums.rs b/crates/matrix_sdk_crypto/src/verification/event_enums.rs similarity index 100% rename from matrix_sdk_crypto/src/verification/event_enums.rs rename to crates/matrix_sdk_crypto/src/verification/event_enums.rs diff --git a/matrix_sdk_crypto/src/verification/machine.rs b/crates/matrix_sdk_crypto/src/verification/machine.rs similarity index 100% rename from matrix_sdk_crypto/src/verification/machine.rs rename to crates/matrix_sdk_crypto/src/verification/machine.rs diff --git a/matrix_sdk_crypto/src/verification/mod.rs b/crates/matrix_sdk_crypto/src/verification/mod.rs similarity index 100% rename from matrix_sdk_crypto/src/verification/mod.rs rename to crates/matrix_sdk_crypto/src/verification/mod.rs diff --git a/matrix_sdk_crypto/src/verification/qrcode.rs b/crates/matrix_sdk_crypto/src/verification/qrcode.rs similarity index 100% rename from matrix_sdk_crypto/src/verification/qrcode.rs rename to crates/matrix_sdk_crypto/src/verification/qrcode.rs diff --git a/matrix_sdk_crypto/src/verification/requests.rs b/crates/matrix_sdk_crypto/src/verification/requests.rs similarity index 100% rename from matrix_sdk_crypto/src/verification/requests.rs rename to crates/matrix_sdk_crypto/src/verification/requests.rs diff --git a/matrix_sdk_crypto/src/verification/sas/helpers.rs b/crates/matrix_sdk_crypto/src/verification/sas/helpers.rs similarity index 100% rename from matrix_sdk_crypto/src/verification/sas/helpers.rs rename to crates/matrix_sdk_crypto/src/verification/sas/helpers.rs diff --git a/matrix_sdk_crypto/src/verification/sas/inner_sas.rs b/crates/matrix_sdk_crypto/src/verification/sas/inner_sas.rs similarity index 100% rename from matrix_sdk_crypto/src/verification/sas/inner_sas.rs rename to crates/matrix_sdk_crypto/src/verification/sas/inner_sas.rs diff --git a/matrix_sdk_crypto/src/verification/sas/mod.rs b/crates/matrix_sdk_crypto/src/verification/sas/mod.rs similarity index 100% rename from matrix_sdk_crypto/src/verification/sas/mod.rs rename to crates/matrix_sdk_crypto/src/verification/sas/mod.rs diff --git a/matrix_sdk_crypto/src/verification/sas/sas_state.rs b/crates/matrix_sdk_crypto/src/verification/sas/sas_state.rs similarity index 100% rename from matrix_sdk_crypto/src/verification/sas/sas_state.rs rename to crates/matrix_sdk_crypto/src/verification/sas/sas_state.rs diff --git a/matrix_sdk_test/Cargo.toml b/crates/matrix_sdk_test/Cargo.toml similarity index 100% rename from matrix_sdk_test/Cargo.toml rename to crates/matrix_sdk_test/Cargo.toml diff --git a/matrix_sdk_test/README.md b/crates/matrix_sdk_test/README.md similarity index 100% rename from matrix_sdk_test/README.md rename to crates/matrix_sdk_test/README.md diff --git a/matrix_sdk_test/src/appservice.rs b/crates/matrix_sdk_test/src/appservice.rs similarity index 100% rename from matrix_sdk_test/src/appservice.rs rename to crates/matrix_sdk_test/src/appservice.rs diff --git a/matrix_sdk_test/src/lib.rs b/crates/matrix_sdk_test/src/lib.rs similarity index 100% rename from matrix_sdk_test/src/lib.rs rename to crates/matrix_sdk_test/src/lib.rs diff --git a/matrix_sdk_test/src/test_json/events.rs b/crates/matrix_sdk_test/src/test_json/events.rs similarity index 100% rename from matrix_sdk_test/src/test_json/events.rs rename to crates/matrix_sdk_test/src/test_json/events.rs diff --git a/matrix_sdk_test/src/test_json/members.rs b/crates/matrix_sdk_test/src/test_json/members.rs similarity index 100% rename from matrix_sdk_test/src/test_json/members.rs rename to crates/matrix_sdk_test/src/test_json/members.rs diff --git a/matrix_sdk_test/src/test_json/mod.rs b/crates/matrix_sdk_test/src/test_json/mod.rs similarity index 100% rename from matrix_sdk_test/src/test_json/mod.rs rename to crates/matrix_sdk_test/src/test_json/mod.rs diff --git a/matrix_sdk_test/src/test_json/sync.rs b/crates/matrix_sdk_test/src/test_json/sync.rs similarity index 100% rename from matrix_sdk_test/src/test_json/sync.rs rename to crates/matrix_sdk_test/src/test_json/sync.rs diff --git a/matrix_sdk_test_macros/Cargo.toml b/crates/matrix_sdk_test_macros/Cargo.toml similarity index 100% rename from matrix_sdk_test_macros/Cargo.toml rename to crates/matrix_sdk_test_macros/Cargo.toml diff --git a/matrix_sdk_test_macros/README.md b/crates/matrix_sdk_test_macros/README.md similarity index 100% rename from matrix_sdk_test_macros/README.md rename to crates/matrix_sdk_test_macros/README.md diff --git a/matrix_sdk_test_macros/src/lib.rs b/crates/matrix_sdk_test_macros/src/lib.rs similarity index 100% rename from matrix_sdk_test_macros/src/lib.rs rename to crates/matrix_sdk_test_macros/src/lib.rs