diff --git a/source/vba/dmg/gb_apu/Blip_Buffer.cpp b/source/vba/gb_apu/Blip_Buffer.cpp
similarity index 100%
rename from source/vba/dmg/gb_apu/Blip_Buffer.cpp
rename to source/vba/gb_apu/Blip_Buffer.cpp
diff --git a/source/vba/dmg/gb_apu/Blip_Buffer.h b/source/vba/gb_apu/Blip_Buffer.h
similarity index 100%
rename from source/vba/dmg/gb_apu/Blip_Buffer.h
rename to source/vba/gb_apu/Blip_Buffer.h
diff --git a/source/vba/dmg/gb_apu/Effects_Buffer.cpp b/source/vba/gb_apu/Effects_Buffer.cpp
similarity index 100%
rename from source/vba/dmg/gb_apu/Effects_Buffer.cpp
rename to source/vba/gb_apu/Effects_Buffer.cpp
diff --git a/source/vba/dmg/gb_apu/Effects_Buffer.h b/source/vba/gb_apu/Effects_Buffer.h
similarity index 100%
rename from source/vba/dmg/gb_apu/Effects_Buffer.h
rename to source/vba/gb_apu/Effects_Buffer.h
diff --git a/source/vba/dmg/gb_apu/Gb_Apu.cpp b/source/vba/gb_apu/Gb_Apu.cpp
similarity index 100%
rename from source/vba/dmg/gb_apu/Gb_Apu.cpp
rename to source/vba/gb_apu/Gb_Apu.cpp
diff --git a/source/vba/dmg/gb_apu/Gb_Apu.h b/source/vba/gb_apu/Gb_Apu.h
similarity index 100%
rename from source/vba/dmg/gb_apu/Gb_Apu.h
rename to source/vba/gb_apu/Gb_Apu.h
diff --git a/source/vba/dmg/gb_apu/Gb_Apu_State.cpp b/source/vba/gb_apu/Gb_Apu_State.cpp
similarity index 100%
rename from source/vba/dmg/gb_apu/Gb_Apu_State.cpp
rename to source/vba/gb_apu/Gb_Apu_State.cpp
diff --git a/source/vba/dmg/gb_apu/Gb_Oscs.cpp b/source/vba/gb_apu/Gb_Oscs.cpp
similarity index 100%
rename from source/vba/dmg/gb_apu/Gb_Oscs.cpp
rename to source/vba/gb_apu/Gb_Oscs.cpp
diff --git a/source/vba/dmg/gb_apu/Gb_Oscs.h b/source/vba/gb_apu/Gb_Oscs.h
similarity index 100%
rename from source/vba/dmg/gb_apu/Gb_Oscs.h
rename to source/vba/gb_apu/Gb_Oscs.h
diff --git a/source/vba/dmg/gb_apu/Multi_Buffer.cpp b/source/vba/gb_apu/Multi_Buffer.cpp
similarity index 100%
rename from source/vba/dmg/gb_apu/Multi_Buffer.cpp
rename to source/vba/gb_apu/Multi_Buffer.cpp
diff --git a/source/vba/dmg/gb_apu/Multi_Buffer.h b/source/vba/gb_apu/Multi_Buffer.h
similarity index 100%
rename from source/vba/dmg/gb_apu/Multi_Buffer.h
rename to source/vba/gb_apu/Multi_Buffer.h
diff --git a/source/vba/dmg/gb_apu/blargg_common.h b/source/vba/gb_apu/blargg_common.h
similarity index 100%
rename from source/vba/dmg/gb_apu/blargg_common.h
rename to source/vba/gb_apu/blargg_common.h
diff --git a/source/vba/dmg/gb_apu/blargg_config.h b/source/vba/gb_apu/blargg_config.h
similarity index 100%
rename from source/vba/dmg/gb_apu/blargg_config.h
rename to source/vba/gb_apu/blargg_config.h
diff --git a/source/vba/dmg/gb_apu/blargg_source.h b/source/vba/gb_apu/blargg_source.h
similarity index 100%
rename from source/vba/dmg/gb_apu/blargg_source.h
rename to source/vba/gb_apu/blargg_source.h
diff --git a/source/vba/agb/CheatSearch.cpp b/source/vba/gba/CheatSearch.cpp
similarity index 100%
rename from source/vba/agb/CheatSearch.cpp
rename to source/vba/gba/CheatSearch.cpp
diff --git a/source/vba/agb/CheatSearch.h b/source/vba/gba/CheatSearch.h
similarity index 100%
rename from source/vba/agb/CheatSearch.h
rename to source/vba/gba/CheatSearch.h
diff --git a/source/vba/agb/Cheats.cpp b/source/vba/gba/Cheats.cpp
similarity index 100%
rename from source/vba/agb/Cheats.cpp
rename to source/vba/gba/Cheats.cpp
diff --git a/source/vba/agb/Cheats.h b/source/vba/gba/Cheats.h
similarity index 100%
rename from source/vba/agb/Cheats.h
rename to source/vba/gba/Cheats.h
diff --git a/source/vba/agb/EEprom.cpp b/source/vba/gba/EEprom.cpp
similarity index 100%
rename from source/vba/agb/EEprom.cpp
rename to source/vba/gba/EEprom.cpp
diff --git a/source/vba/agb/EEprom.h b/source/vba/gba/EEprom.h
similarity index 100%
rename from source/vba/agb/EEprom.h
rename to source/vba/gba/EEprom.h
diff --git a/source/vba/agb/Flash.cpp b/source/vba/gba/Flash.cpp
similarity index 100%
rename from source/vba/agb/Flash.cpp
rename to source/vba/gba/Flash.cpp
diff --git a/source/vba/agb/Flash.h b/source/vba/gba/Flash.h
similarity index 100%
rename from source/vba/agb/Flash.h
rename to source/vba/gba/Flash.h
diff --git a/source/vba/agb/GBA-arm.cpp b/source/vba/gba/GBA-arm.cpp
similarity index 100%
rename from source/vba/agb/GBA-arm.cpp
rename to source/vba/gba/GBA-arm.cpp
diff --git a/source/vba/agb/GBA-thumb.cpp b/source/vba/gba/GBA-thumb.cpp
similarity index 100%
rename from source/vba/agb/GBA-thumb.cpp
rename to source/vba/gba/GBA-thumb.cpp
diff --git a/source/vba/agb/GBA.cpp b/source/vba/gba/GBA.cpp
similarity index 100%
rename from source/vba/agb/GBA.cpp
rename to source/vba/gba/GBA.cpp
diff --git a/source/vba/agb/GBA.h b/source/vba/gba/GBA.h
similarity index 100%
rename from source/vba/agb/GBA.h
rename to source/vba/gba/GBA.h
diff --git a/source/vba/agb/GBAGfx.cpp b/source/vba/gba/GBAGfx.cpp
similarity index 100%
rename from source/vba/agb/GBAGfx.cpp
rename to source/vba/gba/GBAGfx.cpp
diff --git a/source/vba/agb/GBAGfx.h b/source/vba/gba/GBAGfx.h
similarity index 100%
rename from source/vba/agb/GBAGfx.h
rename to source/vba/gba/GBAGfx.h
diff --git a/source/vba/agb/GBAcpu.h b/source/vba/gba/GBAcpu.h
similarity index 100%
rename from source/vba/agb/GBAcpu.h
rename to source/vba/gba/GBAcpu.h
diff --git a/source/vba/agb/GBAinline.h b/source/vba/gba/GBAinline.h
similarity index 100%
rename from source/vba/agb/GBAinline.h
rename to source/vba/gba/GBAinline.h
diff --git a/source/vba/agb/Globals.cpp b/source/vba/gba/Globals.cpp
similarity index 100%
rename from source/vba/agb/Globals.cpp
rename to source/vba/gba/Globals.cpp
diff --git a/source/vba/agb/Globals.h b/source/vba/gba/Globals.h
similarity index 100%
rename from source/vba/agb/Globals.h
rename to source/vba/gba/Globals.h
diff --git a/source/vba/agb/Mode0.cpp b/source/vba/gba/Mode0.cpp
similarity index 100%
rename from source/vba/agb/Mode0.cpp
rename to source/vba/gba/Mode0.cpp
diff --git a/source/vba/agb/Mode1.cpp b/source/vba/gba/Mode1.cpp
similarity index 100%
rename from source/vba/agb/Mode1.cpp
rename to source/vba/gba/Mode1.cpp
diff --git a/source/vba/agb/Mode2.cpp b/source/vba/gba/Mode2.cpp
similarity index 100%
rename from source/vba/agb/Mode2.cpp
rename to source/vba/gba/Mode2.cpp
diff --git a/source/vba/agb/Mode3.cpp b/source/vba/gba/Mode3.cpp
similarity index 100%
rename from source/vba/agb/Mode3.cpp
rename to source/vba/gba/Mode3.cpp
diff --git a/source/vba/agb/Mode4.cpp b/source/vba/gba/Mode4.cpp
similarity index 100%
rename from source/vba/agb/Mode4.cpp
rename to source/vba/gba/Mode4.cpp
diff --git a/source/vba/agb/Mode5.cpp b/source/vba/gba/Mode5.cpp
similarity index 100%
rename from source/vba/agb/Mode5.cpp
rename to source/vba/gba/Mode5.cpp
diff --git a/source/vba/agb/RTC.cpp b/source/vba/gba/RTC.cpp
similarity index 100%
rename from source/vba/agb/RTC.cpp
rename to source/vba/gba/RTC.cpp
diff --git a/source/vba/agb/RTC.h b/source/vba/gba/RTC.h
similarity index 100%
rename from source/vba/agb/RTC.h
rename to source/vba/gba/RTC.h
diff --git a/source/vba/agb/Sound.cpp b/source/vba/gba/Sound.cpp
similarity index 100%
rename from source/vba/agb/Sound.cpp
rename to source/vba/gba/Sound.cpp
diff --git a/source/vba/agb/Sound.h b/source/vba/gba/Sound.h
similarity index 100%
rename from source/vba/agb/Sound.h
rename to source/vba/gba/Sound.h
diff --git a/source/vba/agb/Sram.cpp b/source/vba/gba/Sram.cpp
similarity index 100%
rename from source/vba/agb/Sram.cpp
rename to source/vba/gba/Sram.cpp
diff --git a/source/vba/agb/Sram.h b/source/vba/gba/Sram.h
similarity index 100%
rename from source/vba/agb/Sram.h
rename to source/vba/gba/Sram.h
diff --git a/source/vba/agb/agbprint.cpp b/source/vba/gba/agbprint.cpp
similarity index 100%
rename from source/vba/agb/agbprint.cpp
rename to source/vba/gba/agbprint.cpp
diff --git a/source/vba/agb/agbprint.h b/source/vba/gba/agbprint.h
similarity index 100%
rename from source/vba/agb/agbprint.h
rename to source/vba/gba/agbprint.h
diff --git a/source/vba/agb/armdis.cpp b/source/vba/gba/armdis.cpp
similarity index 100%
rename from source/vba/agb/armdis.cpp
rename to source/vba/gba/armdis.cpp
diff --git a/source/vba/agb/armdis.h b/source/vba/gba/armdis.h
similarity index 100%
rename from source/vba/agb/armdis.h
rename to source/vba/gba/armdis.h
diff --git a/source/vba/agb/bios.cpp b/source/vba/gba/bios.cpp
similarity index 100%
rename from source/vba/agb/bios.cpp
rename to source/vba/gba/bios.cpp
diff --git a/source/vba/agb/bios.h b/source/vba/gba/bios.h
similarity index 100%
rename from source/vba/agb/bios.h
rename to source/vba/gba/bios.h
diff --git a/source/vba/agb/elf.cpp b/source/vba/gba/elf.cpp
similarity index 100%
rename from source/vba/agb/elf.cpp
rename to source/vba/gba/elf.cpp
diff --git a/source/vba/agb/elf.h b/source/vba/gba/elf.h
similarity index 100%
rename from source/vba/agb/elf.h
rename to source/vba/gba/elf.h