diff --git a/.vscode/settings.json b/.vscode/settings.json
index 10cb5627..fee80960 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -13,7 +13,7 @@
     "src/modelinfo",
     "src/objects",
     "src/peds",
-    "src/render",
+    "src/renderer",
     "src/rw",
     "src/save",
     "src/skel",
diff --git a/codewarrior/re3.mcp.xml b/codewarrior/re3.mcp.xml
index b18e2bcc..ca20ec2a 100644
--- a/codewarrior/re3.mcp.xml
+++ b/codewarrior/re3.mcp.xml
@@ -187,7 +187,7 @@
                     </SETTING>
                     <SETTING>
                         <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>..\src\render</VALUE></SETTING>
+                            <SETTING><NAME>Path</NAME><VALUE>..\src\renderer</VALUE></SETTING>
                             <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
                             <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
                         </SETTING>
@@ -6424,7 +6424,7 @@
                     </SETTING>
                     <SETTING>
                         <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>..\src\render</VALUE></SETTING>
+                            <SETTING><NAME>Path</NAME><VALUE>..\src\renderer</VALUE></SETTING>
                             <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
                             <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
                         </SETTING>
@@ -14281,7 +14281,7 @@
                 <PATHFORMAT>Windows</PATHFORMAT>
             </FILEREF>
         </GROUP>
-        <GROUP><NAME>render</NAME>
+        <GROUP><NAME>renderer</NAME>
             <FILEREF>
                 <TARGETNAME>Debug</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>
diff --git a/premake5.lua b/premake5.lua
index 0a8faa07..25090dc6 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -264,7 +264,7 @@ project "re3"
 	files { addSrcFiles("src/modelinfo") }
 	files { addSrcFiles("src/objects") }
 	files { addSrcFiles("src/peds") }
-	files { addSrcFiles("src/render") }
+	files { addSrcFiles("src/renderer") }
 	files { addSrcFiles("src/rw") }
 	files { addSrcFiles("src/save") }
 	files { addSrcFiles("src/skel") }
@@ -293,7 +293,7 @@ project "re3"
 	includedirs { "src/modelinfo" }
 	includedirs { "src/objects" }
 	includedirs { "src/peds" }
-	includedirs { "src/render" }
+	includedirs { "src/renderer" }
 	includedirs { "src/rw" }
 	includedirs { "src/save/" }
 	includedirs { "src/skel/" }
