diff --git a/res/roms/test/parodius/cgb_sound/cgb_sound.gb b/res/roms/test/blargg/cgb_sound/cgb_sound.gb
similarity index 100%
rename from res/roms/test/parodius/cgb_sound/cgb_sound.gb
rename to res/roms/test/blargg/cgb_sound/cgb_sound.gb
diff --git a/res/roms/test/parodius/cpu/01-special.gb b/res/roms/test/blargg/cpu/01-special.gb
similarity index 100%
rename from res/roms/test/parodius/cpu/01-special.gb
rename to res/roms/test/blargg/cpu/01-special.gb
diff --git a/res/roms/test/parodius/cpu/02-interrupts.gb b/res/roms/test/blargg/cpu/02-interrupts.gb
similarity index 100%
rename from res/roms/test/parodius/cpu/02-interrupts.gb
rename to res/roms/test/blargg/cpu/02-interrupts.gb
diff --git a/res/roms/test/parodius/cpu/03-op sp,hl.gb b/res/roms/test/blargg/cpu/03-op sp,hl.gb
similarity index 100%
rename from res/roms/test/parodius/cpu/03-op sp,hl.gb
rename to res/roms/test/blargg/cpu/03-op sp,hl.gb
diff --git a/res/roms/test/parodius/cpu/04-op r,imm.gb b/res/roms/test/blargg/cpu/04-op r,imm.gb
similarity index 100%
rename from res/roms/test/parodius/cpu/04-op r,imm.gb
rename to res/roms/test/blargg/cpu/04-op r,imm.gb
diff --git a/res/roms/test/parodius/cpu/05-op rp.gb b/res/roms/test/blargg/cpu/05-op rp.gb
similarity index 100%
rename from res/roms/test/parodius/cpu/05-op rp.gb
rename to res/roms/test/blargg/cpu/05-op rp.gb
diff --git a/res/roms/test/parodius/cpu/06-ld r,r.gb b/res/roms/test/blargg/cpu/06-ld r,r.gb
similarity index 100%
rename from res/roms/test/parodius/cpu/06-ld r,r.gb
rename to res/roms/test/blargg/cpu/06-ld r,r.gb
diff --git a/res/roms/test/parodius/cpu/07-jr,jp,call,ret,rst.gb b/res/roms/test/blargg/cpu/07-jr,jp,call,ret,rst.gb
similarity index 100%
rename from res/roms/test/parodius/cpu/07-jr,jp,call,ret,rst.gb
rename to res/roms/test/blargg/cpu/07-jr,jp,call,ret,rst.gb
diff --git a/res/roms/test/parodius/cpu/08-misc instrs.gb b/res/roms/test/blargg/cpu/08-misc instrs.gb
similarity index 100%
rename from res/roms/test/parodius/cpu/08-misc instrs.gb
rename to res/roms/test/blargg/cpu/08-misc instrs.gb
diff --git a/res/roms/test/parodius/cpu/09-op r,r.gb b/res/roms/test/blargg/cpu/09-op r,r.gb
similarity index 100%
rename from res/roms/test/parodius/cpu/09-op r,r.gb
rename to res/roms/test/blargg/cpu/09-op r,r.gb
diff --git a/res/roms/test/parodius/cpu/10-bit ops.gb b/res/roms/test/blargg/cpu/10-bit ops.gb
similarity index 100%
rename from res/roms/test/parodius/cpu/10-bit ops.gb
rename to res/roms/test/blargg/cpu/10-bit ops.gb
diff --git a/res/roms/test/parodius/cpu/11-op a,(hl).gb b/res/roms/test/blargg/cpu/11-op a,(hl).gb
similarity index 100%
rename from res/roms/test/parodius/cpu/11-op a,(hl).gb
rename to res/roms/test/blargg/cpu/11-op a,(hl).gb
diff --git a/res/roms/test/parodius/cpu/cpu_instrs.gb b/res/roms/test/blargg/cpu/cpu_instrs.gb
similarity index 100%
rename from res/roms/test/parodius/cpu/cpu_instrs.gb
rename to res/roms/test/blargg/cpu/cpu_instrs.gb
diff --git a/res/roms/test/parodius/dmg_sound/dmg_sound.gb b/res/roms/test/blargg/dmg_sound/dmg_sound.gb
similarity index 100%
rename from res/roms/test/parodius/dmg_sound/dmg_sound.gb
rename to res/roms/test/blargg/dmg_sound/dmg_sound.gb
diff --git a/res/roms/test/parodius/halt_bug/halt_bug.gb b/res/roms/test/blargg/halt_bug/halt_bug.gb
similarity index 100%
rename from res/roms/test/parodius/halt_bug/halt_bug.gb
rename to res/roms/test/blargg/halt_bug/halt_bug.gb
diff --git a/res/roms/test/parodius/instr_timing/instr_timing.gb b/res/roms/test/blargg/instr_timing/instr_timing.gb
similarity index 100%
rename from res/roms/test/parodius/instr_timing/instr_timing.gb
rename to res/roms/test/blargg/instr_timing/instr_timing.gb
diff --git a/res/roms/test/parodius/interrupt_time/interrupt_time.gb b/res/roms/test/blargg/interrupt_time/interrupt_time.gb
similarity index 100%
rename from res/roms/test/parodius/interrupt_time/interrupt_time.gb
rename to res/roms/test/blargg/interrupt_time/interrupt_time.gb
diff --git a/res/roms/test/parodius/mem_timing-2/mem_timing.gb b/res/roms/test/blargg/mem_timing-2/mem_timing.gb
similarity index 100%
rename from res/roms/test/parodius/mem_timing-2/mem_timing.gb
rename to res/roms/test/blargg/mem_timing-2/mem_timing.gb
diff --git a/res/roms/test/parodius/mem_timing/mem_timing.gb b/res/roms/test/blargg/mem_timing/mem_timing.gb
similarity index 100%
rename from res/roms/test/parodius/mem_timing/mem_timing.gb
rename to res/roms/test/blargg/mem_timing/mem_timing.gb
diff --git a/res/roms/test/parodius/oam_bug/oam_bug.gb b/res/roms/test/blargg/oam_bug/oam_bug.gb
similarity index 100%
rename from res/roms/test/parodius/oam_bug/oam_bug.gb
rename to res/roms/test/blargg/oam_bug/oam_bug.gb