diff --git a/src/arch/mod.rs b/src/arch/mod.rs
new file mode 100644
index 0000000..1e5b3c6
--- /dev/null
+++ b/src/arch/mod.rs
@@ -0,0 +1,7 @@
+// Copyright (c) 2015, edef <edef@edef.eu>
+// See the LICENSE file included in this distribution.
+pub use self::imp::Registers;
+
+#[cfg(target_arch = "x86_64")]
+#[path = "x86_64/mod.rs"]
+mod imp;
diff --git a/src/init.s b/src/arch/x86_64/init.s
similarity index 100%
rename from src/init.s
rename to src/arch/x86_64/init.s
diff --git a/src/arch.rs b/src/arch/x86_64/mod.rs
similarity index 100%
rename from src/arch.rs
rename to src/arch/x86_64/mod.rs
diff --git a/src/swap.s b/src/arch/x86_64/swap.s
similarity index 100%
rename from src/swap.s
rename to src/arch/x86_64/swap.s
diff --git a/src/lib.rs b/src/lib.rs
index 59f2a5b..225d039 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -23,7 +23,6 @@ pub mod stack;
 
 mod debug;
 
-#[cfg(target_arch = "x86_64")]
 mod arch;
 
 #[cfg(feature = "os")]