diff --git a/config/vs2015/quake3.vcxproj b/config/vs2015/quake3.vcxproj
index 839e554..43b76f4 100644
--- a/config/vs2015/quake3.vcxproj
+++ b/config/vs2015/quake3.vcxproj
@@ -274,43 +274,43 @@
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\source\engine\win32\win_input.c">
+    <ClCompile Include="..\..\source\engine\platform\win_input.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\source\engine\win32\win_main.c">
+    <ClCompile Include="..\..\source\engine\platform\win_main.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\source\engine\win32\win_net.c">
+    <ClCompile Include="..\..\source\engine\platform\win_net.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\source\engine\win32\win_shared.c">
+    <ClCompile Include="..\..\source\engine\platform\win_shared.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\source\engine\win32\win_snd.c">
+    <ClCompile Include="..\..\source\engine\platform\win_snd.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\source\engine\win32\win_syscon.c">
+    <ClCompile Include="..\..\source\engine\platform\win_syscon.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\source\engine\win32\win_wndproc.c">
+    <ClCompile Include="..\..\source\engine\platform\win_wndproc.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
@@ -440,7 +440,7 @@
     <ClInclude Include="..\..\source\engine\qcommon\qcommon.h" />
     <ClInclude Include="..\..\source\engine\qcommon\qfiles.h" />
     <ClInclude Include="..\..\source\engine\renderer\qgl.h" />
-    <ClInclude Include="..\..\source\engine\win32\resource.h" />
+    <ClInclude Include="..\..\source\engine\platform\resource.h" />
     <ClInclude Include="..\..\source\engine\server\server.h" />
     <ClInclude Include="..\..\source\engine\client\snd_local.h" />
     <ClInclude Include="..\..\source\engine\client\snd_public.h" />
@@ -451,17 +451,17 @@
     <ClInclude Include="..\..\source\q3_ui\ui_public.h" />
     <ClInclude Include="..\..\source\engine\qcommon\unzip.h" />
     <ClInclude Include="..\..\source\engine\qcommon\vm_local.h" />
-    <ClInclude Include="..\..\source\engine\win32\win_local.h" />
+    <ClInclude Include="..\..\source\engine\platform\win_local.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\source\engine\win32\qe3.ico" />
+    <None Include="..\..\source\engine\platform\qe3.ico" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="..\..\source\engine\win32\winquake.rc">
+    <ResourceCompile Include="..\..\source\engine\platform\winquake.rc">
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">platform;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">platform;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
diff --git a/config/vs2015/quake3.vcxproj.filters b/config/vs2015/quake3.vcxproj.filters
index 1421c30..cee987c 100644
--- a/config/vs2015/quake3.vcxproj.filters
+++ b/config/vs2015/quake3.vcxproj.filters
@@ -11,7 +11,7 @@
     <Filter Include="Source Files\client">
       <UniqueIdentifier>{ee4ec941-90c2-4111-84e5-3a384ec99170}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\win32">
+    <Filter Include="Source Files\platform">
       <UniqueIdentifier>{f4a5c1df-75fc-4bb6-b7eb-edcec29ede73}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\common">
@@ -99,26 +99,26 @@
     <ClCompile Include="..\..\source\engine\client\snd_wavelet.c">
       <Filter>Source Files\client</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\engine\win32\win_input.c">
