diff --git a/polymer/eduke32/Makefile b/polymer/eduke32/Makefile
index c3471089b..dccff34db 100644
--- a/polymer/eduke32/Makefile
+++ b/polymer/eduke32/Makefile
@@ -77,14 +77,14 @@ endif
 EBACKTRACEDLL_TARGET:=$(EBACKTRACEDLL)
 
 ifeq ($(PLATFORM),WINDOWS)
-    OBJ=obj_win
-    EOBJ=eobj_win
+    OBJ=$(SRC)/obj_win
+    EOBJ=$(SRC)/eobj_win
 else
     ifeq ($(SUBPLATFORM),LINUX)
         LIBS+= -lrt
     endif
-    OBJ=obj
-    EOBJ=eobj
+    OBJ=$(SRC)/obj
+    EOBJ=$(SRC)/eobj
 endif
 
 JMACTOBJ=$(OBJ)/file_lib.$o \
@@ -220,7 +220,7 @@ ifeq ($(PLATFORM),DARWIN)
                 -I$(APPLE_FRAMEWORKS)/SDL_mixer.framework/Headers
 
         LIBS += -lFLAC -lvorbisfile -lvorbis -logg -lm \
-                -Wl,-framework,SDL -Wl,-framework,SDL_mixer Apple/lib/libSDLmain.a \
+                -Wl,-framework,SDL -Wl,-framework,SDL_mixer platform/Apple/lib/libSDLmain.a \
                 -Wl,-framework,Cocoa -Wl,-framework,Carbon -Wl,-framework,OpenGL \
                 -Wl,-framework,CoreMidi -Wl,-framework,AudioUnit \
                 -Wl,-framework,AudioToolbox -Wl,-framework,IOKit -Wl,-framework,AGL \
@@ -264,7 +264,7 @@ endif
 ifeq ($(RENDERTYPE),SDL)
     ifeq ($(PLATFORM),WINDOWS)
         OURCOMMONFLAGS += -I$(SDLROOT)/include -I$(SDLROOT)/include/SDL
-        LIBS+= Windows/lib$(WINLIB)/SDL_mixer.lib
+        LIBS+= platform/Windows/lib$(WINLIB)/SDL_mixer.lib
         LIBDIRS+= -L$(SDLROOT)/lib
     else
         ifneq ($(PLATFORM),DARWIN)
@@ -352,7 +352,7 @@ ifneq ($(STRIP),)
 	$(STRIP) $(EDUKE32)
 endif
 ifeq ($(PLATFORM),DARWIN)
-	cp -RPf "Apple/bundles/EDuke32.app" "./"
+	cp -RPf "platform/Apple/bundles/EDuke32.app" "./"
 	mkdir -p "EDuke32.app/Contents/MacOS"
 	cp -f "$(EDUKE32)" "EDuke32.app/Contents/MacOS/"
 endif
@@ -364,7 +364,7 @@ ifneq ($(STRIP),)
 	$(STRIP) $(MAPSTER32)
 endif
 ifeq ($(PLATFORM),DARWIN)
-	cp -RPf "Apple/bundles/Mapster32.app" "./"
+	cp -RPf "platform/Apple/bundles/Mapster32.app" "./"
 	mkdir -p "Mapster32.app/Contents/MacOS"
 	cp -f "$(MAPSTER32)" "Mapster32.app/Contents/MacOS/"
 endif
@@ -405,7 +405,7 @@ endif
 
 # RULES
 
-$(EBACKTRACEDLL): Windows/src/backtrace.c
+$(EBACKTRACEDLL): platform/Windows/src/backtrace.c
 	$(COMPILE_STATUS)
 	if $(CC) $(OURCONLYFLAGS) -O2 -shared -Wall -Wextra -I$(EINC) -o $@ $^ -lbfd -liberty -limagehlp; then $(COMPILE_OK); else $(COMPILE_FAILED); fi
 
@@ -467,7 +467,7 @@ $(SRC)/lunatic/mapster32.def: $(SRC)/lunatic/dynsymlist_m32
 
 ####
 
-$(OBJ)/%.$o: Apple/%.m
+$(OBJ)/%.$o: platform/Apple/%.m
 	$(COMPILE_STATUS)
 	if $(COMPILER) $(OURCFLAGS) -c $< -o $@; then $(COMPILE_OK); else $(COMPILE_FAILED); fi
 
diff --git a/polymer/eduke32/Makefile.common b/polymer/eduke32/Makefile.common
index 82bce5284..c4ede6792 100644
--- a/polymer/eduke32/Makefile.common
+++ b/polymer/eduke32/Makefile.common
@@ -398,14 +398,14 @@ endif
 
 # Set up target-specific headers and libs that work across all Makefiles
 ifeq ($(PLATFORM),WINDOWS)
-    BASELIBDIRS+= -L$(abspath $(dir $(MAKEFILE_COMMON))Windows/lib$(WINLIB))
-    BASECOMMONFLAGS+= -I$(abspath $(dir $(MAKEFILE_COMMON))Windows/include)
+    BASELIBDIRS+= -L$(abspath $(dir $(MAKEFILE_COMMON))platform/Windows/lib$(WINLIB))
+    BASECOMMONFLAGS+= -I$(abspath $(dir $(MAKEFILE_COMMON))platform/Windows/include)
 endif
 ifeq ($(PLATFORM),DARWIN)
     # include port and brew
