diff --git a/.gitignore b/.gitignore
index 44856c2d..241daa19 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,13 @@
 /node_modules
 npm-*
 
+# Testing
+/.nyc_output
+/coverage
+
+# IDEA
+/.idea
+
 # Build
-/render*.js
-/dist.js
-/playground/render.js
+/dist
+/playground/scratch-render.js
diff --git a/package.json b/package.json
index b15db152..6fa411ba 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
     "type": "git",
     "url": "git+ssh://git@github.com/LLK/scratch-render.git"
   },
-  "main": "./dist.js",
+  "main": "./dist/node/scratch-render.js",
   "scripts": {
     "build": "./node_modules/.bin/webpack --progress --colors",
     "lint": "./node_modules/.bin/eslint .",
diff --git a/playground/index.html b/playground/index.html
index 19d0bac1..ad94720e 100644
--- a/playground/index.html
+++ b/playground/index.html
@@ -31,7 +31,7 @@
     Min: <input id="fudgeMin" type="number" onchange="onFudgeMinChanged(this.value)">
     Max: <input id="fudgeMax" type="number" onchange="onFudgeMaxChanged(this.value)">
 </p>
-<script src="render.js"></script>
+<script src="scratch-render.js"></script>
 <script>
     var canvas = document.getElementById('scratch-stage');
     var fudge = 90;
diff --git a/src/index-web.js b/src/index-web.js
index 35711da0..0d76145c 100644
--- a/src/index-web.js
+++ b/src/index-web.js
@@ -1,8 +1,8 @@
+/* eslint-env browser */
 require('babel-polyfill');
 
-var RenderWebGL = require('./RenderWebGL');
-
 /**
- * Export for use in a web page
+ * Export for use in a web page.
+ * @type {RenderWebGL}
  */
-window.RenderWebGL = RenderWebGL;
+window.RenderWebGL = require('./index');
diff --git a/src/index.js b/src/index.js
index 2a0292f1..27a14891 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,6 +1,7 @@
-var RenderWebGL = require('./RenderWebGL');
+const RenderWebGL = require('./RenderWebGL');
 
 /**
- * Export for NPM / Node.js
+ * Export for NPM & Node.js
+ * @type {RenderWebGL}
  */
 module.exports = RenderWebGL;
diff --git a/webpack.config.js b/webpack.config.js
index 34922e97..74a4dcc8 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,7 +1,7 @@
-var path = require('path');
-var webpack = require('webpack');
+const path = require('path');
+const webpack = require('webpack');
 
-var base = {
+const base = {
     devServer: {
         contentBase: path.resolve(__dirname, 'playground'),
         host: '0.0.0.0',
@@ -49,10 +49,11 @@ var base = {
 module.exports = [
     // Web-compatible
     Object.assign({}, base, {
+        target: 'web',
         entry: {
-            'render': './src/index-web.js',
-            'playground/render': './src/index-web.js',
-            'render.min': './src/index-web.js'
+            'dist/web/scratch-render': './src/index-web.js',
+            'dist/web/scratch-render.min': './src/index-web.js',
+            'playground/scratch-render': './src/index-web.js'
         },
         output: {
             path: __dirname,
@@ -61,14 +62,15 @@ module.exports = [
     }),
     // Webpack-compatible
     Object.assign({}, base, {
+        target: 'node',
         entry: {
-            'render': './src/index.js'
+            'scratch-render': './src/index.js'
         },
         output: {
             library: 'ScratchRender',
             libraryTarget: 'commonjs2',
             path: __dirname,
-            filename: 'dist.js'
+            filename: 'dist/node/[name].js'
         }
     })
 ];