diff --git a/polymer/eduke32/Android.mk b/Android.mk similarity index 100% rename from polymer/eduke32/Android.mk rename to Android.mk diff --git a/polymer/eduke32/Makefile.common b/Common.mak similarity index 100% rename from polymer/eduke32/Makefile.common rename to Common.mak diff --git a/polymer/eduke32/Makefile b/GNUmakefile similarity index 100% rename from polymer/eduke32/Makefile rename to GNUmakefile diff --git a/polymer/eduke32/_clang-format b/_clang-format similarity index 100% rename from polymer/eduke32/_clang-format rename to _clang-format diff --git a/polymer/eduke32/jit/ABOUT_THIS_DIR b/jit/ABOUT_THIS_DIR similarity index 100% rename from polymer/eduke32/jit/ABOUT_THIS_DIR rename to jit/ABOUT_THIS_DIR diff --git a/polymer/eduke32/jit/bcsave.lua b/jit/bcsave.lua similarity index 100% rename from polymer/eduke32/jit/bcsave.lua rename to jit/bcsave.lua diff --git a/polymer/eduke32/build/buildlic.txt b/package/common/buildlic.txt similarity index 100% rename from polymer/eduke32/build/buildlic.txt rename to package/common/buildlic.txt diff --git a/polymer/eduke32/package/common/gpl-2.0.txt b/package/common/gpl-2.0.txt similarity index 100% rename from polymer/eduke32/package/common/gpl-2.0.txt rename to package/common/gpl-2.0.txt diff --git a/polymer/eduke32/package/debug/win32/ebacktrace1.dll b/package/debug/win32/ebacktrace1.dll similarity index 100% rename from polymer/eduke32/package/debug/win32/ebacktrace1.dll rename to package/debug/win32/ebacktrace1.dll diff --git a/polymer/eduke32/package/debug/win64/ebacktrace1-64.dll b/package/debug/win64/ebacktrace1-64.dll similarity index 100% rename from polymer/eduke32/package/debug/win64/ebacktrace1-64.dll rename to package/debug/win64/ebacktrace1-64.dll diff --git a/polymer/eduke32/package/sdk/SEHELP.HLP b/package/sdk/SEHELP.HLP similarity index 100% rename from polymer/eduke32/package/sdk/SEHELP.HLP rename to package/sdk/SEHELP.HLP diff --git a/polymer/eduke32/package/sdk/STHELP.HLP b/package/sdk/STHELP.HLP similarity index 100% rename from polymer/eduke32/package/sdk/STHELP.HLP rename to package/sdk/STHELP.HLP diff --git a/polymer/eduke32/package/sdk/m32help.hlp b/package/sdk/m32help.hlp similarity index 100% rename from polymer/eduke32/package/sdk/m32help.hlp rename to package/sdk/m32help.hlp diff --git a/polymer/eduke32/package/sdk/names.h b/package/sdk/names.h similarity index 100% rename from polymer/eduke32/package/sdk/names.h rename to package/sdk/names.h diff --git a/polymer/eduke32/package/sdk/samples/_clipshape0.map b/package/sdk/samples/_clipshape0.map similarity index 100% rename from polymer/eduke32/package/sdk/samples/_clipshape0.map rename to package/sdk/samples/_clipshape0.map diff --git a/polymer/eduke32/package/sdk/samples/a.m32 b/package/sdk/samples/a.m32 similarity index 100% rename from polymer/eduke32/package/sdk/samples/a.m32 rename to package/sdk/samples/a.m32 diff --git a/polymer/eduke32/package/sdk/samples/aspect.map b/package/sdk/samples/aspect.map similarity index 100% rename from polymer/eduke32/package/sdk/samples/aspect.map rename to package/sdk/samples/aspect.map diff --git a/polymer/eduke32/package/sdk/samples/dump_used_assets.m32 b/package/sdk/samples/dump_used_assets.m32 similarity index 100% rename from polymer/eduke32/package/sdk/samples/dump_used_assets.m32 rename to package/sdk/samples/dump_used_assets.m32 diff --git a/polymer/eduke32/package/sdk/samples/m32script_ex.map b/package/sdk/samples/m32script_ex.map similarity index 100% rename from polymer/eduke32/package/sdk/samples/m32script_ex.map rename to package/sdk/samples/m32script_ex.map diff --git a/polymer/eduke32/package/sdk/samples/r_usenewshading.map b/package/sdk/samples/r_usenewshading.map similarity index 100% rename from polymer/eduke32/package/sdk/samples/r_usenewshading.map rename to package/sdk/samples/r_usenewshading.map diff --git a/polymer/eduke32/package/sdk/samples/ror.map b/package/sdk/samples/ror.map similarity index 100% rename from polymer/eduke32/package/sdk/samples/ror.map rename to package/sdk/samples/ror.map diff --git a/polymer/eduke32/package/sdk/samples/splitscr.con b/package/sdk/samples/splitscr.con similarity index 100% rename from polymer/eduke32/package/sdk/samples/splitscr.con rename to package/sdk/samples/splitscr.con diff --git a/polymer/eduke32/package/sdk/samples/spriteclip.txt b/package/sdk/samples/spriteclip.txt similarity index 100% rename from polymer/eduke32/package/sdk/samples/spriteclip.txt rename to package/sdk/samples/spriteclip.txt diff --git a/polymer/eduke32/package/sdk/samples/startpos.m32 b/package/sdk/samples/startpos.m32 similarity index 100% rename from polymer/eduke32/package/sdk/samples/startpos.m32 rename to package/sdk/samples/startpos.m32 diff --git a/polymer/eduke32/package/sdk/samples/test_tileoffsets.map b/package/sdk/samples/test_tileoffsets.map similarity index 100% rename from polymer/eduke32/package/sdk/samples/test_tileoffsets.map rename to package/sdk/samples/test_tileoffsets.map diff --git a/polymer/eduke32/package/sdk/samples/tests.m32 b/package/sdk/samples/tests.m32 similarity index 100% rename from polymer/eduke32/package/sdk/samples/tests.m32 rename to package/sdk/samples/tests.m32 diff --git a/polymer/eduke32/package/sdk/samples/trueror1.map b/package/sdk/samples/trueror1.map similarity index 100% rename from polymer/eduke32/package/sdk/samples/trueror1.map rename to package/sdk/samples/trueror1.map diff --git a/polymer/eduke32/package/sdk/samples/weapons.con.sample b/package/sdk/samples/weapons.sample.con similarity index 100% rename from polymer/eduke32/package/sdk/samples/weapons.con.sample rename to package/sdk/samples/weapons.sample.con diff --git a/polymer/eduke32/package/sdk/tiles.cfg b/package/sdk/tiles.cfg similarity index 100% rename from polymer/eduke32/package/sdk/tiles.cfg rename to package/sdk/tiles.cfg diff --git a/polymer/eduke32/platform/Apple/EDuke32.xcodeproj/project.pbxproj b/platform/Apple/EDuke32.xcodeproj/project.pbxproj similarity index 100% rename from polymer/eduke32/platform/Apple/EDuke32.xcodeproj/project.pbxproj rename to platform/Apple/EDuke32.xcodeproj/project.pbxproj diff --git a/polymer/eduke32/platform/Apple/bundles/EDuke32.app/Contents/Info.plist b/platform/Apple/bundles/EDuke32.app/Contents/Info.plist similarity index 100% rename from polymer/eduke32/platform/Apple/bundles/EDuke32.app/Contents/Info.plist rename to platform/Apple/bundles/EDuke32.app/Contents/Info.plist diff --git a/polymer/eduke32/platform/Apple/bundles/EDuke32.app/Contents/PkgInfo b/platform/Apple/bundles/EDuke32.app/Contents/PkgInfo similarity index 100% rename from polymer/eduke32/platform/Apple/bundles/EDuke32.app/Contents/PkgInfo rename to platform/Apple/bundles/EDuke32.app/Contents/PkgInfo diff --git a/polymer/eduke32/platform/Apple/bundles/EDuke32.app/Contents/Resources/alternate.icns b/platform/Apple/bundles/EDuke32.app/Contents/Resources/alternate.icns similarity index 100% rename from polymer/eduke32/platform/Apple/bundles/EDuke32.app/Contents/Resources/alternate.icns rename to platform/Apple/bundles/EDuke32.app/Contents/Resources/alternate.icns diff --git a/polymer/eduke32/platform/Apple/bundles/EDuke32.app/Contents/Resources/eduke32.icns b/platform/Apple/bundles/EDuke32.app/Contents/Resources/eduke32.icns similarity index 100% rename from polymer/eduke32/platform/Apple/bundles/EDuke32.app/Contents/Resources/eduke32.icns rename to platform/Apple/bundles/EDuke32.app/Contents/Resources/eduke32.icns diff --git a/polymer/eduke32/platform/Apple/bundles/EDuke32.app/Contents/Resources/game.png b/platform/Apple/bundles/EDuke32.app/Contents/Resources/game.png similarity index 100% rename from polymer/eduke32/platform/Apple/bundles/EDuke32.app/Contents/Resources/game.png rename to platform/Apple/bundles/EDuke32.app/Contents/Resources/game.png diff --git a/polymer/eduke32/platform/Apple/bundles/EDuke32.app/Contents/Resources/orange.icns b/platform/Apple/bundles/EDuke32.app/Contents/Resources/orange.icns similarity index 100% rename from polymer/eduke32/platform/Apple/bundles/EDuke32.app/Contents/Resources/orange.icns rename to platform/Apple/bundles/EDuke32.app/Contents/Resources/orange.icns diff --git a/polymer/eduke32/platform/Apple/bundles/Mapster32.app/Contents/Info.plist b/platform/Apple/bundles/Mapster32.app/Contents/Info.plist similarity index 100% rename from polymer/eduke32/platform/Apple/bundles/Mapster32.app/Contents/Info.plist rename to platform/Apple/bundles/Mapster32.app/Contents/Info.plist diff --git a/polymer/eduke32/platform/Apple/bundles/Mapster32.app/Contents/PkgInfo b/platform/Apple/bundles/Mapster32.app/Contents/PkgInfo similarity index 100% rename from polymer/eduke32/platform/Apple/bundles/Mapster32.app/Contents/PkgInfo rename to platform/Apple/bundles/Mapster32.app/Contents/PkgInfo diff --git a/polymer/eduke32/platform/Apple/bundles/Mapster32.app/Contents/Resources/alternate.icns b/platform/Apple/bundles/Mapster32.app/Contents/Resources/alternate.icns similarity index 100% rename from polymer/eduke32/platform/Apple/bundles/Mapster32.app/Contents/Resources/alternate.icns rename to platform/Apple/bundles/Mapster32.app/Contents/Resources/alternate.icns diff --git a/polymer/eduke32/platform/Apple/bundles/Mapster32.app/Contents/Resources/build.png b/platform/Apple/bundles/Mapster32.app/Contents/Resources/build.png similarity index 100% rename from polymer/eduke32/platform/Apple/bundles/Mapster32.app/Contents/Resources/build.png rename to platform/Apple/bundles/Mapster32.app/Contents/Resources/build.png diff --git a/polymer/eduke32/platform/Apple/bundles/Mapster32.app/Contents/Resources/mapster32.icns b/platform/Apple/bundles/Mapster32.app/Contents/Resources/mapster32.icns similarity index 100% rename from polymer/eduke32/platform/Apple/bundles/Mapster32.app/Contents/Resources/mapster32.icns rename to platform/Apple/bundles/Mapster32.app/Contents/Resources/mapster32.icns diff --git a/polymer/eduke32/platform/Apple/bundles/Mapster32.app/Contents/Resources/orange.icns b/platform/Apple/bundles/Mapster32.app/Contents/Resources/orange.icns similarity index 100% rename from polymer/eduke32/platform/Apple/bundles/Mapster32.app/Contents/Resources/orange.icns rename to platform/Apple/bundles/Mapster32.app/Contents/Resources/orange.icns diff --git a/polymer/eduke32/platform/Apple/iOS/Images.xcassets/AppIcon.appiconset/Contents.json b/platform/Apple/iOS/Images.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from polymer/eduke32/platform/Apple/iOS/Images.xcassets/AppIcon.appiconset/Contents.json rename to platform/Apple/iOS/Images.xcassets/AppIcon.appiconset/Contents.json diff --git a/polymer/eduke32/platform/Apple/iOS/Images.xcassets/LaunchImage.launchimage/Contents.json b/platform/Apple/iOS/Images.xcassets/LaunchImage.launchimage/Contents.json similarity index 100% rename from polymer/eduke32/platform/Apple/iOS/Images.xcassets/LaunchImage.launchimage/Contents.json rename to platform/Apple/iOS/Images.xcassets/LaunchImage.launchimage/Contents.json diff --git a/polymer/eduke32/platform/Apple/iOS/Info.plist b/platform/Apple/iOS/Info.plist similarity index 100% rename from polymer/eduke32/platform/Apple/iOS/Info.plist rename to platform/Apple/iOS/Info.plist diff --git a/polymer/eduke32/platform/Apple/iOS/en.lproj/InfoPlist.strings b/platform/Apple/iOS/en.lproj/InfoPlist.strings similarity index 100% rename from polymer/eduke32/platform/Apple/iOS/en.lproj/InfoPlist.strings rename to platform/Apple/iOS/en.lproj/InfoPlist.strings diff --git a/polymer/eduke32/platform/Wii/apps/eduke32/icon.png b/platform/Wii/apps/eduke32/icon.png similarity index 100% rename from polymer/eduke32/platform/Wii/apps/eduke32/icon.png rename to platform/Wii/apps/eduke32/icon.png diff --git a/polymer/eduke32/platform/Wii/apps/mapster32/icon.png b/platform/Wii/apps/mapster32/icon.png similarity index 100% rename from polymer/eduke32/platform/Wii/apps/mapster32/icon.png rename to platform/Wii/apps/mapster32/icon.png diff --git a/polymer/eduke32/platform/Wii/eduke32_meta_1.xml b/platform/Wii/eduke32_meta_1.xml similarity index 100% rename from polymer/eduke32/platform/Wii/eduke32_meta_1.xml rename to platform/Wii/eduke32_meta_1.xml diff --git a/polymer/eduke32/platform/Wii/eduke32_meta_2.xml b/platform/Wii/eduke32_meta_2.xml similarity index 100% rename from polymer/eduke32/platform/Wii/eduke32_meta_2.xml rename to platform/Wii/eduke32_meta_2.xml diff --git a/polymer/eduke32/platform/Wii/include/SDL/SDL.h b/platform/Wii/include/SDL/SDL.h similarity index 100% rename from polymer/eduke32/platform/Wii/include/SDL/SDL.h rename to platform/Wii/include/SDL/SDL.h diff --git a/polymer/eduke32/platform/Wii/include/SDL/SDL_active.h b/platform/Wii/include/SDL/SDL_active.h similarity index 100% rename from polymer/eduke32/platform/Wii/include/SDL/SDL_active.h rename to platform/Wii/include/SDL/SDL_active.h diff --git a/polymer/eduke32/platform/Wii/include/SDL/SDL_audio.h b/platform/Wii/include/SDL/SDL_audio.h similarity index 100% rename from polymer/eduke32/platform/Wii/include/SDL/SDL_audio.h rename to platform/Wii/include/SDL/SDL_audio.h diff --git a/polymer/eduke32/platform/Wii/include/SDL/SDL_byteorder.h b/platform/Wii/include/SDL/SDL_byteorder.h similarity index 100% rename from polymer/eduke32/platform/Wii/include/SDL/SDL_byteorder.h rename to platform/Wii/include/SDL/SDL_byteorder.h diff --git a/polymer/eduke32/platform/Wii/include/SDL/SDL_cdrom.h b/platform/Wii/include/SDL/SDL_cdrom.h similarity index 100% rename from polymer/eduke32/platform/Wii/include/SDL/SDL_cdrom.h rename to platform/Wii/include/SDL/SDL_cdrom.h diff --git a/polymer/eduke32/platform/Wii/include/SDL/SDL_config.h b/platform/Wii/include/SDL/SDL_config.h similarity index 100% rename from polymer/eduke32/platform/Wii/include/SDL/SDL_config.h rename to platform/Wii/include/SDL/SDL_config.h diff --git a/polymer/eduke32/platform/Wii/include/SDL/SDL_config_dreamcast.h b/platform/Wii/include/SDL/SDL_config_dreamcast.h similarity index 100% rename from polymer/eduke32/platform/Wii/include/SDL/SDL_config_dreamcast.h rename to platform/Wii/include/SDL/SDL_config_dreamcast.h diff --git a/polymer/eduke32/platform/Wii/include/SDL/SDL_config_macos.h b/platform/Wii/include/SDL/SDL_config_macos.h similarity index 100% rename from polymer/eduke32/platform/Wii/include/SDL/SDL_config_macos.h rename to platform/Wii/include/SDL/SDL_config_macos.h diff --git a/polymer/eduke32/platform/Wii/include/SDL/SDL_config_macosx.h b/platform/Wii/include/SDL/SDL_config_macosx.h similarity index 100% rename from polymer/eduke32/platform/Wii/include/SDL/SDL_config_macosx.h rename to platform/Wii/include/SDL/SDL_config_macosx.h diff --git a/polymer/eduke32/platform/Wii/include/SDL/SDL_config_minimal.h b/platform/Wii/include/SDL/SDL_config_minimal.h similarity index 100% rename from polymer/eduke32/platform/Wii/include/SDL/SDL_config_minimal.h rename to platform/Wii/include/SDL/SDL_config_minimal.h diff --git a/polymer/eduke32/platform/Wii/include/SDL/SDL_config_nds.h b/platform/Wii/include/SDL/SDL_config_nds.h similarity index 100% rename from polymer/eduke32/platform/Wii/include/SDL/SDL_config_nds.h rename to platform/Wii/include/SDL/SDL_config_nds.h diff --git a/polymer/eduke32/platform/Wii/include/SDL/SDL_config_os2.h b/platform/Wii/include/SDL/SDL_config_os2.h similarity index 100% rename from polymer/eduke32/platform/Wii/include/SDL/SDL_config_os2.h rename to platform/Wii/include/SDL/SDL_config_os2.h diff --git a/polymer/eduke32/platform/Wii/include/SDL/SDL_config_symbian.h b/platform/Wii/include/SDL/SDL_config_symbian.h similarity index 100% rename from polymer/eduke32/platform/Wii/include/SDL/SDL_config_symbian.h rename to platform/Wii/include/SDL/SDL_config_symbian.h diff --git a/polymer/eduke32/platform/Wii/include/SDL/SDL_config_wii.h b/platform/Wii/include/SDL/SDL_config_wii.h similarity index 100% rename from polymer/eduke32/platform/Wii/include/SDL/SDL_config_wii.h rename to platform/Wii/include/SDL/SDL_config_wii.h diff --git a/polymer/eduke32/platform/Wii/include/SDL/SDL_config_win32.h b/platform/Wii/include/SDL/SDL_config_win32.h similarity index 100% rename from polymer/eduke32/platform/Wii/include/SDL/SDL_config_win32.h rename to platform/Wii/include/SDL/SDL_config_win32.h diff --git a/polymer/eduke32/platform/Wii/include/SDL/SDL_copying.h b/platform/Wii/include/SDL/SDL_copying.h similarity index 100% rename from polymer/eduke32/platform/Wii/include/SDL/SDL_copying.h rename to platform/Wii/include/SDL/SDL_copying.h diff --git a/polymer/eduke32/platform/Wii/include/SDL/SDL_cpuinfo.h b/platform/Wii/include/SDL/SDL_cpuinfo.h similarity index 100% rename from polymer/eduke32/platform/Wii/include/SDL/SDL_cpuinfo.h rename to platform/Wii/include/SDL/SDL_cpuinfo.h diff --git a/polymer/eduke32/platform/Wii/include/SDL/SDL_endian.h b/platform/Wii/include/SDL/SDL_endian.h similarity index 100% rename from polymer/eduke32/platform/Wii/include/SDL/SDL_endian.h rename to platform/Wii/include/SDL/SDL_endian.h diff --git a/polymer/eduke32/platform/Wii/include/SDL/SDL_error.h b/platform/Wii/include/SDL/SDL_error.h similarity index 100% rename from polymer/eduke32/platform/Wii/include/SDL/SDL_error.h rename to platform/Wii/include/SDL/SDL_error.h diff --git a/polymer/eduke32/platform/Wii/include/SDL/SDL_events.h b/platform/Wii/include/SDL/SDL_events.h similarity index 100% rename from polymer/eduke32/platform/Wii/include/SDL/SDL_events.h rename to platform/Wii/include/SDL/SDL_events.h diff --git a/polymer/eduke32/platform/Wii/include/SDL/SDL_getenv.h b/platform/Wii/include/SDL/SDL_getenv.h similarity index 100% rename from polymer/eduke32/platform/Wii/include/SDL/SDL_getenv.h rename to platform/Wii/include/SDL/SDL_getenv.h diff --git a/polymer/eduke32/platform/Wii/include/SDL/SDL_joystick.h b/platform/Wii/include/SDL/SDL_joystick.h similarity index 100% rename from polymer/eduke32/platform/Wii/include/SDL/SDL_joystick.h rename to platform/Wii/include/SDL/SDL_joystick.h diff --git a/polymer/eduke32/platform/Wii/include/SDL/SDL_keyboard.h b/platform/Wii/include/SDL/SDL_keyboard.h similarity index 100% rename from polymer/eduke32/platform/Wii/include/SDL/SDL_keyboard.h rename to platform/Wii/include/SDL/SDL_keyboard.h diff --git a/polymer/eduke32/platform/Wii/include/SDL/SDL_keysym.h b/platform/Wii/include/SDL/SDL_keysym.h similarity index 100% rename from polymer/eduke32/platform/Wii/include/SDL/SDL_keysym.h rename to platform/Wii/include/SDL/SDL_keysym.h diff --git a/polymer/eduke32/platform/Wii/include/SDL/SDL_loadso.h b/platform/Wii/include/SDL/SDL_loadso.h similarity index 100% rename from polymer/eduke32/platform/Wii/include/SDL/SDL_loadso.h rename to platform/Wii/include/SDL/SDL_loadso.h diff --git a/polymer/eduke32/platform/Wii/include/SDL/SDL_main.h b/platform/Wii/include/SDL/SDL_main.h similarity index 100% rename from polymer/eduke32/platform/Wii/include/SDL/SDL_main.h rename to platform/Wii/include/SDL/SDL_main.h diff --git a/polymer/eduke32/platform/Wii/include/SDL/SDL_mixer.h b/platform/Wii/include/SDL/SDL_mixer.h similarity index 100% rename from polymer/eduke32/platform/Wii/include/SDL/SDL_mixer.h rename to platform/Wii/include/SDL/SDL_mixer.h diff --git a/polymer/eduke32/platform/Wii/include/SDL/SDL_mouse.h b/platform/Wii/include/SDL/SDL_mouse.h similarity index 100% rename from polymer/eduke32/platform/Wii/include/SDL/SDL_mouse.h rename to platform/Wii/include/SDL/SDL_mouse.h diff --git a/polymer/eduke32/platform/Wii/include/SDL/SDL_mutex.h b/platform/Wii/include/SDL/SDL_mutex.h similarity index 100% rename from polymer/eduke32/platform/Wii/include/SDL/SDL_mutex.h rename to platform/Wii/include/SDL/SDL_mutex.h diff --git a/polymer/eduke32/platform/Wii/include/SDL/SDL_name.h b/platform/Wii/include/SDL/SDL_name.h similarity index 100% rename from polymer/eduke32/platform/Wii/include/SDL/SDL_name.h rename to platform/Wii/include/SDL/SDL_name.h diff --git a/polymer/eduke32/platform/Wii/include/SDL/SDL_opengl.h b/platform/Wii/include/SDL/SDL_opengl.h similarity index 100% rename from polymer/eduke32/platform/Wii/include/SDL/SDL_opengl.h rename to platform/Wii/include/SDL/SDL_opengl.h diff --git a/polymer/eduke32/platform/Wii/include/SDL/SDL_platform.h b/platform/Wii/include/SDL/SDL_platform.h similarity index 100% rename from polymer/eduke32/platform/Wii/include/SDL/SDL_platform.h rename to platform/Wii/include/SDL/SDL_platform.h diff --git a/polymer/eduke32/platform/Wii/include/SDL/SDL_quit.h b/platform/Wii/include/SDL/SDL_quit.h similarity index 100% rename from polymer/eduke32/platform/Wii/include/SDL/SDL_quit.h rename to platform/Wii/include/SDL/SDL_quit.h diff --git a/polymer/eduke32/platform/Wii/include/SDL/SDL_rwops.h b/platform/Wii/include/SDL/SDL_rwops.h similarity index 100% rename from polymer/eduke32/platform/Wii/include/SDL/SDL_rwops.h rename to platform/Wii/include/SDL/SDL_rwops.h diff --git a/polymer/eduke32/platform/Wii/include/SDL/SDL_stdinc.h b/platform/Wii/include/SDL/SDL_stdinc.h similarity index 100% rename from polymer/eduke32/platform/Wii/include/SDL/SDL_stdinc.h rename to platform/Wii/include/SDL/SDL_stdinc.h diff --git a/polymer/eduke32/platform/Wii/include/SDL/SDL_syswm.h b/platform/Wii/include/SDL/SDL_syswm.h similarity index 100% rename from polymer/eduke32/platform/Wii/include/SDL/SDL_syswm.h rename to platform/Wii/include/SDL/SDL_syswm.h diff --git a/polymer/eduke32/platform/Wii/include/SDL/SDL_thread.h b/platform/Wii/include/SDL/SDL_thread.h similarity index 100% rename from polymer/eduke32/platform/Wii/include/SDL/SDL_thread.h rename to platform/Wii/include/SDL/SDL_thread.h diff --git a/polymer/eduke32/platform/Wii/include/SDL/SDL_timer.h b/platform/Wii/include/SDL/SDL_timer.h similarity index 100% rename from polymer/eduke32/platform/Wii/include/SDL/SDL_timer.h rename to platform/Wii/include/SDL/SDL_timer.h diff --git a/polymer/eduke32/platform/Wii/include/SDL/SDL_types.h b/platform/Wii/include/SDL/SDL_types.h similarity index 100% rename from polymer/eduke32/platform/Wii/include/SDL/SDL_types.h rename to platform/Wii/include/SDL/SDL_types.h diff --git a/polymer/eduke32/platform/Wii/include/SDL/SDL_version.h b/platform/Wii/include/SDL/SDL_version.h similarity index 100% rename from polymer/eduke32/platform/Wii/include/SDL/SDL_version.h rename to platform/Wii/include/SDL/SDL_version.h diff --git a/polymer/eduke32/platform/Wii/include/SDL/SDL_video.h b/platform/Wii/include/SDL/SDL_video.h similarity index 100% rename from polymer/eduke32/platform/Wii/include/SDL/SDL_video.h rename to platform/Wii/include/SDL/SDL_video.h diff --git a/polymer/eduke32/platform/Wii/include/SDL/begin_code.h b/platform/Wii/include/SDL/begin_code.h similarity index 100% rename from polymer/eduke32/platform/Wii/include/SDL/begin_code.h rename to platform/Wii/include/SDL/begin_code.h diff --git a/polymer/eduke32/platform/Wii/include/SDL/close_code.h b/platform/Wii/include/SDL/close_code.h similarity index 100% rename from polymer/eduke32/platform/Wii/include/SDL/close_code.h rename to platform/Wii/include/SDL/close_code.h diff --git a/polymer/eduke32/platform/Wii/include/png.h b/platform/Wii/include/png.h similarity index 100% rename from polymer/eduke32/platform/Wii/include/png.h rename to platform/Wii/include/png.h diff --git a/polymer/eduke32/platform/Wii/include/pngconf.h b/platform/Wii/include/pngconf.h similarity index 100% rename from polymer/eduke32/platform/Wii/include/pngconf.h rename to platform/Wii/include/pngconf.h diff --git a/polymer/eduke32/platform/Wii/include/pnglibconf.h b/platform/Wii/include/pnglibconf.h similarity index 100% rename from polymer/eduke32/platform/Wii/include/pnglibconf.h rename to platform/Wii/include/pnglibconf.h diff --git a/polymer/eduke32/platform/Wii/include/tremor/config_types.h b/platform/Wii/include/tremor/config_types.h similarity index 100% rename from polymer/eduke32/platform/Wii/include/tremor/config_types.h rename to platform/Wii/include/tremor/config_types.h diff --git a/polymer/eduke32/platform/Wii/include/tremor/ivorbiscodec.h b/platform/Wii/include/tremor/ivorbiscodec.h similarity index 100% rename from polymer/eduke32/platform/Wii/include/tremor/ivorbiscodec.h rename to platform/Wii/include/tremor/ivorbiscodec.h diff --git a/polymer/eduke32/platform/Wii/include/tremor/ivorbisfile.h b/platform/Wii/include/tremor/ivorbisfile.h similarity index 100% rename from polymer/eduke32/platform/Wii/include/tremor/ivorbisfile.h rename to platform/Wii/include/tremor/ivorbisfile.h diff --git a/polymer/eduke32/platform/Wii/include/tremor/ogg.h b/platform/Wii/include/tremor/ogg.h similarity index 100% rename from polymer/eduke32/platform/Wii/include/tremor/ogg.h rename to platform/Wii/include/tremor/ogg.h diff --git a/polymer/eduke32/platform/Wii/include/tremor/os_types.h b/platform/Wii/include/tremor/os_types.h similarity index 100% rename from polymer/eduke32/platform/Wii/include/tremor/os_types.h rename to platform/Wii/include/tremor/os_types.h diff --git a/polymer/eduke32/platform/Wii/include/zconf.h b/platform/Wii/include/zconf.h similarity index 100% rename from polymer/eduke32/platform/Wii/include/zconf.h rename to platform/Wii/include/zconf.h diff --git a/polymer/eduke32/platform/Wii/include/zlib.h b/platform/Wii/include/zlib.h similarity index 100% rename from polymer/eduke32/platform/Wii/include/zlib.h rename to platform/Wii/include/zlib.h diff --git a/polymer/eduke32/platform/Wii/lib/libSDL.a b/platform/Wii/lib/libSDL.a similarity index 100% rename from polymer/eduke32/platform/Wii/lib/libSDL.a rename to platform/Wii/lib/libSDL.a diff --git a/polymer/eduke32/platform/Wii/lib/libSDL_mixer.a b/platform/Wii/lib/libSDL_mixer.a similarity index 100% rename from polymer/eduke32/platform/Wii/lib/libSDL_mixer.a rename to platform/Wii/lib/libSDL_mixer.a diff --git a/polymer/eduke32/platform/Wii/lib/libaesnd_tueidj.a b/platform/Wii/lib/libaesnd_tueidj.a similarity index 100% rename from polymer/eduke32/platform/Wii/lib/libaesnd_tueidj.a rename to platform/Wii/lib/libaesnd_tueidj.a diff --git a/polymer/eduke32/platform/Wii/lib/libpng.a b/platform/Wii/lib/libpng.a similarity index 100% rename from polymer/eduke32/platform/Wii/lib/libpng.a rename to platform/Wii/lib/libpng.a diff --git a/polymer/eduke32/platform/Wii/lib/libvorbisidec.a b/platform/Wii/lib/libvorbisidec.a similarity index 100% rename from polymer/eduke32/platform/Wii/lib/libvorbisidec.a rename to platform/Wii/lib/libvorbisidec.a diff --git a/polymer/eduke32/platform/Wii/lib/libz.a b/platform/Wii/lib/libz.a similarity index 100% rename from polymer/eduke32/platform/Wii/lib/libz.a rename to platform/Wii/lib/libz.a diff --git a/polymer/eduke32/platform/Wii/mapster32_meta_1.xml b/platform/Wii/mapster32_meta_1.xml similarity index 100% rename from polymer/eduke32/platform/Wii/mapster32_meta_1.xml rename to platform/Wii/mapster32_meta_1.xml diff --git a/polymer/eduke32/platform/Wii/mapster32_meta_2.xml b/platform/Wii/mapster32_meta_2.xml similarity index 100% rename from polymer/eduke32/platform/Wii/mapster32_meta_2.xml rename to platform/Wii/mapster32_meta_2.xml diff --git a/polymer/eduke32/platform/Wii/notes.txt b/platform/Wii/notes.txt similarity index 100% rename from polymer/eduke32/platform/Wii/notes.txt rename to platform/Wii/notes.txt diff --git a/polymer/eduke32/platform/Wii/xcopy_exclude.txt b/platform/Wii/xcopy_exclude.txt similarity index 100% rename from polymer/eduke32/platform/Wii/xcopy_exclude.txt rename to platform/Wii/xcopy_exclude.txt diff --git a/polymer/eduke32/eduke32.sln b/platform/Windows/eduke32.sln similarity index 100% rename from polymer/eduke32/eduke32.sln rename to platform/Windows/eduke32.sln diff --git a/polymer/eduke32/eduke32.vcxproj b/platform/Windows/eduke32.vcxproj similarity index 100% rename from polymer/eduke32/eduke32.vcxproj rename to platform/Windows/eduke32.vcxproj diff --git a/polymer/eduke32/eduke32.vcxproj.filters b/platform/Windows/eduke32.vcxproj.filters similarity index 100% rename from polymer/eduke32/eduke32.vcxproj.filters rename to platform/Windows/eduke32.vcxproj.filters diff --git a/polymer/eduke32/source/jaudiolib/third-party/common/include/FLAC/all.h b/platform/Windows/include/FLAC/all.h similarity index 100% rename from polymer/eduke32/source/jaudiolib/third-party/common/include/FLAC/all.h rename to platform/Windows/include/FLAC/all.h diff --git a/polymer/eduke32/source/jaudiolib/third-party/common/include/FLAC/assert.h b/platform/Windows/include/FLAC/assert.h similarity index 100% rename from polymer/eduke32/source/jaudiolib/third-party/common/include/FLAC/assert.h rename to platform/Windows/include/FLAC/assert.h diff --git a/polymer/eduke32/source/jaudiolib/third-party/common/include/FLAC/callback.h b/platform/Windows/include/FLAC/callback.h similarity index 100% rename from polymer/eduke32/source/jaudiolib/third-party/common/include/FLAC/callback.h rename to platform/Windows/include/FLAC/callback.h diff --git a/polymer/eduke32/source/jaudiolib/third-party/common/include/FLAC/export.h b/platform/Windows/include/FLAC/export.h similarity index 100% rename from polymer/eduke32/source/jaudiolib/third-party/common/include/FLAC/export.h rename to platform/Windows/include/FLAC/export.h diff --git a/polymer/eduke32/source/jaudiolib/third-party/common/include/FLAC/format.h b/platform/Windows/include/FLAC/format.h similarity index 100% rename from polymer/eduke32/source/jaudiolib/third-party/common/include/FLAC/format.h rename to platform/Windows/include/FLAC/format.h diff --git a/polymer/eduke32/source/jaudiolib/third-party/common/include/FLAC/metadata.h b/platform/Windows/include/FLAC/metadata.h similarity index 100% rename from polymer/eduke32/source/jaudiolib/third-party/common/include/FLAC/metadata.h rename to platform/Windows/include/FLAC/metadata.h diff --git a/polymer/eduke32/source/jaudiolib/third-party/common/include/FLAC/ordinals.h b/platform/Windows/include/FLAC/ordinals.h similarity index 100% rename from polymer/eduke32/source/jaudiolib/third-party/common/include/FLAC/ordinals.h rename to platform/Windows/include/FLAC/ordinals.h diff --git a/polymer/eduke32/source/jaudiolib/third-party/common/include/FLAC/stream_decoder.h b/platform/Windows/include/FLAC/stream_decoder.h similarity index 100% rename from polymer/eduke32/source/jaudiolib/third-party/common/include/FLAC/stream_decoder.h rename to platform/Windows/include/FLAC/stream_decoder.h diff --git a/polymer/eduke32/source/jaudiolib/third-party/common/include/FLAC/stream_encoder.h b/platform/Windows/include/FLAC/stream_encoder.h similarity index 100% rename from polymer/eduke32/source/jaudiolib/third-party/common/include/FLAC/stream_encoder.h rename to platform/Windows/include/FLAC/stream_encoder.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL.h b/platform/Windows/include/SDL2/SDL.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL.h rename to platform/Windows/include/SDL2/SDL.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_assert.h b/platform/Windows/include/SDL2/SDL_assert.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_assert.h rename to platform/Windows/include/SDL2/SDL_assert.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_atomic.h b/platform/Windows/include/SDL2/SDL_atomic.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_atomic.h rename to platform/Windows/include/SDL2/SDL_atomic.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_audio.h b/platform/Windows/include/SDL2/SDL_audio.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_audio.h rename to platform/Windows/include/SDL2/SDL_audio.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_bits.h b/platform/Windows/include/SDL2/SDL_bits.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_bits.h rename to platform/Windows/include/SDL2/SDL_bits.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_blendmode.h b/platform/Windows/include/SDL2/SDL_blendmode.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_blendmode.h rename to platform/Windows/include/SDL2/SDL_blendmode.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_clipboard.h b/platform/Windows/include/SDL2/SDL_clipboard.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_clipboard.h rename to platform/Windows/include/SDL2/SDL_clipboard.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_config.h b/platform/Windows/include/SDL2/SDL_config.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_config.h rename to platform/Windows/include/SDL2/SDL_config.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_cpuinfo.h b/platform/Windows/include/SDL2/SDL_cpuinfo.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_cpuinfo.h rename to platform/Windows/include/SDL2/SDL_cpuinfo.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_egl.h b/platform/Windows/include/SDL2/SDL_egl.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_egl.h rename to platform/Windows/include/SDL2/SDL_egl.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_endian.h b/platform/Windows/include/SDL2/SDL_endian.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_endian.h rename to platform/Windows/include/SDL2/SDL_endian.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_error.h b/platform/Windows/include/SDL2/SDL_error.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_error.h rename to platform/Windows/include/SDL2/SDL_error.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_events.h b/platform/Windows/include/SDL2/SDL_events.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_events.h rename to platform/Windows/include/SDL2/SDL_events.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_filesystem.h b/platform/Windows/include/SDL2/SDL_filesystem.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_filesystem.h rename to platform/Windows/include/SDL2/SDL_filesystem.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_gamecontroller.h b/platform/Windows/include/SDL2/SDL_gamecontroller.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_gamecontroller.h rename to platform/Windows/include/SDL2/SDL_gamecontroller.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_gesture.h b/platform/Windows/include/SDL2/SDL_gesture.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_gesture.h rename to platform/Windows/include/SDL2/SDL_gesture.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_haptic.h b/platform/Windows/include/SDL2/SDL_haptic.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_haptic.h rename to platform/Windows/include/SDL2/SDL_haptic.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_hints.h b/platform/Windows/include/SDL2/SDL_hints.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_hints.h rename to platform/Windows/include/SDL2/SDL_hints.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_joystick.h b/platform/Windows/include/SDL2/SDL_joystick.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_joystick.h rename to platform/Windows/include/SDL2/SDL_joystick.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_keyboard.h b/platform/Windows/include/SDL2/SDL_keyboard.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_keyboard.h rename to platform/Windows/include/SDL2/SDL_keyboard.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_keycode.h b/platform/Windows/include/SDL2/SDL_keycode.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_keycode.h rename to platform/Windows/include/SDL2/SDL_keycode.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_loadso.h b/platform/Windows/include/SDL2/SDL_loadso.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_loadso.h rename to platform/Windows/include/SDL2/SDL_loadso.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_log.h b/platform/Windows/include/SDL2/SDL_log.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_log.h rename to platform/Windows/include/SDL2/SDL_log.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_main.h b/platform/Windows/include/SDL2/SDL_main.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_main.h rename to platform/Windows/include/SDL2/SDL_main.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_messagebox.h b/platform/Windows/include/SDL2/SDL_messagebox.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_messagebox.h rename to platform/Windows/include/SDL2/SDL_messagebox.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_mouse.h b/platform/Windows/include/SDL2/SDL_mouse.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_mouse.h rename to platform/Windows/include/SDL2/SDL_mouse.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_mutex.h b/platform/Windows/include/SDL2/SDL_mutex.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_mutex.h rename to platform/Windows/include/SDL2/SDL_mutex.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_name.h b/platform/Windows/include/SDL2/SDL_name.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_name.h rename to platform/Windows/include/SDL2/SDL_name.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_opengl.h b/platform/Windows/include/SDL2/SDL_opengl.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_opengl.h rename to platform/Windows/include/SDL2/SDL_opengl.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_opengl_glext.h b/platform/Windows/include/SDL2/SDL_opengl_glext.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_opengl_glext.h rename to platform/Windows/include/SDL2/SDL_opengl_glext.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_opengles.h b/platform/Windows/include/SDL2/SDL_opengles.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_opengles.h rename to platform/Windows/include/SDL2/SDL_opengles.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_opengles2.h b/platform/Windows/include/SDL2/SDL_opengles2.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_opengles2.h rename to platform/Windows/include/SDL2/SDL_opengles2.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_opengles2_gl2.h b/platform/Windows/include/SDL2/SDL_opengles2_gl2.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_opengles2_gl2.h rename to platform/Windows/include/SDL2/SDL_opengles2_gl2.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_opengles2_gl2ext.h b/platform/Windows/include/SDL2/SDL_opengles2_gl2ext.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_opengles2_gl2ext.h rename to platform/Windows/include/SDL2/SDL_opengles2_gl2ext.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_opengles2_gl2platform.h b/platform/Windows/include/SDL2/SDL_opengles2_gl2platform.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_opengles2_gl2platform.h rename to platform/Windows/include/SDL2/SDL_opengles2_gl2platform.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_opengles2_khrplatform.h b/platform/Windows/include/SDL2/SDL_opengles2_khrplatform.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_opengles2_khrplatform.h rename to platform/Windows/include/SDL2/SDL_opengles2_khrplatform.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_pixels.h b/platform/Windows/include/SDL2/SDL_pixels.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_pixels.h rename to platform/Windows/include/SDL2/SDL_pixels.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_platform.h b/platform/Windows/include/SDL2/SDL_platform.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_platform.h rename to platform/Windows/include/SDL2/SDL_platform.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_power.h b/platform/Windows/include/SDL2/SDL_power.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_power.h rename to platform/Windows/include/SDL2/SDL_power.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_quit.h b/platform/Windows/include/SDL2/SDL_quit.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_quit.h rename to platform/Windows/include/SDL2/SDL_quit.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_rect.h b/platform/Windows/include/SDL2/SDL_rect.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_rect.h rename to platform/Windows/include/SDL2/SDL_rect.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_render.h b/platform/Windows/include/SDL2/SDL_render.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_render.h rename to platform/Windows/include/SDL2/SDL_render.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_revision.h b/platform/Windows/include/SDL2/SDL_revision.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_revision.h rename to platform/Windows/include/SDL2/SDL_revision.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_rwops.h b/platform/Windows/include/SDL2/SDL_rwops.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_rwops.h rename to platform/Windows/include/SDL2/SDL_rwops.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_scancode.h b/platform/Windows/include/SDL2/SDL_scancode.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_scancode.h rename to platform/Windows/include/SDL2/SDL_scancode.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_shape.h b/platform/Windows/include/SDL2/SDL_shape.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_shape.h rename to platform/Windows/include/SDL2/SDL_shape.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_stdinc.h b/platform/Windows/include/SDL2/SDL_stdinc.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_stdinc.h rename to platform/Windows/include/SDL2/SDL_stdinc.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_surface.h b/platform/Windows/include/SDL2/SDL_surface.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_surface.h rename to platform/Windows/include/SDL2/SDL_surface.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_system.h b/platform/Windows/include/SDL2/SDL_system.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_system.h rename to platform/Windows/include/SDL2/SDL_system.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_syswm.h b/platform/Windows/include/SDL2/SDL_syswm.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_syswm.h rename to platform/Windows/include/SDL2/SDL_syswm.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_test.h b/platform/Windows/include/SDL2/SDL_test.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_test.h rename to platform/Windows/include/SDL2/SDL_test.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_test_assert.h b/platform/Windows/include/SDL2/SDL_test_assert.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_test_assert.h rename to platform/Windows/include/SDL2/SDL_test_assert.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_test_common.h b/platform/Windows/include/SDL2/SDL_test_common.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_test_common.h rename to platform/Windows/include/SDL2/SDL_test_common.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_test_compare.h b/platform/Windows/include/SDL2/SDL_test_compare.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_test_compare.h rename to platform/Windows/include/SDL2/SDL_test_compare.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_test_crc32.h b/platform/Windows/include/SDL2/SDL_test_crc32.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_test_crc32.h rename to platform/Windows/include/SDL2/SDL_test_crc32.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_test_font.h b/platform/Windows/include/SDL2/SDL_test_font.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_test_font.h rename to platform/Windows/include/SDL2/SDL_test_font.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_test_fuzzer.h b/platform/Windows/include/SDL2/SDL_test_fuzzer.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_test_fuzzer.h rename to platform/Windows/include/SDL2/SDL_test_fuzzer.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_test_harness.h b/platform/Windows/include/SDL2/SDL_test_harness.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_test_harness.h rename to platform/Windows/include/SDL2/SDL_test_harness.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_test_images.h b/platform/Windows/include/SDL2/SDL_test_images.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_test_images.h rename to platform/Windows/include/SDL2/SDL_test_images.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_test_log.h b/platform/Windows/include/SDL2/SDL_test_log.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_test_log.h rename to platform/Windows/include/SDL2/SDL_test_log.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_test_md5.h b/platform/Windows/include/SDL2/SDL_test_md5.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_test_md5.h rename to platform/Windows/include/SDL2/SDL_test_md5.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_test_random.h b/platform/Windows/include/SDL2/SDL_test_random.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_test_random.h rename to platform/Windows/include/SDL2/SDL_test_random.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_thread.h b/platform/Windows/include/SDL2/SDL_thread.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_thread.h rename to platform/Windows/include/SDL2/SDL_thread.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_timer.h b/platform/Windows/include/SDL2/SDL_timer.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_timer.h rename to platform/Windows/include/SDL2/SDL_timer.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_touch.h b/platform/Windows/include/SDL2/SDL_touch.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_touch.h rename to platform/Windows/include/SDL2/SDL_touch.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_types.h b/platform/Windows/include/SDL2/SDL_types.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_types.h rename to platform/Windows/include/SDL2/SDL_types.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_version.h b/platform/Windows/include/SDL2/SDL_version.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_version.h rename to platform/Windows/include/SDL2/SDL_version.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/SDL_video.h b/platform/Windows/include/SDL2/SDL_video.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/SDL_video.h rename to platform/Windows/include/SDL2/SDL_video.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/begin_code.h b/platform/Windows/include/SDL2/begin_code.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/begin_code.h rename to platform/Windows/include/SDL2/begin_code.h diff --git a/polymer/eduke32/platform/Windows/include/SDL2/close_code.h b/platform/Windows/include/SDL2/close_code.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/SDL2/close_code.h rename to platform/Windows/include/SDL2/close_code.h diff --git a/polymer/eduke32/platform/Windows/include/dx/ddraw.h b/platform/Windows/include/dx/ddraw.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/dx/ddraw.h rename to platform/Windows/include/dx/ddraw.h diff --git a/polymer/eduke32/platform/Windows/include/dx/dinput.h b/platform/Windows/include/dx/dinput.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/dx/dinput.h rename to platform/Windows/include/dx/dinput.h diff --git a/polymer/eduke32/platform/Windows/include/dx/dsound.h b/platform/Windows/include/dx/dsound.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/dx/dsound.h rename to platform/Windows/include/dx/dsound.h diff --git a/polymer/eduke32/platform/Windows/include/dx/dx_compat.h b/platform/Windows/include/dx/dx_compat.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/dx/dx_compat.h rename to platform/Windows/include/dx/dx_compat.h diff --git a/polymer/eduke32/platform/Windows/include/libxmp-lite/xmp.h b/platform/Windows/include/libxmp-lite/xmp.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/libxmp-lite/xmp.h rename to platform/Windows/include/libxmp-lite/xmp.h diff --git a/polymer/eduke32/platform/Windows/include/luajit-2.0/lauxlib.h b/platform/Windows/include/luajit-2.0/lauxlib.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/luajit-2.0/lauxlib.h rename to platform/Windows/include/luajit-2.0/lauxlib.h diff --git a/polymer/eduke32/platform/Windows/include/luajit-2.0/lua.h b/platform/Windows/include/luajit-2.0/lua.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/luajit-2.0/lua.h rename to platform/Windows/include/luajit-2.0/lua.h diff --git a/polymer/eduke32/platform/Windows/include/luajit-2.0/lua.hpp b/platform/Windows/include/luajit-2.0/lua.hpp similarity index 100% rename from polymer/eduke32/platform/Windows/include/luajit-2.0/lua.hpp rename to platform/Windows/include/luajit-2.0/lua.hpp diff --git a/polymer/eduke32/platform/Windows/include/luajit-2.0/luaconf.h b/platform/Windows/include/luajit-2.0/luaconf.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/luajit-2.0/luaconf.h rename to platform/Windows/include/luajit-2.0/luaconf.h diff --git a/polymer/eduke32/platform/Windows/include/luajit-2.0/luajit.h b/platform/Windows/include/luajit-2.0/luajit.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/luajit-2.0/luajit.h rename to platform/Windows/include/luajit-2.0/luajit.h diff --git a/polymer/eduke32/platform/Windows/include/luajit-2.0/lualib.h b/platform/Windows/include/luajit-2.0/lualib.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/luajit-2.0/lualib.h rename to platform/Windows/include/luajit-2.0/lualib.h diff --git a/polymer/eduke32/source/jaudiolib/third-party/common/include/ogg/config_types.h b/platform/Windows/include/ogg/config_types.h similarity index 100% rename from polymer/eduke32/source/jaudiolib/third-party/common/include/ogg/config_types.h rename to platform/Windows/include/ogg/config_types.h diff --git a/polymer/eduke32/source/jaudiolib/third-party/common/include/ogg/ogg.h b/platform/Windows/include/ogg/ogg.h similarity index 100% rename from polymer/eduke32/source/jaudiolib/third-party/common/include/ogg/ogg.h rename to platform/Windows/include/ogg/ogg.h diff --git a/polymer/eduke32/source/jaudiolib/third-party/common/include/ogg/os_types.h b/platform/Windows/include/ogg/os_types.h similarity index 100% rename from polymer/eduke32/source/jaudiolib/third-party/common/include/ogg/os_types.h rename to platform/Windows/include/ogg/os_types.h diff --git a/polymer/eduke32/platform/Windows/include/png.h b/platform/Windows/include/png.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/png.h rename to platform/Windows/include/png.h diff --git a/polymer/eduke32/platform/Windows/include/pngconf.h b/platform/Windows/include/pngconf.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/pngconf.h rename to platform/Windows/include/pngconf.h diff --git a/polymer/eduke32/platform/Windows/include/pnglibconf.h b/platform/Windows/include/pnglibconf.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/pnglibconf.h rename to platform/Windows/include/pnglibconf.h diff --git a/polymer/eduke32/source/jaudiolib/third-party/common/include/vorbis/codec.h b/platform/Windows/include/vorbis/codec.h similarity index 100% rename from polymer/eduke32/source/jaudiolib/third-party/common/include/vorbis/codec.h rename to platform/Windows/include/vorbis/codec.h diff --git a/polymer/eduke32/source/jaudiolib/third-party/common/include/vorbis/vorbisfile.h b/platform/Windows/include/vorbis/vorbisfile.h similarity index 100% rename from polymer/eduke32/source/jaudiolib/third-party/common/include/vorbis/vorbisfile.h rename to platform/Windows/include/vorbis/vorbisfile.h diff --git a/polymer/eduke32/platform/Windows/include/vpx/vp8.h b/platform/Windows/include/vpx/vp8.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/vpx/vp8.h rename to platform/Windows/include/vpx/vp8.h diff --git a/polymer/eduke32/platform/Windows/include/vpx/vp8dx.h b/platform/Windows/include/vpx/vp8dx.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/vpx/vp8dx.h rename to platform/Windows/include/vpx/vp8dx.h diff --git a/polymer/eduke32/platform/Windows/include/vpx/vpx_codec.h b/platform/Windows/include/vpx/vpx_codec.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/vpx/vpx_codec.h rename to platform/Windows/include/vpx/vpx_codec.h diff --git a/polymer/eduke32/platform/Windows/include/vpx/vpx_decoder.h b/platform/Windows/include/vpx/vpx_decoder.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/vpx/vpx_decoder.h rename to platform/Windows/include/vpx/vpx_decoder.h diff --git a/polymer/eduke32/platform/Windows/include/vpx/vpx_frame_buffer.h b/platform/Windows/include/vpx/vpx_frame_buffer.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/vpx/vpx_frame_buffer.h rename to platform/Windows/include/vpx/vpx_frame_buffer.h diff --git a/polymer/eduke32/platform/Windows/include/vpx/vpx_image.h b/platform/Windows/include/vpx/vpx_image.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/vpx/vpx_image.h rename to platform/Windows/include/vpx/vpx_image.h diff --git a/polymer/eduke32/platform/Windows/include/vpx/vpx_integer.h b/platform/Windows/include/vpx/vpx_integer.h similarity index 100% rename from polymer/eduke32/platform/Windows/include/vpx/vpx_integer.h rename to platform/Windows/include/vpx/vpx_integer.h diff --git a/polymer/eduke32/source/jaudiolib/third-party/Windows/lib/32/libFLAC.a b/platform/Windows/lib/32/libFLAC.a similarity index 100% rename from polymer/eduke32/source/jaudiolib/third-party/Windows/lib/32/libFLAC.a rename to platform/Windows/lib/32/libFLAC.a diff --git a/polymer/eduke32/platform/Windows/lib/32/libSDL2.a b/platform/Windows/lib/32/libSDL2.a similarity index 100% rename from polymer/eduke32/platform/Windows/lib/32/libSDL2.a rename to platform/Windows/lib/32/libSDL2.a diff --git a/polymer/eduke32/platform/Windows/lib/32/libSDL2main.a b/platform/Windows/lib/32/libSDL2main.a similarity index 100% rename from polymer/eduke32/platform/Windows/lib/32/libSDL2main.a rename to platform/Windows/lib/32/libSDL2main.a diff --git a/polymer/eduke32/platform/Windows/lib/32/libcompat-to-msvc.a b/platform/Windows/lib/32/libcompat-to-msvc.a similarity index 100% rename from polymer/eduke32/platform/Windows/lib/32/libcompat-to-msvc.a rename to platform/Windows/lib/32/libcompat-to-msvc.a diff --git a/polymer/eduke32/platform/Windows/lib/32/libdsound.a b/platform/Windows/lib/32/libdsound.a similarity index 100% rename from polymer/eduke32/platform/Windows/lib/32/libdsound.a rename to platform/Windows/lib/32/libdsound.a diff --git a/polymer/eduke32/platform/Windows/lib/32/libdxguid.a b/platform/Windows/lib/32/libdxguid.a similarity index 100% rename from polymer/eduke32/platform/Windows/lib/32/libdxguid.a rename to platform/Windows/lib/32/libdxguid.a diff --git a/polymer/eduke32/platform/Windows/lib/32/libdxguid_sdl.a b/platform/Windows/lib/32/libdxguid_sdl.a similarity index 100% rename from polymer/eduke32/platform/Windows/lib/32/libdxguid_sdl.a rename to platform/Windows/lib/32/libdxguid_sdl.a diff --git a/polymer/eduke32/platform/Windows/lib/32/liblpeg.a b/platform/Windows/lib/32/liblpeg.a similarity index 100% rename from polymer/eduke32/platform/Windows/lib/32/liblpeg.a rename to platform/Windows/lib/32/liblpeg.a diff --git a/polymer/eduke32/platform/Windows/lib/32/libluajit.a b/platform/Windows/lib/32/libluajit.a similarity index 100% rename from polymer/eduke32/platform/Windows/lib/32/libluajit.a rename to platform/Windows/lib/32/libluajit.a diff --git a/polymer/eduke32/source/jaudiolib/third-party/Windows/lib/32/libogg.a b/platform/Windows/lib/32/libogg.a similarity index 100% rename from polymer/eduke32/source/jaudiolib/third-party/Windows/lib/32/libogg.a rename to platform/Windows/lib/32/libogg.a diff --git a/polymer/eduke32/platform/Windows/lib/32/libpng_mini.a b/platform/Windows/lib/32/libpng_mini.a similarity index 100% rename from polymer/eduke32/platform/Windows/lib/32/libpng_mini.a rename to platform/Windows/lib/32/libpng_mini.a diff --git a/polymer/eduke32/source/jaudiolib/third-party/Windows/lib/32/libvorbis.a b/platform/Windows/lib/32/libvorbis.a similarity index 100% rename from polymer/eduke32/source/jaudiolib/third-party/Windows/lib/32/libvorbis.a rename to platform/Windows/lib/32/libvorbis.a diff --git a/polymer/eduke32/source/jaudiolib/third-party/Windows/lib/32/libvorbisfile.a b/platform/Windows/lib/32/libvorbisfile.a similarity index 100% rename from polymer/eduke32/source/jaudiolib/third-party/Windows/lib/32/libvorbisfile.a rename to platform/Windows/lib/32/libvorbisfile.a diff --git a/polymer/eduke32/platform/Windows/lib/32/libvpx.a b/platform/Windows/lib/32/libvpx.a similarity index 100% rename from polymer/eduke32/platform/Windows/lib/32/libvpx.a rename to platform/Windows/lib/32/libvpx.a diff --git a/polymer/eduke32/platform/Windows/lib/32/libxmp-lite.a b/platform/Windows/lib/32/libxmp-lite.a similarity index 100% rename from polymer/eduke32/platform/Windows/lib/32/libxmp-lite.a rename to platform/Windows/lib/32/libxmp-lite.a diff --git a/polymer/eduke32/platform/Windows/lib/32/libz_mini.a b/platform/Windows/lib/32/libz_mini.a similarity index 100% rename from polymer/eduke32/platform/Windows/lib/32/libz_mini.a rename to platform/Windows/lib/32/libz_mini.a diff --git a/polymer/eduke32/source/jaudiolib/third-party/Windows/lib/64/libFLAC.a b/platform/Windows/lib/64/libFLAC.a similarity index 100% rename from polymer/eduke32/source/jaudiolib/third-party/Windows/lib/64/libFLAC.a rename to platform/Windows/lib/64/libFLAC.a diff --git a/polymer/eduke32/platform/Windows/lib/64/libSDL2.a b/platform/Windows/lib/64/libSDL2.a similarity index 100% rename from polymer/eduke32/platform/Windows/lib/64/libSDL2.a rename to platform/Windows/lib/64/libSDL2.a diff --git a/polymer/eduke32/platform/Windows/lib/64/libSDL2main.a b/platform/Windows/lib/64/libSDL2main.a similarity index 100% rename from polymer/eduke32/platform/Windows/lib/64/libSDL2main.a rename to platform/Windows/lib/64/libSDL2main.a diff --git a/polymer/eduke32/platform/Windows/lib/64/libcompat-to-msvc.a b/platform/Windows/lib/64/libcompat-to-msvc.a similarity index 100% rename from polymer/eduke32/platform/Windows/lib/64/libcompat-to-msvc.a rename to platform/Windows/lib/64/libcompat-to-msvc.a diff --git a/polymer/eduke32/platform/Windows/lib/64/libdsound.a b/platform/Windows/lib/64/libdsound.a similarity index 100% rename from polymer/eduke32/platform/Windows/lib/64/libdsound.a rename to platform/Windows/lib/64/libdsound.a diff --git a/polymer/eduke32/platform/Windows/lib/64/libdxguid.a b/platform/Windows/lib/64/libdxguid.a similarity index 100% rename from polymer/eduke32/platform/Windows/lib/64/libdxguid.a rename to platform/Windows/lib/64/libdxguid.a diff --git a/polymer/eduke32/platform/Windows/lib/64/libdxguid_sdl.a b/platform/Windows/lib/64/libdxguid_sdl.a similarity index 100% rename from polymer/eduke32/platform/Windows/lib/64/libdxguid_sdl.a rename to platform/Windows/lib/64/libdxguid_sdl.a diff --git a/polymer/eduke32/platform/Windows/lib/64/liblpeg.a b/platform/Windows/lib/64/liblpeg.a similarity index 100% rename from polymer/eduke32/platform/Windows/lib/64/liblpeg.a rename to platform/Windows/lib/64/liblpeg.a diff --git a/polymer/eduke32/platform/Windows/lib/64/libluajit.a b/platform/Windows/lib/64/libluajit.a similarity index 100% rename from polymer/eduke32/platform/Windows/lib/64/libluajit.a rename to platform/Windows/lib/64/libluajit.a diff --git a/polymer/eduke32/source/jaudiolib/third-party/Windows/lib/64/libogg.a b/platform/Windows/lib/64/libogg.a similarity index 100% rename from polymer/eduke32/source/jaudiolib/third-party/Windows/lib/64/libogg.a rename to platform/Windows/lib/64/libogg.a diff --git a/polymer/eduke32/platform/Windows/lib/64/libpng_mini.a b/platform/Windows/lib/64/libpng_mini.a similarity index 100% rename from polymer/eduke32/platform/Windows/lib/64/libpng_mini.a rename to platform/Windows/lib/64/libpng_mini.a diff --git a/polymer/eduke32/source/jaudiolib/third-party/Windows/lib/64/libvorbis.a b/platform/Windows/lib/64/libvorbis.a similarity index 100% rename from polymer/eduke32/source/jaudiolib/third-party/Windows/lib/64/libvorbis.a rename to platform/Windows/lib/64/libvorbis.a diff --git a/polymer/eduke32/source/jaudiolib/third-party/Windows/lib/64/libvorbisfile.a b/platform/Windows/lib/64/libvorbisfile.a similarity index 100% rename from polymer/eduke32/source/jaudiolib/third-party/Windows/lib/64/libvorbisfile.a rename to platform/Windows/lib/64/libvorbisfile.a diff --git a/polymer/eduke32/platform/Windows/lib/64/libvpx.a b/platform/Windows/lib/64/libvpx.a similarity index 100% rename from polymer/eduke32/platform/Windows/lib/64/libvpx.a rename to platform/Windows/lib/64/libvpx.a diff --git a/polymer/eduke32/platform/Windows/lib/64/libxmp-lite.a b/platform/Windows/lib/64/libxmp-lite.a similarity index 100% rename from polymer/eduke32/platform/Windows/lib/64/libxmp-lite.a rename to platform/Windows/lib/64/libxmp-lite.a diff --git a/polymer/eduke32/platform/Windows/lib/64/libz_mini.a b/platform/Windows/lib/64/libz_mini.a similarity index 100% rename from polymer/eduke32/platform/Windows/lib/64/libz_mini.a rename to platform/Windows/lib/64/libz_mini.a diff --git a/polymer/eduke32/platform/Windows/lib/instructions.txt b/platform/Windows/lib/instructions.txt similarity index 100% rename from polymer/eduke32/platform/Windows/lib/instructions.txt rename to platform/Windows/lib/instructions.txt diff --git a/polymer/eduke32/platform/Windows/lib/minipng.dfa b/platform/Windows/lib/minipng.dfa similarity index 100% rename from polymer/eduke32/platform/Windows/lib/minipng.dfa rename to platform/Windows/lib/minipng.dfa diff --git a/polymer/eduke32/Makefile.msvc b/platform/Windows/msvc.mak similarity index 100% rename from polymer/eduke32/Makefile.msvc rename to platform/Windows/msvc.mak diff --git a/polymer/eduke32/platform/Windows/src/_dbg_LOAD_IMAGE.h b/platform/Windows/src/_dbg_LOAD_IMAGE.h similarity index 100% rename from polymer/eduke32/platform/Windows/src/_dbg_LOAD_IMAGE.h rename to platform/Windows/src/_dbg_LOAD_IMAGE.h diff --git a/polymer/eduke32/platform/Windows/src/_dbg_common.h b/platform/Windows/src/_dbg_common.h similarity index 100% rename from polymer/eduke32/platform/Windows/src/_dbg_common.h rename to platform/Windows/src/_dbg_common.h diff --git a/polymer/eduke32/platform/Windows/src/backtrace.c b/platform/Windows/src/backtrace.c similarity index 100% rename from polymer/eduke32/platform/Windows/src/backtrace.c rename to platform/Windows/src/backtrace.c diff --git a/polymer/eduke32/platform/Windows/src/compat-to-msvc/Makefile b/platform/Windows/src/compat-to-msvc/Makefile similarity index 100% rename from polymer/eduke32/platform/Windows/src/compat-to-msvc/Makefile rename to platform/Windows/src/compat-to-msvc/Makefile diff --git a/polymer/eduke32/platform/Windows/src/compat-to-msvc/dll_dependency.S b/platform/Windows/src/compat-to-msvc/dll_dependency.S similarity index 100% rename from polymer/eduke32/platform/Windows/src/compat-to-msvc/dll_dependency.S rename to platform/Windows/src/compat-to-msvc/dll_dependency.S diff --git a/polymer/eduke32/platform/Windows/src/compat-to-msvc/dll_math.c b/platform/Windows/src/compat-to-msvc/dll_math.c similarity index 100% rename from polymer/eduke32/platform/Windows/src/compat-to-msvc/dll_math.c rename to platform/Windows/src/compat-to-msvc/dll_math.c diff --git a/polymer/eduke32/platform/Windows/src/compat-to-msvc/io_math.c b/platform/Windows/src/compat-to-msvc/io_math.c similarity index 100% rename from polymer/eduke32/platform/Windows/src/compat-to-msvc/io_math.c rename to platform/Windows/src/compat-to-msvc/io_math.c diff --git a/polymer/eduke32/platform/Windows/src/compat-to-msvc/vsnprintf.c b/platform/Windows/src/compat-to-msvc/vsnprintf.c similarity index 100% rename from polymer/eduke32/platform/Windows/src/compat-to-msvc/vsnprintf.c rename to platform/Windows/src/compat-to-msvc/vsnprintf.c diff --git a/polymer/eduke32/platform/Windows/src/dxlibs/Makefile b/platform/Windows/src/dxlibs/Makefile similarity index 100% rename from polymer/eduke32/platform/Windows/src/dxlibs/Makefile rename to platform/Windows/src/dxlibs/Makefile diff --git a/polymer/eduke32/platform/Windows/src/dxlibs/d3d8.def b/platform/Windows/src/dxlibs/d3d8.def similarity index 100% rename from polymer/eduke32/platform/Windows/src/dxlibs/d3d8.def rename to platform/Windows/src/dxlibs/d3d8.def diff --git a/polymer/eduke32/platform/Windows/src/dxlibs/d3dx8d.def b/platform/Windows/src/dxlibs/d3dx8d.def similarity index 100% rename from polymer/eduke32/platform/Windows/src/dxlibs/d3dx8d.def rename to platform/Windows/src/dxlibs/d3dx8d.def diff --git a/polymer/eduke32/platform/Windows/src/dxlibs/d3dxof.def b/platform/Windows/src/dxlibs/d3dxof.def similarity index 100% rename from polymer/eduke32/platform/Windows/src/dxlibs/d3dxof.def rename to platform/Windows/src/dxlibs/d3dxof.def diff --git a/polymer/eduke32/platform/Windows/src/dxlibs/ddraw.def b/platform/Windows/src/dxlibs/ddraw.def similarity index 100% rename from polymer/eduke32/platform/Windows/src/dxlibs/ddraw.def rename to platform/Windows/src/dxlibs/ddraw.def diff --git a/polymer/eduke32/platform/Windows/src/dxlibs/dinput.c b/platform/Windows/src/dxlibs/dinput.c similarity index 100% rename from polymer/eduke32/platform/Windows/src/dxlibs/dinput.c rename to platform/Windows/src/dxlibs/dinput.c diff --git a/polymer/eduke32/platform/Windows/src/dxlibs/dinput.def b/platform/Windows/src/dxlibs/dinput.def similarity index 100% rename from polymer/eduke32/platform/Windows/src/dxlibs/dinput.def rename to platform/Windows/src/dxlibs/dinput.def diff --git a/polymer/eduke32/platform/Windows/src/dxlibs/dinput8.def b/platform/Windows/src/dxlibs/dinput8.def similarity index 100% rename from polymer/eduke32/platform/Windows/src/dxlibs/dinput8.def rename to platform/Windows/src/dxlibs/dinput8.def diff --git a/polymer/eduke32/platform/Windows/src/dxlibs/dplayx.def b/platform/Windows/src/dxlibs/dplayx.def similarity index 100% rename from polymer/eduke32/platform/Windows/src/dxlibs/dplayx.def rename to platform/Windows/src/dxlibs/dplayx.def diff --git a/polymer/eduke32/platform/Windows/src/dxlibs/dpnaddr.def b/platform/Windows/src/dxlibs/dpnaddr.def similarity index 100% rename from polymer/eduke32/platform/Windows/src/dxlibs/dpnaddr.def rename to platform/Windows/src/dxlibs/dpnaddr.def diff --git a/polymer/eduke32/platform/Windows/src/dxlibs/dpnet.def b/platform/Windows/src/dxlibs/dpnet.def similarity index 100% rename from polymer/eduke32/platform/Windows/src/dxlibs/dpnet.def rename to platform/Windows/src/dxlibs/dpnet.def diff --git a/polymer/eduke32/platform/Windows/src/dxlibs/dpnlobby.def b/platform/Windows/src/dxlibs/dpnlobby.def similarity index 100% rename from polymer/eduke32/platform/Windows/src/dxlibs/dpnlobby.def rename to platform/Windows/src/dxlibs/dpnlobby.def diff --git a/polymer/eduke32/platform/Windows/src/dxlibs/dpvoice.def b/platform/Windows/src/dxlibs/dpvoice.def similarity index 100% rename from polymer/eduke32/platform/Windows/src/dxlibs/dpvoice.def rename to platform/Windows/src/dxlibs/dpvoice.def diff --git a/polymer/eduke32/platform/Windows/src/dxlibs/dsetup.def b/platform/Windows/src/dxlibs/dsetup.def similarity index 100% rename from polymer/eduke32/platform/Windows/src/dxlibs/dsetup.def rename to platform/Windows/src/dxlibs/dsetup.def diff --git a/polymer/eduke32/platform/Windows/src/dxlibs/dsound.def b/platform/Windows/src/dxlibs/dsound.def similarity index 100% rename from polymer/eduke32/platform/Windows/src/dxlibs/dsound.def rename to platform/Windows/src/dxlibs/dsound.def diff --git a/polymer/eduke32/platform/Windows/src/dxlibs/dxguid.c b/platform/Windows/src/dxlibs/dxguid.c similarity index 100% rename from polymer/eduke32/platform/Windows/src/dxlibs/dxguid.c rename to platform/Windows/src/dxlibs/dxguid.c diff --git a/polymer/eduke32/platform/Windows/src/dxlibs/dxguid_sdl.c b/platform/Windows/src/dxlibs/dxguid_sdl.c similarity index 100% rename from polymer/eduke32/platform/Windows/src/dxlibs/dxguid_sdl.c rename to platform/Windows/src/dxlibs/dxguid_sdl.c diff --git a/polymer/eduke32/platform/Windows/src/dxlibs/readme.txt b/platform/Windows/src/dxlibs/readme.txt similarity index 100% rename from polymer/eduke32/platform/Windows/src/dxlibs/readme.txt rename to platform/Windows/src/dxlibs/readme.txt diff --git a/polymer/eduke32/platform/osxbuild.sh b/platform/osxbuild.sh similarity index 100% rename from polymer/eduke32/platform/osxbuild.sh rename to platform/osxbuild.sh diff --git a/polymer/synthesis.sh b/platform/synthesis.sh similarity index 100% rename from polymer/synthesis.sh rename to platform/synthesis.sh diff --git a/polymer/eduke32/platform/wiibuild.sh b/platform/wiibuild.sh similarity index 100% rename from polymer/eduke32/platform/wiibuild.sh rename to platform/wiibuild.sh diff --git a/polymer/eduke32/package/sdk/samples/duke3d.def.sample b/polymer/eduke32/package/sdk/samples/duke3d.def.sample deleted file mode 100644 index aca89b9ca..000000000 --- a/polymer/eduke32/package/sdk/samples/duke3d.def.sample +++ /dev/null @@ -1,69 +0,0 @@ -// Duke Nukem 3D Sample Defs file -// -// For an explanation of the contents of this file, read -// http://wiki.eduke32.com/wiki/DEF_Language - -include DEFS.CON - -// These entries define Hightile tints -// definetint -definetint 1 110 110 255 1 -definetint 2 255 110 80 1 -definetint 4 0 0 0 0 -definetint 6 192 255 138 3 -definetint 7 228 200 172 0 -definetint 8 180 255 200 0 - -// This entry defines a texture replacement -// definetexture 0 0 -1 -1 -//definetexture FEMPIC7 0 0 0 -1 -1 "textures/rikaa.png" - -// These entries demonstrate replacing the Pig Cop character with a model - // Editart tile indices: - // walk 2000-2019 - // pump 2025-2027 - // stand 2030-2034 - // shoot 2035-2037 - // dive 2040-2044 - // dived 2045-2049 - // dshoot 2050-2052 - // hit 2055 - // die 2056-2059 - // dead 2060 -// definemodel -// defineskin -// definemodelanim -// definemodelframe -definemodel "models/pigcop.md2" 1.30 0 -definemodelskin 0 "models/pigcop.jpg" - -definemodelanim "walk0" "walk13" 20 0 -definemodelframe "walk0" 2000 2019 - -definemodelanim "pump0" "pump2" 10 1 -definemodelframe "pump0" 2025 2027 - -definemodelframe "stand" 2030 2034 - -definemodelanim "shoot0" "shoot2" 10 1 -definemodelframe "shoot0" 2035 2037 - -definemodelanim "dive0" "dive3" 8 1 -definemodelframe "dive0" 2040 2044 -definemodelframe "dive3" 2045 2049 - -definemodelanim "dshoot0" "dshoot2" 10 1 -definemodelframe "dshoot0" 2050 2052 - -definemodelframe "die0" 2055 2055 -definemodelanim "die1" "dead" 13 1 -definemodelframe "die1" 2056 2059 -definemodelframe "dead" 2060 2060 - - -// These entries demonstrate voxel replacements -// definevoxel -// definevoxeltiles -//definevoxel "voxels/barstool.kvx" -//definevoxeltiles 1006 1006 - diff --git a/polymer/eduke32/package/sdk/samples/enhance.con.sample b/polymer/eduke32/package/sdk/samples/enhance.con.sample deleted file mode 100644 index 2929bfb3c..000000000 --- a/polymer/eduke32/package/sdk/samples/enhance.con.sample +++ /dev/null @@ -1,249 +0,0 @@ - -// Internal event IDs -// http://wiki.eduke32.com/wiki/EDuke32_event_list - -// Internal projectile stuff -// http://wiki.eduke32.com/wiki/Defineprojectile - -// Variable definition Flags -// http://wiki.eduke32.com/wiki/Category:Gamevar_manipulation -define GAMEVAR_GLOBAL 0 // global variable (default) -define GAMEVAR_PERPLAYER 1 // per-player variable -define GAMEVAR_PERACTOR 2 // per-actor variable - -// Weapon Flags -// http://wiki.eduke32.com/wiki/WEAPONx_FLAGS - -// TRIPBOMB_CONTROL -// http://wiki.eduke32.com/wiki/TRIPBOMB_CONTROL - -// PIPEBOMB_CONTROL -// http://wiki.eduke32.com/wiki/PIPEBOMB_CONTROL - -// http://wiki.eduke32.com/wiki/Pre-defined_gamevars -// http://wiki.eduke32.com/wiki/Constantly_updated_gamevars - -gamevar WEAPON0_WORKSLIKE 0 GAMEVAR_PERPLAYER -gamevar WEAPON0_CLIP 0 GAMEVAR_PERPLAYER -gamevar WEAPON0_RELOAD 0 GAMEVAR_PERPLAYER -gamevar WEAPON0_FIREDELAY 7 GAMEVAR_PERPLAYER -gamevar WEAPON0_TOTALTIME 14 GAMEVAR_PERPLAYER -gamevar WEAPON0_HOLDDELAY 0 GAMEVAR_PERPLAYER -gamevar WEAPON0_FLAGS 292 GAMEVAR_PERPLAYER -gamevar WEAPON0_SHOOTS 2521 GAMEVAR_PERPLAYER -gamevar WEAPON0_SPAWNTIME 0 GAMEVAR_PERPLAYER -gamevar WEAPON0_SPAWN 0 GAMEVAR_PERPLAYER -gamevar WEAPON0_SHOTSPERBURST 0 GAMEVAR_PERPLAYER -gamevar WEAPON0_INITIALSOUND 0 GAMEVAR_PERPLAYER -gamevar WEAPON0_FIRESOUND 0 GAMEVAR_PERPLAYER -gamevar WEAPON0_SOUND2TIME 0 GAMEVAR_PERPLAYER -gamevar WEAPON0_SOUND2SOUND 0 GAMEVAR_PERPLAYER -gamevar WEAPON0_RELOADSOUND1 4 GAMEVAR_PERPLAYER -gamevar WEAPON0_RELOADSOUND2 5 GAMEVAR_PERPLAYER - -gamevar WEAPON1_WORKSLIKE 1 GAMEVAR_PERPLAYER -gamevar WEAPON1_CLIP 12 GAMEVAR_PERPLAYER -gamevar WEAPON1_RELOAD 27 GAMEVAR_PERPLAYER -gamevar WEAPON1_FIREDELAY 2 GAMEVAR_PERPLAYER -gamevar WEAPON1_TOTALTIME 5 GAMEVAR_PERPLAYER -gamevar WEAPON1_HOLDDELAY 0 GAMEVAR_PERPLAYER -gamevar WEAPON1_FLAGS 32768 GAMEVAR_PERPLAYER -gamevar WEAPON1_SHOOTS 2595 GAMEVAR_PERPLAYER -gamevar WEAPON1_SPAWNTIME 2 GAMEVAR_PERPLAYER -gamevar WEAPON1_SPAWN 2533 GAMEVAR_PERPLAYER -gamevar WEAPON1_SHOTSPERBURST 0 GAMEVAR_PERPLAYER -gamevar WEAPON1_INITIALSOUND 0 GAMEVAR_PERPLAYER -gamevar WEAPON1_FIRESOUND 3 GAMEVAR_PERPLAYER -gamevar WEAPON1_SOUND2TIME 0 GAMEVAR_PERPLAYER -gamevar WEAPON1_SOUND2SOUND 0 GAMEVAR_PERPLAYER -gamevar WEAPON1_RELOADSOUND1 4 GAMEVAR_PERPLAYER -gamevar WEAPON1_RELOADSOUND2 5 GAMEVAR_PERPLAYER - -gamevar WEAPON2_WORKSLIKE 2 GAMEVAR_PERPLAYER -gamevar WEAPON2_CLIP 0 GAMEVAR_PERPLAYER -gamevar WEAPON2_RELOAD 13 GAMEVAR_PERPLAYER -gamevar WEAPON2_FIREDELAY 4 GAMEVAR_PERPLAYER -gamevar WEAPON2_TOTALTIME 30 GAMEVAR_PERPLAYER -gamevar WEAPON2_HOLDDELAY 0 GAMEVAR_PERPLAYER -gamevar WEAPON2_FLAGS 1024 GAMEVAR_PERPLAYER -gamevar WEAPON2_SHOOTS 2613 GAMEVAR_PERPLAYER -gamevar WEAPON2_SPAWNTIME 24 GAMEVAR_PERPLAYER -gamevar WEAPON2_SPAWN 2535 GAMEVAR_PERPLAYER -gamevar WEAPON2_SHOTSPERBURST 7 GAMEVAR_PERPLAYER -gamevar WEAPON2_INITIALSOUND 0 GAMEVAR_PERPLAYER -gamevar WEAPON2_FIRESOUND 109 GAMEVAR_PERPLAYER -gamevar WEAPON2_SOUND2TIME 15 GAMEVAR_PERPLAYER -gamevar WEAPON2_SOUND2SOUND 169 GAMEVAR_PERPLAYER -gamevar WEAPON2_RELOADSOUND1 4 GAMEVAR_PERPLAYER -gamevar WEAPON2_RELOADSOUND2 5 GAMEVAR_PERPLAYER - -gamevar WEAPON3_WORKSLIKE 3 GAMEVAR_PERPLAYER -gamevar WEAPON3_CLIP 0 GAMEVAR_PERPLAYER -gamevar WEAPON3_RELOAD 0 GAMEVAR_PERPLAYER -gamevar WEAPON3_FIREDELAY 3 GAMEVAR_PERPLAYER -gamevar WEAPON3_TOTALTIME 12 GAMEVAR_PERPLAYER -gamevar WEAPON3_HOLDDELAY 3 GAMEVAR_PERPLAYER -gamevar WEAPON3_FLAGS 73812 GAMEVAR_PERPLAYER -gamevar WEAPON3_SHOOTS 2536 GAMEVAR_PERPLAYER -gamevar WEAPON3_SPAWNTIME 1 GAMEVAR_PERPLAYER -gamevar WEAPON3_SPAWN 2533 GAMEVAR_PERPLAYER -gamevar WEAPON3_SHOTSPERBURST 0 GAMEVAR_PERPLAYER -gamevar WEAPON3_INITIALSOUND 0 GAMEVAR_PERPLAYER -gamevar WEAPON3_FIRESOUND 6 GAMEVAR_PERPLAYER -gamevar WEAPON3_SOUND2TIME 0 GAMEVAR_PERPLAYER -gamevar WEAPON3_SOUND2SOUND 0 GAMEVAR_PERPLAYER -gamevar WEAPON3_RELOADSOUND1 4 GAMEVAR_PERPLAYER -gamevar WEAPON3_RELOADSOUND2 5 GAMEVAR_PERPLAYER - -gamevar WEAPON4_WORKSLIKE 4 GAMEVAR_PERPLAYER -gamevar WEAPON4_CLIP 0 GAMEVAR_PERPLAYER -gamevar WEAPON4_RELOAD 0 GAMEVAR_PERPLAYER -gamevar WEAPON4_FIREDELAY 4 GAMEVAR_PERPLAYER -gamevar WEAPON4_TOTALTIME 20 GAMEVAR_PERPLAYER -gamevar WEAPON4_HOLDDELAY 0 GAMEVAR_PERPLAYER -gamevar WEAPON4_FLAGS 0 GAMEVAR_PERPLAYER -gamevar WEAPON4_SHOOTS 2605 GAMEVAR_PERPLAYER -gamevar WEAPON4_SPAWNTIME 0 GAMEVAR_PERPLAYER -gamevar WEAPON4_SPAWN 0 GAMEVAR_PERPLAYER -gamevar WEAPON4_SHOTSPERBURST 0 GAMEVAR_PERPLAYER -gamevar WEAPON4_INITIALSOUND 0 GAMEVAR_PERPLAYER -gamevar WEAPON4_FIRESOUND 0 GAMEVAR_PERPLAYER -gamevar WEAPON4_SOUND2TIME 0 GAMEVAR_PERPLAYER -gamevar WEAPON4_SOUND2SOUND 0 GAMEVAR_PERPLAYER -gamevar WEAPON4_RELOADSOUND1 4 GAMEVAR_PERPLAYER -gamevar WEAPON4_RELOADSOUND2 5 GAMEVAR_PERPLAYER - -gamevar WEAPON5_WORKSLIKE 5 GAMEVAR_PERPLAYER -gamevar WEAPON5_CLIP 0 GAMEVAR_PERPLAYER -gamevar WEAPON5_RELOAD 30 GAMEVAR_PERPLAYER -gamevar WEAPON5_FIREDELAY 6 GAMEVAR_PERPLAYER -gamevar WEAPON5_TOTALTIME 19 GAMEVAR_PERPLAYER -gamevar WEAPON5_HOLDDELAY 12 GAMEVAR_PERPLAYER -gamevar WEAPON5_FLAGS 512 GAMEVAR_PERPLAYER -gamevar WEAPON5_SHOOTS 26 GAMEVAR_PERPLAYER -gamevar WEAPON5_SPAWNTIME 0 GAMEVAR_PERPLAYER -gamevar WEAPON5_SPAWN 0 GAMEVAR_PERPLAYER -gamevar WEAPON5_SHOTSPERBURST 0 GAMEVAR_PERPLAYER -gamevar WEAPON5_INITIALSOUND 0 GAMEVAR_PERPLAYER -gamevar WEAPON5_FIRESOUND 0 GAMEVAR_PERPLAYER -gamevar WEAPON5_SOUND2TIME 0 GAMEVAR_PERPLAYER -gamevar WEAPON5_SOUND2SOUND 0 GAMEVAR_PERPLAYER -gamevar WEAPON5_RELOADSOUND1 4 GAMEVAR_PERPLAYER -gamevar WEAPON5_RELOADSOUND2 5 GAMEVAR_PERPLAYER - -gamevar WEAPON6_WORKSLIKE 6 GAMEVAR_PERPLAYER -gamevar WEAPON6_CLIP 0 GAMEVAR_PERPLAYER -gamevar WEAPON6_RELOAD 0 GAMEVAR_PERPLAYER -gamevar WEAPON6_FIREDELAY 10 GAMEVAR_PERPLAYER -gamevar WEAPON6_TOTALTIME 12 GAMEVAR_PERPLAYER -gamevar WEAPON6_HOLDDELAY 0 GAMEVAR_PERPLAYER -gamevar WEAPON6_FLAGS 2 GAMEVAR_PERPLAYER -gamevar WEAPON6_SHOOTS 2556 GAMEVAR_PERPLAYER -gamevar WEAPON6_SPAWNTIME 0 GAMEVAR_PERPLAYER -gamevar WEAPON6_SPAWN 0 GAMEVAR_PERPLAYER -gamevar WEAPON6_SHOTSPERBURST 0 GAMEVAR_PERPLAYER -gamevar WEAPON6_INITIALSOUND 11 GAMEVAR_PERPLAYER -gamevar WEAPON6_FIRESOUND 0 GAMEVAR_PERPLAYER -gamevar WEAPON6_SOUND2TIME 0 GAMEVAR_PERPLAYER -gamevar WEAPON6_SOUND2SOUND 0 GAMEVAR_PERPLAYER -gamevar WEAPON6_RELOADSOUND1 4 GAMEVAR_PERPLAYER -gamevar WEAPON6_RELOADSOUND2 5 GAMEVAR_PERPLAYER - -gamevar WEAPON7_WORKSLIKE 7 GAMEVAR_PERPLAYER -gamevar WEAPON7_CLIP 0 GAMEVAR_PERPLAYER -gamevar WEAPON7_RELOAD 0 GAMEVAR_PERPLAYER -gamevar WEAPON7_FIREDELAY 3 GAMEVAR_PERPLAYER -gamevar WEAPON7_TOTALTIME 6 GAMEVAR_PERPLAYER -gamevar WEAPON7_HOLDDELAY 5 GAMEVAR_PERPLAYER -gamevar WEAPON7_FLAGS 72 GAMEVAR_PERPLAYER -gamevar WEAPON7_SHOOTS 2605 GAMEVAR_PERPLAYER -gamevar WEAPON7_SPAWNTIME 0 GAMEVAR_PERPLAYER -gamevar WEAPON7_SPAWN 0 GAMEVAR_PERPLAYER -gamevar WEAPON7_SHOTSPERBURST 2 GAMEVAR_PERPLAYER -gamevar WEAPON7_INITIALSOUND 10 GAMEVAR_PERPLAYER -gamevar WEAPON7_FIRESOUND 0 GAMEVAR_PERPLAYER -gamevar WEAPON7_SOUND2TIME 0 GAMEVAR_PERPLAYER -gamevar WEAPON7_SOUND2SOUND 0 GAMEVAR_PERPLAYER -gamevar WEAPON7_RELOADSOUND1 4 GAMEVAR_PERPLAYER -gamevar WEAPON7_RELOADSOUND2 5 GAMEVAR_PERPLAYER - -gamevar WEAPON8_WORKSLIKE 8 GAMEVAR_PERPLAYER -gamevar WEAPON8_CLIP 0 GAMEVAR_PERPLAYER -gamevar WEAPON8_RELOAD 16 GAMEVAR_PERPLAYER -gamevar WEAPON8_FIREDELAY 3 GAMEVAR_PERPLAYER -gamevar WEAPON8_TOTALTIME 16 GAMEVAR_PERPLAYER -gamevar WEAPON8_HOLDDELAY 7 GAMEVAR_PERPLAYER -gamevar WEAPON8_FLAGS 3072 GAMEVAR_PERPLAYER -gamevar WEAPON8_SHOOTS 2563 GAMEVAR_PERPLAYER -gamevar WEAPON8_SPAWNTIME 0 GAMEVAR_PERPLAYER -gamevar WEAPON8_SPAWN 0 GAMEVAR_PERPLAYER -gamevar WEAPON8_SHOTSPERBURST 0 GAMEVAR_PERPLAYER -gamevar WEAPON8_INITIALSOUND 0 GAMEVAR_PERPLAYER -gamevar WEAPON8_FIRESOUND 0 GAMEVAR_PERPLAYER -gamevar WEAPON8_SOUND2TIME 0 GAMEVAR_PERPLAYER -gamevar WEAPON8_SOUND2SOUND 0 GAMEVAR_PERPLAYER -gamevar WEAPON8_RELOADSOUND1 4 GAMEVAR_PERPLAYER -gamevar WEAPON8_RELOADSOUND2 5 GAMEVAR_PERPLAYER - -gamevar WEAPON9_WORKSLIKE 9 GAMEVAR_PERPLAYER -gamevar WEAPON9_CLIP 0 GAMEVAR_PERPLAYER -gamevar WEAPON9_RELOAD 0 GAMEVAR_PERPLAYER -gamevar WEAPON9_FIREDELAY 3 GAMEVAR_PERPLAYER -gamevar WEAPON9_TOTALTIME 5 GAMEVAR_PERPLAYER -gamevar WEAPON9_HOLDDELAY 0 GAMEVAR_PERPLAYER -gamevar WEAPON9_FLAGS 65536 GAMEVAR_PERPLAYER -gamevar WEAPON9_SHOOTS 1641 GAMEVAR_PERPLAYER -gamevar WEAPON9_SPAWNTIME 0 GAMEVAR_PERPLAYER -gamevar WEAPON9_SPAWN 0 GAMEVAR_PERPLAYER -gamevar WEAPON9_SHOTSPERBURST 0 GAMEVAR_PERPLAYER -gamevar WEAPON9_INITIALSOUND 10 GAMEVAR_PERPLAYER -gamevar WEAPON9_FIRESOUND 10 GAMEVAR_PERPLAYER -gamevar WEAPON9_SOUND2TIME 0 GAMEVAR_PERPLAYER -gamevar WEAPON9_SOUND2SOUND 0 GAMEVAR_PERPLAYER -gamevar WEAPON9_RELOADSOUND1 4 GAMEVAR_PERPLAYER -gamevar WEAPON9_RELOADSOUND2 5 GAMEVAR_PERPLAYER - -gamevar WEAPON10_WORKSLIKE 10 GAMEVAR_PERPLAYER -gamevar WEAPON10_CLIP 0 GAMEVAR_PERPLAYER -gamevar WEAPON10_RELOAD 10 GAMEVAR_PERPLAYER -gamevar WEAPON10_FIREDELAY 2 GAMEVAR_PERPLAYER -gamevar WEAPON10_TOTALTIME 10 GAMEVAR_PERPLAYER -gamevar WEAPON10_HOLDDELAY 0 GAMEVAR_PERPLAYER -gamevar WEAPON10_FLAGS 384 GAMEVAR_PERPLAYER -gamevar WEAPON10_SHOOTS 0 GAMEVAR_PERPLAYER -gamevar WEAPON10_SPAWNTIME 0 GAMEVAR_PERPLAYER -gamevar WEAPON10_SPAWN 0 GAMEVAR_PERPLAYER -gamevar WEAPON10_SHOTSPERBURST 0 GAMEVAR_PERPLAYER -gamevar WEAPON10_INITIALSOUND 0 GAMEVAR_PERPLAYER -gamevar WEAPON10_FIRESOUND 0 GAMEVAR_PERPLAYER -gamevar WEAPON10_SOUND2TIME 0 GAMEVAR_PERPLAYER -gamevar WEAPON10_SOUND2SOUND 0 GAMEVAR_PERPLAYER -gamevar WEAPON10_RELOADSOUND1 4 GAMEVAR_PERPLAYER -gamevar WEAPON10_RELOADSOUND2 5 GAMEVAR_PERPLAYER - -gamevar WEAPON11_WORKSLIKE 11 GAMEVAR_PERPLAYER -gamevar WEAPON11_CLIP 0 GAMEVAR_PERPLAYER -gamevar WEAPON11_RELOAD 0 GAMEVAR_PERPLAYER -gamevar WEAPON11_FIREDELAY 4 GAMEVAR_PERPLAYER -gamevar WEAPON11_TOTALTIME 5 GAMEVAR_PERPLAYER -gamevar WEAPON11_HOLDDELAY 0 GAMEVAR_PERPLAYER -gamevar WEAPON11_FLAGS 2 GAMEVAR_PERPLAYER -gamevar WEAPON11_SHOOTS 2448 GAMEVAR_PERPLAYER -gamevar WEAPON11_SPAWNTIME 0 GAMEVAR_PERPLAYER -gamevar WEAPON11_SPAWN 0 GAMEVAR_PERPLAYER -gamevar WEAPON11_SHOTSPERBURST 0 GAMEVAR_PERPLAYER -gamevar WEAPON11_INITIALSOUND 0 GAMEVAR_PERPLAYER -gamevar WEAPON11_FIRESOUND 388 GAMEVAR_PERPLAYER -gamevar WEAPON11_SOUND2TIME 0 GAMEVAR_PERPLAYER -gamevar WEAPON11_SOUND2SOUND 0 GAMEVAR_PERPLAYER -gamevar WEAPON11_RELOADSOUND1 4 GAMEVAR_PERPLAYER -gamevar WEAPON11_RELOADSOUND2 5 GAMEVAR_PERPLAYER - -gamevar GRENADE_LIFETIME 120 GAMEVAR_PERPLAYER -gamevar GRENADE_LIFETIME_VAR 30 GAMEVAR_PERPLAYER - -gamevar STICKYBOMB_LIFETIME 120 GAMEVAR_PERPLAYER -gamevar STICKYBOMB_LIFETIME_VAR 30 GAMEVAR_PERPLAYER - -gamevar TRIPBOMB_CONTROL 1 GAMEVAR_PERPLAYER // set value to 2 for timed bomb -gamevar PIPEBOMB_CONTROL 1 GAMEVAR_PERPLAYER // set value to 2 for grenade behavior diff --git a/polymer/eduke32/source/jaudiolib/third-party/Windows/lib/instructions.txt b/polymer/eduke32/source/jaudiolib/third-party/Windows/lib/instructions.txt deleted file mode 100644 index 807059565..000000000 --- a/polymer/eduke32/source/jaudiolib/third-party/Windows/lib/instructions.txt +++ /dev/null @@ -1 +0,0 @@ -See "polymer\eduke32\Windows\lib\instructions.txt". diff --git a/polymer/eduke32/source/gpl-2.0.txt b/source/audiolib/gpl-2.0.txt similarity index 100% rename from polymer/eduke32/source/gpl-2.0.txt rename to source/audiolib/gpl-2.0.txt diff --git a/polymer/eduke32/source/jaudiolib/include/drivers.h b/source/audiolib/include/drivers.h similarity index 100% rename from polymer/eduke32/source/jaudiolib/include/drivers.h rename to source/audiolib/include/drivers.h diff --git a/polymer/eduke32/source/jaudiolib/include/fx_man.h b/source/audiolib/include/fx_man.h similarity index 100% rename from polymer/eduke32/source/jaudiolib/include/fx_man.h rename to source/audiolib/include/fx_man.h diff --git a/polymer/eduke32/source/jaudiolib/include/multivoc.h b/source/audiolib/include/multivoc.h similarity index 100% rename from polymer/eduke32/source/jaudiolib/include/multivoc.h rename to source/audiolib/include/multivoc.h diff --git a/polymer/eduke32/source/jaudiolib/include/music.h b/source/audiolib/include/music.h similarity index 100% rename from polymer/eduke32/source/jaudiolib/include/music.h rename to source/audiolib/include/music.h diff --git a/polymer/eduke32/source/jaudiolib/src/_multivc.h b/source/audiolib/src/_multivc.h similarity index 100% rename from polymer/eduke32/source/jaudiolib/src/_multivc.h rename to source/audiolib/src/_multivc.h diff --git a/polymer/eduke32/source/jaudiolib/src/driver_directsound.c b/source/audiolib/src/driver_directsound.cpp similarity index 100% rename from polymer/eduke32/source/jaudiolib/src/driver_directsound.c rename to source/audiolib/src/driver_directsound.cpp diff --git a/polymer/eduke32/source/jaudiolib/src/driver_directsound.h b/source/audiolib/src/driver_directsound.h similarity index 100% rename from polymer/eduke32/source/jaudiolib/src/driver_directsound.h rename to source/audiolib/src/driver_directsound.h diff --git a/polymer/eduke32/source/jaudiolib/src/driver_nosound.c b/source/audiolib/src/driver_nosound.cpp similarity index 100% rename from polymer/eduke32/source/jaudiolib/src/driver_nosound.c rename to source/audiolib/src/driver_nosound.cpp diff --git a/polymer/eduke32/source/jaudiolib/src/driver_nosound.h b/source/audiolib/src/driver_nosound.h similarity index 100% rename from polymer/eduke32/source/jaudiolib/src/driver_nosound.h rename to source/audiolib/src/driver_nosound.h diff --git a/polymer/eduke32/source/jaudiolib/src/driver_sdl.c b/source/audiolib/src/driver_sdl.cpp similarity index 100% rename from polymer/eduke32/source/jaudiolib/src/driver_sdl.c rename to source/audiolib/src/driver_sdl.cpp diff --git a/polymer/eduke32/source/jaudiolib/src/driver_sdl.h b/source/audiolib/src/driver_sdl.h similarity index 100% rename from polymer/eduke32/source/jaudiolib/src/driver_sdl.h rename to source/audiolib/src/driver_sdl.h diff --git a/polymer/eduke32/source/jaudiolib/src/drivers.c b/source/audiolib/src/drivers.cpp similarity index 100% rename from polymer/eduke32/source/jaudiolib/src/drivers.c rename to source/audiolib/src/drivers.cpp diff --git a/polymer/eduke32/source/jaudiolib/src/flac.c b/source/audiolib/src/flac.cpp similarity index 100% rename from polymer/eduke32/source/jaudiolib/src/flac.c rename to source/audiolib/src/flac.cpp diff --git a/polymer/eduke32/source/jaudiolib/src/formats.c b/source/audiolib/src/formats.cpp similarity index 100% rename from polymer/eduke32/source/jaudiolib/src/formats.c rename to source/audiolib/src/formats.cpp diff --git a/polymer/eduke32/source/jaudiolib/src/fx_man.c b/source/audiolib/src/fx_man.cpp similarity index 100% rename from polymer/eduke32/source/jaudiolib/src/fx_man.c rename to source/audiolib/src/fx_man.cpp diff --git a/polymer/eduke32/source/jaudiolib/src/linklist.h b/source/audiolib/src/linklist.h similarity index 100% rename from polymer/eduke32/source/jaudiolib/src/linklist.h rename to source/audiolib/src/linklist.h diff --git a/polymer/eduke32/source/jaudiolib/src/mix.c b/source/audiolib/src/mix.cpp similarity index 100% rename from polymer/eduke32/source/jaudiolib/src/mix.c rename to source/audiolib/src/mix.cpp diff --git a/polymer/eduke32/source/jaudiolib/src/mixst.c b/source/audiolib/src/mixst.cpp similarity index 100% rename from polymer/eduke32/source/jaudiolib/src/mixst.c rename to source/audiolib/src/mixst.cpp diff --git a/polymer/eduke32/source/jaudiolib/src/multivoc.c b/source/audiolib/src/multivoc.cpp similarity index 100% rename from polymer/eduke32/source/jaudiolib/src/multivoc.c rename to source/audiolib/src/multivoc.cpp diff --git a/polymer/eduke32/source/jaudiolib/src/pitch.c b/source/audiolib/src/pitch.cpp similarity index 100% rename from polymer/eduke32/source/jaudiolib/src/pitch.c rename to source/audiolib/src/pitch.cpp diff --git a/polymer/eduke32/source/jaudiolib/src/pitch.h b/source/audiolib/src/pitch.h similarity index 100% rename from polymer/eduke32/source/jaudiolib/src/pitch.h rename to source/audiolib/src/pitch.h diff --git a/polymer/eduke32/source/jaudiolib/src/vorbis.c b/source/audiolib/src/vorbis.cpp similarity index 100% rename from polymer/eduke32/source/jaudiolib/src/vorbis.c rename to source/audiolib/src/vorbis.cpp diff --git a/polymer/eduke32/source/jaudiolib/src/xa.c b/source/audiolib/src/xa.cpp similarity index 100% rename from polymer/eduke32/source/jaudiolib/src/xa.c rename to source/audiolib/src/xa.cpp diff --git a/polymer/eduke32/source/jaudiolib/src/xmp.c b/source/audiolib/src/xmp.cpp similarity index 100% rename from polymer/eduke32/source/jaudiolib/src/xmp.c rename to source/audiolib/src/xmp.cpp diff --git a/polymer/eduke32/build/Makefile.deps b/source/build/Dependencies.mak similarity index 100% rename from polymer/eduke32/build/Makefile.deps rename to source/build/Dependencies.mak diff --git a/polymer/eduke32/package/common/buildlic.txt b/source/build/buildlic.txt similarity index 100% rename from polymer/eduke32/package/common/buildlic.txt rename to source/build/buildlic.txt diff --git a/polymer/eduke32/build/doc/build.txt b/source/build/doc/build.txt similarity index 100% rename from polymer/eduke32/build/doc/build.txt rename to source/build/doc/build.txt diff --git a/polymer/eduke32/build/doc/build2.txt b/source/build/doc/build2.txt similarity index 100% rename from polymer/eduke32/build/doc/build2.txt rename to source/build/doc/build2.txt diff --git a/polymer/eduke32/build/doc/buildinf.txt b/source/build/doc/buildinf.txt similarity index 100% rename from polymer/eduke32/build/doc/buildinf.txt rename to source/build/doc/buildinf.txt diff --git a/polymer/eduke32/build/doc/todo.txt b/source/build/doc/todo.txt similarity index 100% rename from polymer/eduke32/build/doc/todo.txt rename to source/build/doc/todo.txt diff --git a/polymer/eduke32/build/include/a.h b/source/build/include/a.h similarity index 100% rename from polymer/eduke32/build/include/a.h rename to source/build/include/a.h diff --git a/polymer/eduke32/source/animvpx.h b/source/build/include/animvpx.h similarity index 100% rename from polymer/eduke32/source/animvpx.h rename to source/build/include/animvpx.h diff --git a/polymer/eduke32/build/include/baselayer.h b/source/build/include/baselayer.h similarity index 100% rename from polymer/eduke32/build/include/baselayer.h rename to source/build/include/baselayer.h diff --git a/polymer/eduke32/build/include/build.h b/source/build/include/build.h similarity index 100% rename from polymer/eduke32/build/include/build.h rename to source/build/include/build.h diff --git a/polymer/eduke32/build/include/buildtypes.h b/source/build/include/buildtypes.h similarity index 100% rename from polymer/eduke32/build/include/buildtypes.h rename to source/build/include/buildtypes.h diff --git a/polymer/eduke32/build/include/cache1d.h b/source/build/include/cache1d.h similarity index 100% rename from polymer/eduke32/build/include/cache1d.h rename to source/build/include/cache1d.h diff --git a/polymer/eduke32/build/include/clip.h b/source/build/include/clip.h similarity index 100% rename from polymer/eduke32/build/include/clip.h rename to source/build/include/clip.h diff --git a/polymer/eduke32/build/include/colmatch.h b/source/build/include/colmatch.h similarity index 100% rename from polymer/eduke32/build/include/colmatch.h rename to source/build/include/colmatch.h diff --git a/polymer/eduke32/build/include/common.h b/source/build/include/common.h similarity index 100% rename from polymer/eduke32/build/include/common.h rename to source/build/include/common.h diff --git a/polymer/eduke32/build/include/compat.h b/source/build/include/compat.h similarity index 100% rename from polymer/eduke32/build/include/compat.h rename to source/build/include/compat.h diff --git a/polymer/eduke32/build/include/crc32.h b/source/build/include/crc32.h similarity index 100% rename from polymer/eduke32/build/include/crc32.h rename to source/build/include/crc32.h diff --git a/polymer/eduke32/build/include/dxdidf.h b/source/build/include/dxdidf.h similarity index 100% rename from polymer/eduke32/build/include/dxdidf.h rename to source/build/include/dxdidf.h diff --git a/polymer/eduke32/build/include/dxtfilter.h b/source/build/include/dxtfilter.h similarity index 100% rename from polymer/eduke32/build/include/dxtfilter.h rename to source/build/include/dxtfilter.h diff --git a/polymer/eduke32/build/include/dynamicgtk.h b/source/build/include/dynamicgtk.h similarity index 100% rename from polymer/eduke32/build/include/dynamicgtk.h rename to source/build/include/dynamicgtk.h diff --git a/polymer/eduke32/build/include/editor.h b/source/build/include/editor.h similarity index 100% rename from polymer/eduke32/build/include/editor.h rename to source/build/include/editor.h diff --git a/polymer/eduke32/build/include/glbuild.h b/source/build/include/glbuild.h similarity index 100% rename from polymer/eduke32/build/include/glbuild.h rename to source/build/include/glbuild.h diff --git a/polymer/eduke32/build/include/glext.h b/source/build/include/glext.h similarity index 100% rename from polymer/eduke32/build/include/glext.h rename to source/build/include/glext.h diff --git a/polymer/eduke32/build/include/gtkbits.h b/source/build/include/gtkbits.h similarity index 100% rename from polymer/eduke32/build/include/gtkbits.h rename to source/build/include/gtkbits.h diff --git a/polymer/eduke32/build/include/gtkpixdata.h b/source/build/include/gtkpixdata.h similarity index 100% rename from polymer/eduke32/build/include/gtkpixdata.h rename to source/build/include/gtkpixdata.h diff --git a/polymer/eduke32/build/include/gtkpixdata_shim.h b/source/build/include/gtkpixdata_shim.h similarity index 100% rename from polymer/eduke32/build/include/gtkpixdata_shim.h rename to source/build/include/gtkpixdata_shim.h diff --git a/polymer/eduke32/build/include/hash.h b/source/build/include/hash.h similarity index 100% rename from polymer/eduke32/build/include/hash.h rename to source/build/include/hash.h diff --git a/polymer/eduke32/build/include/hightile.h b/source/build/include/hightile.h similarity index 100% rename from polymer/eduke32/build/include/hightile.h rename to source/build/include/hightile.h diff --git a/polymer/eduke32/build/include/jwzgles.h b/source/build/include/jwzgles.h similarity index 100% rename from polymer/eduke32/build/include/jwzgles.h rename to source/build/include/jwzgles.h diff --git a/polymer/eduke32/build/include/jwzglesI.h b/source/build/include/jwzglesI.h similarity index 100% rename from polymer/eduke32/build/include/jwzglesI.h rename to source/build/include/jwzglesI.h diff --git a/polymer/eduke32/build/include/kplib.h b/source/build/include/kplib.h similarity index 100% rename from polymer/eduke32/build/include/kplib.h rename to source/build/include/kplib.h diff --git a/polymer/eduke32/build/include/libdivide.h b/source/build/include/libdivide.h similarity index 100% rename from polymer/eduke32/build/include/libdivide.h rename to source/build/include/libdivide.h diff --git a/polymer/eduke32/build/include/lunatic.h b/source/build/include/lunatic.h similarity index 100% rename from polymer/eduke32/build/include/lunatic.h rename to source/build/include/lunatic.h diff --git a/polymer/eduke32/build/include/lz4.h b/source/build/include/lz4.h similarity index 100% rename from polymer/eduke32/build/include/lz4.h rename to source/build/include/lz4.h diff --git a/polymer/eduke32/build/include/m32script.h b/source/build/include/m32script.h similarity index 100% rename from polymer/eduke32/build/include/m32script.h rename to source/build/include/m32script.h diff --git a/polymer/eduke32/build/include/md4.h b/source/build/include/md4.h similarity index 100% rename from polymer/eduke32/build/include/md4.h rename to source/build/include/md4.h diff --git a/polymer/eduke32/build/include/mdsprite.h b/source/build/include/mdsprite.h similarity index 100% rename from polymer/eduke32/build/include/mdsprite.h rename to source/build/include/mdsprite.h diff --git a/polymer/eduke32/build/include/mmulti.h b/source/build/include/mmulti.h similarity index 100% rename from polymer/eduke32/build/include/mmulti.h rename to source/build/include/mmulti.h diff --git a/polymer/eduke32/build/include/msvc/inttypes.h b/source/build/include/msvc/inttypes.h similarity index 100% rename from polymer/eduke32/build/include/msvc/inttypes.h rename to source/build/include/msvc/inttypes.h diff --git a/polymer/eduke32/build/include/msvc/stdint.h b/source/build/include/msvc/stdint.h similarity index 100% rename from polymer/eduke32/build/include/msvc/stdint.h rename to source/build/include/msvc/stdint.h diff --git a/polymer/eduke32/build/include/mutex.h b/source/build/include/mutex.h similarity index 100% rename from polymer/eduke32/build/include/mutex.h rename to source/build/include/mutex.h diff --git a/polymer/eduke32/build/include/osd.h b/source/build/include/osd.h similarity index 100% rename from polymer/eduke32/build/include/osd.h rename to source/build/include/osd.h diff --git a/polymer/eduke32/build/include/osxbits.h b/source/build/include/osxbits.h similarity index 100% rename from polymer/eduke32/build/include/osxbits.h rename to source/build/include/osxbits.h diff --git a/polymer/eduke32/build/include/osxmain.h b/source/build/include/osxmain.h similarity index 100% rename from polymer/eduke32/build/include/osxmain.h rename to source/build/include/osxmain.h diff --git a/polymer/eduke32/build/include/palette.h b/source/build/include/palette.h similarity index 100% rename from polymer/eduke32/build/include/palette.h rename to source/build/include/palette.h diff --git a/polymer/eduke32/build/include/polymer.h b/source/build/include/polymer.h similarity index 100% rename from polymer/eduke32/build/include/polymer.h rename to source/build/include/polymer.h diff --git a/polymer/eduke32/build/include/polymost.h b/source/build/include/polymost.h similarity index 100% rename from polymer/eduke32/build/include/polymost.h rename to source/build/include/polymost.h diff --git a/polymer/eduke32/build/include/pragmas.h b/source/build/include/pragmas.h similarity index 100% rename from polymer/eduke32/build/include/pragmas.h rename to source/build/include/pragmas.h diff --git a/polymer/eduke32/build/include/pragmas_arm.h b/source/build/include/pragmas_arm.h similarity index 100% rename from polymer/eduke32/build/include/pragmas_arm.h rename to source/build/include/pragmas_arm.h diff --git a/polymer/eduke32/build/include/pragmas_ppc.h b/source/build/include/pragmas_ppc.h similarity index 100% rename from polymer/eduke32/build/include/pragmas_ppc.h rename to source/build/include/pragmas_ppc.h diff --git a/polymer/eduke32/build/include/pragmas_x86_gcc.h b/source/build/include/pragmas_x86_gcc.h similarity index 100% rename from polymer/eduke32/build/include/pragmas_x86_gcc.h rename to source/build/include/pragmas_x86_gcc.h diff --git a/polymer/eduke32/build/include/pragmas_x86_msvc.h b/source/build/include/pragmas_x86_msvc.h similarity index 100% rename from polymer/eduke32/build/include/pragmas_x86_msvc.h rename to source/build/include/pragmas_x86_msvc.h diff --git a/polymer/eduke32/build/include/prlights.h b/source/build/include/prlights.h similarity index 100% rename from polymer/eduke32/build/include/prlights.h rename to source/build/include/prlights.h diff --git a/polymer/eduke32/build/include/rawinput.h b/source/build/include/rawinput.h similarity index 100% rename from polymer/eduke32/build/include/rawinput.h rename to source/build/include/rawinput.h diff --git a/polymer/eduke32/build/include/renderlayer.h b/source/build/include/renderlayer.h similarity index 100% rename from polymer/eduke32/build/include/renderlayer.h rename to source/build/include/renderlayer.h diff --git a/polymer/eduke32/build/include/scancodes.h b/source/build/include/scancodes.h similarity index 100% rename from polymer/eduke32/build/include/scancodes.h rename to source/build/include/scancodes.h diff --git a/polymer/eduke32/build/include/scriptfile.h b/source/build/include/scriptfile.h similarity index 100% rename from polymer/eduke32/build/include/scriptfile.h rename to source/build/include/scriptfile.h diff --git a/polymer/eduke32/build/include/sdl_inc.h b/source/build/include/sdl_inc.h similarity index 100% rename from polymer/eduke32/build/include/sdl_inc.h rename to source/build/include/sdl_inc.h diff --git a/polymer/eduke32/build/include/sdlappicon.h b/source/build/include/sdlappicon.h similarity index 100% rename from polymer/eduke32/build/include/sdlappicon.h rename to source/build/include/sdlappicon.h diff --git a/polymer/eduke32/build/include/sdlayer.h b/source/build/include/sdlayer.h similarity index 100% rename from polymer/eduke32/build/include/sdlayer.h rename to source/build/include/sdlayer.h diff --git a/polymer/eduke32/build/include/startwin.editor.h b/source/build/include/startwin.editor.h similarity index 100% rename from polymer/eduke32/build/include/startwin.editor.h rename to source/build/include/startwin.editor.h diff --git a/polymer/eduke32/build/include/texcache.h b/source/build/include/texcache.h similarity index 100% rename from polymer/eduke32/build/include/texcache.h rename to source/build/include/texcache.h diff --git a/polymer/eduke32/build/include/tracker.hpp b/source/build/include/tracker.hpp similarity index 100% rename from polymer/eduke32/build/include/tracker.hpp rename to source/build/include/tracker.hpp diff --git a/polymer/eduke32/build/include/tracker_operator.hpp b/source/build/include/tracker_operator.hpp similarity index 100% rename from polymer/eduke32/build/include/tracker_operator.hpp rename to source/build/include/tracker_operator.hpp diff --git a/polymer/eduke32/build/include/tracker_operators.hpp b/source/build/include/tracker_operators.hpp similarity index 100% rename from polymer/eduke32/build/include/tracker_operators.hpp rename to source/build/include/tracker_operators.hpp diff --git a/polymer/eduke32/build/include/wiibits.h b/source/build/include/wiibits.h similarity index 100% rename from polymer/eduke32/build/include/wiibits.h rename to source/build/include/wiibits.h diff --git a/polymer/eduke32/build/include/winbits.h b/source/build/include/winbits.h similarity index 100% rename from polymer/eduke32/build/include/winbits.h rename to source/build/include/winbits.h diff --git a/polymer/eduke32/build/include/winlayer.h b/source/build/include/winlayer.h similarity index 100% rename from polymer/eduke32/build/include/winlayer.h rename to source/build/include/winlayer.h diff --git a/polymer/eduke32/build/include/xxhash.h b/source/build/include/xxhash.h similarity index 100% rename from polymer/eduke32/build/include/xxhash.h rename to source/build/include/xxhash.h diff --git a/polymer/eduke32/build/src/2d.c b/source/build/src/2d.cpp similarity index 100% rename from polymer/eduke32/build/src/2d.c rename to source/build/src/2d.cpp diff --git a/polymer/eduke32/build/src/SDLMain.m b/source/build/src/SDLMain.mm similarity index 100% rename from polymer/eduke32/build/src/SDLMain.m rename to source/build/src/SDLMain.mm diff --git a/polymer/eduke32/build/src/a-c.c b/source/build/src/a-c.cpp similarity index 100% rename from polymer/eduke32/build/src/a-c.c rename to source/build/src/a-c.cpp diff --git a/polymer/eduke32/build/src/a.masm b/source/build/src/a.masm similarity index 100% rename from polymer/eduke32/build/src/a.masm rename to source/build/src/a.masm diff --git a/polymer/eduke32/build/src/a.nasm b/source/build/src/a.nasm similarity index 100% rename from polymer/eduke32/build/src/a.nasm rename to source/build/src/a.nasm diff --git a/polymer/eduke32/build/src/a64.yasm b/source/build/src/a64.yasm similarity index 100% rename from polymer/eduke32/build/src/a64.yasm rename to source/build/src/a64.yasm diff --git a/polymer/eduke32/source/animvpx.c b/source/build/src/animvpx.cpp similarity index 100% rename from polymer/eduke32/source/animvpx.c rename to source/build/src/animvpx.cpp diff --git a/polymer/eduke32/build/src/baselayer.c b/source/build/src/baselayer.cpp similarity index 100% rename from polymer/eduke32/build/src/baselayer.c rename to source/build/src/baselayer.cpp diff --git a/polymer/eduke32/build/src/build.c b/source/build/src/build.cpp similarity index 100% rename from polymer/eduke32/build/src/build.c rename to source/build/src/build.cpp diff --git a/polymer/eduke32/build/src/cache1d.c b/source/build/src/cache1d.cpp similarity index 100% rename from polymer/eduke32/build/src/cache1d.c rename to source/build/src/cache1d.cpp diff --git a/polymer/eduke32/build/src/clip.c b/source/build/src/clip.cpp similarity index 100% rename from polymer/eduke32/build/src/clip.c rename to source/build/src/clip.cpp diff --git a/polymer/eduke32/build/src/colmatch.c b/source/build/src/colmatch.cpp similarity index 100% rename from polymer/eduke32/build/src/colmatch.c rename to source/build/src/colmatch.cpp diff --git a/polymer/eduke32/build/src/common.c b/source/build/src/common.cpp similarity index 100% rename from polymer/eduke32/build/src/common.c rename to source/build/src/common.cpp diff --git a/polymer/eduke32/build/src/compat.c b/source/build/src/compat.cpp similarity index 100% rename from polymer/eduke32/build/src/compat.c rename to source/build/src/compat.cpp diff --git a/polymer/eduke32/build/src/config.c b/source/build/src/config.cpp similarity index 100% rename from polymer/eduke32/build/src/config.c rename to source/build/src/config.cpp diff --git a/polymer/eduke32/build/src/crc32.c b/source/build/src/crc32.cpp similarity index 100% rename from polymer/eduke32/build/src/crc32.c rename to source/build/src/crc32.cpp diff --git a/polymer/eduke32/build/src/defs.c b/source/build/src/defs.cpp similarity index 100% rename from polymer/eduke32/build/src/defs.c rename to source/build/src/defs.cpp diff --git a/polymer/eduke32/build/src/dxtfilter.c b/source/build/src/dxtfilter.cpp similarity index 100% rename from polymer/eduke32/build/src/dxtfilter.c rename to source/build/src/dxtfilter.cpp diff --git a/polymer/eduke32/build/src/dynamicgtk.c b/source/build/src/dynamicgtk.cpp similarity index 100% rename from polymer/eduke32/build/src/dynamicgtk.c rename to source/build/src/dynamicgtk.cpp diff --git a/polymer/eduke32/build/src/engine.c b/source/build/src/engine.cpp similarity index 100% rename from polymer/eduke32/build/src/engine.c rename to source/build/src/engine.cpp diff --git a/polymer/eduke32/build/src/engine_oldmap.h b/source/build/src/engine_oldmap.h similarity index 100% rename from polymer/eduke32/build/src/engine_oldmap.h rename to source/build/src/engine_oldmap.h diff --git a/polymer/eduke32/build/src/engine_priv.h b/source/build/src/engine_priv.h similarity index 100% rename from polymer/eduke32/build/src/engine_priv.h rename to source/build/src/engine_priv.h diff --git a/polymer/eduke32/build/src/glbuild.c b/source/build/src/glbuild.cpp similarity index 100% rename from polymer/eduke32/build/src/glbuild.c rename to source/build/src/glbuild.cpp diff --git a/polymer/eduke32/build/src/gtkbits.c b/source/build/src/gtkbits.cpp similarity index 100% rename from polymer/eduke32/build/src/gtkbits.c rename to source/build/src/gtkbits.cpp diff --git a/polymer/eduke32/build/src/hash.c b/source/build/src/hash.cpp similarity index 100% rename from polymer/eduke32/build/src/hash.c rename to source/build/src/hash.cpp diff --git a/polymer/eduke32/build/src/hightile.c b/source/build/src/hightile.cpp similarity index 100% rename from polymer/eduke32/build/src/hightile.c rename to source/build/src/hightile.cpp diff --git a/polymer/eduke32/build/src/jwzgles.c b/source/build/src/jwzgles.c similarity index 100% rename from polymer/eduke32/build/src/jwzgles.c rename to source/build/src/jwzgles.c diff --git a/polymer/eduke32/build/src/kplib.c b/source/build/src/kplib.cpp similarity index 100% rename from polymer/eduke32/build/src/kplib.c rename to source/build/src/kplib.cpp diff --git a/polymer/eduke32/build/src/lunatic.c b/source/build/src/lunatic.cpp similarity index 100% rename from polymer/eduke32/build/src/lunatic.c rename to source/build/src/lunatic.cpp diff --git a/polymer/eduke32/build/src/lz4.c b/source/build/src/lz4.c similarity index 100% rename from polymer/eduke32/build/src/lz4.c rename to source/build/src/lz4.c diff --git a/polymer/eduke32/build/src/md4.c b/source/build/src/md4.cpp similarity index 100% rename from polymer/eduke32/build/src/md4.c rename to source/build/src/md4.cpp diff --git a/polymer/eduke32/build/src/mdsprite.c b/source/build/src/mdsprite.cpp similarity index 100% rename from polymer/eduke32/build/src/mdsprite.c rename to source/build/src/mdsprite.cpp diff --git a/polymer/eduke32/build/src/mhk.c b/source/build/src/mhk.cpp similarity index 100% rename from polymer/eduke32/build/src/mhk.c rename to source/build/src/mhk.cpp diff --git a/polymer/eduke32/build/src/mingw_main.c b/source/build/src/mingw_main.cpp similarity index 100% rename from polymer/eduke32/build/src/mingw_main.c rename to source/build/src/mingw_main.cpp diff --git a/polymer/eduke32/build/src/mmulti_null.c b/source/build/src/mmulti_null.cpp similarity index 100% rename from polymer/eduke32/build/src/mmulti_null.c rename to source/build/src/mmulti_null.cpp diff --git a/polymer/eduke32/build/src/mutex.c b/source/build/src/mutex.cpp similarity index 100% rename from polymer/eduke32/build/src/mutex.c rename to source/build/src/mutex.cpp diff --git a/polymer/eduke32/build/src/osd.c b/source/build/src/osd.cpp similarity index 100% rename from polymer/eduke32/build/src/osd.c rename to source/build/src/osd.cpp diff --git a/polymer/eduke32/build/src/osxbits.m b/source/build/src/osxbits.mm similarity index 100% rename from polymer/eduke32/build/src/osxbits.m rename to source/build/src/osxbits.mm diff --git a/polymer/eduke32/build/src/palette.c b/source/build/src/palette.cpp similarity index 100% rename from polymer/eduke32/build/src/palette.c rename to source/build/src/palette.cpp diff --git a/polymer/eduke32/build/src/polymer.c b/source/build/src/polymer.cpp similarity index 100% rename from polymer/eduke32/build/src/polymer.c rename to source/build/src/polymer.cpp diff --git a/polymer/eduke32/build/src/polymost.c b/source/build/src/polymost.cpp similarity index 100% rename from polymer/eduke32/build/src/polymost.c rename to source/build/src/polymost.cpp diff --git a/polymer/eduke32/build/src/pragmas.c b/source/build/src/pragmas.cpp similarity index 100% rename from polymer/eduke32/build/src/pragmas.c rename to source/build/src/pragmas.cpp diff --git a/polymer/eduke32/build/src/rawinput.c b/source/build/src/rawinput.cpp similarity index 100% rename from polymer/eduke32/build/src/rawinput.c rename to source/build/src/rawinput.cpp diff --git a/polymer/eduke32/source/rev.c b/source/build/src/rev.cpp similarity index 100% rename from polymer/eduke32/source/rev.c rename to source/build/src/rev.cpp diff --git a/polymer/eduke32/build/src/screenshot.c b/source/build/src/screenshot.cpp similarity index 100% rename from polymer/eduke32/build/src/screenshot.c rename to source/build/src/screenshot.cpp diff --git a/polymer/eduke32/build/src/scriptfile.c b/source/build/src/scriptfile.cpp similarity index 100% rename from polymer/eduke32/build/src/scriptfile.c rename to source/build/src/scriptfile.cpp diff --git a/polymer/eduke32/build/src/sdlayer.c b/source/build/src/sdlayer.cpp similarity index 100% rename from polymer/eduke32/build/src/sdlayer.c rename to source/build/src/sdlayer.cpp diff --git a/polymer/eduke32/build/src/sdlayer12.c b/source/build/src/sdlayer12.cpp similarity index 100% rename from polymer/eduke32/build/src/sdlayer12.c rename to source/build/src/sdlayer12.cpp diff --git a/polymer/eduke32/build/src/sdlkeytrans.c b/source/build/src/sdlkeytrans.cpp similarity index 100% rename from polymer/eduke32/build/src/sdlkeytrans.c rename to source/build/src/sdlkeytrans.cpp diff --git a/polymer/eduke32/build/src/smalltextfont.c b/source/build/src/smalltextfont.cpp similarity index 100% rename from polymer/eduke32/build/src/smalltextfont.c rename to source/build/src/smalltextfont.cpp diff --git a/polymer/eduke32/build/src/startgtk.editor.c b/source/build/src/startgtk.editor.cpp similarity index 100% rename from polymer/eduke32/build/src/startgtk.editor.c rename to source/build/src/startgtk.editor.cpp diff --git a/polymer/eduke32/build/src/startosx.editor.m b/source/build/src/startosx.editor.mm similarity index 100% rename from polymer/eduke32/build/src/startosx.editor.m rename to source/build/src/startosx.editor.mm diff --git a/polymer/eduke32/build/src/startwin.editor.c b/source/build/src/startwin.editor.cpp similarity index 100% rename from polymer/eduke32/build/src/startwin.editor.c rename to source/build/src/startwin.editor.cpp diff --git a/polymer/eduke32/build/src/texcache.c b/source/build/src/texcache.cpp similarity index 100% rename from polymer/eduke32/build/src/texcache.c rename to source/build/src/texcache.cpp diff --git a/polymer/eduke32/build/src/textfont.c b/source/build/src/textfont.cpp similarity index 100% rename from polymer/eduke32/build/src/textfont.c rename to source/build/src/textfont.cpp diff --git a/polymer/eduke32/build/src/tiles.c b/source/build/src/tiles.cpp similarity index 100% rename from polymer/eduke32/build/src/tiles.c rename to source/build/src/tiles.cpp diff --git a/polymer/eduke32/build/src/voxmodel.c b/source/build/src/voxmodel.cpp similarity index 100% rename from polymer/eduke32/build/src/voxmodel.c rename to source/build/src/voxmodel.cpp diff --git a/polymer/eduke32/build/src/wiibits.c b/source/build/src/wiibits.cpp similarity index 100% rename from polymer/eduke32/build/src/wiibits.c rename to source/build/src/wiibits.cpp diff --git a/polymer/eduke32/build/src/winbits.c b/source/build/src/winbits.cpp similarity index 100% rename from polymer/eduke32/build/src/winbits.c rename to source/build/src/winbits.cpp diff --git a/polymer/eduke32/build/src/winlayer.c b/source/build/src/winlayer.cpp similarity index 100% rename from polymer/eduke32/build/src/winlayer.c rename to source/build/src/winlayer.cpp diff --git a/polymer/eduke32/build/src/xxhash.c b/source/build/src/xxhash.c similarity index 100% rename from polymer/eduke32/build/src/xxhash.c rename to source/build/src/xxhash.c diff --git a/polymer/eduke32/Makefile.deps b/source/duke3d/Dependencies.mak similarity index 100% rename from polymer/eduke32/Makefile.deps rename to source/duke3d/Dependencies.mak diff --git a/polymer/eduke32/source/jaudiolib/gpl-2.0.txt b/source/duke3d/gpl-2.0.txt similarity index 100% rename from polymer/eduke32/source/jaudiolib/gpl-2.0.txt rename to source/duke3d/gpl-2.0.txt diff --git a/polymer/eduke32/rsrc/build.bmp b/source/duke3d/rsrc/build.bmp similarity index 100% rename from polymer/eduke32/rsrc/build.bmp rename to source/duke3d/rsrc/build.bmp diff --git a/polymer/eduke32/rsrc/build_icon.c b/source/duke3d/rsrc/build_icon.c similarity index 100% rename from polymer/eduke32/rsrc/build_icon.c rename to source/duke3d/rsrc/build_icon.c diff --git a/polymer/eduke32/rsrc/build_icon.ico b/source/duke3d/rsrc/build_icon.ico similarity index 100% rename from polymer/eduke32/rsrc/build_icon.ico rename to source/duke3d/rsrc/build_icon.ico diff --git a/polymer/eduke32/source/misc/buildres.rc b/source/duke3d/rsrc/buildres.rc similarity index 100% rename from polymer/eduke32/source/misc/buildres.rc rename to source/duke3d/rsrc/buildres.rc diff --git a/polymer/eduke32/rsrc/eduke32_icon.c b/source/duke3d/rsrc/eduke32_icon.c similarity index 100% rename from polymer/eduke32/rsrc/eduke32_icon.c rename to source/duke3d/rsrc/eduke32_icon.c diff --git a/polymer/eduke32/rsrc/eduke32_icon_32px.c b/source/duke3d/rsrc/eduke32_icon_32px.c similarity index 100% rename from polymer/eduke32/rsrc/eduke32_icon_32px.c rename to source/duke3d/rsrc/eduke32_icon_32px.c diff --git a/polymer/eduke32/rsrc/eduke32_icon_48px.c b/source/duke3d/rsrc/eduke32_icon_48px.c similarity index 100% rename from polymer/eduke32/rsrc/eduke32_icon_48px.c rename to source/duke3d/rsrc/eduke32_icon_48px.c diff --git a/polymer/eduke32/rsrc/game.bmp b/source/duke3d/rsrc/game.bmp similarity index 100% rename from polymer/eduke32/rsrc/game.bmp rename to source/duke3d/rsrc/game.bmp diff --git a/polymer/eduke32/rsrc/game_icon.c b/source/duke3d/rsrc/game_icon.c similarity index 100% rename from polymer/eduke32/rsrc/game_icon.c rename to source/duke3d/rsrc/game_icon.c diff --git a/polymer/eduke32/rsrc/game_icon.ico b/source/duke3d/rsrc/game_icon.ico similarity index 100% rename from polymer/eduke32/rsrc/game_icon.ico rename to source/duke3d/rsrc/game_icon.ico diff --git a/polymer/eduke32/source/misc/gameres.rc b/source/duke3d/rsrc/gameres.rc similarity index 100% rename from polymer/eduke32/source/misc/gameres.rc rename to source/duke3d/rsrc/gameres.rc diff --git a/polymer/eduke32/rsrc/manifest.build.xml b/source/duke3d/rsrc/manifest.build.xml similarity index 100% rename from polymer/eduke32/rsrc/manifest.build.xml rename to source/duke3d/rsrc/manifest.build.xml diff --git a/polymer/eduke32/rsrc/manifest.game.xml b/source/duke3d/rsrc/manifest.game.xml similarity index 100% rename from polymer/eduke32/rsrc/manifest.game.xml rename to source/duke3d/rsrc/manifest.game.xml diff --git a/polymer/eduke32/rsrc/source/EDuke32_logo_21_large.psd b/source/duke3d/rsrc/source/EDuke32_logo_21_large.psd similarity index 100% rename from polymer/eduke32/rsrc/source/EDuke32_logo_21_large.psd rename to source/duke3d/rsrc/source/EDuke32_logo_21_large.psd diff --git a/polymer/eduke32/rsrc/source/EDuke32_logo_21_large_blue.psd b/source/duke3d/rsrc/source/EDuke32_logo_21_large_blue.psd similarity index 100% rename from polymer/eduke32/rsrc/source/EDuke32_logo_21_large_blue.psd rename to source/duke3d/rsrc/source/EDuke32_logo_21_large_blue.psd diff --git a/polymer/eduke32/rsrc/source/EDuke32_logo_21_large_opaque.psd b/source/duke3d/rsrc/source/EDuke32_logo_21_large_opaque.psd similarity index 100% rename from polymer/eduke32/rsrc/source/EDuke32_logo_21_large_opaque.psd rename to source/duke3d/rsrc/source/EDuke32_logo_21_large_opaque.psd diff --git a/polymer/eduke32/rsrc/source/game2.psd b/source/duke3d/rsrc/source/game2.psd similarity index 100% rename from polymer/eduke32/rsrc/source/game2.psd rename to source/duke3d/rsrc/source/game2.psd diff --git a/polymer/eduke32/rsrc/source/game3.psd b/source/duke3d/rsrc/source/game3.psd similarity index 100% rename from polymer/eduke32/rsrc/source/game3.psd rename to source/duke3d/rsrc/source/game3.psd diff --git a/polymer/eduke32/rsrc/source/wii-hbc-icon.xcf b/source/duke3d/rsrc/source/wii-hbc-icon.xcf similarity index 100% rename from polymer/eduke32/rsrc/source/wii-hbc-icon.xcf rename to source/duke3d/rsrc/source/wii-hbc-icon.xcf diff --git a/polymer/eduke32/source/GameListSource.game.h b/source/duke3d/src/GameListSource.game.h similarity index 100% rename from polymer/eduke32/source/GameListSource.game.h rename to source/duke3d/src/GameListSource.game.h diff --git a/polymer/eduke32/source/GameListSource.game.m b/source/duke3d/src/GameListSource.game.mm similarity index 100% rename from polymer/eduke32/source/GameListSource.game.m rename to source/duke3d/src/GameListSource.game.mm diff --git a/polymer/eduke32/source/GrpFile.game.h b/source/duke3d/src/GrpFile.game.h similarity index 100% rename from polymer/eduke32/source/GrpFile.game.h rename to source/duke3d/src/GrpFile.game.h diff --git a/polymer/eduke32/source/GrpFile.game.m b/source/duke3d/src/GrpFile.game.mm similarity index 100% rename from polymer/eduke32/source/GrpFile.game.m rename to source/duke3d/src/GrpFile.game.mm diff --git a/polymer/eduke32/source/_functio.h b/source/duke3d/src/_functio.h similarity index 100% rename from polymer/eduke32/source/_functio.h rename to source/duke3d/src/_functio.h diff --git a/polymer/eduke32/source/_midi.h b/source/duke3d/src/_midi.h similarity index 100% rename from polymer/eduke32/source/_midi.h rename to source/duke3d/src/_midi.h diff --git a/polymer/eduke32/source/_rts.h b/source/duke3d/src/_rts.h similarity index 100% rename from polymer/eduke32/source/_rts.h rename to source/duke3d/src/_rts.h diff --git a/polymer/eduke32/source/actors.c b/source/duke3d/src/actors.cpp similarity index 100% rename from polymer/eduke32/source/actors.c rename to source/duke3d/src/actors.cpp diff --git a/polymer/eduke32/source/actors.h b/source/duke3d/src/actors.h similarity index 100% rename from polymer/eduke32/source/actors.h rename to source/duke3d/src/actors.h diff --git a/polymer/eduke32/source/android.h b/source/duke3d/src/android.h similarity index 100% rename from polymer/eduke32/source/android.h rename to source/duke3d/src/android.h diff --git a/polymer/eduke32/source/anim.c b/source/duke3d/src/anim.cpp similarity index 100% rename from polymer/eduke32/source/anim.c rename to source/duke3d/src/anim.cpp diff --git a/polymer/eduke32/source/anim.h b/source/duke3d/src/anim.h similarity index 100% rename from polymer/eduke32/source/anim.h rename to source/duke3d/src/anim.h diff --git a/polymer/eduke32/source/animsounds.c b/source/duke3d/src/animsounds.cpp similarity index 100% rename from polymer/eduke32/source/animsounds.c rename to source/duke3d/src/animsounds.cpp diff --git a/polymer/eduke32/source/animsounds.h b/source/duke3d/src/animsounds.h similarity index 100% rename from polymer/eduke32/source/animsounds.h rename to source/duke3d/src/animsounds.h diff --git a/polymer/eduke32/source/astub.c b/source/duke3d/src/astub.cpp similarity index 100% rename from polymer/eduke32/source/astub.c rename to source/duke3d/src/astub.cpp diff --git a/polymer/eduke32/source/cheats.c b/source/duke3d/src/cheats.cpp similarity index 100% rename from polymer/eduke32/source/cheats.c rename to source/duke3d/src/cheats.cpp diff --git a/polymer/eduke32/source/cheats.h b/source/duke3d/src/cheats.h similarity index 100% rename from polymer/eduke32/source/cheats.h rename to source/duke3d/src/cheats.h diff --git a/polymer/eduke32/source/cmdline.c b/source/duke3d/src/cmdline.cpp similarity index 100% rename from polymer/eduke32/source/cmdline.c rename to source/duke3d/src/cmdline.cpp diff --git a/polymer/eduke32/source/cmdline.h b/source/duke3d/src/cmdline.h similarity index 100% rename from polymer/eduke32/source/cmdline.h rename to source/duke3d/src/cmdline.h diff --git a/polymer/eduke32/source/common.c b/source/duke3d/src/common.cpp similarity index 100% rename from polymer/eduke32/source/common.c rename to source/duke3d/src/common.cpp diff --git a/polymer/eduke32/source/common_game.h b/source/duke3d/src/common_game.h similarity index 100% rename from polymer/eduke32/source/common_game.h rename to source/duke3d/src/common_game.h diff --git a/polymer/eduke32/source/config.c b/source/duke3d/src/config.cpp similarity index 100% rename from polymer/eduke32/source/config.c rename to source/duke3d/src/config.cpp diff --git a/polymer/eduke32/source/config.h b/source/duke3d/src/config.h similarity index 100% rename from polymer/eduke32/source/config.h rename to source/duke3d/src/config.h diff --git a/polymer/eduke32/source/demo.c b/source/duke3d/src/demo.cpp similarity index 100% rename from polymer/eduke32/source/demo.c rename to source/duke3d/src/demo.cpp diff --git a/polymer/eduke32/source/demo.h b/source/duke3d/src/demo.h similarity index 100% rename from polymer/eduke32/source/demo.h rename to source/duke3d/src/demo.h diff --git a/polymer/eduke32/source/duke3d.h b/source/duke3d/src/duke3d.h similarity index 100% rename from polymer/eduke32/source/duke3d.h rename to source/duke3d/src/duke3d.h diff --git a/polymer/eduke32/source/events_defs.h b/source/duke3d/src/events_defs.h similarity index 100% rename from polymer/eduke32/source/events_defs.h rename to source/duke3d/src/events_defs.h diff --git a/polymer/eduke32/source/function.h b/source/duke3d/src/function.h similarity index 100% rename from polymer/eduke32/source/function.h rename to source/duke3d/src/function.h diff --git a/polymer/eduke32/source/game.c b/source/duke3d/src/game.cpp similarity index 100% rename from polymer/eduke32/source/game.c rename to source/duke3d/src/game.cpp diff --git a/polymer/eduke32/source/game.h b/source/duke3d/src/game.h similarity index 100% rename from polymer/eduke32/source/game.h rename to source/duke3d/src/game.h diff --git a/polymer/eduke32/source/gamedef.c b/source/duke3d/src/gamedef.cpp similarity index 100% rename from polymer/eduke32/source/gamedef.c rename to source/duke3d/src/gamedef.cpp diff --git a/polymer/eduke32/source/gamedef.h b/source/duke3d/src/gamedef.h similarity index 100% rename from polymer/eduke32/source/gamedef.h rename to source/duke3d/src/gamedef.h diff --git a/polymer/eduke32/source/gamedefs.h b/source/duke3d/src/gamedefs.h similarity index 100% rename from polymer/eduke32/source/gamedefs.h rename to source/duke3d/src/gamedefs.h diff --git a/polymer/eduke32/source/gameexec.c b/source/duke3d/src/gameexec.cpp similarity index 100% rename from polymer/eduke32/source/gameexec.c rename to source/duke3d/src/gameexec.cpp diff --git a/polymer/eduke32/source/gameexec.h b/source/duke3d/src/gameexec.h similarity index 100% rename from polymer/eduke32/source/gameexec.h rename to source/duke3d/src/gameexec.h diff --git a/polymer/eduke32/source/gamestructures.c b/source/duke3d/src/gamestructures.cpp similarity index 100% rename from polymer/eduke32/source/gamestructures.c rename to source/duke3d/src/gamestructures.cpp diff --git a/polymer/eduke32/source/gamevars.c b/source/duke3d/src/gamevars.cpp similarity index 100% rename from polymer/eduke32/source/gamevars.c rename to source/duke3d/src/gamevars.cpp diff --git a/polymer/eduke32/source/gamevars.h b/source/duke3d/src/gamevars.h similarity index 100% rename from polymer/eduke32/source/gamevars.h rename to source/duke3d/src/gamevars.h diff --git a/polymer/eduke32/source/global.c b/source/duke3d/src/global.cpp similarity index 100% rename from polymer/eduke32/source/global.c rename to source/duke3d/src/global.cpp diff --git a/polymer/eduke32/source/global.h b/source/duke3d/src/global.h similarity index 100% rename from polymer/eduke32/source/global.h rename to source/duke3d/src/global.h diff --git a/polymer/eduke32/source/grpscan.c b/source/duke3d/src/grpscan.cpp similarity index 100% rename from polymer/eduke32/source/grpscan.c rename to source/duke3d/src/grpscan.cpp diff --git a/polymer/eduke32/source/grpscan.h b/source/duke3d/src/grpscan.h similarity index 100% rename from polymer/eduke32/source/grpscan.h rename to source/duke3d/src/grpscan.h diff --git a/polymer/eduke32/source/android/in_android.c b/source/duke3d/src/in_android.cpp similarity index 100% rename from polymer/eduke32/source/android/in_android.c rename to source/duke3d/src/in_android.cpp diff --git a/polymer/eduke32/source/android/in_android.h b/source/duke3d/src/in_android.h similarity index 100% rename from polymer/eduke32/source/android/in_android.h rename to source/duke3d/src/in_android.h diff --git a/polymer/eduke32/source/input.c b/source/duke3d/src/input.cpp similarity index 100% rename from polymer/eduke32/source/input.c rename to source/duke3d/src/input.cpp diff --git a/polymer/eduke32/source/input.h b/source/duke3d/src/input.h similarity index 100% rename from polymer/eduke32/source/input.h rename to source/duke3d/src/input.h diff --git a/polymer/eduke32/source/inv.h b/source/duke3d/src/inv.h similarity index 100% rename from polymer/eduke32/source/inv.h rename to source/duke3d/src/inv.h diff --git a/polymer/eduke32/source/keys.h b/source/duke3d/src/keys.h similarity index 100% rename from polymer/eduke32/source/keys.h rename to source/duke3d/src/keys.h diff --git a/polymer/eduke32/source/lunatic/defs_m32.ilua b/source/duke3d/src/lunatic/_defs_editor.lua similarity index 100% rename from polymer/eduke32/source/lunatic/defs_m32.ilua rename to source/duke3d/src/lunatic/_defs_editor.lua diff --git a/polymer/eduke32/source/lunatic/defs.ilua b/source/duke3d/src/lunatic/_defs_game.lua similarity index 100% rename from polymer/eduke32/source/lunatic/defs.ilua rename to source/duke3d/src/lunatic/_defs_game.lua diff --git a/polymer/eduke32/source/lunatic/bcarray.lua b/source/duke3d/src/lunatic/bcarray.lua similarity index 100% rename from polymer/eduke32/source/lunatic/bcarray.lua rename to source/duke3d/src/lunatic/bcarray.lua diff --git a/polymer/eduke32/source/lunatic/bcheck.lua b/source/duke3d/src/lunatic/bcheck.lua similarity index 100% rename from polymer/eduke32/source/lunatic/bcheck.lua rename to source/duke3d/src/lunatic/bcheck.lua diff --git a/polymer/eduke32/source/lunatic/bitar.lua b/source/duke3d/src/lunatic/bitar.lua similarity index 100% rename from polymer/eduke32/source/lunatic/bitar.lua rename to source/duke3d/src/lunatic/bitar.lua diff --git a/polymer/eduke32/source/lunatic/con_lang.lua b/source/duke3d/src/lunatic/con_lang.lua similarity index 100% rename from polymer/eduke32/source/lunatic/con_lang.lua rename to source/duke3d/src/lunatic/con_lang.lua diff --git a/polymer/eduke32/source/lunatic/control.lua b/source/duke3d/src/lunatic/control.lua similarity index 100% rename from polymer/eduke32/source/lunatic/control.lua rename to source/duke3d/src/lunatic/control.lua diff --git a/polymer/eduke32/source/lunatic/defs_common.lua b/source/duke3d/src/lunatic/defs_common.lua similarity index 100% rename from polymer/eduke32/source/lunatic/defs_common.lua rename to source/duke3d/src/lunatic/defs_common.lua diff --git a/polymer/eduke32/source/lunatic/dis_x64.lua b/source/duke3d/src/lunatic/dis_x64.lua similarity index 100% rename from polymer/eduke32/source/lunatic/dis_x64.lua rename to source/duke3d/src/lunatic/dis_x64.lua diff --git a/polymer/eduke32/source/lunatic/dis_x86.lua b/source/duke3d/src/lunatic/dis_x86.lua similarity index 100% rename from polymer/eduke32/source/lunatic/dis_x86.lua rename to source/duke3d/src/lunatic/dis_x86.lua diff --git a/polymer/eduke32/source/lunatic/doc/Makefile b/source/duke3d/src/lunatic/doc/Makefile similarity index 100% rename from polymer/eduke32/source/lunatic/doc/Makefile rename to source/duke3d/src/lunatic/doc/Makefile diff --git a/polymer/eduke32/source/lunatic/doc/din_w_collapse.png b/source/duke3d/src/lunatic/doc/din_w_collapse.png similarity index 100% rename from polymer/eduke32/source/lunatic/doc/din_w_collapse.png rename to source/duke3d/src/lunatic/doc/din_w_collapse.png diff --git a/polymer/eduke32/source/lunatic/doc/din_w_crushing.png b/source/duke3d/src/lunatic/doc/din_w_crushing.png similarity index 100% rename from polymer/eduke32/source/lunatic/doc/din_w_crushing.png rename to source/duke3d/src/lunatic/doc/din_w_crushing.png diff --git a/polymer/eduke32/source/lunatic/doc/din_w_explosive.png b/source/duke3d/src/lunatic/doc/din_w_explosive.png similarity index 100% rename from polymer/eduke32/source/lunatic/doc/din_w_explosive.png rename to source/duke3d/src/lunatic/doc/din_w_explosive.png diff --git a/polymer/eduke32/source/lunatic/doc/din_w_toxic.png b/source/duke3d/src/lunatic/doc/din_w_toxic.png similarity index 100% rename from polymer/eduke32/source/lunatic/doc/din_w_toxic.png rename to source/duke3d/src/lunatic/doc/din_w_toxic.png diff --git a/polymer/eduke32/source/lunatic/doc/how_to_build_lunatic.txt b/source/duke3d/src/lunatic/doc/how_to_build_lunatic.txt similarity index 100% rename from polymer/eduke32/source/lunatic/doc/how_to_build_lunatic.txt rename to source/duke3d/src/lunatic/doc/how_to_build_lunatic.txt diff --git a/polymer/eduke32/source/lunatic/doc/lpeg-lunatic.patch b/source/duke3d/src/lunatic/doc/lpeg-lunatic.patch similarity index 100% rename from polymer/eduke32/source/lunatic/doc/lpeg-lunatic.patch rename to source/duke3d/src/lunatic/doc/lpeg-lunatic.patch diff --git a/polymer/eduke32/source/lunatic/doc/lunacon.txt b/source/duke3d/src/lunatic/doc/lunacon.txt similarity index 100% rename from polymer/eduke32/source/lunatic/doc/lunacon.txt rename to source/duke3d/src/lunatic/doc/lunacon.txt diff --git a/polymer/eduke32/source/lunatic/doc/lunatic.conf b/source/duke3d/src/lunatic/doc/lunatic.conf similarity index 100% rename from polymer/eduke32/source/lunatic/doc/lunatic.conf rename to source/duke3d/src/lunatic/doc/lunatic.conf diff --git a/polymer/eduke32/source/lunatic/doc/lunatic.txt b/source/duke3d/src/lunatic/doc/lunatic.txt similarity index 100% rename from polymer/eduke32/source/lunatic/doc/lunatic.txt rename to source/duke3d/src/lunatic/doc/lunatic.txt diff --git a/polymer/eduke32/source/lunatic/doc/lunatic_sh.style b/source/duke3d/src/lunatic/doc/lunatic_sh.style similarity index 100% rename from polymer/eduke32/source/lunatic/doc/lunatic_sh.style rename to source/duke3d/src/lunatic/doc/lunatic_sh.style diff --git a/polymer/eduke32/source/lunatic/dump.lua b/source/duke3d/src/lunatic/dump.lua similarity index 100% rename from polymer/eduke32/source/lunatic/dump.lua rename to source/duke3d/src/lunatic/dump.lua diff --git a/polymer/eduke32/source/lunatic/dynsymlist_m32 b/source/duke3d/src/lunatic/dynsymlist_editor.lds similarity index 100% rename from polymer/eduke32/source/lunatic/dynsymlist_m32 rename to source/duke3d/src/lunatic/dynsymlist_editor.lds diff --git a/polymer/eduke32/source/lunatic/dynsymlist b/source/duke3d/src/lunatic/dynsymlist_game.lds similarity index 100% rename from polymer/eduke32/source/lunatic/dynsymlist rename to source/duke3d/src/lunatic/dynsymlist_game.lds diff --git a/polymer/eduke32/source/lunatic/engine.lua b/source/duke3d/src/lunatic/engine.lua similarity index 100% rename from polymer/eduke32/source/lunatic/engine.lua rename to source/duke3d/src/lunatic/engine.lua diff --git a/polymer/eduke32/source/lunatic/engine_maptext.lua b/source/duke3d/src/lunatic/engine_maptext.lua similarity index 100% rename from polymer/eduke32/source/lunatic/engine_maptext.lua rename to source/duke3d/src/lunatic/engine_maptext.lua diff --git a/polymer/eduke32/source/lunatic/fs.lua b/source/duke3d/src/lunatic/fs.lua similarity index 100% rename from polymer/eduke32/source/lunatic/fs.lua rename to source/duke3d/src/lunatic/fs.lua diff --git a/polymer/eduke32/source/lunatic/listglobals.sh b/source/duke3d/src/lunatic/listglobals.sh similarity index 100% rename from polymer/eduke32/source/lunatic/listglobals.sh rename to source/duke3d/src/lunatic/listglobals.sh diff --git a/polymer/eduke32/source/lunatic/lunacon.lua b/source/duke3d/src/lunatic/lunacon.lua similarity index 100% rename from polymer/eduke32/source/lunatic/lunacon.lua rename to source/duke3d/src/lunatic/lunacon.lua diff --git a/polymer/eduke32/source/lunatic/lunatic_m32.c b/source/duke3d/src/lunatic/lunatic_editor.cpp similarity index 100% rename from polymer/eduke32/source/lunatic/lunatic_m32.c rename to source/duke3d/src/lunatic/lunatic_editor.cpp diff --git a/polymer/eduke32/source/lunatic/lunatic_m32.h b/source/duke3d/src/lunatic/lunatic_editor.h similarity index 100% rename from polymer/eduke32/source/lunatic/lunatic_m32.h rename to source/duke3d/src/lunatic/lunatic_editor.h diff --git a/polymer/eduke32/source/lunatic/lunatic_game.c b/source/duke3d/src/lunatic/lunatic_game.cpp similarity index 100% rename from polymer/eduke32/source/lunatic/lunatic_game.c rename to source/duke3d/src/lunatic/lunatic_game.cpp diff --git a/polymer/eduke32/source/lunatic/lunatic_game.h b/source/duke3d/src/lunatic/lunatic_game.h similarity index 100% rename from polymer/eduke32/source/lunatic/lunatic_game.h rename to source/duke3d/src/lunatic/lunatic_game.h diff --git a/polymer/eduke32/source/lunatic/m32/compinside.lua b/source/duke3d/src/lunatic/m32/compinside.lua similarity index 100% rename from polymer/eduke32/source/lunatic/m32/compinside.lua rename to source/duke3d/src/lunatic/m32/compinside.lua diff --git a/polymer/eduke32/source/lunatic/m32/randwalk.lua b/source/duke3d/src/lunatic/m32/randwalk.lua similarity index 100% rename from polymer/eduke32/source/lunatic/m32/randwalk.lua rename to source/duke3d/src/lunatic/m32/randwalk.lua diff --git a/polymer/eduke32/source/lunatic/profdemo.lua b/source/duke3d/src/lunatic/profdemo.lua similarity index 100% rename from polymer/eduke32/source/lunatic/profdemo.lua rename to source/duke3d/src/lunatic/profdemo.lua diff --git a/polymer/eduke32/source/lunatic/randgen.lua b/source/duke3d/src/lunatic/randgen.lua similarity index 100% rename from polymer/eduke32/source/lunatic/randgen.lua rename to source/duke3d/src/lunatic/randgen.lua diff --git a/polymer/eduke32/source/lunatic/savegame.lua b/source/duke3d/src/lunatic/savegame.lua similarity index 100% rename from polymer/eduke32/source/lunatic/savegame.lua rename to source/duke3d/src/lunatic/savegame.lua diff --git a/polymer/eduke32/source/lunatic/stat.lua b/source/duke3d/src/lunatic/stat.lua similarity index 100% rename from polymer/eduke32/source/lunatic/stat.lua rename to source/duke3d/src/lunatic/stat.lua diff --git a/polymer/eduke32/source/lunatic/strict.lua b/source/duke3d/src/lunatic/strict.lua similarity index 100% rename from polymer/eduke32/source/lunatic/strict.lua rename to source/duke3d/src/lunatic/strict.lua diff --git a/polymer/eduke32/source/lunatic/test.lua b/source/duke3d/src/lunatic/test.lua similarity index 100% rename from polymer/eduke32/source/lunatic/test.lua rename to source/duke3d/src/lunatic/test.lua diff --git a/polymer/eduke32/source/lunatic/test/animatesprites.con b/source/duke3d/src/lunatic/test/animatesprites.con similarity index 100% rename from polymer/eduke32/source/lunatic/test/animatesprites.con rename to source/duke3d/src/lunatic/test/animatesprites.con diff --git a/polymer/eduke32/source/lunatic/test/checknearwall.con b/source/duke3d/src/lunatic/test/checknearwall.con similarity index 100% rename from polymer/eduke32/source/lunatic/test/checknearwall.con rename to source/duke3d/src/lunatic/test/checknearwall.con diff --git a/polymer/eduke32/source/lunatic/test/damagehplane.lua b/source/duke3d/src/lunatic/test/damagehplane.lua similarity index 100% rename from polymer/eduke32/source/lunatic/test/damagehplane.lua rename to source/duke3d/src/lunatic/test/damagehplane.lua diff --git a/polymer/eduke32/source/lunatic/test/dangling_else.con b/source/duke3d/src/lunatic/test/dangling_else.con similarity index 100% rename from polymer/eduke32/source/lunatic/test/dangling_else.con rename to source/duke3d/src/lunatic/test/dangling_else.con diff --git a/polymer/eduke32/source/lunatic/test/delmusicsfx.lua b/source/duke3d/src/lunatic/test/delmusicsfx.lua similarity index 100% rename from polymer/eduke32/source/lunatic/test/delmusicsfx.lua rename to source/duke3d/src/lunatic/test/delmusicsfx.lua diff --git a/polymer/eduke32/source/lunatic/test/else_brace_if.con b/source/duke3d/src/lunatic/test/else_brace_if.con similarity index 100% rename from polymer/eduke32/source/lunatic/test/else_brace_if.con rename to source/duke3d/src/lunatic/test/else_brace_if.con diff --git a/polymer/eduke32/source/lunatic/test/event_chaining.con b/source/duke3d/src/lunatic/test/event_chaining.con similarity index 100% rename from polymer/eduke32/source/lunatic/test/event_chaining.con rename to source/duke3d/src/lunatic/test/event_chaining.con diff --git a/polymer/eduke32/source/lunatic/test/gamearray.con b/source/duke3d/src/lunatic/test/gamearray.con similarity index 100% rename from polymer/eduke32/source/lunatic/test/gamearray.con rename to source/duke3d/src/lunatic/test/gamearray.con diff --git a/polymer/eduke32/source/lunatic/test/gettimedate.con b/source/duke3d/src/lunatic/test/gettimedate.con similarity index 100% rename from polymer/eduke32/source/lunatic/test/gettimedate.con rename to source/duke3d/src/lunatic/test/gettimedate.con diff --git a/polymer/eduke32/source/lunatic/test/getuserdef.con b/source/duke3d/src/lunatic/test/getuserdef.con similarity index 100% rename from polymer/eduke32/source/lunatic/test/getuserdef.con rename to source/duke3d/src/lunatic/test/getuserdef.con diff --git a/polymer/eduke32/source/lunatic/test/helixspawner.lua b/source/duke3d/src/lunatic/test/helixspawner.lua similarity index 100% rename from polymer/eduke32/source/lunatic/test/helixspawner.lua rename to source/duke3d/src/lunatic/test/helixspawner.lua diff --git a/polymer/eduke32/source/lunatic/test/mapstate.con b/source/duke3d/src/lunatic/test/mapstate.con similarity index 100% rename from polymer/eduke32/source/lunatic/test/mapstate.con rename to source/duke3d/src/lunatic/test/mapstate.con diff --git a/polymer/eduke32/source/lunatic/test/maputil.lua b/source/duke3d/src/lunatic/test/maputil.lua similarity index 100% rename from polymer/eduke32/source/lunatic/test/maputil.lua rename to source/duke3d/src/lunatic/test/maputil.lua diff --git a/polymer/eduke32/source/lunatic/test/nlcf_break.con b/source/duke3d/src/lunatic/test/nlcf_break.con similarity index 100% rename from polymer/eduke32/source/lunatic/test/nlcf_break.con rename to source/duke3d/src/lunatic/test/nlcf_break.con diff --git a/polymer/eduke32/source/lunatic/test/nlcf_return.con b/source/duke3d/src/lunatic/test/nlcf_return.con similarity index 100% rename from polymer/eduke32/source/lunatic/test/nlcf_return.con rename to source/duke3d/src/lunatic/test/nlcf_return.con diff --git a/polymer/eduke32/source/lunatic/test/qgetsysstr.con b/source/duke3d/src/lunatic/test/qgetsysstr.con similarity index 100% rename from polymer/eduke32/source/lunatic/test/qgetsysstr.con rename to source/duke3d/src/lunatic/test/qgetsysstr.con diff --git a/polymer/eduke32/source/lunatic/test/qsubstr.con b/source/duke3d/src/lunatic/test/qsubstr.con similarity index 100% rename from polymer/eduke32/source/lunatic/test/qsubstr.con rename to source/duke3d/src/lunatic/test/qsubstr.con diff --git a/polymer/eduke32/source/lunatic/test/quote_ops.con b/source/duke3d/src/lunatic/test/quote_ops.con similarity index 100% rename from polymer/eduke32/source/lunatic/test/quote_ops.con rename to source/duke3d/src/lunatic/test/quote_ops.con diff --git a/polymer/eduke32/source/lunatic/test/rotfixed_actor.con b/source/duke3d/src/lunatic/test/rotfixed_actor.con similarity index 100% rename from polymer/eduke32/source/lunatic/test/rotfixed_actor.con rename to source/duke3d/src/lunatic/test/rotfixed_actor.con diff --git a/polymer/eduke32/source/lunatic/test/screentext.con b/source/duke3d/src/lunatic/test/screentext.con similarity index 100% rename from polymer/eduke32/source/lunatic/test/screentext.con rename to source/duke3d/src/lunatic/test/screentext.con diff --git a/polymer/eduke32/source/lunatic/test/shadexfog.lua b/source/duke3d/src/lunatic/test/shadexfog.lua similarity index 100% rename from polymer/eduke32/source/lunatic/test/shadexfog.lua rename to source/duke3d/src/lunatic/test/shadexfog.lua diff --git a/polymer/eduke32/source/lunatic/test/sprite_access.con b/source/duke3d/src/lunatic/test/sprite_access.con similarity index 100% rename from polymer/eduke32/source/lunatic/test/sprite_access.con rename to source/duke3d/src/lunatic/test/sprite_access.con diff --git a/polymer/eduke32/source/lunatic/test/sprite_addtv.con b/source/duke3d/src/lunatic/test/sprite_addtv.con similarity index 100% rename from polymer/eduke32/source/lunatic/test/sprite_addtv.con rename to source/duke3d/src/lunatic/test/sprite_addtv.con diff --git a/polymer/eduke32/source/lunatic/test/switch.con b/source/duke3d/src/lunatic/test/switch.con similarity index 100% rename from polymer/eduke32/source/lunatic/test/switch.con rename to source/duke3d/src/lunatic/test/switch.con diff --git a/polymer/eduke32/source/lunatic/test/tables.lua b/source/duke3d/src/lunatic/test/tables.lua similarity index 100% rename from polymer/eduke32/source/lunatic/test/tables.lua rename to source/duke3d/src/lunatic/test/tables.lua diff --git a/polymer/eduke32/source/lunatic/test/test_bitar.lua b/source/duke3d/src/lunatic/test/test_bitar.lua similarity index 100% rename from polymer/eduke32/source/lunatic/test/test_bitar.lua rename to source/duke3d/src/lunatic/test/test_bitar.lua diff --git a/polymer/eduke32/source/lunatic/test/test_dists.lua b/source/duke3d/src/lunatic/test/test_dists.lua similarity index 100% rename from polymer/eduke32/source/lunatic/test/test_dists.lua rename to source/duke3d/src/lunatic/test/test_dists.lua diff --git a/polymer/eduke32/source/lunatic/test/test_geom.lua b/source/duke3d/src/lunatic/test/test_geom.lua similarity index 100% rename from polymer/eduke32/source/lunatic/test/test_geom.lua rename to source/duke3d/src/lunatic/test/test_geom.lua diff --git a/polymer/eduke32/source/lunatic/test/test_rotspr.lua b/source/duke3d/src/lunatic/test/test_rotspr.lua similarity index 100% rename from polymer/eduke32/source/lunatic/test/test_rotspr.lua rename to source/duke3d/src/lunatic/test/test_rotspr.lua diff --git a/polymer/eduke32/source/lunatic/test/thisactor_getzrange.con b/source/duke3d/src/lunatic/test/thisactor_getzrange.con similarity index 100% rename from polymer/eduke32/source/lunatic/test/thisactor_getzrange.con rename to source/duke3d/src/lunatic/test/thisactor_getzrange.con diff --git a/polymer/eduke32/source/lunatic/test/transhacktest.m32 b/source/duke3d/src/lunatic/test/transhacktest.m32 similarity index 100% rename from polymer/eduke32/source/lunatic/test/transhacktest.m32 rename to source/duke3d/src/lunatic/test/transhacktest.m32 diff --git a/polymer/eduke32/source/lunatic/test/transhacktest.map b/source/duke3d/src/lunatic/test/transhacktest.map similarity index 100% rename from polymer/eduke32/source/lunatic/test/transhacktest.map rename to source/duke3d/src/lunatic/test/transhacktest.map diff --git a/polymer/eduke32/source/lunatic/test/weaponvars.con b/source/duke3d/src/lunatic/test/weaponvars.con similarity index 100% rename from polymer/eduke32/source/lunatic/test/weaponvars.con rename to source/duke3d/src/lunatic/test/weaponvars.con diff --git a/polymer/eduke32/source/lunatic/util/bigytiles.lua b/source/duke3d/src/lunatic/util/bigytiles.lua similarity index 100% rename from polymer/eduke32/source/lunatic/util/bigytiles.lua rename to source/duke3d/src/lunatic/util/bigytiles.lua diff --git a/polymer/eduke32/source/lunatic/util/build.lua b/source/duke3d/src/lunatic/util/build.lua similarity index 100% rename from polymer/eduke32/source/lunatic/util/build.lua rename to source/duke3d/src/lunatic/util/build.lua diff --git a/polymer/eduke32/source/lunatic/util/cmpart.lua b/source/duke3d/src/lunatic/util/cmpart.lua similarity index 100% rename from polymer/eduke32/source/lunatic/util/cmpart.lua rename to source/duke3d/src/lunatic/util/cmpart.lua diff --git a/polymer/eduke32/source/lunatic/util/colenemy.lua b/source/duke3d/src/lunatic/util/colenemy.lua similarity index 100% rename from polymer/eduke32/source/lunatic/util/colenemy.lua rename to source/duke3d/src/lunatic/util/colenemy.lua diff --git a/polymer/eduke32/source/lunatic/util/findmaps.sh b/source/duke3d/src/lunatic/util/findmaps.sh similarity index 100% rename from polymer/eduke32/source/lunatic/util/findmaps.sh rename to source/duke3d/src/lunatic/util/findmaps.sh diff --git a/polymer/eduke32/source/lunatic/util/foreachmap.lua b/source/duke3d/src/lunatic/util/foreachmap.lua similarity index 100% rename from polymer/eduke32/source/lunatic/util/foreachmap.lua rename to source/duke3d/src/lunatic/util/foreachmap.lua diff --git a/polymer/eduke32/source/lunatic/util/map2text.lua b/source/duke3d/src/lunatic/util/map2text.lua similarity index 100% rename from polymer/eduke32/source/lunatic/util/map2text.lua rename to source/duke3d/src/lunatic/util/map2text.lua diff --git a/polymer/eduke32/source/lunatic/util/mapastats.lua b/source/duke3d/src/lunatic/util/mapastats.lua similarity index 100% rename from polymer/eduke32/source/lunatic/util/mapastats.lua rename to source/duke3d/src/lunatic/util/mapastats.lua diff --git a/polymer/eduke32/source/lunatic/util/mapdiff.sh b/source/duke3d/src/lunatic/util/mapdiff.sh similarity index 100% rename from polymer/eduke32/source/lunatic/util/mapdiff.sh rename to source/duke3d/src/lunatic/util/mapdiff.sh diff --git a/polymer/eduke32/source/lunatic/util/mapstats.lua b/source/duke3d/src/lunatic/util/mapstats.lua similarity index 100% rename from polymer/eduke32/source/lunatic/util/mapstats.lua rename to source/duke3d/src/lunatic/util/mapstats.lua diff --git a/polymer/eduke32/source/lunatic/util/mapypan.lua b/source/duke3d/src/lunatic/util/mapypan.lua similarity index 100% rename from polymer/eduke32/source/lunatic/util/mapypan.lua rename to source/duke3d/src/lunatic/util/mapypan.lua diff --git a/polymer/eduke32/source/lunatic/util/plax.lua b/source/duke3d/src/lunatic/util/plax.lua similarity index 100% rename from polymer/eduke32/source/lunatic/util/plax.lua rename to source/duke3d/src/lunatic/util/plax.lua diff --git a/polymer/eduke32/source/lunatic/v.lua b/source/duke3d/src/lunatic/v.lua similarity index 100% rename from polymer/eduke32/source/lunatic/v.lua rename to source/duke3d/src/lunatic/v.lua diff --git a/polymer/eduke32/source/lunatic/xmath.lua b/source/duke3d/src/lunatic/xmath.lua similarity index 100% rename from polymer/eduke32/source/lunatic/xmath.lua rename to source/duke3d/src/lunatic/xmath.lua diff --git a/polymer/eduke32/source/m32common.c b/source/duke3d/src/m32common.cpp similarity index 100% rename from polymer/eduke32/source/m32common.c rename to source/duke3d/src/m32common.cpp diff --git a/polymer/eduke32/source/m32def.c b/source/duke3d/src/m32def.cpp similarity index 100% rename from polymer/eduke32/source/m32def.c rename to source/duke3d/src/m32def.cpp diff --git a/polymer/eduke32/source/m32def.h b/source/duke3d/src/m32def.h similarity index 100% rename from polymer/eduke32/source/m32def.h rename to source/duke3d/src/m32def.h diff --git a/polymer/eduke32/source/m32exec.c b/source/duke3d/src/m32exec.cpp similarity index 100% rename from polymer/eduke32/source/m32exec.c rename to source/duke3d/src/m32exec.cpp diff --git a/polymer/eduke32/source/m32structures.c b/source/duke3d/src/m32structures.cpp similarity index 100% rename from polymer/eduke32/source/m32structures.c rename to source/duke3d/src/m32structures.cpp diff --git a/polymer/eduke32/source/m32vars.c b/source/duke3d/src/m32vars.cpp similarity index 100% rename from polymer/eduke32/source/m32vars.c rename to source/duke3d/src/m32vars.cpp diff --git a/polymer/eduke32/source/macros.h b/source/duke3d/src/macros.h similarity index 100% rename from polymer/eduke32/source/macros.h rename to source/duke3d/src/macros.h diff --git a/polymer/eduke32/source/mapster32.h b/source/duke3d/src/mapster32.h similarity index 100% rename from polymer/eduke32/source/mapster32.h rename to source/duke3d/src/mapster32.h diff --git a/polymer/eduke32/source/mdump.cpp b/source/duke3d/src/mdump.cpp similarity index 100% rename from polymer/eduke32/source/mdump.cpp rename to source/duke3d/src/mdump.cpp diff --git a/polymer/eduke32/source/mdump.h b/source/duke3d/src/mdump.h similarity index 100% rename from polymer/eduke32/source/mdump.h rename to source/duke3d/src/mdump.h diff --git a/polymer/eduke32/source/menus.c b/source/duke3d/src/menus.cpp similarity index 100% rename from polymer/eduke32/source/menus.c rename to source/duke3d/src/menus.cpp diff --git a/polymer/eduke32/source/menus.h b/source/duke3d/src/menus.h similarity index 100% rename from polymer/eduke32/source/menus.h rename to source/duke3d/src/menus.h diff --git a/polymer/eduke32/source/midi.c b/source/duke3d/src/midi.cpp similarity index 100% rename from polymer/eduke32/source/midi.c rename to source/duke3d/src/midi.cpp diff --git a/polymer/eduke32/source/midi.h b/source/duke3d/src/midi.h similarity index 100% rename from polymer/eduke32/source/midi.h rename to source/duke3d/src/midi.h diff --git a/polymer/eduke32/source/mpu401.c b/source/duke3d/src/mpu401.cpp similarity index 100% rename from polymer/eduke32/source/mpu401.c rename to source/duke3d/src/mpu401.cpp diff --git a/polymer/eduke32/source/mpu401.h b/source/duke3d/src/mpu401.h similarity index 100% rename from polymer/eduke32/source/mpu401.h rename to source/duke3d/src/mpu401.h diff --git a/polymer/eduke32/source/music.c b/source/duke3d/src/music.cpp similarity index 100% rename from polymer/eduke32/source/music.c rename to source/duke3d/src/music.cpp diff --git a/polymer/eduke32/source/names.h b/source/duke3d/src/names.h similarity index 100% rename from polymer/eduke32/source/names.h rename to source/duke3d/src/names.h diff --git a/polymer/eduke32/source/namesdyn.c b/source/duke3d/src/namesdyn.cpp similarity index 100% rename from polymer/eduke32/source/namesdyn.c rename to source/duke3d/src/namesdyn.cpp diff --git a/polymer/eduke32/source/namesdyn.h b/source/duke3d/src/namesdyn.h similarity index 100% rename from polymer/eduke32/source/namesdyn.h rename to source/duke3d/src/namesdyn.h diff --git a/polymer/eduke32/source/net.c b/source/duke3d/src/net.cpp similarity index 100% rename from polymer/eduke32/source/net.c rename to source/duke3d/src/net.cpp diff --git a/polymer/eduke32/source/net.h b/source/duke3d/src/net.h similarity index 100% rename from polymer/eduke32/source/net.h rename to source/duke3d/src/net.h diff --git a/polymer/eduke32/source/osdcmds.c b/source/duke3d/src/osdcmds.cpp similarity index 100% rename from polymer/eduke32/source/osdcmds.c rename to source/duke3d/src/osdcmds.cpp diff --git a/polymer/eduke32/source/osdcmds.h b/source/duke3d/src/osdcmds.h similarity index 100% rename from polymer/eduke32/source/osdcmds.h rename to source/duke3d/src/osdcmds.h diff --git a/polymer/eduke32/source/osdfuncs.c b/source/duke3d/src/osdfuncs.cpp similarity index 100% rename from polymer/eduke32/source/osdfuncs.c rename to source/duke3d/src/osdfuncs.cpp diff --git a/polymer/eduke32/source/osdfuncs.h b/source/duke3d/src/osdfuncs.h similarity index 100% rename from polymer/eduke32/source/osdfuncs.h rename to source/duke3d/src/osdfuncs.h diff --git a/polymer/eduke32/source/player.c b/source/duke3d/src/player.cpp similarity index 100% rename from polymer/eduke32/source/player.c rename to source/duke3d/src/player.cpp diff --git a/polymer/eduke32/source/player.h b/source/duke3d/src/player.h similarity index 100% rename from polymer/eduke32/source/player.h rename to source/duke3d/src/player.h diff --git a/polymer/eduke32/source/premap.c b/source/duke3d/src/premap.cpp similarity index 100% rename from polymer/eduke32/source/premap.c rename to source/duke3d/src/premap.cpp diff --git a/polymer/eduke32/source/premap.h b/source/duke3d/src/premap.h similarity index 100% rename from polymer/eduke32/source/premap.h rename to source/duke3d/src/premap.h diff --git a/polymer/eduke32/source/quotes.h b/source/duke3d/src/quotes.h similarity index 100% rename from polymer/eduke32/source/quotes.h rename to source/duke3d/src/quotes.h diff --git a/polymer/eduke32/source/rts.c b/source/duke3d/src/rts.cpp similarity index 100% rename from polymer/eduke32/source/rts.c rename to source/duke3d/src/rts.cpp diff --git a/polymer/eduke32/source/rts.h b/source/duke3d/src/rts.h similarity index 100% rename from polymer/eduke32/source/rts.h rename to source/duke3d/src/rts.h diff --git a/polymer/eduke32/source/savegame.c b/source/duke3d/src/savegame.cpp similarity index 100% rename from polymer/eduke32/source/savegame.c rename to source/duke3d/src/savegame.cpp diff --git a/polymer/eduke32/source/savegame.h b/source/duke3d/src/savegame.h similarity index 100% rename from polymer/eduke32/source/savegame.h rename to source/duke3d/src/savegame.h diff --git a/polymer/eduke32/source/sbar.c b/source/duke3d/src/sbar.cpp similarity index 100% rename from polymer/eduke32/source/sbar.c rename to source/duke3d/src/sbar.cpp diff --git a/polymer/eduke32/source/sbar.h b/source/duke3d/src/sbar.h similarity index 100% rename from polymer/eduke32/source/sbar.h rename to source/duke3d/src/sbar.h diff --git a/polymer/eduke32/source/screens.c b/source/duke3d/src/screens.cpp similarity index 100% rename from polymer/eduke32/source/screens.c rename to source/duke3d/src/screens.cpp diff --git a/polymer/eduke32/source/screens.h b/source/duke3d/src/screens.h similarity index 100% rename from polymer/eduke32/source/screens.h rename to source/duke3d/src/screens.h diff --git a/polymer/eduke32/source/screentext.c b/source/duke3d/src/screentext.cpp similarity index 100% rename from polymer/eduke32/source/screentext.c rename to source/duke3d/src/screentext.cpp diff --git a/polymer/eduke32/source/screentext.h b/source/duke3d/src/screentext.h similarity index 100% rename from polymer/eduke32/source/screentext.h rename to source/duke3d/src/screentext.h diff --git a/polymer/eduke32/source/sdlmusic.c b/source/duke3d/src/sdlmusic.cpp similarity index 100% rename from polymer/eduke32/source/sdlmusic.c rename to source/duke3d/src/sdlmusic.cpp diff --git a/polymer/eduke32/source/sector.c b/source/duke3d/src/sector.cpp similarity index 100% rename from polymer/eduke32/source/sector.c rename to source/duke3d/src/sector.cpp diff --git a/polymer/eduke32/source/sector.h b/source/duke3d/src/sector.h similarity index 100% rename from polymer/eduke32/source/sector.h rename to source/duke3d/src/sector.h diff --git a/polymer/eduke32/source/soundefs.h b/source/duke3d/src/soundefs.h similarity index 100% rename from polymer/eduke32/source/soundefs.h rename to source/duke3d/src/soundefs.h diff --git a/polymer/eduke32/source/sounds.c b/source/duke3d/src/sounds.cpp similarity index 100% rename from polymer/eduke32/source/sounds.c rename to source/duke3d/src/sounds.cpp diff --git a/polymer/eduke32/source/sounds.h b/source/duke3d/src/sounds.h similarity index 100% rename from polymer/eduke32/source/sounds.h rename to source/duke3d/src/sounds.h diff --git a/polymer/eduke32/source/sounds_common.h b/source/duke3d/src/sounds_common.h similarity index 100% rename from polymer/eduke32/source/sounds_common.h rename to source/duke3d/src/sounds_common.h diff --git a/polymer/eduke32/source/sounds_mapster32.c b/source/duke3d/src/sounds_mapster32.cpp similarity index 100% rename from polymer/eduke32/source/sounds_mapster32.c rename to source/duke3d/src/sounds_mapster32.cpp diff --git a/polymer/eduke32/source/sounds_mapster32.h b/source/duke3d/src/sounds_mapster32.h similarity index 100% rename from polymer/eduke32/source/sounds_mapster32.h rename to source/duke3d/src/sounds_mapster32.h diff --git a/polymer/eduke32/source/soundsdyn.c b/source/duke3d/src/soundsdyn.cpp similarity index 100% rename from polymer/eduke32/source/soundsdyn.c rename to source/duke3d/src/soundsdyn.cpp diff --git a/polymer/eduke32/source/soundsdyn.h b/source/duke3d/src/soundsdyn.h similarity index 100% rename from polymer/eduke32/source/soundsdyn.h rename to source/duke3d/src/soundsdyn.h diff --git a/polymer/eduke32/source/standard.h b/source/duke3d/src/standard.h similarity index 100% rename from polymer/eduke32/source/standard.h rename to source/duke3d/src/standard.h diff --git a/polymer/eduke32/source/startgtk.game.c b/source/duke3d/src/startgtk.game.cpp similarity index 100% rename from polymer/eduke32/source/startgtk.game.c rename to source/duke3d/src/startgtk.game.cpp diff --git a/polymer/eduke32/source/startosx.game.m b/source/duke3d/src/startosx.game.mm similarity index 100% rename from polymer/eduke32/source/startosx.game.m rename to source/duke3d/src/startosx.game.mm diff --git a/polymer/eduke32/source/startwin.game.c b/source/duke3d/src/startwin.game.cpp similarity index 100% rename from polymer/eduke32/source/startwin.game.c rename to source/duke3d/src/startwin.game.cpp diff --git a/polymer/eduke32/source/startwin.game.h b/source/duke3d/src/startwin.game.h similarity index 100% rename from polymer/eduke32/source/startwin.game.h rename to source/duke3d/src/startwin.game.h diff --git a/polymer/eduke32/source/winbits.c b/source/duke3d/src/winbits.cpp similarity index 100% rename from polymer/eduke32/source/winbits.c rename to source/duke3d/src/winbits.cpp diff --git a/polymer/eduke32/source/enet/LICENSE b/source/enet/LICENSE similarity index 100% rename from polymer/eduke32/source/enet/LICENSE rename to source/enet/LICENSE diff --git a/polymer/eduke32/source/enet/include/enet/callbacks.h b/source/enet/include/enet/callbacks.h similarity index 100% rename from polymer/eduke32/source/enet/include/enet/callbacks.h rename to source/enet/include/enet/callbacks.h diff --git a/polymer/eduke32/source/enet/include/enet/enet.h b/source/enet/include/enet/enet.h similarity index 100% rename from polymer/eduke32/source/enet/include/enet/enet.h rename to source/enet/include/enet/enet.h diff --git a/polymer/eduke32/source/enet/include/enet/list.h b/source/enet/include/enet/list.h similarity index 100% rename from polymer/eduke32/source/enet/include/enet/list.h rename to source/enet/include/enet/list.h diff --git a/polymer/eduke32/source/enet/include/enet/protocol.h b/source/enet/include/enet/protocol.h similarity index 100% rename from polymer/eduke32/source/enet/include/enet/protocol.h rename to source/enet/include/enet/protocol.h diff --git a/polymer/eduke32/source/enet/include/enet/time.h b/source/enet/include/enet/time.h similarity index 100% rename from polymer/eduke32/source/enet/include/enet/time.h rename to source/enet/include/enet/time.h diff --git a/polymer/eduke32/source/enet/include/enet/types.h b/source/enet/include/enet/types.h similarity index 100% rename from polymer/eduke32/source/enet/include/enet/types.h rename to source/enet/include/enet/types.h diff --git a/polymer/eduke32/source/enet/include/enet/unix.h b/source/enet/include/enet/unix.h similarity index 100% rename from polymer/eduke32/source/enet/include/enet/unix.h rename to source/enet/include/enet/unix.h diff --git a/polymer/eduke32/source/enet/include/enet/utility.h b/source/enet/include/enet/utility.h similarity index 100% rename from polymer/eduke32/source/enet/include/enet/utility.h rename to source/enet/include/enet/utility.h diff --git a/polymer/eduke32/source/enet/include/enet/win32.h b/source/enet/include/enet/win32.h similarity index 100% rename from polymer/eduke32/source/enet/include/enet/win32.h rename to source/enet/include/enet/win32.h diff --git a/polymer/eduke32/source/enet/src/callbacks.c b/source/enet/src/callbacks.c similarity index 100% rename from polymer/eduke32/source/enet/src/callbacks.c rename to source/enet/src/callbacks.c diff --git a/polymer/eduke32/source/enet/src/compress.c b/source/enet/src/compress.c similarity index 100% rename from polymer/eduke32/source/enet/src/compress.c rename to source/enet/src/compress.c diff --git a/polymer/eduke32/source/enet/src/host.c b/source/enet/src/host.c similarity index 100% rename from polymer/eduke32/source/enet/src/host.c rename to source/enet/src/host.c diff --git a/polymer/eduke32/source/enet/src/list.c b/source/enet/src/list.c similarity index 100% rename from polymer/eduke32/source/enet/src/list.c rename to source/enet/src/list.c diff --git a/polymer/eduke32/source/enet/src/packet.c b/source/enet/src/packet.c similarity index 100% rename from polymer/eduke32/source/enet/src/packet.c rename to source/enet/src/packet.c diff --git a/polymer/eduke32/source/enet/src/peer.c b/source/enet/src/peer.c similarity index 100% rename from polymer/eduke32/source/enet/src/peer.c rename to source/enet/src/peer.c diff --git a/polymer/eduke32/source/enet/src/protocol.c b/source/enet/src/protocol.c similarity index 100% rename from polymer/eduke32/source/enet/src/protocol.c rename to source/enet/src/protocol.c diff --git a/polymer/eduke32/source/enet/src/unix.c b/source/enet/src/unix.c similarity index 100% rename from polymer/eduke32/source/enet/src/unix.c rename to source/enet/src/unix.c diff --git a/polymer/eduke32/source/enet/src/win32.c b/source/enet/src/win32.c similarity index 100% rename from polymer/eduke32/source/enet/src/win32.c rename to source/enet/src/win32.c diff --git a/polymer/eduke32/source/android/etcpak/AUTHORS.txt b/source/etcpak/AUTHORS.txt similarity index 100% rename from polymer/eduke32/source/android/etcpak/AUTHORS.txt rename to source/etcpak/AUTHORS.txt diff --git a/polymer/eduke32/source/android/etcpak/LICENSE.txt b/source/etcpak/LICENSE.txt similarity index 100% rename from polymer/eduke32/source/android/etcpak/LICENSE.txt rename to source/etcpak/LICENSE.txt diff --git a/polymer/eduke32/source/android/etcpak/ProcessRGB.hpp b/source/etcpak/include/ProcessRGB.h similarity index 100% rename from polymer/eduke32/source/android/etcpak/ProcessRGB.hpp rename to source/etcpak/include/ProcessRGB.h diff --git a/polymer/eduke32/source/android/etcpak/Math.hpp b/source/etcpak/src/Math.hpp similarity index 100% rename from polymer/eduke32/source/android/etcpak/Math.hpp rename to source/etcpak/src/Math.hpp diff --git a/polymer/eduke32/source/android/etcpak/ProcessCommon.hpp b/source/etcpak/src/ProcessCommon.hpp similarity index 100% rename from polymer/eduke32/source/android/etcpak/ProcessCommon.hpp rename to source/etcpak/src/ProcessCommon.hpp diff --git a/polymer/eduke32/source/android/etcpak/ProcessRGB.cpp b/source/etcpak/src/ProcessRGB.cpp similarity index 100% rename from polymer/eduke32/source/android/etcpak/ProcessRGB.cpp rename to source/etcpak/src/ProcessRGB.cpp diff --git a/polymer/eduke32/source/android/etcpak/Tables.cpp b/source/etcpak/src/Tables.cpp similarity index 100% rename from polymer/eduke32/source/android/etcpak/Tables.cpp rename to source/etcpak/src/Tables.cpp diff --git a/polymer/eduke32/source/android/etcpak/Tables.hpp b/source/etcpak/src/Tables.hpp similarity index 100% rename from polymer/eduke32/source/android/etcpak/Tables.hpp rename to source/etcpak/src/Tables.hpp diff --git a/polymer/eduke32/source/android/etcpak/Types.hpp b/source/etcpak/src/Types.hpp similarity index 100% rename from polymer/eduke32/source/android/etcpak/Types.hpp rename to source/etcpak/src/Types.hpp diff --git a/polymer/eduke32/source/android/etcpak/Vector.hpp b/source/etcpak/src/Vector.hpp similarity index 100% rename from polymer/eduke32/source/android/etcpak/Vector.hpp rename to source/etcpak/src/Vector.hpp diff --git a/polymer/eduke32/source/testgame/buildlic.txt b/source/kenbuild/buildlic.txt similarity index 100% rename from polymer/eduke32/source/testgame/buildlic.txt rename to source/kenbuild/buildlic.txt diff --git a/polymer/eduke32/source/testgame/rsrc/build.bmp b/source/kenbuild/rsrc/build.bmp similarity index 100% rename from polymer/eduke32/source/testgame/rsrc/build.bmp rename to source/kenbuild/rsrc/build.bmp diff --git a/polymer/eduke32/source/testgame/rsrc/build.xcf b/source/kenbuild/rsrc/build.xcf similarity index 100% rename from polymer/eduke32/source/testgame/rsrc/build.xcf rename to source/kenbuild/rsrc/build.xcf diff --git a/polymer/eduke32/source/testgame/rsrc/build_icon.c b/source/kenbuild/rsrc/build_icon.c similarity index 100% rename from polymer/eduke32/source/testgame/rsrc/build_icon.c rename to source/kenbuild/rsrc/build_icon.c diff --git a/polymer/eduke32/source/testgame/rsrc/build_icon.icns b/source/kenbuild/rsrc/build_icon.icns similarity index 100% rename from polymer/eduke32/source/testgame/rsrc/build_icon.icns rename to source/kenbuild/rsrc/build_icon.icns diff --git a/polymer/eduke32/source/testgame/rsrc/build_icon.ico b/source/kenbuild/rsrc/build_icon.ico similarity index 100% rename from polymer/eduke32/source/testgame/rsrc/build_icon.ico rename to source/kenbuild/rsrc/build_icon.ico diff --git a/polymer/eduke32/source/testgame/rsrc/build_icon.png b/source/kenbuild/rsrc/build_icon.png similarity index 100% rename from polymer/eduke32/source/testgame/rsrc/build_icon.png rename to source/kenbuild/rsrc/build_icon.png diff --git a/polymer/eduke32/source/testgame/rsrc/build_icon.xcf b/source/kenbuild/rsrc/build_icon.xcf similarity index 100% rename from polymer/eduke32/source/testgame/rsrc/build_icon.xcf rename to source/kenbuild/rsrc/build_icon.xcf diff --git a/polymer/eduke32/source/testgame/rsrc/buildres.rc b/source/kenbuild/rsrc/buildres.rc similarity index 100% rename from polymer/eduke32/source/testgame/rsrc/buildres.rc rename to source/kenbuild/rsrc/buildres.rc diff --git a/polymer/eduke32/source/testgame/rsrc/game.bmp b/source/kenbuild/rsrc/game.bmp similarity index 100% rename from polymer/eduke32/source/testgame/rsrc/game.bmp rename to source/kenbuild/rsrc/game.bmp diff --git a/polymer/eduke32/source/testgame/rsrc/game.xcf b/source/kenbuild/rsrc/game.xcf similarity index 100% rename from polymer/eduke32/source/testgame/rsrc/game.xcf rename to source/kenbuild/rsrc/game.xcf diff --git a/polymer/eduke32/source/testgame/rsrc/game32_icon.c b/source/kenbuild/rsrc/game32_icon.c similarity index 100% rename from polymer/eduke32/source/testgame/rsrc/game32_icon.c rename to source/kenbuild/rsrc/game32_icon.c diff --git a/polymer/eduke32/source/testgame/rsrc/game_icon.c b/source/kenbuild/rsrc/game_icon.c similarity index 100% rename from polymer/eduke32/source/testgame/rsrc/game_icon.c rename to source/kenbuild/rsrc/game_icon.c diff --git a/polymer/eduke32/source/testgame/rsrc/game_icon.ico b/source/kenbuild/rsrc/game_icon.ico similarity index 100% rename from polymer/eduke32/source/testgame/rsrc/game_icon.ico rename to source/kenbuild/rsrc/game_icon.ico diff --git a/polymer/eduke32/source/testgame/rsrc/game_icon.png b/source/kenbuild/rsrc/game_icon.png similarity index 100% rename from polymer/eduke32/source/testgame/rsrc/game_icon.png rename to source/kenbuild/rsrc/game_icon.png diff --git a/polymer/eduke32/source/testgame/rsrc/gameres.rc b/source/kenbuild/rsrc/gameres.rc similarity index 100% rename from polymer/eduke32/source/testgame/rsrc/gameres.rc rename to source/kenbuild/rsrc/gameres.rc diff --git a/polymer/eduke32/source/testgame/rsrc/manifest.build.xml b/source/kenbuild/rsrc/manifest.build.xml similarity index 100% rename from polymer/eduke32/source/testgame/rsrc/manifest.build.xml rename to source/kenbuild/rsrc/manifest.build.xml diff --git a/polymer/eduke32/source/testgame/rsrc/manifest.game.xml b/source/kenbuild/rsrc/manifest.game.xml similarity index 100% rename from polymer/eduke32/source/testgame/rsrc/manifest.game.xml rename to source/kenbuild/rsrc/manifest.game.xml diff --git a/polymer/eduke32/source/testgame/src/StartupWinController.game.m b/source/kenbuild/src/StartupWinController.game.mm similarity index 100% rename from polymer/eduke32/source/testgame/src/StartupWinController.game.m rename to source/kenbuild/src/StartupWinController.game.mm diff --git a/polymer/eduke32/source/testgame/src/bstub.c b/source/kenbuild/src/bstub.cpp similarity index 100% rename from polymer/eduke32/source/testgame/src/bstub.c rename to source/kenbuild/src/bstub.cpp diff --git a/polymer/eduke32/source/testgame/src/common.c b/source/kenbuild/src/common.cpp similarity index 100% rename from polymer/eduke32/source/testgame/src/common.c rename to source/kenbuild/src/common.cpp diff --git a/polymer/eduke32/source/testgame/src/common_game.h b/source/kenbuild/src/common_game.h similarity index 100% rename from polymer/eduke32/source/testgame/src/common_game.h rename to source/kenbuild/src/common_game.h diff --git a/polymer/eduke32/source/testgame/src/config.c b/source/kenbuild/src/config.cpp similarity index 100% rename from polymer/eduke32/source/testgame/src/config.c rename to source/kenbuild/src/config.cpp diff --git a/polymer/eduke32/source/testgame/src/game.c b/source/kenbuild/src/game.cpp similarity index 100% rename from polymer/eduke32/source/testgame/src/game.c rename to source/kenbuild/src/game.cpp diff --git a/polymer/eduke32/source/testgame/src/game.h b/source/kenbuild/src/game.h similarity index 100% rename from polymer/eduke32/source/testgame/src/game.h rename to source/kenbuild/src/game.h diff --git a/polymer/eduke32/source/testgame/src/names.h b/source/kenbuild/src/names.h similarity index 100% rename from polymer/eduke32/source/testgame/src/names.h rename to source/kenbuild/src/names.h diff --git a/polymer/eduke32/source/testgame/src/sound_stub.c b/source/kenbuild/src/sound_stub.cpp similarity index 100% rename from polymer/eduke32/source/testgame/src/sound_stub.c rename to source/kenbuild/src/sound_stub.cpp diff --git a/polymer/eduke32/source/testgame/src/startgtk.game.c b/source/kenbuild/src/startgtk.game.cpp similarity index 100% rename from polymer/eduke32/source/testgame/src/startgtk.game.c rename to source/kenbuild/src/startgtk.game.cpp diff --git a/polymer/eduke32/source/testgame/src/startwin.game.c b/source/kenbuild/src/startwin.game.cpp similarity index 100% rename from polymer/eduke32/source/testgame/src/startwin.game.c rename to source/kenbuild/src/startwin.game.cpp diff --git a/polymer/eduke32/source/testgame/src/startwin.game.h b/source/kenbuild/src/startwin.game.h similarity index 100% rename from polymer/eduke32/source/testgame/src/startwin.game.h rename to source/kenbuild/src/startwin.game.h diff --git a/polymer/eduke32/source/jmact/gpl-2.0.txt b/source/mact/gpl-2.0.txt similarity index 100% rename from polymer/eduke32/source/jmact/gpl-2.0.txt rename to source/mact/gpl-2.0.txt diff --git a/polymer/eduke32/source/jmact/_control.h b/source/mact/include/_control.h similarity index 100% rename from polymer/eduke32/source/jmact/_control.h rename to source/mact/include/_control.h diff --git a/polymer/eduke32/source/jmact/animlib.h b/source/mact/include/animlib.h similarity index 100% rename from polymer/eduke32/source/jmact/animlib.h rename to source/mact/include/animlib.h diff --git a/polymer/eduke32/source/jmact/control.h b/source/mact/include/control.h similarity index 100% rename from polymer/eduke32/source/jmact/control.h rename to source/mact/include/control.h diff --git a/polymer/eduke32/source/jmact/file_lib.h b/source/mact/include/file_lib.h similarity index 100% rename from polymer/eduke32/source/jmact/file_lib.h rename to source/mact/include/file_lib.h diff --git a/polymer/eduke32/source/jmact/joystick.h b/source/mact/include/joystick.h similarity index 100% rename from polymer/eduke32/source/jmact/joystick.h rename to source/mact/include/joystick.h diff --git a/polymer/eduke32/source/jmact/keyboard.h b/source/mact/include/keyboard.h similarity index 100% rename from polymer/eduke32/source/jmact/keyboard.h rename to source/mact/include/keyboard.h diff --git a/polymer/eduke32/source/jmact/mouse.h b/source/mact/include/mouse.h similarity index 100% rename from polymer/eduke32/source/jmact/mouse.h rename to source/mact/include/mouse.h diff --git a/polymer/eduke32/source/jmact/scriplib.h b/source/mact/include/scriplib.h similarity index 100% rename from polymer/eduke32/source/jmact/scriplib.h rename to source/mact/include/scriplib.h diff --git a/polymer/eduke32/source/jmact/_scrplib.h b/source/mact/src/_scrplib.h similarity index 100% rename from polymer/eduke32/source/jmact/_scrplib.h rename to source/mact/src/_scrplib.h diff --git a/polymer/eduke32/source/jmact/animlib.c b/source/mact/src/animlib.cpp similarity index 100% rename from polymer/eduke32/source/jmact/animlib.c rename to source/mact/src/animlib.cpp diff --git a/polymer/eduke32/source/jmact/control.c b/source/mact/src/control.cpp similarity index 100% rename from polymer/eduke32/source/jmact/control.c rename to source/mact/src/control.cpp diff --git a/polymer/eduke32/source/jmact/file_lib.c b/source/mact/src/file_lib.cpp similarity index 100% rename from polymer/eduke32/source/jmact/file_lib.c rename to source/mact/src/file_lib.cpp diff --git a/polymer/eduke32/source/jmact/joystick.c b/source/mact/src/joystick.cpp similarity index 100% rename from polymer/eduke32/source/jmact/joystick.c rename to source/mact/src/joystick.cpp diff --git a/polymer/eduke32/source/jmact/keyboard.c b/source/mact/src/keyboard.cpp similarity index 100% rename from polymer/eduke32/source/jmact/keyboard.c rename to source/mact/src/keyboard.cpp diff --git a/polymer/eduke32/source/jmact/scriplib.c b/source/mact/src/scriplib.cpp similarity index 100% rename from polymer/eduke32/source/jmact/scriplib.c rename to source/mact/src/scriplib.cpp diff --git a/polymer/eduke32/source/sw/Makefile.deps b/source/sw/Dependencies.mak similarity index 100% rename from polymer/eduke32/source/sw/Makefile.deps rename to source/sw/Dependencies.mak diff --git a/polymer/eduke32/source/sw/gpl-2.0.txt b/source/sw/gpl-2.0.txt similarity index 100% rename from polymer/eduke32/source/sw/gpl-2.0.txt rename to source/sw/gpl-2.0.txt diff --git a/polymer/eduke32/source/sw/rsrc/build.bmp b/source/sw/rsrc/build.bmp similarity index 100% rename from polymer/eduke32/source/sw/rsrc/build.bmp rename to source/sw/rsrc/build.bmp diff --git a/polymer/eduke32/source/sw/rsrc/buildres.rc b/source/sw/rsrc/buildres.rc similarity index 100% rename from polymer/eduke32/source/sw/rsrc/buildres.rc rename to source/sw/rsrc/buildres.rc diff --git a/polymer/eduke32/source/sw/rsrc/game.bmp b/source/sw/rsrc/game.bmp similarity index 100% rename from polymer/eduke32/source/sw/rsrc/game.bmp rename to source/sw/rsrc/game.bmp diff --git a/polymer/eduke32/source/sw/rsrc/game_icon.c b/source/sw/rsrc/game_icon.c similarity index 100% rename from polymer/eduke32/source/sw/rsrc/game_icon.c rename to source/sw/rsrc/game_icon.c diff --git a/polymer/eduke32/source/sw/rsrc/game_icon.ico b/source/sw/rsrc/game_icon.ico similarity index 100% rename from polymer/eduke32/source/sw/rsrc/game_icon.ico rename to source/sw/rsrc/game_icon.ico diff --git a/polymer/eduke32/source/sw/rsrc/game_icon.png b/source/sw/rsrc/game_icon.png similarity index 100% rename from polymer/eduke32/source/sw/rsrc/game_icon.png rename to source/sw/rsrc/game_icon.png diff --git a/polymer/eduke32/source/sw/rsrc/game_icon.svg b/source/sw/rsrc/game_icon.svg similarity index 100% rename from polymer/eduke32/source/sw/rsrc/game_icon.svg rename to source/sw/rsrc/game_icon.svg diff --git a/polymer/eduke32/source/sw/rsrc/gameres.rc b/source/sw/rsrc/gameres.rc similarity index 100% rename from polymer/eduke32/source/sw/rsrc/gameres.rc rename to source/sw/rsrc/gameres.rc diff --git a/polymer/eduke32/source/sw/rsrc/manifest.build.xml b/source/sw/rsrc/manifest.build.xml similarity index 100% rename from polymer/eduke32/source/sw/rsrc/manifest.build.xml rename to source/sw/rsrc/manifest.build.xml diff --git a/polymer/eduke32/source/sw/rsrc/manifest.game.xml b/source/sw/rsrc/manifest.game.xml similarity index 100% rename from polymer/eduke32/source/sw/rsrc/manifest.game.xml rename to source/sw/rsrc/manifest.game.xml diff --git a/polymer/eduke32/source/sw/src/GameListSource.game.h b/source/sw/src/GameListSource.game.h similarity index 100% rename from polymer/eduke32/source/sw/src/GameListSource.game.h rename to source/sw/src/GameListSource.game.h diff --git a/polymer/eduke32/source/sw/src/GameListSource.game.m b/source/sw/src/GameListSource.game.mm similarity index 100% rename from polymer/eduke32/source/sw/src/GameListSource.game.m rename to source/sw/src/GameListSource.game.mm diff --git a/polymer/eduke32/source/sw/src/GrpFile.game.h b/source/sw/src/GrpFile.game.h similarity index 100% rename from polymer/eduke32/source/sw/src/GrpFile.game.h rename to source/sw/src/GrpFile.game.h diff --git a/polymer/eduke32/source/sw/src/GrpFile.game.m b/source/sw/src/GrpFile.game.mm similarity index 100% rename from polymer/eduke32/source/sw/src/GrpFile.game.m rename to source/sw/src/GrpFile.game.mm diff --git a/polymer/eduke32/source/sw/src/StartupWinController.game.m b/source/sw/src/StartupWinController.game.mm similarity index 100% rename from polymer/eduke32/source/sw/src/StartupWinController.game.m rename to source/sw/src/StartupWinController.game.mm diff --git a/polymer/eduke32/source/sw/src/_config.h b/source/sw/src/_config.h similarity index 100% rename from polymer/eduke32/source/sw/src/_config.h rename to source/sw/src/_config.h diff --git a/polymer/eduke32/source/sw/src/_functio.h b/source/sw/src/_functio.h similarity index 100% rename from polymer/eduke32/source/sw/src/_functio.h rename to source/sw/src/_functio.h diff --git a/polymer/eduke32/source/sw/src/_rts.h b/source/sw/src/_rts.h similarity index 100% rename from polymer/eduke32/source/sw/src/_rts.h rename to source/sw/src/_rts.h diff --git a/polymer/eduke32/source/sw/src/actor.c b/source/sw/src/actor.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/actor.c rename to source/sw/src/actor.cpp diff --git a/polymer/eduke32/source/sw/src/actor.h b/source/sw/src/actor.h similarity index 100% rename from polymer/eduke32/source/sw/src/actor.h rename to source/sw/src/actor.h diff --git a/polymer/eduke32/source/sw/src/ai.c b/source/sw/src/ai.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/ai.c rename to source/sw/src/ai.cpp diff --git a/polymer/eduke32/source/sw/src/ai.h b/source/sw/src/ai.h similarity index 100% rename from polymer/eduke32/source/sw/src/ai.h rename to source/sw/src/ai.h diff --git a/polymer/eduke32/source/sw/src/ambient.h b/source/sw/src/ambient.h similarity index 100% rename from polymer/eduke32/source/sw/src/ambient.h rename to source/sw/src/ambient.h diff --git a/polymer/eduke32/source/sw/src/anim.c b/source/sw/src/anim.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/anim.c rename to source/sw/src/anim.cpp diff --git a/polymer/eduke32/source/sw/src/anim.h b/source/sw/src/anim.h similarity index 100% rename from polymer/eduke32/source/sw/src/anim.h rename to source/sw/src/anim.h diff --git a/polymer/eduke32/source/sw/src/bldscript.c b/source/sw/src/bldscript.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/bldscript.c rename to source/sw/src/bldscript.cpp diff --git a/polymer/eduke32/source/sw/src/border.c b/source/sw/src/border.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/border.c rename to source/sw/src/border.cpp diff --git a/polymer/eduke32/source/sw/src/bots.h b/source/sw/src/bots.h similarity index 100% rename from polymer/eduke32/source/sw/src/bots.h rename to source/sw/src/bots.h diff --git a/polymer/eduke32/source/sw/src/break.c b/source/sw/src/break.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/break.c rename to source/sw/src/break.cpp diff --git a/polymer/eduke32/source/sw/src/break.h b/source/sw/src/break.h similarity index 100% rename from polymer/eduke32/source/sw/src/break.h rename to source/sw/src/break.h diff --git a/polymer/eduke32/source/sw/src/brooms.c b/source/sw/src/brooms.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/brooms.c rename to source/sw/src/brooms.cpp diff --git a/polymer/eduke32/source/sw/src/bunny.c b/source/sw/src/bunny.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/bunny.c rename to source/sw/src/bunny.cpp diff --git a/polymer/eduke32/source/sw/src/cache.c b/source/sw/src/cache.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/cache.c rename to source/sw/src/cache.cpp diff --git a/polymer/eduke32/source/sw/src/cache.h b/source/sw/src/cache.h similarity index 100% rename from polymer/eduke32/source/sw/src/cache.h rename to source/sw/src/cache.h diff --git a/polymer/eduke32/source/sw/src/cheats.c b/source/sw/src/cheats.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/cheats.c rename to source/sw/src/cheats.cpp diff --git a/polymer/eduke32/source/sw/src/colormap.c b/source/sw/src/colormap.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/colormap.c rename to source/sw/src/colormap.cpp diff --git a/polymer/eduke32/source/sw/src/colormap.h b/source/sw/src/colormap.h similarity index 100% rename from polymer/eduke32/source/sw/src/colormap.h rename to source/sw/src/colormap.h diff --git a/polymer/eduke32/source/sw/src/common.c b/source/sw/src/common.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/common.c rename to source/sw/src/common.cpp diff --git a/polymer/eduke32/source/sw/src/common_game.h b/source/sw/src/common_game.h similarity index 100% rename from polymer/eduke32/source/sw/src/common_game.h rename to source/sw/src/common_game.h diff --git a/polymer/eduke32/source/sw/src/config.c b/source/sw/src/config.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/config.c rename to source/sw/src/config.cpp diff --git a/polymer/eduke32/source/sw/src/config.h b/source/sw/src/config.h similarity index 100% rename from polymer/eduke32/source/sw/src/config.h rename to source/sw/src/config.h diff --git a/polymer/eduke32/source/sw/src/conpic.h b/source/sw/src/conpic.h similarity index 100% rename from polymer/eduke32/source/sw/src/conpic.h rename to source/sw/src/conpic.h diff --git a/polymer/eduke32/source/sw/src/console.c b/source/sw/src/console.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/console.c rename to source/sw/src/console.cpp diff --git a/polymer/eduke32/source/sw/src/coolg.c b/source/sw/src/coolg.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/coolg.c rename to source/sw/src/coolg.cpp diff --git a/polymer/eduke32/source/sw/src/coolie.c b/source/sw/src/coolie.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/coolie.c rename to source/sw/src/coolie.cpp diff --git a/polymer/eduke32/source/sw/src/copysect.c b/source/sw/src/copysect.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/copysect.c rename to source/sw/src/copysect.cpp diff --git a/polymer/eduke32/source/sw/src/damage.h b/source/sw/src/damage.h similarity index 100% rename from polymer/eduke32/source/sw/src/damage.h rename to source/sw/src/damage.h diff --git a/polymer/eduke32/source/sw/src/demo.c b/source/sw/src/demo.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/demo.c rename to source/sw/src/demo.cpp diff --git a/polymer/eduke32/source/sw/src/demo.h b/source/sw/src/demo.h similarity index 100% rename from polymer/eduke32/source/sw/src/demo.h rename to source/sw/src/demo.h diff --git a/polymer/eduke32/source/sw/src/digi.h b/source/sw/src/digi.h similarity index 100% rename from polymer/eduke32/source/sw/src/digi.h rename to source/sw/src/digi.h diff --git a/polymer/eduke32/source/sw/src/draw.c b/source/sw/src/draw.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/draw.c rename to source/sw/src/draw.cpp diff --git a/polymer/eduke32/source/sw/src/eel.c b/source/sw/src/eel.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/eel.c rename to source/sw/src/eel.cpp diff --git a/polymer/eduke32/source/sw/src/function.h b/source/sw/src/function.h similarity index 100% rename from polymer/eduke32/source/sw/src/function.h rename to source/sw/src/function.h diff --git a/polymer/eduke32/source/sw/src/game.c b/source/sw/src/game.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/game.c rename to source/sw/src/game.cpp diff --git a/polymer/eduke32/source/sw/src/game.h b/source/sw/src/game.h similarity index 100% rename from polymer/eduke32/source/sw/src/game.h rename to source/sw/src/game.h diff --git a/polymer/eduke32/source/sw/src/gamedefs.h b/source/sw/src/gamedefs.h similarity index 100% rename from polymer/eduke32/source/sw/src/gamedefs.h rename to source/sw/src/gamedefs.h diff --git a/polymer/eduke32/source/sw/src/girlninj.c b/source/sw/src/girlninj.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/girlninj.c rename to source/sw/src/girlninj.cpp diff --git a/polymer/eduke32/source/sw/src/goro.c b/source/sw/src/goro.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/goro.c rename to source/sw/src/goro.cpp diff --git a/polymer/eduke32/source/sw/src/grpscan.c b/source/sw/src/grpscan.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/grpscan.c rename to source/sw/src/grpscan.cpp diff --git a/polymer/eduke32/source/sw/src/grpscan.h b/source/sw/src/grpscan.h similarity index 100% rename from polymer/eduke32/source/sw/src/grpscan.h rename to source/sw/src/grpscan.h diff --git a/polymer/eduke32/source/sw/src/hornet.c b/source/sw/src/hornet.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/hornet.c rename to source/sw/src/hornet.cpp diff --git a/polymer/eduke32/source/sw/src/interp.c b/source/sw/src/interp.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/interp.c rename to source/sw/src/interp.cpp diff --git a/polymer/eduke32/source/sw/src/interp.h b/source/sw/src/interp.h similarity index 100% rename from polymer/eduke32/source/sw/src/interp.h rename to source/sw/src/interp.h diff --git a/polymer/eduke32/source/sw/src/interpsh.c b/source/sw/src/interpsh.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/interpsh.c rename to source/sw/src/interpsh.cpp diff --git a/polymer/eduke32/source/sw/src/inv.c b/source/sw/src/inv.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/inv.c rename to source/sw/src/inv.cpp diff --git a/polymer/eduke32/source/sw/src/inv.h b/source/sw/src/inv.h similarity index 100% rename from polymer/eduke32/source/sw/src/inv.h rename to source/sw/src/inv.h diff --git a/polymer/eduke32/source/sw/src/jbhlp.c b/source/sw/src/jbhlp.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/jbhlp.c rename to source/sw/src/jbhlp.cpp diff --git a/polymer/eduke32/source/sw/src/jnames.h b/source/sw/src/jnames.h similarity index 100% rename from polymer/eduke32/source/sw/src/jnames.h rename to source/sw/src/jnames.h diff --git a/polymer/eduke32/source/sw/src/jnstub.c b/source/sw/src/jnstub.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/jnstub.c rename to source/sw/src/jnstub.cpp diff --git a/polymer/eduke32/source/sw/src/jplayer.c b/source/sw/src/jplayer.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/jplayer.c rename to source/sw/src/jplayer.cpp diff --git a/polymer/eduke32/source/sw/src/jsector.c b/source/sw/src/jsector.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/jsector.c rename to source/sw/src/jsector.cpp diff --git a/polymer/eduke32/source/sw/src/jsector.h b/source/sw/src/jsector.h similarity index 100% rename from polymer/eduke32/source/sw/src/jsector.h rename to source/sw/src/jsector.h diff --git a/polymer/eduke32/source/sw/src/jtags.h b/source/sw/src/jtags.h similarity index 100% rename from polymer/eduke32/source/sw/src/jtags.h rename to source/sw/src/jtags.h diff --git a/polymer/eduke32/source/sw/src/jweapon.c b/source/sw/src/jweapon.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/jweapon.c rename to source/sw/src/jweapon.cpp diff --git a/polymer/eduke32/source/sw/src/keys.h b/source/sw/src/keys.h similarity index 100% rename from polymer/eduke32/source/sw/src/keys.h rename to source/sw/src/keys.h diff --git a/polymer/eduke32/source/sw/src/lava.c b/source/sw/src/lava.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/lava.c rename to source/sw/src/lava.cpp diff --git a/polymer/eduke32/source/sw/src/light.c b/source/sw/src/light.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/light.c rename to source/sw/src/light.cpp diff --git a/polymer/eduke32/source/sw/src/light.h b/source/sw/src/light.h similarity index 100% rename from polymer/eduke32/source/sw/src/light.h rename to source/sw/src/light.h diff --git a/polymer/eduke32/source/sw/src/lists.h b/source/sw/src/lists.h similarity index 100% rename from polymer/eduke32/source/sw/src/lists.h rename to source/sw/src/lists.h diff --git a/polymer/eduke32/source/sw/src/mclip.c b/source/sw/src/mclip.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/mclip.c rename to source/sw/src/mclip.cpp diff --git a/polymer/eduke32/source/sw/src/mclip.h b/source/sw/src/mclip.h similarity index 100% rename from polymer/eduke32/source/sw/src/mclip.h rename to source/sw/src/mclip.h diff --git a/polymer/eduke32/source/sw/src/mdastr.c b/source/sw/src/mdastr.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/mdastr.c rename to source/sw/src/mdastr.cpp diff --git a/polymer/eduke32/source/sw/src/menus.c b/source/sw/src/menus.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/menus.c rename to source/sw/src/menus.cpp diff --git a/polymer/eduke32/source/sw/src/menus.h b/source/sw/src/menus.h similarity index 100% rename from polymer/eduke32/source/sw/src/menus.h rename to source/sw/src/menus.h diff --git a/polymer/eduke32/source/sw/src/mfile.h b/source/sw/src/mfile.h similarity index 100% rename from polymer/eduke32/source/sw/src/mfile.h rename to source/sw/src/mfile.h diff --git a/polymer/eduke32/source/sw/src/miscactr.c b/source/sw/src/miscactr.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/miscactr.c rename to source/sw/src/miscactr.cpp diff --git a/polymer/eduke32/source/sw/src/morph.c b/source/sw/src/morph.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/morph.c rename to source/sw/src/morph.cpp diff --git a/polymer/eduke32/source/sw/src/mytypes.h b/source/sw/src/mytypes.h similarity index 100% rename from polymer/eduke32/source/sw/src/mytypes.h rename to source/sw/src/mytypes.h diff --git a/polymer/eduke32/source/sw/src/names.h b/source/sw/src/names.h similarity index 100% rename from polymer/eduke32/source/sw/src/names.h rename to source/sw/src/names.h diff --git a/polymer/eduke32/source/sw/src/names2.h b/source/sw/src/names2.h similarity index 100% rename from polymer/eduke32/source/sw/src/names2.h rename to source/sw/src/names2.h diff --git a/polymer/eduke32/source/sw/src/net.c b/source/sw/src/net.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/net.c rename to source/sw/src/net.cpp diff --git a/polymer/eduke32/source/sw/src/net.h b/source/sw/src/net.h similarity index 100% rename from polymer/eduke32/source/sw/src/net.h rename to source/sw/src/net.h diff --git a/polymer/eduke32/source/sw/src/ninja.c b/source/sw/src/ninja.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/ninja.c rename to source/sw/src/ninja.cpp diff --git a/polymer/eduke32/source/sw/src/ninja.h b/source/sw/src/ninja.h similarity index 100% rename from polymer/eduke32/source/sw/src/ninja.h rename to source/sw/src/ninja.h diff --git a/polymer/eduke32/source/sw/src/pal.h b/source/sw/src/pal.h similarity index 100% rename from polymer/eduke32/source/sw/src/pal.h rename to source/sw/src/pal.h diff --git a/polymer/eduke32/source/sw/src/panel.c b/source/sw/src/panel.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/panel.c rename to source/sw/src/panel.cpp diff --git a/polymer/eduke32/source/sw/src/panel.h b/source/sw/src/panel.h similarity index 100% rename from polymer/eduke32/source/sw/src/panel.h rename to source/sw/src/panel.h diff --git a/polymer/eduke32/source/sw/src/parent.h b/source/sw/src/parent.h similarity index 100% rename from polymer/eduke32/source/sw/src/parent.h rename to source/sw/src/parent.h diff --git a/polymer/eduke32/source/sw/src/parse.h b/source/sw/src/parse.h similarity index 100% rename from polymer/eduke32/source/sw/src/parse.h rename to source/sw/src/parse.h diff --git a/polymer/eduke32/source/sw/src/player.c b/source/sw/src/player.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/player.c rename to source/sw/src/player.cpp diff --git a/polymer/eduke32/source/sw/src/player.h b/source/sw/src/player.h similarity index 100% rename from polymer/eduke32/source/sw/src/player.h rename to source/sw/src/player.h diff --git a/polymer/eduke32/source/sw/src/predict.c b/source/sw/src/predict.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/predict.c rename to source/sw/src/predict.cpp diff --git a/polymer/eduke32/source/sw/src/quake.c b/source/sw/src/quake.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/quake.c rename to source/sw/src/quake.cpp diff --git a/polymer/eduke32/source/sw/src/quake.h b/source/sw/src/quake.h similarity index 100% rename from polymer/eduke32/source/sw/src/quake.h rename to source/sw/src/quake.h diff --git a/polymer/eduke32/source/sw/src/reserve.h b/source/sw/src/reserve.h similarity index 100% rename from polymer/eduke32/source/sw/src/reserve.h rename to source/sw/src/reserve.h diff --git a/polymer/eduke32/source/sw/src/ripper.c b/source/sw/src/ripper.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/ripper.c rename to source/sw/src/ripper.cpp diff --git a/polymer/eduke32/source/sw/src/ripper2.c b/source/sw/src/ripper2.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/ripper2.c rename to source/sw/src/ripper2.cpp diff --git a/polymer/eduke32/source/sw/src/rooms.c b/source/sw/src/rooms.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/rooms.c rename to source/sw/src/rooms.cpp diff --git a/polymer/eduke32/source/sw/src/rotator.c b/source/sw/src/rotator.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/rotator.c rename to source/sw/src/rotator.cpp diff --git a/polymer/eduke32/source/sw/src/rts.c b/source/sw/src/rts.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/rts.c rename to source/sw/src/rts.cpp diff --git a/polymer/eduke32/source/sw/src/rts.h b/source/sw/src/rts.h similarity index 100% rename from polymer/eduke32/source/sw/src/rts.h rename to source/sw/src/rts.h diff --git a/polymer/eduke32/source/sw/src/save.c b/source/sw/src/save.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/save.c rename to source/sw/src/save.cpp diff --git a/polymer/eduke32/source/sw/src/saveable.c b/source/sw/src/saveable.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/saveable.c rename to source/sw/src/saveable.cpp diff --git a/polymer/eduke32/source/sw/src/saveable.h b/source/sw/src/saveable.h similarity index 100% rename from polymer/eduke32/source/sw/src/saveable.h rename to source/sw/src/saveable.h diff --git a/polymer/eduke32/source/sw/src/savedef.h b/source/sw/src/savedef.h similarity index 100% rename from polymer/eduke32/source/sw/src/savedef.h rename to source/sw/src/savedef.h diff --git a/polymer/eduke32/source/sw/src/scrip2.c b/source/sw/src/scrip2.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/scrip2.c rename to source/sw/src/scrip2.cpp diff --git a/polymer/eduke32/source/sw/src/sector.c b/source/sw/src/sector.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/sector.c rename to source/sw/src/sector.cpp diff --git a/polymer/eduke32/source/sw/src/sector.h b/source/sw/src/sector.h similarity index 100% rename from polymer/eduke32/source/sw/src/sector.h rename to source/sw/src/sector.h diff --git a/polymer/eduke32/source/sw/src/serp.c b/source/sw/src/serp.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/serp.c rename to source/sw/src/serp.cpp diff --git a/polymer/eduke32/source/sw/src/settings.h b/source/sw/src/settings.h similarity index 100% rename from polymer/eduke32/source/sw/src/settings.h rename to source/sw/src/settings.h diff --git a/polymer/eduke32/source/sw/src/setup.c b/source/sw/src/setup.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/setup.c rename to source/sw/src/setup.cpp diff --git a/polymer/eduke32/source/sw/src/skel.c b/source/sw/src/skel.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/skel.c rename to source/sw/src/skel.cpp diff --git a/polymer/eduke32/source/sw/src/skull.c b/source/sw/src/skull.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/skull.c rename to source/sw/src/skull.cpp diff --git a/polymer/eduke32/source/sw/src/slidor.c b/source/sw/src/slidor.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/slidor.c rename to source/sw/src/slidor.cpp diff --git a/polymer/eduke32/source/sw/src/slidor.h b/source/sw/src/slidor.h similarity index 100% rename from polymer/eduke32/source/sw/src/slidor.h rename to source/sw/src/slidor.h diff --git a/polymer/eduke32/source/sw/src/sounds.c b/source/sw/src/sounds.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/sounds.c rename to source/sw/src/sounds.cpp diff --git a/polymer/eduke32/source/sw/src/sounds.h b/source/sw/src/sounds.h similarity index 100% rename from polymer/eduke32/source/sw/src/sounds.h rename to source/sw/src/sounds.h diff --git a/polymer/eduke32/source/sw/src/spike.c b/source/sw/src/spike.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/spike.c rename to source/sw/src/spike.cpp diff --git a/polymer/eduke32/source/sw/src/sprite.c b/source/sw/src/sprite.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/sprite.c rename to source/sw/src/sprite.cpp diff --git a/polymer/eduke32/source/sw/src/sprite.h b/source/sw/src/sprite.h similarity index 100% rename from polymer/eduke32/source/sw/src/sprite.h rename to source/sw/src/sprite.h diff --git a/polymer/eduke32/source/sw/src/stag.h b/source/sw/src/stag.h similarity index 100% rename from polymer/eduke32/source/sw/src/stag.h rename to source/sw/src/stag.h diff --git a/polymer/eduke32/source/sw/src/startgtk.game.c b/source/sw/src/startgtk.game.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/startgtk.game.c rename to source/sw/src/startgtk.game.cpp diff --git a/polymer/eduke32/source/sw/src/startwin.game.c b/source/sw/src/startwin.game.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/startwin.game.c rename to source/sw/src/startwin.game.cpp diff --git a/polymer/eduke32/source/sw/src/startwin.game.h b/source/sw/src/startwin.game.h similarity index 100% rename from polymer/eduke32/source/sw/src/startwin.game.h rename to source/sw/src/startwin.game.h diff --git a/polymer/eduke32/source/sw/src/sumo.c b/source/sw/src/sumo.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/sumo.c rename to source/sw/src/sumo.cpp diff --git a/polymer/eduke32/source/sw/src/sw_strs.h b/source/sw/src/sw_strs.h similarity index 100% rename from polymer/eduke32/source/sw/src/sw_strs.h rename to source/sw/src/sw_strs.h diff --git a/polymer/eduke32/source/sw/src/swconfig.c b/source/sw/src/swconfig.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/swconfig.c rename to source/sw/src/swconfig.cpp diff --git a/polymer/eduke32/source/sw/src/sync.c b/source/sw/src/sync.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/sync.c rename to source/sw/src/sync.cpp diff --git a/polymer/eduke32/source/sw/src/tags.h b/source/sw/src/tags.h similarity index 100% rename from polymer/eduke32/source/sw/src/tags.h rename to source/sw/src/tags.h diff --git a/polymer/eduke32/source/sw/src/text.c b/source/sw/src/text.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/text.c rename to source/sw/src/text.cpp diff --git a/polymer/eduke32/source/sw/src/text.h b/source/sw/src/text.h similarity index 100% rename from polymer/eduke32/source/sw/src/text.h rename to source/sw/src/text.h diff --git a/polymer/eduke32/source/sw/src/track.c b/source/sw/src/track.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/track.c rename to source/sw/src/track.cpp diff --git a/polymer/eduke32/source/sw/src/track.h b/source/sw/src/track.h similarity index 100% rename from polymer/eduke32/source/sw/src/track.h rename to source/sw/src/track.h diff --git a/polymer/eduke32/source/sw/src/trigger.h b/source/sw/src/trigger.h similarity index 100% rename from polymer/eduke32/source/sw/src/trigger.h rename to source/sw/src/trigger.h diff --git a/polymer/eduke32/source/sw/src/vator.c b/source/sw/src/vator.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/vator.c rename to source/sw/src/vator.cpp diff --git a/polymer/eduke32/source/sw/src/vis.c b/source/sw/src/vis.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/vis.c rename to source/sw/src/vis.cpp diff --git a/polymer/eduke32/source/sw/src/vis.h b/source/sw/src/vis.h similarity index 100% rename from polymer/eduke32/source/sw/src/vis.h rename to source/sw/src/vis.h diff --git a/polymer/eduke32/source/sw/src/wallmove.c b/source/sw/src/wallmove.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/wallmove.c rename to source/sw/src/wallmove.cpp diff --git a/polymer/eduke32/source/sw/src/warp.c b/source/sw/src/warp.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/warp.c rename to source/sw/src/warp.cpp diff --git a/polymer/eduke32/source/sw/src/warp.h b/source/sw/src/warp.h similarity index 100% rename from polymer/eduke32/source/sw/src/warp.h rename to source/sw/src/warp.h diff --git a/polymer/eduke32/source/sw/src/weapon.c b/source/sw/src/weapon.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/weapon.c rename to source/sw/src/weapon.cpp diff --git a/polymer/eduke32/source/sw/src/weapon.h b/source/sw/src/weapon.h similarity index 100% rename from polymer/eduke32/source/sw/src/weapon.h rename to source/sw/src/weapon.h diff --git a/polymer/eduke32/source/sw/src/zilla.c b/source/sw/src/zilla.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/zilla.c rename to source/sw/src/zilla.cpp diff --git a/polymer/eduke32/source/sw/src/zombie.c b/source/sw/src/zombie.cpp similarity index 100% rename from polymer/eduke32/source/sw/src/zombie.c rename to source/sw/src/zombie.cpp diff --git a/polymer/eduke32/build/src/util/arttool.cc b/source/tools/src/arttool.cpp similarity index 100% rename from polymer/eduke32/build/src/util/arttool.cc rename to source/tools/src/arttool.cpp diff --git a/polymer/eduke32/build/src/util/ase_import.py b/source/tools/src/ase_import.py similarity index 100% rename from polymer/eduke32/build/src/util/ase_import.py rename to source/tools/src/ase_import.py diff --git a/polymer/eduke32/build/src/util/bin2c.cpp b/source/tools/src/bin2c.cpp similarity index 100% rename from polymer/eduke32/build/src/util/bin2c.cpp rename to source/tools/src/bin2c.cpp diff --git a/polymer/eduke32/build/src/util/bsuite.c b/source/tools/src/bsuite.cpp similarity index 100% rename from polymer/eduke32/build/src/util/bsuite.c rename to source/tools/src/bsuite.cpp diff --git a/polymer/eduke32/build/src/util/cacheinfo.c b/source/tools/src/cacheinfo.cpp similarity index 100% rename from polymer/eduke32/build/src/util/cacheinfo.c rename to source/tools/src/cacheinfo.cpp diff --git a/polymer/eduke32/build/src/util/checkdefs.sh b/source/tools/src/checkdefs.sh similarity index 100% rename from polymer/eduke32/build/src/util/checkdefs.sh rename to source/tools/src/checkdefs.sh diff --git a/polymer/eduke32/build/src/util/compat_tools.c b/source/tools/src/compat_tools.cpp similarity index 100% rename from polymer/eduke32/build/src/util/compat_tools.c rename to source/tools/src/compat_tools.cpp diff --git a/polymer/eduke32/build/src/misc/enumdisplay.c b/source/tools/src/enumdisplay.cpp similarity index 100% rename from polymer/eduke32/build/src/misc/enumdisplay.c rename to source/tools/src/enumdisplay.cpp diff --git a/polymer/eduke32/build/src/util/generateicon.c b/source/tools/src/generateicon.cpp similarity index 100% rename from polymer/eduke32/build/src/util/generateicon.c rename to source/tools/src/generateicon.cpp diff --git a/polymer/eduke32/build/src/misc/getdxdidf.c b/source/tools/src/getdxdidf.cpp similarity index 100% rename from polymer/eduke32/build/src/misc/getdxdidf.c rename to source/tools/src/getdxdidf.cpp diff --git a/polymer/eduke32/build/src/util/givedepth.c b/source/tools/src/givedepth.cpp similarity index 100% rename from polymer/eduke32/build/src/util/givedepth.c rename to source/tools/src/givedepth.cpp diff --git a/polymer/eduke32/build/src/util/highpalookupmaker.py b/source/tools/src/highpalookupmaker.py similarity index 100% rename from polymer/eduke32/build/src/util/highpalookupmaker.py rename to source/tools/src/highpalookupmaker.py diff --git a/polymer/eduke32/source/util/ivfrate.c b/source/tools/src/ivfrate.cpp similarity index 100% rename from polymer/eduke32/source/util/ivfrate.c rename to source/tools/src/ivfrate.cpp diff --git a/polymer/eduke32/build/src/util/kextract.c b/source/tools/src/kextract.cpp similarity index 100% rename from polymer/eduke32/build/src/util/kextract.c rename to source/tools/src/kextract.cpp diff --git a/polymer/eduke32/build/src/util/kgroup.c b/source/tools/src/kgroup.cpp similarity index 100% rename from polymer/eduke32/build/src/util/kgroup.c rename to source/tools/src/kgroup.cpp diff --git a/polymer/eduke32/build/src/util/kmd2tool.c b/source/tools/src/kmd2tool.cpp similarity index 100% rename from polymer/eduke32/build/src/util/kmd2tool.c rename to source/tools/src/kmd2tool.cpp diff --git a/polymer/eduke32/build/src/misc/makesdlkeytrans.c b/source/tools/src/makesdlkeytrans.cpp similarity index 100% rename from polymer/eduke32/build/src/misc/makesdlkeytrans.c rename to source/tools/src/makesdlkeytrans.cpp diff --git a/polymer/eduke32/build/src/util/map2stl.c b/source/tools/src/map2stl.cpp similarity index 100% rename from polymer/eduke32/build/src/util/map2stl.c rename to source/tools/src/map2stl.cpp diff --git a/polymer/eduke32/build/src/util/md2tool.c b/source/tools/src/md2tool.cpp similarity index 100% rename from polymer/eduke32/build/src/util/md2tool.c rename to source/tools/src/md2tool.cpp diff --git a/polymer/eduke32/build/src/util/md3_export.py b/source/tools/src/md3_export.py similarity index 100% rename from polymer/eduke32/build/src/util/md3_export.py rename to source/tools/src/md3_export.py diff --git a/polymer/eduke32/build/src/util/mkpalette.c b/source/tools/src/mkpalette.cpp similarity index 100% rename from polymer/eduke32/build/src/util/mkpalette.c rename to source/tools/src/mkpalette.cpp diff --git a/polymer/eduke32/build/src/util/prhighpal.py b/source/tools/src/prhighpal.py similarity index 100% rename from polymer/eduke32/build/src/util/prhighpal.py rename to source/tools/src/prhighpal.py diff --git a/polymer/eduke32/build/src/util/transpal.c b/source/tools/src/transpal.cpp similarity index 100% rename from polymer/eduke32/build/src/util/transpal.c rename to source/tools/src/transpal.cpp diff --git a/polymer/eduke32/build/src/util/unpackssi.c b/source/tools/src/unpackssi.cpp similarity index 100% rename from polymer/eduke32/build/src/util/unpackssi.c rename to source/tools/src/unpackssi.cpp diff --git a/polymer/eduke32/build/src/util/vgafont.cpp b/source/tools/src/vgafont.cpp similarity index 100% rename from polymer/eduke32/build/src/util/vgafont.cpp rename to source/tools/src/vgafont.cpp diff --git a/polymer/eduke32/build/src/util/wad2art.c b/source/tools/src/wad2art.cpp similarity index 100% rename from polymer/eduke32/build/src/util/wad2art.c rename to source/tools/src/wad2art.cpp diff --git a/polymer/eduke32/build/src/util/wad2map.c b/source/tools/src/wad2map.cpp similarity index 100% rename from polymer/eduke32/build/src/util/wad2map.c rename to source/tools/src/wad2map.cpp