diff --git a/src/render/2dEffect.h b/src/renderer/2dEffect.h
similarity index 100%
rename from src/render/2dEffect.h
rename to src/renderer/2dEffect.h
diff --git a/src/render/Antennas.cpp b/src/renderer/Antennas.cpp
similarity index 100%
rename from src/render/Antennas.cpp
rename to src/renderer/Antennas.cpp
diff --git a/src/render/Antennas.h b/src/renderer/Antennas.h
similarity index 100%
rename from src/render/Antennas.h
rename to src/renderer/Antennas.h
diff --git a/src/render/Clouds.cpp b/src/renderer/Clouds.cpp
similarity index 100%
rename from src/render/Clouds.cpp
rename to src/renderer/Clouds.cpp
diff --git a/src/render/Clouds.h b/src/renderer/Clouds.h
similarity index 100%
rename from src/render/Clouds.h
rename to src/renderer/Clouds.h
diff --git a/src/render/Console.cpp b/src/renderer/Console.cpp
similarity index 100%
rename from src/render/Console.cpp
rename to src/renderer/Console.cpp
diff --git a/src/render/Console.h b/src/renderer/Console.h
similarity index 100%
rename from src/render/Console.h
rename to src/renderer/Console.h
diff --git a/src/render/Coronas.cpp b/src/renderer/Coronas.cpp
similarity index 100%
rename from src/render/Coronas.cpp
rename to src/renderer/Coronas.cpp
diff --git a/src/render/Coronas.h b/src/renderer/Coronas.h
similarity index 100%
rename from src/render/Coronas.h
rename to src/renderer/Coronas.h
diff --git a/src/render/Credits.cpp b/src/renderer/Credits.cpp
similarity index 100%
rename from src/render/Credits.cpp
rename to src/renderer/Credits.cpp
diff --git a/src/render/Credits.h b/src/renderer/Credits.h
similarity index 100%
rename from src/render/Credits.h
rename to src/renderer/Credits.h
diff --git a/src/render/Draw.cpp b/src/renderer/Draw.cpp
similarity index 100%
rename from src/render/Draw.cpp
rename to src/renderer/Draw.cpp
diff --git a/src/render/Draw.h b/src/renderer/Draw.h
similarity index 100%
rename from src/render/Draw.h
rename to src/renderer/Draw.h
diff --git a/src/render/Fluff.cpp b/src/renderer/Fluff.cpp
similarity index 100%
rename from src/render/Fluff.cpp
rename to src/renderer/Fluff.cpp
diff --git a/src/render/Fluff.h b/src/renderer/Fluff.h
similarity index 100%
rename from src/render/Fluff.h
rename to src/renderer/Fluff.h
diff --git a/src/render/Font.cpp b/src/renderer/Font.cpp
similarity index 100%
rename from src/render/Font.cpp
rename to src/renderer/Font.cpp
diff --git a/src/render/Font.h b/src/renderer/Font.h
similarity index 100%
rename from src/render/Font.h
rename to src/renderer/Font.h
diff --git a/src/render/Glass.cpp b/src/renderer/Glass.cpp
similarity index 100%
rename from src/render/Glass.cpp
rename to src/renderer/Glass.cpp
diff --git a/src/render/Glass.h b/src/renderer/Glass.h
similarity index 100%
rename from src/render/Glass.h
rename to src/renderer/Glass.h
diff --git a/src/render/Hud.cpp b/src/renderer/Hud.cpp
similarity index 100%
rename from src/render/Hud.cpp
rename to src/renderer/Hud.cpp
diff --git a/src/render/Hud.h b/src/renderer/Hud.h
similarity index 100%
rename from src/render/Hud.h
rename to src/renderer/Hud.h
diff --git a/src/render/Instance.cpp b/src/renderer/Instance.cpp
similarity index 100%
rename from src/render/Instance.cpp
rename to src/renderer/Instance.cpp
diff --git a/src/render/Instance.h b/src/renderer/Instance.h
similarity index 100%
rename from src/render/Instance.h
rename to src/renderer/Instance.h
diff --git a/src/render/Lines.cpp b/src/renderer/Lines.cpp
similarity index 100%
rename from src/render/Lines.cpp
rename to src/renderer/Lines.cpp
diff --git a/src/render/Lines.h b/src/renderer/Lines.h
similarity index 100%
rename from src/render/Lines.h
rename to src/renderer/Lines.h
diff --git a/src/render/MBlur.cpp b/src/renderer/MBlur.cpp
similarity index 100%
rename from src/render/MBlur.cpp
rename to src/renderer/MBlur.cpp
diff --git a/src/render/MBlur.h b/src/renderer/MBlur.h
similarity index 100%
rename from src/render/MBlur.h
rename to src/renderer/MBlur.h
diff --git a/src/render/Particle.cpp b/src/renderer/Particle.cpp
similarity index 100%
rename from src/render/Particle.cpp
rename to src/renderer/Particle.cpp
diff --git a/src/render/Particle.h b/src/renderer/Particle.h
similarity index 100%
rename from src/render/Particle.h
rename to src/renderer/Particle.h
diff --git a/src/render/ParticleMgr.cpp b/src/renderer/ParticleMgr.cpp
similarity index 100%
rename from src/render/ParticleMgr.cpp
rename to src/renderer/ParticleMgr.cpp
diff --git a/src/render/ParticleMgr.h b/src/renderer/ParticleMgr.h
similarity index 100%
rename from src/render/ParticleMgr.h
rename to src/renderer/ParticleMgr.h
diff --git a/src/render/ParticleType.h b/src/renderer/ParticleType.h
similarity index 100%
rename from src/render/ParticleType.h
rename to src/renderer/ParticleType.h
diff --git a/src/render/PlayerSkin.cpp b/src/renderer/PlayerSkin.cpp
similarity index 100%
rename from src/render/PlayerSkin.cpp
rename to src/renderer/PlayerSkin.cpp
diff --git a/src/render/PlayerSkin.h b/src/renderer/PlayerSkin.h
similarity index 100%
rename from src/render/PlayerSkin.h
rename to src/renderer/PlayerSkin.h
diff --git a/src/render/PointLights.cpp b/src/renderer/PointLights.cpp
similarity index 100%
rename from src/render/PointLights.cpp
rename to src/renderer/PointLights.cpp
diff --git a/src/render/PointLights.h b/src/renderer/PointLights.h
similarity index 100%
rename from src/render/PointLights.h
rename to src/renderer/PointLights.h
diff --git a/src/render/RenderBuffer.cpp b/src/renderer/RenderBuffer.cpp
similarity index 100%
rename from src/render/RenderBuffer.cpp
rename to src/renderer/RenderBuffer.cpp
diff --git a/src/render/RenderBuffer.h b/src/renderer/RenderBuffer.h
similarity index 100%
rename from src/render/RenderBuffer.h
rename to src/renderer/RenderBuffer.h
diff --git a/src/render/Renderer.cpp b/src/renderer/Renderer.cpp
similarity index 100%
rename from src/render/Renderer.cpp
rename to src/renderer/Renderer.cpp
diff --git a/src/render/Renderer.h b/src/renderer/Renderer.h
similarity index 100%
rename from src/render/Renderer.h
rename to src/renderer/Renderer.h
diff --git a/src/render/Rubbish.cpp b/src/renderer/Rubbish.cpp
similarity index 100%
rename from src/render/Rubbish.cpp
rename to src/renderer/Rubbish.cpp
diff --git a/src/render/Rubbish.h b/src/renderer/Rubbish.h
similarity index 100%
rename from src/render/Rubbish.h
rename to src/renderer/Rubbish.h
diff --git a/src/render/Shadows.cpp b/src/renderer/Shadows.cpp
similarity index 100%
rename from src/render/Shadows.cpp
rename to src/renderer/Shadows.cpp
diff --git a/src/render/Shadows.h b/src/renderer/Shadows.h
similarity index 100%
rename from src/render/Shadows.h
rename to src/renderer/Shadows.h
diff --git a/src/render/Skidmarks.cpp b/src/renderer/Skidmarks.cpp
similarity index 100%
rename from src/render/Skidmarks.cpp
rename to src/renderer/Skidmarks.cpp
diff --git a/src/render/Skidmarks.h b/src/renderer/Skidmarks.h
similarity index 100%
rename from src/render/Skidmarks.h
rename to src/renderer/Skidmarks.h
diff --git a/src/render/SpecialFX.cpp b/src/renderer/SpecialFX.cpp
similarity index 100%
rename from src/render/SpecialFX.cpp
rename to src/renderer/SpecialFX.cpp
diff --git a/src/render/SpecialFX.h b/src/renderer/SpecialFX.h
similarity index 100%
rename from src/render/SpecialFX.h
rename to src/renderer/SpecialFX.h
diff --git a/src/render/Sprite.cpp b/src/renderer/Sprite.cpp
similarity index 100%
rename from src/render/Sprite.cpp
rename to src/renderer/Sprite.cpp
diff --git a/src/render/Sprite.h b/src/renderer/Sprite.h
similarity index 100%
rename from src/render/Sprite.h
rename to src/renderer/Sprite.h
diff --git a/src/render/Sprite2d.cpp b/src/renderer/Sprite2d.cpp
similarity index 100%
rename from src/render/Sprite2d.cpp
rename to src/renderer/Sprite2d.cpp
diff --git a/src/render/Sprite2d.h b/src/renderer/Sprite2d.h
similarity index 100%
rename from src/render/Sprite2d.h
rename to src/renderer/Sprite2d.h
diff --git a/src/render/TexList.cpp b/src/renderer/TexList.cpp
similarity index 100%
rename from src/render/TexList.cpp
rename to src/renderer/TexList.cpp
diff --git a/src/render/TexList.h b/src/renderer/TexList.h
similarity index 100%
rename from src/render/TexList.h
rename to src/renderer/TexList.h
diff --git a/src/render/Timecycle.cpp b/src/renderer/Timecycle.cpp
similarity index 100%
rename from src/render/Timecycle.cpp
rename to src/renderer/Timecycle.cpp
diff --git a/src/render/Timecycle.h b/src/renderer/Timecycle.h
similarity index 100%
rename from src/render/Timecycle.h
rename to src/renderer/Timecycle.h
diff --git a/src/render/WaterCannon.cpp b/src/renderer/WaterCannon.cpp
similarity index 100%
rename from src/render/WaterCannon.cpp
rename to src/renderer/WaterCannon.cpp
diff --git a/src/render/WaterCannon.h b/src/renderer/WaterCannon.h
similarity index 100%
rename from src/render/WaterCannon.h
rename to src/renderer/WaterCannon.h
diff --git a/src/render/WaterLevel.cpp b/src/renderer/WaterLevel.cpp
similarity index 100%
rename from src/render/WaterLevel.cpp
rename to src/renderer/WaterLevel.cpp
diff --git a/src/render/WaterLevel.h b/src/renderer/WaterLevel.h
similarity index 100%
rename from src/render/WaterLevel.h
rename to src/renderer/WaterLevel.h
diff --git a/src/render/Weather.cpp b/src/renderer/Weather.cpp
similarity index 100%
rename from src/render/Weather.cpp
rename to src/renderer/Weather.cpp
diff --git a/src/render/Weather.h b/src/renderer/Weather.h
similarity index 100%
rename from src/render/Weather.h
rename to src/renderer/Weather.h