diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/GlDhDebugWireframeRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/GlDhDebugWireframeRenderer.java
index 13d225995..93ab5580a 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/GlDhDebugWireframeRenderer.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/GlDhDebugWireframeRenderer.java
@@ -114,8 +114,8 @@ public class GlDhDebugWireframeRenderer extends AbstractDebugWireframeRenderer
 		this.va.setVertexAttribute(0, 0, GlVertexPointer.addVec3Pointer(false));
 		this.va.completeAndCheck(Float.BYTES * 3);
 		this.basicShader = new GlShaderProgram(
-			"shaders/debug/vert.vert",
-			"shaders/debug/frag.frag",
+			"assets/distanthorizons/shaders/debug/gl/vert.vert",
+			"assets/distanthorizons/shaders/debug/gl/frag.frag",
 			"vPosition"
 		);
 		this.createBuffer();
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/GlDhTerrainShaderProgram.java b/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/GlDhTerrainShaderProgram.java
index 04e7a2f02..2d051735a 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/GlDhTerrainShaderProgram.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/GlDhTerrainShaderProgram.java
@@ -109,8 +109,8 @@ public class GlDhTerrainShaderProgram extends GlShaderProgram implements IDhApiS
 	private GlDhTerrainShaderProgram()
 	{
 		super(
-			"shaders/standard.vert",
-			"shaders/flat_shaded.frag",
+			"assets/distanthorizons/shaders/shared/gl/standard.vert",
+			"assets/distanthorizons/shaders/shared/gl/flat_shaded.frag",
 			new String[]{"vPosition", "color"}
 		);
 		
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/generic/GlGenericObjectShaderProgram.java b/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/generic/GlGenericObjectShaderProgram.java
index 6340213c2..768c8a7c6 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/generic/GlGenericObjectShaderProgram.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/generic/GlGenericObjectShaderProgram.java
@@ -17,10 +17,10 @@ import com.seibel.distanthorizons.core.util.math.Vec3f;
 
 public class GlGenericObjectShaderProgram extends GlShaderProgram implements IDhApiGenericObjectShaderProgram
 {
-	public static final String VERTEX_SHADER_INSTANCED_PATH = "shaders/genericObject/instanced/vert.vert";
-	public static final String VERTEX_SHADER_DIRECT_PATH = "shaders/genericObject/direct/vert.vert";
-	public static final String FRAGMENT_SHADER_INSTANCED_PATH = "shaders/genericObject/instanced/frag.frag";
-	public static final String FRAGMENT_SHADER_DIRECT_PATH = "shaders/genericObject/direct/frag.frag";
+	public static final String VERTEX_SHADER_INSTANCED_PATH = "assets/distanthorizons/shaders/generic/gl/instanced/vert.vert";
+	public static final String VERTEX_SHADER_DIRECT_PATH = "assets/distanthorizons/shaders/generic/gl/direct/vert.vert";
+	public static final String FRAGMENT_SHADER_INSTANCED_PATH = "assets/distanthorizons/shaders/generic/gl/instanced/frag.frag";
+	public static final String FRAGMENT_SHADER_DIRECT_PATH = "assets/distanthorizons/shaders/generic/gl/direct/frag.frag";
 	
 	public final GlAbstractVertexAttribute va;
 	
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/apply/GlDhApplyShader.java b/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/apply/GlDhApplyShader.java
index 7407d0379..4a4f4b04b 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/apply/GlDhApplyShader.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/apply/GlDhApplyShader.java
@@ -57,8 +57,8 @@ public class GlDhApplyShader extends GlAbstractShaderRenderer
 	public void onInit()
 	{
 		this.shader = new GlShaderProgram(
-			"shaders/quadApply.vert",
-			"shaders/apply.frag",
+			"assets/distanthorizons/shaders/shared/gl/quadApply.vert",
+			"assets/distanthorizons/shaders/shared/gl/apply.frag",
 			"vPosition"
 		);
 		
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/fade/GlDhFarFadeApplyShader.java b/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/fade/GlDhFarFadeApplyShader.java
index 9e7c47ba1..83e30f08e 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/fade/GlDhFarFadeApplyShader.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/fade/GlDhFarFadeApplyShader.java
@@ -59,8 +59,8 @@ public class GlDhFarFadeApplyShader extends GlAbstractShaderRenderer
 	public void onInit()
 	{
 		this.shader = new GlShaderProgram(
-			"shaders/quadApply.vert",
-			"shaders/fade/apply.frag",
+			"assets/distanthorizons/shaders/shared/gl/quadApply.vert",
+			"assets/distanthorizons/shaders/fade/gl/apply.frag",
 			"vPosition"
 		);
 		
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/fade/GlDhFarFadeShader.java b/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/fade/GlDhFarFadeShader.java
index 62f99ea42..ae9a511ff 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/fade/GlDhFarFadeShader.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/fade/GlDhFarFadeShader.java
@@ -69,8 +69,8 @@ public class GlDhFarFadeShader extends GlAbstractShaderRenderer
 	public void onInit()
 	{
 		this.shader = new GlShaderProgram(
-			"shaders/quadApply.vert",
-			"shaders/fade/dhFade.frag",
+			"assets/distanthorizons/shaders/shared/gl/quadApply.vert",
+			"assets/distanthorizons/shaders/fade/gl/dhFade.frag",
 			"vPosition"
 		);
 		
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/fade/GlDhVanillaFadeShader.java b/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/fade/GlDhVanillaFadeShader.java
index bd0e444c4..15a1ba43c 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/fade/GlDhVanillaFadeShader.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/fade/GlDhVanillaFadeShader.java
@@ -77,8 +77,8 @@ public class GlDhVanillaFadeShader extends GlAbstractShaderRenderer
 	public void onInit()
 	{
 		this.shader = new GlShaderProgram(
-			"shaders/quadApply.vert", 
-			"shaders/fade/vanillaFade.frag",
+			"assets/distanthorizons/shaders/shared/gl/quadApply.vert",
+			"assets/distanthorizons/shaders/fade/gl/vanillaFade.frag",
 			"vPosition"
 		);
 		
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/fog/GlDhFogApplyShader.java b/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/fog/GlDhFogApplyShader.java
index 4db8c0b6b..affbce795 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/fog/GlDhFogApplyShader.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/fog/GlDhFogApplyShader.java
@@ -57,8 +57,8 @@ public class GlDhFogApplyShader extends GlAbstractShaderRenderer
 	public void onInit()
 	{
 		this.shader = new GlShaderProgram(
-			"shaders/quadApply.vert",
-			"shaders/fog/apply.frag",
+			"assets/distanthorizons/shaders/shared/gl/quadApply.vert",
+			"assets/distanthorizons/shaders/fog/gl/apply.frag",
 			"vPosition"
 		);
 		
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/fog/GlDhFogShader.java b/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/fog/GlDhFogShader.java
index c176a07bf..05efafdfb 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/fog/GlDhFogShader.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/fog/GlDhFogShader.java
@@ -109,8 +109,8 @@ public class GlDhFogShader extends GlAbstractShaderRenderer
 	public void onInit()
 	{
 		this.shader = new GlShaderProgram(
-			"shaders/quadApply.vert",
-			"shaders/fog/fog.frag",
+			"assets/distanthorizons/shaders/shared/gl/quadApply.vert",
+			"assets/distanthorizons/shaders/fog/gl/fog.frag",
 			"vPosition"
 		);
 		
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/ssao/GlDhSSAOApplyShader.java b/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/ssao/GlDhSSAOApplyShader.java
index 18a97f29a..d12663de2 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/ssao/GlDhSSAOApplyShader.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/ssao/GlDhSSAOApplyShader.java
@@ -62,8 +62,8 @@ public class GlDhSSAOApplyShader extends GlAbstractShaderRenderer
 	public void onInit()
 	{
 		this.shader = new GlShaderProgram(
-			"shaders/quadApply.vert",
-			"shaders/ssao/apply.frag",
+			"assets/distanthorizons/shaders/shared/gl/quadApply.vert",
+			"assets/distanthorizons/shaders/ssao/gl/apply.frag",
 			"vPosition"
 		);
 		
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/ssao/GlDhSSAOShader.java b/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/ssao/GlDhSSAOShader.java
index a70727753..77cd454af 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/ssao/GlDhSSAOShader.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/ssao/GlDhSSAOShader.java
@@ -70,8 +70,8 @@ public class GlDhSSAOShader extends GlAbstractShaderRenderer
 	public void onInit()
 	{
 		this.shader = new GlShaderProgram(
-			"shaders/quadApply.vert",
-			"shaders/ssao/ao.frag",
+			"assets/distanthorizons/shaders/shared/gl/quadApply.vert",
+			"assets/distanthorizons/shaders/ssao/gl/ao.frag",
 			"vPosition"
 		);
 		
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/test/GlTestTriangleRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/test/GlTestTriangleRenderer.java
index a0d4eff83..c2cb3fbc0 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/test/GlTestTriangleRenderer.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/test/GlTestTriangleRenderer.java
@@ -94,8 +94,8 @@ public class GlTestTriangleRenderer implements IDhTestTriangleRenderer
 		this.va.setVertexAttribute(0, 1, GlVertexPointer.addVec4Pointer(false));
 		this.va.completeAndCheck(Float.BYTES * 6);
 		this.basicShader = new GlShaderProgram(
-			"shaders/test/vert.vert",
-			"shaders/test/frag.frag",
+			"assets/distanthorizons/shaders/test/gl/vert.vert",
+			"assets/distanthorizons/shaders/test/gl/frag.frag",
 			new String[]{"vPosition", "color"});
 		
 		this.createBuffer();
diff --git a/coreSubProjects b/coreSubProjects
index e426fc238..1bbe41c06 160000
--- a/coreSubProjects
+++ b/coreSubProjects
@@ -1 +1 @@
-Subproject commit e426fc238022d8f4c584e6ff6d505a62564ebcab
+Subproject commit 1bbe41c0685546fa91c95ddd265fac78949ff43b