diff --git a/TEST_MAPPING b/TEST_MAPPING
index 3a63a29..7a34485 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -29,7 +29,7 @@
       "path": "packages/modules/Virtualization/apkdmverity"
     },
     {
-      "path": "packages/modules/Virtualization/apkverify"
+      "path": "packages/modules/Virtualization/libs/apkverify"
     },
     {
       "path": "packages/modules/Virtualization/authfs"
diff --git a/apkverify/Android.bp b/libs/apkverify/Android.bp
similarity index 100%
rename from apkverify/Android.bp
rename to libs/apkverify/Android.bp
diff --git a/apkverify/TEST_MAPPING b/libs/apkverify/TEST_MAPPING
similarity index 100%
rename from apkverify/TEST_MAPPING
rename to libs/apkverify/TEST_MAPPING
diff --git a/apkverify/src/bytes_ext.rs b/libs/apkverify/src/bytes_ext.rs
similarity index 100%
rename from apkverify/src/bytes_ext.rs
rename to libs/apkverify/src/bytes_ext.rs
diff --git a/apkverify/src/lib.rs b/libs/apkverify/src/lib.rs
similarity index 100%
rename from apkverify/src/lib.rs
rename to libs/apkverify/src/lib.rs
diff --git a/apkverify/src/sigutil.rs b/libs/apkverify/src/sigutil.rs
similarity index 100%
rename from apkverify/src/sigutil.rs
rename to libs/apkverify/src/sigutil.rs
diff --git a/apkverify/src/testing.rs b/libs/apkverify/src/testing.rs
similarity index 100%
rename from apkverify/src/testing.rs
rename to libs/apkverify/src/testing.rs
diff --git a/apkverify/src/v3.rs b/libs/apkverify/src/v3.rs
similarity index 100%
rename from apkverify/src/v3.rs
rename to libs/apkverify/src/v3.rs
diff --git a/apkverify/src/ziputil.rs b/libs/apkverify/src/ziputil.rs
similarity index 100%
rename from apkverify/src/ziputil.rs
rename to libs/apkverify/src/ziputil.rs
diff --git a/apkverify/tests/apkverify_test.rs b/libs/apkverify/tests/apkverify_test.rs
similarity index 100%
rename from apkverify/tests/apkverify_test.rs
rename to libs/apkverify/tests/apkverify_test.rs
diff --git a/apkverify/tests/data/README.md b/libs/apkverify/tests/data/README.md
similarity index 100%
rename from apkverify/tests/data/README.md
rename to libs/apkverify/tests/data/README.md
diff --git a/apkverify/tests/data/test.apex b/libs/apkverify/tests/data/test.apex
similarity index 100%
rename from apkverify/tests/data/test.apex
rename to libs/apkverify/tests/data/test.apex
Binary files differ
diff --git a/apkverify/tests/data/v2-only-truncated-cd.apk b/libs/apkverify/tests/data/v2-only-truncated-cd.apk
similarity index 100%
rename from apkverify/tests/data/v2-only-truncated-cd.apk
rename to libs/apkverify/tests/data/v2-only-truncated-cd.apk
Binary files differ
diff --git a/apkverify/tests/data/v3-only-cert-and-public-key-mismatch.apk b/libs/apkverify/tests/data/v3-only-cert-and-public-key-mismatch.apk
similarity index 100%
rename from apkverify/tests/data/v3-only-cert-and-public-key-mismatch.apk
rename to libs/apkverify/tests/data/v3-only-cert-and-public-key-mismatch.apk
Binary files differ
diff --git a/apkverify/tests/data/v3-only-with-rsa-pkcs1-sha512-8192-digest-mismatch.apk b/libs/apkverify/tests/data/v3-only-with-rsa-pkcs1-sha512-8192-digest-mismatch.apk
similarity index 100%
rename from apkverify/tests/data/v3-only-with-rsa-pkcs1-sha512-8192-digest-mismatch.apk
rename to libs/apkverify/tests/data/v3-only-with-rsa-pkcs1-sha512-8192-digest-mismatch.apk
Binary files differ
diff --git a/libs/libavb_rs/Android.bp b/libs/avb_bindgen/Android.bp
similarity index 100%
rename from libs/libavb_rs/Android.bp
rename to libs/avb_bindgen/Android.bp
diff --git a/libs/libavb_rs/bindgen/avb.h b/libs/avb_bindgen/bindgen/avb.h
similarity index 100%
rename from libs/libavb_rs/bindgen/avb.h
rename to libs/avb_bindgen/bindgen/avb.h
diff --git a/binder_common/Android.bp b/libs/binder_common/Android.bp
similarity index 100%
rename from binder_common/Android.bp
rename to libs/binder_common/Android.bp
diff --git a/binder_common/lazy_service.rs b/libs/binder_common/lazy_service.rs
similarity index 100%
rename from binder_common/lazy_service.rs
rename to libs/binder_common/lazy_service.rs
diff --git a/binder_common/lib.rs b/libs/binder_common/lib.rs
similarity index 100%
rename from binder_common/lib.rs
rename to libs/binder_common/lib.rs
diff --git a/binder_common/rpc_client.rs b/libs/binder_common/rpc_client.rs
similarity index 100%
rename from binder_common/rpc_client.rs
rename to libs/binder_common/rpc_client.rs
diff --git a/binder_common/rpc_server.rs b/libs/binder_common/rpc_server.rs
similarity index 100%
rename from binder_common/rpc_server.rs
rename to libs/binder_common/rpc_server.rs
diff --git a/idsig/Android.bp b/libs/idsig/Android.bp
similarity index 100%
rename from idsig/Android.bp
rename to libs/idsig/Android.bp
diff --git a/idsig/Cargo.toml b/libs/idsig/Cargo.toml
similarity index 100%
rename from idsig/Cargo.toml
rename to libs/idsig/Cargo.toml
diff --git a/idsig/src/apksigv4.rs b/libs/idsig/src/apksigv4.rs
similarity index 100%
rename from idsig/src/apksigv4.rs
rename to libs/idsig/src/apksigv4.rs
diff --git a/idsig/src/hashtree.rs b/libs/idsig/src/hashtree.rs
similarity index 100%
rename from idsig/src/hashtree.rs
rename to libs/idsig/src/hashtree.rs
diff --git a/idsig/src/lib.rs b/libs/idsig/src/lib.rs
similarity index 100%
rename from idsig/src/lib.rs
rename to libs/idsig/src/lib.rs
diff --git a/idsig/testdata/create.sh b/libs/idsig/testdata/create.sh
similarity index 100%
rename from idsig/testdata/create.sh
rename to libs/idsig/testdata/create.sh
diff --git a/idsig/testdata/input.10000000 b/libs/idsig/testdata/input.10000000
similarity index 100%
rename from idsig/testdata/input.10000000
rename to libs/idsig/testdata/input.10000000
Binary files differ
diff --git a/idsig/testdata/input.10000000.descriptor b/libs/idsig/testdata/input.10000000.descriptor
similarity index 100%
rename from idsig/testdata/input.10000000.descriptor
rename to libs/idsig/testdata/input.10000000.descriptor
Binary files differ
diff --git a/idsig/testdata/input.10000000.hash b/libs/idsig/testdata/input.10000000.hash
similarity index 100%
rename from idsig/testdata/input.10000000.hash
rename to libs/idsig/testdata/input.10000000.hash
Binary files differ
diff --git a/idsig/testdata/input.1M b/libs/idsig/testdata/input.1M
similarity index 100%
rename from idsig/testdata/input.1M
rename to libs/idsig/testdata/input.1M
Binary files differ
diff --git a/idsig/testdata/input.1M.descriptor b/libs/idsig/testdata/input.1M.descriptor
similarity index 100%
rename from idsig/testdata/input.1M.descriptor
rename to libs/idsig/testdata/input.1M.descriptor
Binary files differ
diff --git a/idsig/testdata/input.1M.hash b/libs/idsig/testdata/input.1M.hash
similarity index 100%
rename from idsig/testdata/input.1M.hash
rename to libs/idsig/testdata/input.1M.hash
Binary files differ
diff --git a/idsig/testdata/input.272629760 b/libs/idsig/testdata/input.272629760
similarity index 100%
rename from idsig/testdata/input.272629760
rename to libs/idsig/testdata/input.272629760
Binary files differ
diff --git a/idsig/testdata/input.272629760.descriptor b/libs/idsig/testdata/input.272629760.descriptor
similarity index 100%
rename from idsig/testdata/input.272629760.descriptor
rename to libs/idsig/testdata/input.272629760.descriptor
Binary files differ
diff --git a/idsig/testdata/input.272629760.hash b/libs/idsig/testdata/input.272629760.hash
similarity index 100%
rename from idsig/testdata/input.272629760.hash
rename to libs/idsig/testdata/input.272629760.hash
Binary files differ
diff --git a/idsig/testdata/input.4K b/libs/idsig/testdata/input.4K
similarity index 100%
rename from idsig/testdata/input.4K
rename to libs/idsig/testdata/input.4K
Binary files differ
diff --git a/idsig/testdata/input.4K.descriptor b/libs/idsig/testdata/input.4K.descriptor
similarity index 100%
rename from idsig/testdata/input.4K.descriptor
rename to libs/idsig/testdata/input.4K.descriptor
Binary files differ
diff --git a/idsig/testdata/input.4K.hash b/libs/idsig/testdata/input.4K.hash
similarity index 100%
rename from idsig/testdata/input.4K.hash
rename to libs/idsig/testdata/input.4K.hash
diff --git a/idsig/testdata/input.512 b/libs/idsig/testdata/input.512
similarity index 100%
rename from idsig/testdata/input.512
rename to libs/idsig/testdata/input.512
Binary files differ
diff --git a/idsig/testdata/input.512.descriptor b/libs/idsig/testdata/input.512.descriptor
similarity index 100%
rename from idsig/testdata/input.512.descriptor
rename to libs/idsig/testdata/input.512.descriptor
Binary files differ
diff --git a/idsig/testdata/input.512.hash b/libs/idsig/testdata/input.512.hash
similarity index 100%
rename from idsig/testdata/input.512.hash
rename to libs/idsig/testdata/input.512.hash
diff --git a/idsig/testdata/test.apk b/libs/idsig/testdata/test.apk
similarity index 100%
rename from idsig/testdata/test.apk
rename to libs/idsig/testdata/test.apk
Binary files differ
diff --git a/idsig/testdata/test.apk.idsig b/libs/idsig/testdata/test.apk.idsig
similarity index 100%
rename from idsig/testdata/test.apk.idsig
rename to libs/idsig/testdata/test.apk.idsig
Binary files differ
diff --git a/statslog_virtualization/Android.bp b/libs/statslog_virtualization/Android.bp
similarity index 100%
rename from statslog_virtualization/Android.bp
rename to libs/statslog_virtualization/Android.bp
diff --git a/statslog_virtualization/statslog_header_wrapper.rs b/libs/statslog_virtualization/statslog_header_wrapper.rs
similarity index 100%
rename from statslog_virtualization/statslog_header_wrapper.rs
rename to libs/statslog_virtualization/statslog_header_wrapper.rs
diff --git a/statslog_virtualization/statslog_wrapper.rs b/libs/statslog_virtualization/statslog_wrapper.rs
similarity index 100%
rename from statslog_virtualization/statslog_wrapper.rs
rename to libs/statslog_virtualization/statslog_wrapper.rs
diff --git a/vmconfig/Android.bp b/libs/vmconfig/Android.bp
similarity index 100%
rename from vmconfig/Android.bp
rename to libs/vmconfig/Android.bp
diff --git a/vmconfig/src/lib.rs b/libs/vmconfig/src/lib.rs
similarity index 100%
rename from vmconfig/src/lib.rs
rename to libs/vmconfig/src/lib.rs