diff --git a/.gitignore b/.gitignore
index 751056522..9bc2dea3b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-build/min/
+build/
 node_modules/
 lib/*/*
 npm-debug.log
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index ebf8c0cd6..c6705a258 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,5 +12,4 @@ before_install:
 install: npm install
 
 before_script:
-  - rm -r dist
-  - grunt build:all
+  - grunt dist
diff --git a/Gruntfile.js b/Gruntfile.js
index d1c8cf558..397d443f6 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,9 +1,14 @@
+'use strict';
+
+var _ = require('lodash');
+
 module.exports = function(grunt) {
 
     require('time-grunt')(grunt);
     require('load-grunt-tasks')(grunt);
 
-    var banner = '/*! <%= pkg.title %> v<%= pkg.version %> - <%= pkg.description %>  <%= grunt.template.today("yyyy-mm-dd") %> \n\n\nThis Source Code Form is subject to the terms of the Mozilla Public\nLicense, v. 2.0. If a copy of the MPL was not distributed with this\nfile, You can obtain one at http://mozilla.org/MPL/2.0/.\n */\n';
+    var pkg = grunt.file.readJSON('package.json');
+    var banner = _.template('/*! <%= pkg.title %> v<%= pkg.version %> - <%= pkg.description %>  <%= grunt.template.today("yyyy-mm-dd") %> \n\n\nThis Source Code Form is subject to the terms of the Mozilla Public\nLicense, v. 2.0. If a copy of the MPL was not distributed with this\nfile, You can obtain one at http://mozilla.org/MPL/2.0/.\n */\n')({ pkg: pkg, grunt: grunt });
 
     // Ignore webpack in node v5, until webpack is fixed for that version.
     var ignoreWebpack = process.version.substr(0, 'v5'.length) === 'v5';
