diff --git a/src/core/const.js b/src/core/const.js
index 70a7a55..c0f5b18 100644
--- a/src/core/const.js
+++ b/src/core/const.js
@@ -29,7 +29,7 @@
      * @constant
      * @property {string} VERSION
      */
-    VERSION: require('../package.json').version,
+    VERSION: require('../../package.json').version,
 
     /**
      * Various blend modes supported by PIXI. IMPORTANT - The WebGL renderer only supports

diff --git a/src/core/const.js b/src/core/const.js
index 70a7a55..c0f5b18 100644
--- a/src/core/const.js
+++ b/src/core/const.js
@@ -29,7 +29,7 @@
      * @constant
      * @property {string} VERSION
      */
-    VERSION: require('../package.json').version,
+    VERSION: require('../../package.json').version,
 
     /**
      * Various blend modes supported by PIXI. IMPORTANT - The WebGL renderer only supports
diff --git a/src/core/display/Stage.js b/src/core/display/Stage.js
index 9036d4c..9d365c2 100644
--- a/src/core/display/Stage.js
+++ b/src/core/display/Stage.js
@@ -1,7 +1,7 @@
 var math = require('../math'),
     utils = require('../utils'),
     DisplayObjectContainer = require('./DisplayObjectContainer'),
-    InteractionManager = require('../interaction/InteractionManager');
+    InteractionManager = require('../../interaction/InteractionManager');
 
 /**
  * A Stage represents the root of the display tree. Everything connected to the stage is rendered, but

diff --git a/src/core/const.js b/src/core/const.js
index 70a7a55..c0f5b18 100644
--- a/src/core/const.js
+++ b/src/core/const.js
@@ -29,7 +29,7 @@
      * @constant
      * @property {string} VERSION
      */
-    VERSION: require('../package.json').version,
+    VERSION: require('../../package.json').version,
 
     /**
      * Various blend modes supported by PIXI. IMPORTANT - The WebGL renderer only supports
diff --git a/src/core/display/Stage.js b/src/core/display/Stage.js
index 9036d4c..9d365c2 100644
--- a/src/core/display/Stage.js
+++ b/src/core/display/Stage.js
@@ -1,7 +1,7 @@
 var math = require('../math'),
     utils = require('../utils'),
     DisplayObjectContainer = require('./DisplayObjectContainer'),
-    InteractionManager = require('../interaction/InteractionManager');
+    InteractionManager = require('../../interaction/InteractionManager');
 
 /**
  * A Stage represents the root of the display tree. Everything connected to the stage is rendered, but
diff --git a/src/core/index.js b/src/core/index.js
index 02357bd..c5eeaaa 100644
--- a/src/core/index.js
+++ b/src/core/index.js
@@ -30,7 +30,7 @@
 
     // renderers - canvas
     CanvasRenderer:         require('./renderers/canvas/CanvasRenderer'),
-    CanvasGraphics:         require('./renderers/canvas/utils/CanvasGraphics'),
+    CanvasGraphics:         require('./renderers/canvas/CanvasGraphics'),
     CanvasBuffer:           require('./renderers/canvas/utils/CanvasBuffer'),
 
     // renderers - webgl

diff --git a/src/core/const.js b/src/core/const.js
index 70a7a55..c0f5b18 100644
--- a/src/core/const.js
+++ b/src/core/const.js
@@ -29,7 +29,7 @@
      * @constant
      * @property {string} VERSION
      */
-    VERSION: require('../package.json').version,
+    VERSION: require('../../package.json').version,
 
     /**
      * Various blend modes supported by PIXI. IMPORTANT - The WebGL renderer only supports
diff --git a/src/core/display/Stage.js b/src/core/display/Stage.js
index 9036d4c..9d365c2 100644
--- a/src/core/display/Stage.js
+++ b/src/core/display/Stage.js
@@ -1,7 +1,7 @@
 var math = require('../math'),
     utils = require('../utils'),
     DisplayObjectContainer = require('./DisplayObjectContainer'),
-    InteractionManager = require('../interaction/InteractionManager');
+    InteractionManager = require('../../interaction/InteractionManager');
 
 /**
  * A Stage represents the root of the display tree. Everything connected to the stage is rendered, but
diff --git a/src/core/index.js b/src/core/index.js
index 02357bd..c5eeaaa 100644
--- a/src/core/index.js
+++ b/src/core/index.js
@@ -30,7 +30,7 @@
 
     // renderers - canvas
     CanvasRenderer:         require('./renderers/canvas/CanvasRenderer'),
-    CanvasGraphics:         require('./renderers/canvas/utils/CanvasGraphics'),
+    CanvasGraphics:         require('./renderers/canvas/CanvasGraphics'),
     CanvasBuffer:           require('./renderers/canvas/utils/CanvasBuffer'),
 
     // renderers - webgl
diff --git a/src/core/renderers/canvas/CanvasGraphics.js b/src/core/renderers/canvas/CanvasGraphics.js
index 92e68a1..2b1797a 100644
--- a/src/core/renderers/canvas/CanvasGraphics.js
+++ b/src/core/renderers/canvas/CanvasGraphics.js
@@ -1,4 +1,4 @@
-var Graphics = require('../../primitives/Graphics');
+var Graphics = require('../../../primitives/Graphics');
 
 /**
  * A set of functions used by the canvas renderer to draw the primitive graphics data.

diff --git a/src/core/const.js b/src/core/const.js
index 70a7a55..c0f5b18 100644
--- a/src/core/const.js
+++ b/src/core/const.js
@@ -29,7 +29,7 @@
      * @constant
      * @property {string} VERSION
      */
-    VERSION: require('../package.json').version,
+    VERSION: require('../../package.json').version,
 
     /**
      * Various blend modes supported by PIXI. IMPORTANT - The WebGL renderer only supports
diff --git a/src/core/display/Stage.js b/src/core/display/Stage.js
index 9036d4c..9d365c2 100644
--- a/src/core/display/Stage.js
+++ b/src/core/display/Stage.js
@@ -1,7 +1,7 @@
 var math = require('../math'),
     utils = require('../utils'),
     DisplayObjectContainer = require('./DisplayObjectContainer'),
-    InteractionManager = require('../interaction/InteractionManager');
+    InteractionManager = require('../../interaction/InteractionManager');
 
 /**
  * A Stage represents the root of the display tree. Everything connected to the stage is rendered, but
diff --git a/src/core/index.js b/src/core/index.js
index 02357bd..c5eeaaa 100644
--- a/src/core/index.js
+++ b/src/core/index.js
@@ -30,7 +30,7 @@
 
     // renderers - canvas
     CanvasRenderer:         require('./renderers/canvas/CanvasRenderer'),
-    CanvasGraphics:         require('./renderers/canvas/utils/CanvasGraphics'),
+    CanvasGraphics:         require('./renderers/canvas/CanvasGraphics'),
     CanvasBuffer:           require('./renderers/canvas/utils/CanvasBuffer'),
 
     // renderers - webgl
diff --git a/src/core/renderers/canvas/CanvasGraphics.js b/src/core/renderers/canvas/CanvasGraphics.js
index 92e68a1..2b1797a 100644
--- a/src/core/renderers/canvas/CanvasGraphics.js
+++ b/src/core/renderers/canvas/CanvasGraphics.js
@@ -1,4 +1,4 @@
-var Graphics = require('../../primitives/Graphics');
+var Graphics = require('../../../primitives/Graphics');
 
 /**
  * A set of functions used by the canvas renderer to draw the primitive graphics data.
diff --git a/src/core/renderers/webgl/utils/WebGLGraphics.js b/src/core/renderers/webgl/utils/WebGLGraphics.js
index 1c63370..86efe8f 100644
--- a/src/core/renderers/webgl/utils/WebGLGraphics.js
+++ b/src/core/renderers/webgl/utils/WebGLGraphics.js
@@ -1,6 +1,6 @@
 var utils = require('../../../utils'),
     math = require('../../../math'),
-    Graphics = require('../../../primitives/Graphics'),
+    Graphics = require('../../../../primitives/Graphics'),
     WebGLGraphicsData = require('./WebGLGraphicsData');
 
 /**

diff --git a/src/core/const.js b/src/core/const.js
index 70a7a55..c0f5b18 100644
--- a/src/core/const.js
+++ b/src/core/const.js
@@ -29,7 +29,7 @@
      * @constant
      * @property {string} VERSION
      */
