diff --git a/Cargo.toml b/Cargo.toml
index bf07c8c5..7da8fad1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,24 +1,24 @@
 [workspace]
 members = [
-  "crates/cpu_sm83",
   "crates/gb",
-  "crates/cartridge",
-  "crates/shared",
-  "crates/ppu",
-  "crates/apu",
-  "crates/gb_wasm",
+  "crates/gb_apu",
+  "crates/gb_cartridge",
   "crates/gb_console_log",
+  "crates/gb_cpu_sm83",
+  "crates/gb_ppu",
+  "crates/gb_shared",
+  "crates/gb_wasm",
 ]
 resolver = "2"
 
 [workspace.dependencies]
-gb_cpu_sm83 = { path = "crates/cpu_sm83" }
-gb_cartridge = { path = "crates/cartridge" }
-gb_console_log = { path = "crates/gb_console_log" }
-gb_ppu = { path = "crates/ppu" }
-gb_apu = { path = "crates/apu" }
-gb_shared = { path = "crates/shared" }
 gb = { path = "crates/gb" }
+gb_apu = { path = "crates/gb_apu" }
+gb_cartridge = { path = "crates/gb_cartridge" }
+gb_console_log = { path = "crates/gb_console_log" }
+gb_cpu_sm83 = { path = "crates/gb_cpu_sm83" }
+gb_ppu = { path = "crates/gb_ppu" }
+gb_shared = { path = "crates/gb_shared" }
 log = { version = "0.4.21" }
 anyhow = "1.0.82"
 mockall = "0.12.1"
