diff --git a/bsnes-debugger.exe b/bsnes-debugger.exe
index 273b7fcb..74db5e30 100644
Binary files a/bsnes-debugger.exe and b/bsnes-debugger.exe differ
diff --git a/bsnes.exe b/bsnes.exe
index d887ed94..e1d520eb 100644
Binary files a/bsnes.exe and b/bsnes.exe differ
diff --git a/snesfilter.dll b/snesfilter.dll
index cd250ff8..3fb59fcd 100644
Binary files a/snesfilter.dll and b/snesfilter.dll differ
diff --git a/snesreader.dll b/snesreader.dll
index 82c010a3..aa55db0f 100644
Binary files a/snesreader.dll and b/snesreader.dll differ
diff --git a/bsnes/Makefile b/src/Makefile
similarity index 100%
rename from bsnes/Makefile
rename to src/Makefile
diff --git a/bsnes/base.hpp b/src/base.hpp
similarity index 96%
rename from bsnes/base.hpp
rename to src/base.hpp
index 3784c2b2..94d81e69 100644
--- a/bsnes/base.hpp
+++ b/src/base.hpp
@@ -1,4 +1,4 @@
-static const char bsnesVersion[] = "061";
+static const char bsnesVersion[] = "061.01";
 static const char bsnesTitle[] = "bsnes";
 static const unsigned bsnesSerializerVersion = 5;
 
