diff --git a/Makefile.gc b/Makefile.gc
index c574338..d5ed8ef 100644
--- a/Makefile.gc
+++ b/Makefile.gc
@@ -18,8 +18,8 @@ include $(DEVKITPPC)/gamecube_rules
 TARGET		:=	vba172_gc
 TARGETDIR   :=  executables
 BUILD		:=	build_gc
-SOURCES		:=	src/gb src src/fileio src/ngc
-INCLUDES 	:=  src/gb src src/fileio src/ngc
+SOURCES		:=	source/vba source/vba/gb source/ngc
+INCLUDES 	:=  source/vba source/vba/gb source/ngc
 
 #---------------------------------------------------------------------------------
 # options for code generation
diff --git a/Makefile.wii b/Makefile.wii
index 17c0ff8..b99897c 100644
--- a/Makefile.wii
+++ b/Makefile.wii
@@ -18,8 +18,8 @@ include $(DEVKITPPC)/wii_rules
 TARGET		:=	vba172_wii
 TARGETDIR   :=  executables
 BUILD		:=	build_wii
-SOURCES		:=	src/gb src src/fileio src/ngc
-INCLUDES 	:=  src/gb src src/fileio src/ngc
+SOURCES		:=	source/vba source/vba/gb source/ngc
+INCLUDES 	:=  source/vba source/vba/gb source/ngc
 
 #---------------------------------------------------------------------------------
 # options for code generation