-    VERSION: require('../package.json').version,
+    VERSION: require('../../package.json').version,
 
     /**
      * Various blend modes supported by PIXI. IMPORTANT - The WebGL renderer only supports
diff --git a/src/core/display/Stage.js b/src/core/display/Stage.js
index 9036d4c..9d365c2 100644
--- a/src/core/display/Stage.js
+++ b/src/core/display/Stage.js
@@ -1,7 +1,7 @@
 var math = require('../math'),
     utils = require('../utils'),
     DisplayObjectContainer = require('./DisplayObjectContainer'),
-    InteractionManager = require('../interaction/InteractionManager');
+    InteractionManager = require('../../interaction/InteractionManager');
 
 /**
  * A Stage represents the root of the display tree. Everything connected to the stage is rendered, but
diff --git a/src/core/index.js b/src/core/index.js
index 02357bd..c5eeaaa 100644
--- a/src/core/index.js
+++ b/src/core/index.js
@@ -30,7 +30,7 @@
 
     // renderers - canvas
     CanvasRenderer:         require('./renderers/canvas/CanvasRenderer'),
-    CanvasGraphics:         require('./renderers/canvas/utils/CanvasGraphics'),
+    CanvasGraphics:         require('./renderers/canvas/CanvasGraphics'),
     CanvasBuffer:           require('./renderers/canvas/utils/CanvasBuffer'),
 
     // renderers - webgl
diff --git a/src/core/renderers/canvas/CanvasGraphics.js b/src/core/renderers/canvas/CanvasGraphics.js
index 92e68a1..2b1797a 100644
--- a/src/core/renderers/canvas/CanvasGraphics.js
+++ b/src/core/renderers/canvas/CanvasGraphics.js
@@ -1,4 +1,4 @@
-var Graphics = require('../../primitives/Graphics');
+var Graphics = require('../../../primitives/Graphics');
 
 /**
  * A set of functions used by the canvas renderer to draw the primitive graphics data.
diff --git a/src/core/renderers/webgl/utils/WebGLGraphics.js b/src/core/renderers/webgl/utils/WebGLGraphics.js
index 1c63370..86efe8f 100644
--- a/src/core/renderers/webgl/utils/WebGLGraphics.js
+++ b/src/core/renderers/webgl/utils/WebGLGraphics.js
@@ -1,6 +1,6 @@
 var utils = require('../../../utils'),
     math = require('../../../math'),
-    Graphics = require('../../../primitives/Graphics'),
+    Graphics = require('../../../../primitives/Graphics'),
     WebGLGraphicsData = require('./WebGLGraphicsData');
 
 /**
diff --git a/src/core/renderers/webgl/utils/WebGLShaderManager.js b/src/core/renderers/webgl/utils/WebGLShaderManager.js
index a38774c..7f2c443 100644
--- a/src/core/renderers/webgl/utils/WebGLShaderManager.js
+++ b/src/core/renderers/webgl/utils/WebGLShaderManager.js
@@ -1,8 +1,8 @@
-var PrimitiveShader = require('../shader/PrimitiveShader'),
-    ComplexPrimitiveShader = require('../shader/ComplexPrimitiveShader'),
-    PixiShader = require('../shader/PixiShader'),
-    PixiFastShader = require('../shader/PixiFastShader'),
-    StripShader = require('../shader/StripShader');
+var PrimitiveShader = require('../shaders/PrimitiveShader'),
+    ComplexPrimitiveShader = require('../shaders/ComplexPrimitiveShader'),
+    PixiShader = require('../shaders/PixiShader'),
+    PixiFastShader = require('../shaders/PixiFastShader'),
+    StripShader = require('../shaders/StripShader');
 
 /**
  * @class

diff --git a/src/core/const.js b/src/core/const.js
index 70a7a55..c0f5b18 100644
--- a/src/core/const.js
+++ b/src/core/const.js
@@ -29,7 +29,7 @@
      * @constant
      * @property {string} VERSION
      */
-    VERSION: require('../package.json').version,
+    VERSION: require('../../package.json').version,
 
     /**
      * Various blend modes supported by PIXI. IMPORTANT - The WebGL renderer only supports
diff --git a/src/core/display/Stage.js b/src/core/display/Stage.js
index 9036d4c..9d365c2 100644
--- a/src/core/display/Stage.js
+++ b/src/core/display/Stage.js
@@ -1,7 +1,7 @@
 var math = require('../math'),
     utils = require('../utils'),
     DisplayObjectContainer = require('./DisplayObjectContainer'),
-    InteractionManager = require('../interaction/InteractionManager');
+    InteractionManager = require('../../interaction/InteractionManager');
 
 /**
  * A Stage represents the root of the display tree. Everything connected to the stage is rendered, but
diff --git a/src/core/index.js b/src/core/index.js
index 02357bd..c5eeaaa 100644
--- a/src/core/index.js
+++ b/src/core/index.js
@@ -30,7 +30,7 @@
 
     // renderers - canvas
     CanvasRenderer:         require('./renderers/canvas/CanvasRenderer'),
-    CanvasGraphics:         require('./renderers/canvas/utils/CanvasGraphics'),
+    CanvasGraphics:         require('./renderers/canvas/CanvasGraphics'),
     CanvasBuffer:           require('./renderers/canvas/utils/CanvasBuffer'),
 
     // renderers - webgl
diff --git a/src/core/renderers/canvas/CanvasGraphics.js b/src/core/renderers/canvas/CanvasGraphics.js
index 92e68a1..2b1797a 100644
--- a/src/core/renderers/canvas/CanvasGraphics.js
+++ b/src/core/renderers/canvas/CanvasGraphics.js
@@ -1,4 +1,4 @@
-var Graphics = require('../../primitives/Graphics');
+var Graphics = require('../../../primitives/Graphics');
 
 /**
  * A set of functions used by the canvas renderer to draw the primitive graphics data.
diff --git a/src/core/renderers/webgl/utils/WebGLGraphics.js b/src/core/renderers/webgl/utils/WebGLGraphics.js
index 1c63370..86efe8f 100644
--- a/src/core/renderers/webgl/utils/WebGLGraphics.js
+++ b/src/core/renderers/webgl/utils/WebGLGraphics.js
@@ -1,6 +1,6 @@
 var utils = require('../../../utils'),
     math = require('../../../math'),
-    Graphics = require('../../../primitives/Graphics'),
+    Graphics = require('../../../../primitives/Graphics'),
     WebGLGraphicsData = require('./WebGLGraphicsData');
 
 /**
diff --git a/src/core/renderers/webgl/utils/WebGLShaderManager.js b/src/core/renderers/webgl/utils/WebGLShaderManager.js
index a38774c..7f2c443 100644
--- a/src/core/renderers/webgl/utils/WebGLShaderManager.js
+++ b/src/core/renderers/webgl/utils/WebGLShaderManager.js
@@ -1,8 +1,8 @@
-var PrimitiveShader = require('../shader/PrimitiveShader'),
-    ComplexPrimitiveShader = require('../shader/ComplexPrimitiveShader'),
-    PixiShader = require('../shader/PixiShader'),
-    PixiFastShader = require('../shader/PixiFastShader'),
-    StripShader = require('../shader/StripShader');
+var PrimitiveShader = require('../shaders/PrimitiveShader'),
+    ComplexPrimitiveShader = require('../shaders/ComplexPrimitiveShader'),
+    PixiShader = require('../shaders/PixiShader'),
+    PixiFastShader = require('../shaders/PixiFastShader'),
+    StripShader = require('../shaders/StripShader');
 
 /**
  * @class
diff --git a/src/core/renderers/webgl/utils/WebGLSpriteBatch.js b/src/core/renderers/webgl/utils/WebGLSpriteBatch.js
index c381aba..07f99c3 100644
--- a/src/core/renderers/webgl/utils/WebGLSpriteBatch.js
+++ b/src/core/renderers/webgl/utils/WebGLSpriteBatch.js
@@ -1,4 +1,4 @@
-var AbstractFilter = require('../../../filters/AbstractFilter'),
+var AbstractFilter = require('../../../../filters/AbstractFilter'),
     PixiShader = require('../shaders/PixiShader'),
     TextureUvs = require('./TextureUvs');
 

diff --git a/src/core/const.js b/src/core/const.js
index 70a7a55..c0f5b18 100644
--- a/src/core/const.js
+++ b/src/core/const.js
@@ -29,7 +29,7 @@
      * @constant
      * @property {string} VERSION
      */