diff --git a/bsnes/cartridge/cartridge.cpp b/src/cartridge/cartridge.cpp
similarity index 100%
rename from bsnes/cartridge/cartridge.cpp
rename to src/cartridge/cartridge.cpp
diff --git a/bsnes/cartridge/cartridge.hpp b/src/cartridge/cartridge.hpp
similarity index 100%
rename from bsnes/cartridge/cartridge.hpp
rename to src/cartridge/cartridge.hpp
diff --git a/bsnes/cartridge/serialization.cpp b/src/cartridge/serialization.cpp
similarity index 100%
rename from bsnes/cartridge/serialization.cpp
rename to src/cartridge/serialization.cpp
diff --git a/bsnes/cartridge/xml.cpp b/src/cartridge/xml.cpp
similarity index 99%
rename from bsnes/cartridge/xml.cpp
rename to src/cartridge/xml.cpp
index 46e30101..d75cd811 100644
--- a/bsnes/cartridge/xml.cpp
+++ b/src/cartridge/xml.cpp
@@ -1,6 +1,7 @@
 #ifdef CARTRIDGE_CPP
 
 void Cartridge::parse_xml(const lstring &list) {
+  mapping.reset();
   parse_xml_cartridge(list[0]);
 
   if(mode == Mode::BsxSlotted) {
diff --git a/bsnes/cc.bat b/src/cc.bat
similarity index 100%
rename from bsnes/cc.bat
rename to src/cc.bat
diff --git a/bsnes/cheat/cheat-inline.hpp b/src/cheat/cheat-inline.hpp
similarity index 100%
rename from bsnes/cheat/cheat-inline.hpp
rename to src/cheat/cheat-inline.hpp
diff --git a/bsnes/cheat/cheat.cpp b/src/cheat/cheat.cpp
similarity index 100%
rename from bsnes/cheat/cheat.cpp
rename to src/cheat/cheat.cpp
diff --git a/bsnes/cheat/cheat.hpp b/src/cheat/cheat.hpp
similarity index 100%
rename from bsnes/cheat/cheat.hpp
rename to src/cheat/cheat.hpp
diff --git a/bsnes/chip/bsx/bsx.cpp b/src/chip/bsx/bsx.cpp
similarity index 100%
rename from bsnes/chip/bsx/bsx.cpp
rename to src/chip/bsx/bsx.cpp
diff --git a/bsnes/chip/bsx/bsx.hpp b/src/chip/bsx/bsx.hpp
similarity index 100%
rename from bsnes/chip/bsx/bsx.hpp
rename to src/chip/bsx/bsx.hpp
diff --git a/bsnes/chip/bsx/bsx_base.cpp b/src/chip/bsx/bsx_base.cpp
similarity index 100%
rename from bsnes/chip/bsx/bsx_base.cpp
rename to src/chip/bsx/bsx_base.cpp
diff --git a/bsnes/chip/bsx/bsx_cart.cpp b/src/chip/bsx/bsx_cart.cpp
similarity index 100%
rename from bsnes/chip/bsx/bsx_cart.cpp
rename to src/chip/bsx/bsx_cart.cpp
diff --git a/bsnes/chip/bsx/bsx_flash.cpp b/src/chip/bsx/bsx_flash.cpp
similarity index 100%
rename from bsnes/chip/bsx/bsx_flash.cpp
rename to src/chip/bsx/bsx_flash.cpp
diff --git a/bsnes/chip/chip.hpp b/src/chip/chip.hpp
similarity index 100%
rename from bsnes/chip/chip.hpp
rename to src/chip/chip.hpp
diff --git a/bsnes/chip/cx4/cx4.cpp b/src/chip/cx4/cx4.cpp
similarity index 100%
rename from bsnes/chip/cx4/cx4.cpp
rename to src/chip/cx4/cx4.cpp
diff --git a/bsnes/chip/cx4/cx4.hpp b/src/chip/cx4/cx4.hpp
similarity index 100%
rename from bsnes/chip/cx4/cx4.hpp
rename to src/chip/cx4/cx4.hpp
diff --git a/bsnes/chip/cx4/data.cpp b/src/chip/cx4/data.cpp
similarity index 100%
rename from bsnes/chip/cx4/data.cpp
rename to src/chip/cx4/data.cpp
diff --git a/bsnes/chip/cx4/functions.cpp b/src/chip/cx4/functions.cpp
similarity index 100%
rename from bsnes/chip/cx4/functions.cpp
rename to src/chip/cx4/functions.cpp
diff --git a/bsnes/chip/cx4/oam.cpp b/src/chip/cx4/oam.cpp
similarity index 100%
rename from bsnes/chip/cx4/oam.cpp
rename to src/chip/cx4/oam.cpp
diff --git a/bsnes/chip/cx4/opcodes.cpp b/src/chip/cx4/opcodes.cpp
similarity index 100%
rename from bsnes/chip/cx4/opcodes.cpp
rename to src/chip/cx4/opcodes.cpp
diff --git a/bsnes/chip/cx4/serialization.cpp b/src/chip/cx4/serialization.cpp
similarity index 100%
rename from bsnes/chip/cx4/serialization.cpp
rename to src/chip/cx4/serialization.cpp
diff --git a/bsnes/chip/dsp1/dsp1.cpp b/src/chip/dsp1/dsp1.cpp
similarity index 100%
rename from bsnes/chip/dsp1/dsp1.cpp
rename to src/chip/dsp1/dsp1.cpp
diff --git a/bsnes/chip/dsp1/dsp1.hpp b/src/chip/dsp1/dsp1.hpp
similarity index 100%
rename from bsnes/chip/dsp1/dsp1.hpp
rename to src/chip/dsp1/dsp1.hpp
diff --git a/bsnes/chip/dsp1/dsp1emu.cpp b/src/chip/dsp1/dsp1emu.cpp
similarity index 100%
rename from bsnes/chip/dsp1/dsp1emu.cpp
rename to src/chip/dsp1/dsp1emu.cpp
diff --git a/bsnes/chip/dsp1/dsp1emu.hpp b/src/chip/dsp1/dsp1emu.hpp
similarity index 100%
rename from bsnes/chip/dsp1/dsp1emu.hpp
rename to src/chip/dsp1/dsp1emu.hpp
diff --git a/bsnes/chip/dsp1/serialization.cpp b/src/chip/dsp1/serialization.cpp
similarity index 100%
rename from bsnes/chip/dsp1/serialization.cpp
rename to src/chip/dsp1/serialization.cpp
diff --git a/bsnes/chip/dsp2/dsp2.cpp b/src/chip/dsp2/dsp2.cpp
similarity index 100%
rename from bsnes/chip/dsp2/dsp2.cpp
rename to src/chip/dsp2/dsp2.cpp
diff --git a/bsnes/chip/dsp2/dsp2.hpp b/src/chip/dsp2/dsp2.hpp
similarity index 100%
rename from bsnes/chip/dsp2/dsp2.hpp
rename to src/chip/dsp2/dsp2.hpp
diff --git a/bsnes/chip/dsp2/opcodes.cpp b/src/chip/dsp2/opcodes.cpp
similarity index 100%
rename from bsnes/chip/dsp2/opcodes.cpp
rename to src/chip/dsp2/opcodes.cpp
diff --git a/bsnes/chip/dsp2/serialization.cpp b/src/chip/dsp2/serialization.cpp
similarity index 100%
rename from bsnes/chip/dsp2/serialization.cpp
rename to src/chip/dsp2/serialization.cpp
diff --git a/bsnes/chip/dsp3/dsp3.cpp b/src/chip/dsp3/dsp3.cpp
similarity index 100%
rename from bsnes/chip/dsp3/dsp3.cpp
rename to src/chip/dsp3/dsp3.cpp
diff --git a/bsnes/chip/dsp3/dsp3.hpp b/src/chip/dsp3/dsp3.hpp
similarity index 100%
rename from bsnes/chip/dsp3/dsp3.hpp
rename to src/chip/dsp3/dsp3.hpp
diff --git a/bsnes/chip/dsp3/dsp3emu.c b/src/chip/dsp3/dsp3emu.c
similarity index 100%
rename from bsnes/chip/dsp3/dsp3emu.c
rename to src/chip/dsp3/dsp3emu.c
diff --git a/bsnes/chip/dsp4/dsp4.cpp b/src/chip/dsp4/dsp4.cpp
similarity index 100%
rename from bsnes/chip/dsp4/dsp4.cpp
rename to src/chip/dsp4/dsp4.cpp
diff --git a/bsnes/chip/dsp4/dsp4.hpp b/src/chip/dsp4/dsp4.hpp
similarity index 100%
rename from bsnes/chip/dsp4/dsp4.hpp
rename to src/chip/dsp4/dsp4.hpp
diff --git a/bsnes/chip/dsp4/dsp4emu.c b/src/chip/dsp4/dsp4emu.c
similarity index 100%
rename from bsnes/chip/dsp4/dsp4emu.c
rename to src/chip/dsp4/dsp4emu.c
diff --git a/bsnes/chip/dsp4/dsp4emu.h b/src/chip/dsp4/dsp4emu.h
similarity index 100%
rename from bsnes/chip/dsp4/dsp4emu.h
rename to src/chip/dsp4/dsp4emu.h
diff --git a/bsnes/chip/msu1/msu1.cpp b/src/chip/msu1/msu1.cpp
similarity index 100%
rename from bsnes/chip/msu1/msu1.cpp
rename to src/chip/msu1/msu1.cpp
diff --git a/bsnes/chip/msu1/msu1.hpp b/src/chip/msu1/msu1.hpp
similarity index 100%
rename from bsnes/chip/msu1/msu1.hpp
rename to src/chip/msu1/msu1.hpp
diff --git a/bsnes/chip/msu1/serialization.cpp b/src/chip/msu1/serialization.cpp
similarity index 100%
rename from bsnes/chip/msu1/serialization.cpp
rename to src/chip/msu1/serialization.cpp
diff --git a/bsnes/chip/obc1/obc1.cpp b/src/chip/obc1/obc1.cpp
similarity index 100%
rename from bsnes/chip/obc1/obc1.cpp
rename to src/chip/obc1/obc1.cpp
diff --git a/bsnes/chip/obc1/obc1.hpp b/src/chip/obc1/obc1.hpp
similarity index 100%
rename from bsnes/chip/obc1/obc1.hpp
rename to src/chip/obc1/obc1.hpp
diff --git a/bsnes/chip/obc1/serialization.cpp b/src/chip/obc1/serialization.cpp
similarity index 100%
rename from bsnes/chip/obc1/serialization.cpp
rename to src/chip/obc1/serialization.cpp
diff --git a/bsnes/chip/sa1/bus/bus.cpp b/src/chip/sa1/bus/bus.cpp
similarity index 100%
rename from bsnes/chip/sa1/bus/bus.cpp
rename to src/chip/sa1/bus/bus.cpp
diff --git a/bsnes/chip/sa1/bus/bus.hpp b/src/chip/sa1/bus/bus.hpp
similarity index 100%
rename from bsnes/chip/sa1/bus/bus.hpp
rename to src/chip/sa1/bus/bus.hpp
diff --git a/bsnes/chip/sa1/dma/dma.cpp b/src/chip/sa1/dma/dma.cpp
similarity index 100%
rename from bsnes/chip/sa1/dma/dma.cpp
rename to src/chip/sa1/dma/dma.cpp
diff --git a/bsnes/chip/sa1/dma/dma.hpp b/src/chip/sa1/dma/dma.hpp
similarity index 100%
rename from bsnes/chip/sa1/dma/dma.hpp
rename to src/chip/sa1/dma/dma.hpp
diff --git a/bsnes/chip/sa1/memory/memory.cpp b/src/chip/sa1/memory/memory.cpp
similarity index 100%
rename from bsnes/chip/sa1/memory/memory.cpp
rename to src/chip/sa1/memory/memory.cpp
diff --git a/bsnes/chip/sa1/memory/memory.hpp b/src/chip/sa1/memory/memory.hpp
similarity index 100%
rename from bsnes/chip/sa1/memory/memory.hpp
rename to src/chip/sa1/memory/memory.hpp
diff --git a/bsnes/chip/sa1/mmio/mmio.cpp b/src/chip/sa1/mmio/mmio.cpp
similarity index 100%
rename from bsnes/chip/sa1/mmio/mmio.cpp
rename to src/chip/sa1/mmio/mmio.cpp
diff --git a/bsnes/chip/sa1/mmio/mmio.hpp b/src/chip/sa1/mmio/mmio.hpp
similarity index 100%
rename from bsnes/chip/sa1/mmio/mmio.hpp
rename to src/chip/sa1/mmio/mmio.hpp
diff --git a/bsnes/chip/sa1/sa1.cpp b/src/chip/sa1/sa1.cpp
similarity index 100%
rename from bsnes/chip/sa1/sa1.cpp
rename to src/chip/sa1/sa1.cpp
diff --git a/bsnes/chip/sa1/sa1.hpp b/src/chip/sa1/sa1.hpp
similarity index 100%
rename from bsnes/chip/sa1/sa1.hpp
rename to src/chip/sa1/sa1.hpp
diff --git a/bsnes/chip/sa1/serialization.cpp b/src/chip/sa1/serialization.cpp
similarity index 100%
rename from bsnes/chip/sa1/serialization.cpp
rename to src/chip/sa1/serialization.cpp
diff --git a/bsnes/chip/sdd1/sdd1.cpp b/src/chip/sdd1/sdd1.cpp
similarity index 100%
rename from bsnes/chip/sdd1/sdd1.cpp
rename to src/chip/sdd1/sdd1.cpp
diff --git a/bsnes/chip/sdd1/sdd1.hpp b/src/chip/sdd1/sdd1.hpp
similarity index 100%
rename from bsnes/chip/sdd1/sdd1.hpp
rename to src/chip/sdd1/sdd1.hpp
diff --git a/bsnes/chip/sdd1/sdd1emu.cpp b/src/chip/sdd1/sdd1emu.cpp
similarity index 100%
rename from bsnes/chip/sdd1/sdd1emu.cpp
rename to src/chip/sdd1/sdd1emu.cpp
diff --git a/bsnes/chip/sdd1/sdd1emu.hpp b/src/chip/sdd1/sdd1emu.hpp
similarity index 100%
rename from bsnes/chip/sdd1/sdd1emu.hpp
rename to src/chip/sdd1/sdd1emu.hpp
diff --git a/bsnes/chip/sdd1/serialization.cpp b/src/chip/sdd1/serialization.cpp
similarity index 100%
rename from bsnes/chip/sdd1/serialization.cpp
rename to src/chip/sdd1/serialization.cpp
diff --git a/bsnes/chip/spc7110/decomp.cpp b/src/chip/spc7110/decomp.cpp
similarity index 100%
rename from bsnes/chip/spc7110/decomp.cpp
rename to src/chip/spc7110/decomp.cpp
diff --git a/bsnes/chip/spc7110/decomp.hpp b/src/chip/spc7110/decomp.hpp
similarity index 100%
rename from bsnes/chip/spc7110/decomp.hpp
rename to src/chip/spc7110/decomp.hpp
diff --git a/bsnes/chip/spc7110/serialization.cpp b/src/chip/spc7110/serialization.cpp
similarity index 100%
rename from bsnes/chip/spc7110/serialization.cpp
rename to src/chip/spc7110/serialization.cpp
diff --git a/bsnes/chip/spc7110/spc7110.cpp b/src/chip/spc7110/spc7110.cpp
similarity index 100%
rename from bsnes/chip/spc7110/spc7110.cpp
rename to src/chip/spc7110/spc7110.cpp
diff --git a/bsnes/chip/spc7110/spc7110.hpp b/src/chip/spc7110/spc7110.hpp
similarity index 100%
rename from bsnes/chip/spc7110/spc7110.hpp
rename to src/chip/spc7110/spc7110.hpp
diff --git a/bsnes/chip/srtc/serialization.cpp b/src/chip/srtc/serialization.cpp
similarity index 100%
rename from bsnes/chip/srtc/serialization.cpp
rename to src/chip/srtc/serialization.cpp
diff --git a/bsnes/chip/srtc/srtc.cpp b/src/chip/srtc/srtc.cpp
similarity index 100%
rename from bsnes/chip/srtc/srtc.cpp
rename to src/chip/srtc/srtc.cpp
diff --git a/bsnes/chip/srtc/srtc.hpp b/src/chip/srtc/srtc.hpp
similarity index 100%
rename from bsnes/chip/srtc/srtc.hpp
rename to src/chip/srtc/srtc.hpp
diff --git a/bsnes/chip/st0010/data.hpp b/src/chip/st0010/data.hpp
similarity index 100%
rename from bsnes/chip/st0010/data.hpp
rename to src/chip/st0010/data.hpp
diff --git a/bsnes/chip/st0010/opcodes.cpp b/src/chip/st0010/opcodes.cpp
similarity index 100%
rename from bsnes/chip/st0010/opcodes.cpp
rename to src/chip/st0010/opcodes.cpp
diff --git a/bsnes/chip/st0010/serialization.cpp b/src/chip/st0010/serialization.cpp
similarity index 100%
rename from bsnes/chip/st0010/serialization.cpp
rename to src/chip/st0010/serialization.cpp
diff --git a/bsnes/chip/st0010/st0010.cpp b/src/chip/st0010/st0010.cpp
similarity index 100%
rename from bsnes/chip/st0010/st0010.cpp
rename to src/chip/st0010/st0010.cpp
diff --git a/bsnes/chip/st0010/st0010.hpp b/src/chip/st0010/st0010.hpp
similarity index 100%
rename from bsnes/chip/st0010/st0010.hpp
rename to src/chip/st0010/st0010.hpp
diff --git a/bsnes/chip/st0011/st0011.cpp b/src/chip/st0011/st0011.cpp
similarity index 100%
rename from bsnes/chip/st0011/st0011.cpp
rename to src/chip/st0011/st0011.cpp
diff --git a/bsnes/chip/st0011/st0011.hpp b/src/chip/st0011/st0011.hpp
similarity index 100%
rename from bsnes/chip/st0011/st0011.hpp
rename to src/chip/st0011/st0011.hpp
diff --git a/bsnes/chip/st0018/st0018.cpp b/src/chip/st0018/st0018.cpp
similarity index 100%
rename from bsnes/chip/st0018/st0018.cpp
rename to src/chip/st0018/st0018.cpp
diff --git a/bsnes/chip/st0018/st0018.hpp b/src/chip/st0018/st0018.hpp
similarity index 100%
rename from bsnes/chip/st0018/st0018.hpp
rename to src/chip/st0018/st0018.hpp
diff --git a/bsnes/chip/superfx/bus/bus.cpp b/src/chip/superfx/bus/bus.cpp
similarity index 100%
rename from bsnes/chip/superfx/bus/bus.cpp
rename to src/chip/superfx/bus/bus.cpp
diff --git a/bsnes/chip/superfx/bus/bus.hpp b/src/chip/superfx/bus/bus.hpp
similarity index 100%
rename from bsnes/chip/superfx/bus/bus.hpp
rename to src/chip/superfx/bus/bus.hpp
diff --git a/bsnes/chip/superfx/core/core.cpp b/src/chip/superfx/core/core.cpp
similarity index 100%
rename from bsnes/chip/superfx/core/core.cpp
rename to src/chip/superfx/core/core.cpp
diff --git a/bsnes/chip/superfx/core/core.hpp b/src/chip/superfx/core/core.hpp
similarity index 100%
rename from bsnes/chip/superfx/core/core.hpp
rename to src/chip/superfx/core/core.hpp
diff --git a/bsnes/chip/superfx/core/opcode_table.cpp b/src/chip/superfx/core/opcode_table.cpp
similarity index 100%
rename from bsnes/chip/superfx/core/opcode_table.cpp
rename to src/chip/superfx/core/opcode_table.cpp
diff --git a/bsnes/chip/superfx/core/opcodes.cpp b/src/chip/superfx/core/opcodes.cpp
similarity index 100%
rename from bsnes/chip/superfx/core/opcodes.cpp
rename to src/chip/superfx/core/opcodes.cpp
diff --git a/bsnes/chip/superfx/core/registers.hpp b/src/chip/superfx/core/registers.hpp
similarity index 100%
rename from bsnes/chip/superfx/core/registers.hpp
rename to src/chip/superfx/core/registers.hpp
diff --git a/bsnes/chip/superfx/disasm/disasm.cpp b/src/chip/superfx/disasm/disasm.cpp
similarity index 100%
rename from bsnes/chip/superfx/disasm/disasm.cpp
rename to src/chip/superfx/disasm/disasm.cpp
diff --git a/bsnes/chip/superfx/disasm/disasm.hpp b/src/chip/superfx/disasm/disasm.hpp
similarity index 100%
rename from bsnes/chip/superfx/disasm/disasm.hpp
rename to src/chip/superfx/disasm/disasm.hpp
diff --git a/bsnes/chip/superfx/memory/memory.cpp b/src/chip/superfx/memory/memory.cpp
similarity index 100%
rename from bsnes/chip/superfx/memory/memory.cpp
rename to src/chip/superfx/memory/memory.cpp
diff --git a/bsnes/chip/superfx/memory/memory.hpp b/src/chip/superfx/memory/memory.hpp
similarity index 100%
rename from bsnes/chip/superfx/memory/memory.hpp
rename to src/chip/superfx/memory/memory.hpp
diff --git a/bsnes/chip/superfx/mmio/mmio.cpp b/src/chip/superfx/mmio/mmio.cpp
similarity index 100%
rename from bsnes/chip/superfx/mmio/mmio.cpp
rename to src/chip/superfx/mmio/mmio.cpp
diff --git a/bsnes/chip/superfx/mmio/mmio.hpp b/src/chip/superfx/mmio/mmio.hpp
similarity index 100%
rename from bsnes/chip/superfx/mmio/mmio.hpp
rename to src/chip/superfx/mmio/mmio.hpp
diff --git a/bsnes/chip/superfx/serialization.cpp b/src/chip/superfx/serialization.cpp
similarity index 100%
rename from bsnes/chip/superfx/serialization.cpp
rename to src/chip/superfx/serialization.cpp
diff --git a/bsnes/chip/superfx/superfx.cpp b/src/chip/superfx/superfx.cpp
similarity index 100%
rename from bsnes/chip/superfx/superfx.cpp
rename to src/chip/superfx/superfx.cpp
diff --git a/bsnes/chip/superfx/superfx.hpp b/src/chip/superfx/superfx.hpp
similarity index 100%
rename from bsnes/chip/superfx/superfx.hpp
rename to src/chip/superfx/superfx.hpp
diff --git a/bsnes/chip/superfx/timing/timing.cpp b/src/chip/superfx/timing/timing.cpp
similarity index 100%
rename from bsnes/chip/superfx/timing/timing.cpp
rename to src/chip/superfx/timing/timing.cpp
diff --git a/bsnes/chip/superfx/timing/timing.hpp b/src/chip/superfx/timing/timing.hpp
similarity index 100%
rename from bsnes/chip/superfx/timing/timing.hpp
rename to src/chip/superfx/timing/timing.hpp
diff --git a/bsnes/chip/supergameboy/serialization.cpp b/src/chip/supergameboy/serialization.cpp
similarity index 100%
rename from bsnes/chip/supergameboy/serialization.cpp
rename to src/chip/supergameboy/serialization.cpp
diff --git a/bsnes/chip/supergameboy/supergameboy.cpp b/src/chip/supergameboy/supergameboy.cpp
similarity index 100%
rename from bsnes/chip/supergameboy/supergameboy.cpp
rename to src/chip/supergameboy/supergameboy.cpp
diff --git a/bsnes/chip/supergameboy/supergameboy.hpp b/src/chip/supergameboy/supergameboy.hpp
similarity index 100%
rename from bsnes/chip/supergameboy/supergameboy.hpp
rename to src/chip/supergameboy/supergameboy.hpp
diff --git a/bsnes/clean.bat b/src/clean.bat
similarity index 100%
rename from bsnes/clean.bat
rename to src/clean.bat
diff --git a/bsnes/cpu/core/algorithms.cpp b/src/cpu/core/algorithms.cpp
similarity index 100%
rename from bsnes/cpu/core/algorithms.cpp
rename to src/cpu/core/algorithms.cpp
diff --git a/bsnes/cpu/core/core.cpp b/src/cpu/core/core.cpp
similarity index 100%
rename from bsnes/cpu/core/core.cpp
rename to src/cpu/core/core.cpp
diff --git a/bsnes/cpu/core/core.hpp b/src/cpu/core/core.hpp
similarity index 100%
rename from bsnes/cpu/core/core.hpp
rename to src/cpu/core/core.hpp
diff --git a/bsnes/cpu/core/disassembler/disassembler.cpp b/src/cpu/core/disassembler/disassembler.cpp
similarity index 100%
rename from bsnes/cpu/core/disassembler/disassembler.cpp
rename to src/cpu/core/disassembler/disassembler.cpp
diff --git a/bsnes/cpu/core/disassembler/disassembler.hpp b/src/cpu/core/disassembler/disassembler.hpp
similarity index 100%
rename from bsnes/cpu/core/disassembler/disassembler.hpp
rename to src/cpu/core/disassembler/disassembler.hpp
diff --git a/bsnes/cpu/core/memory.hpp b/src/cpu/core/memory.hpp
similarity index 100%
rename from bsnes/cpu/core/memory.hpp
rename to src/cpu/core/memory.hpp
diff --git a/bsnes/cpu/core/opcode_misc.cpp b/src/cpu/core/opcode_misc.cpp
similarity index 100%
rename from bsnes/cpu/core/opcode_misc.cpp
rename to src/cpu/core/opcode_misc.cpp
diff --git a/bsnes/cpu/core/opcode_pc.cpp b/src/cpu/core/opcode_pc.cpp
similarity index 100%
rename from bsnes/cpu/core/opcode_pc.cpp
rename to src/cpu/core/opcode_pc.cpp
diff --git a/bsnes/cpu/core/opcode_read.cpp b/src/cpu/core/opcode_read.cpp
similarity index 100%
rename from bsnes/cpu/core/opcode_read.cpp
rename to src/cpu/core/opcode_read.cpp
diff --git a/bsnes/cpu/core/opcode_rmw.cpp b/src/cpu/core/opcode_rmw.cpp
similarity index 100%
rename from bsnes/cpu/core/opcode_rmw.cpp
rename to src/cpu/core/opcode_rmw.cpp
diff --git a/bsnes/cpu/core/opcode_write.cpp b/src/cpu/core/opcode_write.cpp
similarity index 100%
rename from bsnes/cpu/core/opcode_write.cpp
rename to src/cpu/core/opcode_write.cpp
diff --git a/bsnes/cpu/core/registers.hpp b/src/cpu/core/registers.hpp
similarity index 100%
rename from bsnes/cpu/core/registers.hpp
rename to src/cpu/core/registers.hpp
diff --git a/bsnes/cpu/core/serialization.cpp b/src/cpu/core/serialization.cpp
similarity index 100%
rename from bsnes/cpu/core/serialization.cpp
rename to src/cpu/core/serialization.cpp
diff --git a/bsnes/cpu/core/table.cpp b/src/cpu/core/table.cpp
similarity index 100%
rename from bsnes/cpu/core/table.cpp
rename to src/cpu/core/table.cpp
diff --git a/bsnes/cpu/cpu-debugger.cpp b/src/cpu/cpu-debugger.cpp
similarity index 100%
rename from bsnes/cpu/cpu-debugger.cpp
rename to src/cpu/cpu-debugger.cpp
diff --git a/bsnes/cpu/cpu-debugger.hpp b/src/cpu/cpu-debugger.hpp
similarity index 100%
rename from bsnes/cpu/cpu-debugger.hpp
rename to src/cpu/cpu-debugger.hpp
diff --git a/bsnes/cpu/cpu.cpp b/src/cpu/cpu.cpp
similarity index 100%
rename from bsnes/cpu/cpu.cpp
rename to src/cpu/cpu.cpp
diff --git a/bsnes/cpu/cpu.hpp b/src/cpu/cpu.hpp
similarity index 100%
rename from bsnes/cpu/cpu.hpp
rename to src/cpu/cpu.hpp
diff --git a/bsnes/cpu/scpu/debugger/debugger.cpp b/src/cpu/scpu/debugger/debugger.cpp
similarity index 100%
rename from bsnes/cpu/scpu/debugger/debugger.cpp
rename to src/cpu/scpu/debugger/debugger.cpp
diff --git a/bsnes/cpu/scpu/debugger/debugger.hpp b/src/cpu/scpu/debugger/debugger.hpp
similarity index 100%
rename from bsnes/cpu/scpu/debugger/debugger.hpp
rename to src/cpu/scpu/debugger/debugger.hpp
diff --git a/bsnes/cpu/scpu/dma/dma.cpp b/src/cpu/scpu/dma/dma.cpp
similarity index 100%
rename from bsnes/cpu/scpu/dma/dma.cpp
rename to src/cpu/scpu/dma/dma.cpp
diff --git a/bsnes/cpu/scpu/dma/dma.hpp b/src/cpu/scpu/dma/dma.hpp
similarity index 100%
rename from bsnes/cpu/scpu/dma/dma.hpp
rename to src/cpu/scpu/dma/dma.hpp
diff --git a/bsnes/cpu/scpu/memory/memory.cpp b/src/cpu/scpu/memory/memory.cpp
similarity index 100%
rename from bsnes/cpu/scpu/memory/memory.cpp
rename to src/cpu/scpu/memory/memory.cpp
diff --git a/bsnes/cpu/scpu/memory/memory.hpp b/src/cpu/scpu/memory/memory.hpp
similarity index 100%
rename from bsnes/cpu/scpu/memory/memory.hpp
rename to src/cpu/scpu/memory/memory.hpp
diff --git a/bsnes/cpu/scpu/mmio/mmio.cpp b/src/cpu/scpu/mmio/mmio.cpp
similarity index 100%
rename from bsnes/cpu/scpu/mmio/mmio.cpp
rename to src/cpu/scpu/mmio/mmio.cpp
diff --git a/bsnes/cpu/scpu/mmio/mmio.hpp b/src/cpu/scpu/mmio/mmio.hpp
similarity index 100%
rename from bsnes/cpu/scpu/mmio/mmio.hpp
rename to src/cpu/scpu/mmio/mmio.hpp
diff --git a/bsnes/cpu/scpu/scpu.cpp b/src/cpu/scpu/scpu.cpp
similarity index 100%
rename from bsnes/cpu/scpu/scpu.cpp
rename to src/cpu/scpu/scpu.cpp
diff --git a/bsnes/cpu/scpu/scpu.hpp b/src/cpu/scpu/scpu.hpp
similarity index 100%
rename from bsnes/cpu/scpu/scpu.hpp
rename to src/cpu/scpu/scpu.hpp
diff --git a/bsnes/cpu/scpu/serialization.cpp b/src/cpu/scpu/serialization.cpp
similarity index 100%
rename from bsnes/cpu/scpu/serialization.cpp
rename to src/cpu/scpu/serialization.cpp
diff --git a/bsnes/cpu/scpu/timing/event.cpp b/src/cpu/scpu/timing/event.cpp
similarity index 100%
rename from bsnes/cpu/scpu/timing/event.cpp
rename to src/cpu/scpu/timing/event.cpp
diff --git a/bsnes/cpu/scpu/timing/irq.cpp b/src/cpu/scpu/timing/irq.cpp
similarity index 100%
rename from bsnes/cpu/scpu/timing/irq.cpp
rename to src/cpu/scpu/timing/irq.cpp
diff --git a/bsnes/cpu/scpu/timing/joypad.cpp b/src/cpu/scpu/timing/joypad.cpp
similarity index 100%
rename from bsnes/cpu/scpu/timing/joypad.cpp
rename to src/cpu/scpu/timing/joypad.cpp
diff --git a/bsnes/cpu/scpu/timing/timing.cpp b/src/cpu/scpu/timing/timing.cpp
similarity index 100%
rename from bsnes/cpu/scpu/timing/timing.cpp
rename to src/cpu/scpu/timing/timing.cpp
diff --git a/bsnes/cpu/scpu/timing/timing.hpp b/src/cpu/scpu/timing/timing.hpp
similarity index 100%
rename from bsnes/cpu/scpu/timing/timing.hpp
rename to src/cpu/scpu/timing/timing.hpp
diff --git a/bsnes/data/bsnes.Manifest b/src/data/bsnes.Manifest
similarity index 100%
rename from bsnes/data/bsnes.Manifest
rename to src/data/bsnes.Manifest
diff --git a/bsnes/data/bsnes.desktop b/src/data/bsnes.desktop
similarity index 100%
rename from bsnes/data/bsnes.desktop
rename to src/data/bsnes.desktop
diff --git a/bsnes/data/bsnes.ico b/src/data/bsnes.ico
similarity index 100%
rename from bsnes/data/bsnes.ico
rename to src/data/bsnes.ico
diff --git a/bsnes/data/bsnes.png b/src/data/bsnes.png
similarity index 100%
rename from bsnes/data/bsnes.png
rename to src/data/bsnes.png
diff --git a/bsnes/data/cheats.xml b/src/data/cheats.xml
similarity index 100%
rename from bsnes/data/cheats.xml
rename to src/data/cheats.xml
diff --git a/bsnes/data/documentation.html b/src/data/documentation.html
similarity index 100%
rename from bsnes/data/documentation.html
rename to src/data/documentation.html
diff --git a/bsnes/data/icons-16x16/accessories-text-editor.png b/src/data/icons-16x16/accessories-text-editor.png
similarity index 100%
rename from bsnes/data/icons-16x16/accessories-text-editor.png
rename to src/data/icons-16x16/accessories-text-editor.png
diff --git a/bsnes/data/icons-16x16/applications-multimedia.png b/src/data/icons-16x16/applications-multimedia.png
similarity index 100%
rename from bsnes/data/icons-16x16/applications-multimedia.png
rename to src/data/icons-16x16/applications-multimedia.png
diff --git a/bsnes/data/icons-16x16/appointment-new.png b/src/data/icons-16x16/appointment-new.png
similarity index 100%
rename from bsnes/data/icons-16x16/appointment-new.png
rename to src/data/icons-16x16/appointment-new.png
diff --git a/bsnes/data/icons-16x16/audio-volume-high.png b/src/data/icons-16x16/audio-volume-high.png
similarity index 100%
rename from bsnes/data/icons-16x16/audio-volume-high.png
rename to src/data/icons-16x16/audio-volume-high.png
diff --git a/bsnes/data/icons-16x16/document-open.png b/src/data/icons-16x16/document-open.png
similarity index 100%
rename from bsnes/data/icons-16x16/document-open.png
rename to src/data/icons-16x16/document-open.png
diff --git a/bsnes/data/icons-16x16/folder-new.png b/src/data/icons-16x16/folder-new.png
similarity index 100%
rename from bsnes/data/icons-16x16/folder-new.png
rename to src/data/icons-16x16/folder-new.png
diff --git a/bsnes/data/icons-16x16/folder.png b/src/data/icons-16x16/folder.png
similarity index 100%
rename from bsnes/data/icons-16x16/folder.png
rename to src/data/icons-16x16/folder.png
diff --git a/bsnes/data/icons-16x16/go-up.png b/src/data/icons-16x16/go-up.png
similarity index 100%
rename from bsnes/data/icons-16x16/go-up.png
rename to src/data/icons-16x16/go-up.png
diff --git a/bsnes/data/icons-16x16/help-browser.png b/src/data/icons-16x16/help-browser.png
similarity index 100%
rename from bsnes/data/icons-16x16/help-browser.png
rename to src/data/icons-16x16/help-browser.png
diff --git a/bsnes/data/icons-16x16/image-x-generic.png b/src/data/icons-16x16/image-x-generic.png
similarity index 100%
rename from bsnes/data/icons-16x16/image-x-generic.png
rename to src/data/icons-16x16/image-x-generic.png
diff --git a/bsnes/data/icons-16x16/input-gaming.png b/src/data/icons-16x16/input-gaming.png
similarity index 100%
rename from bsnes/data/icons-16x16/input-gaming.png
rename to src/data/icons-16x16/input-gaming.png
diff --git a/bsnes/data/icons-16x16/item-check-off.png b/src/data/icons-16x16/item-check-off.png
similarity index 100%
rename from bsnes/data/icons-16x16/item-check-off.png
rename to src/data/icons-16x16/item-check-off.png
diff --git a/bsnes/data/icons-16x16/item-check-on.png b/src/data/icons-16x16/item-check-on.png
similarity index 100%
rename from bsnes/data/icons-16x16/item-check-on.png
rename to src/data/icons-16x16/item-check-on.png
diff --git a/bsnes/data/icons-16x16/item-radio-off.png b/src/data/icons-16x16/item-radio-off.png
similarity index 100%
rename from bsnes/data/icons-16x16/item-radio-off.png
rename to src/data/icons-16x16/item-radio-off.png
diff --git a/bsnes/data/icons-16x16/item-radio-on.png b/src/data/icons-16x16/item-radio-on.png
similarity index 100%
rename from bsnes/data/icons-16x16/item-radio-on.png
rename to src/data/icons-16x16/item-radio-on.png
diff --git a/bsnes/data/icons-16x16/media-playback-start.png b/src/data/icons-16x16/media-playback-start.png
similarity index 100%
rename from bsnes/data/icons-16x16/media-playback-start.png
rename to src/data/icons-16x16/media-playback-start.png
diff --git a/bsnes/data/icons-16x16/media-playback-stop.png b/src/data/icons-16x16/media-playback-stop.png
similarity index 100%
rename from bsnes/data/icons-16x16/media-playback-stop.png
rename to src/data/icons-16x16/media-playback-stop.png
diff --git a/bsnes/data/icons-16x16/media-record.png b/src/data/icons-16x16/media-record.png
similarity index 100%
rename from bsnes/data/icons-16x16/media-record.png
rename to src/data/icons-16x16/media-record.png
diff --git a/bsnes/data/icons-16x16/preferences-desktop.png b/src/data/icons-16x16/preferences-desktop.png
similarity index 100%
rename from bsnes/data/icons-16x16/preferences-desktop.png
rename to src/data/icons-16x16/preferences-desktop.png
diff --git a/bsnes/data/icons-16x16/preferences-system.png b/src/data/icons-16x16/preferences-system.png
similarity index 100%
rename from bsnes/data/icons-16x16/preferences-system.png
rename to src/data/icons-16x16/preferences-system.png
diff --git a/bsnes/data/icons-16x16/process-stop.png b/src/data/icons-16x16/process-stop.png
similarity index 100%
rename from bsnes/data/icons-16x16/process-stop.png
rename to src/data/icons-16x16/process-stop.png
diff --git a/bsnes/data/icons-16x16/system-file-manager.png b/src/data/icons-16x16/system-file-manager.png
similarity index 100%
rename from bsnes/data/icons-16x16/system-file-manager.png
rename to src/data/icons-16x16/system-file-manager.png
diff --git a/bsnes/data/icons-16x16/system-search.png b/src/data/icons-16x16/system-search.png
similarity index 100%
rename from bsnes/data/icons-16x16/system-search.png
rename to src/data/icons-16x16/system-search.png
diff --git a/bsnes/data/icons-16x16/text-x-generic.png b/src/data/icons-16x16/text-x-generic.png
similarity index 100%
rename from bsnes/data/icons-16x16/text-x-generic.png
rename to src/data/icons-16x16/text-x-generic.png
diff --git a/bsnes/data/icons-16x16/utilities-terminal.png b/src/data/icons-16x16/utilities-terminal.png
similarity index 100%
rename from bsnes/data/icons-16x16/utilities-terminal.png
rename to src/data/icons-16x16/utilities-terminal.png
diff --git a/bsnes/data/icons-16x16/video-display.png b/src/data/icons-16x16/video-display.png
similarity index 100%
rename from bsnes/data/icons-16x16/video-display.png
rename to src/data/icons-16x16/video-display.png
diff --git a/bsnes/data/icons-16x16/view-refresh.png b/src/data/icons-16x16/view-refresh.png
similarity index 100%
rename from bsnes/data/icons-16x16/view-refresh.png
rename to src/data/icons-16x16/view-refresh.png
diff --git a/bsnes/data/license.html b/src/data/license.html
similarity index 100%
rename from bsnes/data/license.html
rename to src/data/license.html
diff --git a/bsnes/data/logo.png b/src/data/logo.png
similarity index 100%
rename from bsnes/data/logo.png
rename to src/data/logo.png
diff --git a/bsnes/dsp/adsp/adsp.cpp b/src/dsp/adsp/adsp.cpp
similarity index 100%
rename from bsnes/dsp/adsp/adsp.cpp
rename to src/dsp/adsp/adsp.cpp
diff --git a/bsnes/dsp/adsp/adsp.hpp b/src/dsp/adsp/adsp.hpp
similarity index 100%
rename from bsnes/dsp/adsp/adsp.hpp
rename to src/dsp/adsp/adsp.hpp
diff --git a/bsnes/dsp/adsp/adsp_tables.cpp b/src/dsp/adsp/adsp_tables.cpp
similarity index 100%
rename from bsnes/dsp/adsp/adsp_tables.cpp
rename to src/dsp/adsp/adsp_tables.cpp
diff --git a/bsnes/dsp/dsp-debugger.cpp b/src/dsp/dsp-debugger.cpp
similarity index 100%
rename from bsnes/dsp/dsp-debugger.cpp
rename to src/dsp/dsp-debugger.cpp
diff --git a/bsnes/dsp/dsp-debugger.hpp b/src/dsp/dsp-debugger.hpp
similarity index 100%
rename from bsnes/dsp/dsp-debugger.hpp
rename to src/dsp/dsp-debugger.hpp
diff --git a/bsnes/dsp/dsp.cpp b/src/dsp/dsp.cpp
similarity index 100%
rename from bsnes/dsp/dsp.cpp
rename to src/dsp/dsp.cpp
diff --git a/bsnes/dsp/dsp.hpp b/src/dsp/dsp.hpp
similarity index 100%
rename from bsnes/dsp/dsp.hpp
rename to src/dsp/dsp.hpp
diff --git a/bsnes/dsp/sdsp/brr.cpp b/src/dsp/sdsp/brr.cpp
similarity index 100%
rename from bsnes/dsp/sdsp/brr.cpp
rename to src/dsp/sdsp/brr.cpp
diff --git a/bsnes/dsp/sdsp/counter.cpp b/src/dsp/sdsp/counter.cpp
similarity index 100%
rename from bsnes/dsp/sdsp/counter.cpp
rename to src/dsp/sdsp/counter.cpp
diff --git a/bsnes/dsp/sdsp/debugger/debugger.cpp b/src/dsp/sdsp/debugger/debugger.cpp
similarity index 100%
rename from bsnes/dsp/sdsp/debugger/debugger.cpp
rename to src/dsp/sdsp/debugger/debugger.cpp
diff --git a/bsnes/dsp/sdsp/debugger/debugger.hpp b/src/dsp/sdsp/debugger/debugger.hpp
similarity index 100%
rename from bsnes/dsp/sdsp/debugger/debugger.hpp
rename to src/dsp/sdsp/debugger/debugger.hpp
diff --git a/bsnes/dsp/sdsp/echo.cpp b/src/dsp/sdsp/echo.cpp
similarity index 100%
rename from bsnes/dsp/sdsp/echo.cpp
rename to src/dsp/sdsp/echo.cpp
diff --git a/bsnes/dsp/sdsp/envelope.cpp b/src/dsp/sdsp/envelope.cpp
similarity index 100%
rename from bsnes/dsp/sdsp/envelope.cpp
rename to src/dsp/sdsp/envelope.cpp
diff --git a/bsnes/dsp/sdsp/gaussian.cpp b/src/dsp/sdsp/gaussian.cpp
similarity index 100%
rename from bsnes/dsp/sdsp/gaussian.cpp
rename to src/dsp/sdsp/gaussian.cpp
diff --git a/bsnes/dsp/sdsp/misc.cpp b/src/dsp/sdsp/misc.cpp
similarity index 100%
rename from bsnes/dsp/sdsp/misc.cpp
rename to src/dsp/sdsp/misc.cpp
diff --git a/bsnes/dsp/sdsp/sdsp.cpp b/src/dsp/sdsp/sdsp.cpp
similarity index 100%
rename from bsnes/dsp/sdsp/sdsp.cpp
rename to src/dsp/sdsp/sdsp.cpp
diff --git a/bsnes/dsp/sdsp/sdsp.hpp b/src/dsp/sdsp/sdsp.hpp
similarity index 100%
rename from bsnes/dsp/sdsp/sdsp.hpp
rename to src/dsp/sdsp/sdsp.hpp
diff --git a/bsnes/dsp/sdsp/serialization.cpp b/src/dsp/sdsp/serialization.cpp
similarity index 100%
rename from bsnes/dsp/sdsp/serialization.cpp
rename to src/dsp/sdsp/serialization.cpp
diff --git a/bsnes/dsp/sdsp/voice.cpp b/src/dsp/sdsp/voice.cpp
similarity index 100%
rename from bsnes/dsp/sdsp/voice.cpp
rename to src/dsp/sdsp/voice.cpp
diff --git a/bsnes/interface.hpp b/src/interface.hpp
similarity index 100%
rename from bsnes/interface.hpp
rename to src/interface.hpp
diff --git a/bsnes/lib/libco/amd64.c b/src/lib/libco/amd64.c
similarity index 100%
rename from bsnes/lib/libco/amd64.c
rename to src/lib/libco/amd64.c
diff --git a/bsnes/lib/libco/fiber.c b/src/lib/libco/fiber.c
similarity index 100%
rename from bsnes/lib/libco/fiber.c
rename to src/lib/libco/fiber.c
diff --git a/bsnes/lib/libco/libco.c b/src/lib/libco/libco.c
similarity index 100%
rename from bsnes/lib/libco/libco.c
rename to src/lib/libco/libco.c
diff --git a/bsnes/lib/libco/libco.h b/src/lib/libco/libco.h
similarity index 100%
rename from bsnes/lib/libco/libco.h
rename to src/lib/libco/libco.h
diff --git a/bsnes/lib/libco/ppc-elf.c b/src/lib/libco/ppc-elf.c
similarity index 100%
rename from bsnes/lib/libco/ppc-elf.c
rename to src/lib/libco/ppc-elf.c
diff --git a/bsnes/lib/libco/ppc.s b/src/lib/libco/ppc.s
similarity index 100%
rename from bsnes/lib/libco/ppc.s
rename to src/lib/libco/ppc.s
diff --git a/bsnes/lib/libco/ppc64.s b/src/lib/libco/ppc64.s
similarity index 100%
rename from bsnes/lib/libco/ppc64.s
rename to src/lib/libco/ppc64.s
diff --git a/bsnes/lib/libco/sjlj.c b/src/lib/libco/sjlj.c
similarity index 100%
rename from bsnes/lib/libco/sjlj.c
rename to src/lib/libco/sjlj.c
diff --git a/bsnes/lib/libco/ucontext.c b/src/lib/libco/ucontext.c
similarity index 100%
rename from bsnes/lib/libco/ucontext.c
rename to src/lib/libco/ucontext.c
diff --git a/bsnes/lib/libco/x86.c b/src/lib/libco/x86.c
similarity index 100%
rename from bsnes/lib/libco/x86.c
rename to src/lib/libco/x86.c
diff --git a/bsnes/lib/nall/Makefile b/src/lib/nall/Makefile
similarity index 100%
rename from bsnes/lib/nall/Makefile
rename to src/lib/nall/Makefile
diff --git a/bsnes/lib/nall/algorithm.hpp b/src/lib/nall/algorithm.hpp
similarity index 100%
rename from bsnes/lib/nall/algorithm.hpp
rename to src/lib/nall/algorithm.hpp
diff --git a/bsnes/lib/nall/any.hpp b/src/lib/nall/any.hpp
similarity index 100%
rename from bsnes/lib/nall/any.hpp
rename to src/lib/nall/any.hpp
diff --git a/bsnes/lib/nall/array.hpp b/src/lib/nall/array.hpp
similarity index 100%
rename from bsnes/lib/nall/array.hpp
rename to src/lib/nall/array.hpp
diff --git a/bsnes/lib/nall/base64.hpp b/src/lib/nall/base64.hpp
similarity index 100%
rename from bsnes/lib/nall/base64.hpp
rename to src/lib/nall/base64.hpp
diff --git a/bsnes/lib/nall/bit.hpp b/src/lib/nall/bit.hpp
similarity index 100%
rename from bsnes/lib/nall/bit.hpp
rename to src/lib/nall/bit.hpp
diff --git a/bsnes/lib/nall/concept.hpp b/src/lib/nall/concept.hpp
similarity index 100%
rename from bsnes/lib/nall/concept.hpp
rename to src/lib/nall/concept.hpp
diff --git a/bsnes/lib/nall/config.hpp b/src/lib/nall/config.hpp
similarity index 100%
rename from bsnes/lib/nall/config.hpp
rename to src/lib/nall/config.hpp
diff --git a/bsnes/lib/nall/crc32.hpp b/src/lib/nall/crc32.hpp
similarity index 100%
rename from bsnes/lib/nall/crc32.hpp
rename to src/lib/nall/crc32.hpp
diff --git a/bsnes/lib/nall/detect.hpp b/src/lib/nall/detect.hpp
similarity index 100%
rename from bsnes/lib/nall/detect.hpp
rename to src/lib/nall/detect.hpp
diff --git a/bsnes/lib/nall/dictionary.hpp b/src/lib/nall/dictionary.hpp
similarity index 100%
rename from bsnes/lib/nall/dictionary.hpp
rename to src/lib/nall/dictionary.hpp
diff --git a/bsnes/lib/nall/dl.hpp b/src/lib/nall/dl.hpp
similarity index 100%
rename from bsnes/lib/nall/dl.hpp
rename to src/lib/nall/dl.hpp
diff --git a/bsnes/lib/nall/endian.hpp b/src/lib/nall/endian.hpp
similarity index 100%
rename from bsnes/lib/nall/endian.hpp
rename to src/lib/nall/endian.hpp
diff --git a/bsnes/lib/nall/file.hpp b/src/lib/nall/file.hpp
similarity index 100%
rename from bsnes/lib/nall/file.hpp
rename to src/lib/nall/file.hpp
diff --git a/bsnes/lib/nall/filemap.hpp b/src/lib/nall/filemap.hpp
similarity index 100%
rename from bsnes/lib/nall/filemap.hpp
rename to src/lib/nall/filemap.hpp
diff --git a/bsnes/lib/nall/foreach.hpp b/src/lib/nall/foreach.hpp
similarity index 100%
rename from bsnes/lib/nall/foreach.hpp
rename to src/lib/nall/foreach.hpp
diff --git a/bsnes/lib/nall/function.hpp b/src/lib/nall/function.hpp
similarity index 100%
rename from bsnes/lib/nall/function.hpp
rename to src/lib/nall/function.hpp
diff --git a/bsnes/lib/nall/input.hpp b/src/lib/nall/input.hpp
similarity index 100%
rename from bsnes/lib/nall/input.hpp
rename to src/lib/nall/input.hpp
diff --git a/bsnes/lib/nall/lzss.hpp b/src/lib/nall/lzss.hpp
similarity index 100%
rename from bsnes/lib/nall/lzss.hpp
rename to src/lib/nall/lzss.hpp
diff --git a/bsnes/lib/nall/moduloarray.hpp b/src/lib/nall/moduloarray.hpp
similarity index 100%
rename from bsnes/lib/nall/moduloarray.hpp
rename to src/lib/nall/moduloarray.hpp
diff --git a/bsnes/lib/nall/platform.hpp b/src/lib/nall/platform.hpp
similarity index 100%
rename from bsnes/lib/nall/platform.hpp
rename to src/lib/nall/platform.hpp
diff --git a/bsnes/lib/nall/priorityqueue.hpp b/src/lib/nall/priorityqueue.hpp
similarity index 100%
rename from bsnes/lib/nall/priorityqueue.hpp
rename to src/lib/nall/priorityqueue.hpp
diff --git a/bsnes/lib/nall/property.hpp b/src/lib/nall/property.hpp
similarity index 100%
rename from bsnes/lib/nall/property.hpp
rename to src/lib/nall/property.hpp
diff --git a/bsnes/lib/nall/qt/Makefile b/src/lib/nall/qt/Makefile
similarity index 100%
rename from bsnes/lib/nall/qt/Makefile
rename to src/lib/nall/qt/Makefile
diff --git a/bsnes/lib/nall/qt/check-action.moc.hpp b/src/lib/nall/qt/check-action.moc.hpp
similarity index 100%
rename from bsnes/lib/nall/qt/check-action.moc.hpp
rename to src/lib/nall/qt/check-action.moc.hpp
diff --git a/bsnes/lib/nall/qt/concept.hpp b/src/lib/nall/qt/concept.hpp
similarity index 100%
rename from bsnes/lib/nall/qt/concept.hpp
rename to src/lib/nall/qt/concept.hpp
diff --git a/bsnes/lib/nall/qt/file-dialog.moc.hpp b/src/lib/nall/qt/file-dialog.moc.hpp
similarity index 100%
rename from bsnes/lib/nall/qt/file-dialog.moc.hpp
rename to src/lib/nall/qt/file-dialog.moc.hpp
diff --git a/bsnes/lib/nall/qt/hex-editor.moc.hpp b/src/lib/nall/qt/hex-editor.moc.hpp
similarity index 100%
rename from bsnes/lib/nall/qt/hex-editor.moc.hpp
rename to src/lib/nall/qt/hex-editor.moc.hpp
diff --git a/bsnes/lib/nall/qt/radio-action.moc.hpp b/src/lib/nall/qt/radio-action.moc.hpp
similarity index 100%
rename from bsnes/lib/nall/qt/radio-action.moc.hpp
rename to src/lib/nall/qt/radio-action.moc.hpp
diff --git a/bsnes/lib/nall/qt/window.moc.hpp b/src/lib/nall/qt/window.moc.hpp
similarity index 100%
rename from bsnes/lib/nall/qt/window.moc.hpp
rename to src/lib/nall/qt/window.moc.hpp
diff --git a/bsnes/lib/nall/serial.hpp b/src/lib/nall/serial.hpp
similarity index 100%
rename from bsnes/lib/nall/serial.hpp
rename to src/lib/nall/serial.hpp
diff --git a/bsnes/lib/nall/serializer.hpp b/src/lib/nall/serializer.hpp
similarity index 100%
rename from bsnes/lib/nall/serializer.hpp
rename to src/lib/nall/serializer.hpp
diff --git a/bsnes/lib/nall/sha256.hpp b/src/lib/nall/sha256.hpp
similarity index 100%
rename from bsnes/lib/nall/sha256.hpp
rename to src/lib/nall/sha256.hpp
diff --git a/bsnes/lib/nall/sort.hpp b/src/lib/nall/sort.hpp
similarity index 100%
rename from bsnes/lib/nall/sort.hpp
rename to src/lib/nall/sort.hpp
diff --git a/bsnes/lib/nall/static.hpp b/src/lib/nall/static.hpp
similarity index 100%
rename from bsnes/lib/nall/static.hpp
rename to src/lib/nall/static.hpp
diff --git a/bsnes/lib/nall/stdint.hpp b/src/lib/nall/stdint.hpp
similarity index 100%
rename from bsnes/lib/nall/stdint.hpp
rename to src/lib/nall/stdint.hpp
diff --git a/bsnes/lib/nall/string.hpp b/src/lib/nall/string.hpp
similarity index 100%
rename from bsnes/lib/nall/string.hpp
rename to src/lib/nall/string.hpp
diff --git a/bsnes/lib/nall/string/base.hpp b/src/lib/nall/string/base.hpp
similarity index 100%
rename from bsnes/lib/nall/string/base.hpp
rename to src/lib/nall/string/base.hpp
diff --git a/bsnes/lib/nall/string/cast.hpp b/src/lib/nall/string/cast.hpp
similarity index 100%
rename from bsnes/lib/nall/string/cast.hpp
rename to src/lib/nall/string/cast.hpp
diff --git a/bsnes/lib/nall/string/compare.hpp b/src/lib/nall/string/compare.hpp
similarity index 100%
rename from bsnes/lib/nall/string/compare.hpp
rename to src/lib/nall/string/compare.hpp
diff --git a/bsnes/lib/nall/string/convert.hpp b/src/lib/nall/string/convert.hpp
similarity index 100%
rename from bsnes/lib/nall/string/convert.hpp
rename to src/lib/nall/string/convert.hpp
diff --git a/bsnes/lib/nall/string/core.hpp b/src/lib/nall/string/core.hpp
similarity index 100%
rename from bsnes/lib/nall/string/core.hpp
rename to src/lib/nall/string/core.hpp
diff --git a/bsnes/lib/nall/string/filename.hpp b/src/lib/nall/string/filename.hpp
similarity index 100%
rename from bsnes/lib/nall/string/filename.hpp
rename to src/lib/nall/string/filename.hpp
diff --git a/bsnes/lib/nall/string/match.hpp b/src/lib/nall/string/match.hpp
similarity index 100%
rename from bsnes/lib/nall/string/match.hpp
rename to src/lib/nall/string/match.hpp
diff --git a/bsnes/lib/nall/string/math.hpp b/src/lib/nall/string/math.hpp
similarity index 100%
rename from bsnes/lib/nall/string/math.hpp
rename to src/lib/nall/string/math.hpp
diff --git a/bsnes/lib/nall/string/replace.hpp b/src/lib/nall/string/replace.hpp
similarity index 100%
rename from bsnes/lib/nall/string/replace.hpp
rename to src/lib/nall/string/replace.hpp
diff --git a/bsnes/lib/nall/string/split.hpp b/src/lib/nall/string/split.hpp
similarity index 100%
rename from bsnes/lib/nall/string/split.hpp
rename to src/lib/nall/string/split.hpp
diff --git a/bsnes/lib/nall/string/strl.hpp b/src/lib/nall/string/strl.hpp
similarity index 100%
rename from bsnes/lib/nall/string/strl.hpp
rename to src/lib/nall/string/strl.hpp
diff --git a/bsnes/lib/nall/string/trim.hpp b/src/lib/nall/string/trim.hpp
similarity index 100%
rename from bsnes/lib/nall/string/trim.hpp
rename to src/lib/nall/string/trim.hpp
diff --git a/bsnes/lib/nall/string/utility.hpp b/src/lib/nall/string/utility.hpp
similarity index 100%
rename from bsnes/lib/nall/string/utility.hpp
rename to src/lib/nall/string/utility.hpp
diff --git a/bsnes/lib/nall/string/variadic.hpp b/src/lib/nall/string/variadic.hpp
similarity index 100%
rename from bsnes/lib/nall/string/variadic.hpp
rename to src/lib/nall/string/variadic.hpp
diff --git a/bsnes/lib/nall/string/xml.hpp b/src/lib/nall/string/xml.hpp
similarity index 100%
rename from bsnes/lib/nall/string/xml.hpp
rename to src/lib/nall/string/xml.hpp
diff --git a/bsnes/lib/nall/traits.hpp b/src/lib/nall/traits.hpp
similarity index 100%
rename from bsnes/lib/nall/traits.hpp
rename to src/lib/nall/traits.hpp
diff --git a/bsnes/lib/nall/ups.hpp b/src/lib/nall/ups.hpp
similarity index 100%
rename from bsnes/lib/nall/ups.hpp
rename to src/lib/nall/ups.hpp
diff --git a/bsnes/lib/nall/utf8.hpp b/src/lib/nall/utf8.hpp
similarity index 100%
rename from bsnes/lib/nall/utf8.hpp
rename to src/lib/nall/utf8.hpp
diff --git a/bsnes/lib/nall/utility.hpp b/src/lib/nall/utility.hpp
similarity index 100%
rename from bsnes/lib/nall/utility.hpp
rename to src/lib/nall/utility.hpp
diff --git a/bsnes/lib/nall/varint.hpp b/src/lib/nall/varint.hpp
similarity index 100%
rename from bsnes/lib/nall/varint.hpp
rename to src/lib/nall/varint.hpp
diff --git a/bsnes/lib/nall/vector.hpp b/src/lib/nall/vector.hpp
similarity index 100%
rename from bsnes/lib/nall/vector.hpp
rename to src/lib/nall/vector.hpp
diff --git a/bsnes/lib/ruby/audio.hpp b/src/lib/ruby/audio.hpp
similarity index 100%
rename from bsnes/lib/ruby/audio.hpp
rename to src/lib/ruby/audio.hpp
diff --git a/bsnes/lib/ruby/audio/alsa.cpp b/src/lib/ruby/audio/alsa.cpp
similarity index 100%
rename from bsnes/lib/ruby/audio/alsa.cpp
rename to src/lib/ruby/audio/alsa.cpp
diff --git a/bsnes/lib/ruby/audio/ao.cpp b/src/lib/ruby/audio/ao.cpp
similarity index 100%
rename from bsnes/lib/ruby/audio/ao.cpp
rename to src/lib/ruby/audio/ao.cpp
diff --git a/bsnes/lib/ruby/audio/directsound.cpp b/src/lib/ruby/audio/directsound.cpp
similarity index 100%
rename from bsnes/lib/ruby/audio/directsound.cpp
rename to src/lib/ruby/audio/directsound.cpp
diff --git a/bsnes/lib/ruby/audio/openal.cpp b/src/lib/ruby/audio/openal.cpp
similarity index 100%
rename from bsnes/lib/ruby/audio/openal.cpp
rename to src/lib/ruby/audio/openal.cpp
diff --git a/bsnes/lib/ruby/audio/oss.cpp b/src/lib/ruby/audio/oss.cpp
similarity index 100%
rename from bsnes/lib/ruby/audio/oss.cpp
rename to src/lib/ruby/audio/oss.cpp
diff --git a/bsnes/lib/ruby/audio/pulseaudio.cpp b/src/lib/ruby/audio/pulseaudio.cpp
similarity index 100%
rename from bsnes/lib/ruby/audio/pulseaudio.cpp
rename to src/lib/ruby/audio/pulseaudio.cpp
diff --git a/bsnes/lib/ruby/audio/pulseaudiosimple.cpp b/src/lib/ruby/audio/pulseaudiosimple.cpp
similarity index 100%
rename from bsnes/lib/ruby/audio/pulseaudiosimple.cpp
rename to src/lib/ruby/audio/pulseaudiosimple.cpp
diff --git a/bsnes/lib/ruby/input.hpp b/src/lib/ruby/input.hpp
similarity index 100%
rename from bsnes/lib/ruby/input.hpp
rename to src/lib/ruby/input.hpp
diff --git a/bsnes/lib/ruby/input/carbon.cpp b/src/lib/ruby/input/carbon.cpp
similarity index 100%
rename from bsnes/lib/ruby/input/carbon.cpp
rename to src/lib/ruby/input/carbon.cpp
diff --git a/bsnes/lib/ruby/input/directinput.cpp b/src/lib/ruby/input/directinput.cpp
similarity index 100%
rename from bsnes/lib/ruby/input/directinput.cpp
rename to src/lib/ruby/input/directinput.cpp
diff --git a/bsnes/lib/ruby/input/rawinput.cpp b/src/lib/ruby/input/rawinput.cpp
similarity index 100%
rename from bsnes/lib/ruby/input/rawinput.cpp
rename to src/lib/ruby/input/rawinput.cpp
diff --git a/bsnes/lib/ruby/input/sdl.cpp b/src/lib/ruby/input/sdl.cpp
similarity index 100%
rename from bsnes/lib/ruby/input/sdl.cpp
rename to src/lib/ruby/input/sdl.cpp
diff --git a/bsnes/lib/ruby/input/x.cpp b/src/lib/ruby/input/x.cpp
similarity index 100%
rename from bsnes/lib/ruby/input/x.cpp
rename to src/lib/ruby/input/x.cpp
diff --git a/bsnes/lib/ruby/input/xlibkeys.hpp b/src/lib/ruby/input/xlibkeys.hpp
similarity index 100%
rename from bsnes/lib/ruby/input/xlibkeys.hpp
rename to src/lib/ruby/input/xlibkeys.hpp
diff --git a/bsnes/lib/ruby/ruby.cpp b/src/lib/ruby/ruby.cpp
similarity index 100%
rename from bsnes/lib/ruby/ruby.cpp
rename to src/lib/ruby/ruby.cpp
diff --git a/bsnes/lib/ruby/ruby.hpp b/src/lib/ruby/ruby.hpp
similarity index 100%
rename from bsnes/lib/ruby/ruby.hpp
rename to src/lib/ruby/ruby.hpp
diff --git a/bsnes/lib/ruby/ruby_audio.cpp b/src/lib/ruby/ruby_audio.cpp
similarity index 100%
rename from bsnes/lib/ruby/ruby_audio.cpp
rename to src/lib/ruby/ruby_audio.cpp
diff --git a/bsnes/lib/ruby/ruby_impl.cpp b/src/lib/ruby/ruby_impl.cpp
similarity index 100%
rename from bsnes/lib/ruby/ruby_impl.cpp
rename to src/lib/ruby/ruby_impl.cpp
diff --git a/bsnes/lib/ruby/video.hpp b/src/lib/ruby/video.hpp
similarity index 100%
rename from bsnes/lib/ruby/video.hpp
rename to src/lib/ruby/video.hpp
diff --git a/bsnes/lib/ruby/video/direct3d.cpp b/src/lib/ruby/video/direct3d.cpp
similarity index 100%
rename from bsnes/lib/ruby/video/direct3d.cpp
rename to src/lib/ruby/video/direct3d.cpp
diff --git a/bsnes/lib/ruby/video/directdraw.cpp b/src/lib/ruby/video/directdraw.cpp
similarity index 100%
rename from bsnes/lib/ruby/video/directdraw.cpp
rename to src/lib/ruby/video/directdraw.cpp
diff --git a/bsnes/lib/ruby/video/gdi.cpp b/src/lib/ruby/video/gdi.cpp
similarity index 100%
rename from bsnes/lib/ruby/video/gdi.cpp
rename to src/lib/ruby/video/gdi.cpp
diff --git a/bsnes/lib/ruby/video/glx.cpp b/src/lib/ruby/video/glx.cpp
similarity index 100%
rename from bsnes/lib/ruby/video/glx.cpp
rename to src/lib/ruby/video/glx.cpp
diff --git a/bsnes/lib/ruby/video/opengl.hpp b/src/lib/ruby/video/opengl.hpp
similarity index 100%
rename from bsnes/lib/ruby/video/opengl.hpp
rename to src/lib/ruby/video/opengl.hpp
diff --git a/bsnes/lib/ruby/video/qtopengl.cpp b/src/lib/ruby/video/qtopengl.cpp
similarity index 100%
rename from bsnes/lib/ruby/video/qtopengl.cpp
rename to src/lib/ruby/video/qtopengl.cpp
diff --git a/bsnes/lib/ruby/video/qtraster.cpp b/src/lib/ruby/video/qtraster.cpp
similarity index 100%
rename from bsnes/lib/ruby/video/qtraster.cpp
rename to src/lib/ruby/video/qtraster.cpp
diff --git a/bsnes/lib/ruby/video/sdl.cpp b/src/lib/ruby/video/sdl.cpp
similarity index 100%
rename from bsnes/lib/ruby/video/sdl.cpp
rename to src/lib/ruby/video/sdl.cpp
diff --git a/bsnes/lib/ruby/video/wgl.cpp b/src/lib/ruby/video/wgl.cpp
similarity index 100%
rename from bsnes/lib/ruby/video/wgl.cpp
rename to src/lib/ruby/video/wgl.cpp
diff --git a/bsnes/lib/ruby/video/xv.cpp b/src/lib/ruby/video/xv.cpp
similarity index 100%
rename from bsnes/lib/ruby/video/xv.cpp
rename to src/lib/ruby/video/xv.cpp
diff --git a/bsnes/lib/sync.bat b/src/lib/sync.bat
similarity index 100%
rename from bsnes/lib/sync.bat
rename to src/lib/sync.bat
diff --git a/bsnes/lib/sync.sh b/src/lib/sync.sh
similarity index 100%
rename from bsnes/lib/sync.sh
rename to src/lib/sync.sh
diff --git a/bsnes/memory/memory-inline.hpp b/src/memory/memory-inline.hpp
similarity index 100%
rename from bsnes/memory/memory-inline.hpp
rename to src/memory/memory-inline.hpp
diff --git a/bsnes/memory/memory.cpp b/src/memory/memory.cpp
similarity index 100%
rename from bsnes/memory/memory.cpp
rename to src/memory/memory.cpp
diff --git a/bsnes/memory/memory.hpp b/src/memory/memory.hpp
similarity index 100%
rename from bsnes/memory/memory.hpp
rename to src/memory/memory.hpp
diff --git a/bsnes/memory/smemory/serialization.cpp b/src/memory/smemory/serialization.cpp
similarity index 100%
rename from bsnes/memory/smemory/serialization.cpp
rename to src/memory/smemory/serialization.cpp
diff --git a/bsnes/memory/smemory/smemory.cpp b/src/memory/smemory/smemory.cpp
similarity index 100%
rename from bsnes/memory/smemory/smemory.cpp
rename to src/memory/smemory/smemory.cpp
diff --git a/bsnes/memory/smemory/smemory.hpp b/src/memory/smemory/smemory.hpp
similarity index 100%
rename from bsnes/memory/smemory/smemory.hpp
rename to src/memory/smemory/smemory.hpp
diff --git a/bsnes/ppu/bppu/bppu.cpp b/src/ppu/bppu/bppu.cpp
similarity index 100%
rename from bsnes/ppu/bppu/bppu.cpp
rename to src/ppu/bppu/bppu.cpp
diff --git a/bsnes/ppu/bppu/bppu.hpp b/src/ppu/bppu/bppu.hpp
similarity index 100%
rename from bsnes/ppu/bppu/bppu.hpp
rename to src/ppu/bppu/bppu.hpp
diff --git a/bsnes/ppu/bppu/debugger/debugger.cpp b/src/ppu/bppu/debugger/debugger.cpp
similarity index 100%
rename from bsnes/ppu/bppu/debugger/debugger.cpp
rename to src/ppu/bppu/debugger/debugger.cpp
diff --git a/bsnes/ppu/bppu/debugger/debugger.hpp b/src/ppu/bppu/debugger/debugger.hpp
similarity index 100%
rename from bsnes/ppu/bppu/debugger/debugger.hpp
rename to src/ppu/bppu/debugger/debugger.hpp
diff --git a/bsnes/ppu/bppu/debugger/render.cpp b/src/ppu/bppu/debugger/render.cpp
similarity index 100%
rename from bsnes/ppu/bppu/debugger/render.cpp
rename to src/ppu/bppu/debugger/render.cpp
diff --git a/bsnes/ppu/bppu/memory/memory.cpp b/src/ppu/bppu/memory/memory.cpp
similarity index 100%
rename from bsnes/ppu/bppu/memory/memory.cpp
rename to src/ppu/bppu/memory/memory.cpp
diff --git a/bsnes/ppu/bppu/memory/memory.hpp b/src/ppu/bppu/memory/memory.hpp
similarity index 100%
rename from bsnes/ppu/bppu/memory/memory.hpp
rename to src/ppu/bppu/memory/memory.hpp
diff --git a/bsnes/ppu/bppu/mmio/mmio.cpp b/src/ppu/bppu/mmio/mmio.cpp
similarity index 100%
rename from bsnes/ppu/bppu/mmio/mmio.cpp
rename to src/ppu/bppu/mmio/mmio.cpp
diff --git a/bsnes/ppu/bppu/mmio/mmio.hpp b/src/ppu/bppu/mmio/mmio.hpp
similarity index 100%
rename from bsnes/ppu/bppu/mmio/mmio.hpp
rename to src/ppu/bppu/mmio/mmio.hpp
diff --git a/bsnes/ppu/bppu/render/addsub.cpp b/src/ppu/bppu/render/addsub.cpp
similarity index 100%
rename from bsnes/ppu/bppu/render/addsub.cpp
rename to src/ppu/bppu/render/addsub.cpp
diff --git a/bsnes/ppu/bppu/render/bg.cpp b/src/ppu/bppu/render/bg.cpp
similarity index 100%
rename from bsnes/ppu/bppu/render/bg.cpp
rename to src/ppu/bppu/render/bg.cpp
diff --git a/bsnes/ppu/bppu/render/cache.cpp b/src/ppu/bppu/render/cache.cpp
similarity index 100%
rename from bsnes/ppu/bppu/render/cache.cpp
rename to src/ppu/bppu/render/cache.cpp
diff --git a/bsnes/ppu/bppu/render/line.cpp b/src/ppu/bppu/render/line.cpp
similarity index 100%
rename from bsnes/ppu/bppu/render/line.cpp
rename to src/ppu/bppu/render/line.cpp
diff --git a/bsnes/ppu/bppu/render/mode7.cpp b/src/ppu/bppu/render/mode7.cpp
similarity index 100%
rename from bsnes/ppu/bppu/render/mode7.cpp
rename to src/ppu/bppu/render/mode7.cpp
diff --git a/bsnes/ppu/bppu/render/oam.cpp b/src/ppu/bppu/render/oam.cpp
similarity index 100%
rename from bsnes/ppu/bppu/render/oam.cpp
rename to src/ppu/bppu/render/oam.cpp
diff --git a/bsnes/ppu/bppu/render/render.cpp b/src/ppu/bppu/render/render.cpp
similarity index 100%
rename from bsnes/ppu/bppu/render/render.cpp
rename to src/ppu/bppu/render/render.cpp
diff --git a/bsnes/ppu/bppu/render/render.hpp b/src/ppu/bppu/render/render.hpp
similarity index 100%
rename from bsnes/ppu/bppu/render/render.hpp
rename to src/ppu/bppu/render/render.hpp
diff --git a/bsnes/ppu/bppu/render/windows.cpp b/src/ppu/bppu/render/windows.cpp
similarity index 100%
rename from bsnes/ppu/bppu/render/windows.cpp
rename to src/ppu/bppu/render/windows.cpp
diff --git a/bsnes/ppu/bppu/serialization.cpp b/src/ppu/bppu/serialization.cpp
similarity index 100%
rename from bsnes/ppu/bppu/serialization.cpp
rename to src/ppu/bppu/serialization.cpp
diff --git a/bsnes/ppu/ppu-debugger.cpp b/src/ppu/ppu-debugger.cpp
similarity index 100%
rename from bsnes/ppu/ppu-debugger.cpp
rename to src/ppu/ppu-debugger.cpp
diff --git a/bsnes/ppu/ppu-debugger.hpp b/src/ppu/ppu-debugger.hpp
similarity index 100%
rename from bsnes/ppu/ppu-debugger.hpp
rename to src/ppu/ppu-debugger.hpp
diff --git a/bsnes/ppu/ppu-inline.hpp b/src/ppu/ppu-inline.hpp
similarity index 100%
rename from bsnes/ppu/ppu-inline.hpp
rename to src/ppu/ppu-inline.hpp
diff --git a/bsnes/ppu/ppu.cpp b/src/ppu/ppu.cpp
similarity index 100%
rename from bsnes/ppu/ppu.cpp
rename to src/ppu/ppu.cpp
diff --git a/bsnes/ppu/ppu.hpp b/src/ppu/ppu.hpp
similarity index 100%
rename from bsnes/ppu/ppu.hpp
rename to src/ppu/ppu.hpp
diff --git a/bsnes/ppu/serialization.cpp b/src/ppu/serialization.cpp
similarity index 100%
rename from bsnes/ppu/serialization.cpp
rename to src/ppu/serialization.cpp
diff --git a/bsnes/smp/core/algorithms.cpp b/src/smp/core/algorithms.cpp
similarity index 100%
rename from bsnes/smp/core/algorithms.cpp
rename to src/smp/core/algorithms.cpp
diff --git a/bsnes/smp/core/core.cpp b/src/smp/core/core.cpp
similarity index 100%
rename from bsnes/smp/core/core.cpp
rename to src/smp/core/core.cpp
diff --git a/bsnes/smp/core/core.hpp b/src/smp/core/core.hpp
similarity index 100%
rename from bsnes/smp/core/core.hpp
rename to src/smp/core/core.hpp
diff --git a/bsnes/smp/core/disassembler/disassembler.cpp b/src/smp/core/disassembler/disassembler.cpp
similarity index 100%
rename from bsnes/smp/core/disassembler/disassembler.cpp
rename to src/smp/core/disassembler/disassembler.cpp
diff --git a/bsnes/smp/core/disassembler/disassembler.hpp b/src/smp/core/disassembler/disassembler.hpp
similarity index 100%
rename from bsnes/smp/core/disassembler/disassembler.hpp
rename to src/smp/core/disassembler/disassembler.hpp
diff --git a/bsnes/smp/core/memory.hpp b/src/smp/core/memory.hpp
similarity index 100%
rename from bsnes/smp/core/memory.hpp
rename to src/smp/core/memory.hpp
diff --git a/bsnes/smp/core/opcode_misc.cpp b/src/smp/core/opcode_misc.cpp
similarity index 100%
rename from bsnes/smp/core/opcode_misc.cpp
rename to src/smp/core/opcode_misc.cpp
diff --git a/bsnes/smp/core/opcode_mov.cpp b/src/smp/core/opcode_mov.cpp
similarity index 100%
rename from bsnes/smp/core/opcode_mov.cpp
rename to src/smp/core/opcode_mov.cpp
diff --git a/bsnes/smp/core/opcode_pc.cpp b/src/smp/core/opcode_pc.cpp
similarity index 100%
rename from bsnes/smp/core/opcode_pc.cpp
rename to src/smp/core/opcode_pc.cpp
diff --git a/bsnes/smp/core/opcode_read.cpp b/src/smp/core/opcode_read.cpp
similarity index 100%
rename from bsnes/smp/core/opcode_read.cpp
rename to src/smp/core/opcode_read.cpp
diff --git a/bsnes/smp/core/opcode_rmw.cpp b/src/smp/core/opcode_rmw.cpp
similarity index 100%
rename from bsnes/smp/core/opcode_rmw.cpp
rename to src/smp/core/opcode_rmw.cpp
diff --git a/bsnes/smp/core/registers.hpp b/src/smp/core/registers.hpp
similarity index 100%
rename from bsnes/smp/core/registers.hpp
rename to src/smp/core/registers.hpp
diff --git a/bsnes/smp/core/serialization.cpp b/src/smp/core/serialization.cpp
similarity index 100%
rename from bsnes/smp/core/serialization.cpp
rename to src/smp/core/serialization.cpp
diff --git a/bsnes/smp/core/table.cpp b/src/smp/core/table.cpp
similarity index 100%
rename from bsnes/smp/core/table.cpp
rename to src/smp/core/table.cpp
diff --git a/bsnes/smp/smp-debugger.cpp b/src/smp/smp-debugger.cpp
similarity index 100%
rename from bsnes/smp/smp-debugger.cpp
rename to src/smp/smp-debugger.cpp
diff --git a/bsnes/smp/smp-debugger.hpp b/src/smp/smp-debugger.hpp
similarity index 100%
rename from bsnes/smp/smp-debugger.hpp
rename to src/smp/smp-debugger.hpp
diff --git a/bsnes/smp/smp.cpp b/src/smp/smp.cpp
similarity index 100%
rename from bsnes/smp/smp.cpp
rename to src/smp/smp.cpp
diff --git a/bsnes/smp/smp.hpp b/src/smp/smp.hpp
similarity index 100%
rename from bsnes/smp/smp.hpp
rename to src/smp/smp.hpp
diff --git a/bsnes/smp/ssmp/debugger/debugger.cpp b/src/smp/ssmp/debugger/debugger.cpp
similarity index 100%
rename from bsnes/smp/ssmp/debugger/debugger.cpp
rename to src/smp/ssmp/debugger/debugger.cpp
diff --git a/bsnes/smp/ssmp/debugger/debugger.hpp b/src/smp/ssmp/debugger/debugger.hpp
similarity index 100%
rename from bsnes/smp/ssmp/debugger/debugger.hpp
rename to src/smp/ssmp/debugger/debugger.hpp
diff --git a/bsnes/smp/ssmp/memory/memory.cpp b/src/smp/ssmp/memory/memory.cpp
similarity index 100%
rename from bsnes/smp/ssmp/memory/memory.cpp
rename to src/smp/ssmp/memory/memory.cpp
diff --git a/bsnes/smp/ssmp/memory/memory.hpp b/src/smp/ssmp/memory/memory.hpp
similarity index 100%
rename from bsnes/smp/ssmp/memory/memory.hpp
rename to src/smp/ssmp/memory/memory.hpp
diff --git a/bsnes/smp/ssmp/serialization.cpp b/src/smp/ssmp/serialization.cpp
similarity index 100%
rename from bsnes/smp/ssmp/serialization.cpp
rename to src/smp/ssmp/serialization.cpp
diff --git a/bsnes/smp/ssmp/ssmp.cpp b/src/smp/ssmp/ssmp.cpp
similarity index 100%
rename from bsnes/smp/ssmp/ssmp.cpp
rename to src/smp/ssmp/ssmp.cpp
diff --git a/bsnes/smp/ssmp/ssmp.hpp b/src/smp/ssmp/ssmp.hpp
similarity index 100%
rename from bsnes/smp/ssmp/ssmp.hpp
rename to src/smp/ssmp/ssmp.hpp
diff --git a/bsnes/smp/ssmp/timing/timing.cpp b/src/smp/ssmp/timing/timing.cpp
similarity index 100%
rename from bsnes/smp/ssmp/timing/timing.cpp
rename to src/smp/ssmp/timing/timing.cpp
diff --git a/bsnes/smp/ssmp/timing/timing.hpp b/src/smp/ssmp/timing/timing.hpp
similarity index 100%
rename from bsnes/smp/ssmp/timing/timing.hpp
rename to src/smp/ssmp/timing/timing.hpp
diff --git a/bsnes/system/audio/audio.cpp b/src/system/audio/audio.cpp
similarity index 100%
rename from bsnes/system/audio/audio.cpp
rename to src/system/audio/audio.cpp
diff --git a/bsnes/system/audio/audio.hpp b/src/system/audio/audio.hpp
similarity index 100%
rename from bsnes/system/audio/audio.hpp
rename to src/system/audio/audio.hpp
diff --git a/bsnes/system/config/config.cpp b/src/system/config/config.cpp
similarity index 100%
rename from bsnes/system/config/config.cpp
rename to src/system/config/config.cpp
diff --git a/bsnes/system/config/config.hpp b/src/system/config/config.hpp
similarity index 100%
rename from bsnes/system/config/config.hpp
rename to src/system/config/config.hpp
diff --git a/bsnes/system/debugger/debugger.cpp b/src/system/debugger/debugger.cpp
similarity index 100%
rename from bsnes/system/debugger/debugger.cpp
rename to src/system/debugger/debugger.cpp
diff --git a/bsnes/system/debugger/debugger.hpp b/src/system/debugger/debugger.hpp
similarity index 100%
rename from bsnes/system/debugger/debugger.hpp
rename to src/system/debugger/debugger.hpp
diff --git a/bsnes/system/input/input.cpp b/src/system/input/input.cpp
similarity index 100%
rename from bsnes/system/input/input.cpp
rename to src/system/input/input.cpp
diff --git a/bsnes/system/input/input.hpp b/src/system/input/input.hpp
similarity index 100%
rename from bsnes/system/input/input.hpp
rename to src/system/input/input.hpp
diff --git a/bsnes/system/interface/interface.hpp b/src/system/interface/interface.hpp
similarity index 100%
rename from bsnes/system/interface/interface.hpp
rename to src/system/interface/interface.hpp
diff --git a/bsnes/system/scheduler/scheduler.cpp b/src/system/scheduler/scheduler.cpp
similarity index 100%
rename from bsnes/system/scheduler/scheduler.cpp
rename to src/system/scheduler/scheduler.cpp
diff --git a/bsnes/system/scheduler/scheduler.hpp b/src/system/scheduler/scheduler.hpp
similarity index 100%
rename from bsnes/system/scheduler/scheduler.hpp
rename to src/system/scheduler/scheduler.hpp
diff --git a/bsnes/system/serialization.cpp b/src/system/serialization.cpp
similarity index 100%
rename from bsnes/system/serialization.cpp
rename to src/system/serialization.cpp
diff --git a/bsnes/system/system.cpp b/src/system/system.cpp
similarity index 100%
rename from bsnes/system/system.cpp
rename to src/system/system.cpp
diff --git a/bsnes/system/system.hpp b/src/system/system.hpp
similarity index 100%
rename from bsnes/system/system.hpp
rename to src/system/system.hpp
diff --git a/bsnes/system/video/video.cpp b/src/system/video/video.cpp
similarity index 100%
rename from bsnes/system/video/video.cpp
rename to src/system/video/video.cpp
diff --git a/bsnes/system/video/video.hpp b/src/system/video/video.hpp
similarity index 100%
rename from bsnes/system/video/video.hpp
rename to src/system/video/video.hpp
diff --git a/bsnes/ui_qt/Makefile b/src/ui_qt/Makefile
similarity index 100%
rename from bsnes/ui_qt/Makefile
rename to src/ui_qt/Makefile
diff --git a/bsnes/ui_qt/application/application.cpp b/src/ui_qt/application/application.cpp
similarity index 100%
rename from bsnes/ui_qt/application/application.cpp
rename to src/ui_qt/application/application.cpp
diff --git a/bsnes/ui_qt/application/application.moc.hpp b/src/ui_qt/application/application.moc.hpp
similarity index 100%
rename from bsnes/ui_qt/application/application.moc.hpp
rename to src/ui_qt/application/application.moc.hpp
diff --git a/bsnes/ui_qt/application/init.cpp b/src/ui_qt/application/init.cpp
similarity index 100%
rename from bsnes/ui_qt/application/init.cpp
rename to src/ui_qt/application/init.cpp
diff --git a/bsnes/ui_qt/base/about.cpp b/src/ui_qt/base/about.cpp
similarity index 100%
rename from bsnes/ui_qt/base/about.cpp
rename to src/ui_qt/base/about.cpp
diff --git a/bsnes/ui_qt/base/about.moc.hpp b/src/ui_qt/base/about.moc.hpp
similarity index 100%
rename from bsnes/ui_qt/base/about.moc.hpp
rename to src/ui_qt/base/about.moc.hpp
diff --git a/bsnes/ui_qt/base/base.cpp b/src/ui_qt/base/base.cpp
similarity index 100%
rename from bsnes/ui_qt/base/base.cpp
rename to src/ui_qt/base/base.cpp
diff --git a/bsnes/ui_qt/base/filebrowser.cpp b/src/ui_qt/base/filebrowser.cpp
similarity index 100%
rename from bsnes/ui_qt/base/filebrowser.cpp
rename to src/ui_qt/base/filebrowser.cpp
diff --git a/bsnes/ui_qt/base/filebrowser.moc.hpp b/src/ui_qt/base/filebrowser.moc.hpp
similarity index 100%
rename from bsnes/ui_qt/base/filebrowser.moc.hpp
rename to src/ui_qt/base/filebrowser.moc.hpp
diff --git a/bsnes/ui_qt/base/htmlviewer.cpp b/src/ui_qt/base/htmlviewer.cpp
similarity index 100%
rename from bsnes/ui_qt/base/htmlviewer.cpp
rename to src/ui_qt/base/htmlviewer.cpp
diff --git a/bsnes/ui_qt/base/htmlviewer.moc.hpp b/src/ui_qt/base/htmlviewer.moc.hpp
similarity index 100%
rename from bsnes/ui_qt/base/htmlviewer.moc.hpp
rename to src/ui_qt/base/htmlviewer.moc.hpp
diff --git a/bsnes/ui_qt/base/loader.cpp b/src/ui_qt/base/loader.cpp
similarity index 100%
rename from bsnes/ui_qt/base/loader.cpp
rename to src/ui_qt/base/loader.cpp
diff --git a/bsnes/ui_qt/base/loader.moc.hpp b/src/ui_qt/base/loader.moc.hpp
similarity index 100%
rename from bsnes/ui_qt/base/loader.moc.hpp
rename to src/ui_qt/base/loader.moc.hpp
diff --git a/bsnes/ui_qt/base/main.cpp b/src/ui_qt/base/main.cpp
similarity index 100%
rename from bsnes/ui_qt/base/main.cpp
rename to src/ui_qt/base/main.cpp
diff --git a/bsnes/ui_qt/base/main.moc.hpp b/src/ui_qt/base/main.moc.hpp
similarity index 100%
rename from bsnes/ui_qt/base/main.moc.hpp
rename to src/ui_qt/base/main.moc.hpp
diff --git a/bsnes/ui_qt/cartridge/cartridge.cpp b/src/ui_qt/cartridge/cartridge.cpp
similarity index 100%
rename from bsnes/ui_qt/cartridge/cartridge.cpp
rename to src/ui_qt/cartridge/cartridge.cpp
diff --git a/bsnes/ui_qt/cartridge/cartridge.hpp b/src/ui_qt/cartridge/cartridge.hpp
similarity index 100%
rename from bsnes/ui_qt/cartridge/cartridge.hpp
rename to src/ui_qt/cartridge/cartridge.hpp
diff --git a/bsnes/ui_qt/config.cpp b/src/ui_qt/config.cpp
similarity index 100%
rename from bsnes/ui_qt/config.cpp
rename to src/ui_qt/config.cpp
diff --git a/bsnes/ui_qt/config.hpp b/src/ui_qt/config.hpp
similarity index 100%
rename from bsnes/ui_qt/config.hpp
rename to src/ui_qt/config.hpp
diff --git a/bsnes/ui_qt/debugger/debugger.cpp b/src/ui_qt/debugger/debugger.cpp
similarity index 100%
rename from bsnes/ui_qt/debugger/debugger.cpp
rename to src/ui_qt/debugger/debugger.cpp
diff --git a/bsnes/ui_qt/debugger/debugger.moc.hpp b/src/ui_qt/debugger/debugger.moc.hpp
similarity index 100%
rename from bsnes/ui_qt/debugger/debugger.moc.hpp
rename to src/ui_qt/debugger/debugger.moc.hpp
diff --git a/bsnes/ui_qt/debugger/misc/debugger-options.cpp b/src/ui_qt/debugger/misc/debugger-options.cpp
similarity index 100%
rename from bsnes/ui_qt/debugger/misc/debugger-options.cpp
rename to src/ui_qt/debugger/misc/debugger-options.cpp
diff --git a/bsnes/ui_qt/debugger/misc/debugger-options.moc.hpp b/src/ui_qt/debugger/misc/debugger-options.moc.hpp
similarity index 100%
rename from bsnes/ui_qt/debugger/misc/debugger-options.moc.hpp
rename to src/ui_qt/debugger/misc/debugger-options.moc.hpp
diff --git a/bsnes/ui_qt/debugger/ppu/cgram-viewer.cpp b/src/ui_qt/debugger/ppu/cgram-viewer.cpp
similarity index 100%
rename from bsnes/ui_qt/debugger/ppu/cgram-viewer.cpp
rename to src/ui_qt/debugger/ppu/cgram-viewer.cpp
diff --git a/bsnes/ui_qt/debugger/ppu/cgram-viewer.moc.hpp b/src/ui_qt/debugger/ppu/cgram-viewer.moc.hpp
similarity index 100%
rename from bsnes/ui_qt/debugger/ppu/cgram-viewer.moc.hpp
rename to src/ui_qt/debugger/ppu/cgram-viewer.moc.hpp
diff --git a/bsnes/ui_qt/debugger/ppu/layer-toggle.cpp b/src/ui_qt/debugger/ppu/layer-toggle.cpp
similarity index 100%
rename from bsnes/ui_qt/debugger/ppu/layer-toggle.cpp
rename to src/ui_qt/debugger/ppu/layer-toggle.cpp
diff --git a/bsnes/ui_qt/debugger/ppu/layer-toggle.moc.hpp b/src/ui_qt/debugger/ppu/layer-toggle.moc.hpp
similarity index 100%
rename from bsnes/ui_qt/debugger/ppu/layer-toggle.moc.hpp
rename to src/ui_qt/debugger/ppu/layer-toggle.moc.hpp
diff --git a/bsnes/ui_qt/debugger/ppu/oam-viewer.cpp b/src/ui_qt/debugger/ppu/oam-viewer.cpp
similarity index 100%
rename from bsnes/ui_qt/debugger/ppu/oam-viewer.cpp
rename to src/ui_qt/debugger/ppu/oam-viewer.cpp
diff --git a/bsnes/ui_qt/debugger/ppu/oam-viewer.moc.hpp b/src/ui_qt/debugger/ppu/oam-viewer.moc.hpp
similarity index 100%
rename from bsnes/ui_qt/debugger/ppu/oam-viewer.moc.hpp
rename to src/ui_qt/debugger/ppu/oam-viewer.moc.hpp
diff --git a/bsnes/ui_qt/debugger/ppu/vram-viewer.cpp b/src/ui_qt/debugger/ppu/vram-viewer.cpp
similarity index 100%
rename from bsnes/ui_qt/debugger/ppu/vram-viewer.cpp
rename to src/ui_qt/debugger/ppu/vram-viewer.cpp
diff --git a/bsnes/ui_qt/debugger/ppu/vram-viewer.moc.hpp b/src/ui_qt/debugger/ppu/vram-viewer.moc.hpp
similarity index 100%
rename from bsnes/ui_qt/debugger/ppu/vram-viewer.moc.hpp
rename to src/ui_qt/debugger/ppu/vram-viewer.moc.hpp
diff --git a/bsnes/ui_qt/debugger/tools/breakpoint.cpp b/src/ui_qt/debugger/tools/breakpoint.cpp
similarity index 100%
rename from bsnes/ui_qt/debugger/tools/breakpoint.cpp
rename to src/ui_qt/debugger/tools/breakpoint.cpp
diff --git a/bsnes/ui_qt/debugger/tools/breakpoint.moc.hpp b/src/ui_qt/debugger/tools/breakpoint.moc.hpp
similarity index 100%
rename from bsnes/ui_qt/debugger/tools/breakpoint.moc.hpp
rename to src/ui_qt/debugger/tools/breakpoint.moc.hpp
diff --git a/bsnes/ui_qt/debugger/tools/disassembler.cpp b/src/ui_qt/debugger/tools/disassembler.cpp
similarity index 100%
rename from bsnes/ui_qt/debugger/tools/disassembler.cpp
rename to src/ui_qt/debugger/tools/disassembler.cpp
diff --git a/bsnes/ui_qt/debugger/tools/disassembler.moc.hpp b/src/ui_qt/debugger/tools/disassembler.moc.hpp
similarity index 100%
rename from bsnes/ui_qt/debugger/tools/disassembler.moc.hpp
rename to src/ui_qt/debugger/tools/disassembler.moc.hpp
diff --git a/bsnes/ui_qt/debugger/tools/memory.cpp b/src/ui_qt/debugger/tools/memory.cpp
similarity index 100%
rename from bsnes/ui_qt/debugger/tools/memory.cpp
rename to src/ui_qt/debugger/tools/memory.cpp
diff --git a/bsnes/ui_qt/debugger/tools/memory.moc.hpp b/src/ui_qt/debugger/tools/memory.moc.hpp
similarity index 100%
rename from bsnes/ui_qt/debugger/tools/memory.moc.hpp
rename to src/ui_qt/debugger/tools/memory.moc.hpp
diff --git a/bsnes/ui_qt/debugger/tools/properties.cpp b/src/ui_qt/debugger/tools/properties.cpp
similarity index 100%
rename from bsnes/ui_qt/debugger/tools/properties.cpp
rename to src/ui_qt/debugger/tools/properties.cpp
diff --git a/bsnes/ui_qt/debugger/tools/properties.moc.hpp b/src/ui_qt/debugger/tools/properties.moc.hpp
similarity index 100%
rename from bsnes/ui_qt/debugger/tools/properties.moc.hpp
rename to src/ui_qt/debugger/tools/properties.moc.hpp
diff --git a/bsnes/ui_qt/debugger/tracer.cpp b/src/ui_qt/debugger/tracer.cpp
similarity index 100%
rename from bsnes/ui_qt/debugger/tracer.cpp
rename to src/ui_qt/debugger/tracer.cpp
diff --git a/bsnes/ui_qt/debugger/tracer.moc.hpp b/src/ui_qt/debugger/tracer.moc.hpp
similarity index 100%
rename from bsnes/ui_qt/debugger/tracer.moc.hpp
rename to src/ui_qt/debugger/tracer.moc.hpp
diff --git a/bsnes/ui_qt/input/controller.cpp b/src/ui_qt/input/controller.cpp
similarity index 100%
rename from bsnes/ui_qt/input/controller.cpp
rename to src/ui_qt/input/controller.cpp
diff --git a/bsnes/ui_qt/input/controller.hpp b/src/ui_qt/input/controller.hpp
similarity index 100%
rename from bsnes/ui_qt/input/controller.hpp
rename to src/ui_qt/input/controller.hpp
diff --git a/bsnes/ui_qt/input/input.cpp b/src/ui_qt/input/input.cpp
similarity index 100%
rename from bsnes/ui_qt/input/input.cpp
rename to src/ui_qt/input/input.cpp
diff --git a/bsnes/ui_qt/input/input.hpp b/src/ui_qt/input/input.hpp
similarity index 100%
rename from bsnes/ui_qt/input/input.hpp
rename to src/ui_qt/input/input.hpp
diff --git a/bsnes/ui_qt/input/userinterface-emulationspeed.cpp b/src/ui_qt/input/userinterface-emulationspeed.cpp
similarity index 100%
rename from bsnes/ui_qt/input/userinterface-emulationspeed.cpp
rename to src/ui_qt/input/userinterface-emulationspeed.cpp
diff --git a/bsnes/ui_qt/input/userinterface-general.cpp b/src/ui_qt/input/userinterface-general.cpp
similarity index 100%
rename from bsnes/ui_qt/input/userinterface-general.cpp
rename to src/ui_qt/input/userinterface-general.cpp
diff --git a/bsnes/ui_qt/input/userinterface-states.cpp b/src/ui_qt/input/userinterface-states.cpp
similarity index 100%
rename from bsnes/ui_qt/input/userinterface-states.cpp
rename to src/ui_qt/input/userinterface-states.cpp
diff --git a/bsnes/ui_qt/input/userinterface-system.cpp b/src/ui_qt/input/userinterface-system.cpp
similarity index 100%
rename from bsnes/ui_qt/input/userinterface-system.cpp
rename to src/ui_qt/input/userinterface-system.cpp
diff --git a/bsnes/ui_qt/input/userinterface-videosettings.cpp b/src/ui_qt/input/userinterface-videosettings.cpp
similarity index 100%
rename from bsnes/ui_qt/input/userinterface-videosettings.cpp
rename to src/ui_qt/input/userinterface-videosettings.cpp
diff --git a/bsnes/ui_qt/input/userinterface.hpp b/src/ui_qt/input/userinterface.hpp
similarity index 100%
rename from bsnes/ui_qt/input/userinterface.hpp
rename to src/ui_qt/input/userinterface.hpp
diff --git a/bsnes/ui_qt/interface.cpp b/src/ui_qt/interface.cpp
similarity index 100%
rename from bsnes/ui_qt/interface.cpp
rename to src/ui_qt/interface.cpp
diff --git a/bsnes/ui_qt/interface.hpp b/src/ui_qt/interface.hpp
similarity index 100%
rename from bsnes/ui_qt/interface.hpp
rename to src/ui_qt/interface.hpp
diff --git a/bsnes/ui_qt/link/filter.cpp b/src/ui_qt/link/filter.cpp
similarity index 100%
rename from bsnes/ui_qt/link/filter.cpp
rename to src/ui_qt/link/filter.cpp
diff --git a/bsnes/ui_qt/link/filter.hpp b/src/ui_qt/link/filter.hpp
similarity index 100%
rename from bsnes/ui_qt/link/filter.hpp
rename to src/ui_qt/link/filter.hpp
diff --git a/bsnes/ui_qt/link/reader.cpp b/src/ui_qt/link/reader.cpp
similarity index 100%
rename from bsnes/ui_qt/link/reader.cpp
rename to src/ui_qt/link/reader.cpp
diff --git a/bsnes/ui_qt/link/reader.hpp b/src/ui_qt/link/reader.hpp
similarity index 100%
rename from bsnes/ui_qt/link/reader.hpp
rename to src/ui_qt/link/reader.hpp
diff --git a/bsnes/ui_qt/main.cpp b/src/ui_qt/main.cpp
similarity index 100%
rename from bsnes/ui_qt/main.cpp
rename to src/ui_qt/main.cpp
diff --git a/bsnes/ui_qt/movie/movie.cpp b/src/ui_qt/movie/movie.cpp
similarity index 100%
rename from bsnes/ui_qt/movie/movie.cpp
rename to src/ui_qt/movie/movie.cpp
diff --git a/bsnes/ui_qt/movie/movie.hpp b/src/ui_qt/movie/movie.hpp
similarity index 100%
rename from bsnes/ui_qt/movie/movie.hpp
rename to src/ui_qt/movie/movie.hpp
diff --git a/bsnes/ui_qt/platform/platform_osx.cpp b/src/ui_qt/platform/platform_osx.cpp
similarity index 100%
rename from bsnes/ui_qt/platform/platform_osx.cpp
rename to src/ui_qt/platform/platform_osx.cpp
diff --git a/bsnes/ui_qt/platform/platform_win.cpp b/src/ui_qt/platform/platform_win.cpp
similarity index 100%
rename from bsnes/ui_qt/platform/platform_win.cpp
rename to src/ui_qt/platform/platform_win.cpp
diff --git a/bsnes/ui_qt/platform/platform_x.cpp b/src/ui_qt/platform/platform_x.cpp
similarity index 100%
rename from bsnes/ui_qt/platform/platform_x.cpp
rename to src/ui_qt/platform/platform_x.cpp
diff --git a/bsnes/ui_qt/resource/resource.qrc b/src/ui_qt/resource/resource.qrc
similarity index 100%
rename from bsnes/ui_qt/resource/resource.qrc
rename to src/ui_qt/resource/resource.qrc
diff --git a/bsnes/ui_qt/resource/resource.rc b/src/ui_qt/resource/resource.rc
similarity index 100%
rename from bsnes/ui_qt/resource/resource.rc
rename to src/ui_qt/resource/resource.rc
diff --git a/bsnes/ui_qt/settings/advanced.cpp b/src/ui_qt/settings/advanced.cpp
similarity index 100%
rename from bsnes/ui_qt/settings/advanced.cpp
rename to src/ui_qt/settings/advanced.cpp
diff --git a/bsnes/ui_qt/settings/advanced.moc.hpp b/src/ui_qt/settings/advanced.moc.hpp
similarity index 100%
rename from bsnes/ui_qt/settings/advanced.moc.hpp
rename to src/ui_qt/settings/advanced.moc.hpp
diff --git a/bsnes/ui_qt/settings/audio.cpp b/src/ui_qt/settings/audio.cpp
similarity index 100%
rename from bsnes/ui_qt/settings/audio.cpp
rename to src/ui_qt/settings/audio.cpp
diff --git a/bsnes/ui_qt/settings/audio.moc.hpp b/src/ui_qt/settings/audio.moc.hpp
similarity index 100%
rename from bsnes/ui_qt/settings/audio.moc.hpp
rename to src/ui_qt/settings/audio.moc.hpp
diff --git a/bsnes/ui_qt/settings/input.cpp b/src/ui_qt/settings/input.cpp
similarity index 100%
rename from bsnes/ui_qt/settings/input.cpp
rename to src/ui_qt/settings/input.cpp
diff --git a/bsnes/ui_qt/settings/input.moc.hpp b/src/ui_qt/settings/input.moc.hpp
similarity index 100%
rename from bsnes/ui_qt/settings/input.moc.hpp
rename to src/ui_qt/settings/input.moc.hpp
diff --git a/bsnes/ui_qt/settings/paths.cpp b/src/ui_qt/settings/paths.cpp
similarity index 100%
rename from bsnes/ui_qt/settings/paths.cpp
rename to src/ui_qt/settings/paths.cpp
diff --git a/bsnes/ui_qt/settings/paths.moc.hpp b/src/ui_qt/settings/paths.moc.hpp
similarity index 100%
rename from bsnes/ui_qt/settings/paths.moc.hpp
rename to src/ui_qt/settings/paths.moc.hpp
diff --git a/bsnes/ui_qt/settings/settings.cpp b/src/ui_qt/settings/settings.cpp
similarity index 100%
rename from bsnes/ui_qt/settings/settings.cpp
rename to src/ui_qt/settings/settings.cpp
diff --git a/bsnes/ui_qt/settings/settings.moc.hpp b/src/ui_qt/settings/settings.moc.hpp
similarity index 100%
rename from bsnes/ui_qt/settings/settings.moc.hpp
rename to src/ui_qt/settings/settings.moc.hpp
diff --git a/bsnes/ui_qt/settings/video.cpp b/src/ui_qt/settings/video.cpp
similarity index 100%
rename from bsnes/ui_qt/settings/video.cpp
rename to src/ui_qt/settings/video.cpp
diff --git a/bsnes/ui_qt/settings/video.moc.hpp b/src/ui_qt/settings/video.moc.hpp
similarity index 100%
rename from bsnes/ui_qt/settings/video.moc.hpp
rename to src/ui_qt/settings/video.moc.hpp
diff --git a/bsnes/ui_qt/state/state.cpp b/src/ui_qt/state/state.cpp
similarity index 100%
rename from bsnes/ui_qt/state/state.cpp
rename to src/ui_qt/state/state.cpp
diff --git a/bsnes/ui_qt/state/state.hpp b/src/ui_qt/state/state.hpp
similarity index 100%
rename from bsnes/ui_qt/state/state.hpp
rename to src/ui_qt/state/state.hpp
diff --git a/bsnes/ui_qt/tools/cheateditor.cpp b/src/ui_qt/tools/cheateditor.cpp
similarity index 100%
rename from bsnes/ui_qt/tools/cheateditor.cpp
rename to src/ui_qt/tools/cheateditor.cpp
diff --git a/bsnes/ui_qt/tools/cheateditor.moc.hpp b/src/ui_qt/tools/cheateditor.moc.hpp
similarity index 100%
rename from bsnes/ui_qt/tools/cheateditor.moc.hpp
rename to src/ui_qt/tools/cheateditor.moc.hpp
diff --git a/bsnes/ui_qt/tools/cheatfinder.cpp b/src/ui_qt/tools/cheatfinder.cpp
similarity index 100%
rename from bsnes/ui_qt/tools/cheatfinder.cpp
rename to src/ui_qt/tools/cheatfinder.cpp
diff --git a/bsnes/ui_qt/tools/cheatfinder.moc.hpp b/src/ui_qt/tools/cheatfinder.moc.hpp
similarity index 100%
rename from bsnes/ui_qt/tools/cheatfinder.moc.hpp
rename to src/ui_qt/tools/cheatfinder.moc.hpp
diff --git a/bsnes/ui_qt/tools/statemanager.cpp b/src/ui_qt/tools/statemanager.cpp
similarity index 100%
rename from bsnes/ui_qt/tools/statemanager.cpp
rename to src/ui_qt/tools/statemanager.cpp
diff --git a/bsnes/ui_qt/tools/statemanager.moc.hpp b/src/ui_qt/tools/statemanager.moc.hpp
similarity index 100%
rename from bsnes/ui_qt/tools/statemanager.moc.hpp
rename to src/ui_qt/tools/statemanager.moc.hpp
diff --git a/bsnes/ui_qt/tools/tools.cpp b/src/ui_qt/tools/tools.cpp
similarity index 100%
rename from bsnes/ui_qt/tools/tools.cpp
rename to src/ui_qt/tools/tools.cpp
diff --git a/bsnes/ui_qt/tools/tools.moc.hpp b/src/ui_qt/tools/tools.moc.hpp
similarity index 100%
rename from bsnes/ui_qt/tools/tools.moc.hpp
rename to src/ui_qt/tools/tools.moc.hpp
diff --git a/bsnes/ui_qt/ui-base.hpp b/src/ui_qt/ui-base.hpp
similarity index 100%
rename from bsnes/ui_qt/ui-base.hpp
rename to src/ui_qt/ui-base.hpp
diff --git a/bsnes/ui_qt/utility/system-state.cpp b/src/ui_qt/utility/system-state.cpp
similarity index 100%
rename from bsnes/ui_qt/utility/system-state.cpp
rename to src/ui_qt/utility/system-state.cpp
diff --git a/bsnes/ui_qt/utility/utility.cpp b/src/ui_qt/utility/utility.cpp
similarity index 100%
rename from bsnes/ui_qt/utility/utility.cpp
rename to src/ui_qt/utility/utility.cpp
diff --git a/bsnes/ui_qt/utility/utility.hpp b/src/ui_qt/utility/utility.hpp
similarity index 100%
rename from bsnes/ui_qt/utility/utility.hpp
rename to src/ui_qt/utility/utility.hpp
diff --git a/bsnes/ui_qt/utility/window.cpp b/src/ui_qt/utility/window.cpp
similarity index 100%
rename from bsnes/ui_qt/utility/window.cpp
rename to src/ui_qt/utility/window.cpp
diff --git a/supergameboy.dll b/supergameboy.dll
index d7595f68..138c042d 100644
Binary files a/supergameboy.dll and b/supergameboy.dll differ