-      <Filter>Source Files\win32</Filter>
+    <ClCompile Include="..\..\source\engine\platform\win_input.c">
+      <Filter>Source Files\platform</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\engine\win32\win_main.c">
-      <Filter>Source Files\win32</Filter>
+    <ClCompile Include="..\..\source\engine\platform\win_main.c">
+      <Filter>Source Files\platform</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\engine\win32\win_net.c">
-      <Filter>Source Files\win32</Filter>
+    <ClCompile Include="..\..\source\engine\platform\win_net.c">
+      <Filter>Source Files\platform</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\engine\win32\win_shared.c">
-      <Filter>Source Files\win32</Filter>
+    <ClCompile Include="..\..\source\engine\platform\win_shared.c">
+      <Filter>Source Files\platform</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\engine\win32\win_snd.c">
-      <Filter>Source Files\win32</Filter>
+    <ClCompile Include="..\..\source\engine\platform\win_snd.c">
+      <Filter>Source Files\platform</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\engine\win32\win_syscon.c">
-      <Filter>Source Files\win32</Filter>
+    <ClCompile Include="..\..\source\engine\platform\win_syscon.c">
+      <Filter>Source Files\platform</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\engine\win32\win_wndproc.c">
-      <Filter>Source Files\win32</Filter>
+    <ClCompile Include="..\..\source\engine\platform\win_wndproc.c">
+      <Filter>Source Files\platform</Filter>
     </ClCompile>
     <ClCompile Include="..\..\source\engine\qcommon\cm_load.c">
       <Filter>Source Files\common</Filter>
@@ -215,7 +215,7 @@
     <ClInclude Include="..\..\source\engine\renderer\qgl.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\engine\win32\resource.h">
+    <ClInclude Include="..\..\source\engine\platform\resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\source\engine\server\server.h">
@@ -248,7 +248,7 @@
     <ClInclude Include="..\..\source\engine\qcommon\vm_local.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\engine\win32\win_local.h">
+    <ClInclude Include="..\..\source\engine\platform\win_local.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\source\q3_ui\keycodes.h">
@@ -256,12 +256,12 @@
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\source\engine\win32\qe3.ico">
+    <None Include="..\..\source\engine\platform\qe3.ico">
       <Filter>Resource Files</Filter>
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="..\..\source\engine\win32\winquake.rc">
+    <ResourceCompile Include="..\..\source\engine\platform\winquake.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
diff --git a/config/vs2015/renderer.vcxproj b/config/vs2015/renderer.vcxproj
index 91630d9..fbf98ad 100644
--- a/config/vs2015/renderer.vcxproj
+++ b/config/vs2015/renderer.vcxproj
@@ -253,21 +253,21 @@
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\source\engine\win32\win_gamma.c">
+    <ClCompile Include="..\..\source\engine\platform\win_gamma.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\source\engine\win32\win_glimp.c">
+    <ClCompile Include="..\..\source\engine\platform\win_glimp.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\source\engine\win32\win_qgl.c">
+    <ClCompile Include="..\..\source\engine\platform\win_qgl.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
@@ -529,7 +529,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\source\engine\qcommon\cm_public.h" />
-    <ClInclude Include="..\..\source\engine\win32\glw_win.h" />
+    <ClInclude Include="..\..\source\engine\platform\glw_win.h" />
     <ClInclude Include="..\..\source\game\q_shared.h" />
     <ClInclude Include="..\..\source\engine\qcommon\qcommon.h" />
     <ClInclude Include="..\..\source\engine\qcommon\qfiles.h" />
@@ -538,7 +538,7 @@
     <ClInclude Include="..\..\source\engine\renderer\tr_local.h" />
     <ClInclude Include="..\..\source\engine\renderer\tr_public.h" />
     <ClInclude Include="..\..\source\cgame\tr_types.h" />
-    <ClInclude Include="..\..\source\engine\win32\win_local.h" />
+    <ClInclude Include="..\..\source\engine\platform\win_local.h" />
     <ClInclude Include="..\..\third_party\jpeg-6\jchuff.h" />
     <ClInclude Include="..\..\third_party\jpeg-6\jconfig.h" />
     <ClInclude Include="..\..\third_party\jpeg-6\jdct.h" />
diff --git a/config/vs2015/renderer.vcxproj.filters b/config/vs2015/renderer.vcxproj.filters
index ee71207..a611fb0 100644
--- a/config/vs2015/renderer.vcxproj.filters
+++ b/config/vs2015/renderer.vcxproj.filters
@@ -89,13 +89,13 @@
     <ClCompile Include="..\..\source\engine\renderer\tr_world.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\engine\win32\win_gamma.c">