-    VERSION: require('../package.json').version,
+    VERSION: require('../../package.json').version,
 
     /**
      * Various blend modes supported by PIXI. IMPORTANT - The WebGL renderer only supports
diff --git a/src/core/display/Stage.js b/src/core/display/Stage.js
index 9036d4c..9d365c2 100644
--- a/src/core/display/Stage.js
+++ b/src/core/display/Stage.js
@@ -1,7 +1,7 @@
 var math = require('../math'),
     utils = require('../utils'),
     DisplayObjectContainer = require('./DisplayObjectContainer'),
-    InteractionManager = require('../interaction/InteractionManager');
+    InteractionManager = require('../../interaction/InteractionManager');
 
 /**
  * A Stage represents the root of the display tree. Everything connected to the stage is rendered, but
diff --git a/src/core/index.js b/src/core/index.js
index 02357bd..c5eeaaa 100644
--- a/src/core/index.js
+++ b/src/core/index.js
@@ -30,7 +30,7 @@
 
     // renderers - canvas
     CanvasRenderer:         require('./renderers/canvas/CanvasRenderer'),
-    CanvasGraphics:         require('./renderers/canvas/utils/CanvasGraphics'),
+    CanvasGraphics:         require('./renderers/canvas/CanvasGraphics'),
     CanvasBuffer:           require('./renderers/canvas/utils/CanvasBuffer'),
 
     // renderers - webgl
diff --git a/src/core/renderers/canvas/CanvasGraphics.js b/src/core/renderers/canvas/CanvasGraphics.js
index 92e68a1..2b1797a 100644
--- a/src/core/renderers/canvas/CanvasGraphics.js
+++ b/src/core/renderers/canvas/CanvasGraphics.js
@@ -1,4 +1,4 @@
-var Graphics = require('../../primitives/Graphics');
+var Graphics = require('../../../primitives/Graphics');
 
 /**
  * A set of functions used by the canvas renderer to draw the primitive graphics data.
diff --git a/src/core/renderers/webgl/utils/WebGLGraphics.js b/src/core/renderers/webgl/utils/WebGLGraphics.js
index 1c63370..86efe8f 100644
--- a/src/core/renderers/webgl/utils/WebGLGraphics.js
+++ b/src/core/renderers/webgl/utils/WebGLGraphics.js
@@ -1,6 +1,6 @@
 var utils = require('../../../utils'),
     math = require('../../../math'),
-    Graphics = require('../../../primitives/Graphics'),
+    Graphics = require('../../../../primitives/Graphics'),
     WebGLGraphicsData = require('./WebGLGraphicsData');
 
 /**
diff --git a/src/core/renderers/webgl/utils/WebGLShaderManager.js b/src/core/renderers/webgl/utils/WebGLShaderManager.js
index a38774c..7f2c443 100644
--- a/src/core/renderers/webgl/utils/WebGLShaderManager.js
+++ b/src/core/renderers/webgl/utils/WebGLShaderManager.js
@@ -1,8 +1,8 @@
-var PrimitiveShader = require('../shader/PrimitiveShader'),
-    ComplexPrimitiveShader = require('../shader/ComplexPrimitiveShader'),
-    PixiShader = require('../shader/PixiShader'),
-    PixiFastShader = require('../shader/PixiFastShader'),
-    StripShader = require('../shader/StripShader');
+var PrimitiveShader = require('../shaders/PrimitiveShader'),
+    ComplexPrimitiveShader = require('../shaders/ComplexPrimitiveShader'),
+    PixiShader = require('../shaders/PixiShader'),
+    PixiFastShader = require('../shaders/PixiFastShader'),
+    StripShader = require('../shaders/StripShader');
 
 /**
  * @class
diff --git a/src/core/renderers/webgl/utils/WebGLSpriteBatch.js b/src/core/renderers/webgl/utils/WebGLSpriteBatch.js
index c381aba..07f99c3 100644
--- a/src/core/renderers/webgl/utils/WebGLSpriteBatch.js
+++ b/src/core/renderers/webgl/utils/WebGLSpriteBatch.js
@@ -1,4 +1,4 @@
-var AbstractFilter = require('../../../filters/AbstractFilter'),
+var AbstractFilter = require('../../../../filters/AbstractFilter'),
     PixiShader = require('../shaders/PixiShader'),
     TextureUvs = require('./TextureUvs');
 
diff --git a/src/core/textures/RenderTexture.js b/src/core/textures/RenderTexture.js
index e887054..c9b9b31 100644
--- a/src/core/textures/RenderTexture.js
+++ b/src/core/textures/RenderTexture.js
@@ -1,6 +1,6 @@
 var BaseTexture = require('./BaseTexture'),
     Texture = require('./Texture'),
-    FilterTexture = require('./FilterTexture'),
+    FilterTexture = require('../renderers/webgl/utils/FilterTexture'),
     CanvasBuffer = require('../renderers/canvas/utils/CanvasBuffer'),
     math = require('../math'),
     CONST = require('../const');

diff --git a/src/core/const.js b/src/core/const.js
index 70a7a55..c0f5b18 100644
--- a/src/core/const.js
+++ b/src/core/const.js
@@ -29,7 +29,7 @@
      * @constant
      * @property {string} VERSION
      */
