diff --git a/fastpair/rust/Cargo.toml b/fastpair/rust/bluetooth/Cargo.toml
similarity index 100%
rename from fastpair/rust/Cargo.toml
rename to fastpair/rust/bluetooth/Cargo.toml
diff --git a/fastpair/rust/rustfmt.toml b/fastpair/rust/bluetooth/rustfmt.toml
similarity index 100%
rename from fastpair/rust/rustfmt.toml
rename to fastpair/rust/bluetooth/rustfmt.toml
diff --git a/fastpair/rust/src/bluetooth/api/adapter.rs b/fastpair/rust/bluetooth/src/bluetooth/api/adapter.rs
similarity index 100%
rename from fastpair/rust/src/bluetooth/api/adapter.rs
rename to fastpair/rust/bluetooth/src/bluetooth/api/adapter.rs
diff --git a/fastpair/rust/src/bluetooth/api/device.rs b/fastpair/rust/bluetooth/src/bluetooth/api/device.rs
similarity index 100%
rename from fastpair/rust/src/bluetooth/api/device.rs
rename to fastpair/rust/bluetooth/src/bluetooth/api/device.rs
diff --git a/fastpair/rust/src/bluetooth/api/mod.rs b/fastpair/rust/bluetooth/src/bluetooth/api/mod.rs
similarity index 100%
rename from fastpair/rust/src/bluetooth/api/mod.rs
rename to fastpair/rust/bluetooth/src/bluetooth/api/mod.rs
diff --git a/fastpair/rust/src/bluetooth/common/address.rs b/fastpair/rust/bluetooth/src/bluetooth/common/address.rs
similarity index 100%
rename from fastpair/rust/src/bluetooth/common/address.rs
rename to fastpair/rust/bluetooth/src/bluetooth/common/address.rs
diff --git a/fastpair/rust/src/bluetooth/common/advertisement.rs b/fastpair/rust/bluetooth/src/bluetooth/common/advertisement.rs
similarity index 100%
rename from fastpair/rust/src/bluetooth/common/advertisement.rs
rename to fastpair/rust/bluetooth/src/bluetooth/common/advertisement.rs
diff --git a/fastpair/rust/src/bluetooth/common/error.rs b/fastpair/rust/bluetooth/src/bluetooth/common/error.rs
similarity index 100%
rename from fastpair/rust/src/bluetooth/common/error.rs
rename to fastpair/rust/bluetooth/src/bluetooth/common/error.rs
diff --git a/fastpair/rust/src/bluetooth/common/mod.rs b/fastpair/rust/bluetooth/src/bluetooth/common/mod.rs
similarity index 100%
rename from fastpair/rust/src/bluetooth/common/mod.rs
rename to fastpair/rust/bluetooth/src/bluetooth/common/mod.rs
diff --git a/fastpair/rust/src/bluetooth/mod.rs b/fastpair/rust/bluetooth/src/bluetooth/mod.rs
similarity index 100%
rename from fastpair/rust/src/bluetooth/mod.rs
rename to fastpair/rust/bluetooth/src/bluetooth/mod.rs
diff --git a/fastpair/rust/src/bluetooth/unsupported/adapter.rs b/fastpair/rust/bluetooth/src/bluetooth/unsupported/adapter.rs
similarity index 100%
rename from fastpair/rust/src/bluetooth/unsupported/adapter.rs
rename to fastpair/rust/bluetooth/src/bluetooth/unsupported/adapter.rs
diff --git a/fastpair/rust/src/bluetooth/unsupported/device.rs b/fastpair/rust/bluetooth/src/bluetooth/unsupported/device.rs
similarity index 100%
rename from fastpair/rust/src/bluetooth/unsupported/device.rs
rename to fastpair/rust/bluetooth/src/bluetooth/unsupported/device.rs
diff --git a/fastpair/rust/src/bluetooth/unsupported/mod.rs b/fastpair/rust/bluetooth/src/bluetooth/unsupported/mod.rs
similarity index 100%
rename from fastpair/rust/src/bluetooth/unsupported/mod.rs
rename to fastpair/rust/bluetooth/src/bluetooth/unsupported/mod.rs
diff --git a/fastpair/rust/src/bluetooth/windows/adapter.rs b/fastpair/rust/bluetooth/src/bluetooth/windows/adapter.rs
similarity index 100%
rename from fastpair/rust/src/bluetooth/windows/adapter.rs
rename to fastpair/rust/bluetooth/src/bluetooth/windows/adapter.rs
diff --git a/fastpair/rust/src/bluetooth/windows/address.rs b/fastpair/rust/bluetooth/src/bluetooth/windows/address.rs
similarity index 100%
rename from fastpair/rust/src/bluetooth/windows/address.rs
rename to fastpair/rust/bluetooth/src/bluetooth/windows/address.rs
diff --git a/fastpair/rust/src/bluetooth/windows/advertisement.rs b/fastpair/rust/bluetooth/src/bluetooth/windows/advertisement.rs
similarity index 100%
rename from fastpair/rust/src/bluetooth/windows/advertisement.rs
rename to fastpair/rust/bluetooth/src/bluetooth/windows/advertisement.rs
diff --git a/fastpair/rust/src/bluetooth/windows/device.rs b/fastpair/rust/bluetooth/src/bluetooth/windows/device.rs
similarity index 100%
rename from fastpair/rust/src/bluetooth/windows/device.rs
rename to fastpair/rust/bluetooth/src/bluetooth/windows/device.rs
diff --git a/fastpair/rust/src/bluetooth/windows/error.rs b/fastpair/rust/bluetooth/src/bluetooth/windows/error.rs
similarity index 100%
rename from fastpair/rust/src/bluetooth/windows/error.rs
rename to fastpair/rust/bluetooth/src/bluetooth/windows/error.rs
diff --git a/fastpair/rust/src/bluetooth/windows/mod.rs b/fastpair/rust/bluetooth/src/bluetooth/windows/mod.rs
similarity index 100%
rename from fastpair/rust/src/bluetooth/windows/mod.rs
rename to fastpair/rust/bluetooth/src/bluetooth/windows/mod.rs
diff --git a/fastpair/rust/src/lib.rs b/fastpair/rust/bluetooth/src/lib.rs
similarity index 100%
rename from fastpair/rust/src/lib.rs
rename to fastpair/rust/bluetooth/src/lib.rs
diff --git a/fastpair/rust/src/main.rs b/fastpair/rust/bluetooth/src/main.rs
similarity index 100%
rename from fastpair/rust/src/main.rs
rename to fastpair/rust/bluetooth/src/main.rs
diff --git a/fastpair/rust/src/message_stream.rs b/fastpair/rust/bluetooth/src/message_stream.rs
similarity index 100%
rename from fastpair/rust/src/message_stream.rs
rename to fastpair/rust/bluetooth/src/message_stream.rs
diff --git a/fastpair/rust/src/types.rs b/fastpair/rust/bluetooth/src/types.rs
similarity index 100%
rename from fastpair/rust/src/types.rs
rename to fastpair/rust/bluetooth/src/types.rs
diff --git a/fastpair/rust/src/types/packets.rs b/fastpair/rust/bluetooth/src/types/packets.rs
similarity index 100%
rename from fastpair/rust/src/types/packets.rs
rename to fastpair/rust/bluetooth/src/types/packets.rs
diff --git a/fastpair/rust/tests/integration_test.rs b/fastpair/rust/bluetooth/tests/integration_test.rs
similarity index 100%
rename from fastpair/rust/tests/integration_test.rs
rename to fastpair/rust/bluetooth/tests/integration_test.rs