diff --git a/libs/service_vm_comm/Android.bp b/service_vm/comm/Android.bp
similarity index 100%
rename from libs/service_vm_comm/Android.bp
rename to service_vm/comm/Android.bp
diff --git a/libs/service_vm_comm/src/lib.rs b/service_vm/comm/src/lib.rs
similarity index 100%
rename from libs/service_vm_comm/src/lib.rs
rename to service_vm/comm/src/lib.rs
diff --git a/libs/service_vm_comm/src/message.rs b/service_vm/comm/src/message.rs
similarity index 100%
rename from libs/service_vm_comm/src/message.rs
rename to service_vm/comm/src/message.rs
diff --git a/libs/service_vm_comm/src/vsock.rs b/service_vm/comm/src/vsock.rs
similarity index 100%
rename from libs/service_vm_comm/src/vsock.rs
rename to service_vm/comm/src/vsock.rs
diff --git a/service_vm_manager/Android.bp b/service_vm/manager/Android.bp
similarity index 100%
rename from service_vm_manager/Android.bp
rename to service_vm/manager/Android.bp
diff --git a/service_vm_manager/src/lib.rs b/service_vm/manager/src/lib.rs
similarity index 100%
rename from service_vm_manager/src/lib.rs
rename to service_vm/manager/src/lib.rs