diff --git a/BizHawk.MultiClient/output/dll/libmednahawk.dll b/BizHawk.MultiClient/output/dll/libmednahawk.dll index 3d8d744ab3..8b22ba1165 100644 Binary files a/BizHawk.MultiClient/output/dll/libmednahawk.dll and b/BizHawk.MultiClient/output/dll/libmednahawk.dll differ diff --git a/BizHawk.pro.sln b/BizHawk.pro.sln index a5678a3501..0b4034611e 100644 --- a/BizHawk.pro.sln +++ b/BizHawk.pro.sln @@ -12,7 +12,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.MultiClient", "BizH EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscoHawk", "DiscoHawk\DiscoHawk.csproj", "{C4366030-6D03-424B-AE53-F4F43BB217C3}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmednahawk", "libmednahawk\libmednahawk.vcxproj", "{B014CA7A-DC5F-404C-8614-3378CD02E17D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmednahawk", "mednafen\libmednahawk\libmednahawk.vcxproj", "{B014CA7A-DC5F-404C-8614-3378CD02E17D}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/libmednahawk/libmednahawk.vcxproj b/libmednahawk/libmednahawk.vcxproj deleted file mode 100644 index ffb220f736..0000000000 --- a/libmednahawk/libmednahawk.vcxproj +++ /dev/null @@ -1,451 +0,0 @@ - - - - - Debug - Win32 - - - Release FastBuild - Win32 - - - Release - Win32 - - - - libmednahawk - {B014CA7A-DC5F-404C-8614-3378CD02E17D} - mednafenpsxunibuild - Win32Proj - - - - DynamicLibrary - NotSet - true - - - DynamicLibrary - NotSet - true - - - DynamicLibrary - NotSet - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - ..\BizHawk.MultiClient\output\dll - $(Configuration)\ - true - ..\BizHawk.MultiClient\output\dll - $(Configuration)\ - false - ..\BizHawk.MultiClient\output\dll - $(Configuration)\ - false - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - - - - Disabled - .;src;include;zlib123;sdl/include;dx;%(AdditionalIncludeDirectories) - HEADLESS;WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - false - EnableFastChecks - MultiThreadedDebugDLL - 1Byte - - - Level3 - EditAndContinue - true - - - zlib123/zlib-vc8-Win32.lib;sdl/sdl-vc8-win32.lib;winmm.lib;dx/directx-win32-ddraw-dinput8-dsound-dxerr8-dxguid.lib;%(AdditionalDependencies) - true - Console - MachineX86 - true - - - - - /MP %(AdditionalOptions) - .;src;include;zlib123;sdl/include;dx;%(AdditionalIncludeDirectories) - HEADLESS;WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - 1Byte - - - Level3 - ProgramDatabase - true - StreamingSIMDExtensions2 - false - Fast - Speed - AnySuitable - true - - - zlib123/zlib-vc8-Win32.lib;sdl/sdl-vc8-win32.lib;sdl/sdlmain-vc8-Win32.lib;winmm.lib;dx/directx-win32-ddraw-dinput8-dsound-dxerr8-dxguid.lib;%(AdditionalDependencies) - true - Console - true - true - MachineX86 - - - - - /MP %(AdditionalOptions) - Full - false - .;src;include;zlib123;sdl/include;dx;%(AdditionalIncludeDirectories) - HEADLESS;WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - 1Byte - StreamingSIMDExtensions2 - - - Level3 - ProgramDatabase - true - false - Fast - Speed - - - zlib123/zlib-vc8-Win32.lib;sdl/sdl-vc8-win32.lib;sdl/sdlmain-vc8-Win32.lib;winmm.lib;dx/directx-win32-ddraw-dinput8-dsound-dxerr8-dxguid.lib;%(AdditionalDependencies) - true - Console - true - true - - - MachineX86 - - - - - - - $(IntDir)%(Filename)1.obj - $(IntDir)%(Filename)1.xdc - $(IntDir)%(Filename)1.obj - $(IntDir)%(Filename)1.xdc - $(IntDir)%(Filename)1.obj - $(IntDir)%(Filename)1.xdc - - - - - - - - - - - - - - - - - - - - - - - - - false - false - - - - - - - Full - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - false - false - - - - - - - - - - - - false - false - - - $(IntDir)%(Filename)1.obj - $(IntDir)%(Filename)1.xdc - $(IntDir)%(Filename)1.obj - $(IntDir)%(Filename)1.xdc - $(IntDir)%(Filename)1.obj - $(IntDir)%(Filename)1.xdc - - - - $(IntDir)%(Filename)1.obj - $(IntDir)%(Filename)1.xdc - $(IntDir)%(Filename)1.obj - $(IntDir)%(Filename)1.xdc - $(IntDir)%(Filename)1.obj - $(IntDir)%(Filename)1.xdc - - - - - - - - - - - - - - - - - - - true - true - true - - - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - true - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/libmednahawk/ABOUT-NLS b/mednafen/ABOUT-NLS similarity index 100% rename from libmednahawk/ABOUT-NLS rename to mednafen/ABOUT-NLS diff --git a/libmednahawk/COPYING b/mednafen/COPYING similarity index 100% rename from libmednahawk/COPYING rename to mednafen/COPYING diff --git a/libmednahawk/ChangeLog b/mednafen/ChangeLog similarity index 100% rename from libmednahawk/ChangeLog rename to mednafen/ChangeLog diff --git a/libmednahawk/Makefile.am b/mednafen/Makefile.am similarity index 100% rename from libmednahawk/Makefile.am rename to mednafen/Makefile.am diff --git a/libmednahawk/Makefile.in b/mednafen/Makefile.in similarity index 100% rename from libmednahawk/Makefile.in rename to mednafen/Makefile.in diff --git a/libmednahawk/NEWS b/mednafen/NEWS similarity index 100% rename from libmednahawk/NEWS rename to mednafen/NEWS diff --git a/libmednahawk/README b/mednafen/README similarity index 100% rename from libmednahawk/README rename to mednafen/README diff --git a/libmednahawk/TODO b/mednafen/TODO similarity index 100% rename from libmednahawk/TODO rename to mednafen/TODO diff --git a/libmednahawk/acinclude.m4 b/mednafen/acinclude.m4 similarity index 100% rename from libmednahawk/acinclude.m4 rename to mednafen/acinclude.m4 diff --git a/libmednahawk/aclocal.m4 b/mednafen/aclocal.m4 similarity index 100% rename from libmednahawk/aclocal.m4 rename to mednafen/aclocal.m4 diff --git a/libmednahawk/autogen.sh b/mednafen/autogen.sh similarity index 100% rename from libmednahawk/autogen.sh rename to mednafen/autogen.sh diff --git a/libmednahawk/compile b/mednafen/compile similarity index 100% rename from libmednahawk/compile rename to mednafen/compile diff --git a/libmednahawk/config.guess b/mednafen/config.guess similarity index 100% rename from libmednahawk/config.guess rename to mednafen/config.guess diff --git a/libmednahawk/config.h b/mednafen/config.h similarity index 100% rename from libmednahawk/config.h rename to mednafen/config.h diff --git a/libmednahawk/config.rpath b/mednafen/config.rpath similarity index 100% rename from libmednahawk/config.rpath rename to mednafen/config.rpath diff --git a/libmednahawk/config.sub b/mednafen/config.sub similarity index 100% rename from libmednahawk/config.sub rename to mednafen/config.sub diff --git a/libmednahawk/configure b/mednafen/configure similarity index 100% rename from libmednahawk/configure rename to mednafen/configure diff --git a/libmednahawk/configure.ac b/mednafen/configure.ac similarity index 100% rename from libmednahawk/configure.ac rename to mednafen/configure.ac diff --git a/libmednahawk/depcomp b/mednafen/depcomp similarity index 100% rename from libmednahawk/depcomp rename to mednafen/depcomp diff --git a/libmednahawk/dx/XInput.h b/mednafen/dx/XInput.h similarity index 100% rename from libmednahawk/dx/XInput.h rename to mednafen/dx/XInput.h diff --git a/libmednahawk/dx/dinput.h b/mednafen/dx/dinput.h similarity index 100% rename from libmednahawk/dx/dinput.h rename to mednafen/dx/dinput.h diff --git a/libmednahawk/dx/directx-win32-ddraw-dinput8-dsound-dxerr8-dxguid.lib b/mednafen/dx/directx-win32-ddraw-dinput8-dsound-dxerr8-dxguid.lib similarity index 100% rename from libmednahawk/dx/directx-win32-ddraw-dinput8-dsound-dxerr8-dxguid.lib rename to mednafen/dx/directx-win32-ddraw-dinput8-dsound-dxerr8-dxguid.lib diff --git a/libmednahawk/dx/dsound.h b/mednafen/dx/dsound.h similarity index 100% rename from libmednahawk/dx/dsound.h rename to mednafen/dx/dsound.h diff --git a/libmednahawk/netplay_stub.cpp b/mednafen/headless/netplay_stub.cpp similarity index 100% rename from libmednahawk/netplay_stub.cpp rename to mednafen/headless/netplay_stub.cpp diff --git a/libmednahawk/include/Fir_Resampler.h b/mednafen/include/Fir_Resampler.h similarity index 100% rename from libmednahawk/include/Fir_Resampler.h rename to mednafen/include/Fir_Resampler.h diff --git a/libmednahawk/include/blargg_common.h b/mednafen/include/blargg_common.h similarity index 100% rename from libmednahawk/include/blargg_common.h rename to mednafen/include/blargg_common.h diff --git a/libmednahawk/include/blargg_config.h b/mednafen/include/blargg_config.h similarity index 100% rename from libmednahawk/include/blargg_config.h rename to mednafen/include/blargg_config.h diff --git a/libmednahawk/include/blargg_endian.h b/mednafen/include/blargg_endian.h similarity index 100% rename from libmednahawk/include/blargg_endian.h rename to mednafen/include/blargg_endian.h diff --git a/libmednahawk/include/blargg_source.h b/mednafen/include/blargg_source.h similarity index 100% rename from libmednahawk/include/blargg_source.h rename to mednafen/include/blargg_source.h diff --git a/libmednahawk/include/blip/Blip_Buffer.h b/mednafen/include/blip/Blip_Buffer.h similarity index 100% rename from libmednahawk/include/blip/Blip_Buffer.h rename to mednafen/include/blip/Blip_Buffer.h diff --git a/libmednahawk/include/blip/Stereo_Buffer.h b/mednafen/include/blip/Stereo_Buffer.h similarity index 100% rename from libmednahawk/include/blip/Stereo_Buffer.h rename to mednafen/include/blip/Stereo_Buffer.h diff --git a/libmednahawk/include/config.h.in b/mednafen/include/config.h.in similarity index 100% rename from libmednahawk/include/config.h.in rename to mednafen/include/config.h.in diff --git a/libmednahawk/include/mpcdec/config_types.h b/mednafen/include/mpcdec/config_types.h similarity index 100% rename from libmednahawk/include/mpcdec/config_types.h rename to mednafen/include/mpcdec/config_types.h diff --git a/libmednahawk/include/mpcdec/decoder.h b/mednafen/include/mpcdec/decoder.h similarity index 100% rename from libmednahawk/include/mpcdec/decoder.h rename to mednafen/include/mpcdec/decoder.h diff --git a/libmednahawk/include/mpcdec/huffman.h b/mednafen/include/mpcdec/huffman.h similarity index 100% rename from libmednahawk/include/mpcdec/huffman.h rename to mednafen/include/mpcdec/huffman.h diff --git a/libmednahawk/include/mpcdec/internal.h b/mednafen/include/mpcdec/internal.h similarity index 100% rename from libmednahawk/include/mpcdec/internal.h rename to mednafen/include/mpcdec/internal.h diff --git a/libmednahawk/include/mpcdec/math.h b/mednafen/include/mpcdec/math.h similarity index 100% rename from libmednahawk/include/mpcdec/math.h rename to mednafen/include/mpcdec/math.h diff --git a/libmednahawk/include/mpcdec/mpcdec.h b/mednafen/include/mpcdec/mpcdec.h similarity index 100% rename from libmednahawk/include/mpcdec/mpcdec.h rename to mednafen/include/mpcdec/mpcdec.h diff --git a/libmednahawk/include/mpcdec/reader.h b/mednafen/include/mpcdec/reader.h similarity index 100% rename from libmednahawk/include/mpcdec/reader.h rename to mednafen/include/mpcdec/reader.h diff --git a/libmednahawk/include/mpcdec/requant.h b/mednafen/include/mpcdec/requant.h similarity index 100% rename from libmednahawk/include/mpcdec/requant.h rename to mednafen/include/mpcdec/requant.h diff --git a/libmednahawk/include/mpcdec/streaminfo.h b/mednafen/include/mpcdec/streaminfo.h similarity index 100% rename from libmednahawk/include/mpcdec/streaminfo.h rename to mednafen/include/mpcdec/streaminfo.h diff --git a/libmednahawk/include/trio/CHANGES b/mednafen/include/trio/CHANGES similarity index 100% rename from libmednahawk/include/trio/CHANGES rename to mednafen/include/trio/CHANGES diff --git a/libmednahawk/include/trio/trio.h b/mednafen/include/trio/trio.h similarity index 100% rename from libmednahawk/include/trio/trio.h rename to mednafen/include/trio/trio.h diff --git a/libmednahawk/include/trio/triodef.h b/mednafen/include/trio/triodef.h similarity index 100% rename from libmednahawk/include/trio/triodef.h rename to mednafen/include/trio/triodef.h diff --git a/libmednahawk/include/trio/trionan.h b/mednafen/include/trio/trionan.h similarity index 100% rename from libmednahawk/include/trio/trionan.h rename to mednafen/include/trio/trionan.h diff --git a/libmednahawk/include/trio/triop.h b/mednafen/include/trio/triop.h similarity index 100% rename from libmednahawk/include/trio/triop.h rename to mednafen/include/trio/triop.h diff --git a/libmednahawk/include/trio/triostr.h b/mednafen/include/trio/triostr.h similarity index 100% rename from libmednahawk/include/trio/triostr.h rename to mednafen/include/trio/triostr.h diff --git a/libmednahawk/intl/ChangeLog b/mednafen/intl/ChangeLog similarity index 100% rename from libmednahawk/intl/ChangeLog rename to mednafen/intl/ChangeLog diff --git a/libmednahawk/intl/Makefile.in b/mednafen/intl/Makefile.in similarity index 100% rename from libmednahawk/intl/Makefile.in rename to mednafen/intl/Makefile.in diff --git a/libmednahawk/intl/VERSION b/mednafen/intl/VERSION similarity index 100% rename from libmednahawk/intl/VERSION rename to mednafen/intl/VERSION diff --git a/libmednahawk/intl/bindtextdom.c b/mednafen/intl/bindtextdom.c similarity index 100% rename from libmednahawk/intl/bindtextdom.c rename to mednafen/intl/bindtextdom.c diff --git a/libmednahawk/intl/config.charset b/mednafen/intl/config.charset similarity index 100% rename from libmednahawk/intl/config.charset rename to mednafen/intl/config.charset diff --git a/libmednahawk/intl/dcgettext.c b/mednafen/intl/dcgettext.c similarity index 100% rename from libmednahawk/intl/dcgettext.c rename to mednafen/intl/dcgettext.c diff --git a/libmednahawk/intl/dcigettext.c b/mednafen/intl/dcigettext.c similarity index 100% rename from libmednahawk/intl/dcigettext.c rename to mednafen/intl/dcigettext.c diff --git a/libmednahawk/intl/dcngettext.c b/mednafen/intl/dcngettext.c similarity index 100% rename from libmednahawk/intl/dcngettext.c rename to mednafen/intl/dcngettext.c diff --git a/libmednahawk/intl/dgettext.c b/mednafen/intl/dgettext.c similarity index 100% rename from libmednahawk/intl/dgettext.c rename to mednafen/intl/dgettext.c diff --git a/libmednahawk/intl/dngettext.c b/mednafen/intl/dngettext.c similarity index 100% rename from libmednahawk/intl/dngettext.c rename to mednafen/intl/dngettext.c diff --git a/libmednahawk/intl/eval-plural.h b/mednafen/intl/eval-plural.h similarity index 100% rename from libmednahawk/intl/eval-plural.h rename to mednafen/intl/eval-plural.h diff --git a/libmednahawk/intl/explodename.c b/mednafen/intl/explodename.c similarity index 100% rename from libmednahawk/intl/explodename.c rename to mednafen/intl/explodename.c diff --git a/libmednahawk/intl/export.h b/mednafen/intl/export.h similarity index 100% rename from libmednahawk/intl/export.h rename to mednafen/intl/export.h diff --git a/libmednahawk/intl/finddomain.c b/mednafen/intl/finddomain.c similarity index 100% rename from libmednahawk/intl/finddomain.c rename to mednafen/intl/finddomain.c diff --git a/libmednahawk/intl/gettext.c b/mednafen/intl/gettext.c similarity index 100% rename from libmednahawk/intl/gettext.c rename to mednafen/intl/gettext.c diff --git a/libmednahawk/intl/gettextP.h b/mednafen/intl/gettextP.h similarity index 100% rename from libmednahawk/intl/gettextP.h rename to mednafen/intl/gettextP.h diff --git a/libmednahawk/intl/gmo.h b/mednafen/intl/gmo.h similarity index 100% rename from libmednahawk/intl/gmo.h rename to mednafen/intl/gmo.h diff --git a/libmednahawk/intl/hash-string.c b/mednafen/intl/hash-string.c similarity index 100% rename from libmednahawk/intl/hash-string.c rename to mednafen/intl/hash-string.c diff --git a/libmednahawk/intl/hash-string.h b/mednafen/intl/hash-string.h similarity index 100% rename from libmednahawk/intl/hash-string.h rename to mednafen/intl/hash-string.h diff --git a/libmednahawk/intl/intl-compat.c b/mednafen/intl/intl-compat.c similarity index 100% rename from libmednahawk/intl/intl-compat.c rename to mednafen/intl/intl-compat.c diff --git a/libmednahawk/intl/intl-exports.c b/mednafen/intl/intl-exports.c similarity index 100% rename from libmednahawk/intl/intl-exports.c rename to mednafen/intl/intl-exports.c diff --git a/libmednahawk/intl/l10nflist.c b/mednafen/intl/l10nflist.c similarity index 100% rename from libmednahawk/intl/l10nflist.c rename to mednafen/intl/l10nflist.c diff --git a/libmednahawk/intl/langprefs.c b/mednafen/intl/langprefs.c similarity index 100% rename from libmednahawk/intl/langprefs.c rename to mednafen/intl/langprefs.c diff --git a/libmednahawk/intl/libgnuintl.h.in b/mednafen/intl/libgnuintl.h.in similarity index 100% rename from libmednahawk/intl/libgnuintl.h.in rename to mednafen/intl/libgnuintl.h.in diff --git a/libmednahawk/intl/libintl.rc b/mednafen/intl/libintl.rc similarity index 100% rename from libmednahawk/intl/libintl.rc rename to mednafen/intl/libintl.rc diff --git a/libmednahawk/intl/loadinfo.h b/mednafen/intl/loadinfo.h similarity index 100% rename from libmednahawk/intl/loadinfo.h rename to mednafen/intl/loadinfo.h diff --git a/libmednahawk/intl/loadmsgcat.c b/mednafen/intl/loadmsgcat.c similarity index 100% rename from libmednahawk/intl/loadmsgcat.c rename to mednafen/intl/loadmsgcat.c diff --git a/libmednahawk/intl/localcharset.c b/mednafen/intl/localcharset.c similarity index 100% rename from libmednahawk/intl/localcharset.c rename to mednafen/intl/localcharset.c diff --git a/libmednahawk/intl/localcharset.h b/mednafen/intl/localcharset.h similarity index 100% rename from libmednahawk/intl/localcharset.h rename to mednafen/intl/localcharset.h diff --git a/libmednahawk/intl/locale.alias b/mednafen/intl/locale.alias similarity index 100% rename from libmednahawk/intl/locale.alias rename to mednafen/intl/locale.alias diff --git a/libmednahawk/intl/localealias.c b/mednafen/intl/localealias.c similarity index 100% rename from libmednahawk/intl/localealias.c rename to mednafen/intl/localealias.c diff --git a/libmednahawk/intl/localename.c b/mednafen/intl/localename.c similarity index 100% rename from libmednahawk/intl/localename.c rename to mednafen/intl/localename.c diff --git a/libmednahawk/intl/lock.c b/mednafen/intl/lock.c similarity index 100% rename from libmednahawk/intl/lock.c rename to mednafen/intl/lock.c diff --git a/libmednahawk/intl/lock.h b/mednafen/intl/lock.h similarity index 100% rename from libmednahawk/intl/lock.h rename to mednafen/intl/lock.h diff --git a/libmednahawk/intl/log.c b/mednafen/intl/log.c similarity index 100% rename from libmednahawk/intl/log.c rename to mednafen/intl/log.c diff --git a/libmednahawk/intl/ngettext.c b/mednafen/intl/ngettext.c similarity index 100% rename from libmednahawk/intl/ngettext.c rename to mednafen/intl/ngettext.c diff --git a/libmednahawk/intl/os2compat.c b/mednafen/intl/os2compat.c similarity index 100% rename from libmednahawk/intl/os2compat.c rename to mednafen/intl/os2compat.c diff --git a/libmednahawk/intl/os2compat.h b/mednafen/intl/os2compat.h similarity index 100% rename from libmednahawk/intl/os2compat.h rename to mednafen/intl/os2compat.h diff --git a/libmednahawk/intl/osdep.c b/mednafen/intl/osdep.c similarity index 100% rename from libmednahawk/intl/osdep.c rename to mednafen/intl/osdep.c diff --git a/libmednahawk/intl/plural-exp.c b/mednafen/intl/plural-exp.c similarity index 100% rename from libmednahawk/intl/plural-exp.c rename to mednafen/intl/plural-exp.c diff --git a/libmednahawk/intl/plural-exp.h b/mednafen/intl/plural-exp.h similarity index 100% rename from libmednahawk/intl/plural-exp.h rename to mednafen/intl/plural-exp.h diff --git a/libmednahawk/intl/plural.c b/mednafen/intl/plural.c similarity index 100% rename from libmednahawk/intl/plural.c rename to mednafen/intl/plural.c diff --git a/libmednahawk/intl/plural.y b/mednafen/intl/plural.y similarity index 100% rename from libmednahawk/intl/plural.y rename to mednafen/intl/plural.y diff --git a/libmednahawk/intl/printf-args.c b/mednafen/intl/printf-args.c similarity index 100% rename from libmednahawk/intl/printf-args.c rename to mednafen/intl/printf-args.c diff --git a/libmednahawk/intl/printf-args.h b/mednafen/intl/printf-args.h similarity index 100% rename from libmednahawk/intl/printf-args.h rename to mednafen/intl/printf-args.h diff --git a/libmednahawk/intl/printf-parse.c b/mednafen/intl/printf-parse.c similarity index 100% rename from libmednahawk/intl/printf-parse.c rename to mednafen/intl/printf-parse.c diff --git a/libmednahawk/intl/printf-parse.h b/mednafen/intl/printf-parse.h similarity index 100% rename from libmednahawk/intl/printf-parse.h rename to mednafen/intl/printf-parse.h diff --git a/libmednahawk/intl/printf.c b/mednafen/intl/printf.c similarity index 100% rename from libmednahawk/intl/printf.c rename to mednafen/intl/printf.c diff --git a/libmednahawk/intl/ref-add.sin b/mednafen/intl/ref-add.sin similarity index 100% rename from libmednahawk/intl/ref-add.sin rename to mednafen/intl/ref-add.sin diff --git a/libmednahawk/intl/ref-del.sin b/mednafen/intl/ref-del.sin similarity index 100% rename from libmednahawk/intl/ref-del.sin rename to mednafen/intl/ref-del.sin diff --git a/libmednahawk/intl/relocatable.c b/mednafen/intl/relocatable.c similarity index 100% rename from libmednahawk/intl/relocatable.c rename to mednafen/intl/relocatable.c diff --git a/libmednahawk/intl/relocatable.h b/mednafen/intl/relocatable.h similarity index 100% rename from libmednahawk/intl/relocatable.h rename to mednafen/intl/relocatable.h diff --git a/libmednahawk/intl/setlocale.c b/mednafen/intl/setlocale.c similarity index 100% rename from libmednahawk/intl/setlocale.c rename to mednafen/intl/setlocale.c diff --git a/libmednahawk/intl/textdomain.c b/mednafen/intl/textdomain.c similarity index 100% rename from libmednahawk/intl/textdomain.c rename to mednafen/intl/textdomain.c diff --git a/libmednahawk/intl/threadlib.c b/mednafen/intl/threadlib.c similarity index 100% rename from libmednahawk/intl/threadlib.c rename to mednafen/intl/threadlib.c diff --git a/libmednahawk/intl/tsearch.c b/mednafen/intl/tsearch.c similarity index 100% rename from libmednahawk/intl/tsearch.c rename to mednafen/intl/tsearch.c diff --git a/libmednahawk/intl/tsearch.h b/mednafen/intl/tsearch.h similarity index 100% rename from libmednahawk/intl/tsearch.h rename to mednafen/intl/tsearch.h diff --git a/libmednahawk/intl/vasnprintf.c b/mednafen/intl/vasnprintf.c similarity index 100% rename from libmednahawk/intl/vasnprintf.c rename to mednafen/intl/vasnprintf.c diff --git a/libmednahawk/intl/vasnprintf.h b/mednafen/intl/vasnprintf.h similarity index 100% rename from libmednahawk/intl/vasnprintf.h rename to mednafen/intl/vasnprintf.h diff --git a/libmednahawk/intl/vasnwprintf.h b/mednafen/intl/vasnwprintf.h similarity index 100% rename from libmednahawk/intl/vasnwprintf.h rename to mednafen/intl/vasnwprintf.h diff --git a/libmednahawk/intl/version.c b/mednafen/intl/version.c similarity index 100% rename from libmednahawk/intl/version.c rename to mednafen/intl/version.c diff --git a/libmednahawk/intl/wprintf-parse.h b/mednafen/intl/wprintf-parse.h similarity index 100% rename from libmednahawk/intl/wprintf-parse.h rename to mednafen/intl/wprintf-parse.h diff --git a/libmednahawk/intl/xsize.h b/mednafen/intl/xsize.h similarity index 100% rename from libmednahawk/intl/xsize.h rename to mednafen/intl/xsize.h diff --git a/libmednahawk/inttypes.h b/mednafen/inttypes.h similarity index 100% rename from libmednahawk/inttypes.h rename to mednafen/inttypes.h diff --git a/mednafen/libmednahawk/config.h b/mednafen/libmednahawk/config.h new file mode 100644 index 0000000000..7a332d56da --- /dev/null +++ b/mednafen/libmednahawk/config.h @@ -0,0 +1,22 @@ +//win32 msvc config +#pragma once +#define HAVE__MKDIR 1 +#define LSB_FIRST +#define SIZEOF_DOUBLE 8 +#define WANT_DEBUGGER 1 +#define snprintf _snprintf +#define strcasecmp(x,y) _stricmp(x,y) +#define strncasecmp(x, y, l) strnicmp(x, y, l) +#define _(x) (x) +#define PSS "/" +#define round(x) (floorf((x) + 0.5f)) +#define strdup _strdup +#define strtoull _strtoui64 +#define strtoll _strtoi64 +#define _USE_MATH_DEFINES +#define world_strtod strtod +#define WANT_PSX_EMU + + +#define MEDNAFEN_VERSION "0.999.999-WIP" +#define MEDNAFEN_VERSION_NUMERIC 0x999999 diff --git a/mednafen/libmednahawk/inttypes.h b/mednafen/libmednahawk/inttypes.h new file mode 100644 index 0000000000..6835ef29ab --- /dev/null +++ b/mednafen/libmednahawk/inttypes.h @@ -0,0 +1,12 @@ +#pragma once + + +typedef __int8 int8_t; +typedef __int16 int16_t; +typedef __int32 int32_t; +typedef __int64 int64_t; + +typedef unsigned __int8 uint8_t; +typedef unsigned __int16 uint16_t; +typedef unsigned __int32 uint32_t; +typedef unsigned __int64 uint64_t; diff --git a/libmednahawk/api.cpp b/mednafen/libmednahawk/libmednahawk.cpp similarity index 100% rename from libmednahawk/api.cpp rename to mednafen/libmednahawk/libmednahawk.cpp diff --git a/mednafen/libmednahawk/libmednahawk.vcxproj b/mednafen/libmednahawk/libmednahawk.vcxproj new file mode 100644 index 0000000000..b623df7575 --- /dev/null +++ b/mednafen/libmednahawk/libmednahawk.vcxproj @@ -0,0 +1,451 @@ + + + + + Debug + Win32 + + + Release FastBuild + Win32 + + + Release + Win32 + + + + libmednahawk + {B014CA7A-DC5F-404C-8614-3378CD02E17D} + mednafenpsxunibuild + Win32Proj + + + + DynamicLibrary + NotSet + true + + + DynamicLibrary + NotSet + true + + + DynamicLibrary + NotSet + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + ..\..\BizHawk.MultiClient\output\dll + $(Configuration)\ + true + ..\..\BizHawk.MultiClient\output\dll + $(Configuration)\ + false + ..\..\BizHawk.MultiClient\output\dll + $(Configuration)\ + false + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + + + + Disabled + .;..\src;..\include;..\zlib123;..\sdl\include;..\dx;%(AdditionalIncludeDirectories) + HEADLESS;WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebugDLL + 1Byte + + + Level3 + EditAndContinue + true + + + ..\zlib123/zlib-vc8-Win32.lib;..\sdl/sdl-vc8-win32.lib;winmm.lib;..\dx/directx-win32-ddraw-dinput8-dsound-dxerr8-dxguid.lib;%(AdditionalDependencies) + true + Console + MachineX86 + true + + + + + /MP %(AdditionalOptions) + .;..\src;..\include;..\zlib123;..\sdl\include;..\dx;%(AdditionalIncludeDirectories) + HEADLESS;WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + 1Byte + + + Level3 + ProgramDatabase + true + StreamingSIMDExtensions2 + false + Fast + Speed + AnySuitable + true + + + ..\zlib123/zlib-vc8-Win32.lib;..\sdl/sdl-vc8-win32.lib;winmm.lib;..\dx/directx-win32-ddraw-dinput8-dsound-dxerr8-dxguid.lib;%(AdditionalDependencies) + true + Console + true + true + MachineX86 + + + + + /MP %(AdditionalOptions) + Full + false + .;..\src;..\include;..\zlib123;..\sdl\include;..\dx;%(AdditionalIncludeDirectories) + HEADLESS;WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + 1Byte + StreamingSIMDExtensions2 + + + Level3 + ProgramDatabase + true + false + Fast + Speed + + + ..\zlib123/zlib-vc8-Win32.lib;..\sdl/sdl-vc8-win32.lib;winmm.lib;..\dx/directx-win32-ddraw-dinput8-dsound-dxerr8-dxguid.lib;%(AdditionalDependencies) + true + Console + true + true + + + MachineX86 + + + + + + + $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.xdc + $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.xdc + $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.xdc + + + + + + + + + + + + + + + + + + + + + + + + + false + false + + + + + + + Full + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + false + + + + + + + + + + + + false + false + + + $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.xdc + $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.xdc + $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.xdc + + + + $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.xdc + $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.xdc + $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.xdc + + + + + + + + + + + + + + + + + + + true + true + true + + + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/libmednahawk/libmednahawk.vcxproj.filters b/mednafen/libmednahawk/libmednahawk.vcxproj.filters similarity index 53% rename from libmednahawk/libmednahawk.vcxproj.filters rename to mednafen/libmednahawk/libmednahawk.vcxproj.filters index d4011d4380..e191adbaa5 100644 --- a/libmednahawk/libmednahawk.vcxproj.filters +++ b/mednafen/libmednahawk/libmednahawk.vcxproj.filters @@ -52,737 +52,742 @@ {f36488fc-db6a-4348-84ad-94128fb86fbf} + + {2097105e-a7b2-4499-a0b7-4b486470c6b6} + - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src\psx - + src\psx - + src\psx - + src\psx - + src\psx - + src\psx - + src\psx - + src\psx - + src\psx - + src\psx - + src\psx - + src\psx - + src\psx - + src\psx - + src\psx\input - + src\psx\input - + src\psx\input - + src\psx\input - + src\psx\input - + src\psx\input - + src\psx\input - + src\psx\input - + src\psx\input - + src\resampler - + src\cdrom - + src\cdrom - + src\cdrom - + src\cdrom - + src\cdrom - + src\cdrom - + src\cdrom - + src\cdrom - + src\cdrom - + src\cdrom - + src\cdrom - + src\video - + src\video - + src\video - + src\video - + src\video - + src\video - + src\video - + src\video - + src\video - + src\video - + src\trio - + src\trio - + src\trio - + src\drivers - + src\drivers - + src\drivers - + src\drivers - + src\drivers - + src\drivers - + src\drivers - + src\drivers - + src\drivers - + src\drivers - + src\drivers - + src\drivers - + src\drivers - + src\drivers - + src\drivers - + src\drivers - + src\drivers - + src\drivers - + src\drivers - + src\drivers - + src\drivers - + src\drivers - + src\drivers - + src\drivers - + src\drivers - + src\drivers - + src\drivers - + src\drivers - + src\drivers - + src\sound - + src\sound - + src\sound - + src\sound - + src\sound - + src\compress - + src\compress - + src\compress - + src\compress - + src\compress - + src\string - + src\string - + src\sexyal - + src\sexyal - + src\sexyal\drivers - + src\sexyal\drivers - + src\hw_cpu\c68k - + src\hw_cpu\c68k - + src\hw_cpu\z80-fuse - + src\hw_cpu\z80-fuse - + src\desa68 - - - + src\drivers + + + headless + - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src\psx - + src\psx - + src\psx - + src\psx - + src\psx - + src\psx - + src\psx - + src\psx - + src\psx - + src\psx - + src\psx - + src\psx - + src\psx - + src\psx - + src\psx\input - + src\psx\input - + src\psx\input - + src\psx\input - + src\psx\input - + src\psx\input - + src\psx\input - + src\psx\input - + src\psx\input - + src\resampler - + src\resampler - + src\resampler - + src\resampler - + src\resampler - + src\cdrom - + src\cdrom - + src\cdrom - + src\cdrom - + src\cdrom - + src\cdrom - + src\cdrom - + src\video - + src\video - + src\video - + src\video - + src\video - + src\video - + src\video - + src\video - + src\video - + src\video - + src\drivers - + src\drivers - + src\drivers - + src\drivers - + src\drivers - + src\drivers - + src\drivers - + src\drivers - + src\drivers - + src\drivers - + src\drivers - + src\drivers - + src\drivers - + src\drivers - + src\drivers - + src\drivers - + src\drivers - + src\drivers - + src\drivers - + src\drivers - + src\drivers - + src\drivers - + src\drivers - + src\drivers - + src\drivers - + src\drivers - + src\sound - + src\compress - + src\compress - + src\compress - + src\compress - + src\compress - + src\compress - + src\compress - + src\string - + src\string - + src\sexyal - + src\sexyal - + src\hw_cpu\c68k - + src\hw_cpu\z80-fuse - + src\desa68 - + src\drivers - + src\psx - + src\psx - + src\psx - + src\psx diff --git a/mednafen/libretro/config.h b/mednafen/libretro/config.h new file mode 100644 index 0000000000..7a332d56da --- /dev/null +++ b/mednafen/libretro/config.h @@ -0,0 +1,22 @@ +//win32 msvc config +#pragma once +#define HAVE__MKDIR 1 +#define LSB_FIRST +#define SIZEOF_DOUBLE 8 +#define WANT_DEBUGGER 1 +#define snprintf _snprintf +#define strcasecmp(x,y) _stricmp(x,y) +#define strncasecmp(x, y, l) strnicmp(x, y, l) +#define _(x) (x) +#define PSS "/" +#define round(x) (floorf((x) + 0.5f)) +#define strdup _strdup +#define strtoull _strtoui64 +#define strtoll _strtoi64 +#define _USE_MATH_DEFINES +#define world_strtod strtod +#define WANT_PSX_EMU + + +#define MEDNAFEN_VERSION "0.999.999-WIP" +#define MEDNAFEN_VERSION_NUMERIC 0x999999 diff --git a/mednafen/libretro/inttypes.h b/mednafen/libretro/inttypes.h new file mode 100644 index 0000000000..6835ef29ab --- /dev/null +++ b/mednafen/libretro/inttypes.h @@ -0,0 +1,12 @@ +#pragma once + + +typedef __int8 int8_t; +typedef __int16 int16_t; +typedef __int32 int32_t; +typedef __int64 int64_t; + +typedef unsigned __int8 uint8_t; +typedef unsigned __int16 uint16_t; +typedef unsigned __int32 uint32_t; +typedef unsigned __int64 uint64_t; diff --git a/libmednahawk/ltmain.sh b/mednafen/ltmain.sh similarity index 100% rename from libmednahawk/ltmain.sh rename to mednafen/ltmain.sh diff --git a/libmednahawk/m4/ChangeLog b/mednafen/m4/ChangeLog similarity index 100% rename from libmednahawk/m4/ChangeLog rename to mednafen/m4/ChangeLog diff --git a/libmednahawk/m4/ax_cflags_gcc_option.m4 b/mednafen/m4/ax_cflags_gcc_option.m4 similarity index 100% rename from libmednahawk/m4/ax_cflags_gcc_option.m4 rename to mednafen/m4/ax_cflags_gcc_option.m4 diff --git a/libmednahawk/m4/codeset.m4 b/mednafen/m4/codeset.m4 similarity index 100% rename from libmednahawk/m4/codeset.m4 rename to mednafen/m4/codeset.m4 diff --git a/libmednahawk/m4/fcntl-o.m4 b/mednafen/m4/fcntl-o.m4 similarity index 100% rename from libmednahawk/m4/fcntl-o.m4 rename to mednafen/m4/fcntl-o.m4 diff --git a/libmednahawk/m4/gettext.m4 b/mednafen/m4/gettext.m4 similarity index 100% rename from libmednahawk/m4/gettext.m4 rename to mednafen/m4/gettext.m4 diff --git a/libmednahawk/m4/glibc2.m4 b/mednafen/m4/glibc2.m4 similarity index 100% rename from libmednahawk/m4/glibc2.m4 rename to mednafen/m4/glibc2.m4 diff --git a/libmednahawk/m4/glibc21.m4 b/mednafen/m4/glibc21.m4 similarity index 100% rename from libmednahawk/m4/glibc21.m4 rename to mednafen/m4/glibc21.m4 diff --git a/libmednahawk/m4/iconv.m4 b/mednafen/m4/iconv.m4 similarity index 100% rename from libmednahawk/m4/iconv.m4 rename to mednafen/m4/iconv.m4 diff --git a/libmednahawk/m4/intdiv0.m4 b/mednafen/m4/intdiv0.m4 similarity index 100% rename from libmednahawk/m4/intdiv0.m4 rename to mednafen/m4/intdiv0.m4 diff --git a/libmednahawk/m4/intl.m4 b/mednafen/m4/intl.m4 similarity index 100% rename from libmednahawk/m4/intl.m4 rename to mednafen/m4/intl.m4 diff --git a/libmednahawk/m4/intldir.m4 b/mednafen/m4/intldir.m4 similarity index 100% rename from libmednahawk/m4/intldir.m4 rename to mednafen/m4/intldir.m4 diff --git a/libmednahawk/m4/intlmacosx.m4 b/mednafen/m4/intlmacosx.m4 similarity index 100% rename from libmednahawk/m4/intlmacosx.m4 rename to mednafen/m4/intlmacosx.m4 diff --git a/libmednahawk/m4/intmax.m4 b/mednafen/m4/intmax.m4 similarity index 100% rename from libmednahawk/m4/intmax.m4 rename to mednafen/m4/intmax.m4 diff --git a/libmednahawk/m4/inttypes-h.m4 b/mednafen/m4/inttypes-h.m4 similarity index 100% rename from libmednahawk/m4/inttypes-h.m4 rename to mednafen/m4/inttypes-h.m4 diff --git a/libmednahawk/m4/inttypes-pri.m4 b/mednafen/m4/inttypes-pri.m4 similarity index 100% rename from libmednahawk/m4/inttypes-pri.m4 rename to mednafen/m4/inttypes-pri.m4 diff --git a/libmednahawk/m4/inttypes_h.m4 b/mednafen/m4/inttypes_h.m4 similarity index 100% rename from libmednahawk/m4/inttypes_h.m4 rename to mednafen/m4/inttypes_h.m4 diff --git a/libmednahawk/m4/lcmessage.m4 b/mednafen/m4/lcmessage.m4 similarity index 100% rename from libmednahawk/m4/lcmessage.m4 rename to mednafen/m4/lcmessage.m4 diff --git a/libmednahawk/m4/lib-ld.m4 b/mednafen/m4/lib-ld.m4 similarity index 100% rename from libmednahawk/m4/lib-ld.m4 rename to mednafen/m4/lib-ld.m4 diff --git a/libmednahawk/m4/lib-link.m4 b/mednafen/m4/lib-link.m4 similarity index 100% rename from libmednahawk/m4/lib-link.m4 rename to mednafen/m4/lib-link.m4 diff --git a/libmednahawk/m4/lib-prefix.m4 b/mednafen/m4/lib-prefix.m4 similarity index 100% rename from libmednahawk/m4/lib-prefix.m4 rename to mednafen/m4/lib-prefix.m4 diff --git a/libmednahawk/m4/libtool.m4 b/mednafen/m4/libtool.m4 similarity index 100% rename from libmednahawk/m4/libtool.m4 rename to mednafen/m4/libtool.m4 diff --git a/libmednahawk/m4/lock.m4 b/mednafen/m4/lock.m4 similarity index 100% rename from libmednahawk/m4/lock.m4 rename to mednafen/m4/lock.m4 diff --git a/libmednahawk/m4/longdouble.m4 b/mednafen/m4/longdouble.m4 similarity index 100% rename from libmednahawk/m4/longdouble.m4 rename to mednafen/m4/longdouble.m4 diff --git a/libmednahawk/m4/longlong.m4 b/mednafen/m4/longlong.m4 similarity index 100% rename from libmednahawk/m4/longlong.m4 rename to mednafen/m4/longlong.m4 diff --git a/libmednahawk/m4/ltoptions.m4 b/mednafen/m4/ltoptions.m4 similarity index 100% rename from libmednahawk/m4/ltoptions.m4 rename to mednafen/m4/ltoptions.m4 diff --git a/libmednahawk/m4/ltsugar.m4 b/mednafen/m4/ltsugar.m4 similarity index 100% rename from libmednahawk/m4/ltsugar.m4 rename to mednafen/m4/ltsugar.m4 diff --git a/libmednahawk/m4/ltversion.m4 b/mednafen/m4/ltversion.m4 similarity index 100% rename from libmednahawk/m4/ltversion.m4 rename to mednafen/m4/ltversion.m4 diff --git a/libmednahawk/m4/lt~obsolete.m4 b/mednafen/m4/lt~obsolete.m4 similarity index 100% rename from libmednahawk/m4/lt~obsolete.m4 rename to mednafen/m4/lt~obsolete.m4 diff --git a/libmednahawk/m4/nls.m4 b/mednafen/m4/nls.m4 similarity index 100% rename from libmednahawk/m4/nls.m4 rename to mednafen/m4/nls.m4 diff --git a/libmednahawk/m4/po.m4 b/mednafen/m4/po.m4 similarity index 100% rename from libmednahawk/m4/po.m4 rename to mednafen/m4/po.m4 diff --git a/libmednahawk/m4/printf-posix.m4 b/mednafen/m4/printf-posix.m4 similarity index 100% rename from libmednahawk/m4/printf-posix.m4 rename to mednafen/m4/printf-posix.m4 diff --git a/libmednahawk/m4/progtest.m4 b/mednafen/m4/progtest.m4 similarity index 100% rename from libmednahawk/m4/progtest.m4 rename to mednafen/m4/progtest.m4 diff --git a/libmednahawk/m4/signed.m4 b/mednafen/m4/signed.m4 similarity index 100% rename from libmednahawk/m4/signed.m4 rename to mednafen/m4/signed.m4 diff --git a/libmednahawk/m4/size_max.m4 b/mednafen/m4/size_max.m4 similarity index 100% rename from libmednahawk/m4/size_max.m4 rename to mednafen/m4/size_max.m4 diff --git a/libmednahawk/m4/stdint_h.m4 b/mednafen/m4/stdint_h.m4 similarity index 100% rename from libmednahawk/m4/stdint_h.m4 rename to mednafen/m4/stdint_h.m4 diff --git a/libmednahawk/m4/threadlib.m4 b/mednafen/m4/threadlib.m4 similarity index 100% rename from libmednahawk/m4/threadlib.m4 rename to mednafen/m4/threadlib.m4 diff --git a/libmednahawk/m4/uintmax_t.m4 b/mednafen/m4/uintmax_t.m4 similarity index 100% rename from libmednahawk/m4/uintmax_t.m4 rename to mednafen/m4/uintmax_t.m4 diff --git a/libmednahawk/m4/ulonglong.m4 b/mednafen/m4/ulonglong.m4 similarity index 100% rename from libmednahawk/m4/ulonglong.m4 rename to mednafen/m4/ulonglong.m4 diff --git a/libmednahawk/m4/visibility.m4 b/mednafen/m4/visibility.m4 similarity index 100% rename from libmednahawk/m4/visibility.m4 rename to mednafen/m4/visibility.m4 diff --git a/libmednahawk/m4/wchar_t.m4 b/mednafen/m4/wchar_t.m4 similarity index 100% rename from libmednahawk/m4/wchar_t.m4 rename to mednafen/m4/wchar_t.m4 diff --git a/libmednahawk/m4/wint_t.m4 b/mednafen/m4/wint_t.m4 similarity index 100% rename from libmednahawk/m4/wint_t.m4 rename to mednafen/m4/wint_t.m4 diff --git a/libmednahawk/m4/xsize.m4 b/mednafen/m4/xsize.m4 similarity index 100% rename from libmednahawk/m4/xsize.m4 rename to mednafen/m4/xsize.m4 diff --git a/libmednahawk/missing b/mednafen/missing similarity index 100% rename from libmednahawk/missing rename to mednafen/missing diff --git a/libmednahawk/po/ChangeLog b/mednafen/po/ChangeLog similarity index 100% rename from libmednahawk/po/ChangeLog rename to mednafen/po/ChangeLog diff --git a/libmednahawk/po/LINGUAS b/mednafen/po/LINGUAS similarity index 100% rename from libmednahawk/po/LINGUAS rename to mednafen/po/LINGUAS diff --git a/libmednahawk/po/Makefile.in.in b/mednafen/po/Makefile.in.in similarity index 100% rename from libmednahawk/po/Makefile.in.in rename to mednafen/po/Makefile.in.in diff --git a/libmednahawk/po/Makevars b/mednafen/po/Makevars similarity index 100% rename from libmednahawk/po/Makevars rename to mednafen/po/Makevars diff --git a/libmednahawk/po/POTFILES.in b/mednafen/po/POTFILES.in similarity index 100% rename from libmednahawk/po/POTFILES.in rename to mednafen/po/POTFILES.in diff --git a/libmednahawk/po/Rules-quot b/mednafen/po/Rules-quot similarity index 100% rename from libmednahawk/po/Rules-quot rename to mednafen/po/Rules-quot diff --git a/libmednahawk/po/boldquot.sed b/mednafen/po/boldquot.sed similarity index 100% rename from libmednahawk/po/boldquot.sed rename to mednafen/po/boldquot.sed diff --git a/libmednahawk/po/de.gmo b/mednafen/po/de.gmo similarity index 100% rename from libmednahawk/po/de.gmo rename to mednafen/po/de.gmo diff --git a/libmednahawk/po/de.po b/mednafen/po/de.po similarity index 100% rename from libmednahawk/po/de.po rename to mednafen/po/de.po diff --git a/libmednahawk/po/en@boldquot.header b/mednafen/po/en@boldquot.header similarity index 100% rename from libmednahawk/po/en@boldquot.header rename to mednafen/po/en@boldquot.header diff --git a/libmednahawk/po/en@quot.header b/mednafen/po/en@quot.header similarity index 100% rename from libmednahawk/po/en@quot.header rename to mednafen/po/en@quot.header diff --git a/libmednahawk/po/es.gmo b/mednafen/po/es.gmo similarity index 100% rename from libmednahawk/po/es.gmo rename to mednafen/po/es.gmo diff --git a/libmednahawk/po/es.po b/mednafen/po/es.po similarity index 100% rename from libmednahawk/po/es.po rename to mednafen/po/es.po diff --git a/libmednahawk/po/insert-header.sin b/mednafen/po/insert-header.sin similarity index 100% rename from libmednahawk/po/insert-header.sin rename to mednafen/po/insert-header.sin diff --git a/libmednahawk/po/mednafen.pot b/mednafen/po/mednafen.pot similarity index 100% rename from libmednahawk/po/mednafen.pot rename to mednafen/po/mednafen.pot diff --git a/libmednahawk/po/quot.sed b/mednafen/po/quot.sed similarity index 100% rename from libmednahawk/po/quot.sed rename to mednafen/po/quot.sed diff --git a/libmednahawk/po/remove-potcdate.sin b/mednafen/po/remove-potcdate.sin similarity index 100% rename from libmednahawk/po/remove-potcdate.sin rename to mednafen/po/remove-potcdate.sin diff --git a/libmednahawk/po/ru.gmo b/mednafen/po/ru.gmo similarity index 100% rename from libmednahawk/po/ru.gmo rename to mednafen/po/ru.gmo diff --git a/libmednahawk/po/ru.po b/mednafen/po/ru.po similarity index 100% rename from libmednahawk/po/ru.po rename to mednafen/po/ru.po diff --git a/libmednahawk/po/stamp-po b/mednafen/po/stamp-po similarity index 100% rename from libmednahawk/po/stamp-po rename to mednafen/po/stamp-po diff --git a/libmednahawk/sdl/include/SDL.h b/mednafen/sdl/include/SDL.h similarity index 100% rename from libmednahawk/sdl/include/SDL.h rename to mednafen/sdl/include/SDL.h diff --git a/libmednahawk/sdl/include/SDL_active.h b/mednafen/sdl/include/SDL_active.h similarity index 100% rename from libmednahawk/sdl/include/SDL_active.h rename to mednafen/sdl/include/SDL_active.h diff --git a/libmednahawk/sdl/include/SDL_audio.h b/mednafen/sdl/include/SDL_audio.h similarity index 100% rename from libmednahawk/sdl/include/SDL_audio.h rename to mednafen/sdl/include/SDL_audio.h diff --git a/libmednahawk/sdl/include/SDL_byteorder.h b/mednafen/sdl/include/SDL_byteorder.h similarity index 100% rename from libmednahawk/sdl/include/SDL_byteorder.h rename to mednafen/sdl/include/SDL_byteorder.h diff --git a/libmednahawk/sdl/include/SDL_cdrom.h b/mednafen/sdl/include/SDL_cdrom.h similarity index 100% rename from libmednahawk/sdl/include/SDL_cdrom.h rename to mednafen/sdl/include/SDL_cdrom.h diff --git a/libmednahawk/sdl/include/SDL_config.h b/mednafen/sdl/include/SDL_config.h similarity index 100% rename from libmednahawk/sdl/include/SDL_config.h rename to mednafen/sdl/include/SDL_config.h diff --git a/libmednahawk/sdl/include/SDL_config.h.default b/mednafen/sdl/include/SDL_config.h.default similarity index 100% rename from libmednahawk/sdl/include/SDL_config.h.default rename to mednafen/sdl/include/SDL_config.h.default diff --git a/libmednahawk/sdl/include/SDL_config.h.in b/mednafen/sdl/include/SDL_config.h.in similarity index 100% rename from libmednahawk/sdl/include/SDL_config.h.in rename to mednafen/sdl/include/SDL_config.h.in diff --git a/libmednahawk/sdl/include/SDL_config_dreamcast.h b/mednafen/sdl/include/SDL_config_dreamcast.h similarity index 100% rename from libmednahawk/sdl/include/SDL_config_dreamcast.h rename to mednafen/sdl/include/SDL_config_dreamcast.h diff --git a/libmednahawk/sdl/include/SDL_config_macos.h b/mednafen/sdl/include/SDL_config_macos.h similarity index 100% rename from libmednahawk/sdl/include/SDL_config_macos.h rename to mednafen/sdl/include/SDL_config_macos.h diff --git a/libmednahawk/sdl/include/SDL_config_macosx.h b/mednafen/sdl/include/SDL_config_macosx.h similarity index 100% rename from libmednahawk/sdl/include/SDL_config_macosx.h rename to mednafen/sdl/include/SDL_config_macosx.h diff --git a/libmednahawk/sdl/include/SDL_config_minimal.h b/mednafen/sdl/include/SDL_config_minimal.h similarity index 100% rename from libmednahawk/sdl/include/SDL_config_minimal.h rename to mednafen/sdl/include/SDL_config_minimal.h diff --git a/libmednahawk/sdl/include/SDL_config_nds.h b/mednafen/sdl/include/SDL_config_nds.h similarity index 100% rename from libmednahawk/sdl/include/SDL_config_nds.h rename to mednafen/sdl/include/SDL_config_nds.h diff --git a/libmednahawk/sdl/include/SDL_config_os2.h b/mednafen/sdl/include/SDL_config_os2.h similarity index 100% rename from libmednahawk/sdl/include/SDL_config_os2.h rename to mednafen/sdl/include/SDL_config_os2.h diff --git a/libmednahawk/sdl/include/SDL_config_symbian.h b/mednafen/sdl/include/SDL_config_symbian.h similarity index 100% rename from libmednahawk/sdl/include/SDL_config_symbian.h rename to mednafen/sdl/include/SDL_config_symbian.h diff --git a/libmednahawk/sdl/include/SDL_copying.h b/mednafen/sdl/include/SDL_copying.h similarity index 100% rename from libmednahawk/sdl/include/SDL_copying.h rename to mednafen/sdl/include/SDL_copying.h diff --git a/libmednahawk/sdl/include/SDL_cpuinfo.h b/mednafen/sdl/include/SDL_cpuinfo.h similarity index 100% rename from libmednahawk/sdl/include/SDL_cpuinfo.h rename to mednafen/sdl/include/SDL_cpuinfo.h diff --git a/libmednahawk/sdl/include/SDL_endian.h b/mednafen/sdl/include/SDL_endian.h similarity index 100% rename from libmednahawk/sdl/include/SDL_endian.h rename to mednafen/sdl/include/SDL_endian.h diff --git a/libmednahawk/sdl/include/SDL_error.h b/mednafen/sdl/include/SDL_error.h similarity index 100% rename from libmednahawk/sdl/include/SDL_error.h rename to mednafen/sdl/include/SDL_error.h diff --git a/libmednahawk/sdl/include/SDL_events.h b/mednafen/sdl/include/SDL_events.h similarity index 100% rename from libmednahawk/sdl/include/SDL_events.h rename to mednafen/sdl/include/SDL_events.h diff --git a/libmednahawk/sdl/include/SDL_getenv.h b/mednafen/sdl/include/SDL_getenv.h similarity index 100% rename from libmednahawk/sdl/include/SDL_getenv.h rename to mednafen/sdl/include/SDL_getenv.h diff --git a/libmednahawk/sdl/include/SDL_joystick.h b/mednafen/sdl/include/SDL_joystick.h similarity index 100% rename from libmednahawk/sdl/include/SDL_joystick.h rename to mednafen/sdl/include/SDL_joystick.h diff --git a/libmednahawk/sdl/include/SDL_keyboard.h b/mednafen/sdl/include/SDL_keyboard.h similarity index 100% rename from libmednahawk/sdl/include/SDL_keyboard.h rename to mednafen/sdl/include/SDL_keyboard.h diff --git a/libmednahawk/sdl/include/SDL_keysym.h b/mednafen/sdl/include/SDL_keysym.h similarity index 100% rename from libmednahawk/sdl/include/SDL_keysym.h rename to mednafen/sdl/include/SDL_keysym.h diff --git a/libmednahawk/sdl/include/SDL_loadso.h b/mednafen/sdl/include/SDL_loadso.h similarity index 100% rename from libmednahawk/sdl/include/SDL_loadso.h rename to mednafen/sdl/include/SDL_loadso.h diff --git a/libmednahawk/sdl/include/SDL_main.h b/mednafen/sdl/include/SDL_main.h similarity index 100% rename from libmednahawk/sdl/include/SDL_main.h rename to mednafen/sdl/include/SDL_main.h diff --git a/libmednahawk/sdl/include/SDL_mouse.h b/mednafen/sdl/include/SDL_mouse.h similarity index 100% rename from libmednahawk/sdl/include/SDL_mouse.h rename to mednafen/sdl/include/SDL_mouse.h diff --git a/libmednahawk/sdl/include/SDL_mutex.h b/mednafen/sdl/include/SDL_mutex.h similarity index 100% rename from libmednahawk/sdl/include/SDL_mutex.h rename to mednafen/sdl/include/SDL_mutex.h diff --git a/libmednahawk/sdl/include/SDL_name.h b/mednafen/sdl/include/SDL_name.h similarity index 100% rename from libmednahawk/sdl/include/SDL_name.h rename to mednafen/sdl/include/SDL_name.h diff --git a/libmednahawk/sdl/include/SDL_platform.h b/mednafen/sdl/include/SDL_platform.h similarity index 100% rename from libmednahawk/sdl/include/SDL_platform.h rename to mednafen/sdl/include/SDL_platform.h diff --git a/libmednahawk/sdl/include/SDL_quit.h b/mednafen/sdl/include/SDL_quit.h similarity index 100% rename from libmednahawk/sdl/include/SDL_quit.h rename to mednafen/sdl/include/SDL_quit.h diff --git a/libmednahawk/sdl/include/SDL_rwops.h b/mednafen/sdl/include/SDL_rwops.h similarity index 100% rename from libmednahawk/sdl/include/SDL_rwops.h rename to mednafen/sdl/include/SDL_rwops.h diff --git a/libmednahawk/sdl/include/SDL_stdinc.h b/mednafen/sdl/include/SDL_stdinc.h similarity index 100% rename from libmednahawk/sdl/include/SDL_stdinc.h rename to mednafen/sdl/include/SDL_stdinc.h diff --git a/libmednahawk/sdl/include/SDL_syswm.h b/mednafen/sdl/include/SDL_syswm.h similarity index 100% rename from libmednahawk/sdl/include/SDL_syswm.h rename to mednafen/sdl/include/SDL_syswm.h diff --git a/libmednahawk/sdl/include/SDL_thread.h b/mednafen/sdl/include/SDL_thread.h similarity index 100% rename from libmednahawk/sdl/include/SDL_thread.h rename to mednafen/sdl/include/SDL_thread.h diff --git a/libmednahawk/sdl/include/SDL_timer.h b/mednafen/sdl/include/SDL_timer.h similarity index 100% rename from libmednahawk/sdl/include/SDL_timer.h rename to mednafen/sdl/include/SDL_timer.h diff --git a/libmednahawk/sdl/include/SDL_types.h b/mednafen/sdl/include/SDL_types.h similarity index 100% rename from libmednahawk/sdl/include/SDL_types.h rename to mednafen/sdl/include/SDL_types.h diff --git a/libmednahawk/sdl/include/SDL_version.h b/mednafen/sdl/include/SDL_version.h similarity index 100% rename from libmednahawk/sdl/include/SDL_version.h rename to mednafen/sdl/include/SDL_version.h diff --git a/libmednahawk/sdl/include/SDL_video.h b/mednafen/sdl/include/SDL_video.h similarity index 100% rename from libmednahawk/sdl/include/SDL_video.h rename to mednafen/sdl/include/SDL_video.h diff --git a/libmednahawk/sdl/include/begin_code.h b/mednafen/sdl/include/begin_code.h similarity index 100% rename from libmednahawk/sdl/include/begin_code.h rename to mednafen/sdl/include/begin_code.h diff --git a/libmednahawk/sdl/include/close_code.h b/mednafen/sdl/include/close_code.h similarity index 100% rename from libmednahawk/sdl/include/close_code.h rename to mednafen/sdl/include/close_code.h diff --git a/libmednahawk/sdl/include/doxyfile b/mednafen/sdl/include/doxyfile similarity index 100% rename from libmednahawk/sdl/include/doxyfile rename to mednafen/sdl/include/doxyfile diff --git a/libmednahawk/sdl/include/sdl_config_win32.h b/mednafen/sdl/include/sdl_config_win32.h similarity index 100% rename from libmednahawk/sdl/include/sdl_config_win32.h rename to mednafen/sdl/include/sdl_config_win32.h diff --git a/libmednahawk/sdl/include/sdl_opengl.h b/mednafen/sdl/include/sdl_opengl.h similarity index 100% rename from libmednahawk/sdl/include/sdl_opengl.h rename to mednafen/sdl/include/sdl_opengl.h diff --git a/libmednahawk/sdl/sdl-vc8-Win32.lib b/mednafen/sdl/sdl-vc8-Win32.lib similarity index 100% rename from libmednahawk/sdl/sdl-vc8-Win32.lib rename to mednafen/sdl/sdl-vc8-Win32.lib diff --git a/libmednahawk/sdl/sdlmain-vc8-Win32.lib b/mednafen/sdl/sdlmain-vc8-Win32.lib similarity index 100% rename from libmednahawk/sdl/sdlmain-vc8-Win32.lib rename to mednafen/sdl/sdlmain-vc8-Win32.lib diff --git a/libmednahawk/src/FileStream.cpp b/mednafen/src/FileStream.cpp similarity index 100% rename from libmednahawk/src/FileStream.cpp rename to mednafen/src/FileStream.cpp diff --git a/libmednahawk/src/FileStream.h b/mednafen/src/FileStream.h similarity index 100% rename from libmednahawk/src/FileStream.h rename to mednafen/src/FileStream.h diff --git a/libmednahawk/src/FileWrapper.cpp b/mednafen/src/FileWrapper.cpp similarity index 100% rename from libmednahawk/src/FileWrapper.cpp rename to mednafen/src/FileWrapper.cpp diff --git a/libmednahawk/src/FileWrapper.h b/mednafen/src/FileWrapper.h similarity index 100% rename from libmednahawk/src/FileWrapper.h rename to mednafen/src/FileWrapper.h diff --git a/libmednahawk/src/Makefile.am b/mednafen/src/Makefile.am similarity index 100% rename from libmednahawk/src/Makefile.am rename to mednafen/src/Makefile.am diff --git a/libmednahawk/src/Makefile.in b/mednafen/src/Makefile.in similarity index 100% rename from libmednahawk/src/Makefile.in rename to mednafen/src/Makefile.in diff --git a/libmednahawk/src/MemoryStream.cpp b/mednafen/src/MemoryStream.cpp similarity index 100% rename from libmednahawk/src/MemoryStream.cpp rename to mednafen/src/MemoryStream.cpp diff --git a/libmednahawk/src/MemoryStream.h b/mednafen/src/MemoryStream.h similarity index 100% rename from libmednahawk/src/MemoryStream.h rename to mednafen/src/MemoryStream.h diff --git a/libmednahawk/src/PSFLoader.cpp b/mednafen/src/PSFLoader.cpp similarity index 100% rename from libmednahawk/src/PSFLoader.cpp rename to mednafen/src/PSFLoader.cpp diff --git a/libmednahawk/src/PSFLoader.h b/mednafen/src/PSFLoader.h similarity index 100% rename from libmednahawk/src/PSFLoader.h rename to mednafen/src/PSFLoader.h diff --git a/libmednahawk/src/Stream.cpp b/mednafen/src/Stream.cpp similarity index 100% rename from libmednahawk/src/Stream.cpp rename to mednafen/src/Stream.cpp diff --git a/libmednahawk/src/Stream.h b/mednafen/src/Stream.h similarity index 100% rename from libmednahawk/src/Stream.h rename to mednafen/src/Stream.h diff --git a/libmednahawk/src/cdplay.cpp b/mednafen/src/cdplay.cpp similarity index 100% rename from libmednahawk/src/cdplay.cpp rename to mednafen/src/cdplay.cpp diff --git a/libmednahawk/src/cdrom/CDAccess.cpp b/mednafen/src/cdrom/CDAccess.cpp similarity index 100% rename from libmednahawk/src/cdrom/CDAccess.cpp rename to mednafen/src/cdrom/CDAccess.cpp diff --git a/libmednahawk/src/cdrom/CDAccess.h b/mednafen/src/cdrom/CDAccess.h similarity index 100% rename from libmednahawk/src/cdrom/CDAccess.h rename to mednafen/src/cdrom/CDAccess.h diff --git a/libmednahawk/src/cdrom/CDAccess_Image.cpp b/mednafen/src/cdrom/CDAccess_Image.cpp similarity index 100% rename from libmednahawk/src/cdrom/CDAccess_Image.cpp rename to mednafen/src/cdrom/CDAccess_Image.cpp diff --git a/libmednahawk/src/cdrom/CDAccess_Image.h b/mednafen/src/cdrom/CDAccess_Image.h similarity index 100% rename from libmednahawk/src/cdrom/CDAccess_Image.h rename to mednafen/src/cdrom/CDAccess_Image.h diff --git a/libmednahawk/src/cdrom/CDAccess_Physical.cpp b/mednafen/src/cdrom/CDAccess_Physical.cpp similarity index 100% rename from libmednahawk/src/cdrom/CDAccess_Physical.cpp rename to mednafen/src/cdrom/CDAccess_Physical.cpp diff --git a/libmednahawk/src/cdrom/CDAccess_Physical.h b/mednafen/src/cdrom/CDAccess_Physical.h similarity index 100% rename from libmednahawk/src/cdrom/CDAccess_Physical.h rename to mednafen/src/cdrom/CDAccess_Physical.h diff --git a/libmednahawk/src/cdrom/CDUtility.cpp b/mednafen/src/cdrom/CDUtility.cpp similarity index 100% rename from libmednahawk/src/cdrom/CDUtility.cpp rename to mednafen/src/cdrom/CDUtility.cpp diff --git a/libmednahawk/src/cdrom/CDUtility.h b/mednafen/src/cdrom/CDUtility.h similarity index 100% rename from libmednahawk/src/cdrom/CDUtility.h rename to mednafen/src/cdrom/CDUtility.h diff --git a/libmednahawk/src/cdrom/Makefile.am.inc b/mednafen/src/cdrom/Makefile.am.inc similarity index 100% rename from libmednahawk/src/cdrom/Makefile.am.inc rename to mednafen/src/cdrom/Makefile.am.inc diff --git a/libmednahawk/src/cdrom/SimpleFIFO.cpp b/mednafen/src/cdrom/SimpleFIFO.cpp similarity index 100% rename from libmednahawk/src/cdrom/SimpleFIFO.cpp rename to mednafen/src/cdrom/SimpleFIFO.cpp diff --git a/libmednahawk/src/cdrom/SimpleFIFO.h b/mednafen/src/cdrom/SimpleFIFO.h similarity index 100% rename from libmednahawk/src/cdrom/SimpleFIFO.h rename to mednafen/src/cdrom/SimpleFIFO.h diff --git a/libmednahawk/src/cdrom/audioreader.cpp b/mednafen/src/cdrom/audioreader.cpp similarity index 100% rename from libmednahawk/src/cdrom/audioreader.cpp rename to mednafen/src/cdrom/audioreader.cpp diff --git a/libmednahawk/src/cdrom/audioreader.h b/mednafen/src/cdrom/audioreader.h similarity index 100% rename from libmednahawk/src/cdrom/audioreader.h rename to mednafen/src/cdrom/audioreader.h diff --git a/libmednahawk/src/cdrom/audioreader_opus.cpp b/mednafen/src/cdrom/audioreader_opus.cpp similarity index 100% rename from libmednahawk/src/cdrom/audioreader_opus.cpp rename to mednafen/src/cdrom/audioreader_opus.cpp diff --git a/libmednahawk/src/cdrom/audioreader_opus.h b/mednafen/src/cdrom/audioreader_opus.h similarity index 100% rename from libmednahawk/src/cdrom/audioreader_opus.h rename to mednafen/src/cdrom/audioreader_opus.h diff --git a/libmednahawk/src/cdrom/cdromif.cpp b/mednafen/src/cdrom/cdromif.cpp similarity index 100% rename from libmednahawk/src/cdrom/cdromif.cpp rename to mednafen/src/cdrom/cdromif.cpp diff --git a/libmednahawk/src/cdrom/cdromif.h b/mednafen/src/cdrom/cdromif.h similarity index 100% rename from libmednahawk/src/cdrom/cdromif.h rename to mednafen/src/cdrom/cdromif.h diff --git a/libmednahawk/src/cdrom/crc32.cpp b/mednafen/src/cdrom/crc32.cpp similarity index 100% rename from libmednahawk/src/cdrom/crc32.cpp rename to mednafen/src/cdrom/crc32.cpp diff --git a/libmednahawk/src/cdrom/dvdisaster.h b/mednafen/src/cdrom/dvdisaster.h similarity index 100% rename from libmednahawk/src/cdrom/dvdisaster.h rename to mednafen/src/cdrom/dvdisaster.h diff --git a/libmednahawk/src/cdrom/galois-inlines.h b/mednafen/src/cdrom/galois-inlines.h similarity index 100% rename from libmednahawk/src/cdrom/galois-inlines.h rename to mednafen/src/cdrom/galois-inlines.h diff --git a/libmednahawk/src/cdrom/galois.cpp b/mednafen/src/cdrom/galois.cpp similarity index 100% rename from libmednahawk/src/cdrom/galois.cpp rename to mednafen/src/cdrom/galois.cpp diff --git a/libmednahawk/src/cdrom/l-ec.cpp b/mednafen/src/cdrom/l-ec.cpp similarity index 100% rename from libmednahawk/src/cdrom/l-ec.cpp rename to mednafen/src/cdrom/l-ec.cpp diff --git a/libmednahawk/src/cdrom/lec.cpp b/mednafen/src/cdrom/lec.cpp similarity index 100% rename from libmednahawk/src/cdrom/lec.cpp rename to mednafen/src/cdrom/lec.cpp diff --git a/libmednahawk/src/cdrom/lec.h b/mednafen/src/cdrom/lec.h similarity index 100% rename from libmednahawk/src/cdrom/lec.h rename to mednafen/src/cdrom/lec.h diff --git a/libmednahawk/src/cdrom/pcecd.cpp b/mednafen/src/cdrom/pcecd.cpp similarity index 100% rename from libmednahawk/src/cdrom/pcecd.cpp rename to mednafen/src/cdrom/pcecd.cpp diff --git a/libmednahawk/src/cdrom/pcecd.h b/mednafen/src/cdrom/pcecd.h similarity index 100% rename from libmednahawk/src/cdrom/pcecd.h rename to mednafen/src/cdrom/pcecd.h diff --git a/libmednahawk/src/cdrom/recover-raw.cpp b/mednafen/src/cdrom/recover-raw.cpp similarity index 100% rename from libmednahawk/src/cdrom/recover-raw.cpp rename to mednafen/src/cdrom/recover-raw.cpp diff --git a/libmednahawk/src/cdrom/scsicd-pce-commands.inc b/mednafen/src/cdrom/scsicd-pce-commands.inc similarity index 100% rename from libmednahawk/src/cdrom/scsicd-pce-commands.inc rename to mednafen/src/cdrom/scsicd-pce-commands.inc diff --git a/libmednahawk/src/cdrom/scsicd.cpp b/mednafen/src/cdrom/scsicd.cpp similarity index 100% rename from libmednahawk/src/cdrom/scsicd.cpp rename to mednafen/src/cdrom/scsicd.cpp diff --git a/libmednahawk/src/cdrom/scsicd.h b/mednafen/src/cdrom/scsicd.h similarity index 100% rename from libmednahawk/src/cdrom/scsicd.h rename to mednafen/src/cdrom/scsicd.h diff --git a/libmednahawk/src/clamp.h b/mednafen/src/clamp.h similarity index 100% rename from libmednahawk/src/clamp.h rename to mednafen/src/clamp.h diff --git a/libmednahawk/src/compress/Makefile.am.inc b/mednafen/src/compress/Makefile.am.inc similarity index 100% rename from libmednahawk/src/compress/Makefile.am.inc rename to mednafen/src/compress/Makefile.am.inc diff --git a/libmednahawk/src/compress/README.LZO b/mednafen/src/compress/README.LZO similarity index 100% rename from libmednahawk/src/compress/README.LZO rename to mednafen/src/compress/README.LZO diff --git a/libmednahawk/src/compress/blz.c b/mednafen/src/compress/blz.c similarity index 100% rename from libmednahawk/src/compress/blz.c rename to mednafen/src/compress/blz.c diff --git a/libmednahawk/src/compress/blz.h b/mednafen/src/compress/blz.h similarity index 100% rename from libmednahawk/src/compress/blz.h rename to mednafen/src/compress/blz.h diff --git a/libmednahawk/src/compress/ioapi.c b/mednafen/src/compress/ioapi.c similarity index 100% rename from libmednahawk/src/compress/ioapi.c rename to mednafen/src/compress/ioapi.c diff --git a/libmednahawk/src/compress/ioapi.h b/mednafen/src/compress/ioapi.h similarity index 100% rename from libmednahawk/src/compress/ioapi.h rename to mednafen/src/compress/ioapi.h diff --git a/libmednahawk/src/compress/lzoconf.h b/mednafen/src/compress/lzoconf.h similarity index 100% rename from libmednahawk/src/compress/lzoconf.h rename to mednafen/src/compress/lzoconf.h diff --git a/libmednahawk/src/compress/lzodefs.h b/mednafen/src/compress/lzodefs.h similarity index 100% rename from libmednahawk/src/compress/lzodefs.h rename to mednafen/src/compress/lzodefs.h diff --git a/libmednahawk/src/compress/minilzo.c b/mednafen/src/compress/minilzo.c similarity index 100% rename from libmednahawk/src/compress/minilzo.c rename to mednafen/src/compress/minilzo.c diff --git a/libmednahawk/src/compress/minilzo.h b/mednafen/src/compress/minilzo.h similarity index 100% rename from libmednahawk/src/compress/minilzo.h rename to mednafen/src/compress/minilzo.h diff --git a/libmednahawk/src/compress/quicklz.c b/mednafen/src/compress/quicklz.c similarity index 100% rename from libmednahawk/src/compress/quicklz.c rename to mednafen/src/compress/quicklz.c diff --git a/libmednahawk/src/compress/quicklz.h b/mednafen/src/compress/quicklz.h similarity index 100% rename from libmednahawk/src/compress/quicklz.h rename to mednafen/src/compress/quicklz.h diff --git a/libmednahawk/src/compress/unzip.c b/mednafen/src/compress/unzip.c similarity index 100% rename from libmednahawk/src/compress/unzip.c rename to mednafen/src/compress/unzip.c diff --git a/libmednahawk/src/compress/unzip.h b/mednafen/src/compress/unzip.h similarity index 100% rename from libmednahawk/src/compress/unzip.h rename to mednafen/src/compress/unzip.h diff --git a/libmednahawk/src/cputest/Makefile.am.inc b/mednafen/src/cputest/Makefile.am.inc similarity index 100% rename from libmednahawk/src/cputest/Makefile.am.inc rename to mednafen/src/cputest/Makefile.am.inc diff --git a/libmednahawk/src/cputest/README b/mednafen/src/cputest/README similarity index 100% rename from libmednahawk/src/cputest/README rename to mednafen/src/cputest/README diff --git a/libmednahawk/src/cputest/arm_cpu.c b/mednafen/src/cputest/arm_cpu.c similarity index 100% rename from libmednahawk/src/cputest/arm_cpu.c rename to mednafen/src/cputest/arm_cpu.c diff --git a/libmednahawk/src/cputest/cputest.c b/mednafen/src/cputest/cputest.c similarity index 100% rename from libmednahawk/src/cputest/cputest.c rename to mednafen/src/cputest/cputest.c diff --git a/libmednahawk/src/cputest/cputest.h b/mednafen/src/cputest/cputest.h similarity index 100% rename from libmednahawk/src/cputest/cputest.h rename to mednafen/src/cputest/cputest.h diff --git a/libmednahawk/src/cputest/ppc_cpu.c b/mednafen/src/cputest/ppc_cpu.c similarity index 100% rename from libmednahawk/src/cputest/ppc_cpu.c rename to mednafen/src/cputest/ppc_cpu.c diff --git a/libmednahawk/src/cputest/x86_cpu.c b/mednafen/src/cputest/x86_cpu.c similarity index 100% rename from libmednahawk/src/cputest/x86_cpu.c rename to mednafen/src/cputest/x86_cpu.c diff --git a/libmednahawk/src/cputest/x86_cpu.h b/mednafen/src/cputest/x86_cpu.h similarity index 100% rename from libmednahawk/src/cputest/x86_cpu.h rename to mednafen/src/cputest/x86_cpu.h diff --git a/libmednahawk/src/debug.cpp b/mednafen/src/debug.cpp similarity index 100% rename from libmednahawk/src/debug.cpp rename to mednafen/src/debug.cpp diff --git a/libmednahawk/src/debug.h b/mednafen/src/debug.h similarity index 100% rename from libmednahawk/src/debug.h rename to mednafen/src/debug.h diff --git a/libmednahawk/src/desa68/Makefile.am b/mednafen/src/desa68/Makefile.am similarity index 100% rename from libmednahawk/src/desa68/Makefile.am rename to mednafen/src/desa68/Makefile.am diff --git a/libmednahawk/src/desa68/Makefile.in b/mednafen/src/desa68/Makefile.in similarity index 100% rename from libmednahawk/src/desa68/Makefile.in rename to mednafen/src/desa68/Makefile.in diff --git a/libmednahawk/src/desa68/desa68.c b/mednafen/src/desa68/desa68.c similarity index 100% rename from libmednahawk/src/desa68/desa68.c rename to mednafen/src/desa68/desa68.c diff --git a/libmednahawk/src/desa68/desa68.h b/mednafen/src/desa68/desa68.h similarity index 100% rename from libmednahawk/src/desa68/desa68.h rename to mednafen/src/desa68/desa68.h diff --git a/libmednahawk/src/dis6280.cpp b/mednafen/src/dis6280.cpp similarity index 100% rename from libmednahawk/src/dis6280.cpp rename to mednafen/src/dis6280.cpp diff --git a/libmednahawk/src/dis6280.h b/mednafen/src/dis6280.h similarity index 100% rename from libmednahawk/src/dis6280.h rename to mednafen/src/dis6280.h diff --git a/libmednahawk/src/dis6502.cpp b/mednafen/src/dis6502.cpp similarity index 100% rename from libmednahawk/src/dis6502.cpp rename to mednafen/src/dis6502.cpp diff --git a/libmednahawk/src/dis6502.h b/mednafen/src/dis6502.h similarity index 100% rename from libmednahawk/src/dis6502.h rename to mednafen/src/dis6502.h diff --git a/libmednahawk/src/driver.h b/mednafen/src/driver.h similarity index 100% rename from libmednahawk/src/driver.h rename to mednafen/src/driver.h diff --git a/libmednahawk/src/drivers/2xSaI.cpp b/mednafen/src/drivers/2xSaI.cpp similarity index 100% rename from libmednahawk/src/drivers/2xSaI.cpp rename to mednafen/src/drivers/2xSaI.cpp diff --git a/libmednahawk/src/drivers/2xSaI.h b/mednafen/src/drivers/2xSaI.h similarity index 100% rename from libmednahawk/src/drivers/2xSaI.h rename to mednafen/src/drivers/2xSaI.h diff --git a/libmednahawk/src/drivers/Joystick_DOS_Standard.cpp b/mednafen/src/drivers/Joystick_DOS_Standard.cpp similarity index 100% rename from libmednahawk/src/drivers/Joystick_DOS_Standard.cpp rename to mednafen/src/drivers/Joystick_DOS_Standard.cpp diff --git a/libmednahawk/src/drivers/Joystick_DOS_Standard.h b/mednafen/src/drivers/Joystick_DOS_Standard.h similarity index 100% rename from libmednahawk/src/drivers/Joystick_DOS_Standard.h rename to mednafen/src/drivers/Joystick_DOS_Standard.h diff --git a/libmednahawk/src/drivers/Joystick_DX5.cpp b/mednafen/src/drivers/Joystick_DX5.cpp similarity index 100% rename from libmednahawk/src/drivers/Joystick_DX5.cpp rename to mednafen/src/drivers/Joystick_DX5.cpp diff --git a/libmednahawk/src/drivers/Joystick_DX5.h b/mednafen/src/drivers/Joystick_DX5.h similarity index 100% rename from libmednahawk/src/drivers/Joystick_DX5.h rename to mednafen/src/drivers/Joystick_DX5.h diff --git a/libmednahawk/src/drivers/Joystick_Linux.cpp b/mednafen/src/drivers/Joystick_Linux.cpp similarity index 100% rename from libmednahawk/src/drivers/Joystick_Linux.cpp rename to mednafen/src/drivers/Joystick_Linux.cpp diff --git a/libmednahawk/src/drivers/Joystick_Linux.h b/mednafen/src/drivers/Joystick_Linux.h similarity index 100% rename from libmednahawk/src/drivers/Joystick_Linux.h rename to mednafen/src/drivers/Joystick_Linux.h diff --git a/libmednahawk/src/drivers/Joystick_SDL.cpp b/mednafen/src/drivers/Joystick_SDL.cpp similarity index 100% rename from libmednahawk/src/drivers/Joystick_SDL.cpp rename to mednafen/src/drivers/Joystick_SDL.cpp diff --git a/libmednahawk/src/drivers/Joystick_SDL.h b/mednafen/src/drivers/Joystick_SDL.h similarity index 100% rename from libmednahawk/src/drivers/Joystick_SDL.h rename to mednafen/src/drivers/Joystick_SDL.h diff --git a/libmednahawk/src/drivers/Joystick_XInput.cpp b/mednafen/src/drivers/Joystick_XInput.cpp similarity index 100% rename from libmednahawk/src/drivers/Joystick_XInput.cpp rename to mednafen/src/drivers/Joystick_XInput.cpp diff --git a/libmednahawk/src/drivers/Joystick_XInput.h b/mednafen/src/drivers/Joystick_XInput.h similarity index 100% rename from libmednahawk/src/drivers/Joystick_XInput.h rename to mednafen/src/drivers/Joystick_XInput.h diff --git a/libmednahawk/src/drivers/Keyboard.h b/mednafen/src/drivers/Keyboard.h similarity index 100% rename from libmednahawk/src/drivers/Keyboard.h rename to mednafen/src/drivers/Keyboard.h diff --git a/libmednahawk/src/drivers/Makefile.am b/mednafen/src/drivers/Makefile.am similarity index 100% rename from libmednahawk/src/drivers/Makefile.am rename to mednafen/src/drivers/Makefile.am diff --git a/libmednahawk/src/drivers/Makefile.in b/mednafen/src/drivers/Makefile.in similarity index 100% rename from libmednahawk/src/drivers/Makefile.in rename to mednafen/src/drivers/Makefile.in diff --git a/libmednahawk/src/drivers/NetClient.h b/mednafen/src/drivers/NetClient.h similarity index 100% rename from libmednahawk/src/drivers/NetClient.h rename to mednafen/src/drivers/NetClient.h diff --git a/libmednahawk/src/drivers/NetClient_BSD.cpp b/mednafen/src/drivers/NetClient_BSD.cpp similarity index 100% rename from libmednahawk/src/drivers/NetClient_BSD.cpp rename to mednafen/src/drivers/NetClient_BSD.cpp diff --git a/libmednahawk/src/drivers/NetClient_BSD.h b/mednafen/src/drivers/NetClient_BSD.h similarity index 100% rename from libmednahawk/src/drivers/NetClient_BSD.h rename to mednafen/src/drivers/NetClient_BSD.h diff --git a/libmednahawk/src/drivers/NetClient_POSIX.cpp b/mednafen/src/drivers/NetClient_POSIX.cpp similarity index 100% rename from libmednahawk/src/drivers/NetClient_POSIX.cpp rename to mednafen/src/drivers/NetClient_POSIX.cpp diff --git a/libmednahawk/src/drivers/NetClient_POSIX.h b/mednafen/src/drivers/NetClient_POSIX.h similarity index 100% rename from libmednahawk/src/drivers/NetClient_POSIX.h rename to mednafen/src/drivers/NetClient_POSIX.h diff --git a/libmednahawk/src/drivers/NetClient_WS2.cpp b/mednafen/src/drivers/NetClient_WS2.cpp similarity index 100% rename from libmednahawk/src/drivers/NetClient_WS2.cpp rename to mednafen/src/drivers/NetClient_WS2.cpp diff --git a/libmednahawk/src/drivers/NetClient_WS2.h b/mednafen/src/drivers/NetClient_WS2.h similarity index 100% rename from libmednahawk/src/drivers/NetClient_WS2.h rename to mednafen/src/drivers/NetClient_WS2.h diff --git a/libmednahawk/src/drivers/args.cpp b/mednafen/src/drivers/args.cpp similarity index 100% rename from libmednahawk/src/drivers/args.cpp rename to mednafen/src/drivers/args.cpp diff --git a/libmednahawk/src/drivers/args.h b/mednafen/src/drivers/args.h similarity index 100% rename from libmednahawk/src/drivers/args.h rename to mednafen/src/drivers/args.h diff --git a/libmednahawk/src/drivers/cheat.cpp b/mednafen/src/drivers/cheat.cpp similarity index 100% rename from libmednahawk/src/drivers/cheat.cpp rename to mednafen/src/drivers/cheat.cpp diff --git a/libmednahawk/src/drivers/cheat.h b/mednafen/src/drivers/cheat.h similarity index 100% rename from libmednahawk/src/drivers/cheat.h rename to mednafen/src/drivers/cheat.h diff --git a/libmednahawk/src/drivers/console.cpp b/mednafen/src/drivers/console.cpp similarity index 100% rename from libmednahawk/src/drivers/console.cpp rename to mednafen/src/drivers/console.cpp diff --git a/libmednahawk/src/drivers/console.h b/mednafen/src/drivers/console.h similarity index 100% rename from libmednahawk/src/drivers/console.h rename to mednafen/src/drivers/console.h diff --git a/libmednahawk/src/drivers/debugger.cpp b/mednafen/src/drivers/debugger.cpp similarity index 100% rename from libmednahawk/src/drivers/debugger.cpp rename to mednafen/src/drivers/debugger.cpp diff --git a/libmednahawk/src/drivers/debugger.h b/mednafen/src/drivers/debugger.h similarity index 100% rename from libmednahawk/src/drivers/debugger.h rename to mednafen/src/drivers/debugger.h diff --git a/libmednahawk/src/drivers/ers.cpp b/mednafen/src/drivers/ers.cpp similarity index 100% rename from libmednahawk/src/drivers/ers.cpp rename to mednafen/src/drivers/ers.cpp diff --git a/libmednahawk/src/drivers/ers.h b/mednafen/src/drivers/ers.h similarity index 100% rename from libmednahawk/src/drivers/ers.h rename to mednafen/src/drivers/ers.h diff --git a/libmednahawk/src/drivers/fps.cpp b/mednafen/src/drivers/fps.cpp similarity index 100% rename from libmednahawk/src/drivers/fps.cpp rename to mednafen/src/drivers/fps.cpp diff --git a/libmednahawk/src/drivers/fps.h b/mednafen/src/drivers/fps.h similarity index 100% rename from libmednahawk/src/drivers/fps.h rename to mednafen/src/drivers/fps.h diff --git a/libmednahawk/src/drivers/gfxdebugger.cpp b/mednafen/src/drivers/gfxdebugger.cpp similarity index 100% rename from libmednahawk/src/drivers/gfxdebugger.cpp rename to mednafen/src/drivers/gfxdebugger.cpp diff --git a/libmednahawk/src/drivers/gfxdebugger.h b/mednafen/src/drivers/gfxdebugger.h similarity index 100% rename from libmednahawk/src/drivers/gfxdebugger.h rename to mednafen/src/drivers/gfxdebugger.h diff --git a/libmednahawk/src/drivers/help.cpp b/mednafen/src/drivers/help.cpp similarity index 100% rename from libmednahawk/src/drivers/help.cpp rename to mednafen/src/drivers/help.cpp diff --git a/libmednahawk/src/drivers/help.h b/mednafen/src/drivers/help.h similarity index 100% rename from libmednahawk/src/drivers/help.h rename to mednafen/src/drivers/help.h diff --git a/libmednahawk/src/drivers/hq2x.cpp b/mednafen/src/drivers/hq2x.cpp similarity index 100% rename from libmednahawk/src/drivers/hq2x.cpp rename to mednafen/src/drivers/hq2x.cpp diff --git a/libmednahawk/src/drivers/hq3x.cpp b/mednafen/src/drivers/hq3x.cpp similarity index 100% rename from libmednahawk/src/drivers/hq3x.cpp rename to mednafen/src/drivers/hq3x.cpp diff --git a/libmednahawk/src/drivers/hq4x.cpp b/mednafen/src/drivers/hq4x.cpp similarity index 100% rename from libmednahawk/src/drivers/hq4x.cpp rename to mednafen/src/drivers/hq4x.cpp diff --git a/libmednahawk/src/drivers/hqxx-common.cpp b/mednafen/src/drivers/hqxx-common.cpp similarity index 100% rename from libmednahawk/src/drivers/hqxx-common.cpp rename to mednafen/src/drivers/hqxx-common.cpp diff --git a/libmednahawk/src/drivers/hqxx-common.h b/mednafen/src/drivers/hqxx-common.h similarity index 100% rename from libmednahawk/src/drivers/hqxx-common.h rename to mednafen/src/drivers/hqxx-common.h diff --git a/libmednahawk/src/drivers/icon.h b/mednafen/src/drivers/icon.h similarity index 100% rename from libmednahawk/src/drivers/icon.h rename to mednafen/src/drivers/icon.h diff --git a/libmednahawk/src/drivers/input-config.cpp b/mednafen/src/drivers/input-config.cpp similarity index 100% rename from libmednahawk/src/drivers/input-config.cpp rename to mednafen/src/drivers/input-config.cpp diff --git a/libmednahawk/src/drivers/input-config.h b/mednafen/src/drivers/input-config.h similarity index 100% rename from libmednahawk/src/drivers/input-config.h rename to mednafen/src/drivers/input-config.h diff --git a/libmednahawk/src/drivers/input-default-buttons.h b/mednafen/src/drivers/input-default-buttons.h similarity index 100% rename from libmednahawk/src/drivers/input-default-buttons.h rename to mednafen/src/drivers/input-default-buttons.h diff --git a/libmednahawk/src/drivers/input.cpp b/mednafen/src/drivers/input.cpp similarity index 100% rename from libmednahawk/src/drivers/input.cpp rename to mednafen/src/drivers/input.cpp diff --git a/libmednahawk/src/drivers/input.h b/mednafen/src/drivers/input.h similarity index 100% rename from libmednahawk/src/drivers/input.h rename to mednafen/src/drivers/input.h diff --git a/libmednahawk/src/drivers/joystick.cpp b/mednafen/src/drivers/joystick.cpp similarity index 100% rename from libmednahawk/src/drivers/joystick.cpp rename to mednafen/src/drivers/joystick.cpp diff --git a/libmednahawk/src/drivers/joystick.h b/mednafen/src/drivers/joystick.h similarity index 100% rename from libmednahawk/src/drivers/joystick.h rename to mednafen/src/drivers/joystick.h diff --git a/libmednahawk/src/drivers/logdebugger.cpp b/mednafen/src/drivers/logdebugger.cpp similarity index 100% rename from libmednahawk/src/drivers/logdebugger.cpp rename to mednafen/src/drivers/logdebugger.cpp diff --git a/libmednahawk/src/drivers/logdebugger.h b/mednafen/src/drivers/logdebugger.h similarity index 100% rename from libmednahawk/src/drivers/logdebugger.h rename to mednafen/src/drivers/logdebugger.h diff --git a/libmednahawk/src/drivers/main.cpp b/mednafen/src/drivers/main.cpp similarity index 100% rename from libmednahawk/src/drivers/main.cpp rename to mednafen/src/drivers/main.cpp diff --git a/libmednahawk/src/drivers/main.h b/mednafen/src/drivers/main.h similarity index 100% rename from libmednahawk/src/drivers/main.h rename to mednafen/src/drivers/main.h diff --git a/libmednahawk/src/drivers/memdebugger.cpp b/mednafen/src/drivers/memdebugger.cpp similarity index 100% rename from libmednahawk/src/drivers/memdebugger.cpp rename to mednafen/src/drivers/memdebugger.cpp diff --git a/libmednahawk/src/drivers/memdebugger.h b/mednafen/src/drivers/memdebugger.h similarity index 100% rename from libmednahawk/src/drivers/memdebugger.h rename to mednafen/src/drivers/memdebugger.h diff --git a/libmednahawk/src/drivers/netplay.cpp b/mednafen/src/drivers/netplay.cpp similarity index 100% rename from libmednahawk/src/drivers/netplay.cpp rename to mednafen/src/drivers/netplay.cpp diff --git a/libmednahawk/src/drivers/netplay.h b/mednafen/src/drivers/netplay.h similarity index 100% rename from libmednahawk/src/drivers/netplay.h rename to mednafen/src/drivers/netplay.h diff --git a/libmednahawk/src/drivers/nnx.cpp b/mednafen/src/drivers/nnx.cpp similarity index 100% rename from libmednahawk/src/drivers/nnx.cpp rename to mednafen/src/drivers/nnx.cpp diff --git a/libmednahawk/src/drivers/nnx.h b/mednafen/src/drivers/nnx.h similarity index 100% rename from libmednahawk/src/drivers/nnx.h rename to mednafen/src/drivers/nnx.h diff --git a/libmednahawk/src/drivers/nongl.cpp b/mednafen/src/drivers/nongl.cpp similarity index 100% rename from libmednahawk/src/drivers/nongl.cpp rename to mednafen/src/drivers/nongl.cpp diff --git a/libmednahawk/src/drivers/nongl.h b/mednafen/src/drivers/nongl.h similarity index 100% rename from libmednahawk/src/drivers/nongl.h rename to mednafen/src/drivers/nongl.h diff --git a/libmednahawk/src/drivers/opengl.cpp b/mednafen/src/drivers/opengl.cpp similarity index 100% rename from libmednahawk/src/drivers/opengl.cpp rename to mednafen/src/drivers/opengl.cpp diff --git a/libmednahawk/src/drivers/opengl.h b/mednafen/src/drivers/opengl.h similarity index 100% rename from libmednahawk/src/drivers/opengl.h rename to mednafen/src/drivers/opengl.h diff --git a/libmednahawk/src/drivers/overlay.cpp b/mednafen/src/drivers/overlay.cpp similarity index 100% rename from libmednahawk/src/drivers/overlay.cpp rename to mednafen/src/drivers/overlay.cpp diff --git a/libmednahawk/src/drivers/overlay.h b/mednafen/src/drivers/overlay.h similarity index 100% rename from libmednahawk/src/drivers/overlay.h rename to mednafen/src/drivers/overlay.h diff --git a/libmednahawk/src/drivers/prompt.cpp b/mednafen/src/drivers/prompt.cpp similarity index 100% rename from libmednahawk/src/drivers/prompt.cpp rename to mednafen/src/drivers/prompt.cpp diff --git a/libmednahawk/src/drivers/prompt.h b/mednafen/src/drivers/prompt.h similarity index 100% rename from libmednahawk/src/drivers/prompt.h rename to mednafen/src/drivers/prompt.h diff --git a/libmednahawk/src/drivers/remote.cpp b/mednafen/src/drivers/remote.cpp similarity index 100% rename from libmednahawk/src/drivers/remote.cpp rename to mednafen/src/drivers/remote.cpp diff --git a/libmednahawk/src/drivers/remote.h b/mednafen/src/drivers/remote.h similarity index 100% rename from libmednahawk/src/drivers/remote.h rename to mednafen/src/drivers/remote.h diff --git a/libmednahawk/src/drivers/scale2x.c b/mednafen/src/drivers/scale2x.c similarity index 100% rename from libmednahawk/src/drivers/scale2x.c rename to mednafen/src/drivers/scale2x.c diff --git a/libmednahawk/src/drivers/scale2x.h b/mednafen/src/drivers/scale2x.h similarity index 100% rename from libmednahawk/src/drivers/scale2x.h rename to mednafen/src/drivers/scale2x.h diff --git a/libmednahawk/src/drivers/scale3x.c b/mednafen/src/drivers/scale3x.c similarity index 100% rename from libmednahawk/src/drivers/scale3x.c rename to mednafen/src/drivers/scale3x.c diff --git a/libmednahawk/src/drivers/scale3x.h b/mednafen/src/drivers/scale3x.h similarity index 100% rename from libmednahawk/src/drivers/scale3x.h rename to mednafen/src/drivers/scale3x.h diff --git a/libmednahawk/src/drivers/scalebit.c b/mednafen/src/drivers/scalebit.c similarity index 100% rename from libmednahawk/src/drivers/scalebit.c rename to mednafen/src/drivers/scalebit.c diff --git a/libmednahawk/src/drivers/scalebit.h b/mednafen/src/drivers/scalebit.h similarity index 100% rename from libmednahawk/src/drivers/scalebit.h rename to mednafen/src/drivers/scalebit.h diff --git a/libmednahawk/src/drivers/shader.cpp b/mednafen/src/drivers/shader.cpp similarity index 100% rename from libmednahawk/src/drivers/shader.cpp rename to mednafen/src/drivers/shader.cpp diff --git a/libmednahawk/src/drivers/shader.h b/mednafen/src/drivers/shader.h similarity index 100% rename from libmednahawk/src/drivers/shader.h rename to mednafen/src/drivers/shader.h diff --git a/libmednahawk/src/drivers/sound.cpp b/mednafen/src/drivers/sound.cpp similarity index 100% rename from libmednahawk/src/drivers/sound.cpp rename to mednafen/src/drivers/sound.cpp diff --git a/libmednahawk/src/drivers/sound.h b/mednafen/src/drivers/sound.h similarity index 100% rename from libmednahawk/src/drivers/sound.h rename to mednafen/src/drivers/sound.h diff --git a/libmednahawk/src/drivers/video-state.cpp b/mednafen/src/drivers/video-state.cpp similarity index 100% rename from libmednahawk/src/drivers/video-state.cpp rename to mednafen/src/drivers/video-state.cpp diff --git a/libmednahawk/src/drivers/video-state.h b/mednafen/src/drivers/video-state.h similarity index 100% rename from libmednahawk/src/drivers/video-state.h rename to mednafen/src/drivers/video-state.h diff --git a/libmednahawk/src/drivers/video.cpp b/mednafen/src/drivers/video.cpp similarity index 100% rename from libmednahawk/src/drivers/video.cpp rename to mednafen/src/drivers/video.cpp diff --git a/libmednahawk/src/drivers/video.h b/mednafen/src/drivers/video.h similarity index 100% rename from libmednahawk/src/drivers/video.h rename to mednafen/src/drivers/video.h diff --git a/libmednahawk/src/endian.cpp b/mednafen/src/endian.cpp similarity index 100% rename from libmednahawk/src/endian.cpp rename to mednafen/src/endian.cpp diff --git a/libmednahawk/src/endian.h b/mednafen/src/endian.h similarity index 100% rename from libmednahawk/src/endian.h rename to mednafen/src/endian.h diff --git a/libmednahawk/src/error.cpp b/mednafen/src/error.cpp similarity index 100% rename from libmednahawk/src/error.cpp rename to mednafen/src/error.cpp diff --git a/libmednahawk/src/error.h b/mednafen/src/error.h similarity index 100% rename from libmednahawk/src/error.h rename to mednafen/src/error.h diff --git a/libmednahawk/src/file.cpp b/mednafen/src/file.cpp similarity index 100% rename from libmednahawk/src/file.cpp rename to mednafen/src/file.cpp diff --git a/libmednahawk/src/file.h b/mednafen/src/file.h similarity index 100% rename from libmednahawk/src/file.h rename to mednafen/src/file.h diff --git a/libmednahawk/src/gba/GBA.cpp b/mednafen/src/gba/GBA.cpp similarity index 100% rename from libmednahawk/src/gba/GBA.cpp rename to mednafen/src/gba/GBA.cpp diff --git a/libmednahawk/src/gba/GBA.h b/mednafen/src/gba/GBA.h similarity index 100% rename from libmednahawk/src/gba/GBA.h rename to mednafen/src/gba/GBA.h diff --git a/libmednahawk/src/gba/GBAinline.cpp b/mednafen/src/gba/GBAinline.cpp similarity index 100% rename from libmednahawk/src/gba/GBAinline.cpp rename to mednafen/src/gba/GBAinline.cpp diff --git a/libmednahawk/src/gba/GBAinline.h b/mednafen/src/gba/GBAinline.h similarity index 100% rename from libmednahawk/src/gba/GBAinline.h rename to mednafen/src/gba/GBAinline.h diff --git a/libmednahawk/src/gba/Gfx.cpp b/mednafen/src/gba/Gfx.cpp similarity index 100% rename from libmednahawk/src/gba/Gfx.cpp rename to mednafen/src/gba/Gfx.cpp diff --git a/libmednahawk/src/gba/Gfx.h b/mednafen/src/gba/Gfx.h similarity index 100% rename from libmednahawk/src/gba/Gfx.h rename to mednafen/src/gba/Gfx.h diff --git a/libmednahawk/src/gba/Globals.cpp b/mednafen/src/gba/Globals.cpp similarity index 100% rename from libmednahawk/src/gba/Globals.cpp rename to mednafen/src/gba/Globals.cpp diff --git a/libmednahawk/src/gba/Globals.h b/mednafen/src/gba/Globals.h similarity index 100% rename from libmednahawk/src/gba/Globals.h rename to mednafen/src/gba/Globals.h diff --git a/libmednahawk/src/gba/Makefile.am b/mednafen/src/gba/Makefile.am similarity index 100% rename from libmednahawk/src/gba/Makefile.am rename to mednafen/src/gba/Makefile.am diff --git a/libmednahawk/src/gba/Makefile.in b/mednafen/src/gba/Makefile.in similarity index 100% rename from libmednahawk/src/gba/Makefile.in rename to mednafen/src/gba/Makefile.in diff --git a/libmednahawk/src/gba/Mode0.cpp b/mednafen/src/gba/Mode0.cpp similarity index 100% rename from libmednahawk/src/gba/Mode0.cpp rename to mednafen/src/gba/Mode0.cpp diff --git a/libmednahawk/src/gba/Mode1.cpp b/mednafen/src/gba/Mode1.cpp similarity index 100% rename from libmednahawk/src/gba/Mode1.cpp rename to mednafen/src/gba/Mode1.cpp diff --git a/libmednahawk/src/gba/Mode2.cpp b/mednafen/src/gba/Mode2.cpp similarity index 100% rename from libmednahawk/src/gba/Mode2.cpp rename to mednafen/src/gba/Mode2.cpp diff --git a/libmednahawk/src/gba/Mode3.cpp b/mednafen/src/gba/Mode3.cpp similarity index 100% rename from libmednahawk/src/gba/Mode3.cpp rename to mednafen/src/gba/Mode3.cpp diff --git a/libmednahawk/src/gba/Mode4.cpp b/mednafen/src/gba/Mode4.cpp similarity index 100% rename from libmednahawk/src/gba/Mode4.cpp rename to mednafen/src/gba/Mode4.cpp diff --git a/libmednahawk/src/gba/Mode5.cpp b/mednafen/src/gba/Mode5.cpp similarity index 100% rename from libmednahawk/src/gba/Mode5.cpp rename to mednafen/src/gba/Mode5.cpp diff --git a/libmednahawk/src/gba/Port.h b/mednafen/src/gba/Port.h similarity index 100% rename from libmednahawk/src/gba/Port.h rename to mednafen/src/gba/Port.h diff --git a/libmednahawk/src/gba/RTC.cpp b/mednafen/src/gba/RTC.cpp similarity index 100% rename from libmednahawk/src/gba/RTC.cpp rename to mednafen/src/gba/RTC.cpp diff --git a/libmednahawk/src/gba/RTC.h b/mednafen/src/gba/RTC.h similarity index 100% rename from libmednahawk/src/gba/RTC.h rename to mednafen/src/gba/RTC.h diff --git a/libmednahawk/src/gba/Sound.cpp b/mednafen/src/gba/Sound.cpp similarity index 100% rename from libmednahawk/src/gba/Sound.cpp rename to mednafen/src/gba/Sound.cpp diff --git a/libmednahawk/src/gba/Sound.h b/mednafen/src/gba/Sound.h similarity index 100% rename from libmednahawk/src/gba/Sound.h rename to mednafen/src/gba/Sound.h diff --git a/libmednahawk/src/gba/arm.cpp b/mednafen/src/gba/arm.cpp similarity index 100% rename from libmednahawk/src/gba/arm.cpp rename to mednafen/src/gba/arm.cpp diff --git a/libmednahawk/src/gba/arm.h b/mednafen/src/gba/arm.h similarity index 100% rename from libmednahawk/src/gba/arm.h rename to mednafen/src/gba/arm.h diff --git a/libmednahawk/src/gba/bios.cpp b/mednafen/src/gba/bios.cpp similarity index 100% rename from libmednahawk/src/gba/bios.cpp rename to mednafen/src/gba/bios.cpp diff --git a/libmednahawk/src/gba/bios.h b/mednafen/src/gba/bios.h similarity index 100% rename from libmednahawk/src/gba/bios.h rename to mednafen/src/gba/bios.h diff --git a/libmednahawk/src/gba/eeprom.cpp b/mednafen/src/gba/eeprom.cpp similarity index 100% rename from libmednahawk/src/gba/eeprom.cpp rename to mednafen/src/gba/eeprom.cpp diff --git a/libmednahawk/src/gba/eeprom.h b/mednafen/src/gba/eeprom.h similarity index 100% rename from libmednahawk/src/gba/eeprom.h rename to mednafen/src/gba/eeprom.h diff --git a/libmednahawk/src/gba/flash.cpp b/mednafen/src/gba/flash.cpp similarity index 100% rename from libmednahawk/src/gba/flash.cpp rename to mednafen/src/gba/flash.cpp diff --git a/libmednahawk/src/gba/flash.h b/mednafen/src/gba/flash.h similarity index 100% rename from libmednahawk/src/gba/flash.h rename to mednafen/src/gba/flash.h diff --git a/libmednahawk/src/gba/gfx-draw.h b/mednafen/src/gba/gfx-draw.h similarity index 100% rename from libmednahawk/src/gba/gfx-draw.h rename to mednafen/src/gba/gfx-draw.h diff --git a/libmednahawk/src/gba/myrom.h b/mednafen/src/gba/myrom.h similarity index 100% rename from libmednahawk/src/gba/myrom.h rename to mednafen/src/gba/myrom.h diff --git a/libmednahawk/src/gba/sram.cpp b/mednafen/src/gba/sram.cpp similarity index 100% rename from libmednahawk/src/gba/sram.cpp rename to mednafen/src/gba/sram.cpp diff --git a/libmednahawk/src/gba/sram.h b/mednafen/src/gba/sram.h similarity index 100% rename from libmednahawk/src/gba/sram.h rename to mednafen/src/gba/sram.h diff --git a/libmednahawk/src/gba/thumb.cpp b/mednafen/src/gba/thumb.cpp similarity index 100% rename from libmednahawk/src/gba/thumb.cpp rename to mednafen/src/gba/thumb.cpp diff --git a/libmednahawk/src/gba/thumb.h b/mednafen/src/gba/thumb.h similarity index 100% rename from libmednahawk/src/gba/thumb.h rename to mednafen/src/gba/thumb.h diff --git a/libmednahawk/src/general.cpp b/mednafen/src/general.cpp similarity index 100% rename from libmednahawk/src/general.cpp rename to mednafen/src/general.cpp diff --git a/libmednahawk/src/general.h b/mednafen/src/general.h similarity index 100% rename from libmednahawk/src/general.h rename to mednafen/src/general.h diff --git a/libmednahawk/src/gettext.h b/mednafen/src/gettext.h similarity index 100% rename from libmednahawk/src/gettext.h rename to mednafen/src/gettext.h diff --git a/libmednahawk/src/git-virtb.h b/mednafen/src/git-virtb.h similarity index 100% rename from libmednahawk/src/git-virtb.h rename to mednafen/src/git-virtb.h diff --git a/libmednahawk/src/git.h b/mednafen/src/git.h similarity index 100% rename from libmednahawk/src/git.h rename to mednafen/src/git.h diff --git a/libmednahawk/src/hw_cpu/.Tpo b/mednafen/src/hw_cpu/.Tpo similarity index 100% rename from libmednahawk/src/hw_cpu/.Tpo rename to mednafen/src/hw_cpu/.Tpo diff --git a/libmednahawk/src/hw_cpu/Makefile.am b/mednafen/src/hw_cpu/Makefile.am similarity index 100% rename from libmednahawk/src/hw_cpu/Makefile.am rename to mednafen/src/hw_cpu/Makefile.am diff --git a/libmednahawk/src/hw_cpu/Makefile.in b/mednafen/src/hw_cpu/Makefile.in similarity index 100% rename from libmednahawk/src/hw_cpu/Makefile.in rename to mednafen/src/hw_cpu/Makefile.in diff --git a/libmednahawk/src/hw_cpu/c68k/c68k.c b/mednafen/src/hw_cpu/c68k/c68k.c similarity index 100% rename from libmednahawk/src/hw_cpu/c68k/c68k.c rename to mednafen/src/hw_cpu/c68k/c68k.c diff --git a/libmednahawk/src/hw_cpu/c68k/c68k.cpp b/mednafen/src/hw_cpu/c68k/c68k.cpp similarity index 100% rename from libmednahawk/src/hw_cpu/c68k/c68k.cpp rename to mednafen/src/hw_cpu/c68k/c68k.cpp diff --git a/libmednahawk/src/hw_cpu/c68k/c68k.h b/mednafen/src/hw_cpu/c68k/c68k.h similarity index 100% rename from libmednahawk/src/hw_cpu/c68k/c68k.h rename to mednafen/src/hw_cpu/c68k/c68k.h diff --git a/libmednahawk/src/hw_cpu/c68k/c68k_ini.inc b/mednafen/src/hw_cpu/c68k/c68k_ini.inc similarity index 100% rename from libmednahawk/src/hw_cpu/c68k/c68k_ini.inc rename to mednafen/src/hw_cpu/c68k/c68k_ini.inc diff --git a/libmednahawk/src/hw_cpu/c68k/c68k_op0.inc b/mednafen/src/hw_cpu/c68k/c68k_op0.inc similarity index 100% rename from libmednahawk/src/hw_cpu/c68k/c68k_op0.inc rename to mednafen/src/hw_cpu/c68k/c68k_op0.inc diff --git a/libmednahawk/src/hw_cpu/c68k/c68k_op1.inc b/mednafen/src/hw_cpu/c68k/c68k_op1.inc similarity index 100% rename from libmednahawk/src/hw_cpu/c68k/c68k_op1.inc rename to mednafen/src/hw_cpu/c68k/c68k_op1.inc diff --git a/libmednahawk/src/hw_cpu/c68k/c68k_op2.inc b/mednafen/src/hw_cpu/c68k/c68k_op2.inc similarity index 100% rename from libmednahawk/src/hw_cpu/c68k/c68k_op2.inc rename to mednafen/src/hw_cpu/c68k/c68k_op2.inc diff --git a/libmednahawk/src/hw_cpu/c68k/c68k_op3.inc b/mednafen/src/hw_cpu/c68k/c68k_op3.inc similarity index 100% rename from libmednahawk/src/hw_cpu/c68k/c68k_op3.inc rename to mednafen/src/hw_cpu/c68k/c68k_op3.inc diff --git a/libmednahawk/src/hw_cpu/c68k/c68k_op4.inc b/mednafen/src/hw_cpu/c68k/c68k_op4.inc similarity index 100% rename from libmednahawk/src/hw_cpu/c68k/c68k_op4.inc rename to mednafen/src/hw_cpu/c68k/c68k_op4.inc diff --git a/libmednahawk/src/hw_cpu/c68k/c68k_op5.inc b/mednafen/src/hw_cpu/c68k/c68k_op5.inc similarity index 100% rename from libmednahawk/src/hw_cpu/c68k/c68k_op5.inc rename to mednafen/src/hw_cpu/c68k/c68k_op5.inc diff --git a/libmednahawk/src/hw_cpu/c68k/c68k_op6.inc b/mednafen/src/hw_cpu/c68k/c68k_op6.inc similarity index 100% rename from libmednahawk/src/hw_cpu/c68k/c68k_op6.inc rename to mednafen/src/hw_cpu/c68k/c68k_op6.inc diff --git a/libmednahawk/src/hw_cpu/c68k/c68k_op7.inc b/mednafen/src/hw_cpu/c68k/c68k_op7.inc similarity index 100% rename from libmednahawk/src/hw_cpu/c68k/c68k_op7.inc rename to mednafen/src/hw_cpu/c68k/c68k_op7.inc diff --git a/libmednahawk/src/hw_cpu/c68k/c68k_op8.inc b/mednafen/src/hw_cpu/c68k/c68k_op8.inc similarity index 100% rename from libmednahawk/src/hw_cpu/c68k/c68k_op8.inc rename to mednafen/src/hw_cpu/c68k/c68k_op8.inc diff --git a/libmednahawk/src/hw_cpu/c68k/c68k_op9.inc b/mednafen/src/hw_cpu/c68k/c68k_op9.inc similarity index 100% rename from libmednahawk/src/hw_cpu/c68k/c68k_op9.inc rename to mednafen/src/hw_cpu/c68k/c68k_op9.inc diff --git a/libmednahawk/src/hw_cpu/c68k/c68k_opA.inc b/mednafen/src/hw_cpu/c68k/c68k_opA.inc similarity index 100% rename from libmednahawk/src/hw_cpu/c68k/c68k_opA.inc rename to mednafen/src/hw_cpu/c68k/c68k_opA.inc diff --git a/libmednahawk/src/hw_cpu/c68k/c68k_opB.inc b/mednafen/src/hw_cpu/c68k/c68k_opB.inc similarity index 100% rename from libmednahawk/src/hw_cpu/c68k/c68k_opB.inc rename to mednafen/src/hw_cpu/c68k/c68k_opB.inc diff --git a/libmednahawk/src/hw_cpu/c68k/c68k_opC.inc b/mednafen/src/hw_cpu/c68k/c68k_opC.inc similarity index 100% rename from libmednahawk/src/hw_cpu/c68k/c68k_opC.inc rename to mednafen/src/hw_cpu/c68k/c68k_opC.inc diff --git a/libmednahawk/src/hw_cpu/c68k/c68k_opD.inc b/mednafen/src/hw_cpu/c68k/c68k_opD.inc similarity index 100% rename from libmednahawk/src/hw_cpu/c68k/c68k_opD.inc rename to mednafen/src/hw_cpu/c68k/c68k_opD.inc diff --git a/libmednahawk/src/hw_cpu/c68k/c68k_opE.inc b/mednafen/src/hw_cpu/c68k/c68k_opE.inc similarity index 100% rename from libmednahawk/src/hw_cpu/c68k/c68k_opE.inc rename to mednafen/src/hw_cpu/c68k/c68k_opE.inc diff --git a/libmednahawk/src/hw_cpu/c68k/c68k_opF.inc b/mednafen/src/hw_cpu/c68k/c68k_opF.inc similarity index 100% rename from libmednahawk/src/hw_cpu/c68k/c68k_opF.inc rename to mednafen/src/hw_cpu/c68k/c68k_opF.inc diff --git a/libmednahawk/src/hw_cpu/c68k/c68kexec.c b/mednafen/src/hw_cpu/c68k/c68kexec.c similarity index 100% rename from libmednahawk/src/hw_cpu/c68k/c68kexec.c rename to mednafen/src/hw_cpu/c68k/c68kexec.c diff --git a/libmednahawk/src/hw_cpu/c68k/c68kexec.cpp b/mednafen/src/hw_cpu/c68k/c68kexec.cpp similarity index 100% rename from libmednahawk/src/hw_cpu/c68k/c68kexec.cpp rename to mednafen/src/hw_cpu/c68k/c68kexec.cpp diff --git a/libmednahawk/src/hw_cpu/c68k/c68kmac.inc b/mednafen/src/hw_cpu/c68k/c68kmac.inc similarity index 100% rename from libmednahawk/src/hw_cpu/c68k/c68kmac.inc rename to mednafen/src/hw_cpu/c68k/c68kmac.inc diff --git a/libmednahawk/src/hw_cpu/c68k/gen68k.c b/mednafen/src/hw_cpu/c68k/gen68k.c similarity index 100% rename from libmednahawk/src/hw_cpu/c68k/gen68k.c rename to mednafen/src/hw_cpu/c68k/gen68k.c diff --git a/libmednahawk/src/hw_cpu/c68k/gen68k.h b/mednafen/src/hw_cpu/c68k/gen68k.h similarity index 100% rename from libmednahawk/src/hw_cpu/c68k/gen68k.h rename to mednafen/src/hw_cpu/c68k/gen68k.h diff --git a/libmednahawk/src/hw_cpu/c68k/gen68k.inc b/mednafen/src/hw_cpu/c68k/gen68k.inc similarity index 100% rename from libmednahawk/src/hw_cpu/c68k/gen68k.inc rename to mednafen/src/hw_cpu/c68k/gen68k.inc diff --git a/libmednahawk/src/hw_cpu/huc6280/dis6280.cpp b/mednafen/src/hw_cpu/huc6280/dis6280.cpp similarity index 100% rename from libmednahawk/src/hw_cpu/huc6280/dis6280.cpp rename to mednafen/src/hw_cpu/huc6280/dis6280.cpp diff --git a/libmednahawk/src/hw_cpu/huc6280/dis6280.h b/mednafen/src/hw_cpu/huc6280/dis6280.h similarity index 100% rename from libmednahawk/src/hw_cpu/huc6280/dis6280.h rename to mednafen/src/hw_cpu/huc6280/dis6280.h diff --git a/libmednahawk/src/hw_cpu/huc6280/huc6280.cpp b/mednafen/src/hw_cpu/huc6280/huc6280.cpp similarity index 100% rename from libmednahawk/src/hw_cpu/huc6280/huc6280.cpp rename to mednafen/src/hw_cpu/huc6280/huc6280.cpp diff --git a/libmednahawk/src/hw_cpu/huc6280/huc6280.h b/mednafen/src/hw_cpu/huc6280/huc6280.h similarity index 100% rename from libmednahawk/src/hw_cpu/huc6280/huc6280.h rename to mednafen/src/hw_cpu/huc6280/huc6280.h diff --git a/libmednahawk/src/hw_cpu/huc6280/huc6280_step.inc b/mednafen/src/hw_cpu/huc6280/huc6280_step.inc similarity index 100% rename from libmednahawk/src/hw_cpu/huc6280/huc6280_step.inc rename to mednafen/src/hw_cpu/huc6280/huc6280_step.inc diff --git a/libmednahawk/src/hw_cpu/huc6280/ops.inc b/mednafen/src/hw_cpu/huc6280/ops.inc similarity index 100% rename from libmednahawk/src/hw_cpu/huc6280/ops.inc rename to mednafen/src/hw_cpu/huc6280/ops.inc diff --git a/libmednahawk/src/hw_cpu/v810/fpu-new/mednafen-gcc.h b/mednafen/src/hw_cpu/v810/fpu-new/mednafen-gcc.h similarity index 100% rename from libmednahawk/src/hw_cpu/v810/fpu-new/mednafen-gcc.h rename to mednafen/src/hw_cpu/v810/fpu-new/mednafen-gcc.h diff --git a/libmednahawk/src/hw_cpu/v810/fpu-new/milieu.h b/mednafen/src/hw_cpu/v810/fpu-new/milieu.h similarity index 100% rename from libmednahawk/src/hw_cpu/v810/fpu-new/milieu.h rename to mednafen/src/hw_cpu/v810/fpu-new/milieu.h diff --git a/libmednahawk/src/hw_cpu/v810/fpu-new/softfloat-macros b/mednafen/src/hw_cpu/v810/fpu-new/softfloat-macros similarity index 100% rename from libmednahawk/src/hw_cpu/v810/fpu-new/softfloat-macros rename to mednafen/src/hw_cpu/v810/fpu-new/softfloat-macros diff --git a/libmednahawk/src/hw_cpu/v810/fpu-new/softfloat-specialize b/mednafen/src/hw_cpu/v810/fpu-new/softfloat-specialize similarity index 100% rename from libmednahawk/src/hw_cpu/v810/fpu-new/softfloat-specialize rename to mednafen/src/hw_cpu/v810/fpu-new/softfloat-specialize diff --git a/libmednahawk/src/hw_cpu/v810/fpu-new/softfloat.c b/mednafen/src/hw_cpu/v810/fpu-new/softfloat.c similarity index 100% rename from libmednahawk/src/hw_cpu/v810/fpu-new/softfloat.c rename to mednafen/src/hw_cpu/v810/fpu-new/softfloat.c diff --git a/libmednahawk/src/hw_cpu/v810/fpu-new/softfloat.h b/mednafen/src/hw_cpu/v810/fpu-new/softfloat.h similarity index 100% rename from libmednahawk/src/hw_cpu/v810/fpu-new/softfloat.h rename to mednafen/src/hw_cpu/v810/fpu-new/softfloat.h diff --git a/libmednahawk/src/hw_cpu/v810/fpu-new/timesoftfloat.c b/mednafen/src/hw_cpu/v810/fpu-new/timesoftfloat.c similarity index 100% rename from libmednahawk/src/hw_cpu/v810/fpu-new/timesoftfloat.c rename to mednafen/src/hw_cpu/v810/fpu-new/timesoftfloat.c diff --git a/libmednahawk/src/hw_cpu/v810/v810_cpu.cpp b/mednafen/src/hw_cpu/v810/v810_cpu.cpp similarity index 100% rename from libmednahawk/src/hw_cpu/v810/v810_cpu.cpp rename to mednafen/src/hw_cpu/v810/v810_cpu.cpp diff --git a/libmednahawk/src/hw_cpu/v810/v810_cpu.h b/mednafen/src/hw_cpu/v810/v810_cpu.h similarity index 100% rename from libmednahawk/src/hw_cpu/v810/v810_cpu.h rename to mednafen/src/hw_cpu/v810/v810_cpu.h diff --git a/libmednahawk/src/hw_cpu/v810/v810_cpuD.cpp b/mednafen/src/hw_cpu/v810/v810_cpuD.cpp similarity index 100% rename from libmednahawk/src/hw_cpu/v810/v810_cpuD.cpp rename to mednafen/src/hw_cpu/v810/v810_cpuD.cpp diff --git a/libmednahawk/src/hw_cpu/v810/v810_cpuD.h b/mednafen/src/hw_cpu/v810/v810_cpuD.h similarity index 100% rename from libmednahawk/src/hw_cpu/v810/v810_cpuD.h rename to mednafen/src/hw_cpu/v810/v810_cpuD.h diff --git a/libmednahawk/src/hw_cpu/v810/v810_do_am.h b/mednafen/src/hw_cpu/v810/v810_do_am.h similarity index 100% rename from libmednahawk/src/hw_cpu/v810/v810_do_am.h rename to mednafen/src/hw_cpu/v810/v810_do_am.h diff --git a/libmednahawk/src/hw_cpu/v810/v810_op_table.inc b/mednafen/src/hw_cpu/v810/v810_op_table.inc similarity index 100% rename from libmednahawk/src/hw_cpu/v810/v810_op_table.inc rename to mednafen/src/hw_cpu/v810/v810_op_table.inc diff --git a/libmednahawk/src/hw_cpu/v810/v810_oploop.inc b/mednafen/src/hw_cpu/v810/v810_oploop.inc similarity index 100% rename from libmednahawk/src/hw_cpu/v810/v810_oploop.inc rename to mednafen/src/hw_cpu/v810/v810_oploop.inc diff --git a/libmednahawk/src/hw_cpu/v810/v810_opt.h b/mednafen/src/hw_cpu/v810/v810_opt.h similarity index 100% rename from libmednahawk/src/hw_cpu/v810/v810_opt.h rename to mednafen/src/hw_cpu/v810/v810_opt.h diff --git a/libmednahawk/src/hw_cpu/z80-fuse/coretest.c b/mednafen/src/hw_cpu/z80-fuse/coretest.c similarity index 100% rename from libmednahawk/src/hw_cpu/z80-fuse/coretest.c rename to mednafen/src/hw_cpu/z80-fuse/coretest.c diff --git a/libmednahawk/src/hw_cpu/z80-fuse/opcodes_base.c b/mednafen/src/hw_cpu/z80-fuse/opcodes_base.c similarity index 100% rename from libmednahawk/src/hw_cpu/z80-fuse/opcodes_base.c rename to mednafen/src/hw_cpu/z80-fuse/opcodes_base.c diff --git a/libmednahawk/src/hw_cpu/z80-fuse/z80.cpp b/mednafen/src/hw_cpu/z80-fuse/z80.cpp similarity index 100% rename from libmednahawk/src/hw_cpu/z80-fuse/z80.cpp rename to mednafen/src/hw_cpu/z80-fuse/z80.cpp diff --git a/libmednahawk/src/hw_cpu/z80-fuse/z80.h b/mednafen/src/hw_cpu/z80-fuse/z80.h similarity index 100% rename from libmednahawk/src/hw_cpu/z80-fuse/z80.h rename to mednafen/src/hw_cpu/z80-fuse/z80.h diff --git a/libmednahawk/src/hw_cpu/z80-fuse/z80_cb.c b/mednafen/src/hw_cpu/z80-fuse/z80_cb.c similarity index 100% rename from libmednahawk/src/hw_cpu/z80-fuse/z80_cb.c rename to mednafen/src/hw_cpu/z80-fuse/z80_cb.c diff --git a/libmednahawk/src/hw_cpu/z80-fuse/z80_ddfd.c b/mednafen/src/hw_cpu/z80-fuse/z80_ddfd.c similarity index 100% rename from libmednahawk/src/hw_cpu/z80-fuse/z80_ddfd.c rename to mednafen/src/hw_cpu/z80-fuse/z80_ddfd.c diff --git a/libmednahawk/src/hw_cpu/z80-fuse/z80_ddfdcb.c b/mednafen/src/hw_cpu/z80-fuse/z80_ddfdcb.c similarity index 100% rename from libmednahawk/src/hw_cpu/z80-fuse/z80_ddfdcb.c rename to mednafen/src/hw_cpu/z80-fuse/z80_ddfdcb.c diff --git a/libmednahawk/src/hw_cpu/z80-fuse/z80_ed.c b/mednafen/src/hw_cpu/z80-fuse/z80_ed.c similarity index 100% rename from libmednahawk/src/hw_cpu/z80-fuse/z80_ed.c rename to mednafen/src/hw_cpu/z80-fuse/z80_ed.c diff --git a/libmednahawk/src/hw_cpu/z80-fuse/z80_macros.h b/mednafen/src/hw_cpu/z80-fuse/z80_macros.h similarity index 100% rename from libmednahawk/src/hw_cpu/z80-fuse/z80_macros.h rename to mednafen/src/hw_cpu/z80-fuse/z80_macros.h diff --git a/libmednahawk/src/hw_cpu/z80-fuse/z80_ops.cpp b/mednafen/src/hw_cpu/z80-fuse/z80_ops.cpp similarity index 100% rename from libmednahawk/src/hw_cpu/z80-fuse/z80_ops.cpp rename to mednafen/src/hw_cpu/z80-fuse/z80_ops.cpp diff --git a/libmednahawk/src/hw_misc/Makefile.am b/mednafen/src/hw_misc/Makefile.am similarity index 100% rename from libmednahawk/src/hw_misc/Makefile.am rename to mednafen/src/hw_misc/Makefile.am diff --git a/libmednahawk/src/hw_misc/Makefile.in b/mednafen/src/hw_misc/Makefile.in similarity index 100% rename from libmednahawk/src/hw_misc/Makefile.in rename to mednafen/src/hw_misc/Makefile.in diff --git a/libmednahawk/src/hw_misc/arcade_card/arcade_card.cpp b/mednafen/src/hw_misc/arcade_card/arcade_card.cpp similarity index 100% rename from libmednahawk/src/hw_misc/arcade_card/arcade_card.cpp rename to mednafen/src/hw_misc/arcade_card/arcade_card.cpp diff --git a/libmednahawk/src/hw_misc/arcade_card/arcade_card.h b/mednafen/src/hw_misc/arcade_card/arcade_card.h similarity index 100% rename from libmednahawk/src/hw_misc/arcade_card/arcade_card.h rename to mednafen/src/hw_misc/arcade_card/arcade_card.h diff --git a/libmednahawk/src/lepacker.h b/mednafen/src/lepacker.h similarity index 100% rename from libmednahawk/src/lepacker.h rename to mednafen/src/lepacker.h diff --git a/libmednahawk/src/lynx/Makefile.am b/mednafen/src/lynx/Makefile.am similarity index 100% rename from libmednahawk/src/lynx/Makefile.am rename to mednafen/src/lynx/Makefile.am diff --git a/libmednahawk/src/lynx/Makefile.in b/mednafen/src/lynx/Makefile.in similarity index 100% rename from libmednahawk/src/lynx/Makefile.in rename to mednafen/src/lynx/Makefile.in diff --git a/libmednahawk/src/lynx/c6502mak.h b/mednafen/src/lynx/c6502mak.h similarity index 100% rename from libmednahawk/src/lynx/c6502mak.h rename to mednafen/src/lynx/c6502mak.h diff --git a/libmednahawk/src/lynx/c65c02.cpp b/mednafen/src/lynx/c65c02.cpp similarity index 100% rename from libmednahawk/src/lynx/c65c02.cpp rename to mednafen/src/lynx/c65c02.cpp diff --git a/libmednahawk/src/lynx/c65c02.h b/mednafen/src/lynx/c65c02.h similarity index 100% rename from libmednahawk/src/lynx/c65c02.h rename to mednafen/src/lynx/c65c02.h diff --git a/libmednahawk/src/lynx/cart.cpp b/mednafen/src/lynx/cart.cpp similarity index 100% rename from libmednahawk/src/lynx/cart.cpp rename to mednafen/src/lynx/cart.cpp diff --git a/libmednahawk/src/lynx/cart.h b/mednafen/src/lynx/cart.h similarity index 100% rename from libmednahawk/src/lynx/cart.h rename to mednafen/src/lynx/cart.h diff --git a/libmednahawk/src/lynx/license.txt b/mednafen/src/lynx/license.txt similarity index 100% rename from libmednahawk/src/lynx/license.txt rename to mednafen/src/lynx/license.txt diff --git a/libmednahawk/src/lynx/lynxbase.h b/mednafen/src/lynx/lynxbase.h similarity index 100% rename from libmednahawk/src/lynx/lynxbase.h rename to mednafen/src/lynx/lynxbase.h diff --git a/libmednahawk/src/lynx/lynxdef.h b/mednafen/src/lynx/lynxdef.h similarity index 100% rename from libmednahawk/src/lynx/lynxdef.h rename to mednafen/src/lynx/lynxdef.h diff --git a/libmednahawk/src/lynx/machine.h b/mednafen/src/lynx/machine.h similarity index 100% rename from libmednahawk/src/lynx/machine.h rename to mednafen/src/lynx/machine.h diff --git a/libmednahawk/src/lynx/memmap.cpp b/mednafen/src/lynx/memmap.cpp similarity index 100% rename from libmednahawk/src/lynx/memmap.cpp rename to mednafen/src/lynx/memmap.cpp diff --git a/libmednahawk/src/lynx/memmap.h b/mednafen/src/lynx/memmap.h similarity index 100% rename from libmednahawk/src/lynx/memmap.h rename to mednafen/src/lynx/memmap.h diff --git a/libmednahawk/src/lynx/mikie.cpp b/mednafen/src/lynx/mikie.cpp similarity index 100% rename from libmednahawk/src/lynx/mikie.cpp rename to mednafen/src/lynx/mikie.cpp diff --git a/libmednahawk/src/lynx/mikie.h b/mednafen/src/lynx/mikie.h similarity index 100% rename from libmednahawk/src/lynx/mikie.h rename to mednafen/src/lynx/mikie.h diff --git a/libmednahawk/src/lynx/ram.cpp b/mednafen/src/lynx/ram.cpp similarity index 100% rename from libmednahawk/src/lynx/ram.cpp rename to mednafen/src/lynx/ram.cpp diff --git a/libmednahawk/src/lynx/ram.h b/mednafen/src/lynx/ram.h similarity index 100% rename from libmednahawk/src/lynx/ram.h rename to mednafen/src/lynx/ram.h diff --git a/libmednahawk/src/lynx/rom.cpp b/mednafen/src/lynx/rom.cpp similarity index 100% rename from libmednahawk/src/lynx/rom.cpp rename to mednafen/src/lynx/rom.cpp diff --git a/libmednahawk/src/lynx/rom.h b/mednafen/src/lynx/rom.h similarity index 100% rename from libmednahawk/src/lynx/rom.h rename to mednafen/src/lynx/rom.h diff --git a/libmednahawk/src/lynx/susie.cpp b/mednafen/src/lynx/susie.cpp similarity index 100% rename from libmednahawk/src/lynx/susie.cpp rename to mednafen/src/lynx/susie.cpp diff --git a/libmednahawk/src/lynx/susie.h b/mednafen/src/lynx/susie.h similarity index 100% rename from libmednahawk/src/lynx/susie.h rename to mednafen/src/lynx/susie.h diff --git a/libmednahawk/src/lynx/sysbase.h b/mednafen/src/lynx/sysbase.h similarity index 100% rename from libmednahawk/src/lynx/sysbase.h rename to mednafen/src/lynx/sysbase.h diff --git a/libmednahawk/src/lynx/system.cpp b/mednafen/src/lynx/system.cpp similarity index 100% rename from libmednahawk/src/lynx/system.cpp rename to mednafen/src/lynx/system.cpp diff --git a/libmednahawk/src/lynx/system.h b/mednafen/src/lynx/system.h similarity index 100% rename from libmednahawk/src/lynx/system.h rename to mednafen/src/lynx/system.h diff --git a/libmednahawk/src/masmem.h b/mednafen/src/masmem.h similarity index 100% rename from libmednahawk/src/masmem.h rename to mednafen/src/masmem.h diff --git a/libmednahawk/src/math_ops.cpp b/mednafen/src/math_ops.cpp similarity index 100% rename from libmednahawk/src/math_ops.cpp rename to mednafen/src/math_ops.cpp diff --git a/libmednahawk/src/math_ops.h b/mednafen/src/math_ops.h similarity index 100% rename from libmednahawk/src/math_ops.h rename to mednafen/src/math_ops.h diff --git a/libmednahawk/src/md5.cpp b/mednafen/src/md5.cpp similarity index 100% rename from libmednahawk/src/md5.cpp rename to mednafen/src/md5.cpp diff --git a/libmednahawk/src/md5.h b/mednafen/src/md5.h similarity index 100% rename from libmednahawk/src/md5.h rename to mednafen/src/md5.h diff --git a/libmednahawk/src/mednafen-driver.h b/mednafen/src/mednafen-driver.h similarity index 100% rename from libmednahawk/src/mednafen-driver.h rename to mednafen/src/mednafen-driver.h diff --git a/libmednahawk/src/mednafen.cpp b/mednafen/src/mednafen.cpp similarity index 100% rename from libmednahawk/src/mednafen.cpp rename to mednafen/src/mednafen.cpp diff --git a/libmednahawk/src/mednafen.h b/mednafen/src/mednafen.h similarity index 100% rename from libmednahawk/src/mednafen.h rename to mednafen/src/mednafen.h diff --git a/libmednahawk/src/memory.cpp b/mednafen/src/memory.cpp similarity index 100% rename from libmednahawk/src/memory.cpp rename to mednafen/src/memory.cpp diff --git a/libmednahawk/src/memory.h b/mednafen/src/memory.h similarity index 100% rename from libmednahawk/src/memory.h rename to mednafen/src/memory.h diff --git a/libmednahawk/src/mempatcher-driver.h b/mednafen/src/mempatcher-driver.h similarity index 100% rename from libmednahawk/src/mempatcher-driver.h rename to mednafen/src/mempatcher-driver.h diff --git a/libmednahawk/src/mempatcher.cpp b/mednafen/src/mempatcher.cpp similarity index 100% rename from libmednahawk/src/mempatcher.cpp rename to mednafen/src/mempatcher.cpp diff --git a/libmednahawk/src/mempatcher.h b/mednafen/src/mempatcher.h similarity index 100% rename from libmednahawk/src/mempatcher.h rename to mednafen/src/mempatcher.h diff --git a/libmednahawk/src/movie-driver.h b/mednafen/src/movie-driver.h similarity index 100% rename from libmednahawk/src/movie-driver.h rename to mednafen/src/movie-driver.h diff --git a/libmednahawk/src/movie.cpp b/mednafen/src/movie.cpp similarity index 100% rename from libmednahawk/src/movie.cpp rename to mednafen/src/movie.cpp diff --git a/libmednahawk/src/movie.h b/mednafen/src/movie.h similarity index 100% rename from libmednahawk/src/movie.h rename to mednafen/src/movie.h diff --git a/libmednahawk/src/mpcdec/!VERSION b/mednafen/src/mpcdec/!VERSION similarity index 100% rename from libmednahawk/src/mpcdec/!VERSION rename to mednafen/src/mpcdec/!VERSION diff --git a/libmednahawk/src/mpcdec/AUTHORS b/mednafen/src/mpcdec/AUTHORS similarity index 100% rename from libmednahawk/src/mpcdec/AUTHORS rename to mednafen/src/mpcdec/AUTHORS diff --git a/libmednahawk/src/mpcdec/CMakeLists.txt b/mednafen/src/mpcdec/CMakeLists.txt similarity index 100% rename from libmednahawk/src/mpcdec/CMakeLists.txt rename to mednafen/src/mpcdec/CMakeLists.txt diff --git a/libmednahawk/src/mpcdec/COPYING b/mednafen/src/mpcdec/COPYING similarity index 100% rename from libmednahawk/src/mpcdec/COPYING rename to mednafen/src/mpcdec/COPYING diff --git a/libmednahawk/src/mpcdec/ChangeLog b/mednafen/src/mpcdec/ChangeLog similarity index 100% rename from libmednahawk/src/mpcdec/ChangeLog rename to mednafen/src/mpcdec/ChangeLog diff --git a/libmednahawk/src/mpcdec/Makefile.am b/mednafen/src/mpcdec/Makefile.am similarity index 100% rename from libmednahawk/src/mpcdec/Makefile.am rename to mednafen/src/mpcdec/Makefile.am diff --git a/libmednahawk/src/mpcdec/Makefile.in b/mednafen/src/mpcdec/Makefile.in similarity index 100% rename from libmednahawk/src/mpcdec/Makefile.in rename to mednafen/src/mpcdec/Makefile.in diff --git a/libmednahawk/src/mpcdec/README b/mednafen/src/mpcdec/README similarity index 100% rename from libmednahawk/src/mpcdec/README rename to mednafen/src/mpcdec/README diff --git a/libmednahawk/src/mpcdec/crc32.c b/mednafen/src/mpcdec/crc32.c similarity index 100% rename from libmednahawk/src/mpcdec/crc32.c rename to mednafen/src/mpcdec/crc32.c diff --git a/libmednahawk/src/mpcdec/datatypes.h b/mednafen/src/mpcdec/datatypes.h similarity index 100% rename from libmednahawk/src/mpcdec/datatypes.h rename to mednafen/src/mpcdec/datatypes.h diff --git a/libmednahawk/src/mpcdec/decoder.h b/mednafen/src/mpcdec/decoder.h similarity index 100% rename from libmednahawk/src/mpcdec/decoder.h rename to mednafen/src/mpcdec/decoder.h diff --git a/libmednahawk/src/mpcdec/fastmath.c b/mednafen/src/mpcdec/fastmath.c similarity index 100% rename from libmednahawk/src/mpcdec/fastmath.c rename to mednafen/src/mpcdec/fastmath.c diff --git a/libmednahawk/src/mpcdec/huffman-bcl.c b/mednafen/src/mpcdec/huffman-bcl.c similarity index 100% rename from libmednahawk/src/mpcdec/huffman-bcl.c rename to mednafen/src/mpcdec/huffman-bcl.c diff --git a/libmednahawk/src/mpcdec/huffman.c b/mednafen/src/mpcdec/huffman.c similarity index 100% rename from libmednahawk/src/mpcdec/huffman.c rename to mednafen/src/mpcdec/huffman.c diff --git a/libmednahawk/src/mpcdec/huffman.h b/mednafen/src/mpcdec/huffman.h similarity index 100% rename from libmednahawk/src/mpcdec/huffman.h rename to mednafen/src/mpcdec/huffman.h diff --git a/libmednahawk/src/mpcdec/huffsv46.c b/mednafen/src/mpcdec/huffsv46.c similarity index 100% rename from libmednahawk/src/mpcdec/huffsv46.c rename to mednafen/src/mpcdec/huffsv46.c diff --git a/libmednahawk/src/mpcdec/huffsv7.c b/mednafen/src/mpcdec/huffsv7.c similarity index 100% rename from libmednahawk/src/mpcdec/huffsv7.c rename to mednafen/src/mpcdec/huffsv7.c diff --git a/libmednahawk/src/mpcdec/idtag.c b/mednafen/src/mpcdec/idtag.c similarity index 100% rename from libmednahawk/src/mpcdec/idtag.c rename to mednafen/src/mpcdec/idtag.c diff --git a/libmednahawk/src/mpcdec/internal.h b/mednafen/src/mpcdec/internal.h similarity index 100% rename from libmednahawk/src/mpcdec/internal.h rename to mednafen/src/mpcdec/internal.h diff --git a/libmednahawk/src/mpcdec/minimax.h b/mednafen/src/mpcdec/minimax.h similarity index 100% rename from libmednahawk/src/mpcdec/minimax.h rename to mednafen/src/mpcdec/minimax.h diff --git a/libmednahawk/src/mpcdec/mpc_bits_reader.c b/mednafen/src/mpcdec/mpc_bits_reader.c similarity index 100% rename from libmednahawk/src/mpcdec/mpc_bits_reader.c rename to mednafen/src/mpcdec/mpc_bits_reader.c diff --git a/libmednahawk/src/mpcdec/mpc_bits_reader.h b/mednafen/src/mpcdec/mpc_bits_reader.h similarity index 100% rename from libmednahawk/src/mpcdec/mpc_bits_reader.h rename to mednafen/src/mpcdec/mpc_bits_reader.h diff --git a/libmednahawk/src/mpcdec/mpc_decoder.c b/mednafen/src/mpcdec/mpc_decoder.c similarity index 100% rename from libmednahawk/src/mpcdec/mpc_decoder.c rename to mednafen/src/mpcdec/mpc_decoder.c diff --git a/libmednahawk/src/mpcdec/mpc_demux.c b/mednafen/src/mpcdec/mpc_demux.c similarity index 100% rename from libmednahawk/src/mpcdec/mpc_demux.c rename to mednafen/src/mpcdec/mpc_demux.c diff --git a/libmednahawk/src/mpcdec/mpc_reader.c b/mednafen/src/mpcdec/mpc_reader.c similarity index 100% rename from libmednahawk/src/mpcdec/mpc_reader.c rename to mednafen/src/mpcdec/mpc_reader.c diff --git a/libmednahawk/src/mpcdec/mpc_types.h b/mednafen/src/mpcdec/mpc_types.h similarity index 100% rename from libmednahawk/src/mpcdec/mpc_types.h rename to mednafen/src/mpcdec/mpc_types.h diff --git a/libmednahawk/src/mpcdec/mpcdec.h b/mednafen/src/mpcdec/mpcdec.h similarity index 100% rename from libmednahawk/src/mpcdec/mpcdec.h rename to mednafen/src/mpcdec/mpcdec.h diff --git a/libmednahawk/src/mpcdec/mpcdec_math.h b/mednafen/src/mpcdec/mpcdec_math.h similarity index 100% rename from libmednahawk/src/mpcdec/mpcdec_math.h rename to mednafen/src/mpcdec/mpcdec_math.h diff --git a/libmednahawk/src/mpcdec/mpcmath.h b/mednafen/src/mpcdec/mpcmath.h similarity index 100% rename from libmednahawk/src/mpcdec/mpcmath.h rename to mednafen/src/mpcdec/mpcmath.h diff --git a/libmednahawk/src/mpcdec/reader.h b/mednafen/src/mpcdec/reader.h similarity index 100% rename from libmednahawk/src/mpcdec/reader.h rename to mednafen/src/mpcdec/reader.h diff --git a/libmednahawk/src/mpcdec/requant.c b/mednafen/src/mpcdec/requant.c similarity index 100% rename from libmednahawk/src/mpcdec/requant.c rename to mednafen/src/mpcdec/requant.c diff --git a/libmednahawk/src/mpcdec/requant.h b/mednafen/src/mpcdec/requant.h similarity index 100% rename from libmednahawk/src/mpcdec/requant.h rename to mednafen/src/mpcdec/requant.h diff --git a/libmednahawk/src/mpcdec/streaminfo.c b/mednafen/src/mpcdec/streaminfo.c similarity index 100% rename from libmednahawk/src/mpcdec/streaminfo.c rename to mednafen/src/mpcdec/streaminfo.c diff --git a/libmednahawk/src/mpcdec/streaminfo.h b/mednafen/src/mpcdec/streaminfo.h similarity index 100% rename from libmednahawk/src/mpcdec/streaminfo.h rename to mednafen/src/mpcdec/streaminfo.h diff --git a/libmednahawk/src/mpcdec/synth_filter.c b/mednafen/src/mpcdec/synth_filter.c similarity index 100% rename from libmednahawk/src/mpcdec/synth_filter.c rename to mednafen/src/mpcdec/synth_filter.c diff --git a/libmednahawk/src/mpcdec/tags.c b/mednafen/src/mpcdec/tags.c similarity index 100% rename from libmednahawk/src/mpcdec/tags.c rename to mednafen/src/mpcdec/tags.c diff --git a/libmednahawk/src/netplay-driver.h b/mednafen/src/netplay-driver.h similarity index 100% rename from libmednahawk/src/netplay-driver.h rename to mednafen/src/netplay-driver.h diff --git a/libmednahawk/src/netplay.cpp b/mednafen/src/netplay.cpp similarity index 100% rename from libmednahawk/src/netplay.cpp rename to mednafen/src/netplay.cpp diff --git a/libmednahawk/src/netplay.h b/mednafen/src/netplay.h similarity index 100% rename from libmednahawk/src/netplay.h rename to mednafen/src/netplay.h diff --git a/libmednahawk/src/ngp/Makefile.am b/mednafen/src/ngp/Makefile.am similarity index 100% rename from libmednahawk/src/ngp/Makefile.am rename to mednafen/src/ngp/Makefile.am diff --git a/libmednahawk/src/ngp/Makefile.in b/mednafen/src/ngp/Makefile.in similarity index 100% rename from libmednahawk/src/ngp/Makefile.in rename to mednafen/src/ngp/Makefile.in diff --git a/libmednahawk/src/ngp/T6W28_Apu.cpp b/mednafen/src/ngp/T6W28_Apu.cpp similarity index 100% rename from libmednahawk/src/ngp/T6W28_Apu.cpp rename to mednafen/src/ngp/T6W28_Apu.cpp diff --git a/libmednahawk/src/ngp/T6W28_Apu.h b/mednafen/src/ngp/T6W28_Apu.h similarity index 100% rename from libmednahawk/src/ngp/T6W28_Apu.h rename to mednafen/src/ngp/T6W28_Apu.h diff --git a/libmednahawk/src/ngp/T6W28_Oscs.h b/mednafen/src/ngp/T6W28_Oscs.h similarity index 100% rename from libmednahawk/src/ngp/T6W28_Oscs.h rename to mednafen/src/ngp/T6W28_Oscs.h diff --git a/libmednahawk/src/ngp/TLCS-900h/TLCS900h_disassemble.cpp b/mednafen/src/ngp/TLCS-900h/TLCS900h_disassemble.cpp similarity index 100% rename from libmednahawk/src/ngp/TLCS-900h/TLCS900h_disassemble.cpp rename to mednafen/src/ngp/TLCS-900h/TLCS900h_disassemble.cpp diff --git a/libmednahawk/src/ngp/TLCS-900h/TLCS900h_disassemble.h b/mednafen/src/ngp/TLCS-900h/TLCS900h_disassemble.h similarity index 100% rename from libmednahawk/src/ngp/TLCS-900h/TLCS900h_disassemble.h rename to mednafen/src/ngp/TLCS-900h/TLCS900h_disassemble.h diff --git a/libmednahawk/src/ngp/TLCS-900h/TLCS900h_disassemble_dst.cpp b/mednafen/src/ngp/TLCS-900h/TLCS900h_disassemble_dst.cpp similarity index 100% rename from libmednahawk/src/ngp/TLCS-900h/TLCS900h_disassemble_dst.cpp rename to mednafen/src/ngp/TLCS-900h/TLCS900h_disassemble_dst.cpp diff --git a/libmednahawk/src/ngp/TLCS-900h/TLCS900h_disassemble_extra.cpp b/mednafen/src/ngp/TLCS-900h/TLCS900h_disassemble_extra.cpp similarity index 100% rename from libmednahawk/src/ngp/TLCS-900h/TLCS900h_disassemble_extra.cpp rename to mednafen/src/ngp/TLCS-900h/TLCS900h_disassemble_extra.cpp diff --git a/libmednahawk/src/ngp/TLCS-900h/TLCS900h_disassemble_reg.cpp b/mednafen/src/ngp/TLCS-900h/TLCS900h_disassemble_reg.cpp similarity index 100% rename from libmednahawk/src/ngp/TLCS-900h/TLCS900h_disassemble_reg.cpp rename to mednafen/src/ngp/TLCS-900h/TLCS900h_disassemble_reg.cpp diff --git a/libmednahawk/src/ngp/TLCS-900h/TLCS900h_disassemble_src.cpp b/mednafen/src/ngp/TLCS-900h/TLCS900h_disassemble_src.cpp similarity index 100% rename from libmednahawk/src/ngp/TLCS-900h/TLCS900h_disassemble_src.cpp rename to mednafen/src/ngp/TLCS-900h/TLCS900h_disassemble_src.cpp diff --git a/libmednahawk/src/ngp/TLCS-900h/TLCS900h_interpret.cpp b/mednafen/src/ngp/TLCS-900h/TLCS900h_interpret.cpp similarity index 100% rename from libmednahawk/src/ngp/TLCS-900h/TLCS900h_interpret.cpp rename to mednafen/src/ngp/TLCS-900h/TLCS900h_interpret.cpp diff --git a/libmednahawk/src/ngp/TLCS-900h/TLCS900h_interpret.h b/mednafen/src/ngp/TLCS-900h/TLCS900h_interpret.h similarity index 100% rename from libmednahawk/src/ngp/TLCS-900h/TLCS900h_interpret.h rename to mednafen/src/ngp/TLCS-900h/TLCS900h_interpret.h diff --git a/libmednahawk/src/ngp/TLCS-900h/TLCS900h_interpret_dst.cpp b/mednafen/src/ngp/TLCS-900h/TLCS900h_interpret_dst.cpp similarity index 100% rename from libmednahawk/src/ngp/TLCS-900h/TLCS900h_interpret_dst.cpp rename to mednafen/src/ngp/TLCS-900h/TLCS900h_interpret_dst.cpp diff --git a/libmednahawk/src/ngp/TLCS-900h/TLCS900h_interpret_dst.h b/mednafen/src/ngp/TLCS-900h/TLCS900h_interpret_dst.h similarity index 100% rename from libmednahawk/src/ngp/TLCS-900h/TLCS900h_interpret_dst.h rename to mednafen/src/ngp/TLCS-900h/TLCS900h_interpret_dst.h diff --git a/libmednahawk/src/ngp/TLCS-900h/TLCS900h_interpret_reg.cpp b/mednafen/src/ngp/TLCS-900h/TLCS900h_interpret_reg.cpp similarity index 100% rename from libmednahawk/src/ngp/TLCS-900h/TLCS900h_interpret_reg.cpp rename to mednafen/src/ngp/TLCS-900h/TLCS900h_interpret_reg.cpp diff --git a/libmednahawk/src/ngp/TLCS-900h/TLCS900h_interpret_reg.h b/mednafen/src/ngp/TLCS-900h/TLCS900h_interpret_reg.h similarity index 100% rename from libmednahawk/src/ngp/TLCS-900h/TLCS900h_interpret_reg.h rename to mednafen/src/ngp/TLCS-900h/TLCS900h_interpret_reg.h diff --git a/libmednahawk/src/ngp/TLCS-900h/TLCS900h_interpret_single.cpp b/mednafen/src/ngp/TLCS-900h/TLCS900h_interpret_single.cpp similarity index 100% rename from libmednahawk/src/ngp/TLCS-900h/TLCS900h_interpret_single.cpp rename to mednafen/src/ngp/TLCS-900h/TLCS900h_interpret_single.cpp diff --git a/libmednahawk/src/ngp/TLCS-900h/TLCS900h_interpret_single.h b/mednafen/src/ngp/TLCS-900h/TLCS900h_interpret_single.h similarity index 100% rename from libmednahawk/src/ngp/TLCS-900h/TLCS900h_interpret_single.h rename to mednafen/src/ngp/TLCS-900h/TLCS900h_interpret_single.h diff --git a/libmednahawk/src/ngp/TLCS-900h/TLCS900h_interpret_src.cpp b/mednafen/src/ngp/TLCS-900h/TLCS900h_interpret_src.cpp similarity index 100% rename from libmednahawk/src/ngp/TLCS-900h/TLCS900h_interpret_src.cpp rename to mednafen/src/ngp/TLCS-900h/TLCS900h_interpret_src.cpp diff --git a/libmednahawk/src/ngp/TLCS-900h/TLCS900h_interpret_src.h b/mednafen/src/ngp/TLCS-900h/TLCS900h_interpret_src.h similarity index 100% rename from libmednahawk/src/ngp/TLCS-900h/TLCS900h_interpret_src.h rename to mednafen/src/ngp/TLCS-900h/TLCS900h_interpret_src.h diff --git a/libmednahawk/src/ngp/TLCS-900h/TLCS900h_registers.cpp b/mednafen/src/ngp/TLCS-900h/TLCS900h_registers.cpp similarity index 100% rename from libmednahawk/src/ngp/TLCS-900h/TLCS900h_registers.cpp rename to mednafen/src/ngp/TLCS-900h/TLCS900h_registers.cpp diff --git a/libmednahawk/src/ngp/TLCS-900h/TLCS900h_registers.h b/mednafen/src/ngp/TLCS-900h/TLCS900h_registers.h similarity index 100% rename from libmednahawk/src/ngp/TLCS-900h/TLCS900h_registers.h rename to mednafen/src/ngp/TLCS-900h/TLCS900h_registers.h diff --git a/libmednahawk/src/ngp/TLCS-900h/TLCS900h_registers_mapB.h b/mednafen/src/ngp/TLCS-900h/TLCS900h_registers_mapB.h similarity index 100% rename from libmednahawk/src/ngp/TLCS-900h/TLCS900h_registers_mapB.h rename to mednafen/src/ngp/TLCS-900h/TLCS900h_registers_mapB.h diff --git a/libmednahawk/src/ngp/TLCS-900h/TLCS900h_registers_mapCodeB0.h b/mednafen/src/ngp/TLCS-900h/TLCS900h_registers_mapCodeB0.h similarity index 100% rename from libmednahawk/src/ngp/TLCS-900h/TLCS900h_registers_mapCodeB0.h rename to mednafen/src/ngp/TLCS-900h/TLCS900h_registers_mapCodeB0.h diff --git a/libmednahawk/src/ngp/TLCS-900h/TLCS900h_registers_mapCodeB1.h b/mednafen/src/ngp/TLCS-900h/TLCS900h_registers_mapCodeB1.h similarity index 100% rename from libmednahawk/src/ngp/TLCS-900h/TLCS900h_registers_mapCodeB1.h rename to mednafen/src/ngp/TLCS-900h/TLCS900h_registers_mapCodeB1.h diff --git a/libmednahawk/src/ngp/TLCS-900h/TLCS900h_registers_mapCodeB2.h b/mednafen/src/ngp/TLCS-900h/TLCS900h_registers_mapCodeB2.h similarity index 100% rename from libmednahawk/src/ngp/TLCS-900h/TLCS900h_registers_mapCodeB2.h rename to mednafen/src/ngp/TLCS-900h/TLCS900h_registers_mapCodeB2.h diff --git a/libmednahawk/src/ngp/TLCS-900h/TLCS900h_registers_mapCodeB3.h b/mednafen/src/ngp/TLCS-900h/TLCS900h_registers_mapCodeB3.h similarity index 100% rename from libmednahawk/src/ngp/TLCS-900h/TLCS900h_registers_mapCodeB3.h rename to mednafen/src/ngp/TLCS-900h/TLCS900h_registers_mapCodeB3.h diff --git a/libmednahawk/src/ngp/TLCS-900h/TLCS900h_registers_mapCodeL0.h b/mednafen/src/ngp/TLCS-900h/TLCS900h_registers_mapCodeL0.h similarity index 100% rename from libmednahawk/src/ngp/TLCS-900h/TLCS900h_registers_mapCodeL0.h rename to mednafen/src/ngp/TLCS-900h/TLCS900h_registers_mapCodeL0.h diff --git a/libmednahawk/src/ngp/TLCS-900h/TLCS900h_registers_mapCodeL1.h b/mednafen/src/ngp/TLCS-900h/TLCS900h_registers_mapCodeL1.h similarity index 100% rename from libmednahawk/src/ngp/TLCS-900h/TLCS900h_registers_mapCodeL1.h rename to mednafen/src/ngp/TLCS-900h/TLCS900h_registers_mapCodeL1.h diff --git a/libmednahawk/src/ngp/TLCS-900h/TLCS900h_registers_mapCodeL2.h b/mednafen/src/ngp/TLCS-900h/TLCS900h_registers_mapCodeL2.h similarity index 100% rename from libmednahawk/src/ngp/TLCS-900h/TLCS900h_registers_mapCodeL2.h rename to mednafen/src/ngp/TLCS-900h/TLCS900h_registers_mapCodeL2.h diff --git a/libmednahawk/src/ngp/TLCS-900h/TLCS900h_registers_mapCodeL3.h b/mednafen/src/ngp/TLCS-900h/TLCS900h_registers_mapCodeL3.h similarity index 100% rename from libmednahawk/src/ngp/TLCS-900h/TLCS900h_registers_mapCodeL3.h rename to mednafen/src/ngp/TLCS-900h/TLCS900h_registers_mapCodeL3.h diff --git a/libmednahawk/src/ngp/TLCS-900h/TLCS900h_registers_mapCodeW0.h b/mednafen/src/ngp/TLCS-900h/TLCS900h_registers_mapCodeW0.h similarity index 100% rename from libmednahawk/src/ngp/TLCS-900h/TLCS900h_registers_mapCodeW0.h rename to mednafen/src/ngp/TLCS-900h/TLCS900h_registers_mapCodeW0.h diff --git a/libmednahawk/src/ngp/TLCS-900h/TLCS900h_registers_mapCodeW1.h b/mednafen/src/ngp/TLCS-900h/TLCS900h_registers_mapCodeW1.h similarity index 100% rename from libmednahawk/src/ngp/TLCS-900h/TLCS900h_registers_mapCodeW1.h rename to mednafen/src/ngp/TLCS-900h/TLCS900h_registers_mapCodeW1.h diff --git a/libmednahawk/src/ngp/TLCS-900h/TLCS900h_registers_mapCodeW2.h b/mednafen/src/ngp/TLCS-900h/TLCS900h_registers_mapCodeW2.h similarity index 100% rename from libmednahawk/src/ngp/TLCS-900h/TLCS900h_registers_mapCodeW2.h rename to mednafen/src/ngp/TLCS-900h/TLCS900h_registers_mapCodeW2.h diff --git a/libmednahawk/src/ngp/TLCS-900h/TLCS900h_registers_mapCodeW3.h b/mednafen/src/ngp/TLCS-900h/TLCS900h_registers_mapCodeW3.h similarity index 100% rename from libmednahawk/src/ngp/TLCS-900h/TLCS900h_registers_mapCodeW3.h rename to mednafen/src/ngp/TLCS-900h/TLCS900h_registers_mapCodeW3.h diff --git a/libmednahawk/src/ngp/TLCS-900h/TLCS900h_registers_mapL.h b/mednafen/src/ngp/TLCS-900h/TLCS900h_registers_mapL.h similarity index 100% rename from libmednahawk/src/ngp/TLCS-900h/TLCS900h_registers_mapL.h rename to mednafen/src/ngp/TLCS-900h/TLCS900h_registers_mapL.h diff --git a/libmednahawk/src/ngp/TLCS-900h/TLCS900h_registers_mapW.h b/mednafen/src/ngp/TLCS-900h/TLCS900h_registers_mapW.h similarity index 100% rename from libmednahawk/src/ngp/TLCS-900h/TLCS900h_registers_mapW.h rename to mednafen/src/ngp/TLCS-900h/TLCS900h_registers_mapW.h diff --git a/libmednahawk/src/ngp/Z80_interface.cpp b/mednafen/src/ngp/Z80_interface.cpp similarity index 100% rename from libmednahawk/src/ngp/Z80_interface.cpp rename to mednafen/src/ngp/Z80_interface.cpp diff --git a/libmednahawk/src/ngp/Z80_interface.h b/mednafen/src/ngp/Z80_interface.h similarity index 100% rename from libmednahawk/src/ngp/Z80_interface.h rename to mednafen/src/ngp/Z80_interface.h diff --git a/libmednahawk/src/ngp/bios.cpp b/mednafen/src/ngp/bios.cpp similarity index 100% rename from libmednahawk/src/ngp/bios.cpp rename to mednafen/src/ngp/bios.cpp diff --git a/libmednahawk/src/ngp/bios.h b/mednafen/src/ngp/bios.h similarity index 100% rename from libmednahawk/src/ngp/bios.h rename to mednafen/src/ngp/bios.h diff --git a/libmednahawk/src/ngp/biosHLE.cpp b/mednafen/src/ngp/biosHLE.cpp similarity index 100% rename from libmednahawk/src/ngp/biosHLE.cpp rename to mednafen/src/ngp/biosHLE.cpp diff --git a/libmednahawk/src/ngp/dma.cpp b/mednafen/src/ngp/dma.cpp similarity index 100% rename from libmednahawk/src/ngp/dma.cpp rename to mednafen/src/ngp/dma.cpp diff --git a/libmednahawk/src/ngp/dma.h b/mednafen/src/ngp/dma.h similarity index 100% rename from libmednahawk/src/ngp/dma.h rename to mednafen/src/ngp/dma.h diff --git a/libmednahawk/src/ngp/flash.cpp b/mednafen/src/ngp/flash.cpp similarity index 100% rename from libmednahawk/src/ngp/flash.cpp rename to mednafen/src/ngp/flash.cpp diff --git a/libmednahawk/src/ngp/flash.h b/mednafen/src/ngp/flash.h similarity index 100% rename from libmednahawk/src/ngp/flash.h rename to mednafen/src/ngp/flash.h diff --git a/libmednahawk/src/ngp/gfx.cpp b/mednafen/src/ngp/gfx.cpp similarity index 100% rename from libmednahawk/src/ngp/gfx.cpp rename to mednafen/src/ngp/gfx.cpp diff --git a/libmednahawk/src/ngp/gfx.h b/mednafen/src/ngp/gfx.h similarity index 100% rename from libmednahawk/src/ngp/gfx.h rename to mednafen/src/ngp/gfx.h diff --git a/libmednahawk/src/ngp/gfx_scanline_colour.cpp b/mednafen/src/ngp/gfx_scanline_colour.cpp similarity index 100% rename from libmednahawk/src/ngp/gfx_scanline_colour.cpp rename to mednafen/src/ngp/gfx_scanline_colour.cpp diff --git a/libmednahawk/src/ngp/gfx_scanline_mono.cpp b/mednafen/src/ngp/gfx_scanline_mono.cpp similarity index 100% rename from libmednahawk/src/ngp/gfx_scanline_mono.cpp rename to mednafen/src/ngp/gfx_scanline_mono.cpp diff --git a/libmednahawk/src/ngp/interrupt.cpp b/mednafen/src/ngp/interrupt.cpp similarity index 100% rename from libmednahawk/src/ngp/interrupt.cpp rename to mednafen/src/ngp/interrupt.cpp diff --git a/libmednahawk/src/ngp/interrupt.h b/mednafen/src/ngp/interrupt.h similarity index 100% rename from libmednahawk/src/ngp/interrupt.h rename to mednafen/src/ngp/interrupt.h diff --git a/libmednahawk/src/ngp/mem.cpp b/mednafen/src/ngp/mem.cpp similarity index 100% rename from libmednahawk/src/ngp/mem.cpp rename to mednafen/src/ngp/mem.cpp diff --git a/libmednahawk/src/ngp/mem.h b/mednafen/src/ngp/mem.h similarity index 100% rename from libmednahawk/src/ngp/mem.h rename to mednafen/src/ngp/mem.h diff --git a/libmednahawk/src/ngp/neopop.cpp b/mednafen/src/ngp/neopop.cpp similarity index 100% rename from libmednahawk/src/ngp/neopop.cpp rename to mednafen/src/ngp/neopop.cpp diff --git a/libmednahawk/src/ngp/neopop.h b/mednafen/src/ngp/neopop.h similarity index 100% rename from libmednahawk/src/ngp/neopop.h rename to mednafen/src/ngp/neopop.h diff --git a/libmednahawk/src/ngp/rom.cpp b/mednafen/src/ngp/rom.cpp similarity index 100% rename from libmednahawk/src/ngp/rom.cpp rename to mednafen/src/ngp/rom.cpp diff --git a/libmednahawk/src/ngp/rtc.cpp b/mednafen/src/ngp/rtc.cpp similarity index 100% rename from libmednahawk/src/ngp/rtc.cpp rename to mednafen/src/ngp/rtc.cpp diff --git a/libmednahawk/src/ngp/rtc.h b/mednafen/src/ngp/rtc.h similarity index 100% rename from libmednahawk/src/ngp/rtc.h rename to mednafen/src/ngp/rtc.h diff --git a/libmednahawk/src/ngp/sound.cpp b/mednafen/src/ngp/sound.cpp similarity index 100% rename from libmednahawk/src/ngp/sound.cpp rename to mednafen/src/ngp/sound.cpp diff --git a/libmednahawk/src/ngp/sound.h b/mednafen/src/ngp/sound.h similarity index 100% rename from libmednahawk/src/ngp/sound.h rename to mednafen/src/ngp/sound.h diff --git a/libmednahawk/src/okiadpcm-deltatable.h b/mednafen/src/okiadpcm-deltatable.h similarity index 100% rename from libmednahawk/src/okiadpcm-deltatable.h rename to mednafen/src/okiadpcm-deltatable.h diff --git a/libmednahawk/src/okiadpcm.cpp b/mednafen/src/okiadpcm.cpp similarity index 100% rename from libmednahawk/src/okiadpcm.cpp rename to mednafen/src/okiadpcm.cpp diff --git a/libmednahawk/src/okiadpcm.h b/mednafen/src/okiadpcm.h similarity index 100% rename from libmednahawk/src/okiadpcm.h rename to mednafen/src/okiadpcm.h diff --git a/libmednahawk/src/okiadpcm_generate.cpp b/mednafen/src/okiadpcm_generate.cpp similarity index 100% rename from libmednahawk/src/okiadpcm_generate.cpp rename to mednafen/src/okiadpcm_generate.cpp diff --git a/libmednahawk/src/pcfx/Makefile.am b/mednafen/src/pcfx/Makefile.am similarity index 100% rename from libmednahawk/src/pcfx/Makefile.am rename to mednafen/src/pcfx/Makefile.am diff --git a/libmednahawk/src/pcfx/Makefile.in b/mednafen/src/pcfx/Makefile.in similarity index 100% rename from libmednahawk/src/pcfx/Makefile.in rename to mednafen/src/pcfx/Makefile.in diff --git a/libmednahawk/src/pcfx/debug.cpp b/mednafen/src/pcfx/debug.cpp similarity index 100% rename from libmednahawk/src/pcfx/debug.cpp rename to mednafen/src/pcfx/debug.cpp diff --git a/libmednahawk/src/pcfx/debug.h b/mednafen/src/pcfx/debug.h similarity index 100% rename from libmednahawk/src/pcfx/debug.h rename to mednafen/src/pcfx/debug.h diff --git a/libmednahawk/src/pcfx/fxscsi.cpp b/mednafen/src/pcfx/fxscsi.cpp similarity index 100% rename from libmednahawk/src/pcfx/fxscsi.cpp rename to mednafen/src/pcfx/fxscsi.cpp diff --git a/libmednahawk/src/pcfx/fxscsi.h b/mednafen/src/pcfx/fxscsi.h similarity index 100% rename from libmednahawk/src/pcfx/fxscsi.h rename to mednafen/src/pcfx/fxscsi.h diff --git a/libmednahawk/src/pcfx/gamedb.inc b/mednafen/src/pcfx/gamedb.inc similarity index 100% rename from libmednahawk/src/pcfx/gamedb.inc rename to mednafen/src/pcfx/gamedb.inc diff --git a/libmednahawk/src/pcfx/huc6273.cpp b/mednafen/src/pcfx/huc6273.cpp similarity index 100% rename from libmednahawk/src/pcfx/huc6273.cpp rename to mednafen/src/pcfx/huc6273.cpp diff --git a/libmednahawk/src/pcfx/huc6273.h b/mednafen/src/pcfx/huc6273.h similarity index 100% rename from libmednahawk/src/pcfx/huc6273.h rename to mednafen/src/pcfx/huc6273.h diff --git a/libmednahawk/src/pcfx/input.cpp b/mednafen/src/pcfx/input.cpp similarity index 100% rename from libmednahawk/src/pcfx/input.cpp rename to mednafen/src/pcfx/input.cpp diff --git a/libmednahawk/src/pcfx/input.h b/mednafen/src/pcfx/input.h similarity index 100% rename from libmednahawk/src/pcfx/input.h rename to mednafen/src/pcfx/input.h diff --git a/libmednahawk/src/pcfx/input/gamepad.cpp b/mednafen/src/pcfx/input/gamepad.cpp similarity index 100% rename from libmednahawk/src/pcfx/input/gamepad.cpp rename to mednafen/src/pcfx/input/gamepad.cpp diff --git a/libmednahawk/src/pcfx/input/gamepad.h b/mednafen/src/pcfx/input/gamepad.h similarity index 100% rename from libmednahawk/src/pcfx/input/gamepad.h rename to mednafen/src/pcfx/input/gamepad.h diff --git a/libmednahawk/src/pcfx/input/mouse.cpp b/mednafen/src/pcfx/input/mouse.cpp similarity index 100% rename from libmednahawk/src/pcfx/input/mouse.cpp rename to mednafen/src/pcfx/input/mouse.cpp diff --git a/libmednahawk/src/pcfx/input/mouse.h b/mednafen/src/pcfx/input/mouse.h similarity index 100% rename from libmednahawk/src/pcfx/input/mouse.h rename to mednafen/src/pcfx/input/mouse.h diff --git a/libmednahawk/src/pcfx/interrupt.cpp b/mednafen/src/pcfx/interrupt.cpp similarity index 100% rename from libmednahawk/src/pcfx/interrupt.cpp rename to mednafen/src/pcfx/interrupt.cpp diff --git a/libmednahawk/src/pcfx/interrupt.h b/mednafen/src/pcfx/interrupt.h similarity index 100% rename from libmednahawk/src/pcfx/interrupt.h rename to mednafen/src/pcfx/interrupt.h diff --git a/libmednahawk/src/pcfx/io-handler.inc b/mednafen/src/pcfx/io-handler.inc similarity index 100% rename from libmednahawk/src/pcfx/io-handler.inc rename to mednafen/src/pcfx/io-handler.inc diff --git a/libmednahawk/src/pcfx/jrevdct.cpp b/mednafen/src/pcfx/jrevdct.cpp similarity index 100% rename from libmednahawk/src/pcfx/jrevdct.cpp rename to mednafen/src/pcfx/jrevdct.cpp diff --git a/libmednahawk/src/pcfx/jrevdct.h b/mednafen/src/pcfx/jrevdct.h similarity index 100% rename from libmednahawk/src/pcfx/jrevdct.h rename to mednafen/src/pcfx/jrevdct.h diff --git a/libmednahawk/src/pcfx/king-bgfast-blit.inc b/mednafen/src/pcfx/king-bgfast-blit.inc similarity index 100% rename from libmednahawk/src/pcfx/king-bgfast-blit.inc rename to mednafen/src/pcfx/king-bgfast-blit.inc diff --git a/libmednahawk/src/pcfx/king-bgfast.inc b/mednafen/src/pcfx/king-bgfast.inc similarity index 100% rename from libmednahawk/src/pcfx/king-bgfast.inc rename to mednafen/src/pcfx/king-bgfast.inc diff --git a/libmednahawk/src/pcfx/king.cpp b/mednafen/src/pcfx/king.cpp similarity index 100% rename from libmednahawk/src/pcfx/king.cpp rename to mednafen/src/pcfx/king.cpp diff --git a/libmednahawk/src/pcfx/king.h b/mednafen/src/pcfx/king.h similarity index 100% rename from libmednahawk/src/pcfx/king.h rename to mednafen/src/pcfx/king.h diff --git a/libmednahawk/src/pcfx/king_mix_body.inc b/mednafen/src/pcfx/king_mix_body.inc similarity index 100% rename from libmednahawk/src/pcfx/king_mix_body.inc rename to mednafen/src/pcfx/king_mix_body.inc diff --git a/libmednahawk/src/pcfx/mem-handler.inc b/mednafen/src/pcfx/mem-handler.inc similarity index 100% rename from libmednahawk/src/pcfx/mem-handler.inc rename to mednafen/src/pcfx/mem-handler.inc diff --git a/libmednahawk/src/pcfx/pcfx.cpp b/mednafen/src/pcfx/pcfx.cpp similarity index 100% rename from libmednahawk/src/pcfx/pcfx.cpp rename to mednafen/src/pcfx/pcfx.cpp diff --git a/libmednahawk/src/pcfx/pcfx.h b/mednafen/src/pcfx/pcfx.h similarity index 100% rename from libmednahawk/src/pcfx/pcfx.h rename to mednafen/src/pcfx/pcfx.h diff --git a/libmednahawk/src/pcfx/rainbow.cpp b/mednafen/src/pcfx/rainbow.cpp similarity index 100% rename from libmednahawk/src/pcfx/rainbow.cpp rename to mednafen/src/pcfx/rainbow.cpp diff --git a/libmednahawk/src/pcfx/rainbow.h b/mednafen/src/pcfx/rainbow.h similarity index 100% rename from libmednahawk/src/pcfx/rainbow.h rename to mednafen/src/pcfx/rainbow.h diff --git a/libmednahawk/src/pcfx/soundbox.cpp b/mednafen/src/pcfx/soundbox.cpp similarity index 100% rename from libmednahawk/src/pcfx/soundbox.cpp rename to mednafen/src/pcfx/soundbox.cpp diff --git a/libmednahawk/src/pcfx/soundbox.h b/mednafen/src/pcfx/soundbox.h similarity index 100% rename from libmednahawk/src/pcfx/soundbox.h rename to mednafen/src/pcfx/soundbox.h diff --git a/libmednahawk/src/pcfx/timer.cpp b/mednafen/src/pcfx/timer.cpp similarity index 100% rename from libmednahawk/src/pcfx/timer.cpp rename to mednafen/src/pcfx/timer.cpp diff --git a/libmednahawk/src/pcfx/timer.h b/mednafen/src/pcfx/timer.h similarity index 100% rename from libmednahawk/src/pcfx/timer.h rename to mednafen/src/pcfx/timer.h diff --git a/libmednahawk/src/player.cpp b/mednafen/src/player.cpp similarity index 100% rename from libmednahawk/src/player.cpp rename to mednafen/src/player.cpp diff --git a/libmednahawk/src/player.h b/mednafen/src/player.h similarity index 100% rename from libmednahawk/src/player.h rename to mednafen/src/player.h diff --git a/libmednahawk/src/psx/.Tpo b/mednafen/src/psx/.Tpo similarity index 100% rename from libmednahawk/src/psx/.Tpo rename to mednafen/src/psx/.Tpo diff --git a/libmednahawk/src/psx/Makefile.am b/mednafen/src/psx/Makefile.am similarity index 100% rename from libmednahawk/src/psx/Makefile.am rename to mednafen/src/psx/Makefile.am diff --git a/libmednahawk/src/psx/Makefile.in b/mednafen/src/psx/Makefile.in similarity index 100% rename from libmednahawk/src/psx/Makefile.in rename to mednafen/src/psx/Makefile.in diff --git a/libmednahawk/src/psx/NOTES b/mednafen/src/psx/NOTES similarity index 100% rename from libmednahawk/src/psx/NOTES rename to mednafen/src/psx/NOTES diff --git a/libmednahawk/src/psx/PSX-TODO b/mednafen/src/psx/PSX-TODO similarity index 100% rename from libmednahawk/src/psx/PSX-TODO rename to mednafen/src/psx/PSX-TODO diff --git a/libmednahawk/src/psx/README.NOW b/mednafen/src/psx/README.NOW similarity index 100% rename from libmednahawk/src/psx/README.NOW rename to mednafen/src/psx/README.NOW diff --git a/libmednahawk/src/psx/SOURCES b/mednafen/src/psx/SOURCES similarity index 100% rename from libmednahawk/src/psx/SOURCES rename to mednafen/src/psx/SOURCES diff --git a/libmednahawk/src/psx/cdc.cpp b/mednafen/src/psx/cdc.cpp similarity index 100% rename from libmednahawk/src/psx/cdc.cpp rename to mednafen/src/psx/cdc.cpp diff --git a/libmednahawk/src/psx/cdc.h b/mednafen/src/psx/cdc.h similarity index 100% rename from libmednahawk/src/psx/cdc.h rename to mednafen/src/psx/cdc.h diff --git a/libmednahawk/src/psx/cpu.cpp b/mednafen/src/psx/cpu.cpp similarity index 100% rename from libmednahawk/src/psx/cpu.cpp rename to mednafen/src/psx/cpu.cpp diff --git a/libmednahawk/src/psx/cpu.h b/mednafen/src/psx/cpu.h similarity index 100% rename from libmednahawk/src/psx/cpu.h rename to mednafen/src/psx/cpu.h diff --git a/libmednahawk/src/psx/debug.cpp b/mednafen/src/psx/debug.cpp similarity index 100% rename from libmednahawk/src/psx/debug.cpp rename to mednafen/src/psx/debug.cpp diff --git a/libmednahawk/src/psx/debug.h b/mednafen/src/psx/debug.h similarity index 100% rename from libmednahawk/src/psx/debug.h rename to mednafen/src/psx/debug.h diff --git a/libmednahawk/src/psx/dis.cpp b/mednafen/src/psx/dis.cpp similarity index 100% rename from libmednahawk/src/psx/dis.cpp rename to mednafen/src/psx/dis.cpp diff --git a/libmednahawk/src/psx/dis.h b/mednafen/src/psx/dis.h similarity index 100% rename from libmednahawk/src/psx/dis.h rename to mednafen/src/psx/dis.h diff --git a/libmednahawk/src/psx/dma.cpp b/mednafen/src/psx/dma.cpp similarity index 100% rename from libmednahawk/src/psx/dma.cpp rename to mednafen/src/psx/dma.cpp diff --git a/libmednahawk/src/psx/dma.h b/mednafen/src/psx/dma.h similarity index 100% rename from libmednahawk/src/psx/dma.h rename to mednafen/src/psx/dma.h diff --git a/libmednahawk/src/psx/frontio.cpp b/mednafen/src/psx/frontio.cpp similarity index 100% rename from libmednahawk/src/psx/frontio.cpp rename to mednafen/src/psx/frontio.cpp diff --git a/libmednahawk/src/psx/frontio.h b/mednafen/src/psx/frontio.h similarity index 100% rename from libmednahawk/src/psx/frontio.h rename to mednafen/src/psx/frontio.h diff --git a/libmednahawk/src/psx/gpu.cpp b/mednafen/src/psx/gpu.cpp similarity index 100% rename from libmednahawk/src/psx/gpu.cpp rename to mednafen/src/psx/gpu.cpp diff --git a/libmednahawk/src/psx/gpu.h b/mednafen/src/psx/gpu.h similarity index 100% rename from libmednahawk/src/psx/gpu.h rename to mednafen/src/psx/gpu.h diff --git a/libmednahawk/src/psx/gpu_command_table.inc b/mednafen/src/psx/gpu_command_table.inc similarity index 100% rename from libmednahawk/src/psx/gpu_command_table.inc rename to mednafen/src/psx/gpu_command_table.inc diff --git a/libmednahawk/src/psx/gpu_line.inc b/mednafen/src/psx/gpu_line.inc similarity index 100% rename from libmednahawk/src/psx/gpu_line.inc rename to mednafen/src/psx/gpu_line.inc diff --git a/libmednahawk/src/psx/gpu_polygon.inc b/mednafen/src/psx/gpu_polygon.inc similarity index 100% rename from libmednahawk/src/psx/gpu_polygon.inc rename to mednafen/src/psx/gpu_polygon.inc diff --git a/libmednahawk/src/psx/gpu_sprite.inc b/mednafen/src/psx/gpu_sprite.inc similarity index 100% rename from libmednahawk/src/psx/gpu_sprite.inc rename to mednafen/src/psx/gpu_sprite.inc diff --git a/libmednahawk/src/psx/gte.cpp b/mednafen/src/psx/gte.cpp similarity index 100% rename from libmednahawk/src/psx/gte.cpp rename to mednafen/src/psx/gte.cpp diff --git a/libmednahawk/src/psx/gte.h b/mednafen/src/psx/gte.h similarity index 100% rename from libmednahawk/src/psx/gte.h rename to mednafen/src/psx/gte.h diff --git a/libmednahawk/src/psx/gte_divrecip.inc b/mednafen/src/psx/gte_divrecip.inc similarity index 100% rename from libmednahawk/src/psx/gte_divrecip.inc rename to mednafen/src/psx/gte_divrecip.inc diff --git a/libmednahawk/src/psx/input/dualanalog.cpp b/mednafen/src/psx/input/dualanalog.cpp similarity index 100% rename from libmednahawk/src/psx/input/dualanalog.cpp rename to mednafen/src/psx/input/dualanalog.cpp diff --git a/libmednahawk/src/psx/input/dualanalog.h b/mednafen/src/psx/input/dualanalog.h similarity index 100% rename from libmednahawk/src/psx/input/dualanalog.h rename to mednafen/src/psx/input/dualanalog.h diff --git a/libmednahawk/src/psx/input/dualshock.cpp b/mednafen/src/psx/input/dualshock.cpp similarity index 100% rename from libmednahawk/src/psx/input/dualshock.cpp rename to mednafen/src/psx/input/dualshock.cpp diff --git a/libmednahawk/src/psx/input/dualshock.h b/mednafen/src/psx/input/dualshock.h similarity index 100% rename from libmednahawk/src/psx/input/dualshock.h rename to mednafen/src/psx/input/dualshock.h diff --git a/libmednahawk/src/psx/input/gamepad.cpp b/mednafen/src/psx/input/gamepad.cpp similarity index 100% rename from libmednahawk/src/psx/input/gamepad.cpp rename to mednafen/src/psx/input/gamepad.cpp diff --git a/libmednahawk/src/psx/input/gamepad.h b/mednafen/src/psx/input/gamepad.h similarity index 100% rename from libmednahawk/src/psx/input/gamepad.h rename to mednafen/src/psx/input/gamepad.h diff --git a/libmednahawk/src/psx/input/guncon.cpp b/mednafen/src/psx/input/guncon.cpp similarity index 100% rename from libmednahawk/src/psx/input/guncon.cpp rename to mednafen/src/psx/input/guncon.cpp diff --git a/libmednahawk/src/psx/input/guncon.h b/mednafen/src/psx/input/guncon.h similarity index 100% rename from libmednahawk/src/psx/input/guncon.h rename to mednafen/src/psx/input/guncon.h diff --git a/libmednahawk/src/psx/input/justifier.cpp b/mednafen/src/psx/input/justifier.cpp similarity index 100% rename from libmednahawk/src/psx/input/justifier.cpp rename to mednafen/src/psx/input/justifier.cpp diff --git a/libmednahawk/src/psx/input/justifier.h b/mednafen/src/psx/input/justifier.h similarity index 100% rename from libmednahawk/src/psx/input/justifier.h rename to mednafen/src/psx/input/justifier.h diff --git a/libmednahawk/src/psx/input/memcard.cpp b/mednafen/src/psx/input/memcard.cpp similarity index 100% rename from libmednahawk/src/psx/input/memcard.cpp rename to mednafen/src/psx/input/memcard.cpp diff --git a/libmednahawk/src/psx/input/memcard.h b/mednafen/src/psx/input/memcard.h similarity index 100% rename from libmednahawk/src/psx/input/memcard.h rename to mednafen/src/psx/input/memcard.h diff --git a/libmednahawk/src/psx/input/mouse.cpp b/mednafen/src/psx/input/mouse.cpp similarity index 100% rename from libmednahawk/src/psx/input/mouse.cpp rename to mednafen/src/psx/input/mouse.cpp diff --git a/libmednahawk/src/psx/input/mouse.h b/mednafen/src/psx/input/mouse.h similarity index 100% rename from libmednahawk/src/psx/input/mouse.h rename to mednafen/src/psx/input/mouse.h diff --git a/libmednahawk/src/psx/input/multitap.cpp b/mednafen/src/psx/input/multitap.cpp similarity index 100% rename from libmednahawk/src/psx/input/multitap.cpp rename to mednafen/src/psx/input/multitap.cpp diff --git a/libmednahawk/src/psx/input/multitap.h b/mednafen/src/psx/input/multitap.h similarity index 100% rename from libmednahawk/src/psx/input/multitap.h rename to mednafen/src/psx/input/multitap.h diff --git a/libmednahawk/src/psx/input/negcon.cpp b/mednafen/src/psx/input/negcon.cpp similarity index 100% rename from libmednahawk/src/psx/input/negcon.cpp rename to mednafen/src/psx/input/negcon.cpp diff --git a/libmednahawk/src/psx/input/negcon.h b/mednafen/src/psx/input/negcon.h similarity index 100% rename from libmednahawk/src/psx/input/negcon.h rename to mednafen/src/psx/input/negcon.h diff --git a/libmednahawk/src/psx/irq.cpp b/mednafen/src/psx/irq.cpp similarity index 100% rename from libmednahawk/src/psx/irq.cpp rename to mednafen/src/psx/irq.cpp diff --git a/libmednahawk/src/psx/irq.h b/mednafen/src/psx/irq.h similarity index 100% rename from libmednahawk/src/psx/irq.h rename to mednafen/src/psx/irq.h diff --git a/libmednahawk/src/psx/mdec.cpp b/mednafen/src/psx/mdec.cpp similarity index 100% rename from libmednahawk/src/psx/mdec.cpp rename to mednafen/src/psx/mdec.cpp diff --git a/libmednahawk/src/psx/mdec.h b/mednafen/src/psx/mdec.h similarity index 100% rename from libmednahawk/src/psx/mdec.h rename to mednafen/src/psx/mdec.h diff --git a/libmednahawk/src/psx/psx.cpp b/mednafen/src/psx/psx.cpp similarity index 100% rename from libmednahawk/src/psx/psx.cpp rename to mednafen/src/psx/psx.cpp diff --git a/libmednahawk/src/psx/psx.h b/mednafen/src/psx/psx.h similarity index 100% rename from libmednahawk/src/psx/psx.h rename to mednafen/src/psx/psx.h diff --git a/libmednahawk/src/psx/sio.cpp b/mednafen/src/psx/sio.cpp similarity index 100% rename from libmednahawk/src/psx/sio.cpp rename to mednafen/src/psx/sio.cpp diff --git a/libmednahawk/src/psx/sio.h b/mednafen/src/psx/sio.h similarity index 100% rename from libmednahawk/src/psx/sio.h rename to mednafen/src/psx/sio.h diff --git a/libmednahawk/src/psx/spu.cpp b/mednafen/src/psx/spu.cpp similarity index 100% rename from libmednahawk/src/psx/spu.cpp rename to mednafen/src/psx/spu.cpp diff --git a/libmednahawk/src/psx/spu.h b/mednafen/src/psx/spu.h similarity index 100% rename from libmednahawk/src/psx/spu.h rename to mednafen/src/psx/spu.h diff --git a/libmednahawk/src/psx/spu_fir_table.inc b/mednafen/src/psx/spu_fir_table.inc similarity index 100% rename from libmednahawk/src/psx/spu_fir_table.inc rename to mednafen/src/psx/spu_fir_table.inc diff --git a/libmednahawk/src/psx/spu_nft.inc b/mednafen/src/psx/spu_nft.inc similarity index 100% rename from libmednahawk/src/psx/spu_nft.inc rename to mednafen/src/psx/spu_nft.inc diff --git a/libmednahawk/src/psx/spu_reverb.inc b/mednafen/src/psx/spu_reverb.inc similarity index 100% rename from libmednahawk/src/psx/spu_reverb.inc rename to mednafen/src/psx/spu_reverb.inc diff --git a/libmednahawk/src/psx/spu_xa.inc b/mednafen/src/psx/spu_xa.inc similarity index 100% rename from libmednahawk/src/psx/spu_xa.inc rename to mednafen/src/psx/spu_xa.inc diff --git a/libmednahawk/src/psx/timer.cpp b/mednafen/src/psx/timer.cpp similarity index 100% rename from libmednahawk/src/psx/timer.cpp rename to mednafen/src/psx/timer.cpp diff --git a/libmednahawk/src/psx/timer.h b/mednafen/src/psx/timer.h similarity index 100% rename from libmednahawk/src/psx/timer.h rename to mednafen/src/psx/timer.h diff --git a/libmednahawk/src/qtrecord.cpp b/mednafen/src/qtrecord.cpp similarity index 100% rename from libmednahawk/src/qtrecord.cpp rename to mednafen/src/qtrecord.cpp diff --git a/libmednahawk/src/qtrecord.h b/mednafen/src/qtrecord.h similarity index 100% rename from libmednahawk/src/qtrecord.h rename to mednafen/src/qtrecord.h diff --git a/libmednahawk/src/resampler/Makefile.am.inc b/mednafen/src/resampler/Makefile.am.inc similarity index 100% rename from libmednahawk/src/resampler/Makefile.am.inc rename to mednafen/src/resampler/Makefile.am.inc diff --git a/libmednahawk/src/resampler/arch.h b/mednafen/src/resampler/arch.h similarity index 100% rename from libmednahawk/src/resampler/arch.h rename to mednafen/src/resampler/arch.h diff --git a/libmednahawk/src/resampler/fixed_generic.h b/mednafen/src/resampler/fixed_generic.h similarity index 100% rename from libmednahawk/src/resampler/fixed_generic.h rename to mednafen/src/resampler/fixed_generic.h diff --git a/libmednahawk/src/resampler/resample.c b/mednafen/src/resampler/resample.c similarity index 100% rename from libmednahawk/src/resampler/resample.c rename to mednafen/src/resampler/resample.c diff --git a/libmednahawk/src/resampler/resample_sse.h b/mednafen/src/resampler/resample_sse.h similarity index 100% rename from libmednahawk/src/resampler/resample_sse.h rename to mednafen/src/resampler/resample_sse.h diff --git a/libmednahawk/src/resampler/resampler.h b/mednafen/src/resampler/resampler.h similarity index 100% rename from libmednahawk/src/resampler/resampler.h rename to mednafen/src/resampler/resampler.h diff --git a/libmednahawk/src/resampler/stack_alloc.h b/mednafen/src/resampler/stack_alloc.h similarity index 100% rename from libmednahawk/src/resampler/stack_alloc.h rename to mednafen/src/resampler/stack_alloc.h diff --git a/libmednahawk/src/settings-common.h b/mednafen/src/settings-common.h similarity index 100% rename from libmednahawk/src/settings-common.h rename to mednafen/src/settings-common.h diff --git a/libmednahawk/src/settings-driver.h b/mednafen/src/settings-driver.h similarity index 100% rename from libmednahawk/src/settings-driver.h rename to mednafen/src/settings-driver.h diff --git a/libmednahawk/src/settings.cpp b/mednafen/src/settings.cpp similarity index 100% rename from libmednahawk/src/settings.cpp rename to mednafen/src/settings.cpp diff --git a/libmednahawk/src/settings.h b/mednafen/src/settings.h similarity index 100% rename from libmednahawk/src/settings.h rename to mednafen/src/settings.h diff --git a/libmednahawk/src/sexyal/COPYING b/mednafen/src/sexyal/COPYING similarity index 100% rename from libmednahawk/src/sexyal/COPYING rename to mednafen/src/sexyal/COPYING diff --git a/libmednahawk/src/sexyal/Makefile.am b/mednafen/src/sexyal/Makefile.am similarity index 100% rename from libmednahawk/src/sexyal/Makefile.am rename to mednafen/src/sexyal/Makefile.am diff --git a/libmednahawk/src/sexyal/Makefile.in b/mednafen/src/sexyal/Makefile.in similarity index 100% rename from libmednahawk/src/sexyal/Makefile.in rename to mednafen/src/sexyal/Makefile.in diff --git a/libmednahawk/src/sexyal/README b/mednafen/src/sexyal/README similarity index 100% rename from libmednahawk/src/sexyal/README rename to mednafen/src/sexyal/README diff --git a/libmednahawk/src/sexyal/convert.cpp b/mednafen/src/sexyal/convert.cpp similarity index 100% rename from libmednahawk/src/sexyal/convert.cpp rename to mednafen/src/sexyal/convert.cpp diff --git a/libmednahawk/src/sexyal/convert.h b/mednafen/src/sexyal/convert.h similarity index 100% rename from libmednahawk/src/sexyal/convert.h rename to mednafen/src/sexyal/convert.h diff --git a/libmednahawk/src/sexyal/drivers/alsa.cpp b/mednafen/src/sexyal/drivers/alsa.cpp similarity index 100% rename from libmednahawk/src/sexyal/drivers/alsa.cpp rename to mednafen/src/sexyal/drivers/alsa.cpp diff --git a/libmednahawk/src/sexyal/drivers/dsound.cpp b/mednafen/src/sexyal/drivers/dsound.cpp similarity index 100% rename from libmednahawk/src/sexyal/drivers/dsound.cpp rename to mednafen/src/sexyal/drivers/dsound.cpp diff --git a/libmednahawk/src/sexyal/drivers/dummy.cpp b/mednafen/src/sexyal/drivers/dummy.cpp similarity index 100% rename from libmednahawk/src/sexyal/drivers/dummy.cpp rename to mednafen/src/sexyal/drivers/dummy.cpp diff --git a/libmednahawk/src/sexyal/drivers/jack.cpp b/mednafen/src/sexyal/drivers/jack.cpp similarity index 100% rename from libmednahawk/src/sexyal/drivers/jack.cpp rename to mednafen/src/sexyal/drivers/jack.cpp diff --git a/libmednahawk/src/sexyal/drivers/oss.cpp b/mednafen/src/sexyal/drivers/oss.cpp similarity index 100% rename from libmednahawk/src/sexyal/drivers/oss.cpp rename to mednafen/src/sexyal/drivers/oss.cpp diff --git a/libmednahawk/src/sexyal/drivers/sdl.cpp b/mednafen/src/sexyal/drivers/sdl.cpp similarity index 100% rename from libmednahawk/src/sexyal/drivers/sdl.cpp rename to mednafen/src/sexyal/drivers/sdl.cpp diff --git a/libmednahawk/src/sexyal/sexyal.cpp b/mednafen/src/sexyal/sexyal.cpp similarity index 100% rename from libmednahawk/src/sexyal/sexyal.cpp rename to mednafen/src/sexyal/sexyal.cpp diff --git a/libmednahawk/src/sexyal/sexyal.h b/mednafen/src/sexyal/sexyal.h similarity index 100% rename from libmednahawk/src/sexyal/sexyal.h rename to mednafen/src/sexyal/sexyal.h diff --git a/libmednahawk/src/sound.h b/mednafen/src/sound.h similarity index 100% rename from libmednahawk/src/sound.h rename to mednafen/src/sound.h diff --git a/libmednahawk/src/sound/Blip_Buffer.cpp b/mednafen/src/sound/Blip_Buffer.cpp similarity index 100% rename from libmednahawk/src/sound/Blip_Buffer.cpp rename to mednafen/src/sound/Blip_Buffer.cpp diff --git a/libmednahawk/src/sound/Fir_Resampler.cpp b/mednafen/src/sound/Fir_Resampler.cpp similarity index 100% rename from libmednahawk/src/sound/Fir_Resampler.cpp rename to mednafen/src/sound/Fir_Resampler.cpp diff --git a/libmednahawk/src/sound/Makefile.am b/mednafen/src/sound/Makefile.am similarity index 100% rename from libmednahawk/src/sound/Makefile.am rename to mednafen/src/sound/Makefile.am diff --git a/libmednahawk/src/sound/Makefile.in b/mednafen/src/sound/Makefile.in similarity index 100% rename from libmednahawk/src/sound/Makefile.in rename to mednafen/src/sound/Makefile.in diff --git a/libmednahawk/src/sound/Stereo_Buffer.cpp b/mednafen/src/sound/Stereo_Buffer.cpp similarity index 100% rename from libmednahawk/src/sound/Stereo_Buffer.cpp rename to mednafen/src/sound/Stereo_Buffer.cpp diff --git a/libmednahawk/src/sound/WAVRecord.cpp b/mednafen/src/sound/WAVRecord.cpp similarity index 100% rename from libmednahawk/src/sound/WAVRecord.cpp rename to mednafen/src/sound/WAVRecord.cpp diff --git a/libmednahawk/src/sound/WAVRecord.h b/mednafen/src/sound/WAVRecord.h similarity index 100% rename from libmednahawk/src/sound/WAVRecord.h rename to mednafen/src/sound/WAVRecord.h diff --git a/libmednahawk/src/sound/sound.cpp b/mednafen/src/sound/sound.cpp similarity index 100% rename from libmednahawk/src/sound/sound.cpp rename to mednafen/src/sound/sound.cpp diff --git a/libmednahawk/src/state-common.h b/mednafen/src/state-common.h similarity index 100% rename from libmednahawk/src/state-common.h rename to mednafen/src/state-common.h diff --git a/libmednahawk/src/state-driver.h b/mednafen/src/state-driver.h similarity index 100% rename from libmednahawk/src/state-driver.h rename to mednafen/src/state-driver.h diff --git a/libmednahawk/src/state.cpp b/mednafen/src/state.cpp similarity index 100% rename from libmednahawk/src/state.cpp rename to mednafen/src/state.cpp diff --git a/libmednahawk/src/state.h b/mednafen/src/state.h similarity index 100% rename from libmednahawk/src/state.h rename to mednafen/src/state.h diff --git a/libmednahawk/src/string/ConvertUTF.cpp b/mednafen/src/string/ConvertUTF.cpp similarity index 100% rename from libmednahawk/src/string/ConvertUTF.cpp rename to mednafen/src/string/ConvertUTF.cpp diff --git a/libmednahawk/src/string/ConvertUTF.h b/mednafen/src/string/ConvertUTF.h similarity index 100% rename from libmednahawk/src/string/ConvertUTF.h rename to mednafen/src/string/ConvertUTF.h diff --git a/libmednahawk/src/string/Makefile.am.inc b/mednafen/src/string/Makefile.am.inc similarity index 100% rename from libmednahawk/src/string/Makefile.am.inc rename to mednafen/src/string/Makefile.am.inc diff --git a/libmednahawk/src/string/escape.cpp b/mednafen/src/string/escape.cpp similarity index 100% rename from libmednahawk/src/string/escape.cpp rename to mednafen/src/string/escape.cpp diff --git a/libmednahawk/src/string/escape.h b/mednafen/src/string/escape.h similarity index 100% rename from libmednahawk/src/string/escape.h rename to mednafen/src/string/escape.h diff --git a/libmednahawk/src/string/world_strtod.c b/mednafen/src/string/world_strtod.c similarity index 100% rename from libmednahawk/src/string/world_strtod.c rename to mednafen/src/string/world_strtod.c diff --git a/libmednahawk/src/string/world_strtod.h b/mednafen/src/string/world_strtod.h similarity index 100% rename from libmednahawk/src/string/world_strtod.h rename to mednafen/src/string/world_strtod.h diff --git a/libmednahawk/src/tests.cpp b/mednafen/src/tests.cpp similarity index 100% rename from libmednahawk/src/tests.cpp rename to mednafen/src/tests.cpp diff --git a/libmednahawk/src/tests.h b/mednafen/src/tests.h similarity index 100% rename from libmednahawk/src/tests.h rename to mednafen/src/tests.h diff --git a/libmednahawk/src/tremor/!!!VERSION b/mednafen/src/tremor/!!!VERSION similarity index 100% rename from libmednahawk/src/tremor/!!!VERSION rename to mednafen/src/tremor/!!!VERSION diff --git a/libmednahawk/src/tremor/CHANGELOG b/mednafen/src/tremor/CHANGELOG similarity index 100% rename from libmednahawk/src/tremor/CHANGELOG rename to mednafen/src/tremor/CHANGELOG diff --git a/libmednahawk/src/tremor/COPYING b/mednafen/src/tremor/COPYING similarity index 100% rename from libmednahawk/src/tremor/COPYING rename to mednafen/src/tremor/COPYING diff --git a/libmednahawk/src/tremor/Makefile.am b/mednafen/src/tremor/Makefile.am similarity index 100% rename from libmednahawk/src/tremor/Makefile.am rename to mednafen/src/tremor/Makefile.am diff --git a/libmednahawk/src/tremor/Makefile.in b/mednafen/src/tremor/Makefile.in similarity index 100% rename from libmednahawk/src/tremor/Makefile.in rename to mednafen/src/tremor/Makefile.in diff --git a/libmednahawk/src/tremor/README b/mednafen/src/tremor/README similarity index 100% rename from libmednahawk/src/tremor/README rename to mednafen/src/tremor/README diff --git a/libmednahawk/src/tremor/Version_script.in b/mednafen/src/tremor/Version_script.in similarity index 100% rename from libmednahawk/src/tremor/Version_script.in rename to mednafen/src/tremor/Version_script.in diff --git a/libmednahawk/src/tremor/asm_arm.h b/mednafen/src/tremor/asm_arm.h similarity index 100% rename from libmednahawk/src/tremor/asm_arm.h rename to mednafen/src/tremor/asm_arm.h diff --git a/libmednahawk/src/tremor/backends.h b/mednafen/src/tremor/backends.h similarity index 100% rename from libmednahawk/src/tremor/backends.h rename to mednafen/src/tremor/backends.h diff --git a/libmednahawk/src/tremor/bitwise.c b/mednafen/src/tremor/bitwise.c similarity index 100% rename from libmednahawk/src/tremor/bitwise.c rename to mednafen/src/tremor/bitwise.c diff --git a/libmednahawk/src/tremor/block.c b/mednafen/src/tremor/block.c similarity index 100% rename from libmednahawk/src/tremor/block.c rename to mednafen/src/tremor/block.c diff --git a/libmednahawk/src/tremor/block.h b/mednafen/src/tremor/block.h similarity index 100% rename from libmednahawk/src/tremor/block.h rename to mednafen/src/tremor/block.h diff --git a/libmednahawk/src/tremor/codebook.c b/mednafen/src/tremor/codebook.c similarity index 100% rename from libmednahawk/src/tremor/codebook.c rename to mednafen/src/tremor/codebook.c diff --git a/libmednahawk/src/tremor/codebook.h b/mednafen/src/tremor/codebook.h similarity index 100% rename from libmednahawk/src/tremor/codebook.h rename to mednafen/src/tremor/codebook.h diff --git a/libmednahawk/src/tremor/codec_internal.h b/mednafen/src/tremor/codec_internal.h similarity index 100% rename from libmednahawk/src/tremor/codec_internal.h rename to mednafen/src/tremor/codec_internal.h diff --git a/libmednahawk/src/tremor/config_types.h b/mednafen/src/tremor/config_types.h similarity index 100% rename from libmednahawk/src/tremor/config_types.h rename to mednafen/src/tremor/config_types.h diff --git a/libmednahawk/src/tremor/configure.in b/mednafen/src/tremor/configure.in similarity index 100% rename from libmednahawk/src/tremor/configure.in rename to mednafen/src/tremor/configure.in diff --git a/libmednahawk/src/tremor/floor0.c b/mednafen/src/tremor/floor0.c similarity index 100% rename from libmednahawk/src/tremor/floor0.c rename to mednafen/src/tremor/floor0.c diff --git a/libmednahawk/src/tremor/floor1.c b/mednafen/src/tremor/floor1.c similarity index 100% rename from libmednahawk/src/tremor/floor1.c rename to mednafen/src/tremor/floor1.c diff --git a/libmednahawk/src/tremor/framing.c b/mednafen/src/tremor/framing.c similarity index 100% rename from libmednahawk/src/tremor/framing.c rename to mednafen/src/tremor/framing.c diff --git a/libmednahawk/src/tremor/info.c b/mednafen/src/tremor/info.c similarity index 100% rename from libmednahawk/src/tremor/info.c rename to mednafen/src/tremor/info.c diff --git a/libmednahawk/src/tremor/iseeking_example.c b/mednafen/src/tremor/iseeking_example.c similarity index 100% rename from libmednahawk/src/tremor/iseeking_example.c rename to mednafen/src/tremor/iseeking_example.c diff --git a/libmednahawk/src/tremor/ivorbiscodec.h b/mednafen/src/tremor/ivorbiscodec.h similarity index 100% rename from libmednahawk/src/tremor/ivorbiscodec.h rename to mednafen/src/tremor/ivorbiscodec.h diff --git a/libmednahawk/src/tremor/ivorbisfile.h b/mednafen/src/tremor/ivorbisfile.h similarity index 100% rename from libmednahawk/src/tremor/ivorbisfile.h rename to mednafen/src/tremor/ivorbisfile.h diff --git a/libmednahawk/src/tremor/ivorbisfile_example.c b/mednafen/src/tremor/ivorbisfile_example.c similarity index 100% rename from libmednahawk/src/tremor/ivorbisfile_example.c rename to mednafen/src/tremor/ivorbisfile_example.c diff --git a/libmednahawk/src/tremor/lsp_lookup.h b/mednafen/src/tremor/lsp_lookup.h similarity index 100% rename from libmednahawk/src/tremor/lsp_lookup.h rename to mednafen/src/tremor/lsp_lookup.h diff --git a/libmednahawk/src/tremor/mapping0.c b/mednafen/src/tremor/mapping0.c similarity index 100% rename from libmednahawk/src/tremor/mapping0.c rename to mednafen/src/tremor/mapping0.c diff --git a/libmednahawk/src/tremor/mdct.c b/mednafen/src/tremor/mdct.c similarity index 100% rename from libmednahawk/src/tremor/mdct.c rename to mednafen/src/tremor/mdct.c diff --git a/libmednahawk/src/tremor/mdct.h b/mednafen/src/tremor/mdct.h similarity index 100% rename from libmednahawk/src/tremor/mdct.h rename to mednafen/src/tremor/mdct.h diff --git a/libmednahawk/src/tremor/mdct_lookup.h b/mednafen/src/tremor/mdct_lookup.h similarity index 100% rename from libmednahawk/src/tremor/mdct_lookup.h rename to mednafen/src/tremor/mdct_lookup.h diff --git a/libmednahawk/src/tremor/misc.h b/mednafen/src/tremor/misc.h similarity index 100% rename from libmednahawk/src/tremor/misc.h rename to mednafen/src/tremor/misc.h diff --git a/libmednahawk/src/tremor/ogg.h b/mednafen/src/tremor/ogg.h similarity index 100% rename from libmednahawk/src/tremor/ogg.h rename to mednafen/src/tremor/ogg.h diff --git a/libmednahawk/src/tremor/os.h b/mednafen/src/tremor/os.h similarity index 100% rename from libmednahawk/src/tremor/os.h rename to mednafen/src/tremor/os.h diff --git a/libmednahawk/src/tremor/os_types.h b/mednafen/src/tremor/os_types.h similarity index 100% rename from libmednahawk/src/tremor/os_types.h rename to mednafen/src/tremor/os_types.h diff --git a/libmednahawk/src/tremor/registry.c b/mednafen/src/tremor/registry.c similarity index 100% rename from libmednahawk/src/tremor/registry.c rename to mednafen/src/tremor/registry.c diff --git a/libmednahawk/src/tremor/registry.h b/mednafen/src/tremor/registry.h similarity index 100% rename from libmednahawk/src/tremor/registry.h rename to mednafen/src/tremor/registry.h diff --git a/libmednahawk/src/tremor/res012.c b/mednafen/src/tremor/res012.c similarity index 100% rename from libmednahawk/src/tremor/res012.c rename to mednafen/src/tremor/res012.c diff --git a/libmednahawk/src/tremor/sharedbook.c b/mednafen/src/tremor/sharedbook.c similarity index 100% rename from libmednahawk/src/tremor/sharedbook.c rename to mednafen/src/tremor/sharedbook.c diff --git a/libmednahawk/src/tremor/synthesis.c b/mednafen/src/tremor/synthesis.c similarity index 100% rename from libmednahawk/src/tremor/synthesis.c rename to mednafen/src/tremor/synthesis.c diff --git a/libmednahawk/src/tremor/vorbisfile.c b/mednafen/src/tremor/vorbisfile.c similarity index 100% rename from libmednahawk/src/tremor/vorbisfile.c rename to mednafen/src/tremor/vorbisfile.c diff --git a/libmednahawk/src/tremor/vorbisidec.pc.in b/mednafen/src/tremor/vorbisidec.pc.in similarity index 100% rename from libmednahawk/src/tremor/vorbisidec.pc.in rename to mednafen/src/tremor/vorbisidec.pc.in diff --git a/libmednahawk/src/tremor/window.c b/mednafen/src/tremor/window.c similarity index 100% rename from libmednahawk/src/tremor/window.c rename to mednafen/src/tremor/window.c diff --git a/libmednahawk/src/tremor/window.h b/mednafen/src/tremor/window.h similarity index 100% rename from libmednahawk/src/tremor/window.h rename to mednafen/src/tremor/window.h diff --git a/libmednahawk/src/tremor/window_lookup.h b/mednafen/src/tremor/window_lookup.h similarity index 100% rename from libmednahawk/src/tremor/window_lookup.h rename to mednafen/src/tremor/window_lookup.h diff --git a/libmednahawk/src/trio/CHANGES b/mednafen/src/trio/CHANGES similarity index 100% rename from libmednahawk/src/trio/CHANGES rename to mednafen/src/trio/CHANGES diff --git a/libmednahawk/src/trio/Makefile.am b/mednafen/src/trio/Makefile.am similarity index 100% rename from libmednahawk/src/trio/Makefile.am rename to mednafen/src/trio/Makefile.am diff --git a/libmednahawk/src/trio/Makefile.in b/mednafen/src/trio/Makefile.in similarity index 100% rename from libmednahawk/src/trio/Makefile.in rename to mednafen/src/trio/Makefile.in diff --git a/libmednahawk/src/trio/trio.c b/mednafen/src/trio/trio.c similarity index 100% rename from libmednahawk/src/trio/trio.c rename to mednafen/src/trio/trio.c diff --git a/libmednahawk/src/trio/trionan.c b/mednafen/src/trio/trionan.c similarity index 100% rename from libmednahawk/src/trio/trionan.c rename to mednafen/src/trio/trionan.c diff --git a/libmednahawk/src/trio/triostr.c b/mednafen/src/trio/triostr.c similarity index 100% rename from libmednahawk/src/trio/triostr.c rename to mednafen/src/trio/triostr.c diff --git a/libmednahawk/src/types.h b/mednafen/src/types.h similarity index 100% rename from libmednahawk/src/types.h rename to mednafen/src/types.h diff --git a/libmednahawk/src/vb/Makefile.am b/mednafen/src/vb/Makefile.am similarity index 100% rename from libmednahawk/src/vb/Makefile.am rename to mednafen/src/vb/Makefile.am diff --git a/libmednahawk/src/vb/Makefile.in b/mednafen/src/vb/Makefile.in similarity index 100% rename from libmednahawk/src/vb/Makefile.in rename to mednafen/src/vb/Makefile.in diff --git a/libmednahawk/src/vb/debug.cpp b/mednafen/src/vb/debug.cpp similarity index 100% rename from libmednahawk/src/vb/debug.cpp rename to mednafen/src/vb/debug.cpp diff --git a/libmednahawk/src/vb/debug.h b/mednafen/src/vb/debug.h similarity index 100% rename from libmednahawk/src/vb/debug.h rename to mednafen/src/vb/debug.h diff --git a/libmednahawk/src/vb/input.cpp b/mednafen/src/vb/input.cpp similarity index 100% rename from libmednahawk/src/vb/input.cpp rename to mednafen/src/vb/input.cpp diff --git a/libmednahawk/src/vb/input.h b/mednafen/src/vb/input.h similarity index 100% rename from libmednahawk/src/vb/input.h rename to mednafen/src/vb/input.h diff --git a/libmednahawk/src/vb/timer.cpp b/mednafen/src/vb/timer.cpp similarity index 100% rename from libmednahawk/src/vb/timer.cpp rename to mednafen/src/vb/timer.cpp diff --git a/libmednahawk/src/vb/timer.h b/mednafen/src/vb/timer.h similarity index 100% rename from libmednahawk/src/vb/timer.h rename to mednafen/src/vb/timer.h diff --git a/libmednahawk/src/vb/vb.cpp b/mednafen/src/vb/vb.cpp similarity index 100% rename from libmednahawk/src/vb/vb.cpp rename to mednafen/src/vb/vb.cpp diff --git a/libmednahawk/src/vb/vb.h b/mednafen/src/vb/vb.h similarity index 100% rename from libmednahawk/src/vb/vb.h rename to mednafen/src/vb/vb.h diff --git a/libmednahawk/src/vb/vip.cpp b/mednafen/src/vb/vip.cpp similarity index 100% rename from libmednahawk/src/vb/vip.cpp rename to mednafen/src/vb/vip.cpp diff --git a/libmednahawk/src/vb/vip.h b/mednafen/src/vb/vip.h similarity index 100% rename from libmednahawk/src/vb/vip.h rename to mednafen/src/vb/vip.h diff --git a/libmednahawk/src/vb/vip_draw.inc b/mednafen/src/vb/vip_draw.inc similarity index 100% rename from libmednahawk/src/vb/vip_draw.inc rename to mednafen/src/vb/vip_draw.inc diff --git a/libmednahawk/src/vb/vsu.cpp b/mednafen/src/vb/vsu.cpp similarity index 100% rename from libmednahawk/src/vb/vsu.cpp rename to mednafen/src/vb/vsu.cpp diff --git a/libmednahawk/src/vb/vsu.h b/mednafen/src/vb/vsu.h similarity index 100% rename from libmednahawk/src/vb/vsu.h rename to mednafen/src/vb/vsu.h diff --git a/libmednahawk/src/video-driver.h b/mednafen/src/video-driver.h similarity index 100% rename from libmednahawk/src/video-driver.h rename to mednafen/src/video-driver.h diff --git a/libmednahawk/src/video.h b/mednafen/src/video.h similarity index 100% rename from libmednahawk/src/video.h rename to mednafen/src/video.h diff --git a/libmednahawk/src/video/Deinterlacer.cpp b/mednafen/src/video/Deinterlacer.cpp similarity index 100% rename from libmednahawk/src/video/Deinterlacer.cpp rename to mednafen/src/video/Deinterlacer.cpp diff --git a/libmednahawk/src/video/Deinterlacer.h b/mednafen/src/video/Deinterlacer.h similarity index 100% rename from libmednahawk/src/video/Deinterlacer.h rename to mednafen/src/video/Deinterlacer.h diff --git a/libmednahawk/src/video/Makefile.am.inc b/mednafen/src/video/Makefile.am.inc similarity index 100% rename from libmednahawk/src/video/Makefile.am.inc rename to mednafen/src/video/Makefile.am.inc diff --git a/libmednahawk/src/video/font-data-12x13.c b/mednafen/src/video/font-data-12x13.c similarity index 100% rename from libmednahawk/src/video/font-data-12x13.c rename to mednafen/src/video/font-data-12x13.c diff --git a/libmednahawk/src/video/font-data-18x18.c b/mednafen/src/video/font-data-18x18.c similarity index 100% rename from libmednahawk/src/video/font-data-18x18.c rename to mednafen/src/video/font-data-18x18.c diff --git a/libmednahawk/src/video/font-data.cpp b/mednafen/src/video/font-data.cpp similarity index 100% rename from libmednahawk/src/video/font-data.cpp rename to mednafen/src/video/font-data.cpp diff --git a/libmednahawk/src/video/font-data.h b/mednafen/src/video/font-data.h similarity index 100% rename from libmednahawk/src/video/font-data.h rename to mednafen/src/video/font-data.h diff --git a/libmednahawk/src/video/font12x13.h b/mednafen/src/video/font12x13.h similarity index 100% rename from libmednahawk/src/video/font12x13.h rename to mednafen/src/video/font12x13.h diff --git a/libmednahawk/src/video/font18x18.h b/mednafen/src/video/font18x18.h similarity index 100% rename from libmednahawk/src/video/font18x18.h rename to mednafen/src/video/font18x18.h diff --git a/libmednahawk/src/video/font4x5.h b/mednafen/src/video/font4x5.h similarity index 100% rename from libmednahawk/src/video/font4x5.h rename to mednafen/src/video/font4x5.h diff --git a/libmednahawk/src/video/font5x7.h b/mednafen/src/video/font5x7.h similarity index 100% rename from libmednahawk/src/video/font5x7.h rename to mednafen/src/video/font5x7.h diff --git a/libmednahawk/src/video/font6x13.h b/mednafen/src/video/font6x13.h similarity index 100% rename from libmednahawk/src/video/font6x13.h rename to mednafen/src/video/font6x13.h diff --git a/libmednahawk/src/video/font9x18.h b/mednafen/src/video/font9x18.h similarity index 100% rename from libmednahawk/src/video/font9x18.h rename to mednafen/src/video/font9x18.h diff --git a/libmednahawk/src/video/png.cpp b/mednafen/src/video/png.cpp similarity index 100% rename from libmednahawk/src/video/png.cpp rename to mednafen/src/video/png.cpp diff --git a/libmednahawk/src/video/png.h b/mednafen/src/video/png.h similarity index 100% rename from libmednahawk/src/video/png.h rename to mednafen/src/video/png.h diff --git a/libmednahawk/src/video/primitives.cpp b/mednafen/src/video/primitives.cpp similarity index 100% rename from libmednahawk/src/video/primitives.cpp rename to mednafen/src/video/primitives.cpp diff --git a/libmednahawk/src/video/primitives.h b/mednafen/src/video/primitives.h similarity index 100% rename from libmednahawk/src/video/primitives.h rename to mednafen/src/video/primitives.h diff --git a/libmednahawk/src/video/resize.cpp b/mednafen/src/video/resize.cpp similarity index 100% rename from libmednahawk/src/video/resize.cpp rename to mednafen/src/video/resize.cpp diff --git a/libmednahawk/src/video/resize.h b/mednafen/src/video/resize.h similarity index 100% rename from libmednahawk/src/video/resize.h rename to mednafen/src/video/resize.h diff --git a/libmednahawk/src/video/selblur.cpp b/mednafen/src/video/selblur.cpp similarity index 100% rename from libmednahawk/src/video/selblur.cpp rename to mednafen/src/video/selblur.cpp diff --git a/libmednahawk/src/video/selblur.h b/mednafen/src/video/selblur.h similarity index 100% rename from libmednahawk/src/video/selblur.h rename to mednafen/src/video/selblur.h diff --git a/libmednahawk/src/video/surface.cpp b/mednafen/src/video/surface.cpp similarity index 100% rename from libmednahawk/src/video/surface.cpp rename to mednafen/src/video/surface.cpp diff --git a/libmednahawk/src/video/surface.h b/mednafen/src/video/surface.h similarity index 100% rename from libmednahawk/src/video/surface.h rename to mednafen/src/video/surface.h diff --git a/libmednahawk/src/video/tblur.cpp b/mednafen/src/video/tblur.cpp similarity index 100% rename from libmednahawk/src/video/tblur.cpp rename to mednafen/src/video/tblur.cpp diff --git a/libmednahawk/src/video/tblur.h b/mednafen/src/video/tblur.h similarity index 100% rename from libmednahawk/src/video/tblur.h rename to mednafen/src/video/tblur.h diff --git a/libmednahawk/src/video/text.cpp b/mednafen/src/video/text.cpp similarity index 100% rename from libmednahawk/src/video/text.cpp rename to mednafen/src/video/text.cpp diff --git a/libmednahawk/src/video/text.h b/mednafen/src/video/text.h similarity index 100% rename from libmednahawk/src/video/text.h rename to mednafen/src/video/text.h diff --git a/libmednahawk/src/video/video-common.h b/mednafen/src/video/video-common.h similarity index 100% rename from libmednahawk/src/video/video-common.h rename to mednafen/src/video/video-common.h diff --git a/libmednahawk/src/video/video.cpp b/mednafen/src/video/video.cpp similarity index 100% rename from libmednahawk/src/video/video.cpp rename to mednafen/src/video/video.cpp diff --git a/libmednahawk/src/wswan/Makefile.am b/mednafen/src/wswan/Makefile.am similarity index 100% rename from libmednahawk/src/wswan/Makefile.am rename to mednafen/src/wswan/Makefile.am diff --git a/libmednahawk/src/wswan/Makefile.in b/mednafen/src/wswan/Makefile.in similarity index 100% rename from libmednahawk/src/wswan/Makefile.in rename to mednafen/src/wswan/Makefile.in diff --git a/libmednahawk/src/wswan/debug.cpp b/mednafen/src/wswan/debug.cpp similarity index 100% rename from libmednahawk/src/wswan/debug.cpp rename to mednafen/src/wswan/debug.cpp diff --git a/libmednahawk/src/wswan/debug.h b/mednafen/src/wswan/debug.h similarity index 100% rename from libmednahawk/src/wswan/debug.h rename to mednafen/src/wswan/debug.h diff --git a/libmednahawk/src/wswan/dis/dis_decode.cpp b/mednafen/src/wswan/dis/dis_decode.cpp similarity index 100% rename from libmednahawk/src/wswan/dis/dis_decode.cpp rename to mednafen/src/wswan/dis/dis_decode.cpp diff --git a/libmednahawk/src/wswan/dis/dis_groups.cpp b/mednafen/src/wswan/dis/dis_groups.cpp similarity index 100% rename from libmednahawk/src/wswan/dis/dis_groups.cpp rename to mednafen/src/wswan/dis/dis_groups.cpp diff --git a/libmednahawk/src/wswan/dis/dis_tables.h b/mednafen/src/wswan/dis/dis_tables.h similarity index 100% rename from libmednahawk/src/wswan/dis/dis_tables.h rename to mednafen/src/wswan/dis/dis_tables.h diff --git a/libmednahawk/src/wswan/dis/dis_tables.inc b/mednafen/src/wswan/dis/dis_tables.inc similarity index 100% rename from libmednahawk/src/wswan/dis/dis_tables.inc rename to mednafen/src/wswan/dis/dis_tables.inc diff --git a/libmednahawk/src/wswan/dis/disasm.h b/mednafen/src/wswan/dis/disasm.h similarity index 100% rename from libmednahawk/src/wswan/dis/disasm.h rename to mednafen/src/wswan/dis/disasm.h diff --git a/libmednahawk/src/wswan/dis/opcodes.inc b/mednafen/src/wswan/dis/opcodes.inc similarity index 100% rename from libmednahawk/src/wswan/dis/opcodes.inc rename to mednafen/src/wswan/dis/opcodes.inc diff --git a/libmednahawk/src/wswan/dis/resolve.cpp b/mednafen/src/wswan/dis/resolve.cpp similarity index 100% rename from libmednahawk/src/wswan/dis/resolve.cpp rename to mednafen/src/wswan/dis/resolve.cpp diff --git a/libmednahawk/src/wswan/dis/syntax.cpp b/mednafen/src/wswan/dis/syntax.cpp similarity index 100% rename from libmednahawk/src/wswan/dis/syntax.cpp rename to mednafen/src/wswan/dis/syntax.cpp diff --git a/libmednahawk/src/wswan/eeprom.cpp b/mednafen/src/wswan/eeprom.cpp similarity index 100% rename from libmednahawk/src/wswan/eeprom.cpp rename to mednafen/src/wswan/eeprom.cpp diff --git a/libmednahawk/src/wswan/eeprom.h b/mednafen/src/wswan/eeprom.h similarity index 100% rename from libmednahawk/src/wswan/eeprom.h rename to mednafen/src/wswan/eeprom.h diff --git a/libmednahawk/src/wswan/gfx.cpp b/mednafen/src/wswan/gfx.cpp similarity index 100% rename from libmednahawk/src/wswan/gfx.cpp rename to mednafen/src/wswan/gfx.cpp diff --git a/libmednahawk/src/wswan/gfx.h b/mednafen/src/wswan/gfx.h similarity index 100% rename from libmednahawk/src/wswan/gfx.h rename to mednafen/src/wswan/gfx.h diff --git a/libmednahawk/src/wswan/interrupt.cpp b/mednafen/src/wswan/interrupt.cpp similarity index 100% rename from libmednahawk/src/wswan/interrupt.cpp rename to mednafen/src/wswan/interrupt.cpp diff --git a/libmednahawk/src/wswan/interrupt.h b/mednafen/src/wswan/interrupt.h similarity index 100% rename from libmednahawk/src/wswan/interrupt.h rename to mednafen/src/wswan/interrupt.h diff --git a/libmednahawk/src/wswan/main.cpp b/mednafen/src/wswan/main.cpp similarity index 100% rename from libmednahawk/src/wswan/main.cpp rename to mednafen/src/wswan/main.cpp diff --git a/libmednahawk/src/wswan/memory.cpp b/mednafen/src/wswan/memory.cpp similarity index 100% rename from libmednahawk/src/wswan/memory.cpp rename to mednafen/src/wswan/memory.cpp diff --git a/libmednahawk/src/wswan/memory.h b/mednafen/src/wswan/memory.h similarity index 100% rename from libmednahawk/src/wswan/memory.h rename to mednafen/src/wswan/memory.h diff --git a/libmednahawk/src/wswan/rtc.cpp b/mednafen/src/wswan/rtc.cpp similarity index 100% rename from libmednahawk/src/wswan/rtc.cpp rename to mednafen/src/wswan/rtc.cpp diff --git a/libmednahawk/src/wswan/rtc.h b/mednafen/src/wswan/rtc.h similarity index 100% rename from libmednahawk/src/wswan/rtc.h rename to mednafen/src/wswan/rtc.h diff --git a/libmednahawk/src/wswan/sound.cpp b/mednafen/src/wswan/sound.cpp similarity index 100% rename from libmednahawk/src/wswan/sound.cpp rename to mednafen/src/wswan/sound.cpp diff --git a/libmednahawk/src/wswan/sound.h b/mednafen/src/wswan/sound.h similarity index 100% rename from libmednahawk/src/wswan/sound.h rename to mednafen/src/wswan/sound.h diff --git a/libmednahawk/src/wswan/start.inc b/mednafen/src/wswan/start.inc similarity index 100% rename from libmednahawk/src/wswan/start.inc rename to mednafen/src/wswan/start.inc diff --git a/libmednahawk/src/wswan/tcache.cpp b/mednafen/src/wswan/tcache.cpp similarity index 100% rename from libmednahawk/src/wswan/tcache.cpp rename to mednafen/src/wswan/tcache.cpp diff --git a/libmednahawk/src/wswan/v30mz-ea.inc b/mednafen/src/wswan/v30mz-ea.inc similarity index 100% rename from libmednahawk/src/wswan/v30mz-ea.inc rename to mednafen/src/wswan/v30mz-ea.inc diff --git a/libmednahawk/src/wswan/v30mz-modrm.inc b/mednafen/src/wswan/v30mz-modrm.inc similarity index 100% rename from libmednahawk/src/wswan/v30mz-modrm.inc rename to mednafen/src/wswan/v30mz-modrm.inc diff --git a/libmednahawk/src/wswan/v30mz-private.h b/mednafen/src/wswan/v30mz-private.h similarity index 100% rename from libmednahawk/src/wswan/v30mz-private.h rename to mednafen/src/wswan/v30mz-private.h diff --git a/libmednahawk/src/wswan/v30mz.cpp b/mednafen/src/wswan/v30mz.cpp similarity index 100% rename from libmednahawk/src/wswan/v30mz.cpp rename to mednafen/src/wswan/v30mz.cpp diff --git a/libmednahawk/src/wswan/v30mz.h b/mednafen/src/wswan/v30mz.h similarity index 100% rename from libmednahawk/src/wswan/v30mz.h rename to mednafen/src/wswan/v30mz.h diff --git a/libmednahawk/src/wswan/wstech24.txt b/mednafen/src/wswan/wstech24.txt similarity index 100% rename from libmednahawk/src/wswan/wstech24.txt rename to mednafen/src/wswan/wstech24.txt diff --git a/libmednahawk/src/wswan/wswan.h b/mednafen/src/wswan/wswan.h similarity index 100% rename from libmednahawk/src/wswan/wswan.h rename to mednafen/src/wswan/wswan.h diff --git a/libmednahawk/zlib123/README b/mednafen/zlib123/README similarity index 100% rename from libmednahawk/zlib123/README rename to mednafen/zlib123/README diff --git a/libmednahawk/zlib123/zconf.h b/mednafen/zlib123/zconf.h similarity index 100% rename from libmednahawk/zlib123/zconf.h rename to mednafen/zlib123/zconf.h diff --git a/libmednahawk/zlib123/zlib-1.2.3_from_tastools b/mednafen/zlib123/zlib-1.2.3_from_tastools similarity index 100% rename from libmednahawk/zlib123/zlib-1.2.3_from_tastools rename to mednafen/zlib123/zlib-1.2.3_from_tastools diff --git a/libmednahawk/zlib123/zlib-vc8-Win32.lib b/mednafen/zlib123/zlib-vc8-Win32.lib similarity index 100% rename from libmednahawk/zlib123/zlib-vc8-Win32.lib rename to mednafen/zlib123/zlib-vc8-Win32.lib diff --git a/libmednahawk/zlib123/zlib.h b/mednafen/zlib123/zlib.h similarity index 100% rename from libmednahawk/zlib123/zlib.h rename to mednafen/zlib123/zlib.h diff --git a/libmednahawk/zlib123/zutil.h b/mednafen/zlib123/zutil.h similarity index 100% rename from libmednahawk/zlib123/zutil.h rename to mednafen/zlib123/zutil.h