+    <ClCompile Include="..\..\source\engine\platform\win_gamma.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\engine\win32\win_glimp.c">
+    <ClCompile Include="..\..\source\engine\platform\win_glimp.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\engine\win32\win_qgl.c">
+    <ClCompile Include="..\..\source\engine\platform\win_qgl.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\third_party\jpeg-6\jcapimin.c">
@@ -211,7 +211,7 @@
     <ClInclude Include="..\..\source\engine\qcommon\cm_public.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\engine\win32\glw_win.h">
+    <ClInclude Include="..\..\source\engine\platform\glw_win.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\source\game\q_shared.h">
@@ -232,7 +232,7 @@
     <ClInclude Include="..\..\source\engine\renderer\tr_public.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\engine\win32\win_local.h">
+    <ClInclude Include="..\..\source\engine\platform\win_local.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\third_party\jpeg-6\jchuff.h">
diff --git a/source/engine/win32/glw_win.h b/source/engine/platform/glw_win.h
similarity index 100%
rename from source/engine/win32/glw_win.h
rename to source/engine/platform/glw_win.h
diff --git a/source/engine/win32/qe3.ico b/source/engine/platform/qe3.ico
similarity index 100%
rename from source/engine/win32/qe3.ico
rename to source/engine/platform/qe3.ico
diff --git a/source/engine/win32/resource.h b/source/engine/platform/resource.h
similarity index 100%
rename from source/engine/win32/resource.h
rename to source/engine/platform/resource.h
diff --git a/source/engine/win32/win_gamma.c b/source/engine/platform/win_gamma.c
similarity index 100%
rename from source/engine/win32/win_gamma.c
rename to source/engine/platform/win_gamma.c
diff --git a/source/engine/win32/win_glimp.c b/source/engine/platform/win_glimp.c
similarity index 100%
rename from source/engine/win32/win_glimp.c
rename to source/engine/platform/win_glimp.c
diff --git a/source/engine/win32/win_input.c b/source/engine/platform/win_input.c
similarity index 100%
rename from source/engine/win32/win_input.c
rename to source/engine/platform/win_input.c
diff --git a/source/engine/win32/win_local.h b/source/engine/platform/win_local.h
similarity index 100%
rename from source/engine/win32/win_local.h
rename to source/engine/platform/win_local.h
diff --git a/source/engine/win32/win_main.c b/source/engine/platform/win_main.c
similarity index 100%
rename from source/engine/win32/win_main.c
rename to source/engine/platform/win_main.c
diff --git a/source/engine/win32/win_net.c b/source/engine/platform/win_net.c
similarity index 100%
rename from source/engine/win32/win_net.c
rename to source/engine/platform/win_net.c
diff --git a/source/engine/win32/win_qgl.c b/source/engine/platform/win_qgl.c
similarity index 100%
rename from source/engine/win32/win_qgl.c
rename to source/engine/platform/win_qgl.c
diff --git a/source/engine/win32/win_shared.c b/source/engine/platform/win_shared.c
similarity index 100%
rename from source/engine/win32/win_shared.c
rename to source/engine/platform/win_shared.c
diff --git a/source/engine/win32/win_snd.c b/source/engine/platform/win_snd.c
similarity index 100%
rename from source/engine/win32/win_snd.c
rename to source/engine/platform/win_snd.c
diff --git a/source/engine/win32/win_syscon.c b/source/engine/platform/win_syscon.c
similarity index 100%
rename from source/engine/win32/win_syscon.c
rename to source/engine/platform/win_syscon.c
diff --git a/source/engine/win32/win_wndproc.c b/source/engine/platform/win_wndproc.c
similarity index 100%
rename from source/engine/win32/win_wndproc.c
rename to source/engine/platform/win_wndproc.c
diff --git a/source/engine/win32/winquake.rc b/source/engine/platform/winquake.rc
similarity index 100%
rename from source/engine/win32/winquake.rc
rename to source/engine/platform/winquake.rc