-    VERSION: require('../package.json').version,
+    VERSION: require('../../package.json').version,
 
     /**
      * Various blend modes supported by PIXI. IMPORTANT - The WebGL renderer only supports
diff --git a/src/core/display/Stage.js b/src/core/display/Stage.js
index 9036d4c..9d365c2 100644
--- a/src/core/display/Stage.js
+++ b/src/core/display/Stage.js
@@ -1,7 +1,7 @@
 var math = require('../math'),
     utils = require('../utils'),
     DisplayObjectContainer = require('./DisplayObjectContainer'),
-    InteractionManager = require('../interaction/InteractionManager');
+    InteractionManager = require('../../interaction/InteractionManager');
 
 /**
  * A Stage represents the root of the display tree. Everything connected to the stage is rendered, but
diff --git a/src/core/index.js b/src/core/index.js
index 02357bd..c5eeaaa 100644
--- a/src/core/index.js
+++ b/src/core/index.js
@@ -30,7 +30,7 @@
 
     // renderers - canvas
     CanvasRenderer:         require('./renderers/canvas/CanvasRenderer'),
-    CanvasGraphics:         require('./renderers/canvas/utils/CanvasGraphics'),
+    CanvasGraphics:         require('./renderers/canvas/CanvasGraphics'),
     CanvasBuffer:           require('./renderers/canvas/utils/CanvasBuffer'),
 
     // renderers - webgl
diff --git a/src/core/renderers/canvas/CanvasGraphics.js b/src/core/renderers/canvas/CanvasGraphics.js
index 92e68a1..2b1797a 100644
--- a/src/core/renderers/canvas/CanvasGraphics.js
+++ b/src/core/renderers/canvas/CanvasGraphics.js
@@ -1,4 +1,4 @@
-var Graphics = require('../../primitives/Graphics');
+var Graphics = require('../../../primitives/Graphics');
 
 /**
  * A set of functions used by the canvas renderer to draw the primitive graphics data.
diff --git a/src/core/renderers/webgl/utils/WebGLGraphics.js b/src/core/renderers/webgl/utils/WebGLGraphics.js
index 1c63370..86efe8f 100644
--- a/src/core/renderers/webgl/utils/WebGLGraphics.js
+++ b/src/core/renderers/webgl/utils/WebGLGraphics.js
@@ -1,6 +1,6 @@
 var utils = require('../../../utils'),
     math = require('../../../math'),
-    Graphics = require('../../../primitives/Graphics'),
+    Graphics = require('../../../../primitives/Graphics'),
     WebGLGraphicsData = require('./WebGLGraphicsData');
 
 /**
diff --git a/src/core/renderers/webgl/utils/WebGLShaderManager.js b/src/core/renderers/webgl/utils/WebGLShaderManager.js
index a38774c..7f2c443 100644
--- a/src/core/renderers/webgl/utils/WebGLShaderManager.js
+++ b/src/core/renderers/webgl/utils/WebGLShaderManager.js
@@ -1,8 +1,8 @@
-var PrimitiveShader = require('../shader/PrimitiveShader'),
-    ComplexPrimitiveShader = require('../shader/ComplexPrimitiveShader'),
-    PixiShader = require('../shader/PixiShader'),
-    PixiFastShader = require('../shader/PixiFastShader'),
-    StripShader = require('../shader/StripShader');
+var PrimitiveShader = require('../shaders/PrimitiveShader'),
+    ComplexPrimitiveShader = require('../shaders/ComplexPrimitiveShader'),
+    PixiShader = require('../shaders/PixiShader'),
+    PixiFastShader = require('../shaders/PixiFastShader'),
+    StripShader = require('../shaders/StripShader');
 
 /**
  * @class
diff --git a/src/core/renderers/webgl/utils/WebGLSpriteBatch.js b/src/core/renderers/webgl/utils/WebGLSpriteBatch.js
index c381aba..07f99c3 100644
--- a/src/core/renderers/webgl/utils/WebGLSpriteBatch.js
+++ b/src/core/renderers/webgl/utils/WebGLSpriteBatch.js
@@ -1,4 +1,4 @@
-var AbstractFilter = require('../../../filters/AbstractFilter'),
+var AbstractFilter = require('../../../../filters/AbstractFilter'),
     PixiShader = require('../shaders/PixiShader'),
     TextureUvs = require('./TextureUvs');
 
diff --git a/src/core/textures/RenderTexture.js b/src/core/textures/RenderTexture.js
index e887054..c9b9b31 100644
--- a/src/core/textures/RenderTexture.js
+++ b/src/core/textures/RenderTexture.js
@@ -1,6 +1,6 @@
 var BaseTexture = require('./BaseTexture'),
     Texture = require('./Texture'),
-    FilterTexture = require('./FilterTexture'),
+    FilterTexture = require('../renderers/webgl/utils/FilterTexture'),
     CanvasBuffer = require('../renderers/canvas/utils/CanvasBuffer'),
     math = require('../math'),
     CONST = require('../const');
diff --git a/src/core/textures/Texture.js b/src/core/textures/Texture.js
index f8e8609..e54a0e8 100644
--- a/src/core/textures/Texture.js
+++ b/src/core/textures/Texture.js
@@ -1,7 +1,7 @@
 var BaseTexture = require('./BaseTexture'),
-    Rectangle = require('./Rectangle'),
     EventTarget = require('../utils/EventTarget'),
     TextureUvs = require('../renderers/webgl/utils/TextureUvs'),
+    math = require('../math'),
     utils = require('../utils');
 
 /**
@@ -26,7 +26,7 @@
 
     if (!frame) {
         this.noFrame = true;
-        frame = new Rectangle(0,0,1,1);
+        frame = new math.Rectangle(0,0,1,1);
     }
 
     if (baseTexture instanceof Texture) {
@@ -96,11 +96,11 @@
      *
      * @member {Rectangle}
      */
-    this.crop = crop || new Rectangle(0, 0, 1, 1);
+    this.crop = crop || new math.Rectangle(0, 0, 1, 1);
 
     if (baseTexture.hasLoaded) {
         if (this.noFrame) {
-            frame = new Rectangle(0, 0, baseTexture.width, baseTexture.height);
+            frame = new math.Rectangle(0, 0, baseTexture.width, baseTexture.height);
         }
         this.setFrame(frame);
     }
@@ -124,7 +124,7 @@
     baseTexture.removeEventListener('loaded', this.onLoaded);
 
     if (this.noFrame) {
-        this.frame = new Rectangle(0, 0, baseTexture.width, baseTexture.height);
+        this.frame = new math.Rectangle(0, 0, baseTexture.width, baseTexture.height);
     }
 
     this.setFrame(this.frame);

diff --git a/src/core/const.js b/src/core/const.js
index 70a7a55..c0f5b18 100644
--- a/src/core/const.js
+++ b/src/core/const.js
@@ -29,7 +29,7 @@
      * @constant
      * @property {string} VERSION
      */
