diff --git a/gulp/util/bundle.js b/gulp/util/bundle.js
index 0ff4e8d..7eecd98 100644
--- a/gulp/util/bundle.js
+++ b/gulp/util/bundle.js
@@ -9,6 +9,7 @@
     watchify    = require('watchify'),
     handleErrors = require('../util/handleErrors');
 
+// TODO - Concat license header to dev/prod build files.
 function rebundle() {
     return this.bundle()
         .on('error', handleErrors.handler)

diff --git a/gulp/util/bundle.js b/gulp/util/bundle.js
index 0ff4e8d..7eecd98 100644
--- a/gulp/util/bundle.js
+++ b/gulp/util/bundle.js
@@ -9,6 +9,7 @@
     watchify    = require('watchify'),
     handleErrors = require('../util/handleErrors');
 
+// TODO - Concat license header to dev/prod build files.
 function rebundle() {
     return this.bundle()
         .on('error', handleErrors.handler)
diff --git a/src/core/index.js b/src/core/index.js
index 950977e..3954b6f 100644
--- a/src/core/index.js
+++ b/src/core/index.js
@@ -29,7 +29,7 @@
     Texture:                require('./textures/Texture'),
     BaseTexture:            require('./textures/BaseTexture'),
     RenderTexture:          require('./textures/RenderTexture'),
-    VideoTexture:           require('./textures/VideoTexture'),
+    VideoBaseTexture:       require('./textures/VideoBaseTexture'),
 
     // renderers - canvas
     CanvasRenderer:         require('./renderers/canvas/CanvasRenderer'),

diff --git a/gulp/util/bundle.js b/gulp/util/bundle.js
index 0ff4e8d..7eecd98 100644
--- a/gulp/util/bundle.js
+++ b/gulp/util/bundle.js
@@ -9,6 +9,7 @@
     watchify    = require('watchify'),
     handleErrors = require('../util/handleErrors');
 
+// TODO - Concat license header to dev/prod build files.
 function rebundle() {
     return this.bundle()
         .on('error', handleErrors.handler)
diff --git a/src/core/index.js b/src/core/index.js
index 950977e..3954b6f 100644
--- a/src/core/index.js
+++ b/src/core/index.js
@@ -29,7 +29,7 @@
     Texture:                require('./textures/Texture'),
     BaseTexture:            require('./textures/BaseTexture'),
     RenderTexture:          require('./textures/RenderTexture'),
-    VideoTexture:           require('./textures/VideoTexture'),
+    VideoBaseTexture:       require('./textures/VideoBaseTexture'),
 
     // renderers - canvas
     CanvasRenderer:         require('./renderers/canvas/CanvasRenderer'),
diff --git a/src/core/renderers/canvas/utils/CanvasGraphics.js b/src/core/renderers/canvas/utils/CanvasGraphics.js
index 7c315e1..c7eaa2a 100644
--- a/src/core/renderers/canvas/utils/CanvasGraphics.js
+++ b/src/core/renderers/canvas/utils/CanvasGraphics.js
@@ -1,4 +1,4 @@
-var CONST = require('../../const');
+var CONST = require('../../../const');
 
 /**
  * A set of functions used by the canvas renderer to draw the primitive graphics data.

diff --git a/gulp/util/bundle.js b/gulp/util/bundle.js
index 0ff4e8d..7eecd98 100644
--- a/gulp/util/bundle.js
+++ b/gulp/util/bundle.js
@@ -9,6 +9,7 @@
     watchify    = require('watchify'),
     handleErrors = require('../util/handleErrors');
 
+// TODO - Concat license header to dev/prod build files.
 function rebundle() {
     return this.bundle()
         .on('error', handleErrors.handler)
diff --git a/src/core/index.js b/src/core/index.js
index 950977e..3954b6f 100644
--- a/src/core/index.js
+++ b/src/core/index.js
@@ -29,7 +29,7 @@
     Texture:                require('./textures/Texture'),
     BaseTexture:            require('./textures/BaseTexture'),
     RenderTexture:          require('./textures/RenderTexture'),
-    VideoTexture:           require('./textures/VideoTexture'),
+    VideoBaseTexture:       require('./textures/VideoBaseTexture'),
 
     // renderers - canvas
     CanvasRenderer:         require('./renderers/canvas/CanvasRenderer'),
diff --git a/src/core/renderers/canvas/utils/CanvasGraphics.js b/src/core/renderers/canvas/utils/CanvasGraphics.js
index 7c315e1..c7eaa2a 100644
--- a/src/core/renderers/canvas/utils/CanvasGraphics.js
+++ b/src/core/renderers/canvas/utils/CanvasGraphics.js
@@ -1,4 +1,4 @@
-var CONST = require('../../const');
+var CONST = require('../../../const');
 
 /**
  * A set of functions used by the canvas renderer to draw the primitive graphics data.
diff --git a/src/core/renderers/webgl/WebGLRenderer.js b/src/core/renderers/webgl/WebGLRenderer.js
index 5f7f1e4..bb0e76b 100644
--- a/src/core/renderers/webgl/WebGLRenderer.js
+++ b/src/core/renderers/webgl/WebGLRenderer.js
@@ -1,9 +1,9 @@
-var WebGLShaderManager = require('./utils/WebGLShaderManager'),
-    WebGLSpriteBatch = require('./utils/WebGLSpriteBatch'),
-    WebGLMaskManager = require('./utils/WebGLMaskManager'),
-    WebGLFilterManager = require('./utils/WebGLFilterManager'),
-    WebGLStencilManager = require('./utils/WebGLStencilManager'),
-    WebGLBlendModeManager = require('./utils/WebGLBlendModeManager'),
+var WebGLSpriteBatch = require('./utils/WebGLSpriteBatch'),
+    WebGLShaderManager = require('./managers/WebGLShaderManager'),
+    WebGLMaskManager = require('./managers/WebGLMaskManager'),
+    WebGLFilterManager = require('./managers/WebGLFilterManager'),
+    WebGLStencilManager = require('./managers/WebGLStencilManager'),
+    WebGLBlendModeManager = require('./managers/WebGLBlendModeManager'),
     math = require('../../math'),
     utils = require('../../utils'),
     CONST = require('../../const');

diff --git a/gulp/util/bundle.js b/gulp/util/bundle.js
index 0ff4e8d..7eecd98 100644
--- a/gulp/util/bundle.js
+++ b/gulp/util/bundle.js
@@ -9,6 +9,7 @@
     watchify    = require('watchify'),
     handleErrors = require('../util/handleErrors');
 
+// TODO - Concat license header to dev/prod build files.
 function rebundle() {
     return this.bundle()
         .on('error', handleErrors.handler)
diff --git a/src/core/index.js b/src/core/index.js
index 950977e..3954b6f 100644
--- a/src/core/index.js
+++ b/src/core/index.js
@@ -29,7 +29,7 @@
     Texture:                require('./textures/Texture'),
     BaseTexture:            require('./textures/BaseTexture'),
     RenderTexture:          require('./textures/RenderTexture'),
-    VideoTexture:           require('./textures/VideoTexture'),
+    VideoBaseTexture:       require('./textures/VideoBaseTexture'),
 
     // renderers - canvas
     CanvasRenderer:         require('./renderers/canvas/CanvasRenderer'),
diff --git a/src/core/renderers/canvas/utils/CanvasGraphics.js b/src/core/renderers/canvas/utils/CanvasGraphics.js
index 7c315e1..c7eaa2a 100644
--- a/src/core/renderers/canvas/utils/CanvasGraphics.js
+++ b/src/core/renderers/canvas/utils/CanvasGraphics.js
@@ -1,4 +1,4 @@
-var CONST = require('../../const');
+var CONST = require('../../../const');
 
 /**
  * A set of functions used by the canvas renderer to draw the primitive graphics data.
diff --git a/src/core/renderers/webgl/WebGLRenderer.js b/src/core/renderers/webgl/WebGLRenderer.js
index 5f7f1e4..bb0e76b 100644
--- a/src/core/renderers/webgl/WebGLRenderer.js
+++ b/src/core/renderers/webgl/WebGLRenderer.js
@@ -1,9 +1,9 @@
-var WebGLShaderManager = require('./utils/WebGLShaderManager'),
-    WebGLSpriteBatch = require('./utils/WebGLSpriteBatch'),
-    WebGLMaskManager = require('./utils/WebGLMaskManager'),
-    WebGLFilterManager = require('./utils/WebGLFilterManager'),
-    WebGLStencilManager = require('./utils/WebGLStencilManager'),
-    WebGLBlendModeManager = require('./utils/WebGLBlendModeManager'),
+var WebGLSpriteBatch = require('./utils/WebGLSpriteBatch'),
+    WebGLShaderManager = require('./managers/WebGLShaderManager'),
+    WebGLMaskManager = require('./managers/WebGLMaskManager'),
+    WebGLFilterManager = require('./managers/WebGLFilterManager'),
+    WebGLStencilManager = require('./managers/WebGLStencilManager'),
+    WebGLBlendModeManager = require('./managers/WebGLBlendModeManager'),
     math = require('../../math'),
     utils = require('../../utils'),
     CONST = require('../../const');
diff --git a/src/core/renderers/webgl/managers/WebGLFilterManager.js b/src/core/renderers/webgl/managers/WebGLFilterManager.js
index 7cae0e1..d35e7d7 100644
--- a/src/core/renderers/webgl/managers/WebGLFilterManager.js
+++ b/src/core/renderers/webgl/managers/WebGLFilterManager.js
@@ -1,5 +1,5 @@
 var WebGLManager = require('./WebGLManager'),
-    FilterTexture = require('./FilterTexture'),
+    FilterTexture = require('../utils/FilterTexture'),
     Shader = require('../shaders/Shader');
 
 /**

diff --git a/gulp/util/bundle.js b/gulp/util/bundle.js
index 0ff4e8d..7eecd98 100644
--- a/gulp/util/bundle.js
+++ b/gulp/util/bundle.js
@@ -9,6 +9,7 @@
     watchify    = require('watchify'),
     handleErrors = require('../util/handleErrors');
 
+// TODO - Concat license header to dev/prod build files.
 function rebundle() {
     return this.bundle()
         .on('error', handleErrors.handler)
diff --git a/src/core/index.js b/src/core/index.js
index 950977e..3954b6f 100644
--- a/src/core/index.js
+++ b/src/core/index.js
@@ -29,7 +29,7 @@
     Texture:                require('./textures/Texture'),
     BaseTexture:            require('./textures/BaseTexture'),
     RenderTexture:          require('./textures/RenderTexture'),
-    VideoTexture:           require('./textures/VideoTexture'),
+    VideoBaseTexture:       require('./textures/VideoBaseTexture'),
 
     // renderers - canvas
     CanvasRenderer:         require('./renderers/canvas/CanvasRenderer'),
diff --git a/src/core/renderers/canvas/utils/CanvasGraphics.js b/src/core/renderers/canvas/utils/CanvasGraphics.js
index 7c315e1..c7eaa2a 100644
--- a/src/core/renderers/canvas/utils/CanvasGraphics.js
+++ b/src/core/renderers/canvas/utils/CanvasGraphics.js
@@ -1,4 +1,4 @@
-var CONST = require('../../const');
+var CONST = require('../../../const');
 
 /**
  * A set of functions used by the canvas renderer to draw the primitive graphics data.
diff --git a/src/core/renderers/webgl/WebGLRenderer.js b/src/core/renderers/webgl/WebGLRenderer.js
index 5f7f1e4..bb0e76b 100644
--- a/src/core/renderers/webgl/WebGLRenderer.js
+++ b/src/core/renderers/webgl/WebGLRenderer.js
@@ -1,9 +1,9 @@
-var WebGLShaderManager = require('./utils/WebGLShaderManager'),
-    WebGLSpriteBatch = require('./utils/WebGLSpriteBatch'),
-    WebGLMaskManager = require('./utils/WebGLMaskManager'),
-    WebGLFilterManager = require('./utils/WebGLFilterManager'),
-    WebGLStencilManager = require('./utils/WebGLStencilManager'),
-    WebGLBlendModeManager = require('./utils/WebGLBlendModeManager'),
+var WebGLSpriteBatch = require('./utils/WebGLSpriteBatch'),
+    WebGLShaderManager = require('./managers/WebGLShaderManager'),
+    WebGLMaskManager = require('./managers/WebGLMaskManager'),
+    WebGLFilterManager = require('./managers/WebGLFilterManager'),
+    WebGLStencilManager = require('./managers/WebGLStencilManager'),
+    WebGLBlendModeManager = require('./managers/WebGLBlendModeManager'),
     math = require('../../math'),
     utils = require('../../utils'),
     CONST = require('../../const');
diff --git a/src/core/renderers/webgl/managers/WebGLFilterManager.js b/src/core/renderers/webgl/managers/WebGLFilterManager.js
index 7cae0e1..d35e7d7 100644
--- a/src/core/renderers/webgl/managers/WebGLFilterManager.js
+++ b/src/core/renderers/webgl/managers/WebGLFilterManager.js
@@ -1,5 +1,5 @@
 var WebGLManager = require('./WebGLManager'),
-    FilterTexture = require('./FilterTexture'),
+    FilterTexture = require('../utils/FilterTexture'),
     Shader = require('../shaders/Shader');
 
 /**
diff --git a/src/core/renderers/webgl/managers/WebGLMaskManager.js b/src/core/renderers/webgl/managers/WebGLMaskManager.js
index 6d46d85..2f90b64 100644
--- a/src/core/renderers/webgl/managers/WebGLMaskManager.js
+++ b/src/core/renderers/webgl/managers/WebGLMaskManager.js
@@ -1,5 +1,5 @@
 var WebGLManager = require('./WebGLManager'),
-    WebGLGraphics = require('./WebGLGraphics');
+    WebGLGraphics = require('../utils/WebGLGraphics');
 
 /**
  * @class