diff --git a/src/ngc/gcpad.cpp b/source/ngc/gcpad.cpp
similarity index 100%
rename from src/ngc/gcpad.cpp
rename to source/ngc/gcpad.cpp
diff --git a/src/ngc/gcpad.h b/source/ngc/gcpad.h
similarity index 100%
rename from src/ngc/gcpad.h
rename to source/ngc/gcpad.h
diff --git a/src/ngc/gx_supp.c b/source/ngc/gx_supp.c
similarity index 100%
rename from src/ngc/gx_supp.c
rename to source/ngc/gx_supp.c
diff --git a/src/ngc/gx_supp.h b/source/ngc/gx_supp.h
similarity index 100%
rename from src/ngc/gx_supp.h
rename to source/ngc/gx_supp.h
diff --git a/src/ngc/main.c b/source/ngc/main.c
similarity index 100%
rename from src/ngc/main.c
rename to source/ngc/main.c
diff --git a/src/ngc/menu.cpp b/source/ngc/menu.cpp
similarity index 100%
rename from src/ngc/menu.cpp
rename to source/ngc/menu.cpp
diff --git a/src/ngc/mixer.cpp b/source/ngc/mixer.cpp
similarity index 100%
rename from src/ngc/mixer.cpp
rename to source/ngc/mixer.cpp
diff --git a/src/ngc/mixer.h b/source/ngc/mixer.h
similarity index 100%
rename from src/ngc/mixer.h
rename to source/ngc/mixer.h
diff --git a/src/ngc/pal60.h b/source/ngc/pal60.h
similarity index 100%
rename from src/ngc/pal60.h
rename to source/ngc/pal60.h
diff --git a/src/fileio/sdfileio.c b/source/ngc/sdfileio.c
similarity index 100%
rename from src/fileio/sdfileio.c
rename to source/ngc/sdfileio.c
diff --git a/src/fileio/sdfileio.h b/source/ngc/sdfileio.h
similarity index 100%
rename from src/fileio/sdfileio.h
rename to source/ngc/sdfileio.h
diff --git a/src/ngc/tbtime.c b/source/ngc/tbtime.c
similarity index 100%
rename from src/ngc/tbtime.c
rename to source/ngc/tbtime.c
diff --git a/src/ngc/tbtime.h b/source/ngc/tbtime.h
similarity index 100%
rename from src/ngc/tbtime.h
rename to source/ngc/tbtime.h
diff --git a/src/ngc/vba172.cpp b/source/ngc/vba172.cpp
similarity index 100%
rename from src/ngc/vba172.cpp
rename to source/ngc/vba172.cpp
diff --git a/src/ngc/vmmem.cpp b/source/ngc/vmmem.cpp
similarity index 100%
rename from src/ngc/vmmem.cpp
rename to source/ngc/vmmem.cpp
diff --git a/src/ngc/vmmem.h b/source/ngc/vmmem.h
similarity index 100%
rename from src/ngc/vmmem.h
rename to source/ngc/vmmem.h
diff --git a/src/CheatSearch.cpp b/source/vba/CheatSearch.cpp
similarity index 100%
rename from src/CheatSearch.cpp
rename to source/vba/CheatSearch.cpp
diff --git a/src/CheatSearch.h b/source/vba/CheatSearch.h
similarity index 100%
rename from src/CheatSearch.h
rename to source/vba/CheatSearch.h
diff --git a/src/Cheats.cpp b/source/vba/Cheats.cpp
similarity index 100%
rename from src/Cheats.cpp
rename to source/vba/Cheats.cpp
diff --git a/src/Cheats.h b/source/vba/Cheats.h
similarity index 100%
rename from src/Cheats.h
rename to source/vba/Cheats.h
diff --git a/src/EEprom.cpp b/source/vba/EEprom.cpp
similarity index 100%
rename from src/EEprom.cpp
rename to source/vba/EEprom.cpp
diff --git a/src/EEprom.h b/source/vba/EEprom.h
similarity index 100%
rename from src/EEprom.h
rename to source/vba/EEprom.h
diff --git a/src/Flash.cpp b/source/vba/Flash.cpp
similarity index 100%
rename from src/Flash.cpp
rename to source/vba/Flash.cpp
diff --git a/src/Flash.h b/source/vba/Flash.h
similarity index 100%
rename from src/Flash.h
rename to source/vba/Flash.h
diff --git a/src/GBA.cpp b/source/vba/GBA.cpp
similarity index 100%
rename from src/GBA.cpp
rename to source/vba/GBA.cpp
diff --git a/src/GBA.h b/source/vba/GBA.h
similarity index 100%
rename from src/GBA.h
rename to source/vba/GBA.h
diff --git a/src/GBAinline.h b/source/vba/GBAinline.h
similarity index 100%
rename from src/GBAinline.h
rename to source/vba/GBAinline.h
diff --git a/src/Gfx.cpp b/source/vba/Gfx.cpp
similarity index 100%
rename from src/Gfx.cpp
rename to source/vba/Gfx.cpp
diff --git a/src/Gfx.h b/source/vba/Gfx.h
similarity index 100%
rename from src/Gfx.h
rename to source/vba/Gfx.h
diff --git a/src/Globals.cpp b/source/vba/Globals.cpp
similarity index 100%
rename from src/Globals.cpp
rename to source/vba/Globals.cpp
diff --git a/src/Globals.h b/source/vba/Globals.h
similarity index 100%
rename from src/Globals.h
rename to source/vba/Globals.h
diff --git a/src/Mode0.cpp b/source/vba/Mode0.cpp
similarity index 100%
rename from src/Mode0.cpp
rename to source/vba/Mode0.cpp
diff --git a/src/Mode1.cpp b/source/vba/Mode1.cpp
similarity index 100%
rename from src/Mode1.cpp
rename to source/vba/Mode1.cpp
diff --git a/src/Mode2.cpp b/source/vba/Mode2.cpp
similarity index 100%
rename from src/Mode2.cpp
rename to source/vba/Mode2.cpp
diff --git a/src/Mode3.cpp b/source/vba/Mode3.cpp
similarity index 100%
rename from src/Mode3.cpp
rename to source/vba/Mode3.cpp
diff --git a/src/Mode4.cpp b/source/vba/Mode4.cpp
similarity index 100%
rename from src/Mode4.cpp
rename to source/vba/Mode4.cpp
diff --git a/src/Mode5.cpp b/source/vba/Mode5.cpp
similarity index 100%
rename from src/Mode5.cpp
rename to source/vba/Mode5.cpp
diff --git a/src/NLS.h b/source/vba/NLS.h
similarity index 100%
rename from src/NLS.h
rename to source/vba/NLS.h
diff --git a/src/Port.h b/source/vba/Port.h
similarity index 100%
rename from src/Port.h
rename to source/vba/Port.h
diff --git a/src/RTC.cpp b/source/vba/RTC.cpp
similarity index 100%
rename from src/RTC.cpp
rename to source/vba/RTC.cpp
diff --git a/src/RTC.h b/source/vba/RTC.h
similarity index 100%
rename from src/RTC.h
rename to source/vba/RTC.h
diff --git a/src/Sound.cpp b/source/vba/Sound.cpp
similarity index 100%
rename from src/Sound.cpp
rename to source/vba/Sound.cpp
diff --git a/src/Sound.h b/source/vba/Sound.h
similarity index 100%
rename from src/Sound.h
rename to source/vba/Sound.h
diff --git a/src/Sram.cpp b/source/vba/Sram.cpp
similarity index 100%
rename from src/Sram.cpp
rename to source/vba/Sram.cpp
diff --git a/src/Sram.h b/source/vba/Sram.h
similarity index 100%
rename from src/Sram.h
rename to source/vba/Sram.h
diff --git a/src/System.h b/source/vba/System.h
similarity index 100%
rename from src/System.h
rename to source/vba/System.h
diff --git a/src/Text.cpp b/source/vba/Text.cpp
similarity index 100%
rename from src/Text.cpp
rename to source/vba/Text.cpp
diff --git a/src/Text.h b/source/vba/Text.h
similarity index 100%
rename from src/Text.h
rename to source/vba/Text.h
diff --git a/src/Util.cpp b/source/vba/Util.cpp
similarity index 100%
rename from src/Util.cpp
rename to source/vba/Util.cpp
diff --git a/src/Util.h b/source/vba/Util.h
similarity index 100%
rename from src/Util.h
rename to source/vba/Util.h
diff --git a/src/admame.cpp b/source/vba/admame.cpp
similarity index 100%
rename from src/admame.cpp
rename to source/vba/admame.cpp
diff --git a/src/agbprint.cpp b/source/vba/agbprint.cpp
similarity index 100%
rename from src/agbprint.cpp
rename to source/vba/agbprint.cpp
diff --git a/src/agbprint.h b/source/vba/agbprint.h
similarity index 100%
rename from src/agbprint.h
rename to source/vba/agbprint.h
diff --git a/src/arm-new.h b/source/vba/arm-new.h
similarity index 100%
rename from src/arm-new.h
rename to source/vba/arm-new.h
diff --git a/src/armdis.cpp b/source/vba/armdis.cpp
similarity index 100%
rename from src/armdis.cpp
rename to source/vba/armdis.cpp
diff --git a/src/armdis.h b/source/vba/armdis.h
similarity index 100%
rename from src/armdis.h
rename to source/vba/armdis.h
diff --git a/src/bilinear.cpp b/source/vba/bilinear.cpp
similarity index 100%
rename from src/bilinear.cpp
rename to source/vba/bilinear.cpp
diff --git a/src/bios.cpp b/source/vba/bios.cpp
similarity index 100%
rename from src/bios.cpp
rename to source/vba/bios.cpp
diff --git a/src/bios.h b/source/vba/bios.h
similarity index 100%
rename from src/bios.h
rename to source/vba/bios.h
diff --git a/src/elf.cpp b/source/vba/elf.cpp
similarity index 100%
rename from src/elf.cpp
rename to source/vba/elf.cpp
diff --git a/src/elf.h b/source/vba/elf.h
similarity index 100%
rename from src/elf.h
rename to source/vba/elf.h
diff --git a/src/exprNode.h b/source/vba/exprNode.h
similarity index 100%
rename from src/exprNode.h
rename to source/vba/exprNode.h
diff --git a/src/gb/GB.cpp b/source/vba/gb/GB.cpp
similarity index 100%
rename from src/gb/GB.cpp
rename to source/vba/gb/GB.cpp
diff --git a/src/gb/GB.h b/source/vba/gb/GB.h
similarity index 100%
rename from src/gb/GB.h
rename to source/vba/gb/GB.h
diff --git a/src/gb/gbCheats.cpp b/source/vba/gb/gbCheats.cpp
similarity index 100%
rename from src/gb/gbCheats.cpp
rename to source/vba/gb/gbCheats.cpp
diff --git a/src/gb/gbCheats.h b/source/vba/gb/gbCheats.h
similarity index 100%
rename from src/gb/gbCheats.h
rename to source/vba/gb/gbCheats.h
diff --git a/src/gb/gbCodes.h b/source/vba/gb/gbCodes.h
similarity index 100%
rename from src/gb/gbCodes.h
rename to source/vba/gb/gbCodes.h
diff --git a/src/gb/gbCodesCB.h b/source/vba/gb/gbCodesCB.h
similarity index 100%
rename from src/gb/gbCodesCB.h
rename to source/vba/gb/gbCodesCB.h
diff --git a/src/gb/gbDis.cpp b/source/vba/gb/gbDis.cpp
similarity index 100%
rename from src/gb/gbDis.cpp
rename to source/vba/gb/gbDis.cpp
diff --git a/src/gb/gbGfx.cpp b/source/vba/gb/gbGfx.cpp
similarity index 100%
rename from src/gb/gbGfx.cpp
rename to source/vba/gb/gbGfx.cpp
diff --git a/src/gb/gbGlobals.cpp b/source/vba/gb/gbGlobals.cpp
similarity index 100%
rename from src/gb/gbGlobals.cpp
rename to source/vba/gb/gbGlobals.cpp
diff --git a/src/gb/gbGlobals.h b/source/vba/gb/gbGlobals.h
similarity index 100%
rename from src/gb/gbGlobals.h
rename to source/vba/gb/gbGlobals.h
diff --git a/src/gb/gbMemory.cpp b/source/vba/gb/gbMemory.cpp
similarity index 100%
rename from src/gb/gbMemory.cpp
rename to source/vba/gb/gbMemory.cpp
diff --git a/src/gb/gbMemory.h b/source/vba/gb/gbMemory.h
similarity index 100%
rename from src/gb/gbMemory.h
rename to source/vba/gb/gbMemory.h
diff --git a/src/gb/gbPrinter.cpp b/source/vba/gb/gbPrinter.cpp
similarity index 100%
rename from src/gb/gbPrinter.cpp
rename to source/vba/gb/gbPrinter.cpp
diff --git a/src/gb/gbPrinter.h b/source/vba/gb/gbPrinter.h
similarity index 100%
rename from src/gb/gbPrinter.h
rename to source/vba/gb/gbPrinter.h
diff --git a/src/gb/gbSGB.cpp b/source/vba/gb/gbSGB.cpp
similarity index 100%
rename from src/gb/gbSGB.cpp
rename to source/vba/gb/gbSGB.cpp
diff --git a/src/gb/gbSGB.h b/source/vba/gb/gbSGB.h
similarity index 100%
rename from src/gb/gbSGB.h
rename to source/vba/gb/gbSGB.h
diff --git a/src/gb/gbSound.cpp b/source/vba/gb/gbSound.cpp
similarity index 100%
rename from src/gb/gbSound.cpp
rename to source/vba/gb/gbSound.cpp
diff --git a/src/gb/gbSound.h b/source/vba/gb/gbSound.h
similarity index 100%
rename from src/gb/gbSound.h
rename to source/vba/gb/gbSound.h
diff --git a/src/getopt.c b/source/vba/getopt.c
similarity index 100%
rename from src/getopt.c
rename to source/vba/getopt.c
diff --git a/src/getopt.h b/source/vba/getopt.h
similarity index 100%
rename from src/getopt.h
rename to source/vba/getopt.h
diff --git a/src/getopt1.c b/source/vba/getopt1.c
similarity index 100%
rename from src/getopt1.c
rename to source/vba/getopt1.c
diff --git a/src/interframe.cpp b/source/vba/interframe.cpp
similarity index 100%
rename from src/interframe.cpp
rename to source/vba/interframe.cpp
diff --git a/src/interp.h b/source/vba/interp.h
similarity index 100%
rename from src/interp.h
rename to source/vba/interp.h
diff --git a/src/memgzio.c b/source/vba/memgzio.c
similarity index 100%
rename from src/memgzio.c
rename to source/vba/memgzio.c
diff --git a/src/memgzio.h b/source/vba/memgzio.h
similarity index 100%
rename from src/memgzio.h
rename to source/vba/memgzio.h
diff --git a/src/pixel.cpp b/source/vba/pixel.cpp
similarity index 100%
rename from src/pixel.cpp
rename to source/vba/pixel.cpp
diff --git a/src/scanline.cpp b/source/vba/scanline.cpp
similarity index 100%
rename from src/scanline.cpp
rename to source/vba/scanline.cpp
diff --git a/src/simple2x.cpp b/source/vba/simple2x.cpp
similarity index 100%
rename from src/simple2x.cpp
rename to source/vba/simple2x.cpp
diff --git a/src/thumb.h b/source/vba/thumb.h
similarity index 100%
rename from src/thumb.h
rename to source/vba/thumb.h
diff --git a/src/unzip.cpp b/source/vba/unzip.cpp
similarity index 100%
rename from src/unzip.cpp
rename to source/vba/unzip.cpp
diff --git a/src/unzip.h b/source/vba/unzip.h
similarity index 100%
rename from src/unzip.h
rename to source/vba/unzip.h
diff --git a/src/zutil.h b/source/vba/zutil.h
similarity index 100%
rename from src/zutil.h
rename to source/vba/zutil.h