-    VERSION: require('../package.json').version,
+    VERSION: require('../../package.json').version,
 
     /**
      * Various blend modes supported by PIXI. IMPORTANT - The WebGL renderer only supports
diff --git a/src/core/display/Stage.js b/src/core/display/Stage.js
index 9036d4c..9d365c2 100644
--- a/src/core/display/Stage.js
+++ b/src/core/display/Stage.js
@@ -1,7 +1,7 @@
 var math = require('../math'),
     utils = require('../utils'),
     DisplayObjectContainer = require('./DisplayObjectContainer'),
-    InteractionManager = require('../interaction/InteractionManager');
+    InteractionManager = require('../../interaction/InteractionManager');
 
 /**
  * A Stage represents the root of the display tree. Everything connected to the stage is rendered, but
diff --git a/src/core/index.js b/src/core/index.js
index 02357bd..c5eeaaa 100644
--- a/src/core/index.js
+++ b/src/core/index.js
@@ -30,7 +30,7 @@
 
     // renderers - canvas
     CanvasRenderer:         require('./renderers/canvas/CanvasRenderer'),
-    CanvasGraphics:         require('./renderers/canvas/utils/CanvasGraphics'),
+    CanvasGraphics:         require('./renderers/canvas/CanvasGraphics'),
     CanvasBuffer:           require('./renderers/canvas/utils/CanvasBuffer'),
 
     // renderers - webgl
diff --git a/src/core/renderers/canvas/CanvasGraphics.js b/src/core/renderers/canvas/CanvasGraphics.js
index 92e68a1..2b1797a 100644
--- a/src/core/renderers/canvas/CanvasGraphics.js
+++ b/src/core/renderers/canvas/CanvasGraphics.js
@@ -1,4 +1,4 @@
-var Graphics = require('../../primitives/Graphics');
+var Graphics = require('../../../primitives/Graphics');
 
 /**
  * A set of functions used by the canvas renderer to draw the primitive graphics data.
diff --git a/src/core/renderers/webgl/utils/WebGLGraphics.js b/src/core/renderers/webgl/utils/WebGLGraphics.js
index 1c63370..86efe8f 100644
--- a/src/core/renderers/webgl/utils/WebGLGraphics.js
+++ b/src/core/renderers/webgl/utils/WebGLGraphics.js
@@ -1,6 +1,6 @@
 var utils = require('../../../utils'),
     math = require('../../../math'),
-    Graphics = require('../../../primitives/Graphics'),
+    Graphics = require('../../../../primitives/Graphics'),
     WebGLGraphicsData = require('./WebGLGraphicsData');
 
 /**
diff --git a/src/core/renderers/webgl/utils/WebGLShaderManager.js b/src/core/renderers/webgl/utils/WebGLShaderManager.js
index a38774c..7f2c443 100644
--- a/src/core/renderers/webgl/utils/WebGLShaderManager.js
+++ b/src/core/renderers/webgl/utils/WebGLShaderManager.js
@@ -1,8 +1,8 @@
-var PrimitiveShader = require('../shader/PrimitiveShader'),
-    ComplexPrimitiveShader = require('../shader/ComplexPrimitiveShader'),
-    PixiShader = require('../shader/PixiShader'),
-    PixiFastShader = require('../shader/PixiFastShader'),
-    StripShader = require('../shader/StripShader');
+var PrimitiveShader = require('../shaders/PrimitiveShader'),
+    ComplexPrimitiveShader = require('../shaders/ComplexPrimitiveShader'),
+    PixiShader = require('../shaders/PixiShader'),
+    PixiFastShader = require('../shaders/PixiFastShader'),
+    StripShader = require('../shaders/StripShader');
 
 /**
  * @class
diff --git a/src/core/renderers/webgl/utils/WebGLSpriteBatch.js b/src/core/renderers/webgl/utils/WebGLSpriteBatch.js
index c381aba..07f99c3 100644
--- a/src/core/renderers/webgl/utils/WebGLSpriteBatch.js
+++ b/src/core/renderers/webgl/utils/WebGLSpriteBatch.js
@@ -1,4 +1,4 @@
-var AbstractFilter = require('../../../filters/AbstractFilter'),
+var AbstractFilter = require('../../../../filters/AbstractFilter'),
     PixiShader = require('../shaders/PixiShader'),
     TextureUvs = require('./TextureUvs');
 
diff --git a/src/core/textures/RenderTexture.js b/src/core/textures/RenderTexture.js
index e887054..c9b9b31 100644
--- a/src/core/textures/RenderTexture.js
+++ b/src/core/textures/RenderTexture.js
@@ -1,6 +1,6 @@
 var BaseTexture = require('./BaseTexture'),
     Texture = require('./Texture'),
-    FilterTexture = require('./FilterTexture'),
+    FilterTexture = require('../renderers/webgl/utils/FilterTexture'),
     CanvasBuffer = require('../renderers/canvas/utils/CanvasBuffer'),
     math = require('../math'),
     CONST = require('../const');
diff --git a/src/core/textures/Texture.js b/src/core/textures/Texture.js
index f8e8609..e54a0e8 100644
--- a/src/core/textures/Texture.js
+++ b/src/core/textures/Texture.js
@@ -1,7 +1,7 @@
 var BaseTexture = require('./BaseTexture'),
-    Rectangle = require('./Rectangle'),
     EventTarget = require('../utils/EventTarget'),
     TextureUvs = require('../renderers/webgl/utils/TextureUvs'),
+    math = require('../math'),
     utils = require('../utils');
 
 /**
@@ -26,7 +26,7 @@
 
     if (!frame) {
         this.noFrame = true;
-        frame = new Rectangle(0,0,1,1);
+        frame = new math.Rectangle(0,0,1,1);
     }
 
     if (baseTexture instanceof Texture) {
@@ -96,11 +96,11 @@
      *
      * @member {Rectangle}
      */
-    this.crop = crop || new Rectangle(0, 0, 1, 1);
+    this.crop = crop || new math.Rectangle(0, 0, 1, 1);
 
     if (baseTexture.hasLoaded) {
         if (this.noFrame) {
-            frame = new Rectangle(0, 0, baseTexture.width, baseTexture.height);
+            frame = new math.Rectangle(0, 0, baseTexture.width, baseTexture.height);
         }
         this.setFrame(frame);
     }
@@ -124,7 +124,7 @@
     baseTexture.removeEventListener('loaded', this.onLoaded);
 
     if (this.noFrame) {
-        this.frame = new Rectangle(0, 0, baseTexture.width, baseTexture.height);
+        this.frame = new math.Rectangle(0, 0, baseTexture.width, baseTexture.height);
     }
 
     this.setFrame(this.frame);
diff --git a/src/core/utils/index.js b/src/core/utils/index.js
index bf9f6b3..2148338 100644
--- a/src/core/utils/index.js
+++ b/src/core/utils/index.js
@@ -159,7 +159,7 @@
     },
 
     PolyK:      require('./PolyK'),
-    Event:      require('./Event'),
+    EventData:  require('./EventData'),
     EventTarget: require('./EventTarget'),
 
     // TODO: refactor out this

diff --git a/src/core/const.js b/src/core/const.js
index 70a7a55..c0f5b18 100644
--- a/src/core/const.js
+++ b/src/core/const.js
@@ -29,7 +29,7 @@
      * @constant
      * @property {string} VERSION
      */
