diff --git a/src/core/graphics/webgl/ComplexPrimitiveShader.js b/src/core/graphics/webgl/ComplexPrimitiveShader.js
index 656c5fd..1ca0c24 100644
--- a/src/core/graphics/webgl/ComplexPrimitiveShader.js
+++ b/src/core/graphics/webgl/ComplexPrimitiveShader.js
@@ -1,5 +1,5 @@
-var Shader = require('./Shader'),
-    WebGLShaderManager = require('../managers/WebGLShaderManager');
+var Shader = require('../../renderers/webgl/shaders/Shader'),
+    WebGLShaderManager = require('../../renderers/webgl/managers/WebGLShaderManager');
 
 /**
  * @class

diff --git a/src/core/graphics/webgl/ComplexPrimitiveShader.js b/src/core/graphics/webgl/ComplexPrimitiveShader.js
index 656c5fd..1ca0c24 100644
--- a/src/core/graphics/webgl/ComplexPrimitiveShader.js
+++ b/src/core/graphics/webgl/ComplexPrimitiveShader.js
@@ -1,5 +1,5 @@
-var Shader = require('./Shader'),
-    WebGLShaderManager = require('../managers/WebGLShaderManager');
+var Shader = require('../../renderers/webgl/shaders/Shader'),
+    WebGLShaderManager = require('../../renderers/webgl/managers/WebGLShaderManager');
 
 /**
  * @class
diff --git a/src/core/graphics/webgl/GraphicsRenderer.js b/src/core/graphics/webgl/GraphicsRenderer.js
index 10b3563..a12cbdc 100644
--- a/src/core/graphics/webgl/GraphicsRenderer.js
+++ b/src/core/graphics/webgl/GraphicsRenderer.js
@@ -1,8 +1,8 @@
-var utils = require('../utils'),
-    math = require('../math'),
-    CONST = require('../const'),
-    ObjectRenderer = require('../renderers/webgl/utils/ObjectRenderer'),
-    WebGLRenderer = require('../renderers/webgl/WebGLRenderer'),
+var utils = require('../../utils'),
+    math = require('../../math'),
+    CONST = require('../../const'),
+    ObjectRenderer = require('../../renderers/webgl/utils/ObjectRenderer'),
+    WebGLRenderer = require('../../renderers/webgl/WebGLRenderer'),
     WebGLGraphicsData = require('./WebGLGraphicsData');
 
 /**

diff --git a/src/core/graphics/webgl/ComplexPrimitiveShader.js b/src/core/graphics/webgl/ComplexPrimitiveShader.js
index 656c5fd..1ca0c24 100644
--- a/src/core/graphics/webgl/ComplexPrimitiveShader.js
+++ b/src/core/graphics/webgl/ComplexPrimitiveShader.js
@@ -1,5 +1,5 @@
-var Shader = require('./Shader'),
-    WebGLShaderManager = require('../managers/WebGLShaderManager');
+var Shader = require('../../renderers/webgl/shaders/Shader'),
+    WebGLShaderManager = require('../../renderers/webgl/managers/WebGLShaderManager');
 
 /**
  * @class
diff --git a/src/core/graphics/webgl/GraphicsRenderer.js b/src/core/graphics/webgl/GraphicsRenderer.js
index 10b3563..a12cbdc 100644
--- a/src/core/graphics/webgl/GraphicsRenderer.js
+++ b/src/core/graphics/webgl/GraphicsRenderer.js
@@ -1,8 +1,8 @@
-var utils = require('../utils'),
-    math = require('../math'),
-    CONST = require('../const'),
-    ObjectRenderer = require('../renderers/webgl/utils/ObjectRenderer'),
-    WebGLRenderer = require('../renderers/webgl/WebGLRenderer'),
+var utils = require('../../utils'),
+    math = require('../../math'),
+    CONST = require('../../const'),
+    ObjectRenderer = require('../../renderers/webgl/utils/ObjectRenderer'),
+    WebGLRenderer = require('../../renderers/webgl/WebGLRenderer'),
     WebGLGraphicsData = require('./WebGLGraphicsData');
 
 /**
diff --git a/src/core/graphics/webgl/PrimitiveShader.js b/src/core/graphics/webgl/PrimitiveShader.js
index f75a226..b7c5766 100644
--- a/src/core/graphics/webgl/PrimitiveShader.js
+++ b/src/core/graphics/webgl/PrimitiveShader.js
@@ -1,5 +1,5 @@
-var Shader = require('./Shader'),
-    WebGLShaderManager = require('../managers/WebGLShaderManager');
+var Shader = require('../../renderers/webgl/shaders/Shader'),
+    WebGLShaderManager = require('../../renderers/webgl/managers/WebGLShaderManager');
 
 /**
  * @class

diff --git a/src/core/graphics/webgl/ComplexPrimitiveShader.js b/src/core/graphics/webgl/ComplexPrimitiveShader.js
index 656c5fd..1ca0c24 100644
--- a/src/core/graphics/webgl/ComplexPrimitiveShader.js
+++ b/src/core/graphics/webgl/ComplexPrimitiveShader.js
@@ -1,5 +1,5 @@
-var Shader = require('./Shader'),
-    WebGLShaderManager = require('../managers/WebGLShaderManager');
+var Shader = require('../../renderers/webgl/shaders/Shader'),
+    WebGLShaderManager = require('../../renderers/webgl/managers/WebGLShaderManager');
 
 /**
  * @class
diff --git a/src/core/graphics/webgl/GraphicsRenderer.js b/src/core/graphics/webgl/GraphicsRenderer.js
index 10b3563..a12cbdc 100644
--- a/src/core/graphics/webgl/GraphicsRenderer.js
+++ b/src/core/graphics/webgl/GraphicsRenderer.js
@@ -1,8 +1,8 @@
-var utils = require('../utils'),
-    math = require('../math'),
-    CONST = require('../const'),
-    ObjectRenderer = require('../renderers/webgl/utils/ObjectRenderer'),
-    WebGLRenderer = require('../renderers/webgl/WebGLRenderer'),
+var utils = require('../../utils'),
+    math = require('../../math'),
+    CONST = require('../../const'),
+    ObjectRenderer = require('../../renderers/webgl/utils/ObjectRenderer'),
+    WebGLRenderer = require('../../renderers/webgl/WebGLRenderer'),
     WebGLGraphicsData = require('./WebGLGraphicsData');
 
 /**
diff --git a/src/core/graphics/webgl/PrimitiveShader.js b/src/core/graphics/webgl/PrimitiveShader.js
index f75a226..b7c5766 100644
--- a/src/core/graphics/webgl/PrimitiveShader.js
+++ b/src/core/graphics/webgl/PrimitiveShader.js
@@ -1,5 +1,5 @@
-var Shader = require('./Shader'),
-    WebGLShaderManager = require('../managers/WebGLShaderManager');
+var Shader = require('../../renderers/webgl/shaders/Shader'),
+    WebGLShaderManager = require('../../renderers/webgl/managers/WebGLShaderManager');
 
 /**
  * @class
diff --git a/src/core/renderers/webgl/managers/WebGLFilterManager.js b/src/core/renderers/webgl/managers/WebGLFilterManager.js
index 2dac048..ca6799b 100644
--- a/src/core/renderers/webgl/managers/WebGLFilterManager.js
+++ b/src/core/renderers/webgl/managers/WebGLFilterManager.js
@@ -359,7 +359,7 @@
 
     if (!shader)
     {
-        shader = new Shader(gl);
+        shader = new Shader(this.renderer.shaderManager);
 
         shader.fragmentSrc = filter.fragmentSrc;
         shader.uniforms = filter.uniforms;

diff --git a/src/core/graphics/webgl/ComplexPrimitiveShader.js b/src/core/graphics/webgl/ComplexPrimitiveShader.js
index 656c5fd..1ca0c24 100644
--- a/src/core/graphics/webgl/ComplexPrimitiveShader.js
+++ b/src/core/graphics/webgl/ComplexPrimitiveShader.js
@@ -1,5 +1,5 @@
-var Shader = require('./Shader'),
-    WebGLShaderManager = require('../managers/WebGLShaderManager');
+var Shader = require('../../renderers/webgl/shaders/Shader'),
+    WebGLShaderManager = require('../../renderers/webgl/managers/WebGLShaderManager');
 
 /**
  * @class
diff --git a/src/core/graphics/webgl/GraphicsRenderer.js b/src/core/graphics/webgl/GraphicsRenderer.js
index 10b3563..a12cbdc 100644
--- a/src/core/graphics/webgl/GraphicsRenderer.js
+++ b/src/core/graphics/webgl/GraphicsRenderer.js
@@ -1,8 +1,8 @@
-var utils = require('../utils'),
-    math = require('../math'),
-    CONST = require('../const'),
-    ObjectRenderer = require('../renderers/webgl/utils/ObjectRenderer'),
-    WebGLRenderer = require('../renderers/webgl/WebGLRenderer'),
+var utils = require('../../utils'),
+    math = require('../../math'),
+    CONST = require('../../const'),
+    ObjectRenderer = require('../../renderers/webgl/utils/ObjectRenderer'),
+    WebGLRenderer = require('../../renderers/webgl/WebGLRenderer'),
     WebGLGraphicsData = require('./WebGLGraphicsData');
 
 /**
diff --git a/src/core/graphics/webgl/PrimitiveShader.js b/src/core/graphics/webgl/PrimitiveShader.js
index f75a226..b7c5766 100644
--- a/src/core/graphics/webgl/PrimitiveShader.js
+++ b/src/core/graphics/webgl/PrimitiveShader.js
@@ -1,5 +1,5 @@
-var Shader = require('./Shader'),
-    WebGLShaderManager = require('../managers/WebGLShaderManager');
+var Shader = require('../../renderers/webgl/shaders/Shader'),
+    WebGLShaderManager = require('../../renderers/webgl/managers/WebGLShaderManager');
 
 /**
  * @class
diff --git a/src/core/renderers/webgl/managers/WebGLFilterManager.js b/src/core/renderers/webgl/managers/WebGLFilterManager.js
index 2dac048..ca6799b 100644
--- a/src/core/renderers/webgl/managers/WebGLFilterManager.js
+++ b/src/core/renderers/webgl/managers/WebGLFilterManager.js
@@ -359,7 +359,7 @@
 
     if (!shader)
     {
-        shader = new Shader(gl);
+        shader = new Shader(this.renderer.shaderManager);
 
         shader.fragmentSrc = filter.fragmentSrc;
         shader.uniforms = filter.uniforms;
diff --git a/src/core/sprites/webgl/SpriteRenderer.js b/src/core/sprites/webgl/SpriteRenderer.js
index a2727e3..f808078 100644
--- a/src/core/sprites/webgl/SpriteRenderer.js
+++ b/src/core/sprites/webgl/SpriteRenderer.js
@@ -1,8 +1,8 @@
-var ObjectRenderer = require('../renderers/webgl/utils/ObjectRenderer'),
-    Shader = require('../renderers/webgl/shaders/Shader'),
-    SpriteShader = require('../renderers/webgl/shaders/SpriteShader'),
-    WebGLRenderer = require('../renderers/webgl/WebGLRenderer');
-    math = require('../math');
+var ObjectRenderer = require('../../renderers/webgl/utils/ObjectRenderer'),
+    Shader = require('../../renderers/webgl/shaders/Shader'),
+    SpriteShader = require('../../renderers/webgl/shaders/SpriteShader'),
+    WebGLRenderer = require('../../renderers/webgl/WebGLRenderer');
+    math = require('../../math');
 
 /**
  * @author Mat Groves
@@ -429,7 +429,7 @@
 
                 if (!shader)
                 {
-                    shader = new Shader(gl, null, currentShader.fragmentSrc, currentShader.uniforms);
+                    shader = new Shader(this.renderer.shaderManager, null, currentShader.fragmentSrc, currentShader.uniforms);
                     currentShader.shaders[gl.id] = shader;
                 }
 

diff --git a/src/core/graphics/webgl/ComplexPrimitiveShader.js b/src/core/graphics/webgl/ComplexPrimitiveShader.js
index 656c5fd..1ca0c24 100644
--- a/src/core/graphics/webgl/ComplexPrimitiveShader.js
+++ b/src/core/graphics/webgl/ComplexPrimitiveShader.js
@@ -1,5 +1,5 @@
-var Shader = require('./Shader'),
-    WebGLShaderManager = require('../managers/WebGLShaderManager');
+var Shader = require('../../renderers/webgl/shaders/Shader'),
+    WebGLShaderManager = require('../../renderers/webgl/managers/WebGLShaderManager');
 
 /**
  * @class
diff --git a/src/core/graphics/webgl/GraphicsRenderer.js b/src/core/graphics/webgl/GraphicsRenderer.js
index 10b3563..a12cbdc 100644
--- a/src/core/graphics/webgl/GraphicsRenderer.js
+++ b/src/core/graphics/webgl/GraphicsRenderer.js
@@ -1,8 +1,8 @@
-var utils = require('../utils'),
-    math = require('../math'),
-    CONST = require('../const'),
-    ObjectRenderer = require('../renderers/webgl/utils/ObjectRenderer'),
-    WebGLRenderer = require('../renderers/webgl/WebGLRenderer'),
+var utils = require('../../utils'),
+    math = require('../../math'),
+    CONST = require('../../const'),
+    ObjectRenderer = require('../../renderers/webgl/utils/ObjectRenderer'),
+    WebGLRenderer = require('../../renderers/webgl/WebGLRenderer'),
     WebGLGraphicsData = require('./WebGLGraphicsData');
 
 /**
diff --git a/src/core/graphics/webgl/PrimitiveShader.js b/src/core/graphics/webgl/PrimitiveShader.js
index f75a226..b7c5766 100644
--- a/src/core/graphics/webgl/PrimitiveShader.js
+++ b/src/core/graphics/webgl/PrimitiveShader.js
@@ -1,5 +1,5 @@
-var Shader = require('./Shader'),
-    WebGLShaderManager = require('../managers/WebGLShaderManager');
+var Shader = require('../../renderers/webgl/shaders/Shader'),
+    WebGLShaderManager = require('../../renderers/webgl/managers/WebGLShaderManager');
 
 /**
  * @class
diff --git a/src/core/renderers/webgl/managers/WebGLFilterManager.js b/src/core/renderers/webgl/managers/WebGLFilterManager.js
index 2dac048..ca6799b 100644
--- a/src/core/renderers/webgl/managers/WebGLFilterManager.js
+++ b/src/core/renderers/webgl/managers/WebGLFilterManager.js
@@ -359,7 +359,7 @@
 
     if (!shader)
     {
-        shader = new Shader(gl);
+        shader = new Shader(this.renderer.shaderManager);
 
         shader.fragmentSrc = filter.fragmentSrc;
         shader.uniforms = filter.uniforms;
diff --git a/src/core/sprites/webgl/SpriteRenderer.js b/src/core/sprites/webgl/SpriteRenderer.js
index a2727e3..f808078 100644
--- a/src/core/sprites/webgl/SpriteRenderer.js
+++ b/src/core/sprites/webgl/SpriteRenderer.js
@@ -1,8 +1,8 @@
-var ObjectRenderer = require('../renderers/webgl/utils/ObjectRenderer'),
-    Shader = require('../renderers/webgl/shaders/Shader'),
-    SpriteShader = require('../renderers/webgl/shaders/SpriteShader'),
-    WebGLRenderer = require('../renderers/webgl/WebGLRenderer');
-    math = require('../math');
+var ObjectRenderer = require('../../renderers/webgl/utils/ObjectRenderer'),
+    Shader = require('../../renderers/webgl/shaders/Shader'),
+    SpriteShader = require('../../renderers/webgl/shaders/SpriteShader'),
+    WebGLRenderer = require('../../renderers/webgl/WebGLRenderer');
+    math = require('../../math');
 
 /**
  * @author Mat Groves
@@ -429,7 +429,7 @@
 
                 if (!shader)
                 {
-                    shader = new Shader(gl, null, currentShader.fragmentSrc, currentShader.uniforms);
+                    shader = new Shader(this.renderer.shaderManager, null, currentShader.fragmentSrc, currentShader.uniforms);
                     currentShader.shaders[gl.id] = shader;
                 }
 
diff --git a/src/core/sprites/webgl/SpriteShader.js b/src/core/sprites/webgl/SpriteShader.js
index 8532a96..3925e9f 100644
--- a/src/core/sprites/webgl/SpriteShader.js
+++ b/src/core/sprites/webgl/SpriteShader.js
@@ -1,5 +1,5 @@
-var Shader = require('./Shader'),
-    WebGLShaderManager = require('../managers/WebGLShaderManager');
+var Shader = require('../../renderers/webgl/shaders/Shader'),
+    WebGLShaderManager = require('../../renderers/webgl/managers/WebGLShaderManager');
 
 /**
  * @class