diff --git a/libs/libvmbase/src/arch.rs b/libs/libvmbase/src/aarch64.rs
similarity index 100%
rename from libs/libvmbase/src/arch.rs
rename to libs/libvmbase/src/aarch64.rs
diff --git a/libs/libvmbase/src/lib.rs b/libs/libvmbase/src/lib.rs
index 630834b..c805cec 100644
--- a/libs/libvmbase/src/lib.rs
+++ b/libs/libvmbase/src/lib.rs
@@ -18,7 +18,7 @@
 
 extern crate alloc;
 
-pub mod arch;
+pub mod aarch64;
 pub mod bionic;
 pub mod console;
 mod entry;
@@ -45,3 +45,8 @@
     eprintln!("{}", info);
     reboot()
 }
+
+// TODO(ptosi): Move crate::aarch64 to crate::arch::aarch64 and remove this.
+pub(crate) mod arch {
+    pub use crate::aarch64::write_volatile_u8;
+}