diff --git a/desmume/AUTHORS b/AUTHORS
similarity index 100%
rename from desmume/AUTHORS
rename to AUTHORS
diff --git a/desmume/COPYING b/COPYING
similarity index 100%
rename from desmume/COPYING
rename to COPYING
diff --git a/desmume/ChangeLog b/ChangeLog
similarity index 100%
rename from desmume/ChangeLog
rename to ChangeLog
diff --git a/desmume/Makefile.am b/Makefile.am
similarity index 100%
rename from desmume/Makefile.am
rename to Makefile.am
diff --git a/desmume/NEWS b/NEWS
similarity index 100%
rename from desmume/NEWS
rename to NEWS
diff --git a/desmume/README b/README
similarity index 100%
rename from desmume/README
rename to README
diff --git a/desmume/README.LIN b/README.LIN
similarity index 100%
rename from desmume/README.LIN
rename to README.LIN
diff --git a/desmume/README.MAC b/README.MAC
similarity index 100%
rename from desmume/README.MAC
rename to README.MAC
diff --git a/desmume/README.TRANSLATION b/README.TRANSLATION
similarity index 100%
rename from desmume/README.TRANSLATION
rename to README.TRANSLATION
diff --git a/desmume/README.WIN b/README.WIN
similarity index 100%
rename from desmume/README.WIN
rename to README.WIN
diff --git a/desmume/TODO b/TODO
similarity index 100%
rename from desmume/TODO
rename to TODO
diff --git a/desmume/autogen.sh b/autogen.sh
similarity index 100%
rename from desmume/autogen.sh
rename to autogen.sh
diff --git a/desmume/autopackage/default.apspec.in b/autopackage/default.apspec.in
similarity index 100%
rename from desmume/autopackage/default.apspec.in
rename to autopackage/default.apspec.in
diff --git a/desmume/compile b/compile
similarity index 100%
rename from desmume/compile
rename to compile
diff --git a/desmume/configure.ac b/configure.ac
similarity index 100%
rename from desmume/configure.ac
rename to configure.ac
diff --git a/desmume/dsm.txt b/dsm.txt
similarity index 100%
rename from desmume/dsm.txt
rename to dsm.txt
diff --git a/desmume/dsv.txt b/dsv.txt
similarity index 100%
rename from desmume/dsv.txt
rename to dsv.txt
diff --git a/desmume/faq.htm b/faq.htm
similarity index 100%
rename from desmume/faq.htm
rename to faq.htm
diff --git a/desmume/po/ChangeLog b/po/ChangeLog
similarity index 100%
rename from desmume/po/ChangeLog
rename to po/ChangeLog
diff --git a/desmume/po/LINGUAS b/po/LINGUAS
similarity index 100%
rename from desmume/po/LINGUAS
rename to po/LINGUAS
diff --git a/desmume/po/PACKAGE b/po/PACKAGE
similarity index 100%
rename from desmume/po/PACKAGE
rename to po/PACKAGE
diff --git a/desmume/po/POTFILES.in b/po/POTFILES.in
similarity index 100%
rename from desmume/po/POTFILES.in
rename to po/POTFILES.in
diff --git a/desmume/po/desmume.pot b/po/desmume.pot
similarity index 100%
rename from desmume/po/desmume.pot
rename to po/desmume.pot
diff --git a/desmume/po/fr.po b/po/fr.po
similarity index 100%
rename from desmume/po/fr.po
rename to po/fr.po
diff --git a/desmume/po/pt_BR.po b/po/pt_BR.po
similarity index 100%
rename from desmume/po/pt_BR.po
rename to po/pt_BR.po
diff --git a/desmume/po/sv.po b/po/sv.po
similarity index 100%
rename from desmume/po/sv.po
rename to po/sv.po
diff --git a/desmume/po/windows/en_US.po b/po/windows/en_US.po
similarity index 100%
rename from desmume/po/windows/en_US.po
rename to po/windows/en_US.po
diff --git a/desmume/po/windows/fr_FR.po b/po/windows/fr_FR.po
similarity index 100%
rename from desmume/po/windows/fr_FR.po
rename to po/windows/fr_FR.po
diff --git a/desmume/src/ARM9.h b/src/ARM9.h
similarity index 100%
rename from desmume/src/ARM9.h
rename to src/ARM9.h
diff --git a/desmume/src/Disassembler.cpp b/src/Disassembler.cpp
similarity index 100%
rename from desmume/src/Disassembler.cpp
rename to src/Disassembler.cpp
diff --git a/desmume/src/Disassembler.h b/src/Disassembler.h
similarity index 100%
rename from desmume/src/Disassembler.h
rename to src/Disassembler.h
diff --git a/desmume/src/FIFO.cpp b/src/FIFO.cpp
similarity index 100%
rename from desmume/src/FIFO.cpp
rename to src/FIFO.cpp
diff --git a/desmume/src/FIFO.h b/src/FIFO.h
similarity index 100%
rename from desmume/src/FIFO.h
rename to src/FIFO.h
diff --git a/desmume/src/GPU.cpp b/src/GPU.cpp
similarity index 100%
rename from desmume/src/GPU.cpp
rename to src/GPU.cpp
diff --git a/desmume/src/GPU.h b/src/GPU.h
similarity index 100%
rename from desmume/src/GPU.h
rename to src/GPU.h
diff --git a/desmume/src/GPU_osd.cpp b/src/GPU_osd.cpp
similarity index 100%
rename from desmume/src/GPU_osd.cpp
rename to src/GPU_osd.cpp
diff --git a/desmume/src/GPU_osd.h b/src/GPU_osd.h
similarity index 100%
rename from desmume/src/GPU_osd.h
rename to src/GPU_osd.h
diff --git a/desmume/src/MMU.cpp b/src/MMU.cpp
similarity index 100%
rename from desmume/src/MMU.cpp
rename to src/MMU.cpp
diff --git a/desmume/src/MMU.h b/src/MMU.h
similarity index 100%
rename from desmume/src/MMU.h
rename to src/MMU.h
diff --git a/desmume/src/Makefile.am b/src/Makefile.am
similarity index 100%
rename from desmume/src/Makefile.am
rename to src/Makefile.am
diff --git a/desmume/src/NDSSystem.cpp b/src/NDSSystem.cpp
similarity index 100%
rename from desmume/src/NDSSystem.cpp
rename to src/NDSSystem.cpp
diff --git a/desmume/src/NDSSystem.h b/src/NDSSystem.h
similarity index 100%
rename from desmume/src/NDSSystem.h
rename to src/NDSSystem.h
diff --git a/desmume/src/OGLRender.cpp b/src/OGLRender.cpp
similarity index 100%
rename from desmume/src/OGLRender.cpp
rename to src/OGLRender.cpp
diff --git a/desmume/src/OGLRender.h b/src/OGLRender.h
similarity index 100%
rename from desmume/src/OGLRender.h
rename to src/OGLRender.h
diff --git a/desmume/src/PACKED.h b/src/PACKED.h
similarity index 100%
rename from desmume/src/PACKED.h
rename to src/PACKED.h
diff --git a/desmume/src/PACKED_END.h b/src/PACKED_END.h
similarity index 100%
rename from desmume/src/PACKED_END.h
rename to src/PACKED_END.h
diff --git a/desmume/src/ROMReader.cpp b/src/ROMReader.cpp
similarity index 100%
rename from desmume/src/ROMReader.cpp
rename to src/ROMReader.cpp
diff --git a/desmume/src/ROMReader.h b/src/ROMReader.h
similarity index 100%
rename from desmume/src/ROMReader.h
rename to src/ROMReader.h
diff --git a/desmume/src/SPU.cpp b/src/SPU.cpp
similarity index 100%
rename from desmume/src/SPU.cpp
rename to src/SPU.cpp
diff --git a/desmume/src/SPU.h b/src/SPU.h
similarity index 100%
rename from desmume/src/SPU.h
rename to src/SPU.h
diff --git a/desmume/src/addons.cpp b/src/addons.cpp
similarity index 100%
rename from desmume/src/addons.cpp
rename to src/addons.cpp
diff --git a/desmume/src/addons.h b/src/addons.h
similarity index 100%
rename from desmume/src/addons.h
rename to src/addons.h
diff --git a/desmume/src/addons/compactFlash.cpp b/src/addons/compactFlash.cpp
similarity index 100%
rename from desmume/src/addons/compactFlash.cpp
rename to src/addons/compactFlash.cpp
diff --git a/desmume/src/addons/gbagame.cpp b/src/addons/gbagame.cpp
similarity index 100%
rename from desmume/src/addons/gbagame.cpp
rename to src/addons/gbagame.cpp
diff --git a/desmume/src/addons/none.cpp b/src/addons/none.cpp
similarity index 100%
rename from desmume/src/addons/none.cpp
rename to src/addons/none.cpp
diff --git a/desmume/src/addons/rumblepak.cpp b/src/addons/rumblepak.cpp
similarity index 100%
rename from desmume/src/addons/rumblepak.cpp
rename to src/addons/rumblepak.cpp
diff --git a/desmume/src/arm_instructions.cpp b/src/arm_instructions.cpp
similarity index 100%
rename from desmume/src/arm_instructions.cpp
rename to src/arm_instructions.cpp
diff --git a/desmume/src/arm_instructions.h b/src/arm_instructions.h
similarity index 100%
rename from desmume/src/arm_instructions.h
rename to src/arm_instructions.h
diff --git a/desmume/src/armcpu.cpp b/src/armcpu.cpp
similarity index 100%
rename from desmume/src/armcpu.cpp
rename to src/armcpu.cpp
diff --git a/desmume/src/armcpu.h b/src/armcpu.h
similarity index 100%
rename from desmume/src/armcpu.h
rename to src/armcpu.h
diff --git a/desmume/src/bios.cpp b/src/bios.cpp
similarity index 100%
rename from desmume/src/bios.cpp
rename to src/bios.cpp
diff --git a/desmume/src/bios.h b/src/bios.h
similarity index 100%
rename from desmume/src/bios.h
rename to src/bios.h
diff --git a/desmume/src/bits.h b/src/bits.h
similarity index 100%
rename from desmume/src/bits.h
rename to src/bits.h
diff --git a/desmume/src/build.bat b/src/build.bat
similarity index 100%
rename from desmume/src/build.bat
rename to src/build.bat
diff --git a/desmume/src/cflash.cpp b/src/cflash.cpp
similarity index 100%
rename from desmume/src/cflash.cpp
rename to src/cflash.cpp
diff --git a/desmume/src/cflash.h b/src/cflash.h
similarity index 100%
rename from desmume/src/cflash.h
rename to src/cflash.h
diff --git a/desmume/src/cheatSystem.cpp b/src/cheatSystem.cpp
similarity index 100%
rename from desmume/src/cheatSystem.cpp
rename to src/cheatSystem.cpp
diff --git a/desmume/src/cheatSystem.h b/src/cheatSystem.h
similarity index 100%
rename from desmume/src/cheatSystem.h
rename to src/cheatSystem.h
diff --git a/desmume/src/cli/Makefile.am b/src/cli/Makefile.am
similarity index 100%
rename from desmume/src/cli/Makefile.am
rename to src/cli/Makefile.am
diff --git a/desmume/src/cli/doc/Makefile.am b/src/cli/doc/Makefile.am
similarity index 100%
rename from desmume/src/cli/doc/Makefile.am
rename to src/cli/doc/Makefile.am
diff --git a/desmume/src/cli/doc/desmume-cli.1 b/src/cli/doc/desmume-cli.1
similarity index 100%
rename from desmume/src/cli/doc/desmume-cli.1
rename to src/cli/doc/desmume-cli.1
diff --git a/desmume/src/cli/main.cpp b/src/cli/main.cpp
similarity index 100%
rename from desmume/src/cli/main.cpp
rename to src/cli/main.cpp
diff --git a/desmume/src/cocoa/DeSmuME.cbp b/src/cocoa/DeSmuME.cbp
similarity index 100%
rename from desmume/src/cocoa/DeSmuME.cbp
rename to src/cocoa/DeSmuME.cbp
diff --git a/desmume/src/cocoa/DeSmuME.icns b/src/cocoa/DeSmuME.icns
similarity index 100%
rename from desmume/src/cocoa/DeSmuME.icns
rename to src/cocoa/DeSmuME.icns
diff --git a/desmume/src/cocoa/DeSmuME.xcodeproj/project.pbxproj b/src/cocoa/DeSmuME.xcodeproj/project.pbxproj
similarity index 100%
rename from desmume/src/cocoa/DeSmuME.xcodeproj/project.pbxproj
rename to src/cocoa/DeSmuME.xcodeproj/project.pbxproj
diff --git a/desmume/src/cocoa/Info.plist b/src/cocoa/Info.plist
similarity index 100%
rename from desmume/src/cocoa/Info.plist
rename to src/cocoa/Info.plist
diff --git a/desmume/src/cocoa/InfoPlist.strings b/src/cocoa/InfoPlist.strings
similarity index 100%
rename from desmume/src/cocoa/InfoPlist.strings
rename to src/cocoa/InfoPlist.strings
diff --git a/desmume/src/cocoa/Makefile.am b/src/cocoa/Makefile.am
similarity index 100%
rename from desmume/src/cocoa/Makefile.am
rename to src/cocoa/Makefile.am
diff --git a/desmume/src/cocoa/PkgInfo b/src/cocoa/PkgInfo
similarity index 100%
rename from desmume/src/cocoa/PkgInfo
rename to src/cocoa/PkgInfo
diff --git a/desmume/src/cocoa/Rakefile b/src/cocoa/Rakefile
similarity index 100%
rename from desmume/src/cocoa/Rakefile
rename to src/cocoa/Rakefile
diff --git a/desmume/src/cocoa/about.m b/src/cocoa/about.m
similarity index 100%
rename from desmume/src/cocoa/about.m
rename to src/cocoa/about.m
diff --git a/desmume/src/cocoa/build_dmg.sh b/src/cocoa/build_dmg.sh
similarity index 100%
rename from desmume/src/cocoa/build_dmg.sh
rename to src/cocoa/build_dmg.sh
diff --git a/desmume/src/cocoa/cocoa_util.m b/src/cocoa/cocoa_util.m
similarity index 100%
rename from desmume/src/cocoa/cocoa_util.m
rename to src/cocoa/cocoa_util.m
diff --git a/desmume/src/cocoa/dialogs/rom_info.h b/src/cocoa/dialogs/rom_info.h
similarity index 100%
rename from desmume/src/cocoa/dialogs/rom_info.h
rename to src/cocoa/dialogs/rom_info.h
diff --git a/desmume/src/cocoa/dialogs/rom_info.m b/src/cocoa/dialogs/rom_info.m
similarity index 100%
rename from desmume/src/cocoa/dialogs/rom_info.m
rename to src/cocoa/dialogs/rom_info.m
diff --git a/desmume/src/cocoa/dialogs/speed_limit_selection_window.h b/src/cocoa/dialogs/speed_limit_selection_window.h
similarity index 100%
rename from desmume/src/cocoa/dialogs/speed_limit_selection_window.h
rename to src/cocoa/dialogs/speed_limit_selection_window.h
diff --git a/desmume/src/cocoa/dialogs/speed_limit_selection_window.mm b/src/cocoa/dialogs/speed_limit_selection_window.mm
similarity index 100%
rename from desmume/src/cocoa/dialogs/speed_limit_selection_window.mm
rename to src/cocoa/dialogs/speed_limit_selection_window.mm
diff --git a/desmume/src/cocoa/globals.h b/src/cocoa/globals.h
similarity index 100%
rename from desmume/src/cocoa/globals.h
rename to src/cocoa/globals.h
diff --git a/desmume/src/cocoa/input.h b/src/cocoa/input.h
similarity index 100%
rename from desmume/src/cocoa/input.h
rename to src/cocoa/input.h
diff --git a/desmume/src/cocoa/input.mm b/src/cocoa/input.mm
similarity index 100%
rename from desmume/src/cocoa/input.mm
rename to src/cocoa/input.mm
diff --git a/desmume/src/cocoa/main.mm b/src/cocoa/main.mm
similarity index 100%
rename from desmume/src/cocoa/main.mm
rename to src/cocoa/main.mm
diff --git a/desmume/src/cocoa/main_window.h b/src/cocoa/main_window.h
similarity index 100%
rename from desmume/src/cocoa/main_window.h
rename to src/cocoa/main_window.h
diff --git a/desmume/src/cocoa/main_window.mm b/src/cocoa/main_window.mm
similarity index 100%
rename from desmume/src/cocoa/main_window.mm
rename to src/cocoa/main_window.mm
diff --git a/desmume/src/cocoa/makeapp.sh b/src/cocoa/makeapp.sh
similarity index 100%
rename from desmume/src/cocoa/makeapp.sh
rename to src/cocoa/makeapp.sh
diff --git a/desmume/src/cocoa/nds_control.h b/src/cocoa/nds_control.h
similarity index 100%
rename from desmume/src/cocoa/nds_control.h
rename to src/cocoa/nds_control.h
diff --git a/desmume/src/cocoa/nds_control.mm b/src/cocoa/nds_control.mm
similarity index 100%
rename from desmume/src/cocoa/nds_control.mm
rename to src/cocoa/nds_control.mm
diff --git a/desmume/src/cocoa/preferences.h b/src/cocoa/preferences.h
similarity index 100%
rename from desmume/src/cocoa/preferences.h
rename to src/cocoa/preferences.h
diff --git a/desmume/src/cocoa/preferences.mm b/src/cocoa/preferences.mm
similarity index 100%
rename from desmume/src/cocoa/preferences.mm
rename to src/cocoa/preferences.mm
diff --git a/desmume/src/cocoa/screen_state.h b/src/cocoa/screen_state.h
similarity index 100%
rename from desmume/src/cocoa/screen_state.h
rename to src/cocoa/screen_state.h
diff --git a/desmume/src/cocoa/screen_state.m b/src/cocoa/screen_state.m
similarity index 100%
rename from desmume/src/cocoa/screen_state.m
rename to src/cocoa/screen_state.m
diff --git a/desmume/src/cocoa/screenshot.h b/src/cocoa/screenshot.h
similarity index 100%
rename from desmume/src/cocoa/screenshot.h
rename to src/cocoa/screenshot.h
diff --git a/desmume/src/cocoa/screenshot.mm b/src/cocoa/screenshot.mm
similarity index 100%
rename from desmume/src/cocoa/screenshot.mm
rename to src/cocoa/screenshot.mm
diff --git a/desmume/src/cocoa/sndOSX.h b/src/cocoa/sndOSX.h
similarity index 100%
rename from desmume/src/cocoa/sndOSX.h
rename to src/cocoa/sndOSX.h
diff --git a/desmume/src/cocoa/sndOSX.mm b/src/cocoa/sndOSX.mm
similarity index 100%
rename from desmume/src/cocoa/sndOSX.mm
rename to src/cocoa/sndOSX.mm
diff --git a/desmume/src/cocoa/translations/English.lproj/Localizable.strings b/src/cocoa/translations/English.lproj/Localizable.strings
similarity index 100%
rename from desmume/src/cocoa/translations/English.lproj/Localizable.strings
rename to src/cocoa/translations/English.lproj/Localizable.strings
diff --git a/desmume/src/cocoa/translations/English.lproj/MainMenu.nib/classes.nib b/src/cocoa/translations/English.lproj/MainMenu.nib/classes.nib
similarity index 100%
rename from desmume/src/cocoa/translations/English.lproj/MainMenu.nib/classes.nib
rename to src/cocoa/translations/English.lproj/MainMenu.nib/classes.nib
diff --git a/desmume/src/cocoa/translations/English.lproj/MainMenu.nib/info.nib b/src/cocoa/translations/English.lproj/MainMenu.nib/info.nib
similarity index 100%
rename from desmume/src/cocoa/translations/English.lproj/MainMenu.nib/info.nib
rename to src/cocoa/translations/English.lproj/MainMenu.nib/info.nib
diff --git a/desmume/src/cocoa/translations/English.lproj/MainMenu.nib/keyedobjects.nib b/src/cocoa/translations/English.lproj/MainMenu.nib/keyedobjects.nib
similarity index 100%
rename from desmume/src/cocoa/translations/English.lproj/MainMenu.nib/keyedobjects.nib
rename to src/cocoa/translations/English.lproj/MainMenu.nib/keyedobjects.nib
diff --git a/desmume/src/cocoa/translations/French.lproj/Localizable.strings b/src/cocoa/translations/French.lproj/Localizable.strings
similarity index 100%
rename from desmume/src/cocoa/translations/French.lproj/Localizable.strings
rename to src/cocoa/translations/French.lproj/Localizable.strings
diff --git a/desmume/src/cocoa/translations/French.lproj/MainMenu.nib/classes.nib b/src/cocoa/translations/French.lproj/MainMenu.nib/classes.nib
similarity index 100%
rename from desmume/src/cocoa/translations/French.lproj/MainMenu.nib/classes.nib
rename to src/cocoa/translations/French.lproj/MainMenu.nib/classes.nib
diff --git a/desmume/src/cocoa/translations/French.lproj/MainMenu.nib/info.nib b/src/cocoa/translations/French.lproj/MainMenu.nib/info.nib
similarity index 100%
rename from desmume/src/cocoa/translations/French.lproj/MainMenu.nib/info.nib
rename to src/cocoa/translations/French.lproj/MainMenu.nib/info.nib
diff --git a/desmume/src/cocoa/translations/French.lproj/MainMenu.nib/keyedobjects.nib b/src/cocoa/translations/French.lproj/MainMenu.nib/keyedobjects.nib
similarity index 100%
rename from desmume/src/cocoa/translations/French.lproj/MainMenu.nib/keyedobjects.nib
rename to src/cocoa/translations/French.lproj/MainMenu.nib/keyedobjects.nib
diff --git a/desmume/src/cocoa/translations/Italian.lproj/Localizable.strings b/src/cocoa/translations/Italian.lproj/Localizable.strings
similarity index 100%
rename from desmume/src/cocoa/translations/Italian.lproj/Localizable.strings
rename to src/cocoa/translations/Italian.lproj/Localizable.strings
diff --git a/desmume/src/cocoa/translations/Italian.lproj/MainMenu.nib/classes.nib b/src/cocoa/translations/Italian.lproj/MainMenu.nib/classes.nib
similarity index 100%
rename from desmume/src/cocoa/translations/Italian.lproj/MainMenu.nib/classes.nib
rename to src/cocoa/translations/Italian.lproj/MainMenu.nib/classes.nib
diff --git a/desmume/src/cocoa/translations/Italian.lproj/MainMenu.nib/info.nib b/src/cocoa/translations/Italian.lproj/MainMenu.nib/info.nib
similarity index 100%
rename from desmume/src/cocoa/translations/Italian.lproj/MainMenu.nib/info.nib
rename to src/cocoa/translations/Italian.lproj/MainMenu.nib/info.nib
diff --git a/desmume/src/cocoa/translations/Italian.lproj/MainMenu.nib/keyedobjects.nib b/src/cocoa/translations/Italian.lproj/MainMenu.nib/keyedobjects.nib
similarity index 100%
rename from desmume/src/cocoa/translations/Italian.lproj/MainMenu.nib/keyedobjects.nib
rename to src/cocoa/translations/Italian.lproj/MainMenu.nib/keyedobjects.nib
diff --git a/desmume/src/cocoa/translations/Japanese.lproj/Localizable.strings b/src/cocoa/translations/Japanese.lproj/Localizable.strings
similarity index 100%
rename from desmume/src/cocoa/translations/Japanese.lproj/Localizable.strings
rename to src/cocoa/translations/Japanese.lproj/Localizable.strings
diff --git a/desmume/src/cocoa/translations/Japanese.lproj/MainMenu.nib/classes.nib b/src/cocoa/translations/Japanese.lproj/MainMenu.nib/classes.nib
similarity index 100%
rename from desmume/src/cocoa/translations/Japanese.lproj/MainMenu.nib/classes.nib
rename to src/cocoa/translations/Japanese.lproj/MainMenu.nib/classes.nib
diff --git a/desmume/src/cocoa/translations/Japanese.lproj/MainMenu.nib/info.nib b/src/cocoa/translations/Japanese.lproj/MainMenu.nib/info.nib
similarity index 100%
rename from desmume/src/cocoa/translations/Japanese.lproj/MainMenu.nib/info.nib
rename to src/cocoa/translations/Japanese.lproj/MainMenu.nib/info.nib
diff --git a/desmume/src/cocoa/translations/Japanese.lproj/MainMenu.nib/keyedobjects.nib b/src/cocoa/translations/Japanese.lproj/MainMenu.nib/keyedobjects.nib
similarity index 100%
rename from desmume/src/cocoa/translations/Japanese.lproj/MainMenu.nib/keyedobjects.nib
rename to src/cocoa/translations/Japanese.lproj/MainMenu.nib/keyedobjects.nib
diff --git a/desmume/src/cocoa/video_output_view.h b/src/cocoa/video_output_view.h
similarity index 100%
rename from desmume/src/cocoa/video_output_view.h
rename to src/cocoa/video_output_view.h
diff --git a/desmume/src/cocoa/video_output_view.mm b/src/cocoa/video_output_view.mm
similarity index 100%
rename from desmume/src/cocoa/video_output_view.mm
rename to src/cocoa/video_output_view.mm
diff --git a/desmume/src/commandline.cpp b/src/commandline.cpp
similarity index 100%
rename from desmume/src/commandline.cpp
rename to src/commandline.cpp
diff --git a/desmume/src/commandline.h b/src/commandline.h
similarity index 100%
rename from desmume/src/commandline.h
rename to src/commandline.h
diff --git a/desmume/src/common.cpp b/src/common.cpp
similarity index 100%
rename from desmume/src/common.cpp
rename to src/common.cpp
diff --git a/desmume/src/common.h b/src/common.h
similarity index 100%
rename from desmume/src/common.h
rename to src/common.h
diff --git a/desmume/src/cp15.cpp b/src/cp15.cpp
similarity index 100%
rename from desmume/src/cp15.cpp
rename to src/cp15.cpp
diff --git a/desmume/src/cp15.h b/src/cp15.h
similarity index 100%
rename from desmume/src/cp15.h
rename to src/cp15.h
diff --git a/desmume/src/ctrlssdl.cpp b/src/ctrlssdl.cpp
similarity index 100%
rename from desmume/src/ctrlssdl.cpp
rename to src/ctrlssdl.cpp
diff --git a/desmume/src/ctrlssdl.h b/src/ctrlssdl.h
similarity index 100%
rename from desmume/src/ctrlssdl.h
rename to src/ctrlssdl.h
diff --git a/desmume/src/debug.cpp b/src/debug.cpp
similarity index 100%
rename from desmume/src/debug.cpp
rename to src/debug.cpp
diff --git a/desmume/src/debug.h b/src/debug.h
similarity index 100%
rename from desmume/src/debug.h
rename to src/debug.h
diff --git a/desmume/src/desmume.mk b/src/desmume.mk
similarity index 100%
rename from desmume/src/desmume.mk
rename to src/desmume.mk
diff --git a/desmume/src/driver.h b/src/driver.h
similarity index 100%
rename from desmume/src/driver.h
rename to src/driver.h
diff --git a/desmume/src/dscard.h b/src/dscard.h
similarity index 100%
rename from desmume/src/dscard.h
rename to src/dscard.h
diff --git a/desmume/src/fat.h b/src/fat.h
similarity index 100%
rename from desmume/src/fat.h
rename to src/fat.h
diff --git a/desmume/src/fs-linux.cpp b/src/fs-linux.cpp
similarity index 100%
rename from desmume/src/fs-linux.cpp
rename to src/fs-linux.cpp
diff --git a/desmume/src/fs-windows.cpp b/src/fs-windows.cpp
similarity index 100%
rename from desmume/src/fs-windows.cpp
rename to src/fs-windows.cpp
diff --git a/desmume/src/fs.h b/src/fs.h
similarity index 100%
rename from desmume/src/fs.h
rename to src/fs.h
diff --git a/desmume/src/gdbstub.h b/src/gdbstub.h
similarity index 100%
rename from desmume/src/gdbstub.h
rename to src/gdbstub.h
diff --git a/desmume/src/gdbstub/Makefile.am b/src/gdbstub/Makefile.am
similarity index 100%
rename from desmume/src/gdbstub/Makefile.am
rename to src/gdbstub/Makefile.am
diff --git a/desmume/src/gdbstub/gdbstub.cpp b/src/gdbstub/gdbstub.cpp
similarity index 100%
rename from desmume/src/gdbstub/gdbstub.cpp
rename to src/gdbstub/gdbstub.cpp
diff --git a/desmume/src/gdbstub/gdbstub_internal.h b/src/gdbstub/gdbstub_internal.h
similarity index 100%
rename from desmume/src/gdbstub/gdbstub_internal.h
rename to src/gdbstub/gdbstub_internal.h
diff --git a/desmume/src/gfx3d.cpp b/src/gfx3d.cpp
similarity index 100%
rename from desmume/src/gfx3d.cpp
rename to src/gfx3d.cpp
diff --git a/desmume/src/gfx3d.h b/src/gfx3d.h
similarity index 100%
rename from desmume/src/gfx3d.h
rename to src/gfx3d.h
diff --git a/desmume/src/gtk-glade/Makefile.am b/src/gtk-glade/Makefile.am
similarity index 100%
rename from desmume/src/gtk-glade/Makefile.am
rename to src/gtk-glade/Makefile.am
diff --git a/desmume/src/gtk-glade/callbacks.cpp b/src/gtk-glade/callbacks.cpp
similarity index 100%
rename from desmume/src/gtk-glade/callbacks.cpp
rename to src/gtk-glade/callbacks.cpp
diff --git a/desmume/src/gtk-glade/callbacks.h b/src/gtk-glade/callbacks.h
similarity index 100%
rename from desmume/src/gtk-glade/callbacks.h
rename to src/gtk-glade/callbacks.h
diff --git a/desmume/src/gtk-glade/callbacks_IO.cpp b/src/gtk-glade/callbacks_IO.cpp
similarity index 100%
rename from desmume/src/gtk-glade/callbacks_IO.cpp
rename to src/gtk-glade/callbacks_IO.cpp
diff --git a/desmume/src/gtk-glade/callbacks_IO.h b/src/gtk-glade/callbacks_IO.h
similarity index 100%
rename from desmume/src/gtk-glade/callbacks_IO.h
rename to src/gtk-glade/callbacks_IO.h
diff --git a/desmume/src/gtk-glade/dTools/callbacks_1_ioregs.cpp b/src/gtk-glade/dTools/callbacks_1_ioregs.cpp
similarity index 100%
rename from desmume/src/gtk-glade/dTools/callbacks_1_ioregs.cpp
rename to src/gtk-glade/dTools/callbacks_1_ioregs.cpp
diff --git a/desmume/src/gtk-glade/dTools/callbacks_2_memview.cpp b/src/gtk-glade/dTools/callbacks_2_memview.cpp
similarity index 100%
rename from desmume/src/gtk-glade/dTools/callbacks_2_memview.cpp
rename to src/gtk-glade/dTools/callbacks_2_memview.cpp
diff --git a/desmume/src/gtk-glade/dTools/callbacks_3_palview.cpp b/src/gtk-glade/dTools/callbacks_3_palview.cpp
similarity index 100%
rename from desmume/src/gtk-glade/dTools/callbacks_3_palview.cpp
rename to src/gtk-glade/dTools/callbacks_3_palview.cpp
diff --git a/desmume/src/gtk-glade/dTools/callbacks_4_tileview.cpp b/src/gtk-glade/dTools/callbacks_4_tileview.cpp
similarity index 100%
rename from desmume/src/gtk-glade/dTools/callbacks_4_tileview.cpp
rename to src/gtk-glade/dTools/callbacks_4_tileview.cpp
diff --git a/desmume/src/gtk-glade/dTools/callbacks_dtools.h b/src/gtk-glade/dTools/callbacks_dtools.h
similarity index 100%
rename from desmume/src/gtk-glade/dTools/callbacks_dtools.h
rename to src/gtk-glade/dTools/callbacks_dtools.h
diff --git a/desmume/src/gtk-glade/dTools/dTools_display.h b/src/gtk-glade/dTools/dTools_display.h
similarity index 100%
rename from desmume/src/gtk-glade/dTools/dTools_display.h
rename to src/gtk-glade/dTools/dTools_display.h
diff --git a/desmume/src/gtk-glade/desmume-glade.desktop b/src/gtk-glade/desmume-glade.desktop
similarity index 100%
rename from desmume/src/gtk-glade/desmume-glade.desktop
rename to src/gtk-glade/desmume-glade.desktop
diff --git a/desmume/src/gtk-glade/desmume.cpp b/src/gtk-glade/desmume.cpp
similarity index 100%
rename from desmume/src/gtk-glade/desmume.cpp
rename to src/gtk-glade/desmume.cpp
diff --git a/desmume/src/gtk-glade/desmume.h b/src/gtk-glade/desmume.h
similarity index 100%
rename from desmume/src/gtk-glade/desmume.h
rename to src/gtk-glade/desmume.h
diff --git a/desmume/src/gtk-glade/doc/Makefile.am b/src/gtk-glade/doc/Makefile.am
similarity index 100%
rename from desmume/src/gtk-glade/doc/Makefile.am
rename to src/gtk-glade/doc/Makefile.am
diff --git a/desmume/src/gtk-glade/doc/desmume-glade.1 b/src/gtk-glade/doc/desmume-glade.1
similarity index 100%
rename from desmume/src/gtk-glade/doc/desmume-glade.1
rename to src/gtk-glade/doc/desmume-glade.1
diff --git a/desmume/src/gtk-glade/gdk_3Demu.cpp b/src/gtk-glade/gdk_3Demu.cpp
similarity index 100%
rename from desmume/src/gtk-glade/gdk_3Demu.cpp
rename to src/gtk-glade/gdk_3Demu.cpp
diff --git a/desmume/src/gtk-glade/gdk_3Demu.h b/src/gtk-glade/gdk_3Demu.h
similarity index 100%
rename from desmume/src/gtk-glade/gdk_3Demu.h
rename to src/gtk-glade/gdk_3Demu.h
diff --git a/desmume/src/gtk-glade/gdk_gl.cpp b/src/gtk-glade/gdk_gl.cpp
similarity index 100%
rename from desmume/src/gtk-glade/gdk_gl.cpp
rename to src/gtk-glade/gdk_gl.cpp
diff --git a/desmume/src/gtk-glade/gdk_gl.h b/src/gtk-glade/gdk_gl.h
similarity index 100%
rename from desmume/src/gtk-glade/gdk_gl.h
rename to src/gtk-glade/gdk_gl.h
diff --git a/desmume/src/gtk-glade/glade-xml.cpp b/src/gtk-glade/glade-xml.cpp
similarity index 100%
rename from desmume/src/gtk-glade/glade-xml.cpp
rename to src/gtk-glade/glade-xml.cpp
diff --git a/desmume/src/gtk-glade/glade/DeSmuME.xpm b/src/gtk-glade/glade/DeSmuME.xpm
similarity index 100%
rename from desmume/src/gtk-glade/glade/DeSmuME.xpm
rename to src/gtk-glade/glade/DeSmuME.xpm
diff --git a/desmume/src/gtk-glade/glade/DeSmuMe.glade b/src/gtk-glade/glade/DeSmuMe.glade
similarity index 100%
rename from desmume/src/gtk-glade/glade/DeSmuMe.glade
rename to src/gtk-glade/glade/DeSmuMe.glade
diff --git a/desmume/src/gtk-glade/glade/DeSmuMe_Dtools.glade b/src/gtk-glade/glade/DeSmuMe_Dtools.glade
similarity index 100%
rename from desmume/src/gtk-glade/glade/DeSmuMe_Dtools.glade
rename to src/gtk-glade/glade/DeSmuMe_Dtools.glade
diff --git a/desmume/src/gtk-glade/globals.h b/src/gtk-glade/globals.h
similarity index 100%
rename from desmume/src/gtk-glade/globals.h
rename to src/gtk-glade/globals.h
diff --git a/desmume/src/gtk-glade/keyval_names.cpp b/src/gtk-glade/keyval_names.cpp
similarity index 100%
rename from desmume/src/gtk-glade/keyval_names.cpp
rename to src/gtk-glade/keyval_names.cpp
diff --git a/desmume/src/gtk-glade/keyval_names.h b/src/gtk-glade/keyval_names.h
similarity index 100%
rename from desmume/src/gtk-glade/keyval_names.h
rename to src/gtk-glade/keyval_names.h
diff --git a/desmume/src/gtk-glade/main.cpp b/src/gtk-glade/main.cpp
similarity index 100%
rename from desmume/src/gtk-glade/main.cpp
rename to src/gtk-glade/main.cpp
diff --git a/desmume/src/gtk/DeSmuME.xpm b/src/gtk/DeSmuME.xpm
similarity index 100%
rename from desmume/src/gtk/DeSmuME.xpm
rename to src/gtk/DeSmuME.xpm
diff --git a/desmume/src/gtk/Makefile.am b/src/gtk/Makefile.am
similarity index 100%
rename from desmume/src/gtk/Makefile.am
rename to src/gtk/Makefile.am
diff --git a/desmume/src/gtk/cheatsGTK.cpp b/src/gtk/cheatsGTK.cpp
similarity index 100%
rename from desmume/src/gtk/cheatsGTK.cpp
rename to src/gtk/cheatsGTK.cpp
diff --git a/desmume/src/gtk/cheatsGTK.h b/src/gtk/cheatsGTK.h
similarity index 100%
rename from desmume/src/gtk/cheatsGTK.h
rename to src/gtk/cheatsGTK.h
diff --git a/desmume/src/gtk/dTool.h b/src/gtk/dTool.h
similarity index 100%
rename from desmume/src/gtk/dTool.h
rename to src/gtk/dTool.h
diff --git a/desmume/src/gtk/dToolsList.cpp b/src/gtk/dToolsList.cpp
similarity index 100%
rename from desmume/src/gtk/dToolsList.cpp
rename to src/gtk/dToolsList.cpp
diff --git a/desmume/src/gtk/desmume.cpp b/src/gtk/desmume.cpp
similarity index 100%
rename from desmume/src/gtk/desmume.cpp
rename to src/gtk/desmume.cpp
diff --git a/desmume/src/gtk/desmume.desktop b/src/gtk/desmume.desktop
similarity index 100%
rename from desmume/src/gtk/desmume.desktop
rename to src/gtk/desmume.desktop
diff --git a/desmume/src/gtk/desmume.h b/src/gtk/desmume.h
similarity index 100%
rename from desmume/src/gtk/desmume.h
rename to src/gtk/desmume.h
diff --git a/desmume/src/gtk/desmume_config.cpp b/src/gtk/desmume_config.cpp
similarity index 100%
rename from desmume/src/gtk/desmume_config.cpp
rename to src/gtk/desmume_config.cpp
diff --git a/desmume/src/gtk/desmume_config.h b/src/gtk/desmume_config.h
similarity index 100%
rename from desmume/src/gtk/desmume_config.h
rename to src/gtk/desmume_config.h
diff --git a/desmume/src/gtk/doc/Makefile.am b/src/gtk/doc/Makefile.am
similarity index 100%
rename from desmume/src/gtk/doc/Makefile.am
rename to src/gtk/doc/Makefile.am
diff --git a/desmume/src/gtk/doc/desmume.1 b/src/gtk/doc/desmume.1
similarity index 100%
rename from desmume/src/gtk/doc/desmume.1
rename to src/gtk/doc/desmume.1
diff --git a/desmume/src/gtk/main.cpp b/src/gtk/main.cpp
similarity index 100%
rename from desmume/src/gtk/main.cpp
rename to src/gtk/main.cpp
diff --git a/desmume/src/gtk/main.h b/src/gtk/main.h
similarity index 100%
rename from desmume/src/gtk/main.h
rename to src/gtk/main.h
diff --git a/desmume/src/gtk/osmesa_3Demu.cpp b/src/gtk/osmesa_3Demu.cpp
similarity index 100%
rename from desmume/src/gtk/osmesa_3Demu.cpp
rename to src/gtk/osmesa_3Demu.cpp
diff --git a/desmume/src/gtk/osmesa_3Demu.h b/src/gtk/osmesa_3Demu.h
similarity index 100%
rename from desmume/src/gtk/osmesa_3Demu.h
rename to src/gtk/osmesa_3Demu.h
diff --git a/desmume/src/gtk/tools/ioregsView.cpp b/src/gtk/tools/ioregsView.cpp
similarity index 100%
rename from desmume/src/gtk/tools/ioregsView.cpp
rename to src/gtk/tools/ioregsView.cpp
diff --git a/desmume/src/gtk/tools/ioregsView.h b/src/gtk/tools/ioregsView.h
similarity index 100%
rename from desmume/src/gtk/tools/ioregsView.h
rename to src/gtk/tools/ioregsView.h
diff --git a/desmume/src/instruction_tabdef.inc b/src/instruction_tabdef.inc
similarity index 100%
rename from desmume/src/instruction_tabdef.inc
rename to src/instruction_tabdef.inc
diff --git a/desmume/src/matrix.cpp b/src/matrix.cpp
similarity index 100%
rename from desmume/src/matrix.cpp
rename to src/matrix.cpp
diff --git a/desmume/src/matrix.h b/src/matrix.h
similarity index 100%
rename from desmume/src/matrix.h
rename to src/matrix.h
diff --git a/desmume/src/matrix_sse2-x64.asm b/src/matrix_sse2-x64.asm
similarity index 100%
rename from desmume/src/matrix_sse2-x64.asm
rename to src/matrix_sse2-x64.asm
diff --git a/desmume/src/matrix_sse2-x86.asm b/src/matrix_sse2-x86.asm
similarity index 100%
rename from desmume/src/matrix_sse2-x86.asm
rename to src/matrix_sse2-x86.asm
diff --git a/desmume/src/mc.cpp b/src/mc.cpp
similarity index 100%
rename from desmume/src/mc.cpp
rename to src/mc.cpp
diff --git a/desmume/src/mc.h b/src/mc.h
similarity index 100%
rename from desmume/src/mc.h
rename to src/mc.h
diff --git a/desmume/src/mem.h b/src/mem.h
similarity index 100%
rename from desmume/src/mem.h
rename to src/mem.h
diff --git a/desmume/src/memorystream.h b/src/memorystream.h
similarity index 100%
rename from desmume/src/memorystream.h
rename to src/memorystream.h
diff --git a/desmume/src/mic.cpp b/src/mic.cpp
similarity index 100%
rename from desmume/src/mic.cpp
rename to src/mic.cpp
diff --git a/desmume/src/mic.h b/src/mic.h
similarity index 100%
rename from desmume/src/mic.h
rename to src/mic.h
diff --git a/desmume/src/movie.cpp b/src/movie.cpp
similarity index 100%
rename from desmume/src/movie.cpp
rename to src/movie.cpp
diff --git a/desmume/src/movie.h b/src/movie.h
similarity index 100%
rename from desmume/src/movie.h
rename to src/movie.h
diff --git a/desmume/src/rasterize.cpp b/src/rasterize.cpp
similarity index 100%
rename from desmume/src/rasterize.cpp
rename to src/rasterize.cpp
diff --git a/desmume/src/rasterize.h b/src/rasterize.h
similarity index 100%
rename from desmume/src/rasterize.h
rename to src/rasterize.h
diff --git a/desmume/src/readwrite.cpp b/src/readwrite.cpp
similarity index 100%
rename from desmume/src/readwrite.cpp
rename to src/readwrite.cpp
diff --git a/desmume/src/readwrite.h b/src/readwrite.h
similarity index 100%
rename from desmume/src/readwrite.h
rename to src/readwrite.h
diff --git a/desmume/src/registers.h b/src/registers.h
similarity index 100%
rename from desmume/src/registers.h
rename to src/registers.h
diff --git a/desmume/src/render3D.cpp b/src/render3D.cpp
similarity index 100%
rename from desmume/src/render3D.cpp
rename to src/render3D.cpp
diff --git a/desmume/src/render3D.h b/src/render3D.h
similarity index 100%
rename from desmume/src/render3D.h
rename to src/render3D.h
diff --git a/desmume/src/rtc.cpp b/src/rtc.cpp
similarity index 100%
rename from desmume/src/rtc.cpp
rename to src/rtc.cpp
diff --git a/desmume/src/rtc.h b/src/rtc.h
similarity index 100%
rename from desmume/src/rtc.h
rename to src/rtc.h
diff --git a/desmume/src/saves.cpp b/src/saves.cpp
similarity index 100%
rename from desmume/src/saves.cpp
rename to src/saves.cpp
diff --git a/desmume/src/saves.h b/src/saves.h
similarity index 100%
rename from desmume/src/saves.h
rename to src/saves.h
diff --git a/desmume/src/shaders.h b/src/shaders.h
similarity index 100%
rename from desmume/src/shaders.h
rename to src/shaders.h
diff --git a/desmume/src/sndsdl.cpp b/src/sndsdl.cpp
similarity index 100%
rename from desmume/src/sndsdl.cpp
rename to src/sndsdl.cpp
diff --git a/desmume/src/sndsdl.h b/src/sndsdl.h
similarity index 100%
rename from desmume/src/sndsdl.h
rename to src/sndsdl.h
diff --git a/desmume/src/softrender.cpp b/src/softrender.cpp
similarity index 100%
rename from desmume/src/softrender.cpp
rename to src/softrender.cpp
diff --git a/desmume/src/softrender.h b/src/softrender.h
similarity index 100%
rename from desmume/src/softrender.h
rename to src/softrender.h
diff --git a/desmume/src/softrender_config.h b/src/softrender_config.h
similarity index 100%
rename from desmume/src/softrender_config.h
rename to src/softrender_config.h
diff --git a/desmume/src/softrender_desmumefont.h b/src/softrender_desmumefont.h
similarity index 100%
rename from desmume/src/softrender_desmumefont.h
rename to src/softrender_desmumefont.h
diff --git a/desmume/src/softrender_v3sysfont.h b/src/softrender_v3sysfont.h
similarity index 100%
rename from desmume/src/softrender_v3sysfont.h
rename to src/softrender_v3sysfont.h
diff --git a/desmume/src/texcache.cpp b/src/texcache.cpp
similarity index 100%
rename from desmume/src/texcache.cpp
rename to src/texcache.cpp
diff --git a/desmume/src/texcache.h b/src/texcache.h
similarity index 100%
rename from desmume/src/texcache.h
rename to src/texcache.h
diff --git a/desmume/src/thumb_instructions.cpp b/src/thumb_instructions.cpp
similarity index 100%
rename from desmume/src/thumb_instructions.cpp
rename to src/thumb_instructions.cpp
diff --git a/desmume/src/thumb_instructions.h b/src/thumb_instructions.h
similarity index 100%
rename from desmume/src/thumb_instructions.h
rename to src/thumb_instructions.h
diff --git a/desmume/src/thumb_tabdef.inc b/src/thumb_tabdef.inc
similarity index 100%
rename from desmume/src/thumb_tabdef.inc
rename to src/thumb_tabdef.inc
diff --git a/desmume/src/types.h b/src/types.h
similarity index 100%
rename from desmume/src/types.h
rename to src/types.h
diff --git a/desmume/src/utils/ConvertUTF.c b/src/utils/ConvertUTF.c
similarity index 100%
rename from desmume/src/utils/ConvertUTF.c
rename to src/utils/ConvertUTF.c
diff --git a/desmume/src/utils/ConvertUTF.h b/src/utils/ConvertUTF.h
similarity index 100%
rename from desmume/src/utils/ConvertUTF.h
rename to src/utils/ConvertUTF.h
diff --git a/desmume/src/utils/decrypt/crc.cpp b/src/utils/decrypt/crc.cpp
similarity index 100%
rename from desmume/src/utils/decrypt/crc.cpp
rename to src/utils/decrypt/crc.cpp
diff --git a/desmume/src/utils/decrypt/crc.h b/src/utils/decrypt/crc.h
similarity index 100%
rename from desmume/src/utils/decrypt/crc.h
rename to src/utils/decrypt/crc.h
diff --git a/desmume/src/utils/decrypt/decrypt.cpp b/src/utils/decrypt/decrypt.cpp
similarity index 100%
rename from desmume/src/utils/decrypt/decrypt.cpp
rename to src/utils/decrypt/decrypt.cpp
diff --git a/desmume/src/utils/decrypt/decrypt.h b/src/utils/decrypt/decrypt.h
similarity index 100%
rename from desmume/src/utils/decrypt/decrypt.h
rename to src/utils/decrypt/decrypt.h
diff --git a/desmume/src/utils/decrypt/header.cpp b/src/utils/decrypt/header.cpp
similarity index 100%
rename from desmume/src/utils/decrypt/header.cpp
rename to src/utils/decrypt/header.cpp
diff --git a/desmume/src/utils/decrypt/header.h b/src/utils/decrypt/header.h
similarity index 100%
rename from desmume/src/utils/decrypt/header.h
rename to src/utils/decrypt/header.h
diff --git a/desmume/src/utils/guid.cpp b/src/utils/guid.cpp
similarity index 100%
rename from desmume/src/utils/guid.cpp
rename to src/utils/guid.cpp
diff --git a/desmume/src/utils/guid.h b/src/utils/guid.h
similarity index 100%
rename from desmume/src/utils/guid.h
rename to src/utils/guid.h
diff --git a/desmume/src/utils/md5.cpp b/src/utils/md5.cpp
similarity index 100%
rename from desmume/src/utils/md5.cpp
rename to src/utils/md5.cpp
diff --git a/desmume/src/utils/md5.h b/src/utils/md5.h
similarity index 100%
rename from desmume/src/utils/md5.h
rename to src/utils/md5.h
diff --git a/desmume/src/utils/valuearray.h b/src/utils/valuearray.h
similarity index 100%
rename from desmume/src/utils/valuearray.h
rename to src/utils/valuearray.h
diff --git a/desmume/src/utils/xstring.cpp b/src/utils/xstring.cpp
similarity index 100%
rename from desmume/src/utils/xstring.cpp
rename to src/utils/xstring.cpp
diff --git a/desmume/src/utils/xstring.h b/src/utils/xstring.h
similarity index 100%
rename from desmume/src/utils/xstring.h
rename to src/utils/xstring.h
diff --git a/desmume/src/wifi.cpp b/src/wifi.cpp
similarity index 100%
rename from desmume/src/wifi.cpp
rename to src/wifi.cpp
diff --git a/desmume/src/wifi.h b/src/wifi.h
similarity index 100%
rename from desmume/src/wifi.h
rename to src/wifi.h
diff --git a/desmume/src/windows/AboutBox.cpp b/src/windows/AboutBox.cpp
similarity index 100%
rename from desmume/src/windows/AboutBox.cpp
rename to src/windows/AboutBox.cpp
diff --git a/desmume/src/windows/AboutBox.h b/src/windows/AboutBox.h
similarity index 100%
rename from desmume/src/windows/AboutBox.h
rename to src/windows/AboutBox.h
diff --git a/desmume/src/windows/CWindow.cpp b/src/windows/CWindow.cpp
similarity index 100%
rename from desmume/src/windows/CWindow.cpp
rename to src/windows/CWindow.cpp
diff --git a/desmume/src/windows/CWindow.h b/src/windows/CWindow.h
similarity index 100%
rename from desmume/src/windows/CWindow.h
rename to src/windows/CWindow.h
diff --git a/desmume/src/windows/DeSmuME.ico b/src/windows/DeSmuME.ico
similarity index 100%
rename from desmume/src/windows/DeSmuME.ico
rename to src/windows/DeSmuME.ico
diff --git a/desmume/src/windows/DeSmuME_2005.sln b/src/windows/DeSmuME_2005.sln
similarity index 100%
rename from desmume/src/windows/DeSmuME_2005.sln
rename to src/windows/DeSmuME_2005.sln
diff --git a/desmume/src/windows/DeSmuME_2005.vcproj b/src/windows/DeSmuME_2005.vcproj
similarity index 100%
rename from desmume/src/windows/DeSmuME_2005.vcproj
rename to src/windows/DeSmuME_2005.vcproj
diff --git a/desmume/src/windows/DeSmuME_2008.sln b/src/windows/DeSmuME_2008.sln
similarity index 100%
rename from desmume/src/windows/DeSmuME_2008.sln
rename to src/windows/DeSmuME_2008.sln
diff --git a/desmume/src/windows/DeSmuME_2008.vcproj b/src/windows/DeSmuME_2008.vcproj
similarity index 100%
rename from desmume/src/windows/DeSmuME_2008.vcproj
rename to src/windows/DeSmuME_2008.vcproj
diff --git a/desmume/src/windows/DeSmuME_Intel.icproj b/src/windows/DeSmuME_Intel.icproj
similarity index 100%
rename from desmume/src/windows/DeSmuME_Intel.icproj
rename to src/windows/DeSmuME_Intel.icproj
diff --git a/desmume/src/windows/DeSmuME_Intel.sln b/src/windows/DeSmuME_Intel.sln
similarity index 100%
rename from desmume/src/windows/DeSmuME_Intel.sln
rename to src/windows/DeSmuME_Intel.sln
diff --git a/desmume/src/windows/DeSmuME_Intel.vcproj b/src/windows/DeSmuME_Intel.vcproj
similarity index 100%
rename from desmume/src/windows/DeSmuME_Intel.vcproj
rename to src/windows/DeSmuME_Intel.vcproj
diff --git a/desmume/src/windows/DeSmuME_x64.manifest b/src/windows/DeSmuME_x64.manifest
similarity index 100%
rename from desmume/src/windows/DeSmuME_x64.manifest
rename to src/windows/DeSmuME_x64.manifest
diff --git a/desmume/src/windows/DeSmuME_x86.manifest b/src/windows/DeSmuME_x86.manifest
similarity index 100%
rename from desmume/src/windows/DeSmuME_x86.manifest
rename to src/windows/DeSmuME_x86.manifest
diff --git a/desmume/src/windows/FirmConfig.cpp b/src/windows/FirmConfig.cpp
similarity index 100%
rename from desmume/src/windows/FirmConfig.cpp
rename to src/windows/FirmConfig.cpp
diff --git a/desmume/src/windows/FirmConfig.h b/src/windows/FirmConfig.h
similarity index 100%
rename from desmume/src/windows/FirmConfig.h
rename to src/windows/FirmConfig.h
diff --git a/desmume/src/windows/GL/glext.h b/src/windows/GL/glext.h
similarity index 100%
rename from desmume/src/windows/GL/glext.h
rename to src/windows/GL/glext.h
diff --git a/desmume/src/windows/IORegView.cpp b/src/windows/IORegView.cpp
similarity index 100%
rename from desmume/src/windows/IORegView.cpp
rename to src/windows/IORegView.cpp
diff --git a/desmume/src/windows/IORegView.h b/src/windows/IORegView.h
similarity index 100%
rename from desmume/src/windows/IORegView.h
rename to src/windows/IORegView.h
diff --git a/desmume/src/windows/Makefile.am b/src/windows/Makefile.am
similarity index 100%
rename from desmume/src/windows/Makefile.am
rename to src/windows/Makefile.am
diff --git a/desmume/src/windows/Makefile.win b/src/windows/Makefile.win
similarity index 100%
rename from desmume/src/windows/Makefile.win
rename to src/windows/Makefile.win
diff --git a/desmume/src/windows/afxres.h b/src/windows/afxres.h
similarity index 100%
rename from desmume/src/windows/afxres.h
rename to src/windows/afxres.h
diff --git a/desmume/src/windows/aviout.cpp b/src/windows/aviout.cpp
similarity index 100%
rename from desmume/src/windows/aviout.cpp
rename to src/windows/aviout.cpp
diff --git a/desmume/src/windows/aviout.h b/src/windows/aviout.h
similarity index 100%
rename from desmume/src/windows/aviout.h
rename to src/windows/aviout.h
diff --git a/desmume/src/windows/bitmap1.bmp b/src/windows/bitmap1.bmp
similarity index 100%
rename from desmume/src/windows/bitmap1.bmp
rename to src/windows/bitmap1.bmp
diff --git a/desmume/src/windows/cheatsWin.cpp b/src/windows/cheatsWin.cpp
similarity index 100%
rename from desmume/src/windows/cheatsWin.cpp
rename to src/windows/cheatsWin.cpp
diff --git a/desmume/src/windows/cheatsWin.h b/src/windows/cheatsWin.h
similarity index 100%
rename from desmume/src/windows/cheatsWin.h
rename to src/windows/cheatsWin.h
diff --git a/desmume/src/windows/colorctrl.cpp b/src/windows/colorctrl.cpp
similarity index 100%
rename from desmume/src/windows/colorctrl.cpp
rename to src/windows/colorctrl.cpp
diff --git a/desmume/src/windows/colorctrl.h b/src/windows/colorctrl.h
similarity index 100%
rename from desmume/src/windows/colorctrl.h
rename to src/windows/colorctrl.h
diff --git a/desmume/src/windows/config.h b/src/windows/config.h
similarity index 100%
rename from desmume/src/windows/config.h
rename to src/windows/config.h
diff --git a/desmume/src/windows/console.cpp b/src/windows/console.cpp
similarity index 100%
rename from desmume/src/windows/console.cpp
rename to src/windows/console.cpp
diff --git a/desmume/src/windows/console.h b/src/windows/console.h
similarity index 100%
rename from desmume/src/windows/console.h
rename to src/windows/console.h
diff --git a/desmume/src/windows/defaultconfig/userconfig.h b/src/windows/defaultconfig/userconfig.h
similarity index 100%
rename from desmume/src/windows/defaultconfig/userconfig.h
rename to src/windows/defaultconfig/userconfig.h
diff --git a/desmume/src/windows/directx/DxErr8.lib b/src/windows/directx/DxErr8.lib
similarity index 100%
rename from desmume/src/windows/directx/DxErr8.lib
rename to src/windows/directx/DxErr8.lib
diff --git a/desmume/src/windows/directx/ddraw.h b/src/windows/directx/ddraw.h
similarity index 100%
rename from desmume/src/windows/directx/ddraw.h
rename to src/windows/directx/ddraw.h
diff --git a/desmume/src/windows/directx/ddraw.lib b/src/windows/directx/ddraw.lib
similarity index 100%
rename from desmume/src/windows/directx/ddraw.lib
rename to src/windows/directx/ddraw.lib
diff --git a/desmume/src/windows/directx/dinput.h b/src/windows/directx/dinput.h
similarity index 100%
rename from desmume/src/windows/directx/dinput.h
rename to src/windows/directx/dinput.h
diff --git a/desmume/src/windows/directx/dinput8.lib b/src/windows/directx/dinput8.lib
similarity index 100%
rename from desmume/src/windows/directx/dinput8.lib
rename to src/windows/directx/dinput8.lib
diff --git a/desmume/src/windows/directx/dsound.h b/src/windows/directx/dsound.h
similarity index 100%
rename from desmume/src/windows/directx/dsound.h
rename to src/windows/directx/dsound.h
diff --git a/desmume/src/windows/directx/dsound.lib b/src/windows/directx/dsound.lib
similarity index 100%
rename from desmume/src/windows/directx/dsound.lib
rename to src/windows/directx/dsound.lib
diff --git a/desmume/src/windows/directx/dxerr8.h b/src/windows/directx/dxerr8.h
similarity index 100%
rename from desmume/src/windows/directx/dxerr8.h
rename to src/windows/directx/dxerr8.h
diff --git a/desmume/src/windows/directx/dxguid.lib b/src/windows/directx/dxguid.lib
similarity index 100%
rename from desmume/src/windows/directx/dxguid.lib
rename to src/windows/directx/dxguid.lib
diff --git a/desmume/src/windows/disView.cpp b/src/windows/disView.cpp
similarity index 100%
rename from desmume/src/windows/disView.cpp
rename to src/windows/disView.cpp
diff --git a/desmume/src/windows/disView.h b/src/windows/disView.h
similarity index 100%
rename from desmume/src/windows/disView.h
rename to src/windows/disView.h
diff --git a/desmume/src/windows/gbaslot_config.cpp b/src/windows/gbaslot_config.cpp
similarity index 100%
rename from desmume/src/windows/gbaslot_config.cpp
rename to src/windows/gbaslot_config.cpp
diff --git a/desmume/src/windows/gbaslot_config.h b/src/windows/gbaslot_config.h
similarity index 100%
rename from desmume/src/windows/gbaslot_config.h
rename to src/windows/gbaslot_config.h
diff --git a/desmume/src/windows/ginfo.cpp b/src/windows/ginfo.cpp
similarity index 100%
rename from desmume/src/windows/ginfo.cpp
rename to src/windows/ginfo.cpp
diff --git a/desmume/src/windows/ginfo.h b/src/windows/ginfo.h
similarity index 100%
rename from desmume/src/windows/ginfo.h
rename to src/windows/ginfo.h
diff --git a/desmume/src/windows/glib-2.20.1/build/dependencies/proxy-libintl-20080918/include/libintl.h b/src/windows/glib-2.20.1/build/dependencies/proxy-libintl-20080918/include/libintl.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/dependencies/proxy-libintl-20080918/include/libintl.h
rename to src/windows/glib-2.20.1/build/dependencies/proxy-libintl-20080918/include/libintl.h
diff --git a/desmume/src/windows/glib-2.20.1/build/dirent/README b/src/windows/glib-2.20.1/build/dirent/README
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/dirent/README
rename to src/windows/glib-2.20.1/build/dirent/README
diff --git a/desmume/src/windows/glib-2.20.1/build/dirent/dirent.c b/src/windows/glib-2.20.1/build/dirent/dirent.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/dirent/dirent.c
rename to src/windows/glib-2.20.1/build/dirent/dirent.c
diff --git a/desmume/src/windows/glib-2.20.1/build/dirent/dirent.h b/src/windows/glib-2.20.1/build/dirent/dirent.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/dirent/dirent.h
rename to src/windows/glib-2.20.1/build/dirent/dirent.h
diff --git a/desmume/src/windows/glib-2.20.1/build/dirent/wdirent.c b/src/windows/glib-2.20.1/build/dirent/wdirent.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/dirent/wdirent.c
rename to src/windows/glib-2.20.1/build/dirent/wdirent.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/config.h b/src/windows/glib-2.20.1/build/glib/config.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/config.h
rename to src/windows/glib-2.20.1/build/glib/config.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/galias.h b/src/windows/glib-2.20.1/build/glib/galias.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/galias.h
rename to src/windows/glib-2.20.1/build/glib/galias.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/galiasdef.c b/src/windows/glib-2.20.1/build/glib/galiasdef.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/galiasdef.c
rename to src/windows/glib-2.20.1/build/glib/galiasdef.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/galloca.h b/src/windows/glib-2.20.1/build/glib/galloca.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/galloca.h
rename to src/windows/glib-2.20.1/build/glib/galloca.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/garray.c b/src/windows/glib-2.20.1/build/glib/garray.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/garray.c
rename to src/windows/glib-2.20.1/build/glib/garray.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/garray.h b/src/windows/glib-2.20.1/build/glib/garray.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/garray.h
rename to src/windows/glib-2.20.1/build/glib/garray.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gasyncqueue.c b/src/windows/glib-2.20.1/build/glib/gasyncqueue.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gasyncqueue.c
rename to src/windows/glib-2.20.1/build/glib/gasyncqueue.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gasyncqueue.h b/src/windows/glib-2.20.1/build/glib/gasyncqueue.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gasyncqueue.h
rename to src/windows/glib-2.20.1/build/glib/gasyncqueue.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gatomic.c b/src/windows/glib-2.20.1/build/glib/gatomic.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gatomic.c
rename to src/windows/glib-2.20.1/build/glib/gatomic.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gatomic.h b/src/windows/glib-2.20.1/build/glib/gatomic.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gatomic.h
rename to src/windows/glib-2.20.1/build/glib/gatomic.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gbacktrace.c b/src/windows/glib-2.20.1/build/glib/gbacktrace.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gbacktrace.c
rename to src/windows/glib-2.20.1/build/glib/gbacktrace.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gbacktrace.h b/src/windows/glib-2.20.1/build/glib/gbacktrace.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gbacktrace.h
rename to src/windows/glib-2.20.1/build/glib/gbacktrace.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gbase64.c b/src/windows/glib-2.20.1/build/glib/gbase64.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gbase64.c
rename to src/windows/glib-2.20.1/build/glib/gbase64.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gbase64.h b/src/windows/glib-2.20.1/build/glib/gbase64.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gbase64.h
rename to src/windows/glib-2.20.1/build/glib/gbase64.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gbookmarkfile.c b/src/windows/glib-2.20.1/build/glib/gbookmarkfile.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gbookmarkfile.c
rename to src/windows/glib-2.20.1/build/glib/gbookmarkfile.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gbookmarkfile.h b/src/windows/glib-2.20.1/build/glib/gbookmarkfile.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gbookmarkfile.h
rename to src/windows/glib-2.20.1/build/glib/gbookmarkfile.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gbsearcharray.h b/src/windows/glib-2.20.1/build/glib/gbsearcharray.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gbsearcharray.h
rename to src/windows/glib-2.20.1/build/glib/gbsearcharray.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gcache.c b/src/windows/glib-2.20.1/build/glib/gcache.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gcache.c
rename to src/windows/glib-2.20.1/build/glib/gcache.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gcache.h b/src/windows/glib-2.20.1/build/glib/gcache.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gcache.h
rename to src/windows/glib-2.20.1/build/glib/gcache.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gchecksum.c b/src/windows/glib-2.20.1/build/glib/gchecksum.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gchecksum.c
rename to src/windows/glib-2.20.1/build/glib/gchecksum.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gchecksum.h b/src/windows/glib-2.20.1/build/glib/gchecksum.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gchecksum.h
rename to src/windows/glib-2.20.1/build/glib/gchecksum.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gcompletion.c b/src/windows/glib-2.20.1/build/glib/gcompletion.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gcompletion.c
rename to src/windows/glib-2.20.1/build/glib/gcompletion.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gcompletion.h b/src/windows/glib-2.20.1/build/glib/gcompletion.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gcompletion.h
rename to src/windows/glib-2.20.1/build/glib/gcompletion.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gconvert.c b/src/windows/glib-2.20.1/build/glib/gconvert.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gconvert.c
rename to src/windows/glib-2.20.1/build/glib/gconvert.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gconvert.h b/src/windows/glib-2.20.1/build/glib/gconvert.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gconvert.h
rename to src/windows/glib-2.20.1/build/glib/gconvert.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gdataset.c b/src/windows/glib-2.20.1/build/glib/gdataset.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gdataset.c
rename to src/windows/glib-2.20.1/build/glib/gdataset.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gdataset.h b/src/windows/glib-2.20.1/build/glib/gdataset.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gdataset.h
rename to src/windows/glib-2.20.1/build/glib/gdataset.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gdatasetprivate.h b/src/windows/glib-2.20.1/build/glib/gdatasetprivate.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gdatasetprivate.h
rename to src/windows/glib-2.20.1/build/glib/gdatasetprivate.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gdate.c b/src/windows/glib-2.20.1/build/glib/gdate.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gdate.c
rename to src/windows/glib-2.20.1/build/glib/gdate.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gdate.h b/src/windows/glib-2.20.1/build/glib/gdate.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gdate.h
rename to src/windows/glib-2.20.1/build/glib/gdate.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gdebug.h b/src/windows/glib-2.20.1/build/glib/gdebug.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gdebug.h
rename to src/windows/glib-2.20.1/build/glib/gdebug.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gdir.c b/src/windows/glib-2.20.1/build/glib/gdir.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gdir.c
rename to src/windows/glib-2.20.1/build/glib/gdir.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gdir.h b/src/windows/glib-2.20.1/build/glib/gdir.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gdir.h
rename to src/windows/glib-2.20.1/build/glib/gdir.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gerror.c b/src/windows/glib-2.20.1/build/glib/gerror.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gerror.c
rename to src/windows/glib-2.20.1/build/glib/gerror.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gerror.h b/src/windows/glib-2.20.1/build/glib/gerror.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gerror.h
rename to src/windows/glib-2.20.1/build/glib/gerror.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gfileutils.c b/src/windows/glib-2.20.1/build/glib/gfileutils.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gfileutils.c
rename to src/windows/glib-2.20.1/build/glib/gfileutils.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gfileutils.h b/src/windows/glib-2.20.1/build/glib/gfileutils.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gfileutils.h
rename to src/windows/glib-2.20.1/build/glib/gfileutils.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/ghash.c b/src/windows/glib-2.20.1/build/glib/ghash.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/ghash.c
rename to src/windows/glib-2.20.1/build/glib/ghash.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/ghash.h b/src/windows/glib-2.20.1/build/glib/ghash.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/ghash.h
rename to src/windows/glib-2.20.1/build/glib/ghash.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/ghook.c b/src/windows/glib-2.20.1/build/glib/ghook.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/ghook.c
rename to src/windows/glib-2.20.1/build/glib/ghook.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/ghook.h b/src/windows/glib-2.20.1/build/glib/ghook.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/ghook.h
rename to src/windows/glib-2.20.1/build/glib/ghook.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gi18n-lib.h b/src/windows/glib-2.20.1/build/glib/gi18n-lib.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gi18n-lib.h
rename to src/windows/glib-2.20.1/build/glib/gi18n-lib.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gi18n.h b/src/windows/glib-2.20.1/build/glib/gi18n.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gi18n.h
rename to src/windows/glib-2.20.1/build/glib/gi18n.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/giochannel.c b/src/windows/glib-2.20.1/build/glib/giochannel.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/giochannel.c
rename to src/windows/glib-2.20.1/build/glib/giochannel.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/giochannel.h b/src/windows/glib-2.20.1/build/glib/giochannel.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/giochannel.h
rename to src/windows/glib-2.20.1/build/glib/giochannel.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/giounix.c b/src/windows/glib-2.20.1/build/glib/giounix.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/giounix.c
rename to src/windows/glib-2.20.1/build/glib/giounix.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/giowin32.c b/src/windows/glib-2.20.1/build/glib/giowin32.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/giowin32.c
rename to src/windows/glib-2.20.1/build/glib/giowin32.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gkeyfile.c b/src/windows/glib-2.20.1/build/glib/gkeyfile.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gkeyfile.c
rename to src/windows/glib-2.20.1/build/glib/gkeyfile.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gkeyfile.h b/src/windows/glib-2.20.1/build/glib/gkeyfile.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gkeyfile.h
rename to src/windows/glib-2.20.1/build/glib/gkeyfile.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/glib-object.h b/src/windows/glib-2.20.1/build/glib/glib-object.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/glib-object.h
rename to src/windows/glib-2.20.1/build/glib/glib-object.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/glib.h b/src/windows/glib-2.20.1/build/glib/glib.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/glib.h
rename to src/windows/glib-2.20.1/build/glib/glib.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/glibintl.h b/src/windows/glib-2.20.1/build/glib/glibintl.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/glibintl.h
rename to src/windows/glib-2.20.1/build/glib/glibintl.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/glist.c b/src/windows/glib-2.20.1/build/glib/glist.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/glist.c
rename to src/windows/glib-2.20.1/build/glib/glist.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/glist.h b/src/windows/glib-2.20.1/build/glib/glist.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/glist.h
rename to src/windows/glib-2.20.1/build/glib/glist.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gmacros.h b/src/windows/glib-2.20.1/build/glib/gmacros.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gmacros.h
rename to src/windows/glib-2.20.1/build/glib/gmacros.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gmain.c b/src/windows/glib-2.20.1/build/glib/gmain.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gmain.c
rename to src/windows/glib-2.20.1/build/glib/gmain.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gmain.h b/src/windows/glib-2.20.1/build/glib/gmain.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gmain.h
rename to src/windows/glib-2.20.1/build/glib/gmain.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gmappedfile.c b/src/windows/glib-2.20.1/build/glib/gmappedfile.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gmappedfile.c
rename to src/windows/glib-2.20.1/build/glib/gmappedfile.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gmappedfile.h b/src/windows/glib-2.20.1/build/glib/gmappedfile.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gmappedfile.h
rename to src/windows/glib-2.20.1/build/glib/gmappedfile.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gmarkup.c b/src/windows/glib-2.20.1/build/glib/gmarkup.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gmarkup.c
rename to src/windows/glib-2.20.1/build/glib/gmarkup.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gmarkup.h b/src/windows/glib-2.20.1/build/glib/gmarkup.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gmarkup.h
rename to src/windows/glib-2.20.1/build/glib/gmarkup.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gmem.c b/src/windows/glib-2.20.1/build/glib/gmem.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gmem.c
rename to src/windows/glib-2.20.1/build/glib/gmem.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gmem.h b/src/windows/glib-2.20.1/build/glib/gmem.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gmem.h
rename to src/windows/glib-2.20.1/build/glib/gmem.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gmessages.c b/src/windows/glib-2.20.1/build/glib/gmessages.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gmessages.c
rename to src/windows/glib-2.20.1/build/glib/gmessages.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gmessages.h b/src/windows/glib-2.20.1/build/glib/gmessages.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gmessages.h
rename to src/windows/glib-2.20.1/build/glib/gmessages.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gmirroringtable.h b/src/windows/glib-2.20.1/build/glib/gmirroringtable.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gmirroringtable.h
rename to src/windows/glib-2.20.1/build/glib/gmirroringtable.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gnode.c b/src/windows/glib-2.20.1/build/glib/gnode.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gnode.c
rename to src/windows/glib-2.20.1/build/glib/gnode.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gnode.h b/src/windows/glib-2.20.1/build/glib/gnode.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gnode.h
rename to src/windows/glib-2.20.1/build/glib/gnode.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gnulib/README b/src/windows/glib-2.20.1/build/glib/gnulib/README
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gnulib/README
rename to src/windows/glib-2.20.1/build/glib/gnulib/README
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gnulib/asnprintf.c b/src/windows/glib-2.20.1/build/glib/gnulib/asnprintf.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gnulib/asnprintf.c
rename to src/windows/glib-2.20.1/build/glib/gnulib/asnprintf.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gnulib/g-gnulib.h b/src/windows/glib-2.20.1/build/glib/gnulib/g-gnulib.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gnulib/g-gnulib.h
rename to src/windows/glib-2.20.1/build/glib/gnulib/g-gnulib.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gnulib/printf-args.c b/src/windows/glib-2.20.1/build/glib/gnulib/printf-args.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gnulib/printf-args.c
rename to src/windows/glib-2.20.1/build/glib/gnulib/printf-args.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gnulib/printf-args.h b/src/windows/glib-2.20.1/build/glib/gnulib/printf-args.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gnulib/printf-args.h
rename to src/windows/glib-2.20.1/build/glib/gnulib/printf-args.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gnulib/printf-parse.c b/src/windows/glib-2.20.1/build/glib/gnulib/printf-parse.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gnulib/printf-parse.c
rename to src/windows/glib-2.20.1/build/glib/gnulib/printf-parse.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gnulib/printf-parse.h b/src/windows/glib-2.20.1/build/glib/gnulib/printf-parse.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gnulib/printf-parse.h
rename to src/windows/glib-2.20.1/build/glib/gnulib/printf-parse.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gnulib/printf.c b/src/windows/glib-2.20.1/build/glib/gnulib/printf.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gnulib/printf.c
rename to src/windows/glib-2.20.1/build/glib/gnulib/printf.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gnulib/printf.h b/src/windows/glib-2.20.1/build/glib/gnulib/printf.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gnulib/printf.h
rename to src/windows/glib-2.20.1/build/glib/gnulib/printf.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gnulib/vasnprintf.c b/src/windows/glib-2.20.1/build/glib/gnulib/vasnprintf.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gnulib/vasnprintf.c
rename to src/windows/glib-2.20.1/build/glib/gnulib/vasnprintf.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gnulib/vasnprintf.h b/src/windows/glib-2.20.1/build/glib/gnulib/vasnprintf.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gnulib/vasnprintf.h
rename to src/windows/glib-2.20.1/build/glib/gnulib/vasnprintf.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/goption.c b/src/windows/glib-2.20.1/build/glib/goption.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/goption.c
rename to src/windows/glib-2.20.1/build/glib/goption.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/goption.h b/src/windows/glib-2.20.1/build/glib/goption.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/goption.h
rename to src/windows/glib-2.20.1/build/glib/goption.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gpattern.c b/src/windows/glib-2.20.1/build/glib/gpattern.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gpattern.c
rename to src/windows/glib-2.20.1/build/glib/gpattern.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gpattern.h b/src/windows/glib-2.20.1/build/glib/gpattern.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gpattern.h
rename to src/windows/glib-2.20.1/build/glib/gpattern.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gpoll.c b/src/windows/glib-2.20.1/build/glib/gpoll.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gpoll.c
rename to src/windows/glib-2.20.1/build/glib/gpoll.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gpoll.h b/src/windows/glib-2.20.1/build/glib/gpoll.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gpoll.h
rename to src/windows/glib-2.20.1/build/glib/gpoll.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gprimes.c b/src/windows/glib-2.20.1/build/glib/gprimes.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gprimes.c
rename to src/windows/glib-2.20.1/build/glib/gprimes.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gprimes.h b/src/windows/glib-2.20.1/build/glib/gprimes.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gprimes.h
rename to src/windows/glib-2.20.1/build/glib/gprimes.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gprintf.c b/src/windows/glib-2.20.1/build/glib/gprintf.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gprintf.c
rename to src/windows/glib-2.20.1/build/glib/gprintf.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gprintf.h b/src/windows/glib-2.20.1/build/glib/gprintf.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gprintf.h
rename to src/windows/glib-2.20.1/build/glib/gprintf.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gprintfint.h b/src/windows/glib-2.20.1/build/glib/gprintfint.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gprintfint.h
rename to src/windows/glib-2.20.1/build/glib/gprintfint.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gqsort.c b/src/windows/glib-2.20.1/build/glib/gqsort.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gqsort.c
rename to src/windows/glib-2.20.1/build/glib/gqsort.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gqsort.h b/src/windows/glib-2.20.1/build/glib/gqsort.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gqsort.h
rename to src/windows/glib-2.20.1/build/glib/gqsort.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gquark.h b/src/windows/glib-2.20.1/build/glib/gquark.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gquark.h
rename to src/windows/glib-2.20.1/build/glib/gquark.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gqueue.c b/src/windows/glib-2.20.1/build/glib/gqueue.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gqueue.c
rename to src/windows/glib-2.20.1/build/glib/gqueue.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gqueue.h b/src/windows/glib-2.20.1/build/glib/gqueue.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gqueue.h
rename to src/windows/glib-2.20.1/build/glib/gqueue.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/grand.c b/src/windows/glib-2.20.1/build/glib/grand.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/grand.c
rename to src/windows/glib-2.20.1/build/glib/grand.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/grand.h b/src/windows/glib-2.20.1/build/glib/grand.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/grand.h
rename to src/windows/glib-2.20.1/build/glib/grand.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gregex.c b/src/windows/glib-2.20.1/build/glib/gregex.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gregex.c
rename to src/windows/glib-2.20.1/build/glib/gregex.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gregex.h b/src/windows/glib-2.20.1/build/glib/gregex.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gregex.h
rename to src/windows/glib-2.20.1/build/glib/gregex.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/grel.c b/src/windows/glib-2.20.1/build/glib/grel.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/grel.c
rename to src/windows/glib-2.20.1/build/glib/grel.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/grel.h b/src/windows/glib-2.20.1/build/glib/grel.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/grel.h
rename to src/windows/glib-2.20.1/build/glib/grel.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gscanner.c b/src/windows/glib-2.20.1/build/glib/gscanner.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gscanner.c
rename to src/windows/glib-2.20.1/build/glib/gscanner.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gscanner.h b/src/windows/glib-2.20.1/build/glib/gscanner.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gscanner.h
rename to src/windows/glib-2.20.1/build/glib/gscanner.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gscripttable.h b/src/windows/glib-2.20.1/build/glib/gscripttable.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gscripttable.h
rename to src/windows/glib-2.20.1/build/glib/gscripttable.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gsequence.c b/src/windows/glib-2.20.1/build/glib/gsequence.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gsequence.c
rename to src/windows/glib-2.20.1/build/glib/gsequence.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gsequence.h b/src/windows/glib-2.20.1/build/glib/gsequence.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gsequence.h
rename to src/windows/glib-2.20.1/build/glib/gsequence.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gshell.c b/src/windows/glib-2.20.1/build/glib/gshell.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gshell.c
rename to src/windows/glib-2.20.1/build/glib/gshell.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gshell.h b/src/windows/glib-2.20.1/build/glib/gshell.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gshell.h
rename to src/windows/glib-2.20.1/build/glib/gshell.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gslice.c b/src/windows/glib-2.20.1/build/glib/gslice.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gslice.c
rename to src/windows/glib-2.20.1/build/glib/gslice.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gslice.h b/src/windows/glib-2.20.1/build/glib/gslice.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gslice.h
rename to src/windows/glib-2.20.1/build/glib/gslice.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gslist.c b/src/windows/glib-2.20.1/build/glib/gslist.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gslist.c
rename to src/windows/glib-2.20.1/build/glib/gslist.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gslist.h b/src/windows/glib-2.20.1/build/glib/gslist.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gslist.h
rename to src/windows/glib-2.20.1/build/glib/gslist.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gspawn-win32-helper-console.c b/src/windows/glib-2.20.1/build/glib/gspawn-win32-helper-console.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gspawn-win32-helper-console.c
rename to src/windows/glib-2.20.1/build/glib/gspawn-win32-helper-console.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gspawn-win32-helper.c b/src/windows/glib-2.20.1/build/glib/gspawn-win32-helper.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gspawn-win32-helper.c
rename to src/windows/glib-2.20.1/build/glib/gspawn-win32-helper.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gspawn-win32.c b/src/windows/glib-2.20.1/build/glib/gspawn-win32.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gspawn-win32.c
rename to src/windows/glib-2.20.1/build/glib/gspawn-win32.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gspawn-win64-helper-console.c b/src/windows/glib-2.20.1/build/glib/gspawn-win64-helper-console.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gspawn-win64-helper-console.c
rename to src/windows/glib-2.20.1/build/glib/gspawn-win64-helper-console.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gspawn-win64-helper.c b/src/windows/glib-2.20.1/build/glib/gspawn-win64-helper.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gspawn-win64-helper.c
rename to src/windows/glib-2.20.1/build/glib/gspawn-win64-helper.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gspawn.c b/src/windows/glib-2.20.1/build/glib/gspawn.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gspawn.c
rename to src/windows/glib-2.20.1/build/glib/gspawn.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gspawn.h b/src/windows/glib-2.20.1/build/glib/gspawn.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gspawn.h
rename to src/windows/glib-2.20.1/build/glib/gspawn.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gstdio.c b/src/windows/glib-2.20.1/build/glib/gstdio.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gstdio.c
rename to src/windows/glib-2.20.1/build/glib/gstdio.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gstdio.h b/src/windows/glib-2.20.1/build/glib/gstdio.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gstdio.h
rename to src/windows/glib-2.20.1/build/glib/gstdio.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gstrfuncs.c b/src/windows/glib-2.20.1/build/glib/gstrfuncs.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gstrfuncs.c
rename to src/windows/glib-2.20.1/build/glib/gstrfuncs.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gstrfuncs.h b/src/windows/glib-2.20.1/build/glib/gstrfuncs.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gstrfuncs.h
rename to src/windows/glib-2.20.1/build/glib/gstrfuncs.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gstring.c b/src/windows/glib-2.20.1/build/glib/gstring.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gstring.c
rename to src/windows/glib-2.20.1/build/glib/gstring.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gstring.h b/src/windows/glib-2.20.1/build/glib/gstring.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gstring.h
rename to src/windows/glib-2.20.1/build/glib/gstring.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gtester.c b/src/windows/glib-2.20.1/build/glib/gtester.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gtester.c
rename to src/windows/glib-2.20.1/build/glib/gtester.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gtestutils.c b/src/windows/glib-2.20.1/build/glib/gtestutils.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gtestutils.c
rename to src/windows/glib-2.20.1/build/glib/gtestutils.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gtestutils.h b/src/windows/glib-2.20.1/build/glib/gtestutils.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gtestutils.h
rename to src/windows/glib-2.20.1/build/glib/gtestutils.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gthread.c b/src/windows/glib-2.20.1/build/glib/gthread.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gthread.c
rename to src/windows/glib-2.20.1/build/glib/gthread.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gthread.h b/src/windows/glib-2.20.1/build/glib/gthread.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gthread.h
rename to src/windows/glib-2.20.1/build/glib/gthread.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gthreadpool.c b/src/windows/glib-2.20.1/build/glib/gthreadpool.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gthreadpool.c
rename to src/windows/glib-2.20.1/build/glib/gthreadpool.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gthreadpool.h b/src/windows/glib-2.20.1/build/glib/gthreadpool.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gthreadpool.h
rename to src/windows/glib-2.20.1/build/glib/gthreadpool.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gthreadprivate.h b/src/windows/glib-2.20.1/build/glib/gthreadprivate.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gthreadprivate.h
rename to src/windows/glib-2.20.1/build/glib/gthreadprivate.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gtimer.c b/src/windows/glib-2.20.1/build/glib/gtimer.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gtimer.c
rename to src/windows/glib-2.20.1/build/glib/gtimer.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gtimer.h b/src/windows/glib-2.20.1/build/glib/gtimer.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gtimer.h
rename to src/windows/glib-2.20.1/build/glib/gtimer.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gtree.c b/src/windows/glib-2.20.1/build/glib/gtree.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gtree.c
rename to src/windows/glib-2.20.1/build/glib/gtree.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gtree.h b/src/windows/glib-2.20.1/build/glib/gtree.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gtree.h
rename to src/windows/glib-2.20.1/build/glib/gtree.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gtypes.h b/src/windows/glib-2.20.1/build/glib/gtypes.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gtypes.h
rename to src/windows/glib-2.20.1/build/glib/gtypes.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gunibreak.c b/src/windows/glib-2.20.1/build/glib/gunibreak.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gunibreak.c
rename to src/windows/glib-2.20.1/build/glib/gunibreak.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gunibreak.h b/src/windows/glib-2.20.1/build/glib/gunibreak.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gunibreak.h
rename to src/windows/glib-2.20.1/build/glib/gunibreak.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gunichartables.h b/src/windows/glib-2.20.1/build/glib/gunichartables.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gunichartables.h
rename to src/windows/glib-2.20.1/build/glib/gunichartables.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gunicode.h b/src/windows/glib-2.20.1/build/glib/gunicode.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gunicode.h
rename to src/windows/glib-2.20.1/build/glib/gunicode.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gunicodeprivate.h b/src/windows/glib-2.20.1/build/glib/gunicodeprivate.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gunicodeprivate.h
rename to src/windows/glib-2.20.1/build/glib/gunicodeprivate.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gunicollate.c b/src/windows/glib-2.20.1/build/glib/gunicollate.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gunicollate.c
rename to src/windows/glib-2.20.1/build/glib/gunicollate.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gunicomp.h b/src/windows/glib-2.20.1/build/glib/gunicomp.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gunicomp.h
rename to src/windows/glib-2.20.1/build/glib/gunicomp.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gunidecomp.c b/src/windows/glib-2.20.1/build/glib/gunidecomp.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gunidecomp.c
rename to src/windows/glib-2.20.1/build/glib/gunidecomp.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gunidecomp.h b/src/windows/glib-2.20.1/build/glib/gunidecomp.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gunidecomp.h
rename to src/windows/glib-2.20.1/build/glib/gunidecomp.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/guniprop.c b/src/windows/glib-2.20.1/build/glib/guniprop.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/guniprop.c
rename to src/windows/glib-2.20.1/build/glib/guniprop.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gurifuncs.c b/src/windows/glib-2.20.1/build/glib/gurifuncs.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gurifuncs.c
rename to src/windows/glib-2.20.1/build/glib/gurifuncs.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gurifuncs.h b/src/windows/glib-2.20.1/build/glib/gurifuncs.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gurifuncs.h
rename to src/windows/glib-2.20.1/build/glib/gurifuncs.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gutf8.c b/src/windows/glib-2.20.1/build/glib/gutf8.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gutf8.c
rename to src/windows/glib-2.20.1/build/glib/gutf8.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gutils.c b/src/windows/glib-2.20.1/build/glib/gutils.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gutils.c
rename to src/windows/glib-2.20.1/build/glib/gutils.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gutils.h b/src/windows/glib-2.20.1/build/glib/gutils.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gutils.h
rename to src/windows/glib-2.20.1/build/glib/gutils.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gwin32.c b/src/windows/glib-2.20.1/build/glib/gwin32.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gwin32.c
rename to src/windows/glib-2.20.1/build/glib/gwin32.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/gwin32.h b/src/windows/glib-2.20.1/build/glib/gwin32.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/gwin32.h
rename to src/windows/glib-2.20.1/build/glib/gwin32.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/libcharset/README b/src/windows/glib-2.20.1/build/glib/libcharset/README
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/libcharset/README
rename to src/windows/glib-2.20.1/build/glib/libcharset/README
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/libcharset/libcharset.h b/src/windows/glib-2.20.1/build/glib/libcharset/libcharset.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/libcharset/libcharset.h
rename to src/windows/glib-2.20.1/build/glib/libcharset/libcharset.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/libcharset/localcharset.c b/src/windows/glib-2.20.1/build/glib/libcharset/localcharset.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/libcharset/localcharset.c
rename to src/windows/glib-2.20.1/build/glib/libcharset/localcharset.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/libcharset/localcharset.h b/src/windows/glib-2.20.1/build/glib/libcharset/localcharset.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/libcharset/localcharset.h
rename to src/windows/glib-2.20.1/build/glib/libcharset/localcharset.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/libintl.h b/src/windows/glib-2.20.1/build/glib/libintl.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/libintl.h
rename to src/windows/glib-2.20.1/build/glib/libintl.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/msvc_recommended_pragmas.h b/src/windows/glib-2.20.1/build/glib/msvc_recommended_pragmas.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/msvc_recommended_pragmas.h
rename to src/windows/glib-2.20.1/build/glib/msvc_recommended_pragmas.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/pcre/COPYING b/src/windows/glib-2.20.1/build/glib/pcre/COPYING
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/pcre/COPYING
rename to src/windows/glib-2.20.1/build/glib/pcre/COPYING
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/pcre/pcre.h b/src/windows/glib-2.20.1/build/glib/pcre/pcre.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/pcre/pcre.h
rename to src/windows/glib-2.20.1/build/glib/pcre/pcre.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/pcre/pcre_chartables.c b/src/windows/glib-2.20.1/build/glib/pcre/pcre_chartables.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/pcre/pcre_chartables.c
rename to src/windows/glib-2.20.1/build/glib/pcre/pcre_chartables.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/pcre/pcre_compile.c b/src/windows/glib-2.20.1/build/glib/pcre/pcre_compile.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/pcre/pcre_compile.c
rename to src/windows/glib-2.20.1/build/glib/pcre/pcre_compile.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/pcre/pcre_config.c b/src/windows/glib-2.20.1/build/glib/pcre/pcre_config.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/pcre/pcre_config.c
rename to src/windows/glib-2.20.1/build/glib/pcre/pcre_config.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/pcre/pcre_dfa_exec.c b/src/windows/glib-2.20.1/build/glib/pcre/pcre_dfa_exec.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/pcre/pcre_dfa_exec.c
rename to src/windows/glib-2.20.1/build/glib/pcre/pcre_dfa_exec.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/pcre/pcre_exec.c b/src/windows/glib-2.20.1/build/glib/pcre/pcre_exec.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/pcre/pcre_exec.c
rename to src/windows/glib-2.20.1/build/glib/pcre/pcre_exec.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/pcre/pcre_fullinfo.c b/src/windows/glib-2.20.1/build/glib/pcre/pcre_fullinfo.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/pcre/pcre_fullinfo.c
rename to src/windows/glib-2.20.1/build/glib/pcre/pcre_fullinfo.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/pcre/pcre_get.c b/src/windows/glib-2.20.1/build/glib/pcre/pcre_get.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/pcre/pcre_get.c
rename to src/windows/glib-2.20.1/build/glib/pcre/pcre_get.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/pcre/pcre_globals.c b/src/windows/glib-2.20.1/build/glib/pcre/pcre_globals.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/pcre/pcre_globals.c
rename to src/windows/glib-2.20.1/build/glib/pcre/pcre_globals.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/pcre/pcre_info.c b/src/windows/glib-2.20.1/build/glib/pcre/pcre_info.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/pcre/pcre_info.c
rename to src/windows/glib-2.20.1/build/glib/pcre/pcre_info.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/pcre/pcre_internal.h b/src/windows/glib-2.20.1/build/glib/pcre/pcre_internal.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/pcre/pcre_internal.h
rename to src/windows/glib-2.20.1/build/glib/pcre/pcre_internal.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/pcre/pcre_maketables.c b/src/windows/glib-2.20.1/build/glib/pcre/pcre_maketables.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/pcre/pcre_maketables.c
rename to src/windows/glib-2.20.1/build/glib/pcre/pcre_maketables.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/pcre/pcre_newline.c b/src/windows/glib-2.20.1/build/glib/pcre/pcre_newline.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/pcre/pcre_newline.c
rename to src/windows/glib-2.20.1/build/glib/pcre/pcre_newline.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/pcre/pcre_ord2utf8.c b/src/windows/glib-2.20.1/build/glib/pcre/pcre_ord2utf8.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/pcre/pcre_ord2utf8.c
rename to src/windows/glib-2.20.1/build/glib/pcre/pcre_ord2utf8.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/pcre/pcre_refcount.c b/src/windows/glib-2.20.1/build/glib/pcre/pcre_refcount.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/pcre/pcre_refcount.c
rename to src/windows/glib-2.20.1/build/glib/pcre/pcre_refcount.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/pcre/pcre_study.c b/src/windows/glib-2.20.1/build/glib/pcre/pcre_study.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/pcre/pcre_study.c
rename to src/windows/glib-2.20.1/build/glib/pcre/pcre_study.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/pcre/pcre_tables.c b/src/windows/glib-2.20.1/build/glib/pcre/pcre_tables.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/pcre/pcre_tables.c
rename to src/windows/glib-2.20.1/build/glib/pcre/pcre_tables.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/pcre/pcre_try_flipped.c b/src/windows/glib-2.20.1/build/glib/pcre/pcre_try_flipped.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/pcre/pcre_try_flipped.c
rename to src/windows/glib-2.20.1/build/glib/pcre/pcre_try_flipped.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/pcre/pcre_ucp_searchfuncs.c b/src/windows/glib-2.20.1/build/glib/pcre/pcre_ucp_searchfuncs.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/pcre/pcre_ucp_searchfuncs.c
rename to src/windows/glib-2.20.1/build/glib/pcre/pcre_ucp_searchfuncs.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/pcre/pcre_valid_utf8.c b/src/windows/glib-2.20.1/build/glib/pcre/pcre_valid_utf8.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/pcre/pcre_valid_utf8.c
rename to src/windows/glib-2.20.1/build/glib/pcre/pcre_valid_utf8.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/pcre/pcre_version.c b/src/windows/glib-2.20.1/build/glib/pcre/pcre_version.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/pcre/pcre_version.c
rename to src/windows/glib-2.20.1/build/glib/pcre/pcre_version.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/pcre/pcre_xclass.c b/src/windows/glib-2.20.1/build/glib/pcre/pcre_xclass.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/pcre/pcre_xclass.c
rename to src/windows/glib-2.20.1/build/glib/pcre/pcre_xclass.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/pcre/ucp.h b/src/windows/glib-2.20.1/build/glib/pcre/ucp.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/pcre/ucp.h
rename to src/windows/glib-2.20.1/build/glib/pcre/ucp.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/pcre/ucpinternal.h b/src/windows/glib-2.20.1/build/glib/pcre/ucpinternal.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/pcre/ucpinternal.h
rename to src/windows/glib-2.20.1/build/glib/pcre/ucpinternal.h
diff --git a/desmume/src/windows/glib-2.20.1/build/glib/win_iconv.c b/src/windows/glib-2.20.1/build/glib/win_iconv.c
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glib/win_iconv.c
rename to src/windows/glib-2.20.1/build/glib/win_iconv.c
diff --git a/desmume/src/windows/glib-2.20.1/build/glibconfig.h b/src/windows/glib-2.20.1/build/glibconfig.h
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/glibconfig.h
rename to src/windows/glib-2.20.1/build/glibconfig.h
diff --git a/desmume/src/windows/glib-2.20.1/build/vs8/README b/src/windows/glib-2.20.1/build/vs8/README
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/vs8/README
rename to src/windows/glib-2.20.1/build/vs8/README
diff --git a/desmume/src/windows/glib-2.20.1/build/vs8/gio.vcproj b/src/windows/glib-2.20.1/build/vs8/gio.vcproj
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/vs8/gio.vcproj
rename to src/windows/glib-2.20.1/build/vs8/gio.vcproj
diff --git a/desmume/src/windows/glib-2.20.1/build/vs8/glib.sln b/src/windows/glib-2.20.1/build/vs8/glib.sln
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/vs8/glib.sln
rename to src/windows/glib-2.20.1/build/vs8/glib.sln
diff --git a/desmume/src/windows/glib-2.20.1/build/vs8/glib.vcproj b/src/windows/glib-2.20.1/build/vs8/glib.vcproj
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/build/vs8/glib.vcproj
rename to src/windows/glib-2.20.1/build/vs8/glib.vcproj
diff --git a/desmume/src/windows/glib-2.20.1/lib/glib-2.20.1-x86.lib b/src/windows/glib-2.20.1/lib/glib-2.20.1-x86.lib
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/lib/glib-2.20.1-x86.lib
rename to src/windows/glib-2.20.1/lib/glib-2.20.1-x86.lib
diff --git a/desmume/src/windows/glib-2.20.1/modified_for_desmume.txt b/src/windows/glib-2.20.1/modified_for_desmume.txt
similarity index 100%
rename from desmume/src/windows/glib-2.20.1/modified_for_desmume.txt
rename to src/windows/glib-2.20.1/modified_for_desmume.txt
diff --git a/desmume/src/windows/hotkey.cpp b/src/windows/hotkey.cpp
similarity index 100%
rename from desmume/src/windows/hotkey.cpp
rename to src/windows/hotkey.cpp
diff --git a/desmume/src/windows/hotkey.h b/src/windows/hotkey.h
similarity index 100%
rename from desmume/src/windows/hotkey.h
rename to src/windows/hotkey.h
diff --git a/desmume/src/windows/inputdx.cpp b/src/windows/inputdx.cpp
similarity index 100%
rename from desmume/src/windows/inputdx.cpp
rename to src/windows/inputdx.cpp
diff --git a/desmume/src/windows/inputdx.h b/src/windows/inputdx.h
similarity index 100%
rename from desmume/src/windows/inputdx.h
rename to src/windows/inputdx.h
diff --git a/desmume/src/windows/langs/build_utils/gettextlib.dll b/src/windows/langs/build_utils/gettextlib.dll
similarity index 100%
rename from desmume/src/windows/langs/build_utils/gettextlib.dll
rename to src/windows/langs/build_utils/gettextlib.dll
diff --git a/desmume/src/windows/langs/build_utils/gettextpo.dll b/src/windows/langs/build_utils/gettextpo.dll
similarity index 100%
rename from desmume/src/windows/langs/build_utils/gettextpo.dll
rename to src/windows/langs/build_utils/gettextpo.dll
diff --git a/desmume/src/windows/langs/build_utils/gettextsrc.dll b/src/windows/langs/build_utils/gettextsrc.dll
similarity index 100%
rename from desmume/src/windows/langs/build_utils/gettextsrc.dll
rename to src/windows/langs/build_utils/gettextsrc.dll
diff --git a/desmume/src/windows/langs/build_utils/iconv.dll b/src/windows/langs/build_utils/iconv.dll
similarity index 100%
rename from desmume/src/windows/langs/build_utils/iconv.dll
rename to src/windows/langs/build_utils/iconv.dll
diff --git a/desmume/src/windows/langs/build_utils/intl.dll b/src/windows/langs/build_utils/intl.dll
similarity index 100%
rename from desmume/src/windows/langs/build_utils/intl.dll
rename to src/windows/langs/build_utils/intl.dll
diff --git a/desmume/src/windows/langs/build_utils/libiconv-2.dll b/src/windows/langs/build_utils/libiconv-2.dll
similarity index 100%
rename from desmume/src/windows/langs/build_utils/libiconv-2.dll
rename to src/windows/langs/build_utils/libiconv-2.dll
diff --git a/desmume/src/windows/langs/build_utils/msgfmt.exe b/src/windows/langs/build_utils/msgfmt.exe
similarity index 100%
rename from desmume/src/windows/langs/build_utils/msgfmt.exe
rename to src/windows/langs/build_utils/msgfmt.exe
diff --git a/desmume/src/windows/langs/fr_FR.mo b/src/windows/langs/fr_FR.mo
similarity index 100%
rename from desmume/src/windows/langs/fr_FR.mo
rename to src/windows/langs/fr_FR.mo
diff --git a/desmume/src/windows/lightView.cpp b/src/windows/lightView.cpp
similarity index 100%
rename from desmume/src/windows/lightView.cpp
rename to src/windows/lightView.cpp
diff --git a/desmume/src/windows/lightView.h b/src/windows/lightView.h
similarity index 100%
rename from desmume/src/windows/lightView.h
rename to src/windows/lightView.h
diff --git a/desmume/src/windows/main.cpp b/src/windows/main.cpp
similarity index 100%
rename from desmume/src/windows/main.cpp
rename to src/windows/main.cpp
diff --git a/desmume/src/windows/main.h b/src/windows/main.h
similarity index 100%
rename from desmume/src/windows/main.h
rename to src/windows/main.h
diff --git a/desmume/src/windows/mapView.cpp b/src/windows/mapView.cpp
similarity index 100%
rename from desmume/src/windows/mapView.cpp
rename to src/windows/mapView.cpp
diff --git a/desmume/src/windows/mapView.h b/src/windows/mapView.h
similarity index 100%
rename from desmume/src/windows/mapView.h
rename to src/windows/mapView.h
diff --git a/desmume/src/windows/matrixView.cpp b/src/windows/matrixView.cpp
similarity index 100%
rename from desmume/src/windows/matrixView.cpp
rename to src/windows/matrixView.cpp
diff --git a/desmume/src/windows/matrixView.h b/src/windows/matrixView.h
similarity index 100%
rename from desmume/src/windows/matrixView.h
rename to src/windows/matrixView.h
diff --git a/desmume/src/windows/memView.cpp b/src/windows/memView.cpp
similarity index 100%
rename from desmume/src/windows/memView.cpp
rename to src/windows/memView.cpp
diff --git a/desmume/src/windows/memView.h b/src/windows/memView.h
similarity index 100%
rename from desmume/src/windows/memView.h
rename to src/windows/memView.h
diff --git a/desmume/src/windows/mic.cpp b/src/windows/mic.cpp
similarity index 100%
rename from desmume/src/windows/mic.cpp
rename to src/windows/mic.cpp
diff --git a/desmume/src/windows/oamView.cpp b/src/windows/oamView.cpp
similarity index 100%
rename from desmume/src/windows/oamView.cpp
rename to src/windows/oamView.cpp
diff --git a/desmume/src/windows/oamView.h b/src/windows/oamView.h
similarity index 100%
rename from desmume/src/windows/oamView.h
rename to src/windows/oamView.h
diff --git a/desmume/src/windows/ogl.cpp b/src/windows/ogl.cpp
similarity index 100%
rename from desmume/src/windows/ogl.cpp
rename to src/windows/ogl.cpp
diff --git a/desmume/src/windows/palView.cpp b/src/windows/palView.cpp
similarity index 100%
rename from desmume/src/windows/palView.cpp
rename to src/windows/palView.cpp
diff --git a/desmume/src/windows/palView.h b/src/windows/palView.h
similarity index 100%
rename from desmume/src/windows/palView.h
rename to src/windows/palView.h
diff --git a/desmume/src/windows/ram_search.cpp b/src/windows/ram_search.cpp
similarity index 100%
rename from desmume/src/windows/ram_search.cpp
rename to src/windows/ram_search.cpp
diff --git a/desmume/src/windows/ram_search.h b/src/windows/ram_search.h
similarity index 100%
rename from desmume/src/windows/ram_search.h
rename to src/windows/ram_search.h
diff --git a/desmume/src/windows/ramwatch.cpp b/src/windows/ramwatch.cpp
similarity index 100%
rename from desmume/src/windows/ramwatch.cpp
rename to src/windows/ramwatch.cpp
diff --git a/desmume/src/windows/ramwatch.h b/src/windows/ramwatch.h
similarity index 100%
rename from desmume/src/windows/ramwatch.h
rename to src/windows/ramwatch.h
diff --git a/desmume/src/windows/replay.cpp b/src/windows/replay.cpp
similarity index 100%
rename from desmume/src/windows/replay.cpp
rename to src/windows/replay.cpp
diff --git a/desmume/src/windows/replay.h b/src/windows/replay.h
similarity index 100%
rename from desmume/src/windows/replay.h
rename to src/windows/replay.h
diff --git a/desmume/src/windows/resource.h b/src/windows/resource.h
similarity index 100%
rename from desmume/src/windows/resource.h
rename to src/windows/resource.h
diff --git a/desmume/src/windows/resources.rc b/src/windows/resources.rc
similarity index 100%
rename from desmume/src/windows/resources.rc
rename to src/windows/resources.rc
diff --git a/desmume/src/windows/snddx.cpp b/src/windows/snddx.cpp
similarity index 100%
rename from desmume/src/windows/snddx.cpp
rename to src/windows/snddx.cpp
diff --git a/desmume/src/windows/snddx.h b/src/windows/snddx.h
similarity index 100%
rename from desmume/src/windows/snddx.h
rename to src/windows/snddx.h
diff --git a/desmume/src/windows/soundView.cpp b/src/windows/soundView.cpp
similarity index 100%
rename from desmume/src/windows/soundView.cpp
rename to src/windows/soundView.cpp
diff --git a/desmume/src/windows/soundView.h b/src/windows/soundView.h
similarity index 100%
rename from desmume/src/windows/soundView.h
rename to src/windows/soundView.h
diff --git a/desmume/src/windows/throttle.cpp b/src/windows/throttle.cpp
similarity index 100%
rename from desmume/src/windows/throttle.cpp
rename to src/windows/throttle.cpp
diff --git a/desmume/src/windows/throttle.h b/src/windows/throttle.h
similarity index 100%
rename from desmume/src/windows/throttle.h
rename to src/windows/throttle.h
diff --git a/desmume/src/windows/tileView.cpp b/src/windows/tileView.cpp
similarity index 100%
rename from desmume/src/windows/tileView.cpp
rename to src/windows/tileView.cpp
diff --git a/desmume/src/windows/tileView.h b/src/windows/tileView.h
similarity index 100%
rename from desmume/src/windows/tileView.h
rename to src/windows/tileView.h
diff --git a/desmume/src/windows/windriver.h b/src/windows/windriver.h
similarity index 100%
rename from desmume/src/windows/windriver.h
rename to src/windows/windriver.h
diff --git a/desmume/src/windows/winpcap/Devioctl.h b/src/windows/winpcap/Devioctl.h
similarity index 100%
rename from desmume/src/windows/winpcap/Devioctl.h
rename to src/windows/winpcap/Devioctl.h
diff --git a/desmume/src/windows/winpcap/Gnuc.h b/src/windows/winpcap/Gnuc.h
similarity index 100%
rename from desmume/src/windows/winpcap/Gnuc.h
rename to src/windows/winpcap/Gnuc.h
diff --git a/desmume/src/windows/winpcap/Ntddndis.h b/src/windows/winpcap/Ntddndis.h
similarity index 100%
rename from desmume/src/windows/winpcap/Ntddndis.h
rename to src/windows/winpcap/Ntddndis.h
diff --git a/desmume/src/windows/winpcap/Ntddpack.h b/src/windows/winpcap/Ntddpack.h
similarity index 100%
rename from desmume/src/windows/winpcap/Ntddpack.h
rename to src/windows/winpcap/Ntddpack.h
diff --git a/desmume/src/windows/winpcap/Packet.lib b/src/windows/winpcap/Packet.lib
similarity index 100%
rename from desmume/src/windows/winpcap/Packet.lib
rename to src/windows/winpcap/Packet.lib
diff --git a/desmume/src/windows/winpcap/Packet32.h b/src/windows/winpcap/Packet32.h
similarity index 100%
rename from desmume/src/windows/winpcap/Packet32.h
rename to src/windows/winpcap/Packet32.h
diff --git a/desmume/src/windows/winpcap/Win32-Extensions.h b/src/windows/winpcap/Win32-Extensions.h
similarity index 100%
rename from desmume/src/windows/winpcap/Win32-Extensions.h
rename to src/windows/winpcap/Win32-Extensions.h
diff --git a/desmume/src/windows/winpcap/bittypes.h b/src/windows/winpcap/bittypes.h
similarity index 100%
rename from desmume/src/windows/winpcap/bittypes.h
rename to src/windows/winpcap/bittypes.h
diff --git a/desmume/src/windows/winpcap/bucket_lookup.h b/src/windows/winpcap/bucket_lookup.h
similarity index 100%
rename from desmume/src/windows/winpcap/bucket_lookup.h
rename to src/windows/winpcap/bucket_lookup.h
diff --git a/desmume/src/windows/winpcap/count_packets.h b/src/windows/winpcap/count_packets.h
similarity index 100%
rename from desmume/src/windows/winpcap/count_packets.h
rename to src/windows/winpcap/count_packets.h
diff --git a/desmume/src/windows/winpcap/ip6_misc.h b/src/windows/winpcap/ip6_misc.h
similarity index 100%
rename from desmume/src/windows/winpcap/ip6_misc.h
rename to src/windows/winpcap/ip6_misc.h
diff --git a/desmume/src/windows/winpcap/memory_t.h b/src/windows/winpcap/memory_t.h
similarity index 100%
rename from desmume/src/windows/winpcap/memory_t.h
rename to src/windows/winpcap/memory_t.h
diff --git a/desmume/src/windows/winpcap/normal_lookup.h b/src/windows/winpcap/normal_lookup.h
similarity index 100%
rename from desmume/src/windows/winpcap/normal_lookup.h
rename to src/windows/winpcap/normal_lookup.h
diff --git a/desmume/src/windows/winpcap/pcap-bpf.h b/src/windows/winpcap/pcap-bpf.h
similarity index 100%
rename from desmume/src/windows/winpcap/pcap-bpf.h
rename to src/windows/winpcap/pcap-bpf.h
diff --git a/desmume/src/windows/winpcap/pcap-int.h b/src/windows/winpcap/pcap-int.h
similarity index 100%
rename from desmume/src/windows/winpcap/pcap-int.h
rename to src/windows/winpcap/pcap-int.h
diff --git a/desmume/src/windows/winpcap/pcap-stdinc.h b/src/windows/winpcap/pcap-stdinc.h
similarity index 100%
rename from desmume/src/windows/winpcap/pcap-stdinc.h
rename to src/windows/winpcap/pcap-stdinc.h
diff --git a/desmume/src/windows/winpcap/pcap.h b/src/windows/winpcap/pcap.h
similarity index 100%
rename from desmume/src/windows/winpcap/pcap.h
rename to src/windows/winpcap/pcap.h
diff --git a/desmume/src/windows/winpcap/remote-ext.h b/src/windows/winpcap/remote-ext.h
similarity index 100%
rename from desmume/src/windows/winpcap/remote-ext.h
rename to src/windows/winpcap/remote-ext.h
diff --git a/desmume/src/windows/winpcap/tcp_session.h b/src/windows/winpcap/tcp_session.h
similarity index 100%
rename from desmume/src/windows/winpcap/tcp_session.h
rename to src/windows/winpcap/tcp_session.h
diff --git a/desmume/src/windows/winpcap/time_calls.h b/src/windows/winpcap/time_calls.h
similarity index 100%
rename from desmume/src/windows/winpcap/time_calls.h
rename to src/windows/winpcap/time_calls.h
diff --git a/desmume/src/windows/winpcap/tme.h b/src/windows/winpcap/tme.h
similarity index 100%
rename from desmume/src/windows/winpcap/tme.h
rename to src/windows/winpcap/tme.h
diff --git a/desmume/src/windows/winpcap/wpcap.lib b/src/windows/winpcap/wpcap.lib
similarity index 100%
rename from desmume/src/windows/winpcap/wpcap.lib
rename to src/windows/winpcap/wpcap.lib
diff --git a/desmume/src/windows/zlib123/README b/src/windows/zlib123/README
similarity index 100%
rename from desmume/src/windows/zlib123/README
rename to src/windows/zlib123/README
diff --git a/desmume/src/windows/zlib123/zconf.h b/src/windows/zlib123/zconf.h
similarity index 100%
rename from desmume/src/windows/zlib123/zconf.h
rename to src/windows/zlib123/zconf.h
diff --git a/desmume/src/windows/zlib123/zlib-2005-x32.lib b/src/windows/zlib123/zlib-2005-x32.lib
similarity index 100%
rename from desmume/src/windows/zlib123/zlib-2005-x32.lib
rename to src/windows/zlib123/zlib-2005-x32.lib
diff --git a/desmume/src/windows/zlib123/zlib-2005-x64.lib b/src/windows/zlib123/zlib-2005-x64.lib
similarity index 100%
rename from desmume/src/windows/zlib123/zlib-2005-x64.lib
rename to src/windows/zlib123/zlib-2005-x64.lib
diff --git a/desmume/src/windows/zlib123/zlib-2008-x32.lib b/src/windows/zlib123/zlib-2008-x32.lib
similarity index 100%
rename from desmume/src/windows/zlib123/zlib-2008-x32.lib
rename to src/windows/zlib123/zlib-2008-x32.lib
diff --git a/desmume/src/windows/zlib123/zlib-2008-x64.lib b/src/windows/zlib123/zlib-2008-x64.lib
similarity index 100%
rename from desmume/src/windows/zlib123/zlib-2008-x64.lib
rename to src/windows/zlib123/zlib-2008-x64.lib
diff --git a/desmume/src/windows/zlib123/zlib.h b/src/windows/zlib123/zlib.h
similarity index 100%
rename from desmume/src/windows/zlib123/zlib.h
rename to src/windows/zlib123/zlib.h
diff --git a/desmume/src/windows/zlib123/zutil.h b/src/windows/zlib123/zutil.h
similarity index 100%
rename from desmume/src/windows/zlib123/zutil.h
rename to src/windows/zlib123/zutil.h
diff --git a/desmume/src/windows/zziplib/README b/src/windows/zziplib/README
similarity index 100%
rename from desmume/src/windows/zziplib/README
rename to src/windows/zziplib/README
diff --git a/desmume/src/windows/zziplib/zzip/_msvc.h b/src/windows/zziplib/zzip/_msvc.h
similarity index 100%
rename from desmume/src/windows/zziplib/zzip/_msvc.h
rename to src/windows/zziplib/zzip/_msvc.h
diff --git a/desmume/src/windows/zziplib/zzip/conf.h b/src/windows/zziplib/zzip/conf.h
similarity index 100%
rename from desmume/src/windows/zziplib/zzip/conf.h
rename to src/windows/zziplib/zzip/conf.h
diff --git a/desmume/src/windows/zziplib/zzip/types.h b/src/windows/zziplib/zzip/types.h
similarity index 100%
rename from desmume/src/windows/zziplib/zzip/types.h
rename to src/windows/zziplib/zzip/types.h
diff --git a/desmume/src/windows/zziplib/zzip/zzip.h b/src/windows/zziplib/zzip/zzip.h
similarity index 100%
rename from desmume/src/windows/zziplib/zzip/zzip.h
rename to src/windows/zziplib/zzip/zzip.h
diff --git a/desmume/src/windows/zziplib/zziplib-2005-x32.lib b/src/windows/zziplib/zziplib-2005-x32.lib
similarity index 100%
rename from desmume/src/windows/zziplib/zziplib-2005-x32.lib
rename to src/windows/zziplib/zziplib-2005-x32.lib
diff --git a/desmume/src/windows/zziplib/zziplib-2005-x64.lib b/src/windows/zziplib/zziplib-2005-x64.lib
similarity index 100%
rename from desmume/src/windows/zziplib/zziplib-2005-x64.lib
rename to src/windows/zziplib/zziplib-2005-x64.lib
diff --git a/desmume/src/windows/zziplib/zziplib-2008-x32.lib b/src/windows/zziplib/zziplib-2008-x32.lib
similarity index 100%
rename from desmume/src/windows/zziplib/zziplib-2008-x32.lib
rename to src/windows/zziplib/zziplib-2008-x32.lib
diff --git a/desmume/src/windows/zziplib/zziplib-2008-x64.lib b/src/windows/zziplib/zziplib-2008-x64.lib
similarity index 100%
rename from desmume/src/windows/zziplib/zziplib-2008-x64.lib
rename to src/windows/zziplib/zziplib-2008-x64.lib