-    VERSION: require('../package.json').version,
+    VERSION: require('../../package.json').version,
 
     /**
      * Various blend modes supported by PIXI. IMPORTANT - The WebGL renderer only supports
diff --git a/src/core/display/Stage.js b/src/core/display/Stage.js
index 9036d4c..9d365c2 100644
--- a/src/core/display/Stage.js
+++ b/src/core/display/Stage.js
@@ -1,7 +1,7 @@
 var math = require('../math'),
     utils = require('../utils'),
     DisplayObjectContainer = require('./DisplayObjectContainer'),
-    InteractionManager = require('../interaction/InteractionManager');
+    InteractionManager = require('../../interaction/InteractionManager');
 
 /**
  * A Stage represents the root of the display tree. Everything connected to the stage is rendered, but
diff --git a/src/core/index.js b/src/core/index.js
index 02357bd..c5eeaaa 100644
--- a/src/core/index.js
+++ b/src/core/index.js
@@ -30,7 +30,7 @@
 
     // renderers - canvas
     CanvasRenderer:         require('./renderers/canvas/CanvasRenderer'),
-    CanvasGraphics:         require('./renderers/canvas/utils/CanvasGraphics'),
+    CanvasGraphics:         require('./renderers/canvas/CanvasGraphics'),
     CanvasBuffer:           require('./renderers/canvas/utils/CanvasBuffer'),
 
     // renderers - webgl
diff --git a/src/core/renderers/canvas/CanvasGraphics.js b/src/core/renderers/canvas/CanvasGraphics.js
index 92e68a1..2b1797a 100644
--- a/src/core/renderers/canvas/CanvasGraphics.js
+++ b/src/core/renderers/canvas/CanvasGraphics.js
@@ -1,4 +1,4 @@
-var Graphics = require('../../primitives/Graphics');
+var Graphics = require('../../../primitives/Graphics');
 
 /**
  * A set of functions used by the canvas renderer to draw the primitive graphics data.
diff --git a/src/core/renderers/webgl/utils/WebGLGraphics.js b/src/core/renderers/webgl/utils/WebGLGraphics.js
index 1c63370..86efe8f 100644
--- a/src/core/renderers/webgl/utils/WebGLGraphics.js
+++ b/src/core/renderers/webgl/utils/WebGLGraphics.js
@@ -1,6 +1,6 @@
 var utils = require('../../../utils'),
     math = require('../../../math'),
-    Graphics = require('../../../primitives/Graphics'),
+    Graphics = require('../../../../primitives/Graphics'),
     WebGLGraphicsData = require('./WebGLGraphicsData');
 
 /**
diff --git a/src/core/renderers/webgl/utils/WebGLShaderManager.js b/src/core/renderers/webgl/utils/WebGLShaderManager.js
index a38774c..7f2c443 100644
--- a/src/core/renderers/webgl/utils/WebGLShaderManager.js
+++ b/src/core/renderers/webgl/utils/WebGLShaderManager.js
@@ -1,8 +1,8 @@
-var PrimitiveShader = require('../shader/PrimitiveShader'),
-    ComplexPrimitiveShader = require('../shader/ComplexPrimitiveShader'),
-    PixiShader = require('../shader/PixiShader'),
-    PixiFastShader = require('../shader/PixiFastShader'),
-    StripShader = require('../shader/StripShader');
+var PrimitiveShader = require('../shaders/PrimitiveShader'),
+    ComplexPrimitiveShader = require('../shaders/ComplexPrimitiveShader'),
+    PixiShader = require('../shaders/PixiShader'),
+    PixiFastShader = require('../shaders/PixiFastShader'),
+    StripShader = require('../shaders/StripShader');
 
 /**
  * @class
diff --git a/src/core/renderers/webgl/utils/WebGLSpriteBatch.js b/src/core/renderers/webgl/utils/WebGLSpriteBatch.js
index c381aba..07f99c3 100644
--- a/src/core/renderers/webgl/utils/WebGLSpriteBatch.js
+++ b/src/core/renderers/webgl/utils/WebGLSpriteBatch.js
@@ -1,4 +1,4 @@
-var AbstractFilter = require('../../../filters/AbstractFilter'),
+var AbstractFilter = require('../../../../filters/AbstractFilter'),
     PixiShader = require('../shaders/PixiShader'),
     TextureUvs = require('./TextureUvs');
 
diff --git a/src/core/textures/RenderTexture.js b/src/core/textures/RenderTexture.js
index e887054..c9b9b31 100644
--- a/src/core/textures/RenderTexture.js
+++ b/src/core/textures/RenderTexture.js
@@ -1,6 +1,6 @@
 var BaseTexture = require('./BaseTexture'),
     Texture = require('./Texture'),
-    FilterTexture = require('./FilterTexture'),
+    FilterTexture = require('../renderers/webgl/utils/FilterTexture'),
     CanvasBuffer = require('../renderers/canvas/utils/CanvasBuffer'),
     math = require('../math'),
     CONST = require('../const');
diff --git a/src/core/textures/Texture.js b/src/core/textures/Texture.js
index f8e8609..e54a0e8 100644
--- a/src/core/textures/Texture.js
+++ b/src/core/textures/Texture.js
@@ -1,7 +1,7 @@
 var BaseTexture = require('./BaseTexture'),
-    Rectangle = require('./Rectangle'),
     EventTarget = require('../utils/EventTarget'),
     TextureUvs = require('../renderers/webgl/utils/TextureUvs'),
+    math = require('../math'),
     utils = require('../utils');
 
 /**
@@ -26,7 +26,7 @@
 
     if (!frame) {
         this.noFrame = true;
-        frame = new Rectangle(0,0,1,1);
+        frame = new math.Rectangle(0,0,1,1);
     }
 
     if (baseTexture instanceof Texture) {
@@ -96,11 +96,11 @@
      *
      * @member {Rectangle}
      */
-    this.crop = crop || new Rectangle(0, 0, 1, 1);
+    this.crop = crop || new math.Rectangle(0, 0, 1, 1);
 
     if (baseTexture.hasLoaded) {
         if (this.noFrame) {
-            frame = new Rectangle(0, 0, baseTexture.width, baseTexture.height);
+            frame = new math.Rectangle(0, 0, baseTexture.width, baseTexture.height);
         }
         this.setFrame(frame);
     }
@@ -124,7 +124,7 @@
     baseTexture.removeEventListener('loaded', this.onLoaded);
 
     if (this.noFrame) {
-        this.frame = new Rectangle(0, 0, baseTexture.width, baseTexture.height);
+        this.frame = new math.Rectangle(0, 0, baseTexture.width, baseTexture.height);
     }
 
     this.setFrame(this.frame);
diff --git a/src/core/utils/index.js b/src/core/utils/index.js
index bf9f6b3..2148338 100644
--- a/src/core/utils/index.js
+++ b/src/core/utils/index.js
@@ -159,7 +159,7 @@
     },
 
     PolyK:      require('./PolyK'),
-    Event:      require('./Event'),
+    EventData:  require('./EventData'),
     EventTarget: require('./EventTarget'),
 
     // TODO: refactor out this
diff --git a/src/filters/TiltShiftXFilter.js b/src/filters/TiltShiftXFilter.js
index f07ba13..244f543 100644
--- a/src/filters/TiltShiftXFilter.js
+++ b/src/filters/TiltShiftXFilter.js
@@ -1,4 +1,4 @@
-var AbstractFilter = require('AbstractFilter');
+var AbstractFilter = require('./AbstractFilter');
 
 /**
  * @author Vico @vicocotea

diff --git a/src/core/const.js b/src/core/const.js
index 70a7a55..c0f5b18 100644
--- a/src/core/const.js
+++ b/src/core/const.js
@@ -29,7 +29,7 @@
      * @constant
      * @property {string} VERSION
      */
