diff --git a/src/vm/common.rs b/src/vm/addr.rs
similarity index 100%
rename from src/vm/common.rs
rename to src/vm/addr.rs
diff --git a/src/vm/error.rs b/src/vm/error.rs
index 0799e19..9d5db5a 100644
--- a/src/vm/error.rs
+++ b/src/vm/error.rs
@@ -1,4 +1,4 @@
-use crate::vm::{inst::InstOp, reg::Reg, common::*,};
+use crate::vm::{inst::InstOp, reg::Reg, addr::*,};
 use snafu::Snafu;
 
 #[derive(Snafu, Debug, Clone)]
diff --git a/src/vm/inst.rs b/src/vm/inst.rs
index 7b11653..309f6c6 100644
--- a/src/vm/inst.rs
+++ b/src/vm/inst.rs
@@ -1,4 +1,4 @@
-use crate::vm::{common::Addr, reg::Reg};
+use crate::vm::{addr::Addr, reg::Reg};
 
 macro_rules! instructions {
     {
diff --git a/src/vm/mem.rs b/src/vm/mem.rs
index ea623e3..9071a58 100644
--- a/src/vm/mem.rs
+++ b/src/vm/mem.rs
@@ -1,4 +1,4 @@
-use crate::vm::{common::*, error::*, inst::*, reg::*};
+use crate::vm::{addr::*, error::*, inst::*, reg::*};
 use std::{convert::TryInto, ops::Index, mem};
 
 pub struct MemCursor<T> {
diff --git a/src/vm/mod.rs b/src/vm/mod.rs
index 653fd3e..dc4270d 100644
--- a/src/vm/mod.rs
+++ b/src/vm/mod.rs
@@ -1,4 +1,4 @@
-pub mod common;
+pub mod addr;
 pub mod error;
 pub mod flags;
 pub mod inst;
diff --git a/src/vm/state.rs b/src/vm/state.rs
index abced0e..c147b1f 100644
--- a/src/vm/state.rs
+++ b/src/vm/state.rs
@@ -1,4 +1,4 @@
-use crate::vm::{common::*, error::*, flags::*, mem::*, reg::*};
+use crate::vm::{addr::*, error::*, flags::*, mem::*, reg::*};
 
 pub struct State {
     regs: [u64; NUM_REGS],