-    BASELIBDIRS+= -L$(abspath $(dir $(MAKEFILE_COMMON))Apple/lib) \
+    BASELIBDIRS+= -L$(abspath $(dir $(MAKEFILE_COMMON))platform/Apple/lib) \
         -L/opt/local/lib -L/usr/local/lib
-    BASECOMMONFLAGS+= -I$(abspath $(dir $(MAKEFILE_COMMON))Apple/include) \
+    BASECOMMONFLAGS+= -I$(abspath $(dir $(MAKEFILE_COMMON))platform/Apple/include) \
         -I/opt/local/include -I/sw/include -I/usr/local/include
 endif
 
diff --git a/polymer/eduke32/Makefile.msvc b/polymer/eduke32/Makefile.msvc
index 6e9f72043..ae501860e 100644
--- a/polymer/eduke32/Makefile.msvc
+++ b/polymer/eduke32/Makefile.msvc
@@ -1,10 +1,10 @@
 # EDuke32 Makefile for Microsoft NMake
 CPLUSPLUS=1
 SRC=source
-OBJ=obj_win
+OBJ=$(SRC)\obj_win
 EROOT=build
 EINC=$(EROOT)\include
-EOBJ=eobj_win
+EOBJ=$(SRC)\eobj_win
 INC=$(SRC)
 RSRC=rsrc
 o=obj
