diff --git a/TEST_MAPPING b/TEST_MAPPING
index 80e085c..bdf6da9 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -123,7 +123,7 @@
       "path": "packages/modules/Virtualization/guest/pvmfw"
     },
     {
-      "path": "packages/modules/Virtualization/rialto"
+      "path": "packages/modules/Virtualization/guest/rialto"
     },
     {
       "path": "packages/modules/Virtualization/service_vm/client_vm_csr"
diff --git a/rialto/Android.bp b/guest/rialto/Android.bp
similarity index 100%
rename from rialto/Android.bp
rename to guest/rialto/Android.bp
diff --git a/rialto/AndroidTest.xml b/guest/rialto/AndroidTest.xml
similarity index 100%
rename from rialto/AndroidTest.xml
rename to guest/rialto/AndroidTest.xml
diff --git a/rialto/TEST_MAPPING b/guest/rialto/TEST_MAPPING
similarity index 100%
rename from rialto/TEST_MAPPING
rename to guest/rialto/TEST_MAPPING
diff --git a/rialto/idmap.S b/guest/rialto/idmap.S
similarity index 100%
rename from rialto/idmap.S
rename to guest/rialto/idmap.S
diff --git a/rialto/image.ld b/guest/rialto/image.ld
similarity index 100%
rename from rialto/image.ld
rename to guest/rialto/image.ld
diff --git a/rialto/src/communication.rs b/guest/rialto/src/communication.rs
similarity index 100%
rename from rialto/src/communication.rs
rename to guest/rialto/src/communication.rs
diff --git a/rialto/src/error.rs b/guest/rialto/src/error.rs
similarity index 100%
rename from rialto/src/error.rs
rename to guest/rialto/src/error.rs
diff --git a/rialto/src/exceptions.rs b/guest/rialto/src/exceptions.rs
similarity index 100%
rename from rialto/src/exceptions.rs
rename to guest/rialto/src/exceptions.rs
diff --git a/rialto/src/fdt.rs b/guest/rialto/src/fdt.rs
similarity index 100%
rename from rialto/src/fdt.rs
rename to guest/rialto/src/fdt.rs
diff --git a/rialto/src/main.rs b/guest/rialto/src/main.rs
similarity index 100%
rename from rialto/src/main.rs
rename to guest/rialto/src/main.rs
diff --git a/rialto/tests/test.rs b/guest/rialto/tests/test.rs
similarity index 100%
rename from rialto/tests/test.rs
rename to guest/rialto/tests/test.rs
diff --git a/service_vm/fake_chain/Android.bp b/service_vm/fake_chain/Android.bp
index 2bc7b4e..39f36eb 100644
--- a/service_vm/fake_chain/Android.bp
+++ b/service_vm/fake_chain/Android.bp
@@ -22,7 +22,7 @@
     defaults: ["avf_build_flags_rust"],
     srcs: ["src/lib.rs"],
     visibility: [
-        "//packages/modules/Virtualization/rialto:__subpackages__",
+        "//packages/modules/Virtualization/guest/rialto:__subpackages__",
     ],
     prefer_rlib: true,
     rustlibs: [