diff --git a/tracker/.gitignore b/tracker/.gitignore
new file mode 100644
index 00000000..66f47f87
--- /dev/null
+++ b/tracker/.gitignore
@@ -0,0 +1 @@
+agb-*/Cargo.lock
diff --git a/agb-tracker-interop/Cargo.toml b/tracker/agb-tracker-interop/Cargo.toml
similarity index 100%
rename from agb-tracker-interop/Cargo.toml
rename to tracker/agb-tracker-interop/Cargo.toml
diff --git a/agb-tracker-interop/src/lib.rs b/tracker/agb-tracker-interop/src/lib.rs
similarity index 100%
rename from agb-tracker-interop/src/lib.rs
rename to tracker/agb-tracker-interop/src/lib.rs
diff --git a/agb-tracker/.cargo/config.toml b/tracker/agb-tracker/.cargo/config.toml
similarity index 100%
rename from agb-tracker/.cargo/config.toml
rename to tracker/agb-tracker/.cargo/config.toml
diff --git a/agb-tracker/Cargo.toml b/tracker/agb-tracker/Cargo.toml
similarity index 89%
rename from agb-tracker/Cargo.toml
rename to tracker/agb-tracker/Cargo.toml
index bb7c9851..d1d9d7d5 100644
--- a/agb-tracker/Cargo.toml
+++ b/tracker/agb-tracker/Cargo.toml
@@ -8,5 +8,5 @@ repository = "https://github.com/agbrs/agb"
 
 [dependencies]
 agb_xm = { version = "0.15.0", path = "../agb-xm" }
-agb = { version = "0.15.0", path = "../agb" }
+agb = { version = "0.15.0", path = "../../agb" }
 agb_tracker_interop = { version = "0.15.0", path = "../agb-tracker-interop", default-features = false }
\ No newline at end of file
diff --git a/agb-tracker/gba.ld b/tracker/agb-tracker/gba.ld
similarity index 100%
rename from agb-tracker/gba.ld
rename to tracker/agb-tracker/gba.ld
diff --git a/agb-tracker/rust-toolchain.toml b/tracker/agb-tracker/rust-toolchain.toml
similarity index 100%
rename from agb-tracker/rust-toolchain.toml
rename to tracker/agb-tracker/rust-toolchain.toml
diff --git a/agb-tracker/src/lib.rs b/tracker/agb-tracker/src/lib.rs
similarity index 100%
rename from agb-tracker/src/lib.rs
rename to tracker/agb-tracker/src/lib.rs
diff --git a/agb-xm/Cargo.toml b/tracker/agb-xm/Cargo.toml
similarity index 100%
rename from agb-xm/Cargo.toml
rename to tracker/agb-xm/Cargo.toml
diff --git a/agb-xm/src/lib.rs b/tracker/agb-xm/src/lib.rs
similarity index 100%
rename from agb-xm/src/lib.rs
rename to tracker/agb-xm/src/lib.rs