diff --git a/polymer/eduke32/Apple/SDLMain.h b/polymer/eduke32/platform/Apple/SDLMain.h
similarity index 100%
rename from polymer/eduke32/Apple/SDLMain.h
rename to polymer/eduke32/platform/Apple/SDLMain.h
diff --git a/polymer/eduke32/Apple/SDLMain.m b/polymer/eduke32/platform/Apple/SDLMain.m
similarity index 100%
rename from polymer/eduke32/Apple/SDLMain.m
rename to polymer/eduke32/platform/Apple/SDLMain.m
diff --git a/polymer/eduke32/Apple/bundles/EDuke32.app/Contents/Info.plist b/polymer/eduke32/platform/Apple/bundles/EDuke32.app/Contents/Info.plist
similarity index 100%
rename from polymer/eduke32/Apple/bundles/EDuke32.app/Contents/Info.plist
rename to polymer/eduke32/platform/Apple/bundles/EDuke32.app/Contents/Info.plist
diff --git a/polymer/eduke32/Apple/bundles/EDuke32.app/Contents/PkgInfo b/polymer/eduke32/platform/Apple/bundles/EDuke32.app/Contents/PkgInfo
similarity index 100%
rename from polymer/eduke32/Apple/bundles/EDuke32.app/Contents/PkgInfo
rename to polymer/eduke32/platform/Apple/bundles/EDuke32.app/Contents/PkgInfo
diff --git a/polymer/eduke32/Apple/bundles/EDuke32.app/Contents/Resources/alternate.icns b/polymer/eduke32/platform/Apple/bundles/EDuke32.app/Contents/Resources/alternate.icns
similarity index 100%
rename from polymer/eduke32/Apple/bundles/EDuke32.app/Contents/Resources/alternate.icns
rename to polymer/eduke32/platform/Apple/bundles/EDuke32.app/Contents/Resources/alternate.icns
diff --git a/polymer/eduke32/Apple/bundles/EDuke32.app/Contents/Resources/eduke32.icns b/polymer/eduke32/platform/Apple/bundles/EDuke32.app/Contents/Resources/eduke32.icns
similarity index 100%
rename from polymer/eduke32/Apple/bundles/EDuke32.app/Contents/Resources/eduke32.icns
rename to polymer/eduke32/platform/Apple/bundles/EDuke32.app/Contents/Resources/eduke32.icns
diff --git a/polymer/eduke32/Apple/bundles/EDuke32.app/Contents/Resources/game.osxmain.nib/classes.nib b/polymer/eduke32/platform/Apple/bundles/EDuke32.app/Contents/Resources/game.osxmain.nib/classes.nib
similarity index 100%
rename from polymer/eduke32/Apple/bundles/EDuke32.app/Contents/Resources/game.osxmain.nib/classes.nib
rename to polymer/eduke32/platform/Apple/bundles/EDuke32.app/Contents/Resources/game.osxmain.nib/classes.nib
diff --git a/polymer/eduke32/Apple/bundles/EDuke32.app/Contents/Resources/game.osxmain.nib/info.nib b/polymer/eduke32/platform/Apple/bundles/EDuke32.app/Contents/Resources/game.osxmain.nib/info.nib
similarity index 100%
rename from polymer/eduke32/Apple/bundles/EDuke32.app/Contents/Resources/game.osxmain.nib/info.nib
rename to polymer/eduke32/platform/Apple/bundles/EDuke32.app/Contents/Resources/game.osxmain.nib/info.nib
diff --git a/polymer/eduke32/Apple/bundles/EDuke32.app/Contents/Resources/game.osxmain.nib/keyedobjects.nib b/polymer/eduke32/platform/Apple/bundles/EDuke32.app/Contents/Resources/game.osxmain.nib/keyedobjects.nib
similarity index 100%
rename from polymer/eduke32/Apple/bundles/EDuke32.app/Contents/Resources/game.osxmain.nib/keyedobjects.nib
rename to polymer/eduke32/platform/Apple/bundles/EDuke32.app/Contents/Resources/game.osxmain.nib/keyedobjects.nib
diff --git a/polymer/eduke32/Apple/bundles/EDuke32.app/Contents/Resources/orange.icns b/polymer/eduke32/platform/Apple/bundles/EDuke32.app/Contents/Resources/orange.icns
similarity index 100%
rename from polymer/eduke32/Apple/bundles/EDuke32.app/Contents/Resources/orange.icns
rename to polymer/eduke32/platform/Apple/bundles/EDuke32.app/Contents/Resources/orange.icns
diff --git a/polymer/eduke32/Apple/bundles/EDuke32.app/Contents/Resources/startwin.game.nib/classes.nib b/polymer/eduke32/platform/Apple/bundles/EDuke32.app/Contents/Resources/startwin.game.nib/classes.nib
similarity index 100%
rename from polymer/eduke32/Apple/bundles/EDuke32.app/Contents/Resources/startwin.game.nib/classes.nib
rename to polymer/eduke32/platform/Apple/bundles/EDuke32.app/Contents/Resources/startwin.game.nib/classes.nib
diff --git a/polymer/eduke32/Apple/bundles/EDuke32.app/Contents/Resources/startwin.game.nib/info.nib b/polymer/eduke32/platform/Apple/bundles/EDuke32.app/Contents/Resources/startwin.game.nib/info.nib
similarity index 100%
rename from polymer/eduke32/Apple/bundles/EDuke32.app/Contents/Resources/startwin.game.nib/info.nib
rename to polymer/eduke32/platform/Apple/bundles/EDuke32.app/Contents/Resources/startwin.game.nib/info.nib
diff --git a/polymer/eduke32/Apple/bundles/EDuke32.app/Contents/Resources/startwin.game.nib/keyedobjects.nib b/polymer/eduke32/platform/Apple/bundles/EDuke32.app/Contents/Resources/startwin.game.nib/keyedobjects.nib
similarity index 100%
rename from polymer/eduke32/Apple/bundles/EDuke32.app/Contents/Resources/startwin.game.nib/keyedobjects.nib
rename to polymer/eduke32/platform/Apple/bundles/EDuke32.app/Contents/Resources/startwin.game.nib/keyedobjects.nib
diff --git a/polymer/eduke32/Apple/bundles/Mapster32.app/Contents/Info.plist b/polymer/eduke32/platform/Apple/bundles/Mapster32.app/Contents/Info.plist
similarity index 100%
rename from polymer/eduke32/Apple/bundles/Mapster32.app/Contents/Info.plist
rename to polymer/eduke32/platform/Apple/bundles/Mapster32.app/Contents/Info.plist
diff --git a/polymer/eduke32/Apple/bundles/Mapster32.app/Contents/PkgInfo b/polymer/eduke32/platform/Apple/bundles/Mapster32.app/Contents/PkgInfo
similarity index 100%
rename from polymer/eduke32/Apple/bundles/Mapster32.app/Contents/PkgInfo
rename to polymer/eduke32/platform/Apple/bundles/Mapster32.app/Contents/PkgInfo
diff --git a/polymer/eduke32/Apple/bundles/Mapster32.app/Contents/Resources/alternate.icns b/polymer/eduke32/platform/Apple/bundles/Mapster32.app/Contents/Resources/alternate.icns
similarity index 100%
rename from polymer/eduke32/Apple/bundles/Mapster32.app/Contents/Resources/alternate.icns
rename to polymer/eduke32/platform/Apple/bundles/Mapster32.app/Contents/Resources/alternate.icns
diff --git a/polymer/eduke32/Apple/bundles/Mapster32.app/Contents/Resources/build.osxmain.nib/classes.nib b/polymer/eduke32/platform/Apple/bundles/Mapster32.app/Contents/Resources/build.osxmain.nib/classes.nib
similarity index 100%
rename from polymer/eduke32/Apple/bundles/Mapster32.app/Contents/Resources/build.osxmain.nib/classes.nib
rename to polymer/eduke32/platform/Apple/bundles/Mapster32.app/Contents/Resources/build.osxmain.nib/classes.nib
diff --git a/polymer/eduke32/Apple/bundles/Mapster32.app/Contents/Resources/build.osxmain.nib/info.nib b/polymer/eduke32/platform/Apple/bundles/Mapster32.app/Contents/Resources/build.osxmain.nib/info.nib
similarity index 100%
rename from polymer/eduke32/Apple/bundles/Mapster32.app/Contents/Resources/build.osxmain.nib/info.nib
rename to polymer/eduke32/platform/Apple/bundles/Mapster32.app/Contents/Resources/build.osxmain.nib/info.nib
diff --git a/polymer/eduke32/Apple/bundles/Mapster32.app/Contents/Resources/build.osxmain.nib/keyedobjects.nib b/polymer/eduke32/platform/Apple/bundles/Mapster32.app/Contents/Resources/build.osxmain.nib/keyedobjects.nib
similarity index 100%
rename from polymer/eduke32/Apple/bundles/Mapster32.app/Contents/Resources/build.osxmain.nib/keyedobjects.nib
rename to polymer/eduke32/platform/Apple/bundles/Mapster32.app/Contents/Resources/build.osxmain.nib/keyedobjects.nib
diff --git a/polymer/eduke32/Apple/bundles/Mapster32.app/Contents/Resources/mapster32.icns b/polymer/eduke32/platform/Apple/bundles/Mapster32.app/Contents/Resources/mapster32.icns
similarity index 100%
rename from polymer/eduke32/Apple/bundles/Mapster32.app/Contents/Resources/mapster32.icns
rename to polymer/eduke32/platform/Apple/bundles/Mapster32.app/Contents/Resources/mapster32.icns
diff --git a/polymer/eduke32/Apple/bundles/Mapster32.app/Contents/Resources/orange.icns b/polymer/eduke32/platform/Apple/bundles/Mapster32.app/Contents/Resources/orange.icns
similarity index 100%
rename from polymer/eduke32/Apple/bundles/Mapster32.app/Contents/Resources/orange.icns
rename to polymer/eduke32/platform/Apple/bundles/Mapster32.app/Contents/Resources/orange.icns
diff --git a/polymer/eduke32/Apple/bundles/Mapster32.app/Contents/Resources/startwin.editor.nib/classes.nib b/polymer/eduke32/platform/Apple/bundles/Mapster32.app/Contents/Resources/startwin.editor.nib/classes.nib
similarity index 100%
rename from polymer/eduke32/Apple/bundles/Mapster32.app/Contents/Resources/startwin.editor.nib/classes.nib
rename to polymer/eduke32/platform/Apple/bundles/Mapster32.app/Contents/Resources/startwin.editor.nib/classes.nib
diff --git a/polymer/eduke32/Apple/bundles/Mapster32.app/Contents/Resources/startwin.editor.nib/info.nib b/polymer/eduke32/platform/Apple/bundles/Mapster32.app/Contents/Resources/startwin.editor.nib/info.nib
similarity index 100%
rename from polymer/eduke32/Apple/bundles/Mapster32.app/Contents/Resources/startwin.editor.nib/info.nib
rename to polymer/eduke32/platform/Apple/bundles/Mapster32.app/Contents/Resources/startwin.editor.nib/info.nib
diff --git a/polymer/eduke32/Apple/bundles/Mapster32.app/Contents/Resources/startwin.editor.nib/keyedobjects.nib b/polymer/eduke32/platform/Apple/bundles/Mapster32.app/Contents/Resources/startwin.editor.nib/keyedobjects.nib
similarity index 100%
rename from polymer/eduke32/Apple/bundles/Mapster32.app/Contents/Resources/startwin.editor.nib/keyedobjects.nib
rename to polymer/eduke32/platform/Apple/bundles/Mapster32.app/Contents/Resources/startwin.editor.nib/keyedobjects.nib
diff --git a/polymer/eduke32/Apple/lib/libSDLmain.a b/polymer/eduke32/platform/Apple/lib/libSDLmain.a
similarity index 100%
rename from polymer/eduke32/Apple/lib/libSDLmain.a
rename to polymer/eduke32/platform/Apple/lib/libSDLmain.a
diff --git a/polymer/eduke32/Wii/apps/eduke32/icon.png b/polymer/eduke32/platform/Wii/apps/eduke32/icon.png
similarity index 100%
rename from polymer/eduke32/Wii/apps/eduke32/icon.png
rename to polymer/eduke32/platform/Wii/apps/eduke32/icon.png
diff --git a/polymer/eduke32/Wii/apps/mapster32/icon.png b/polymer/eduke32/platform/Wii/apps/mapster32/icon.png
similarity index 100%
rename from polymer/eduke32/Wii/apps/mapster32/icon.png
rename to polymer/eduke32/platform/Wii/apps/mapster32/icon.png
diff --git a/polymer/eduke32/Wii/eduke32_meta_1.xml b/polymer/eduke32/platform/Wii/eduke32_meta_1.xml
similarity index 100%
rename from polymer/eduke32/Wii/eduke32_meta_1.xml
rename to polymer/eduke32/platform/Wii/eduke32_meta_1.xml
diff --git a/polymer/eduke32/Wii/eduke32_meta_2.xml b/polymer/eduke32/platform/Wii/eduke32_meta_2.xml
similarity index 100%
rename from polymer/eduke32/Wii/eduke32_meta_2.xml
rename to polymer/eduke32/platform/Wii/eduke32_meta_2.xml
diff --git a/polymer/eduke32/Wii/mapster32_meta_1.xml b/polymer/eduke32/platform/Wii/mapster32_meta_1.xml
similarity index 100%
rename from polymer/eduke32/Wii/mapster32_meta_1.xml
rename to polymer/eduke32/platform/Wii/mapster32_meta_1.xml
diff --git a/polymer/eduke32/Wii/mapster32_meta_2.xml b/polymer/eduke32/platform/Wii/mapster32_meta_2.xml
similarity index 100%
rename from polymer/eduke32/Wii/mapster32_meta_2.xml
rename to polymer/eduke32/platform/Wii/mapster32_meta_2.xml
diff --git a/polymer/eduke32/Wii/xcopy_exclude.txt b/polymer/eduke32/platform/Wii/xcopy_exclude.txt
similarity index 100%
rename from polymer/eduke32/Wii/xcopy_exclude.txt
rename to polymer/eduke32/platform/Wii/xcopy_exclude.txt
diff --git a/polymer/eduke32/Windows/include/ddraw.h b/polymer/eduke32/platform/Windows/include/ddraw.h
similarity index 100%
rename from polymer/eduke32/Windows/include/ddraw.h
rename to polymer/eduke32/platform/Windows/include/ddraw.h
diff --git a/polymer/eduke32/Windows/include/dinput.h b/polymer/eduke32/platform/Windows/include/dinput.h
similarity index 100%
rename from polymer/eduke32/Windows/include/dinput.h
rename to polymer/eduke32/platform/Windows/include/dinput.h
diff --git a/polymer/eduke32/Windows/include/dsound.h b/polymer/eduke32/platform/Windows/include/dsound.h
similarity index 100%
rename from polymer/eduke32/Windows/include/dsound.h
rename to polymer/eduke32/platform/Windows/include/dsound.h
diff --git a/polymer/eduke32/Windows/include/dx_compat.h b/polymer/eduke32/platform/Windows/include/dx_compat.h
similarity index 100%
rename from polymer/eduke32/Windows/include/dx_compat.h
rename to polymer/eduke32/platform/Windows/include/dx_compat.h
diff --git a/polymer/eduke32/Windows/include/png.h b/polymer/eduke32/platform/Windows/include/png.h
similarity index 100%
rename from polymer/eduke32/Windows/include/png.h
rename to polymer/eduke32/platform/Windows/include/png.h
diff --git a/polymer/eduke32/Windows/include/pngconf.h b/polymer/eduke32/platform/Windows/include/pngconf.h
similarity index 100%
rename from polymer/eduke32/Windows/include/pngconf.h
rename to polymer/eduke32/platform/Windows/include/pngconf.h
diff --git a/polymer/eduke32/Windows/include/pnglibconf.h b/polymer/eduke32/platform/Windows/include/pnglibconf.h
similarity index 100%
rename from polymer/eduke32/Windows/include/pnglibconf.h
rename to polymer/eduke32/platform/Windows/include/pnglibconf.h
diff --git a/polymer/eduke32/Windows/include/vpx/vp8.h b/polymer/eduke32/platform/Windows/include/vpx/vp8.h
similarity index 100%
rename from polymer/eduke32/Windows/include/vpx/vp8.h
rename to polymer/eduke32/platform/Windows/include/vpx/vp8.h
diff --git a/polymer/eduke32/Windows/include/vpx/vp8dx.h b/polymer/eduke32/platform/Windows/include/vpx/vp8dx.h
similarity index 100%
rename from polymer/eduke32/Windows/include/vpx/vp8dx.h
rename to polymer/eduke32/platform/Windows/include/vpx/vp8dx.h
diff --git a/polymer/eduke32/Windows/include/vpx/vpx_codec.h b/polymer/eduke32/platform/Windows/include/vpx/vpx_codec.h
similarity index 100%
rename from polymer/eduke32/Windows/include/vpx/vpx_codec.h
rename to polymer/eduke32/platform/Windows/include/vpx/vpx_codec.h
diff --git a/polymer/eduke32/Windows/include/vpx/vpx_codec_impl_bottom.h b/polymer/eduke32/platform/Windows/include/vpx/vpx_codec_impl_bottom.h
similarity index 100%
rename from polymer/eduke32/Windows/include/vpx/vpx_codec_impl_bottom.h
rename to polymer/eduke32/platform/Windows/include/vpx/vpx_codec_impl_bottom.h
diff --git a/polymer/eduke32/Windows/include/vpx/vpx_codec_impl_top.h b/polymer/eduke32/platform/Windows/include/vpx/vpx_codec_impl_top.h
similarity index 100%
rename from polymer/eduke32/Windows/include/vpx/vpx_codec_impl_top.h
rename to polymer/eduke32/platform/Windows/include/vpx/vpx_codec_impl_top.h
diff --git a/polymer/eduke32/Windows/include/vpx/vpx_decoder.h b/polymer/eduke32/platform/Windows/include/vpx/vpx_decoder.h
similarity index 100%
rename from polymer/eduke32/Windows/include/vpx/vpx_decoder.h
rename to polymer/eduke32/platform/Windows/include/vpx/vpx_decoder.h
diff --git a/polymer/eduke32/Windows/include/vpx/vpx_decoder_compat.h b/polymer/eduke32/platform/Windows/include/vpx/vpx_decoder_compat.h
similarity index 100%
rename from polymer/eduke32/Windows/include/vpx/vpx_decoder_compat.h
rename to polymer/eduke32/platform/Windows/include/vpx/vpx_decoder_compat.h
diff --git a/polymer/eduke32/Windows/include/vpx/vpx_image.h b/polymer/eduke32/platform/Windows/include/vpx/vpx_image.h
similarity index 100%
rename from polymer/eduke32/Windows/include/vpx/vpx_image.h
rename to polymer/eduke32/platform/Windows/include/vpx/vpx_image.h
diff --git a/polymer/eduke32/Windows/include/vpx/vpx_integer.h b/polymer/eduke32/platform/Windows/include/vpx/vpx_integer.h
similarity index 100%
rename from polymer/eduke32/Windows/include/vpx/vpx_integer.h
rename to polymer/eduke32/platform/Windows/include/vpx/vpx_integer.h
diff --git a/polymer/eduke32/Windows/lib/32/SDL_mixer.lib b/polymer/eduke32/platform/Windows/lib/32/SDL_mixer.lib
similarity index 100%
rename from polymer/eduke32/Windows/lib/32/SDL_mixer.lib
rename to polymer/eduke32/platform/Windows/lib/32/SDL_mixer.lib
diff --git a/polymer/eduke32/Windows/lib/32/libdsound.a b/polymer/eduke32/platform/Windows/lib/32/libdsound.a
similarity index 100%
rename from polymer/eduke32/Windows/lib/32/libdsound.a
rename to polymer/eduke32/platform/Windows/lib/32/libdsound.a
diff --git a/polymer/eduke32/Windows/lib/32/libdxguid.a b/polymer/eduke32/platform/Windows/lib/32/libdxguid.a
similarity index 100%
rename from polymer/eduke32/Windows/lib/32/libdxguid.a
rename to polymer/eduke32/platform/Windows/lib/32/libdxguid.a
diff --git a/polymer/eduke32/Windows/lib/32/libpng_mini.a b/polymer/eduke32/platform/Windows/lib/32/libpng_mini.a
similarity index 100%
rename from polymer/eduke32/Windows/lib/32/libpng_mini.a
rename to polymer/eduke32/platform/Windows/lib/32/libpng_mini.a
diff --git a/polymer/eduke32/Windows/lib/32/libvpx.a b/polymer/eduke32/platform/Windows/lib/32/libvpx.a
similarity index 100%
rename from polymer/eduke32/Windows/lib/32/libvpx.a
rename to polymer/eduke32/platform/Windows/lib/32/libvpx.a
diff --git a/polymer/eduke32/Windows/lib/32/libvpx_g.a b/polymer/eduke32/platform/Windows/lib/32/libvpx_g.a
similarity index 100%
rename from polymer/eduke32/Windows/lib/32/libvpx_g.a
rename to polymer/eduke32/platform/Windows/lib/32/libvpx_g.a
diff --git a/polymer/eduke32/Windows/lib/32/libz_mini.a b/polymer/eduke32/platform/Windows/lib/32/libz_mini.a
similarity index 100%
rename from polymer/eduke32/Windows/lib/32/libz_mini.a
rename to polymer/eduke32/platform/Windows/lib/32/libz_mini.a
diff --git a/polymer/eduke32/Windows/lib/64/SDL_mixer.lib b/polymer/eduke32/platform/Windows/lib/64/SDL_mixer.lib
similarity index 100%
rename from polymer/eduke32/Windows/lib/64/SDL_mixer.lib
rename to polymer/eduke32/platform/Windows/lib/64/SDL_mixer.lib
diff --git a/polymer/eduke32/Windows/lib/64/libdsound.a b/polymer/eduke32/platform/Windows/lib/64/libdsound.a
similarity index 100%
rename from polymer/eduke32/Windows/lib/64/libdsound.a
rename to polymer/eduke32/platform/Windows/lib/64/libdsound.a
diff --git a/polymer/eduke32/Windows/lib/64/libdxguid.a b/polymer/eduke32/platform/Windows/lib/64/libdxguid.a
similarity index 100%
rename from polymer/eduke32/Windows/lib/64/libdxguid.a
rename to polymer/eduke32/platform/Windows/lib/64/libdxguid.a
diff --git a/polymer/eduke32/Windows/lib/64/libpng_mini.a b/polymer/eduke32/platform/Windows/lib/64/libpng_mini.a
similarity index 100%
rename from polymer/eduke32/Windows/lib/64/libpng_mini.a
rename to polymer/eduke32/platform/Windows/lib/64/libpng_mini.a
diff --git a/polymer/eduke32/Windows/lib/64/libvpx.a b/polymer/eduke32/platform/Windows/lib/64/libvpx.a
similarity index 100%
rename from polymer/eduke32/Windows/lib/64/libvpx.a
rename to polymer/eduke32/platform/Windows/lib/64/libvpx.a
diff --git a/polymer/eduke32/Windows/lib/64/libvpx_g.a b/polymer/eduke32/platform/Windows/lib/64/libvpx_g.a
similarity index 100%
rename from polymer/eduke32/Windows/lib/64/libvpx_g.a
rename to polymer/eduke32/platform/Windows/lib/64/libvpx_g.a
diff --git a/polymer/eduke32/Windows/lib/64/libz_mini.a b/polymer/eduke32/platform/Windows/lib/64/libz_mini.a
similarity index 100%
rename from polymer/eduke32/Windows/lib/64/libz_mini.a
rename to polymer/eduke32/platform/Windows/lib/64/libz_mini.a
diff --git a/polymer/eduke32/Windows/lib/instructions.txt b/polymer/eduke32/platform/Windows/lib/instructions.txt
similarity index 100%
rename from polymer/eduke32/Windows/lib/instructions.txt
rename to polymer/eduke32/platform/Windows/lib/instructions.txt
diff --git a/polymer/eduke32/Windows/lib/libvpx with MinGW-w64.patch b/polymer/eduke32/platform/Windows/lib/libvpx with MinGW-w64.patch
similarity index 100%
rename from polymer/eduke32/Windows/lib/libvpx with MinGW-w64.patch
rename to polymer/eduke32/platform/Windows/lib/libvpx with MinGW-w64.patch
diff --git a/polymer/eduke32/Windows/lib/minipng.dfa b/polymer/eduke32/platform/Windows/lib/minipng.dfa
similarity index 100%
rename from polymer/eduke32/Windows/lib/minipng.dfa
rename to polymer/eduke32/platform/Windows/lib/minipng.dfa
diff --git a/polymer/eduke32/Windows/src/_dbg_LOAD_IMAGE.h b/polymer/eduke32/platform/Windows/src/_dbg_LOAD_IMAGE.h
similarity index 100%
rename from polymer/eduke32/Windows/src/_dbg_LOAD_IMAGE.h
rename to polymer/eduke32/platform/Windows/src/_dbg_LOAD_IMAGE.h
diff --git a/polymer/eduke32/Windows/src/_dbg_common.h b/polymer/eduke32/platform/Windows/src/_dbg_common.h
similarity index 100%
rename from polymer/eduke32/Windows/src/_dbg_common.h
rename to polymer/eduke32/platform/Windows/src/_dbg_common.h
diff --git a/polymer/eduke32/Windows/src/backtrace.c b/polymer/eduke32/platform/Windows/src/backtrace.c
similarity index 100%
rename from polymer/eduke32/Windows/src/backtrace.c
rename to polymer/eduke32/platform/Windows/src/backtrace.c
diff --git a/polymer/eduke32/Windows/src/dxlibs/Makefile b/polymer/eduke32/platform/Windows/src/dxlibs/Makefile
similarity index 100%
rename from polymer/eduke32/Windows/src/dxlibs/Makefile
rename to polymer/eduke32/platform/Windows/src/dxlibs/Makefile
diff --git a/polymer/eduke32/Windows/src/dxlibs/d3d8.def b/polymer/eduke32/platform/Windows/src/dxlibs/d3d8.def
similarity index 100%
rename from polymer/eduke32/Windows/src/dxlibs/d3d8.def
rename to polymer/eduke32/platform/Windows/src/dxlibs/d3d8.def
diff --git a/polymer/eduke32/Windows/src/dxlibs/d3dx8d.def b/polymer/eduke32/platform/Windows/src/dxlibs/d3dx8d.def
similarity index 100%
rename from polymer/eduke32/Windows/src/dxlibs/d3dx8d.def
rename to polymer/eduke32/platform/Windows/src/dxlibs/d3dx8d.def
diff --git a/polymer/eduke32/Windows/src/dxlibs/d3dxof.def b/polymer/eduke32/platform/Windows/src/dxlibs/d3dxof.def
similarity index 100%
rename from polymer/eduke32/Windows/src/dxlibs/d3dxof.def
rename to polymer/eduke32/platform/Windows/src/dxlibs/d3dxof.def
diff --git a/polymer/eduke32/Windows/src/dxlibs/ddraw.def b/polymer/eduke32/platform/Windows/src/dxlibs/ddraw.def
similarity index 100%
rename from polymer/eduke32/Windows/src/dxlibs/ddraw.def
rename to polymer/eduke32/platform/Windows/src/dxlibs/ddraw.def
diff --git a/polymer/eduke32/Windows/src/dxlibs/dinput.c b/polymer/eduke32/platform/Windows/src/dxlibs/dinput.c
similarity index 100%
rename from polymer/eduke32/Windows/src/dxlibs/dinput.c
rename to polymer/eduke32/platform/Windows/src/dxlibs/dinput.c
diff --git a/polymer/eduke32/Windows/src/dxlibs/dinput.def b/polymer/eduke32/platform/Windows/src/dxlibs/dinput.def
similarity index 100%
rename from polymer/eduke32/Windows/src/dxlibs/dinput.def
rename to polymer/eduke32/platform/Windows/src/dxlibs/dinput.def
diff --git a/polymer/eduke32/Windows/src/dxlibs/dinput8.def b/polymer/eduke32/platform/Windows/src/dxlibs/dinput8.def
similarity index 100%
rename from polymer/eduke32/Windows/src/dxlibs/dinput8.def
rename to polymer/eduke32/platform/Windows/src/dxlibs/dinput8.def
diff --git a/polymer/eduke32/Windows/src/dxlibs/dplayx.def b/polymer/eduke32/platform/Windows/src/dxlibs/dplayx.def
similarity index 100%
rename from polymer/eduke32/Windows/src/dxlibs/dplayx.def
rename to polymer/eduke32/platform/Windows/src/dxlibs/dplayx.def
diff --git a/polymer/eduke32/Windows/src/dxlibs/dpnaddr.def b/polymer/eduke32/platform/Windows/src/dxlibs/dpnaddr.def
similarity index 100%
rename from polymer/eduke32/Windows/src/dxlibs/dpnaddr.def
rename to polymer/eduke32/platform/Windows/src/dxlibs/dpnaddr.def
diff --git a/polymer/eduke32/Windows/src/dxlibs/dpnet.def b/polymer/eduke32/platform/Windows/src/dxlibs/dpnet.def
similarity index 100%
rename from polymer/eduke32/Windows/src/dxlibs/dpnet.def
rename to polymer/eduke32/platform/Windows/src/dxlibs/dpnet.def
diff --git a/polymer/eduke32/Windows/src/dxlibs/dpnlobby.def b/polymer/eduke32/platform/Windows/src/dxlibs/dpnlobby.def
similarity index 100%
rename from polymer/eduke32/Windows/src/dxlibs/dpnlobby.def
rename to polymer/eduke32/platform/Windows/src/dxlibs/dpnlobby.def
diff --git a/polymer/eduke32/Windows/src/dxlibs/dpvoice.def b/polymer/eduke32/platform/Windows/src/dxlibs/dpvoice.def
similarity index 100%
rename from polymer/eduke32/Windows/src/dxlibs/dpvoice.def
rename to polymer/eduke32/platform/Windows/src/dxlibs/dpvoice.def
diff --git a/polymer/eduke32/Windows/src/dxlibs/dsetup.def b/polymer/eduke32/platform/Windows/src/dxlibs/dsetup.def
similarity index 100%
rename from polymer/eduke32/Windows/src/dxlibs/dsetup.def
rename to polymer/eduke32/platform/Windows/src/dxlibs/dsetup.def
diff --git a/polymer/eduke32/Windows/src/dxlibs/dsound.def b/polymer/eduke32/platform/Windows/src/dxlibs/dsound.def
similarity index 100%
rename from polymer/eduke32/Windows/src/dxlibs/dsound.def
rename to polymer/eduke32/platform/Windows/src/dxlibs/dsound.def
diff --git a/polymer/eduke32/Windows/src/dxlibs/dxguid.c b/polymer/eduke32/platform/Windows/src/dxlibs/dxguid.c
similarity index 100%
rename from polymer/eduke32/Windows/src/dxlibs/dxguid.c
rename to polymer/eduke32/platform/Windows/src/dxlibs/dxguid.c
diff --git a/polymer/eduke32/Windows/src/dxlibs/readme.txt b/polymer/eduke32/platform/Windows/src/dxlibs/readme.txt
similarity index 100%
rename from polymer/eduke32/Windows/src/dxlibs/readme.txt
rename to polymer/eduke32/platform/Windows/src/dxlibs/readme.txt
diff --git a/polymer/eduke32/osxbuild.sh b/polymer/eduke32/platform/osxbuild.sh
similarity index 100%
rename from polymer/eduke32/osxbuild.sh
rename to polymer/eduke32/platform/osxbuild.sh
diff --git a/polymer/eduke32/wiibuild.bat b/polymer/eduke32/platform/wiibuild.bat
similarity index 100%
rename from polymer/eduke32/wiibuild.bat
rename to polymer/eduke32/platform/wiibuild.bat
diff --git a/polymer/eduke32/psd/EDuke32_logo_21_large.psd b/polymer/eduke32/rsrc/source/EDuke32_logo_21_large.psd
similarity index 100%
rename from polymer/eduke32/psd/EDuke32_logo_21_large.psd
rename to polymer/eduke32/rsrc/source/EDuke32_logo_21_large.psd
diff --git a/polymer/eduke32/psd/EDuke32_logo_21_large_blue.psd b/polymer/eduke32/rsrc/source/EDuke32_logo_21_large_blue.psd
similarity index 100%
rename from polymer/eduke32/psd/EDuke32_logo_21_large_blue.psd
rename to polymer/eduke32/rsrc/source/EDuke32_logo_21_large_blue.psd
diff --git a/polymer/eduke32/psd/EDuke32_logo_21_large_opaque.psd b/polymer/eduke32/rsrc/source/EDuke32_logo_21_large_opaque.psd
similarity index 100%
rename from polymer/eduke32/psd/EDuke32_logo_21_large_opaque.psd
rename to polymer/eduke32/rsrc/source/EDuke32_logo_21_large_opaque.psd
diff --git a/polymer/eduke32/psd/game2.psd b/polymer/eduke32/rsrc/source/game2.psd
similarity index 100%
rename from polymer/eduke32/psd/game2.psd
rename to polymer/eduke32/rsrc/source/game2.psd
diff --git a/polymer/eduke32/psd/game3.psd b/polymer/eduke32/rsrc/source/game3.psd
similarity index 100%
rename from polymer/eduke32/psd/game3.psd
rename to polymer/eduke32/rsrc/source/game3.psd
diff --git a/polymer/eduke32/psd/wii-hbc-icon.xcf b/polymer/eduke32/rsrc/source/wii-hbc-icon.xcf
similarity index 100%
rename from polymer/eduke32/psd/wii-hbc-icon.xcf
rename to polymer/eduke32/rsrc/source/wii-hbc-icon.xcf
diff --git a/polymer/eduke32/eobj/keep.me b/polymer/eduke32/source/eobj/keep.me
similarity index 100%
rename from polymer/eduke32/eobj/keep.me
rename to polymer/eduke32/source/eobj/keep.me
diff --git a/polymer/eduke32/eobj_win/keep.me b/polymer/eduke32/source/eobj_win/keep.me
similarity index 100%
rename from polymer/eduke32/eobj_win/keep.me
rename to polymer/eduke32/source/eobj_win/keep.me
diff --git a/polymer/eduke32/obj/keep.me b/polymer/eduke32/source/obj/keep.me
similarity index 100%
rename from polymer/eduke32/obj/keep.me
rename to polymer/eduke32/source/obj/keep.me
diff --git a/polymer/eduke32/obj_win/keep.me b/polymer/eduke32/source/obj_win/keep.me
similarity index 100%
rename from polymer/eduke32/obj_win/keep.me
rename to polymer/eduke32/source/obj_win/keep.me