@@ -103,16 +108,16 @@ module.exports = function(grunt) {
 
     var config = {
 
-        pkg: grunt.file.readJSON('package.json'),
+        pkg: pkg,
 
         webpack: {
             joint: {
                 files: {
-                   './dist/joint.webpack-bundle.js' : './dist/joint.min.js'
+                   './build/joint.webpack-bundle.js' : './build/joint.min.js'
                 },
-                entry: './dist/joint.min.js',
+                entry: './build/joint.min.js',
                 output: {
-                    path: './dist/',
+                    path: './build/',
                     filename: 'joint.webpack-bundle.js',
                     library: 'joint'
                 },
@@ -127,7 +132,7 @@ module.exports = function(grunt) {
         browserify: {
             joint: {
                 files: {
-                    'dist/joint.browserify-bundle.js': 'dist/joint.min.js'
+                    'build/joint.browserify-bundle.js': 'build/joint.min.js'
                 },
                 options: {
                     browserifyOptions: {
@@ -136,94 +141,91 @@ module.exports = function(grunt) {
                 }
             }
         },
+        clean: {
+            dist: ['dist']
+        },
         concat: {
-            options: {
-                banner: banner,
-                process: {
-                    delimiters: 'square'
-                }
-            },
             geometry: {
                 files: {
-                    'dist/geometry.js': [].concat(
-                        ['build/wrappers/geometry.head.js'],
+                    'build/geometry.js': [].concat(
+                        ['wrappers/geometry.head.js'],
                         js.geometry,
-                        ['build/wrappers/geometry.foot.js']
+                        ['wrappers/geometry.foot.js']
                     ),
-                    'dist/geometry.min.js': [].concat(
-                        ['build/wrappers/geometry.head.js'],
+                    'build/geometry.min.js': [].concat(
+                        ['wrappers/geometry.head.js'],
                         ['build/min/geometry.min.js'],
-                        ['build/wrappers/geometry.foot.js']
+                        ['wrappers/geometry.foot.js']
                     )
                 }
             },
             vectorizer: {
                 files: {
-                    'dist/vectorizer.js': [].concat(
-                        ['build/wrappers/vectorizer.head.js'],
+                    'build/vectorizer.js': [].concat(
+                        ['wrappers/vectorizer.head.js'],
                         js.vectorizer,
-                        ['build/wrappers/vectorizer.foot.js']
+                        ['wrappers/vectorizer.foot.js']
                     ),
-                    'dist/vectorizer.min.js': [].concat(
-                        ['build/wrappers/vectorizer.head.js'],
+                    'build/vectorizer.min.js': [].concat(
+                        ['wrappers/vectorizer.head.js'],
                         ['build/min/vectorizer.min.js'],
-                        ['build/wrappers/vectorizer.foot.js']
+                        ['wrappers/vectorizer.foot.js']
                     )
                 }
             },
             joint: {
                 files: {
-                    'dist/joint.core.js': [].concat(
-                        ['build/wrappers/joint.head.js'],
+                    'build/joint.core.js': [].concat(
+                        ['wrappers/joint.head.js'],
                         js.geometry,
                         js.vectorizer,
                         js.core,
-                        ['build/wrappers/joint.foot.js']
+                        ['wrappers/joint.foot.js']
                     ),
-                    'dist/joint.core.min.js': [].concat(
-                        ['build/wrappers/joint.head.js'],
+                    'build/joint.core.min.js': [].concat(
+                        ['wrappers/joint.head.js'],
                         ['build/min/geometry.min.js'],
                         ['build/min/vectorizer.min.js'],
                         ['build/min/joint.min.js'],
-                        ['build/wrappers/joint.foot.js']
+                        ['wrappers/joint.foot.js']
                     ),
-                    'dist/joint.core.css': [].concat(
+                    'build/joint.core.css': [].concat(
                         css.core
                     ),
-                    'dist/joint.core.min.css': [].concat(
+                    'build/joint.core.min.css': [].concat(
                         ['build/min/joint.min.css']
                     ),
-                    'dist/joint.js': [].concat(
-                        ['build/wrappers/joint.head.js'],
+                    'build/joint.js': [].concat(
+                        ['wrappers/joint.head.js'],
                         js.geometry,
                         js.vectorizer,
                         js.core,
                         allJSPlugins(),
-                        ['build/wrappers/joint.foot.js']
+                        ['wrappers/joint.foot.js']
                     ),
-                    'dist/joint.min.js': [].concat(
-                        ['build/wrappers/joint.head.js'],
+                    'build/joint.min.js': [].concat(
+                        ['wrappers/joint.head.js'],
                         ['build/min/geometry.min.js'],
                         ['build/min/vectorizer.min.js'],
                         ['build/min/joint.min.js'],
                         allMinifiedJSPlugins(),
-                        ['build/wrappers/joint.foot.js']
+                        ['wrappers/joint.foot.js']
                     ),
-                    'dist/joint.css': [].concat(
+                    'build/joint.css': [].concat(
                         css.core,
                         allCSSPlugins()
                     ),
-                    'dist/joint.min.css': [].concat(
+                    'build/joint.min.css': [].concat(
                         ['build/min/joint.min.css'],
                         allMinifiedCSSPlugins()
                     ),
-                    'dist/joint.nowrap.js': [].concat(
+                    'build/joint.nowrap.js': [].concat(
                         js.geometry,
                         js.vectorizer,
                         js.core,
                         allJSPlugins()
                     ),
-                    'dist/joint.nowrap.min.js': [].concat(
+                    'build/joint.nowrap.min.js': [].concat(
                         ['build/min/geometry.min.js'],
                         ['build/min/vectorizer.min.js'],
                         ['build/min/joint.min.js'],
@@ -232,6 +234,26 @@ module.exports = function(grunt) {
                 }
             }
         },
+        copy: {
+            dist: {
+                files: [{
+                    nonull: true,
+                    expand: true,
+                    cwd: 'build/',
+                    src: [
+                        '*',
+                        '!min'
+                    ],
+                    dest: 'dist/'
+                }],
+                options: {
+                    process: function(content) {
+                        // Add JointJS banner to all distribution files.
+                        return banner + content;
+                    }
+                }
+            }
+        },
         cssmin: {
             joint: {
                 files: {
@@ -399,19 +421,19 @@ module.exports = function(grunt) {
     // Create targets for all the plugins.
     Object.keys(js.plugins).forEach(function(name) {
 
-        config.concat[name] = { files: {}, options: { banner: banner } };
+        config.concat[name] = { files: {} };
         config.uglify[name] = { files: {} };
 
         config.uglify[name].files['build/min/joint.' + name + '.min.js'] = js.plugins[name];
-        config.concat[name].files['dist/joint.' + name + '.js'] = js.plugins[name];
-        config.concat[name].files['dist/joint.' + name + '.min.js'] = ['build/min/joint.' + name + '.min.js'];
+        config.concat[name].files['build/joint.' + name + '.js'] = js.plugins[name];
+        config.concat[name].files['build/joint.' + name + '.min.js'] = ['build/min/joint.' + name + '.min.js'];
 
         if (css.plugins[name]) {
 
             config.cssmin[name] = { files: {} };
             config.cssmin[name].files['build/min/joint.' + name + '.min.css'] = css.plugins[name];
-            config.concat[name].files['dist/joint.' + name + '.css'] = css.plugins[name];
-            config.concat[name].files['dist/joint.' + name + '.min.css'] = ['build/min/joint.' + name + '.min.css'];
+            config.concat[name].files['build/joint.' + name + '.css'] = css.plugins[name];
+            config.concat[name].files['build/joint.' + name + '.min.css'] = ['build/min/joint.' + name + '.min.css'];
         }
     });
 
@@ -469,22 +491,34 @@ module.exports = function(grunt) {
     ]);
 
     grunt.registerTask('build', ['build:joint']);
+
     grunt.registerTask('build:bundles', ignoreWebpack ? [
         'newer:browserify'
     ] : [
         'newer:browserify',
         'newer:webpack'
     ]);
-    grunt.registerTask('build:all', ['build:joint', 'build:bundles']);
+
+    grunt.registerTask('build:all', [
+        'build:joint',
+        'build:bundles'
+    ]);
+
+    grunt.registerTask('dist', [
+        'build:all',
+        'clean:dist',
+        'copy:dist'
+    ]);
 
     grunt.registerTask('test:server', ['mochaTest:server']);
-    grunt.registerTask('test:client', ['qunit:all', 'jscs']);
-    grunt.registerTask('test', ['test:server', 'test:client']);
+    grunt.registerTask('test:client', ['qunit:all']);
+    grunt.registerTask('test:code-style', ['jscs']);
+    grunt.registerTask('test', ['test:server', 'test:client', 'test:code-style']);
 
     grunt.registerTask('bowerInstall', [
         'shell:bowerInstall:.'
     ]);
 
-    grunt.registerTask('install', ['bowerInstall']);
+    grunt.registerTask('install', ['bowerInstall', 'build:all']);
     grunt.registerTask('default', ['install', 'build', 'watch']);
 };
diff --git a/README.md b/README.md
index d2313dd9d..949253018 100644
--- a/README.md
+++ b/README.md
@@ -38,12 +38,43 @@ Only the good ones (those that support SVG):
 * IE 9+
 
 
-## Tests
+## Development Environment
 
-Before running tests, be sure to run a full build:
+If you want to work on JointJS locally, use the following guidelines to get started.
+
+### Dependencies
+
+Make sure you have the following dependencies installed on your system:
+* [Node.js](https://nodejs.org/)
+* [grunt-cli](http://gruntjs.com/using-the-cli)
+* [bower](http://bower.io/)
+* git
+
+### Setup
+
+Clone this git repository:
+```
+git clone https://github.com/clientIO/joint.git
+```
+
+Change into the joint directory:
+```
+cd joint
+```
+
+Run installation
 ```
-grunt build:all
+npm install
 ```
+This will install all npm and bower dependencies as well as run a full build.
+
+### Tests
+
+Before running tests, be sure to run the following:
+```
+npm install
+```
+This will ensure that you have all NPM and bower dependencies, and will run a full build.
 
 To run all tests:
 ```
@@ -62,11 +93,10 @@ grunt test:client
 
 To run code style checks:
 ```
-grunt jscs
+grunt test:code-style
 ```
 
-
-## Code Coverage
+### Code Coverage
 
 It is possible to generate code coverage reports using the existing qunit tests. For example, to output the coverage report in [lcov format](http://ltp.sourceforge.net/coverage/lcov/geninfo.1.php) for all unit tests:
 ```
@@ -78,6 +108,13 @@ By default, the output will be saved to `coverage.info` at the root of the proje
 grunt qunit:all_coverage --reporter lcov --output customfilename.info --coverage
 ```
 
+### Building Distribution Files
+
+The `dist` directory contains pre-built distribution files. To re-build them, run the following:
+```
+grunt dist
+```
+
 
 ## License
 
diff --git a/demo/3d.html b/demo/3d.html
index 5d83712b3..4ba2ca6bb 100644
--- a/demo/3d.html
+++ b/demo/3d.html
@@ -5,7 +5,7 @@
 
         <title>3d shapes experiment</title>
 
-        <link rel="stylesheet" type="text/css" href="../dist/joint.css" />
+        <link rel="stylesheet" type="text/css" href="../build/joint.css" />
 
         <style>
             #paper {
@@ -23,7 +23,7 @@
         <script src="../node_modules/lodash/index.js"></script>
         <script src="../node_modules/backbone/backbone.js"></script>
 
-        <script src="../dist/joint.js"></script>
+        <script src="../build/joint.js"></script>
 
         <script src="./3d.js"></script>
 
diff --git a/demo/basic.html b/demo/basic.html
index 41caa8760..8d3ffa7a6 100644
--- a/demo/basic.html
+++ b/demo/basic.html
@@ -5,7 +5,7 @@
 
         <title>Basic shapes</title>
 
-        <link rel="stylesheet" type="text/css" href="../dist/joint.css" />
+        <link rel="stylesheet" type="text/css" href="../build/joint.css" />
 
         <style>
             #paper {
@@ -49,7 +49,7 @@
         <script src="../node_modules/lodash/index.js"></script>
         <script src="../node_modules/backbone/backbone.js"></script>
 
-        <script src="../dist/joint.js"></script>
+        <script src="../build/joint.js"></script>
 
         <script src="./basic.js"></script>
 
diff --git a/demo/clipping.html b/demo/clipping.html
index 820bd68c8..d661ad8fa 100644
--- a/demo/clipping.html
+++ b/demo/clipping.html
@@ -5,7 +5,7 @@
 
         <title>SVG Clipping</title>
 
-        <link rel="stylesheet" type="text/css" href="../dist/joint.css" />
+        <link rel="stylesheet" type="text/css" href="../build/joint.css" />
 
         <style>
             #paper {
@@ -24,7 +24,7 @@
         <script src="../node_modules/lodash/index.js"></script>
         <script src="../node_modules/backbone/backbone.js"></script>
 
-        <script src="../dist/joint.js"></script>
+        <script src="../build/joint.js"></script>
         <script src="../plugins/shapes/joint.shapes.fsa.js"></script>
 
         <script src="./clipping.js"></script>
diff --git a/demo/filters.html b/demo/filters.html
index 4c8329fb9..831cc7a08 100644
--- a/demo/filters.html
+++ b/demo/filters.html
@@ -5,7 +5,7 @@
 
         <title>Filters</title>
 
-        <link rel="stylesheet" type="text/css" href="../dist/joint.css" />
+        <link rel="stylesheet" type="text/css" href="../build/joint.css" />
 
         <style>
             #paper {
@@ -24,7 +24,7 @@
         <script src="../node_modules/lodash/index.js"></script>
         <script src="../node_modules/backbone/backbone.js"></script>
 
-        <script src="../dist/joint.js"></script>
+        <script src="../build/joint.js"></script>
 
         <script src="./filters.js"></script>
 
diff --git a/demo/fsa.html b/demo/fsa.html
index 5837e19a8..ba1e1b34d 100644
--- a/demo/fsa.html
+++ b/demo/fsa.html
@@ -5,7 +5,7 @@
 
         <title>Basic shapes</title>
 
-        <link rel="stylesheet" type="text/css" href="../dist/joint.css" />
+        <link rel="stylesheet" type="text/css" href="../build/joint.css" />
 
         <style>
             #paper {
@@ -23,7 +23,7 @@
         <script src="../node_modules/lodash/index.js"></script>
         <script src="../node_modules/backbone/backbone.js"></script>
 
-        <script src="../dist/joint.js"></script>
+        <script src="../build/joint.js"></script>
         <script src="../plugins/shapes/joint.shapes.fsa.js"></script>
 
         <script src="./fsa.js"></script>
diff --git a/demo/gradients.html b/demo/gradients.html
index 504bcc28e..874014434 100644
--- a/demo/gradients.html
+++ b/demo/gradients.html
@@ -5,7 +5,7 @@
 
         <title>Gradients</title>
 
-        <link rel="stylesheet" type="text/css" href="../dist/joint.css" />
+        <link rel="stylesheet" type="text/css" href="../build/joint.css" />
 
         <style>
             #paper {
@@ -24,7 +24,7 @@
         <script src="../node_modules/lodash/index.js"></script>
         <script src="../node_modules/backbone/backbone.js"></script>
 
-        <script src="../dist/joint.js"></script>
+        <script src="../build/joint.js"></script>
 
         <script src="./gradients.js"></script>
 
diff --git a/demo/graph.html b/demo/graph.html
index 60dd15ff7..7ffcd6b86 100644
--- a/demo/graph.html
+++ b/demo/graph.html
@@ -3,7 +3,7 @@
     <head>
         <meta charset="utf8"/>
         <title>Graph</title>
-        <link rel="stylesheet" type="text/css" href="../dist/joint.css" />
+        <link rel="stylesheet" type="text/css" href="../build/joint.css" />
     </head>
     <body>
 
@@ -15,7 +15,7 @@
         <script src="../node_modules/lodash/index.js"></script>
         <script src="../node_modules/backbone/backbone.js"></script>
 
-        <script src="../dist/joint.js"></script>
+        <script src="../build/joint.js"></script>
 
         <script src="./graph.js"></script>
 
diff --git a/demo/htmlel.html b/demo/htmlel.html
index 4d01b1b81..7cb79f76d 100644
--- a/demo/htmlel.html
+++ b/demo/htmlel.html
@@ -5,7 +5,7 @@
 
         <title>HTML shapes</title>
 
-        <link rel="stylesheet" type="text/css" href="../dist/joint.css" />
+        <link rel="stylesheet" type="text/css" href="../build/joint.css" />
 
         <style>
             html, body { margin: 0; padding: 0 }
@@ -46,7 +46,7 @@
         <script src="../node_modules/lodash/index.js"></script>
         <script src="../node_modules/backbone/backbone.js"></script>
 
-        <script src="../dist/joint.js"></script>
+        <script src="../build/joint.js"></script>
 
         <script src="./htmlel.js"></script>
 
diff --git a/demo/hyperlinks.html b/demo/hyperlinks.html
index f190480bb..d06618e99 100644
--- a/demo/hyperlinks.html
+++ b/demo/hyperlinks.html
@@ -5,7 +5,7 @@
 
         <title>Hyperlinks inside JointJS elements</title>
 
-        <link rel="stylesheet" type="text/css" href="../dist/joint.css" />
+        <link rel="stylesheet" type="text/css" href="../build/joint.css" />
 
         <style>
             #paper {
@@ -23,7 +23,7 @@
         <script src="../node_modules/lodash/index.js"></script>
         <script src="../node_modules/backbone/backbone.js"></script>
 
-        <script src="../dist/joint.js"></script>
+        <script src="../build/joint.js"></script>
 
         <script src="./hyperlinks.js"></script>
 
diff --git a/demo/interpreter.html b/demo/interpreter.html
index 9fbd3198c..369a65da0 100644
--- a/demo/interpreter.html
+++ b/demo/interpreter.html
@@ -5,7 +5,7 @@
 
         <title>Interpreter</title>
 
-        <link rel="stylesheet" type="text/css" href="../dist/joint.css" />
+        <link rel="stylesheet" type="text/css" href="../build/joint.css" />
 
         <style>
             html, body { margin: 0; padding: 0 }
@@ -29,7 +29,7 @@
         <script src="../node_modules/lodash/index.js"></script>
         <script src="../node_modules/backbone/backbone.js"></script>
 
-        <script src="../dist/joint.js"></script>
+        <script src="../build/joint.js"></script>
 
         <script src="./interpreter.js"></script>
 
diff --git a/demo/iphone.html b/demo/iphone.html
index a07efdb4e..3fc9a3596 100644
--- a/demo/iphone.html
+++ b/demo/iphone.html
@@ -5,7 +5,7 @@
 
         <title>iPhone demo</title>
 
-        <link rel="stylesheet" type="text/css" href="../dist/joint.css" />
+        <link rel="stylesheet" type="text/css" href="../build/joint.css" />
 
         <style>
             #paper {
@@ -24,7 +24,7 @@
         <script src="../node_modules/lodash/index.js"></script>
         <script src="../node_modules/backbone/backbone.js"></script>
 
-        <script src="../dist/joint.js"></script>
+        <script src="../build/joint.js"></script>
 
         <script src="./iphone.js"></script>
 
diff --git a/demo/jump-over-connector.html b/demo/jump-over-connector.html
index 1b0372588..5ca66d810 100644
--- a/demo/jump-over-connector.html
+++ b/demo/jump-over-connector.html
@@ -6,7 +6,7 @@
 
         <title>Jump over connector demo</title>
 
-        <link rel="stylesheet" type="text/css" href="../dist/joint.css" />
+        <link rel="stylesheet" type="text/css" href="../build/joint.css" />
 
         <style>
             #paper {
@@ -26,7 +26,7 @@ <h3>Using graph.resetCells()</h3>
         <script src="../node_modules/lodash/index.js"></script>
         <script src="../node_modules/backbone/backbone.js"></script>
 
-        <script src="../dist/joint.js"></script>
+        <script src="../build/joint.js"></script>
 
         <script src="./jump-over-connector.js"></script>
 
diff --git a/demo/line-draw.html b/demo/line-draw.html
index 099d163b4..cf1582647 100644
--- a/demo/line-draw.html
+++ b/demo/line-draw.html
@@ -5,7 +5,7 @@
 
         <title>Basic shapes</title>
 
-        <link rel="stylesheet" type="text/css" href="../dist/joint.css" />
+        <link rel="stylesheet" type="text/css" href="../build/joint.css" />
 
         <style>
             #paper {
@@ -36,7 +36,7 @@ <h3>How to</h3>
         <script src="../node_modules/lodash/index.js"></script>
         <script src="../node_modules/backbone/backbone.js"></script>
 
-        <script src="../dist/joint.js"></script>
+        <script src="../build/joint.js"></script>
 
         <script src="./line-draw.js"></script>
 
diff --git a/demo/links-sticky-points.html b/demo/links-sticky-points.html
index 0b9af2189..68b5dbe84 100644
--- a/demo/links-sticky-points.html
+++ b/demo/links-sticky-points.html
@@ -6,7 +6,7 @@
 
         <title>Links sticky pionts demo</title>
 
-        <link rel="stylesheet" type="text/css" href="../dist/joint.css" />
+        <link rel="stylesheet" type="text/css" href="../build/joint.css" />
 
         <style>
             #paper {
@@ -25,7 +25,7 @@ <h1>Links sticky points</h1>
         <script src="../node_modules/lodash/index.js"></script>
         <script src="../node_modules/backbone/backbone.js"></script>
 
-        <script src="../dist/joint.js"></script>
+        <script src="../build/joint.js"></script>
 
         <script src="./links-sticky-points.js"></script>
 
diff --git a/demo/links.html b/demo/links.html
index 256ce1195..8407dc50f 100644
--- a/demo/links.html
+++ b/demo/links.html
@@ -6,7 +6,7 @@
 
         <title>Links demo</title>
 
-        <link rel="stylesheet" type="text/css" href="../dist/joint.css" />
+        <link rel="stylesheet" type="text/css" href="../build/joint.css" />
 
         <style>
             #paper {
@@ -26,7 +26,7 @@
         <script src="../node_modules/lodash/index.js"></script>
         <script src="../node_modules/backbone/backbone.js"></script>
 
-        <script src="../dist/joint.js"></script>
+        <script src="../build/joint.js"></script>
 
         <script src="./links.js"></script>
 
diff --git a/demo/meridium.html b/demo/meridium.html
index 7a0e4c113..2fdbb74ec 100644
--- a/demo/meridium.html
+++ b/demo/meridium.html
@@ -5,7 +5,7 @@
 
         <title>Meridium client shapes</title>
 
-        <link rel="stylesheet" type="text/css" href="../dist/joint.css" />
+        <link rel="stylesheet" type="text/css" href="../build/joint.css" />
 
         <style>
             #paper {
@@ -23,7 +23,7 @@
         <script src="../node_modules/lodash/index.js"></script>
         <script src="../node_modules/backbone/backbone.js"></script>
 
-        <script src="../dist/joint.js"></script>
+        <script src="../build/joint.js"></script>
         <script src="./meridium.js"></script>
 
     </body>
diff --git a/demo/nested-clone.html b/demo/nested-clone.html
index 1e3d33d15..d5b3d3d37 100644
--- a/demo/nested-clone.html
+++ b/demo/nested-clone.html
@@ -5,7 +5,7 @@
 
         <title>Embeds clone demo</title>
 
-        <link rel="stylesheet" type="text/css" href="../dist/joint.css" />
+        <link rel="stylesheet" type="text/css" href="../build/joint.css" />
 
         <style>
             .paper {
@@ -22,7 +22,7 @@
         <script src="../node_modules/lodash/index.js"></script>
         <script src="../node_modules/backbone/backbone.js"></script>
 
-        <script src="../dist/joint.js"></script>
+        <script src="../build/joint.js"></script>
 
         <script src="./nested-clone.js"></script>
     </body>
diff --git a/demo/nested.html b/demo/nested.html
index 7dee07fa4..f3ee3d761 100644
--- a/demo/nested.html
+++ b/demo/nested.html
@@ -5,7 +5,7 @@
 
         <title>Embeds demo</title>
 
-        <link rel="stylesheet" type="text/css" href="../dist/joint.css" />
+        <link rel="stylesheet" type="text/css" href="../build/joint.css" />
 
         <style>
             #paper {
@@ -24,7 +24,7 @@
         <script src="../node_modules/lodash/index.js"></script>
         <script src="../node_modules/backbone/backbone.js"></script>
 
-        <script src="../dist/joint.js"></script>
+        <script src="../build/joint.js"></script>
 
         <script src="./nested.js"></script>
 
diff --git a/demo/nested2.html b/demo/nested2.html
index bad08e296..6ee21f259 100644
--- a/demo/nested2.html
+++ b/demo/nested2.html
@@ -5,7 +5,7 @@
 
         <title>Embeds demo</title>
 
-        <link rel="stylesheet" type="text/css" href="../dist/joint.css" />
+        <link rel="stylesheet" type="text/css" href="../build/joint.css" />
 
         <style>
             #paper {
@@ -26,7 +26,7 @@
         <script src="../node_modules/lodash/index.js"></script>
         <script src="../node_modules/backbone/backbone.js"></script>
 
-        <script src="../dist/joint.js"></script>
+        <script src="../build/joint.js"></script>
 
         <script src="./nested2.js"></script>
 
diff --git a/demo/paper/index.html b/demo/paper/index.html
index 472e9386c..e9caf08ba 100644
--- a/demo/paper/index.html
+++ b/demo/paper/index.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf8"/>
     <title>Paper Demo</title>
-    <link rel="stylesheet" type="text/css" href="../../dist/joint.css" />
+    <link rel="stylesheet" type="text/css" href="../../build/joint.css" />
     <link rel="stylesheet" type="text/css" href="./paper.css">
   </head>
   <body>
@@ -161,7 +161,7 @@
     <script src="../../node_modules/lodash/index.js"></script>
     <script src="../../node_modules/backbone/backbone.js"></script>
 
-    <script src="../../dist/joint.js"></script>
+    <script src="../../build/joint.js"></script>
 
     <script src="./paper.js"></script>
   </body>
diff --git a/demo/performance.html b/demo/performance.html
index 7acb09b79..90fc8ce97 100644
--- a/demo/performance.html
+++ b/demo/performance.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="UTF-8">
     <title>Joint JS - Performance 1000x1000</title>
-    <link rel="stylesheet" type="text/css" href="../dist/joint.css" />
+    <link rel="stylesheet" type="text/css" href="../build/joint.css" />
   </head>
   <body>
     <style>
@@ -26,7 +26,7 @@
     <script src="../node_modules/jquery/dist/jquery.js"></script>
     <script src="../node_modules/lodash/index.js"></script>
     <script src="../node_modules/backbone/backbone.js"></script>
-    <script src="../dist/joint.js"></script>
+    <script src="../build/joint.js"></script>
     <script src="./performance.js"></script>
   </body>
 </html>
diff --git a/demo/pipes.html b/demo/pipes.html
index 484df64ce..cdad4152e 100644
--- a/demo/pipes.html
+++ b/demo/pipes.html
@@ -6,7 +6,7 @@
 
     <title>Pipes - link patterns</title>
 
-    <link rel="stylesheet" type="text/css" href="../dist/joint.css" />
+    <link rel="stylesheet" type="text/css" href="../build/joint.css" />
 
     <style>
       #paper {
@@ -32,7 +32,7 @@
     <script src="../node_modules/lodash/index.js"></script>
     <script src="../node_modules/backbone/backbone.js"></script>
 
-    <script src="../dist/joint.js"></script>
+    <script src="../build/joint.js"></script>
 
     <script src="./pipes.js"></script>
 
diff --git a/demo/ports.html b/demo/ports.html
index 469db102d..77214e332 100644
--- a/demo/ports.html
+++ b/demo/ports.html
@@ -5,7 +5,7 @@
 
         <title>Ports</title>
 
-        <link rel="stylesheet" type="text/css" href="../dist/joint.css" />
+        <link rel="stylesheet" type="text/css" href="../build/joint.css" />
 
         <style>
             #paper {
@@ -23,7 +23,7 @@
         <script src="../node_modules/lodash/index.js"></script>
         <script src="../node_modules/backbone/backbone.js"></script>
 
-        <script src="../dist/joint.js"></script>
+        <script src="../build/joint.js"></script>
         <script src="./ports.js"></script>
 
     </body>
diff --git a/demo/requirejs/index.html b/demo/requirejs/index.html
index b11470c2d..9dbab105d 100644
--- a/demo/requirejs/index.html
+++ b/demo/requirejs/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <link rel="stylesheet" href="../../dist/joint.css" />
+    <link rel="stylesheet" href="../../build/joint.css" />
     <style>
       #app { position: relative; }
     </style>
diff --git a/demo/requirejs/main.js b/demo/requirejs/main.js
index 07c9cef53..147951e22 100644
--- a/demo/requirejs/main.js
+++ b/demo/requirejs/main.js
@@ -14,7 +14,7 @@ require.config({
     }
 });
 
-require(['jquery', 'dist/joint'], function($, joint) {
+require(['jquery', 'build/joint'], function($, joint) {
 
     var $paper = $('<div/>').appendTo($('#app'));
 
diff --git a/demo/responsive.html b/demo/responsive.html
index 02f52aaf9..72d3ef35d 100644
--- a/demo/responsive.html
+++ b/demo/responsive.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="UTF-8"/>
     <title>JointJS Hello World!</title>
-    <link rel="stylesheet" href="../dist/joint.css" />
+    <link rel="stylesheet" href="../build/joint.css" />
     <style>
       #myholder {
          display: inline-block;
@@ -21,7 +21,7 @@
     <script src="../node_modules/lodash/index.js"></script>
     <script src="../node_modules/backbone/backbone.js"></script>
 
-    <script src="../dist/joint.js"></script>
+    <script src="../build/joint.js"></script>
 
     <script>
       var graph = new joint.dia.Graph;
diff --git a/demo/router-orthogonal.html b/demo/router-orthogonal.html
index 6a50734db..f2193b292 100644
--- a/demo/router-orthogonal.html
+++ b/demo/router-orthogonal.html
@@ -4,7 +4,7 @@
     <meta charset="utf8"/>
     <meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=no"/>
     <title>Orthogonal router demo</title>
-    <link rel="stylesheet" type="text/css" href="../dist/joint.css" />
+    <link rel="stylesheet" type="text/css" href="../build/joint.css" />
     <style>#paper { width: 800px; height: 800px; border: 1px solid gray; }</style>
   </head>
   <body>
@@ -15,7 +15,7 @@
     <script src="../node_modules/lodash/index.js"></script>
     <script src="../node_modules/backbone/backbone.js"></script>
 
-    <script src="../dist/joint.js"></script>
+    <script src="../build/joint.js"></script>
 
     <script src="./router-orthogonal.js"></script>
   </body>
diff --git a/demo/routing.html b/demo/routing.html
index 29909ada8..0adec6b3a 100644
--- a/demo/routing.html
+++ b/demo/routing.html
@@ -6,7 +6,7 @@
 
         <title>Smart Routing demo</title>
 
-        <link rel="stylesheet" type="text/css" href="../dist/joint.css" />
+        <link rel="stylesheet" type="text/css" href="../build/joint.css" />
 
         <style>
             #paper {
@@ -55,7 +55,7 @@
         <script src="../node_modules/lodash/index.js"></script>
         <script src="../node_modules/backbone/backbone.js"></script>
 
-        <script src="../dist/joint.js"></script>
+        <script src="../build/joint.js"></script>
 
         <script src="./routing.js"></script>
 
diff --git a/demo/sketched.html b/demo/sketched.html
index 00e262fff..38b31c21c 100644
--- a/demo/sketched.html
+++ b/demo/sketched.html
@@ -5,7 +5,7 @@
 
         <title>Hand-drawn shapes</title>
 
-        <link rel="stylesheet" type="text/css" href="../dist/joint.css" />
+        <link rel="stylesheet" type="text/css" href="../build/joint.css" />
 
         <style>
             #paper {
@@ -24,7 +24,7 @@
         <script src="../node_modules/lodash/index.js"></script>
         <script src="../node_modules/backbone/backbone.js"></script>
 
-        <script src="../dist/joint.js"></script>
+        <script src="../build/joint.js"></script>
 
         <script src="./sketched.js"></script>
 
diff --git a/demo/solar.html b/demo/solar.html
index 5f32b7924..886f3a1eb 100644
--- a/demo/solar.html
+++ b/demo/solar.html
@@ -5,7 +5,7 @@
 
         <title>Interactive solar system</title>
 
-        <link rel="stylesheet" type="text/css" href="../dist/joint.css" />
+        <link rel="stylesheet" type="text/css" href="../build/joint.css" />
 
         <style>
             #paper {
@@ -39,7 +39,7 @@
         <script src="../node_modules/lodash/index.js"></script>
         <script src="../node_modules/backbone/backbone.js"></script>
 
-        <script src="../dist/joint.js"></script>
+        <script src="../build/joint.js"></script>
 
         <script src="./solar.js"></script>
     </body>
diff --git a/demo/textpath.html b/demo/textpath.html
index 8b2cf415a..859545227 100644
--- a/demo/textpath.html
+++ b/demo/textpath.html
@@ -5,7 +5,7 @@
 
         <title>TextPath</title>
 
-        <link rel="stylesheet" type="text/css" href="../dist/joint.css" />
+        <link rel="stylesheet" type="text/css" href="../build/joint.css" />
 
         <style>
             #paper {
@@ -29,7 +29,7 @@
         <script src="../node_modules/lodash/index.js"></script>
         <script src="../node_modules/backbone/backbone.js"></script>
 
-        <script src="../dist/joint.js"></script>
+        <script src="../build/joint.js"></script>
 
         <script src="./textpath.js"></script>
 
diff --git a/demo/transition.html b/demo/transition.html
index 576430a69..f66c688fd 100644
--- a/demo/transition.html
+++ b/demo/transition.html
@@ -5,7 +5,7 @@
 
         <title>Transition</title>
 
-        <link rel="stylesheet" type="text/css" href="../dist/joint.css" />
+        <link rel="stylesheet" type="text/css" href="../build/joint.css" />
 
         <style>
             #paper {
@@ -24,7 +24,7 @@
         <script src="../node_modules/lodash/index.js"></script>
         <script src="../node_modules/backbone/backbone.js"></script>
 
-        <script src="../dist/joint.js"></script>
+        <script src="../build/joint.js"></script>
 
         <script src="./transition.js"></script>
 
diff --git a/demo/transition2.html b/demo/transition2.html
index bd97335a4..80b0b2f03 100644
--- a/demo/transition2.html
+++ b/demo/transition2.html
@@ -5,7 +5,7 @@
 
         <title>Transition 2</title>
 
-        <link rel="stylesheet" type="text/css" href="../dist/joint.css" />
+        <link rel="stylesheet" type="text/css" href="../build/joint.css" />
 
         <style>
             #paper {
@@ -30,7 +30,7 @@
         <script src="../node_modules/lodash/index.js"></script>
         <script src="../node_modules/backbone/backbone.js"></script>
 
-        <script src="../dist/joint.js"></script>
+        <script src="../build/joint.js"></script>
 
         <script src="./transition2.js"></script>
 
diff --git a/demo/vectorizer.html b/demo/vectorizer.html
index 7d6963287..1218d087e 100644
--- a/demo/vectorizer.html
+++ b/demo/vectorizer.html
@@ -15,9 +15,9 @@
     <body>
 
         <!-- Dependencies: -->
-        <script src="../dist/geometry.js"></script>
+        <script src="../build/geometry.js"></script>
 
-        <script src="../dist/vectorizer.js"></script>
+        <script src="../build/vectorizer.js"></script>
 
         <script src="./vectorizer.js"></script>
 
diff --git a/index.js b/index.js
index b274f99bb..238d47971 100644
--- a/index.js
+++ b/index.js
@@ -1 +1 @@
-module.exports = require('./dist/joint');
+module.exports = require('./build/joint');
diff --git a/package.json b/package.json
index a73fab063..b1418ec79 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,9 @@
     "express": "4.13.3",
     "grunt": "0.4.5",
     "grunt-browserify": "4.0.1",
+    "grunt-contrib-clean": "0.7.0",
     "grunt-contrib-concat": "0.5.1",
+    "grunt-contrib-copy": "0.8.2",
     "grunt-contrib-cssmin": "0.14.0",
     "grunt-contrib-qunit": "0.7.0",
     "grunt-contrib-uglify": "0.11.0",
diff --git a/test/geometry/index.html b/test/geometry/index.html
index e2311ed40..72b9d858e 100644
--- a/test/geometry/index.html
+++ b/test/geometry/index.html
@@ -12,10 +12,9 @@
 
         <script src="../../lib/qunit/qunit/qunit.js"></script>
         <script src="../../lib/blanket/dist/qunit/blanket.js"></script>
-        <script src="../../node_modules/sinon/pkg/sinon.js"></script>
         <script src="../coverage.js"></script>
 
-        <script data-cover src="../../dist/geometry.js"></script>
+        <script data-cover src="../../build/geometry.js"></script>
 
         <script src="./geometry.js"></script>
 
diff --git a/test/geometry/require.js b/test/geometry/require.js
index 17c4c9644..c5ac75dee 100644
--- a/test/geometry/require.js
+++ b/test/geometry/require.js
@@ -13,6 +13,8 @@ require(['qunit'], function(QUnit) {
     (function() {
 
         var buildFiles = [
+            'build/geometry',
+            'build/geometry.min',
             'dist/geometry',
             'dist/geometry.min'
         ];
diff --git a/test/jointjs/browserify.html b/test/jointjs/browserify.html
index 71c9dd192..ce60e9866 100644
--- a/test/jointjs/browserify.html
+++ b/test/jointjs/browserify.html
@@ -4,7 +4,6 @@
 
         <title>JointJS | Browserify | test suite</title>
         <link rel="stylesheet" href="../../lib/qunit/qunit/qunit.css">
-        <link rel="stylesheet" href="../../dist/joint.css">
     </head>
     <body>
 
@@ -12,7 +11,7 @@
         <div id="qunit-fixture"></div>
 
         <script src="../../lib/qunit/qunit/qunit.js"></script>
-        <script src="../../dist/joint.browserify-bundle.js"></script>
+        <script src="../../build/joint.browserify-bundle.js"></script>
         <script src="./browserify.js"></script>
 
     </body>
diff --git a/test/jointjs/coverage.html b/test/jointjs/coverage.html
index 15a91b9e3..82d6ecae5 100644
--- a/test/jointjs/coverage.html
+++ b/test/jointjs/coverage.html
@@ -4,7 +4,7 @@
 
         <title>JointJS test suite</title>
         <link rel="stylesheet" href="../../lib/qunit/qunit/qunit.css">
-        <link rel="stylesheet" href="../../dist/joint.css">
+        <link rel="stylesheet" href="../../build/joint.css">
     </head>
     <body>
 
@@ -24,8 +24,8 @@
         <script src="../../node_modules/backbone/backbone.js"></script>
         <script src="../../node_modules/graphlib/dist/graphlib.core.js"></script>
         <script src="../../node_modules/dagre/dist/dagre.core.js"></script>
-        <script src="../../dist/geometry.js"></script>
-        <script src="../../dist/vectorizer.js"></script>
+        <script src="../../build/geometry.js"></script>
+        <script src="../../build/vectorizer.js"></script>
 
         <script data-cover src="../../src/core.js"></script>
         <script data-cover src="../../src/joint.mvc.view.js"></script>
diff --git a/test/jointjs/index.html b/test/jointjs/index.html
index 9d24e1d43..01b1816e6 100644
--- a/test/jointjs/index.html
+++ b/test/jointjs/index.html
@@ -4,7 +4,7 @@
 
         <title>JointJS test suite</title>
         <link rel="stylesheet" href="../../lib/qunit/qunit/qunit.css">
-        <link rel="stylesheet" href="../../dist/joint.css">
+        <link rel="stylesheet" href="../../build/joint.css">
     </head>
     <body>
 
@@ -24,7 +24,7 @@
         <script src="../../node_modules/graphlib/dist/graphlib.core.js"></script>
         <script src="../../node_modules/dagre/dist/dagre.core.js"></script>
 
-        <script src="../../dist/joint.js"></script>
+        <script src="../../build/joint.js"></script>
 
         <script src="./mvc.view.js"></script>
         <script src="./core.js"></script>
diff --git a/test/jointjs/require.js b/test/jointjs/require.js
index 32acb6145..ad15e5433 100644
--- a/test/jointjs/require.js
+++ b/test/jointjs/require.js
@@ -22,6 +22,10 @@ require(['qunit'], function(QUnit) {
     QUnit.module('RequireJS');
 
     var buildFiles = [
+        'build/joint.core',
+        'build/joint.core.min',
+        'build/joint',
+        'build/joint.min',
         'dist/joint.core',
         'dist/joint.core.min',
         'dist/joint',
diff --git a/test/jointjs/requirejs.html b/test/jointjs/requirejs.html
index 5f308ce8e..c8179331b 100644
--- a/test/jointjs/requirejs.html
+++ b/test/jointjs/requirejs.html
@@ -4,7 +4,7 @@
 
         <title>JointJS | require.js | test suite</title>
         <link rel="stylesheet" href="../../lib/qunit/qunit/qunit.css">
-        <link rel="stylesheet" href="../../dist/joint.css">
+        <link rel="stylesheet" href="../../build/joint.css">
     </head>
     <body>
 
diff --git a/test/jointjs/webpack.html b/test/jointjs/webpack.html
index dabe24cf7..28fd2334d 100644
--- a/test/jointjs/webpack.html
+++ b/test/jointjs/webpack.html
@@ -4,7 +4,6 @@
 
         <title>JointJS | Webpack | test suite</title>
         <link rel="stylesheet" href="../../lib/qunit/qunit/qunit.css">
-        <link rel="stylesheet" href="../../dist/joint.css">
     </head>
     <body>
 
@@ -12,7 +11,7 @@
         <div id="qunit-fixture"></div>
 
         <script src="../../lib/qunit/qunit/qunit.js"></script>
-        <script src="../../dist/joint.webpack-bundle.js"></script>
+        <script src="../../build/joint.webpack-bundle.js"></script>
         <script src="./webpack.js"></script>
 
     </body>
diff --git a/test/vectorizer/index.html b/test/vectorizer/index.html
index 312928f70..2a63c8525 100644
--- a/test/vectorizer/index.html
+++ b/test/vectorizer/index.html
@@ -33,13 +33,12 @@
 
         <script src="../../lib/qunit/qunit/qunit.js"></script>
         <script src="../../lib/blanket/dist/qunit/blanket.js"></script>
-        <script src="../../node_modules/sinon/pkg/sinon.js"></script>
         <script src="../coverage.js"></script>
 
         <!-- Dependencies:  -->
-        <script src="../../dist/geometry.js"></script>
+        <script src="../../build/geometry.js"></script>
 
-        <script data-cover src="../../dist/vectorizer.js"></script>
+        <script data-cover src="../../build/vectorizer.js"></script>
 
         <script src="./vectorizer.js"></script>
 
diff --git a/test/vectorizer/require.js b/test/vectorizer/require.js
index 926d68894..1e8a86084 100644
--- a/test/vectorizer/require.js
+++ b/test/vectorizer/require.js
@@ -14,6 +14,8 @@ require(['qunit'], function(QUnit) {
     QUnit.module('RequireJS');
 
     var buildFiles = [
+        'build/vectorizer',
+        'build/vectorizer.min',
         'dist/vectorizer',
         'dist/vectorizer.min'
     ];
diff --git a/build/wrappers/geometry.foot.js b/wrappers/geometry.foot.js
similarity index 100%
rename from build/wrappers/geometry.foot.js
rename to wrappers/geometry.foot.js
diff --git a/build/wrappers/geometry.head.js b/wrappers/geometry.head.js
similarity index 100%
rename from build/wrappers/geometry.head.js
rename to wrappers/geometry.head.js
diff --git a/build/wrappers/joint.foot.js b/wrappers/joint.foot.js
similarity index 100%
rename from build/wrappers/joint.foot.js
rename to wrappers/joint.foot.js
diff --git a/build/wrappers/joint.head.js b/wrappers/joint.head.js
similarity index 100%
rename from build/wrappers/joint.head.js
rename to wrappers/joint.head.js
diff --git a/build/wrappers/vectorizer.foot.js b/wrappers/vectorizer.foot.js
similarity index 100%
rename from build/wrappers/vectorizer.foot.js
rename to wrappers/vectorizer.foot.js
diff --git a/build/wrappers/vectorizer.head.js b/wrappers/vectorizer.head.js
similarity index 100%
rename from build/wrappers/vectorizer.head.js
rename to wrappers/vectorizer.head.js