-    VERSION: require('../package.json').version,
+    VERSION: require('../../package.json').version,
 
     /**
      * Various blend modes supported by PIXI. IMPORTANT - The WebGL renderer only supports
diff --git a/src/core/display/Stage.js b/src/core/display/Stage.js
index 9036d4c..9d365c2 100644
--- a/src/core/display/Stage.js
+++ b/src/core/display/Stage.js
@@ -1,7 +1,7 @@
 var math = require('../math'),
     utils = require('../utils'),
     DisplayObjectContainer = require('./DisplayObjectContainer'),
-    InteractionManager = require('../interaction/InteractionManager');
+    InteractionManager = require('../../interaction/InteractionManager');
 
 /**
  * A Stage represents the root of the display tree. Everything connected to the stage is rendered, but
diff --git a/src/core/index.js b/src/core/index.js
index 02357bd..c5eeaaa 100644
--- a/src/core/index.js
+++ b/src/core/index.js
@@ -30,7 +30,7 @@
 
     // renderers - canvas
     CanvasRenderer:         require('./renderers/canvas/CanvasRenderer'),
-    CanvasGraphics:         require('./renderers/canvas/utils/CanvasGraphics'),
+    CanvasGraphics:         require('./renderers/canvas/CanvasGraphics'),
     CanvasBuffer:           require('./renderers/canvas/utils/CanvasBuffer'),
 
     // renderers - webgl
diff --git a/src/core/renderers/canvas/CanvasGraphics.js b/src/core/renderers/canvas/CanvasGraphics.js
index 92e68a1..2b1797a 100644
--- a/src/core/renderers/canvas/CanvasGraphics.js
+++ b/src/core/renderers/canvas/CanvasGraphics.js
@@ -1,4 +1,4 @@
-var Graphics = require('../../primitives/Graphics');
+var Graphics = require('../../../primitives/Graphics');
 
 /**
  * A set of functions used by the canvas renderer to draw the primitive graphics data.
diff --git a/src/core/renderers/webgl/utils/WebGLGraphics.js b/src/core/renderers/webgl/utils/WebGLGraphics.js
index 1c63370..86efe8f 100644
--- a/src/core/renderers/webgl/utils/WebGLGraphics.js
+++ b/src/core/renderers/webgl/utils/WebGLGraphics.js
@@ -1,6 +1,6 @@
 var utils = require('../../../utils'),
     math = require('../../../math'),
-    Graphics = require('../../../primitives/Graphics'),
+    Graphics = require('../../../../primitives/Graphics'),
     WebGLGraphicsData = require('./WebGLGraphicsData');
 
 /**
diff --git a/src/core/renderers/webgl/utils/WebGLShaderManager.js b/src/core/renderers/webgl/utils/WebGLShaderManager.js
index a38774c..7f2c443 100644
--- a/src/core/renderers/webgl/utils/WebGLShaderManager.js
+++ b/src/core/renderers/webgl/utils/WebGLShaderManager.js
@@ -1,8 +1,8 @@
-var PrimitiveShader = require('../shader/PrimitiveShader'),
-    ComplexPrimitiveShader = require('../shader/ComplexPrimitiveShader'),
-    PixiShader = require('../shader/PixiShader'),
-    PixiFastShader = require('../shader/PixiFastShader'),
-    StripShader = require('../shader/StripShader');
+var PrimitiveShader = require('../shaders/PrimitiveShader'),
+    ComplexPrimitiveShader = require('../shaders/ComplexPrimitiveShader'),
+    PixiShader = require('../shaders/PixiShader'),
+    PixiFastShader = require('../shaders/PixiFastShader'),
+    StripShader = require('../shaders/StripShader');
 
 /**
  * @class
diff --git a/src/core/renderers/webgl/utils/WebGLSpriteBatch.js b/src/core/renderers/webgl/utils/WebGLSpriteBatch.js
index c381aba..07f99c3 100644
--- a/src/core/renderers/webgl/utils/WebGLSpriteBatch.js
+++ b/src/core/renderers/webgl/utils/WebGLSpriteBatch.js
@@ -1,4 +1,4 @@
-var AbstractFilter = require('../../../filters/AbstractFilter'),
+var AbstractFilter = require('../../../../filters/AbstractFilter'),
     PixiShader = require('../shaders/PixiShader'),
     TextureUvs = require('./TextureUvs');
 
diff --git a/src/core/textures/RenderTexture.js b/src/core/textures/RenderTexture.js
index e887054..c9b9b31 100644
--- a/src/core/textures/RenderTexture.js
+++ b/src/core/textures/RenderTexture.js
@@ -1,6 +1,6 @@
 var BaseTexture = require('./BaseTexture'),
     Texture = require('./Texture'),
-    FilterTexture = require('./FilterTexture'),
+    FilterTexture = require('../renderers/webgl/utils/FilterTexture'),
     CanvasBuffer = require('../renderers/canvas/utils/CanvasBuffer'),
     math = require('../math'),
     CONST = require('../const');
diff --git a/src/core/textures/Texture.js b/src/core/textures/Texture.js
index f8e8609..e54a0e8 100644
--- a/src/core/textures/Texture.js
+++ b/src/core/textures/Texture.js
@@ -1,7 +1,7 @@
 var BaseTexture = require('./BaseTexture'),
-    Rectangle = require('./Rectangle'),
     EventTarget = require('../utils/EventTarget'),
     TextureUvs = require('../renderers/webgl/utils/TextureUvs'),
+    math = require('../math'),
     utils = require('../utils');
 
 /**
@@ -26,7 +26,7 @@
 
     if (!frame) {
         this.noFrame = true;
-        frame = new Rectangle(0,0,1,1);
+        frame = new math.Rectangle(0,0,1,1);
     }
 
     if (baseTexture instanceof Texture) {
@@ -96,11 +96,11 @@
      *
      * @member {Rectangle}
      */
-    this.crop = crop || new Rectangle(0, 0, 1, 1);
+    this.crop = crop || new math.Rectangle(0, 0, 1, 1);
 
     if (baseTexture.hasLoaded) {
         if (this.noFrame) {
-            frame = new Rectangle(0, 0, baseTexture.width, baseTexture.height);
+            frame = new math.Rectangle(0, 0, baseTexture.width, baseTexture.height);
         }
         this.setFrame(frame);
     }
@@ -124,7 +124,7 @@
     baseTexture.removeEventListener('loaded', this.onLoaded);
 
     if (this.noFrame) {
-        this.frame = new Rectangle(0, 0, baseTexture.width, baseTexture.height);
+        this.frame = new math.Rectangle(0, 0, baseTexture.width, baseTexture.height);
     }
 
     this.setFrame(this.frame);
diff --git a/src/core/utils/index.js b/src/core/utils/index.js
index bf9f6b3..2148338 100644
--- a/src/core/utils/index.js
+++ b/src/core/utils/index.js
@@ -159,7 +159,7 @@
     },
 
     PolyK:      require('./PolyK'),
-    Event:      require('./Event'),
+    EventData:  require('./EventData'),
     EventTarget: require('./EventTarget'),
 
     // TODO: refactor out this
diff --git a/src/filters/TiltShiftXFilter.js b/src/filters/TiltShiftXFilter.js
index f07ba13..244f543 100644
--- a/src/filters/TiltShiftXFilter.js
+++ b/src/filters/TiltShiftXFilter.js
@@ -1,4 +1,4 @@
-var AbstractFilter = require('AbstractFilter');
+var AbstractFilter = require('./AbstractFilter');
 
 /**
  * @author Vico @vicocotea
diff --git a/src/filters/TiltShiftYFilter.js b/src/filters/TiltShiftYFilter.js
index 2127ef2..087e8b2 100644
--- a/src/filters/TiltShiftYFilter.js
+++ b/src/filters/TiltShiftYFilter.js
@@ -1,4 +1,4 @@
-var AbstractFilter = require('AbstractFilter');
+var AbstractFilter = require('./AbstractFilter');
 
 /**
  * @author Vico @vicocotea

diff --git a/src/core/const.js b/src/core/const.js
index 70a7a55..c0f5b18 100644
--- a/src/core/const.js
+++ b/src/core/const.js
@@ -29,7 +29,7 @@
      * @constant
      * @property {string} VERSION
      */
