diff --git a/Cargo.toml b/Cargo.toml
index 42b7b08..9c40408 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,10 +4,9 @@ version = "0.1.0"
 authors = ["Michel Heily <michelheily@gmail.com>"]
 edition = "2018"
 
+[workspace]
+members = [".", "arm7tdmi"]
+
 [dependencies]
 byteorder = "*"
 arm7tdmi = {path = "arm7tdmi"}
-
-[[bin]]
-name = "disassembler"
-path = "src/disassembler.rs"
\ No newline at end of file
diff --git a/arm7tdmi/Cargo.toml b/arm7tdmi/Cargo.toml
index bb55de7..4e7d160 100644
--- a/arm7tdmi/Cargo.toml
+++ b/arm7tdmi/Cargo.toml
@@ -5,6 +5,11 @@ authors = ["Michel Heily <michelheily@gmail.com>"]
 edition = "2018"
 
 [dependencies]
+byteorder = "*"
 enum-primitive-derive = "^0.1"
 num-traits = "^0.1"
-bit = "^0.1"
\ No newline at end of file
+bit = "^0.1"
+
+[[bin]]
+name = "disass"
+path = "src/disass.rs"
\ No newline at end of file
diff --git a/src/disass.rs b/arm7tdmi/src/disass.rs
similarity index 100%
rename from src/disass.rs
rename to arm7tdmi/src/disass.rs