diff --git a/src/core/graphics/Graphics.js b/src/core/graphics/Graphics.js
index baab0f8..9e13246 100644
--- a/src/core/graphics/Graphics.js
+++ b/src/core/graphics/Graphics.js
@@ -1,5 +1,5 @@
 var DisplayObjectContainer = require('../display/DisplayObjectContainer'),
-    Sprite = require('../display/Sprite'),
+    Sprite = require('../sprites/Sprite'),
     Texture = require('../textures/Texture'),
     CanvasBuffer = require('../renderers/canvas/utils/CanvasBuffer'),
     CanvasGraphics = require('../renderers/canvas/utils/CanvasGraphics'),

diff --git a/src/core/graphics/Graphics.js b/src/core/graphics/Graphics.js
index baab0f8..9e13246 100644
--- a/src/core/graphics/Graphics.js
+++ b/src/core/graphics/Graphics.js
@@ -1,5 +1,5 @@
 var DisplayObjectContainer = require('../display/DisplayObjectContainer'),
-    Sprite = require('../display/Sprite'),
+    Sprite = require('../sprites/Sprite'),
     Texture = require('../textures/Texture'),
     CanvasBuffer = require('../renderers/canvas/utils/CanvasBuffer'),
     CanvasGraphics = require('../renderers/canvas/utils/CanvasGraphics'),
diff --git a/src/core/index.js b/src/core/index.js
index 7877f3f..0ac5cf8 100644
--- a/src/core/index.js
+++ b/src/core/index.js
@@ -23,12 +23,12 @@
 
     Sprite:                 require('./sprites/Sprite'),
     SpriteBatch:            require('./sprites/SpriteBatch'),
-    SpriteRenderer:         require('./sprites/SpriteRenderer'),
+    SpriteRenderer:         require('./sprites/webgl/SpriteRenderer'),
 
     // primitives
-    Graphics:               require('./primitives/Graphics'),
-    GraphicsData:           require('./primitives/GraphicsData'),
-    GraphicsRenderer:       require('./primitives/GraphicsRenderer'),
+    Graphics:               require('./graphics/Graphics'),
+    GraphicsData:           require('./graphics/GraphicsData'),
+    GraphicsRenderer:       require('./graphics/webgl/GraphicsRenderer'),
 
     // textures
     Texture:                require('./textures/Texture'),

diff --git a/src/core/graphics/Graphics.js b/src/core/graphics/Graphics.js
index baab0f8..9e13246 100644
--- a/src/core/graphics/Graphics.js
+++ b/src/core/graphics/Graphics.js
@@ -1,5 +1,5 @@
 var DisplayObjectContainer = require('../display/DisplayObjectContainer'),
-    Sprite = require('../display/Sprite'),
+    Sprite = require('../sprites/Sprite'),
     Texture = require('../textures/Texture'),
     CanvasBuffer = require('../renderers/canvas/utils/CanvasBuffer'),
     CanvasGraphics = require('../renderers/canvas/utils/CanvasGraphics'),
diff --git a/src/core/index.js b/src/core/index.js
index 7877f3f..0ac5cf8 100644
--- a/src/core/index.js
+++ b/src/core/index.js
@@ -23,12 +23,12 @@
 
     Sprite:                 require('./sprites/Sprite'),
     SpriteBatch:            require('./sprites/SpriteBatch'),
-    SpriteRenderer:         require('./sprites/SpriteRenderer'),
+    SpriteRenderer:         require('./sprites/webgl/SpriteRenderer'),
 
     // primitives
-    Graphics:               require('./primitives/Graphics'),
-    GraphicsData:           require('./primitives/GraphicsData'),
-    GraphicsRenderer:       require('./primitives/GraphicsRenderer'),
+    Graphics:               require('./graphics/Graphics'),
+    GraphicsData:           require('./graphics/GraphicsData'),
+    GraphicsRenderer:       require('./graphics/webgl/GraphicsRenderer'),
 
     // textures
     Texture:                require('./textures/Texture'),
diff --git a/src/core/sprites/webgl/SpriteRenderer.js b/src/core/sprites/webgl/SpriteRenderer.js
index 6e2dad2..c006ba4 100644
--- a/src/core/sprites/webgl/SpriteRenderer.js
+++ b/src/core/sprites/webgl/SpriteRenderer.js
@@ -1,7 +1,7 @@
 var ObjectRenderer = require('../../renderers/webgl/utils/ObjectRenderer'),
     Shader = require('../../renderers/webgl/shaders/Shader'),
-    SpriteShader = require('../../renderers/webgl/shaders/SpriteShader'),
-    WebGLRenderer = require('../../renderers/webgl/WebGLRenderer');
+    WebGLRenderer = require('../../renderers/webgl/WebGLRenderer'),
+    SpriteShader = require('./SpriteShader');
 
 /**
  * @author Mat Groves