diff --git a/crates/apu/Cargo.toml b/crates/gb_apu/Cargo.toml
similarity index 100%
rename from crates/apu/Cargo.toml
rename to crates/gb_apu/Cargo.toml
diff --git a/crates/apu/src/blipbuf.rs b/crates/gb_apu/src/blipbuf.rs
similarity index 100%
rename from crates/apu/src/blipbuf.rs
rename to crates/gb_apu/src/blipbuf.rs
diff --git a/crates/apu/src/channel/envelope.rs b/crates/gb_apu/src/channel/envelope.rs
similarity index 100%
rename from crates/apu/src/channel/envelope.rs
rename to crates/gb_apu/src/channel/envelope.rs
diff --git a/crates/apu/src/channel/frame_sequencer.rs b/crates/gb_apu/src/channel/frame_sequencer.rs
similarity index 100%
rename from crates/apu/src/channel/frame_sequencer.rs
rename to crates/gb_apu/src/channel/frame_sequencer.rs
diff --git a/crates/apu/src/channel/length_counter.rs b/crates/gb_apu/src/channel/length_counter.rs
similarity index 100%
rename from crates/apu/src/channel/length_counter.rs
rename to crates/gb_apu/src/channel/length_counter.rs
diff --git a/crates/apu/src/channel/mod.rs b/crates/gb_apu/src/channel/mod.rs
similarity index 100%
rename from crates/apu/src/channel/mod.rs
rename to crates/gb_apu/src/channel/mod.rs
diff --git a/crates/apu/src/channel/noise_channel.rs b/crates/gb_apu/src/channel/noise_channel.rs
similarity index 100%
rename from crates/apu/src/channel/noise_channel.rs
rename to crates/gb_apu/src/channel/noise_channel.rs
diff --git a/crates/apu/src/channel/pulse_channel.rs b/crates/gb_apu/src/channel/pulse_channel.rs
similarity index 100%
rename from crates/apu/src/channel/pulse_channel.rs
rename to crates/gb_apu/src/channel/pulse_channel.rs
diff --git a/crates/apu/src/channel/sweep.rs b/crates/gb_apu/src/channel/sweep.rs
similarity index 100%
rename from crates/apu/src/channel/sweep.rs
rename to crates/gb_apu/src/channel/sweep.rs
diff --git a/crates/apu/src/channel/wave_channel.rs b/crates/gb_apu/src/channel/wave_channel.rs
similarity index 100%
rename from crates/apu/src/channel/wave_channel.rs
rename to crates/gb_apu/src/channel/wave_channel.rs
diff --git a/crates/apu/src/clock.rs b/crates/gb_apu/src/clock.rs
similarity index 100%
rename from crates/apu/src/clock.rs
rename to crates/gb_apu/src/clock.rs
diff --git a/crates/apu/src/lib.rs b/crates/gb_apu/src/lib.rs
similarity index 100%
rename from crates/apu/src/lib.rs
rename to crates/gb_apu/src/lib.rs
diff --git a/crates/apu/src/utils.rs b/crates/gb_apu/src/utils.rs
similarity index 100%
rename from crates/apu/src/utils.rs
rename to crates/gb_apu/src/utils.rs
diff --git a/crates/cartridge/Cargo.toml b/crates/gb_cartridge/Cargo.toml
similarity index 100%
rename from crates/cartridge/Cargo.toml
rename to crates/gb_cartridge/Cargo.toml
diff --git a/crates/cartridge/src/lib.rs b/crates/gb_cartridge/src/lib.rs
similarity index 100%
rename from crates/cartridge/src/lib.rs
rename to crates/gb_cartridge/src/lib.rs
diff --git a/crates/cartridge/src/mbc/mbc1.rs b/crates/gb_cartridge/src/mbc/mbc1.rs
similarity index 100%
rename from crates/cartridge/src/mbc/mbc1.rs
rename to crates/gb_cartridge/src/mbc/mbc1.rs
diff --git a/crates/cartridge/src/mbc/mbc2.rs b/crates/gb_cartridge/src/mbc/mbc2.rs
similarity index 100%
rename from crates/cartridge/src/mbc/mbc2.rs
rename to crates/gb_cartridge/src/mbc/mbc2.rs
diff --git a/crates/cartridge/src/mbc/mbc3.rs b/crates/gb_cartridge/src/mbc/mbc3.rs
similarity index 100%
rename from crates/cartridge/src/mbc/mbc3.rs
rename to crates/gb_cartridge/src/mbc/mbc3.rs
diff --git a/crates/cartridge/src/mbc/mbc5.rs b/crates/gb_cartridge/src/mbc/mbc5.rs
similarity index 100%
rename from crates/cartridge/src/mbc/mbc5.rs
rename to crates/gb_cartridge/src/mbc/mbc5.rs
diff --git a/crates/cartridge/src/mbc/mbc_none.rs b/crates/gb_cartridge/src/mbc/mbc_none.rs
similarity index 100%
rename from crates/cartridge/src/mbc/mbc_none.rs
rename to crates/gb_cartridge/src/mbc/mbc_none.rs
diff --git a/crates/cartridge/src/mbc/mod.rs b/crates/gb_cartridge/src/mbc/mod.rs
similarity index 100%
rename from crates/cartridge/src/mbc/mod.rs
rename to crates/gb_cartridge/src/mbc/mod.rs
diff --git a/crates/cartridge/tests/cart_load.rs b/crates/gb_cartridge/tests/cart_load.rs
similarity index 100%
rename from crates/cartridge/tests/cart_load.rs
rename to crates/gb_cartridge/tests/cart_load.rs
diff --git a/crates/cpu_sm83/Cargo.toml b/crates/gb_cpu_sm83/Cargo.toml
similarity index 100%
rename from crates/cpu_sm83/Cargo.toml
rename to crates/gb_cpu_sm83/Cargo.toml
diff --git a/crates/cpu_sm83/src/alu/adc.rs b/crates/gb_cpu_sm83/src/alu/adc.rs
similarity index 100%
rename from crates/cpu_sm83/src/alu/adc.rs
rename to crates/gb_cpu_sm83/src/alu/adc.rs
diff --git a/crates/cpu_sm83/src/alu/add.rs b/crates/gb_cpu_sm83/src/alu/add.rs
similarity index 100%
rename from crates/cpu_sm83/src/alu/add.rs
rename to crates/gb_cpu_sm83/src/alu/add.rs
diff --git a/crates/cpu_sm83/src/alu/and.rs b/crates/gb_cpu_sm83/src/alu/and.rs
similarity index 100%
rename from crates/cpu_sm83/src/alu/and.rs
rename to crates/gb_cpu_sm83/src/alu/and.rs
diff --git a/crates/cpu_sm83/src/alu/bit.rs b/crates/gb_cpu_sm83/src/alu/bit.rs
similarity index 100%
rename from crates/cpu_sm83/src/alu/bit.rs
rename to crates/gb_cpu_sm83/src/alu/bit.rs
diff --git a/crates/cpu_sm83/src/alu/cp.rs b/crates/gb_cpu_sm83/src/alu/cp.rs
similarity index 100%
rename from crates/cpu_sm83/src/alu/cp.rs
rename to crates/gb_cpu_sm83/src/alu/cp.rs
diff --git a/crates/cpu_sm83/src/alu/daa.rs b/crates/gb_cpu_sm83/src/alu/daa.rs
similarity index 100%
rename from crates/cpu_sm83/src/alu/daa.rs
rename to crates/gb_cpu_sm83/src/alu/daa.rs
diff --git a/crates/cpu_sm83/src/alu/dec.rs b/crates/gb_cpu_sm83/src/alu/dec.rs
similarity index 100%
rename from crates/cpu_sm83/src/alu/dec.rs
rename to crates/gb_cpu_sm83/src/alu/dec.rs
diff --git a/crates/cpu_sm83/src/alu/inc.rs b/crates/gb_cpu_sm83/src/alu/inc.rs
similarity index 100%
rename from crates/cpu_sm83/src/alu/inc.rs
rename to crates/gb_cpu_sm83/src/alu/inc.rs
diff --git a/crates/cpu_sm83/src/alu/mod.rs b/crates/gb_cpu_sm83/src/alu/mod.rs
similarity index 100%
rename from crates/cpu_sm83/src/alu/mod.rs
rename to crates/gb_cpu_sm83/src/alu/mod.rs
diff --git a/crates/cpu_sm83/src/alu/or.rs b/crates/gb_cpu_sm83/src/alu/or.rs
similarity index 100%
rename from crates/cpu_sm83/src/alu/or.rs
rename to crates/gb_cpu_sm83/src/alu/or.rs
diff --git a/crates/cpu_sm83/src/alu/res.rs b/crates/gb_cpu_sm83/src/alu/res.rs
similarity index 100%
rename from crates/cpu_sm83/src/alu/res.rs
rename to crates/gb_cpu_sm83/src/alu/res.rs
diff --git a/crates/cpu_sm83/src/alu/rl.rs b/crates/gb_cpu_sm83/src/alu/rl.rs
similarity index 100%
rename from crates/cpu_sm83/src/alu/rl.rs
rename to crates/gb_cpu_sm83/src/alu/rl.rs
diff --git a/crates/cpu_sm83/src/alu/rlc.rs b/crates/gb_cpu_sm83/src/alu/rlc.rs
similarity index 100%
rename from crates/cpu_sm83/src/alu/rlc.rs
rename to crates/gb_cpu_sm83/src/alu/rlc.rs
diff --git a/crates/cpu_sm83/src/alu/rr.rs b/crates/gb_cpu_sm83/src/alu/rr.rs
similarity index 100%
rename from crates/cpu_sm83/src/alu/rr.rs
rename to crates/gb_cpu_sm83/src/alu/rr.rs
diff --git a/crates/cpu_sm83/src/alu/rrc.rs b/crates/gb_cpu_sm83/src/alu/rrc.rs
similarity index 100%
rename from crates/cpu_sm83/src/alu/rrc.rs
rename to crates/gb_cpu_sm83/src/alu/rrc.rs
diff --git a/crates/cpu_sm83/src/alu/sbc.rs b/crates/gb_cpu_sm83/src/alu/sbc.rs
similarity index 100%
rename from crates/cpu_sm83/src/alu/sbc.rs
rename to crates/gb_cpu_sm83/src/alu/sbc.rs
diff --git a/crates/cpu_sm83/src/alu/set.rs b/crates/gb_cpu_sm83/src/alu/set.rs
similarity index 100%
rename from crates/cpu_sm83/src/alu/set.rs
rename to crates/gb_cpu_sm83/src/alu/set.rs
diff --git a/crates/cpu_sm83/src/alu/sla.rs b/crates/gb_cpu_sm83/src/alu/sla.rs
similarity index 100%
rename from crates/cpu_sm83/src/alu/sla.rs
rename to crates/gb_cpu_sm83/src/alu/sla.rs
diff --git a/crates/cpu_sm83/src/alu/sra.rs b/crates/gb_cpu_sm83/src/alu/sra.rs
similarity index 100%
rename from crates/cpu_sm83/src/alu/sra.rs
rename to crates/gb_cpu_sm83/src/alu/sra.rs
diff --git a/crates/cpu_sm83/src/alu/srl.rs b/crates/gb_cpu_sm83/src/alu/srl.rs
similarity index 100%
rename from crates/cpu_sm83/src/alu/srl.rs
rename to crates/gb_cpu_sm83/src/alu/srl.rs
diff --git a/crates/cpu_sm83/src/alu/sub.rs b/crates/gb_cpu_sm83/src/alu/sub.rs
similarity index 100%
rename from crates/cpu_sm83/src/alu/sub.rs
rename to crates/gb_cpu_sm83/src/alu/sub.rs
diff --git a/crates/cpu_sm83/src/alu/swap.rs b/crates/gb_cpu_sm83/src/alu/swap.rs
similarity index 100%
rename from crates/cpu_sm83/src/alu/swap.rs
rename to crates/gb_cpu_sm83/src/alu/swap.rs
diff --git a/crates/cpu_sm83/src/alu/xor.rs b/crates/gb_cpu_sm83/src/alu/xor.rs
similarity index 100%
rename from crates/cpu_sm83/src/alu/xor.rs
rename to crates/gb_cpu_sm83/src/alu/xor.rs
diff --git a/crates/cpu_sm83/src/interrupt.rs b/crates/gb_cpu_sm83/src/interrupt.rs
similarity index 100%
rename from crates/cpu_sm83/src/interrupt.rs
rename to crates/gb_cpu_sm83/src/interrupt.rs
diff --git a/crates/cpu_sm83/src/lib.rs b/crates/gb_cpu_sm83/src/lib.rs
similarity index 100%
rename from crates/cpu_sm83/src/lib.rs
rename to crates/gb_cpu_sm83/src/lib.rs
diff --git a/crates/cpu_sm83/src/proc/cb.rs b/crates/gb_cpu_sm83/src/proc/cb.rs
similarity index 100%
rename from crates/cpu_sm83/src/proc/cb.rs
rename to crates/gb_cpu_sm83/src/proc/cb.rs
diff --git a/crates/cpu_sm83/src/proc/mod.rs b/crates/gb_cpu_sm83/src/proc/mod.rs
similarity index 100%
rename from crates/cpu_sm83/src/proc/mod.rs
rename to crates/gb_cpu_sm83/src/proc/mod.rs
diff --git a/crates/ppu/Cargo.toml b/crates/gb_ppu/Cargo.toml
similarity index 100%
rename from crates/ppu/Cargo.toml
rename to crates/gb_ppu/Cargo.toml
diff --git a/crates/ppu/src/config.rs b/crates/gb_ppu/src/config.rs
similarity index 100%
rename from crates/ppu/src/config.rs
rename to crates/gb_ppu/src/config.rs
diff --git a/crates/ppu/src/lcd.rs b/crates/gb_ppu/src/lcd.rs
similarity index 100%
rename from crates/ppu/src/lcd.rs
rename to crates/gb_ppu/src/lcd.rs
diff --git a/crates/ppu/src/lib.rs b/crates/gb_ppu/src/lib.rs
similarity index 100%
rename from crates/ppu/src/lib.rs
rename to crates/gb_ppu/src/lib.rs
diff --git a/crates/ppu/src/object.rs b/crates/gb_ppu/src/object.rs
similarity index 100%
rename from crates/ppu/src/object.rs
rename to crates/gb_ppu/src/object.rs
diff --git a/crates/ppu/src/palette/compatibility_palettes.rs b/crates/gb_ppu/src/palette/compatibility_palettes.rs
similarity index 100%
rename from crates/ppu/src/palette/compatibility_palettes.rs
rename to crates/gb_ppu/src/palette/compatibility_palettes.rs
diff --git a/crates/ppu/src/palette/mod.rs b/crates/gb_ppu/src/palette/mod.rs
similarity index 100%
rename from crates/ppu/src/palette/mod.rs
rename to crates/gb_ppu/src/palette/mod.rs
diff --git a/crates/ppu/src/tile.rs b/crates/gb_ppu/src/tile.rs
similarity index 100%
rename from crates/ppu/src/tile.rs
rename to crates/gb_ppu/src/tile.rs
diff --git a/crates/ppu/src/vram.rs b/crates/gb_ppu/src/vram.rs
similarity index 100%
rename from crates/ppu/src/vram.rs
rename to crates/gb_ppu/src/vram.rs
diff --git a/crates/shared/Cargo.toml b/crates/gb_shared/Cargo.toml
similarity index 100%
rename from crates/shared/Cargo.toml
rename to crates/gb_shared/Cargo.toml
diff --git a/crates/shared/src/bitwise.rs b/crates/gb_shared/src/bitwise.rs
similarity index 100%
rename from crates/shared/src/bitwise.rs
rename to crates/gb_shared/src/bitwise.rs
diff --git a/crates/shared/src/boxed.rs b/crates/gb_shared/src/boxed.rs
similarity index 100%
rename from crates/shared/src/boxed.rs
rename to crates/gb_shared/src/boxed.rs
diff --git a/crates/shared/src/command.rs b/crates/gb_shared/src/command.rs
similarity index 100%
rename from crates/shared/src/command.rs
rename to crates/gb_shared/src/command.rs
diff --git a/crates/shared/src/lib.rs b/crates/gb_shared/src/lib.rs
similarity index 100%
rename from crates/shared/src/lib.rs
rename to crates/gb_shared/src/lib.rs