-    VERSION: require('../package.json').version,
+    VERSION: require('../../package.json').version,
 
     /**
      * Various blend modes supported by PIXI. IMPORTANT - The WebGL renderer only supports
diff --git a/src/core/display/Stage.js b/src/core/display/Stage.js
index 9036d4c..9d365c2 100644
--- a/src/core/display/Stage.js
+++ b/src/core/display/Stage.js
@@ -1,7 +1,7 @@
 var math = require('../math'),
     utils = require('../utils'),
     DisplayObjectContainer = require('./DisplayObjectContainer'),
-    InteractionManager = require('../interaction/InteractionManager');
+    InteractionManager = require('../../interaction/InteractionManager');
 
 /**
  * A Stage represents the root of the display tree. Everything connected to the stage is rendered, but
diff --git a/src/core/index.js b/src/core/index.js
index 02357bd..c5eeaaa 100644
--- a/src/core/index.js
+++ b/src/core/index.js
@@ -30,7 +30,7 @@
 
     // renderers - canvas
     CanvasRenderer:         require('./renderers/canvas/CanvasRenderer'),
-    CanvasGraphics:         require('./renderers/canvas/utils/CanvasGraphics'),
+    CanvasGraphics:         require('./renderers/canvas/CanvasGraphics'),
     CanvasBuffer:           require('./renderers/canvas/utils/CanvasBuffer'),
 
     // renderers - webgl
diff --git a/src/core/renderers/canvas/CanvasGraphics.js b/src/core/renderers/canvas/CanvasGraphics.js
index 92e68a1..2b1797a 100644
--- a/src/core/renderers/canvas/CanvasGraphics.js
+++ b/src/core/renderers/canvas/CanvasGraphics.js
@@ -1,4 +1,4 @@
-var Graphics = require('../../primitives/Graphics');
+var Graphics = require('../../../primitives/Graphics');
 
 /**
  * A set of functions used by the canvas renderer to draw the primitive graphics data.
diff --git a/src/core/renderers/webgl/utils/WebGLGraphics.js b/src/core/renderers/webgl/utils/WebGLGraphics.js
index 1c63370..86efe8f 100644
--- a/src/core/renderers/webgl/utils/WebGLGraphics.js
+++ b/src/core/renderers/webgl/utils/WebGLGraphics.js
@@ -1,6 +1,6 @@
 var utils = require('../../../utils'),
     math = require('../../../math'),
-    Graphics = require('../../../primitives/Graphics'),
+    Graphics = require('../../../../primitives/Graphics'),
     WebGLGraphicsData = require('./WebGLGraphicsData');
 
 /**
diff --git a/src/core/renderers/webgl/utils/WebGLShaderManager.js b/src/core/renderers/webgl/utils/WebGLShaderManager.js
index a38774c..7f2c443 100644
--- a/src/core/renderers/webgl/utils/WebGLShaderManager.js
+++ b/src/core/renderers/webgl/utils/WebGLShaderManager.js
@@ -1,8 +1,8 @@
-var PrimitiveShader = require('../shader/PrimitiveShader'),
-    ComplexPrimitiveShader = require('../shader/ComplexPrimitiveShader'),
-    PixiShader = require('../shader/PixiShader'),
-    PixiFastShader = require('../shader/PixiFastShader'),
-    StripShader = require('../shader/StripShader');
+var PrimitiveShader = require('../shaders/PrimitiveShader'),
+    ComplexPrimitiveShader = require('../shaders/ComplexPrimitiveShader'),
+    PixiShader = require('../shaders/PixiShader'),
+    PixiFastShader = require('../shaders/PixiFastShader'),
+    StripShader = require('../shaders/StripShader');
 
 /**
  * @class
diff --git a/src/core/renderers/webgl/utils/WebGLSpriteBatch.js b/src/core/renderers/webgl/utils/WebGLSpriteBatch.js
index c381aba..07f99c3 100644
--- a/src/core/renderers/webgl/utils/WebGLSpriteBatch.js
+++ b/src/core/renderers/webgl/utils/WebGLSpriteBatch.js
@@ -1,4 +1,4 @@
-var AbstractFilter = require('../../../filters/AbstractFilter'),
+var AbstractFilter = require('../../../../filters/AbstractFilter'),
     PixiShader = require('../shaders/PixiShader'),
     TextureUvs = require('./TextureUvs');
 
diff --git a/src/core/textures/RenderTexture.js b/src/core/textures/RenderTexture.js
index e887054..c9b9b31 100644
--- a/src/core/textures/RenderTexture.js
+++ b/src/core/textures/RenderTexture.js
@@ -1,6 +1,6 @@
 var BaseTexture = require('./BaseTexture'),
     Texture = require('./Texture'),
-    FilterTexture = require('./FilterTexture'),
+    FilterTexture = require('../renderers/webgl/utils/FilterTexture'),
     CanvasBuffer = require('../renderers/canvas/utils/CanvasBuffer'),
     math = require('../math'),
     CONST = require('../const');
diff --git a/src/core/textures/Texture.js b/src/core/textures/Texture.js
index f8e8609..e54a0e8 100644
--- a/src/core/textures/Texture.js
+++ b/src/core/textures/Texture.js
@@ -1,7 +1,7 @@
 var BaseTexture = require('./BaseTexture'),
-    Rectangle = require('./Rectangle'),
     EventTarget = require('../utils/EventTarget'),
     TextureUvs = require('../renderers/webgl/utils/TextureUvs'),
+    math = require('../math'),
     utils = require('../utils');
 
 /**
@@ -26,7 +26,7 @@
 
     if (!frame) {
         this.noFrame = true;
-        frame = new Rectangle(0,0,1,1);
+        frame = new math.Rectangle(0,0,1,1);
     }
 
     if (baseTexture instanceof Texture) {
@@ -96,11 +96,11 @@
      *
      * @member {Rectangle}
      */
-    this.crop = crop || new Rectangle(0, 0, 1, 1);
+    this.crop = crop || new math.Rectangle(0, 0, 1, 1);
 
     if (baseTexture.hasLoaded) {
         if (this.noFrame) {
-            frame = new Rectangle(0, 0, baseTexture.width, baseTexture.height);
+            frame = new math.Rectangle(0, 0, baseTexture.width, baseTexture.height);
         }
         this.setFrame(frame);
     }
@@ -124,7 +124,7 @@
     baseTexture.removeEventListener('loaded', this.onLoaded);
 
     if (this.noFrame) {
-        this.frame = new Rectangle(0, 0, baseTexture.width, baseTexture.height);
+        this.frame = new math.Rectangle(0, 0, baseTexture.width, baseTexture.height);
     }
 
     this.setFrame(this.frame);
diff --git a/src/core/utils/index.js b/src/core/utils/index.js
index bf9f6b3..2148338 100644
--- a/src/core/utils/index.js
+++ b/src/core/utils/index.js
@@ -159,7 +159,7 @@
     },
 
     PolyK:      require('./PolyK'),
-    Event:      require('./Event'),
+    EventData:  require('./EventData'),
     EventTarget: require('./EventTarget'),
 
     // TODO: refactor out this
diff --git a/src/filters/TiltShiftXFilter.js b/src/filters/TiltShiftXFilter.js
index f07ba13..244f543 100644
--- a/src/filters/TiltShiftXFilter.js
+++ b/src/filters/TiltShiftXFilter.js
@@ -1,4 +1,4 @@
-var AbstractFilter = require('AbstractFilter');
+var AbstractFilter = require('./AbstractFilter');
 
 /**
  * @author Vico @vicocotea
diff --git a/src/filters/TiltShiftYFilter.js b/src/filters/TiltShiftYFilter.js
index 2127ef2..087e8b2 100644
--- a/src/filters/TiltShiftYFilter.js
+++ b/src/filters/TiltShiftYFilter.js
@@ -1,4 +1,4 @@
-var AbstractFilter = require('AbstractFilter');
+var AbstractFilter = require('./AbstractFilter');
 
 /**
  * @author Vico @vicocotea
diff --git a/src/spine/index.js b/src/spine/index.js
index e8a036d..b6adfa2 100644
--- a/src/spine/index.js
+++ b/src/spine/index.js
@@ -9,6 +9,5 @@
  * @namespace PIXI
  */
 module.exports = {
-    Spine:              require('./Spine'),
-    SpineTextureLoader: require('./SpineTextureLoader')
+    Spine:              require('./Spine')
 };