diff --git a/.gitignore b/.gitignore
index 51324e9f7..54d12d0f2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,5 @@ nodes/node-red-nodes/
 /coverage
 .config.json
 .sessions.json
-
+public
+.dist
diff --git a/.travis.yml b/.travis.yml
index 7da65ca45..82148451c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,6 @@ before_install:
   - npm install -g npm@~1.4.18
 node_js:
   - "0.10"
-  - "0.8"
 script:
   - istanbul cover ./node_modules/.bin/grunt --report lcovonly && istanbul report text && ( cat coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js || true ) && rm -rf coverage
 before_script:
diff --git a/Gruntfile.js b/Gruntfile.js
index 0e68c900a..db93ad48d 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2013, 2014 IBM Corp.
+ * Copyright 2013, 2015 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,82 +14,279 @@
  * limitations under the License.
  **/
 
+var path = require("path");
+ 
 module.exports = function(grunt) {
     
-    // Project configuration.
     grunt.initConfig({
-            pkg: grunt.file.readJSON('package.json'),
-            simplemocha: {
-                options: {
-                    globals: ['expect'],
-                    timeout: 3000,
-                    ignoreLeaks: false,
-                    ui: 'bdd',
-                    reporter: 'spec'
-                },
-                all: { src: ['test/**/*_spec.js'] },
-                core: { src: ["test/_spec.js","test/red/**/*_spec.js"]},
-                nodes: { src: ["test/nodes/**/*_spec.js"]}
+        pkg: grunt.file.readJSON('package.json'),
+        paths: {
+            dist: ".dist"
+        },
+        simplemocha: {
+            options: {
+                globals: ['expect'],
+                timeout: 3000,
+                ignoreLeaks: false,
+                ui: 'bdd',
+                reporter: 'spec'
             },
-            jshint: {
-                options: {
-                    // http://www.jshint.com/docs/options/
-                    "asi": true,      // allow missing semicolons
-                    "curly": true,    // require braces
-                    "eqnull": true,   // ignore ==null
-                    "forin": true,    // require property filtering in "for in" loops
-                    "immed": true,    // require immediate functions to be wrapped in ( )
-                    "nonbsp": true,   // warn on unexpected whitespace breaking chars
-                    //"strict": true, // commented out for now as it causes 100s of warnings, but want to get there eventually
-                    "loopfunc": true, // allow functions to be defined in loops
-                    "sub": true       // don't warn that foo['bar'] should be written as foo.bar
-                },
-                all: [
-                    'Gruntfile.js',
-                    'red.js',
-                    'red/**/*.js',
-                    'nodes/**/*.js',
-                    'public/red/**/*.js'
-                ],
-                
-                core: {
-                    files: {
-                        src: [
-                            'Gruntfile.js',
-                            'red.js',
-                            'red/**/*.js'
-                        ]
-                    }
-                },
-                nodes: {
-                    files: {
-                        src: [ 'nodes/**/*.js' ]
-                    }
-                },
-                editor: {
-                    files: {
-                        src: [ 'public/red/**/*.js' ]
-                    }
-                },
-                tests: {
-                    files: {
-                        src: ['test/**/*.js']
-                    },
-                    options: {
-                        "expr": true
-                    }
+            all: { src: ['test/**/*_spec.js'] },
+            core: { src: ["test/_spec.js","test/red/**/*_spec.js"]},
+            nodes: { src: ["test/nodes/**/*_spec.js"]}
+        },
+        jshint: {
+            options: {
+                // http://www.jshint.com/docs/options/
+                "asi": true,      // allow missing semicolons
+                "curly": true,    // require braces
+                "eqnull": true,   // ignore ==null
+                "forin": true,    // require property filtering in "for in" loops
+                "immed": true,    // require immediate functions to be wrapped in ( )
+                "nonbsp": true,   // warn on unexpected whitespace breaking chars
+                //"strict": true, // commented out for now as it causes 100s of warnings, but want to get there eventually
+                "loopfunc": true, // allow functions to be defined in loops
+                "sub": true       // don't warn that foo['bar'] should be written as foo.bar
+            },
+            all: [
+                'Gruntfile.js',
+                'red.js',
+                'red/**/*.js',
+                'nodes/**/*.js',
+                'editor/js/**/*.js'
+            ],
+            
+            core: {
+                files: {
+                    src: [
+                        'Gruntfile.js',
+                        'red.js',
+                        'red/**/*.js'
+                    ]
+                }
+            },
+            nodes: {
+                files: {
+                    src: [ 'nodes/**/*.js' ]
+                }
+            },
+            editor: {
+                files: {
+                    src: [ 'editor/js/**/*.js' ]
+                }
+            },
+            tests: {
+                files: {
+                    src: ['test/**/*.js']
+                },
+                options: {
+                    "expr": true
                 }
-                
             }
+        },
+        concat: {
+            options: {
+                separator: ";",
+            },
+            build: {
+              src: [
+                  // Ensure editor source files are concatenated in
+                  // the right order
+                  "editor/js/main.js",
+                  "editor/js/settings.js",
+                  "editor/js/user.js",
+                  "editor/js/comms.js",
+                  "editor/js/ui/state.js",
+                  "editor/js/nodes.js",
+                  "editor/js/history.js",
+                  "editor/js/validators.js",
+                  "editor/js/ui/deploy.js",
+                  "editor/js/ui/menu.js",
+                  "editor/js/ui/keyboard.js",
+                  "editor/js/ui/tabs.js",
+                  "editor/js/ui/workspaces.js",
+                  "editor/js/ui/view.js",
+                  "editor/js/ui/sidebar.js",
+                  "editor/js/ui/palette.js",
+                  "editor/js/ui/tab-info.js",
+                  "editor/js/ui/tab-config.js",
+                  "editor/js/ui/editor.js",
+                  "editor/js/ui/clipboard.js",
+                  "editor/js/ui/library.js",
+                  "editor/js/ui/notifications.js",
+                  "editor/js/ui/subflow.js",
+                  "editor/js/ui/touch/radialMenu.js"
+              ],
+              dest: "public/red/red.js"
+            }
+        },
+        uglify: {
+            build: {
+                files: {
+                    'public/red/red.min.js': 'public/red/red.js'
+                }
+            }
+        },
+        sass: {
+            build: {
+                options: {
+                    outputStyle: 'compressed'
+                },
+                files: [{
+                    dest: 'public/red/style.min.css',
+                    src: 'editor/sass/style.scss'
+                }]
+            }
+        },
+        clean: {
+            build: {
+                src: [
+                    "public/red",
+                    "public/index.html",
+                    "public/favicon.ico",
+                    "public/icons",
+                    "public/vendor"
+                ]
+            },
+            release: {
+                src: [
+                    '<%= paths.dist %>'
+                ]
+            }
+        },
+        watch: {
+            js: {
+                files: [
+                    'editor/js/**/*.js'
+                ],
+                tasks: ['concat','uglify']
+            },
+            sass: {
+                files: [
+                    'editor/sass/**/*.scss'
+                ],
+                tasks: ['sass']
+            }
+        },
+        
+        nodemon: {
+            /* uses .nodemonignore */
+            dev: {
+                script: 'red.js',
+                options: {
+                    args:['-v'],
+                    ext: 'js,html'
+                }
+            }
+        },
+        
+        concurrent: {
+            dev: {
+                tasks: ['nodemon', 'watch'],
+                options: {
+                    logConcurrentOutput: true
+                }
+            }
+        },
+        
+        copy: {
+            build: {
+                files:[{
+                    cwd: 'editor/images',
+                    src: '**',
+                    expand: true,
+                    dest: 'public/red/images/'
+                },
+                {
+                    cwd: 'editor/vendor',
+                    src: '**',
+                    expand: true,
+                    dest: 'public/vendor/'
+                },
+                {
+                    cwd: 'editor/icons',
+                    src: '**',
+                    expand: true,
+                    dest: 'public/icons/'
+                },
+                {
+                    expand: true,
+                    src: ['editor/index.html','editor/favicon.ico'],
+                    dest: 'public/',
+                    flatten: true
+                }]
+            },
+            release: {
+                files: [{
+                    expand: true,
+                    src: [
+                        '*.md',
+                        'LICENSE',
+                        'package.json',
+                        'settings.js',
+                        'red.js',
+                        'lib/.gitignore',
+                        'nodes/*.demo',
+                        'nodes/core/**',
+                        'red/**',
+                        'public/**'
+                    ],
+                    dest: path.resolve('<%= paths.dist %>/node-red-<%= pkg.version %>')
+                }]
+            }
+        },
+                
+        compress: {
+            release: {
+                options: {
+                    archive: '<%= paths.dist %>/node-red-<%= pkg.version %>.zip'
+                },
+                expand: true,
+                cwd: '<%= paths.dist %>/',
+                src: ['node-red-<%= pkg.version %>/**']
+            }
+        }
     });
     
     grunt.loadNpmTasks('grunt-simple-mocha');
     grunt.loadNpmTasks('grunt-contrib-jshint');
+    grunt.loadNpmTasks('grunt-contrib-concat');
+    grunt.loadNpmTasks('grunt-contrib-uglify');
+    grunt.loadNpmTasks('grunt-contrib-clean');
+    grunt.loadNpmTasks('grunt-contrib-watch');
+    grunt.loadNpmTasks('grunt-concurrent');
+    grunt.loadNpmTasks('grunt-sass');
+    grunt.loadNpmTasks('grunt-nodemon');
+    grunt.loadNpmTasks('grunt-contrib-compress');
+    grunt.loadNpmTasks('grunt-contrib-copy');
     
-    grunt.registerTask('default', ['test-core','test-editor','test-nodes']);
+    grunt.registerTask('default',
+        'Builds editor content then runs code style checks and unit tests on all components',
+        ['build','test-core','test-editor','test-nodes']);
     
-    grunt.registerTask('test-core', ['jshint:core','simplemocha:core']);
-    grunt.registerTask('test-editor', ['jshint:editor']);
-    grunt.registerTask('test-nodes', ['simplemocha:nodes']);
+    grunt.registerTask('test-core',
+        'Runs code style check and unit tests on core runtime code',
+        ['jshint:core','simplemocha:core']);
+    
+    grunt.registerTask('test-editor',
+        'Runs code style check on editor code',
+        ['jshint:editor']);
+    
+    grunt.registerTask('test-nodes',
+        'Runs unit tests on core nodes',
+        ['simplemocha:nodes']);
+    
+    grunt.registerTask('build',
+        'Builds editor content',
+        ['clean:build','concat:build','uglify:build','sass:build','copy:build']);
+    
+    grunt.registerTask('dev',
+        'Developer mode: run node-red, watch for source changes and build/restart',
+        ['build','concurrent:dev']);
+    
+    grunt.registerTask('release',
+        'Create distribution zip file',
+        ['build','clean:release','copy:release','compress:release']);
+
     
 };
diff --git a/README.md b/README.md
index 142db0a9f..96d57142a 100644
--- a/README.md
+++ b/README.md
@@ -25,6 +25,31 @@ More documentation can be found [here](http://nodered.org/docs).
 For further help, or general discussion, please use the
 [mailing list](https://groups.google.com/forum/#!forum/node-red).
 
+## Developers
+
+If you want to run the latest code from git, here's how to get started:
+
+1. Install grunt, the build tool
+
+        npm install -g grunt-cli
+
+2. Clone the code:
+
+        git clone git@github.com:node-red/node-red.git
+        cd node-red
+
+3. Install the node-red dependencies
+
+        npm install
+
+4. Build the code
+
+        grunt build
+
+5. Run
+
+        node red.js
+
 ## Contributing
 
 Before raising a pull-request, please read our
diff --git a/public/favicon.ico b/editor/favicon.ico
similarity index 100%
rename from public/favicon.ico
rename to editor/favicon.ico
diff --git a/public/icons/alert.png b/editor/icons/alert.png
similarity index 100%
rename from public/icons/alert.png
rename to editor/icons/alert.png
diff --git a/public/icons/arduino.png b/editor/icons/arduino.png
similarity index 100%
rename from public/icons/arduino.png
rename to editor/icons/arduino.png
diff --git a/public/icons/arrow-in.png b/editor/icons/arrow-in.png
similarity index 100%
rename from public/icons/arrow-in.png
rename to editor/icons/arrow-in.png
diff --git a/public/icons/bluetooth.png b/editor/icons/bluetooth.png
similarity index 100%
rename from public/icons/bluetooth.png
rename to editor/icons/bluetooth.png
diff --git a/public/icons/bridge-dash.png b/editor/icons/bridge-dash.png
similarity index 100%
rename from public/icons/bridge-dash.png
rename to editor/icons/bridge-dash.png
diff --git a/public/icons/bridge.png b/editor/icons/bridge.png
similarity index 100%
rename from public/icons/bridge.png
rename to editor/icons/bridge.png
diff --git a/public/icons/comment.png b/editor/icons/comment.png
similarity index 100%
rename from public/icons/comment.png
rename to editor/icons/comment.png
diff --git a/public/icons/db.png b/editor/icons/db.png
similarity index 100%
rename from public/icons/db.png
rename to editor/icons/db.png
diff --git a/public/icons/debug.png b/editor/icons/debug.png
similarity index 100%
rename from public/icons/debug.png
rename to editor/icons/debug.png
diff --git a/public/icons/envelope.png b/editor/icons/envelope.png
similarity index 100%
rename from public/icons/envelope.png
rename to editor/icons/envelope.png
diff --git a/public/icons/feed.png b/editor/icons/feed.png
similarity index 100%
rename from public/icons/feed.png
rename to editor/icons/feed.png
diff --git a/public/icons/file.png b/editor/icons/file.png
similarity index 100%
rename from public/icons/file.png
rename to editor/icons/file.png
diff --git a/public/icons/function.png b/editor/icons/function.png
similarity index 100%
rename from public/icons/function.png
rename to editor/icons/function.png
diff --git a/public/icons/hash.png b/editor/icons/hash.png
similarity index 100%
rename from public/icons/hash.png
rename to editor/icons/hash.png
diff --git a/public/icons/inject.png b/editor/icons/inject.png
similarity index 100%
rename from public/icons/inject.png
rename to editor/icons/inject.png
diff --git a/public/icons/leveldb.png b/editor/icons/leveldb.png
similarity index 100%
rename from public/icons/leveldb.png
rename to editor/icons/leveldb.png
diff --git a/public/icons/light.png b/editor/icons/light.png
similarity index 100%
rename from public/icons/light.png
rename to editor/icons/light.png
diff --git a/public/icons/mongodb.png b/editor/icons/mongodb.png
similarity index 100%
rename from public/icons/mongodb.png
rename to editor/icons/mongodb.png
diff --git a/public/icons/mouse.png b/editor/icons/mouse.png
similarity index 100%
rename from public/icons/mouse.png
rename to editor/icons/mouse.png
diff --git a/public/icons/node-changed.png b/editor/icons/node-changed.png
similarity index 100%
rename from public/icons/node-changed.png
rename to editor/icons/node-changed.png
diff --git a/public/icons/node-error.png b/editor/icons/node-error.png
similarity index 100%
rename from public/icons/node-error.png
rename to editor/icons/node-error.png
diff --git a/public/icons/range.png b/editor/icons/range.png
similarity index 100%
rename from public/icons/range.png
rename to editor/icons/range.png
diff --git a/public/icons/redis.png b/editor/icons/redis.png
similarity index 100%
rename from public/icons/redis.png
rename to editor/icons/redis.png
diff --git a/public/icons/rpi.png b/editor/icons/rpi.png
similarity index 100%
rename from public/icons/rpi.png
rename to editor/icons/rpi.png
diff --git a/public/icons/serial.png b/editor/icons/serial.png
similarity index 100%
rename from public/icons/serial.png
rename to editor/icons/serial.png
diff --git a/public/icons/subflow.png b/editor/icons/subflow.png
similarity index 100%
rename from public/icons/subflow.png
rename to editor/icons/subflow.png
diff --git a/public/icons/swap.png b/editor/icons/swap.png
similarity index 100%
rename from public/icons/swap.png
rename to editor/icons/swap.png
diff --git a/public/icons/switch.png b/editor/icons/switch.png
similarity index 100%
rename from public/icons/switch.png
rename to editor/icons/switch.png
diff --git a/public/icons/template.png b/editor/icons/template.png
similarity index 100%
rename from public/icons/template.png
rename to editor/icons/template.png
diff --git a/public/icons/timer.png b/editor/icons/timer.png
similarity index 100%
rename from public/icons/timer.png
rename to editor/icons/timer.png
diff --git a/public/icons/trigger.png b/editor/icons/trigger.png
similarity index 100%
rename from public/icons/trigger.png
rename to editor/icons/trigger.png
diff --git a/public/icons/twitter.png b/editor/icons/twitter.png
similarity index 100%
rename from public/icons/twitter.png
rename to editor/icons/twitter.png
diff --git a/public/icons/watch.png b/editor/icons/watch.png
similarity index 100%
rename from public/icons/watch.png
rename to editor/icons/watch.png
diff --git a/public/icons/white-globe.png b/editor/icons/white-globe.png
similarity index 100%
rename from public/icons/white-globe.png
rename to editor/icons/white-globe.png
diff --git a/public/images/deploy-flows-o.png b/editor/images/deploy-flows-o.png
similarity index 100%
rename from public/images/deploy-flows-o.png
rename to editor/images/deploy-flows-o.png
diff --git a/public/images/deploy-flows.png b/editor/images/deploy-flows.png
similarity index 100%
rename from public/images/deploy-flows.png
rename to editor/images/deploy-flows.png
diff --git a/public/images/deploy-full-o.png b/editor/images/deploy-full-o.png
similarity index 100%
rename from public/images/deploy-full-o.png
rename to editor/images/deploy-full-o.png
diff --git a/public/images/deploy-full.png b/editor/images/deploy-full.png
similarity index 100%
rename from public/images/deploy-full.png
rename to editor/images/deploy-full.png
diff --git a/public/images/deploy-nodes-o.png b/editor/images/deploy-nodes-o.png
similarity index 100%
rename from public/images/deploy-nodes-o.png
rename to editor/images/deploy-nodes-o.png
diff --git a/public/images/deploy-nodes.png b/editor/images/deploy-nodes.png
similarity index 100%
rename from public/images/deploy-nodes.png
rename to editor/images/deploy-nodes.png
diff --git a/public/grip.png b/editor/images/grip.png
similarity index 100%
rename from public/grip.png
rename to editor/images/grip.png
diff --git a/public/node-red-256.png b/editor/images/node-red-256.png
similarity index 100%
rename from public/node-red-256.png
rename to editor/images/node-red-256.png
diff --git a/public/node-red.png b/editor/images/node-red.png
similarity index 100%
rename from public/node-red.png
rename to editor/images/node-red.png
diff --git a/public/pw_maze_white.png b/editor/images/pw_maze_white.png
similarity index 100%
rename from public/pw_maze_white.png
rename to editor/images/pw_maze_white.png
diff --git a/public/spin.svg b/editor/images/spin.svg
similarity index 100%
rename from public/spin.svg
rename to editor/images/spin.svg
diff --git a/public/index.html b/editor/index.html
similarity index 78%
rename from public/index.html
rename to editor/index.html
index b928e6a6f..ba1dbeee3 100644
--- a/public/index.html
+++ b/editor/index.html
@@ -4,7 +4,6 @@
 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0"/>
 <meta name="apple-mobile-web-app-capable" content="yes">
 <meta name="mobile-web-app-capable" content="yes">
-
 <!--
   Copyright 2013, 2015 IBM Corp.
 
@@ -22,22 +21,22 @@
 -->
 <head>
 <title>Node-RED</title>
-<link href="bootstrap/css/bootstrap.min.css" rel="stylesheet" media="screen">
-<link href="jquery/css/smoothness/jquery-ui-1.10.3.custom.min.css" rel="stylesheet" media="screen">
-<link rel="stylesheet" type="text/css" href="orion/built-editor.css"/>
-<link rel="stylesheet" type="text/css" href="font-awesome/css/font-awesome.min.css"/>
-<link rel="stylesheet" href="style.css">
+<link href="vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet" media="screen">
+<link href="vendor/jquery/css/smoothness/jquery-ui-1.10.3.custom.min.css" rel="stylesheet" media="screen">
+<link rel="stylesheet" type="text/css" href="vendor/orion/built-editor.css"/>
+<link rel="stylesheet" type="text/css" href="vendor/font-awesome/css/font-awesome.min.css"/>
+<link rel="stylesheet" href="red/style.min.css">
 </head>
 <body spellcheck="false">
 <div id="header">
-    <span class="logo"><img src="node-red.png"> <span>Node-RED</span></span>
+    <span class="logo"><img src="red/images/node-red.png"> <span>Node-RED</span></span>
     <ul class="header-toolbar hide">
         <li><a id="btn-sidemenu" class="button" data-toggle="dropdown" href="#"><i class="fa fa-bars"></i></a></li>
     <ul>
 </div>
 <div id="main-container" class="sidebar-closed hide">
     <div id="palette">
-        <img src="spin.svg" class="palette-spinner hide"/>
+        <img src="red/images/spin.svg" class="palette-spinner hide"/>
         <div id="palette-container" class="palette-scroll">
         </div>
         <div id="palette-search">
@@ -170,39 +169,16 @@
     </div>
 </script>
 
-<script src="jquery/js/jquery-1.11.1.min.js"></script>
-<script src="bootstrap/js/bootstrap.min.js"></script>
-<script src="jquery/js/jquery-ui-1.10.3.custom.min.js"></script>
-<script src="jquery/js/jquery.ui.touch-punch.min.js"></script>
-<script src="marked/marked.min.js"></script>
-<script src="orion/built-editor.min.js"></script>
-<script src="ace/ace.js"></script>
-<script src="ace/ext-language_tools.js"></script>
-<script src="d3.v3.min.js"></script>
-<script src="red/main.js"></script>
-<script src="red/settings.js"></script>
-<script src="red/user.js"></script>
-<script src="red/comms.js"></script>
-<script src="red/ui/state.js"></script>
-<script src="red/nodes.js"></script>
-<script src="red/history.js"></script>
-<script src="red/validators.js"></script>
-<script src="red/ui/deploy.js"></script>
-<script src="red/ui/menu.js"></script>
-<script src="red/ui/keyboard.js"></script>
-<script src="red/ui/tabs.js"></script>
-<script src="red/ui/workspaces.js"></script>
-<script src="red/ui/view.js"></script>
-<script src="red/ui/sidebar.js"></script>
-<script src="red/ui/palette.js"></script>
-<script src="red/ui/tab-info.js"></script>
-<script src="red/ui/tab-config.js"></script>
-<script src="red/ui/editor.js"></script>
-<script src="red/ui/clipboard.js"></script>
-<script src="red/ui/library.js"></script>
-<script src="red/ui/notifications.js"></script>
-<script src="red/ui/subflow.js"></script>
-<script src="red/ui/touch/radialMenu.js"></script>
+<script src="vendor/jquery/js/jquery-1.11.1.min.js"></script>
+<script src="vendor/bootstrap/js/bootstrap.min.js"></script>
+<script src="vendor/jquery/js/jquery-ui-1.10.3.custom.min.js"></script>
+<script src="vendor/jquery/js/jquery.ui.touch-punch.min.js"></script>
+<script src="vendor/marked/marked.min.js"></script>
+<script src="vendor/orion/built-editor.min.js"></script>
+<script src="vendor/ace/ace.js"></script>
+<script src="vendor/ace/ext-language_tools.js"></script>
+<script src="vendor/d3/d3.v3.min.js"></script>
+<script src="red/red.min.js"></script>
 
 </body>
 </html>
diff --git a/public/red/comms.js b/editor/js/comms.js
similarity index 100%
rename from public/red/comms.js
rename to editor/js/comms.js
diff --git a/public/red/history.js b/editor/js/history.js
similarity index 100%
rename from public/red/history.js
rename to editor/js/history.js
diff --git a/public/red/main.js b/editor/js/main.js
similarity index 100%
rename from public/red/main.js
rename to editor/js/main.js
diff --git a/public/red/nodes.js b/editor/js/nodes.js
similarity index 100%
rename from public/red/nodes.js
rename to editor/js/nodes.js
diff --git a/public/red/settings.js b/editor/js/settings.js
similarity index 100%
rename from public/red/settings.js
rename to editor/js/settings.js
diff --git a/public/red/ui/clipboard.js b/editor/js/ui/clipboard.js
similarity index 100%
rename from public/red/ui/clipboard.js
rename to editor/js/ui/clipboard.js
diff --git a/public/red/ui/deploy.js b/editor/js/ui/deploy.js
similarity index 89%
rename from public/red/ui/deploy.js
rename to editor/js/ui/deploy.js
index d1354cac4..f8293e996 100644
--- a/public/red/ui/deploy.js
+++ b/editor/js/ui/deploy.js
@@ -17,9 +17,9 @@
 RED.deploy = (function() {
         
     var deploymentTypes = {
-        "full":{img:"images/deploy-full-o.png"},
-        "nodes":{img:"images/deploy-nodes-o.png"},
-        "flows":{img:"images/deploy-flows-o.png"}
+        "full":{img:"red/images/deploy-full-o.png"},
+        "nodes":{img:"red/images/deploy-nodes-o.png"},
+        "flows":{img:"red/images/deploy-flows-o.png"}
     }
     
     var deploymentType = "full";
@@ -32,7 +32,7 @@ RED.deploy = (function() {
     function init() {
         
         var deployButton = $('<li><span class="deploy-button-group button-group">'+
-          '<a id="btn-deploy" class="action-deploy disabled" href="#"><img id="btn-icn-deploy" src="images/deploy-full-o.png"> <span>Deploy</span></a>'+
+          '<a id="btn-deploy" class="action-deploy disabled" href="#"><img id="btn-icn-deploy" src="red/images/deploy-full-o.png"> <span>Deploy</span></a>'+
           '<a id="btn-deploy-options"  data-toggle="dropdown"  class="" href="#"><i class="fa fa-caret-down"></i></a>'+
           '</span></li>').prependTo(".header-toolbar");
         
@@ -63,9 +63,9 @@ RED.deploy = (function() {
 
         RED.menu.init({id:"btn-deploy-options",
             options: [
-                {id:"btn-deploy-full",toggle:"deploy-type",icon:"images/deploy-full.png",label:"Full",sublabel:"Deploys everything in the workspace",onselect:function(s) { if(s){changeDeploymentType("full")}}},
-                {id:"btn-deploy-flow",toggle:"deploy-type",icon:"images/deploy-flows.png",label:"Modified Flows",sublabel:"Only deploys flows that contain changed nodes", onselect:function(s) {if(s){changeDeploymentType("flows")}}},
-                {id:"btn-deploy-node",toggle:"deploy-type",icon:"images/deploy-nodes.png",label:"Modified Nodes",sublabel:"Only deploys nodes that have changed",onselect:function(s) { if(s){changeDeploymentType("nodes")}}}
+                {id:"btn-deploy-full",toggle:"deploy-type",icon:"red/images/deploy-full.png",label:"Full",sublabel:"Deploys everything in the workspace",onselect:function(s) { if(s){changeDeploymentType("full")}}},
+                {id:"btn-deploy-flow",toggle:"deploy-type",icon:"red/images/deploy-flows.png",label:"Modified Flows",sublabel:"Only deploys flows that contain changed nodes", onselect:function(s) {if(s){changeDeploymentType("flows")}}},
+                {id:"btn-deploy-node",toggle:"deploy-type",icon:"red/images/deploy-nodes.png",label:"Modified Nodes",sublabel:"Only deploys nodes that have changed",onselect:function(s) { if(s){changeDeploymentType("nodes")}}}
             ]
         });
 
diff --git a/public/red/ui/editor.js b/editor/js/ui/editor.js
similarity index 100%
rename from public/red/ui/editor.js
rename to editor/js/ui/editor.js
diff --git a/public/red/ui/keyboard.js b/editor/js/ui/keyboard.js
similarity index 100%
rename from public/red/ui/keyboard.js
rename to editor/js/ui/keyboard.js
diff --git a/public/red/ui/library.js b/editor/js/ui/library.js
similarity index 100%
rename from public/red/ui/library.js
rename to editor/js/ui/library.js
diff --git a/public/red/ui/menu.js b/editor/js/ui/menu.js
similarity index 100%
rename from public/red/ui/menu.js
rename to editor/js/ui/menu.js
diff --git a/public/red/ui/notifications.js b/editor/js/ui/notifications.js
similarity index 100%
rename from public/red/ui/notifications.js
rename to editor/js/ui/notifications.js
diff --git a/public/red/ui/palette.js b/editor/js/ui/palette.js
similarity index 100%
rename from public/red/ui/palette.js
rename to editor/js/ui/palette.js
diff --git a/public/red/ui/sidebar.js b/editor/js/ui/sidebar.js
similarity index 100%
rename from public/red/ui/sidebar.js
rename to editor/js/ui/sidebar.js
diff --git a/public/red/ui/state.js b/editor/js/ui/state.js
similarity index 100%
rename from public/red/ui/state.js
rename to editor/js/ui/state.js
diff --git a/public/red/ui/subflow.js b/editor/js/ui/subflow.js
similarity index 100%
rename from public/red/ui/subflow.js
rename to editor/js/ui/subflow.js
diff --git a/public/red/ui/tab-config.js b/editor/js/ui/tab-config.js
similarity index 100%
rename from public/red/ui/tab-config.js
rename to editor/js/ui/tab-config.js
diff --git a/public/red/ui/tab-info.js b/editor/js/ui/tab-info.js
similarity index 100%
rename from public/red/ui/tab-info.js
rename to editor/js/ui/tab-info.js
diff --git a/public/red/ui/tabs.js b/editor/js/ui/tabs.js
similarity index 100%
rename from public/red/ui/tabs.js
rename to editor/js/ui/tabs.js
diff --git a/public/red/ui/touch/radialMenu.js b/editor/js/ui/touch/radialMenu.js
similarity index 100%
rename from public/red/ui/touch/radialMenu.js
rename to editor/js/ui/touch/radialMenu.js
diff --git a/public/red/ui/view.js b/editor/js/ui/view.js
similarity index 100%
rename from public/red/ui/view.js
rename to editor/js/ui/view.js
diff --git a/public/red/ui/workspaces.js b/editor/js/ui/workspaces.js
similarity index 100%
rename from public/red/ui/workspaces.js
rename to editor/js/ui/workspaces.js
diff --git a/public/red/user.js b/editor/js/user.js
similarity index 100%
rename from public/red/user.js
rename to editor/js/user.js
diff --git a/public/red/validators.js b/editor/js/validators.js
similarity index 100%
rename from public/red/validators.js
rename to editor/js/validators.js
diff --git a/public/style.css b/editor/sass/style.scss
similarity index 99%
rename from public/style.css
rename to editor/sass/style.scss
index b875dc74c..5ce93cad0 100644
--- a/public/style.css
+++ b/editor/sass/style.scss
@@ -17,7 +17,7 @@
 body {
   font: 13px "Helvetica" !important;
   padding-top: 100px;
-  background: url("pw_maze_white.png");
+  background: url("images/pw_maze_white.png");
 }
 
 #header {
@@ -501,7 +501,7 @@ span.deploy-button-group.open > #btn-deploy.disabled + a {
 }
 #sidebar-separator {
     width: 15px;
-    background: url(grip.png) no-repeat 50% 50%;
+    background: url(images/grip.png) no-repeat 50% 50%;
     position: absolute;
     right: 316px; top: 5px; bottom:10px;
     cursor: col-resize;
@@ -902,7 +902,7 @@ div.node-info {
 
 
 .dropdown-menu>li.disabled>a:hover>[class^="icon-"] {
-    background-image: url("bootstrap/img/glyphicons-halflings.png") !important;
+    background-image: url("vendor/bootstrap/img/glyphicons-halflings.png") !important;
 }
 /** Fix for unreachable dropdown menu **/
 .dropdown-menu  {
@@ -1189,7 +1189,7 @@ i.spinner {
     line-height: 14px;
     vertical-align: text-top;
     margin-top: 0px;
-    background: url(spin.svg) no-repeat 50% 50%;
+    background: url(images/spin.svg) no-repeat 50% 50%;
     background-size: contain
 }
 
diff --git a/public/ace/LICENSE b/editor/vendor/ace/LICENSE
similarity index 100%
rename from public/ace/LICENSE
rename to editor/vendor/ace/LICENSE
diff --git a/public/ace/ace.js b/editor/vendor/ace/ace.js
similarity index 100%
rename from public/ace/ace.js
rename to editor/vendor/ace/ace.js
diff --git a/public/ace/ext-language_tools.js b/editor/vendor/ace/ext-language_tools.js
similarity index 100%
rename from public/ace/ext-language_tools.js
rename to editor/vendor/ace/ext-language_tools.js
diff --git a/public/ace/ext-searchbox.js b/editor/vendor/ace/ext-searchbox.js
similarity index 100%
rename from public/ace/ext-searchbox.js
rename to editor/vendor/ace/ext-searchbox.js
diff --git a/public/ace/mode-handlebars.js b/editor/vendor/ace/mode-handlebars.js
similarity index 100%
rename from public/ace/mode-handlebars.js
rename to editor/vendor/ace/mode-handlebars.js
diff --git a/public/ace/mode-html.js b/editor/vendor/ace/mode-html.js
similarity index 100%
rename from public/ace/mode-html.js
rename to editor/vendor/ace/mode-html.js
diff --git a/public/ace/mode-javascript.js b/editor/vendor/ace/mode-javascript.js
similarity index 100%
rename from public/ace/mode-javascript.js
rename to editor/vendor/ace/mode-javascript.js
diff --git a/public/ace/mode-json.js b/editor/vendor/ace/mode-json.js
similarity index 100%
rename from public/ace/mode-json.js
rename to editor/vendor/ace/mode-json.js
diff --git a/public/ace/mode-markdown.js b/editor/vendor/ace/mode-markdown.js
similarity index 100%
rename from public/ace/mode-markdown.js
rename to editor/vendor/ace/mode-markdown.js
diff --git a/public/ace/mode-yaml.js b/editor/vendor/ace/mode-yaml.js
similarity index 100%
rename from public/ace/mode-yaml.js
rename to editor/vendor/ace/mode-yaml.js
diff --git a/public/ace/snippets/handlebars.js b/editor/vendor/ace/snippets/handlebars.js
similarity index 100%
rename from public/ace/snippets/handlebars.js
rename to editor/vendor/ace/snippets/handlebars.js
diff --git a/public/ace/snippets/html.js b/editor/vendor/ace/snippets/html.js
similarity index 100%
rename from public/ace/snippets/html.js
rename to editor/vendor/ace/snippets/html.js
diff --git a/public/ace/snippets/javascript.js b/editor/vendor/ace/snippets/javascript.js
similarity index 100%
rename from public/ace/snippets/javascript.js
rename to editor/vendor/ace/snippets/javascript.js
diff --git a/public/ace/snippets/markdown.js b/editor/vendor/ace/snippets/markdown.js
similarity index 100%
rename from public/ace/snippets/markdown.js
rename to editor/vendor/ace/snippets/markdown.js
diff --git a/public/ace/snippets/text.js b/editor/vendor/ace/snippets/text.js
similarity index 100%
rename from public/ace/snippets/text.js
rename to editor/vendor/ace/snippets/text.js
diff --git a/public/ace/snippets/yaml.js b/editor/vendor/ace/snippets/yaml.js
similarity index 100%
rename from public/ace/snippets/yaml.js
rename to editor/vendor/ace/snippets/yaml.js
diff --git a/public/ace/theme-chrome.js b/editor/vendor/ace/theme-chrome.js
similarity index 100%
rename from public/ace/theme-chrome.js
rename to editor/vendor/ace/theme-chrome.js
diff --git a/public/ace/theme-crimson_editor.js b/editor/vendor/ace/theme-crimson_editor.js
similarity index 100%
rename from public/ace/theme-crimson_editor.js
rename to editor/vendor/ace/theme-crimson_editor.js
diff --git a/public/ace/theme-solarized_light.js b/editor/vendor/ace/theme-solarized_light.js
similarity index 100%
rename from public/ace/theme-solarized_light.js
rename to editor/vendor/ace/theme-solarized_light.js
diff --git a/public/ace/theme-tomorrow.js b/editor/vendor/ace/theme-tomorrow.js
similarity index 100%
rename from public/ace/theme-tomorrow.js
rename to editor/vendor/ace/theme-tomorrow.js
diff --git a/public/ace/worker-html.js b/editor/vendor/ace/worker-html.js
similarity index 100%
rename from public/ace/worker-html.js
rename to editor/vendor/ace/worker-html.js
diff --git a/public/ace/worker-javascript.js b/editor/vendor/ace/worker-javascript.js
similarity index 100%
rename from public/ace/worker-javascript.js
rename to editor/vendor/ace/worker-javascript.js
diff --git a/public/ace/worker-json.js b/editor/vendor/ace/worker-json.js
similarity index 100%
rename from public/ace/worker-json.js
rename to editor/vendor/ace/worker-json.js
diff --git a/public/bootstrap/css/bootstrap.min.css b/editor/vendor/bootstrap/css/bootstrap.min.css
similarity index 100%
rename from public/bootstrap/css/bootstrap.min.css
rename to editor/vendor/bootstrap/css/bootstrap.min.css
diff --git a/public/bootstrap/img/glyphicons-halflings-white.png b/editor/vendor/bootstrap/img/glyphicons-halflings-white.png
similarity index 100%
rename from public/bootstrap/img/glyphicons-halflings-white.png
rename to editor/vendor/bootstrap/img/glyphicons-halflings-white.png
diff --git a/public/bootstrap/img/glyphicons-halflings.png b/editor/vendor/bootstrap/img/glyphicons-halflings.png
similarity index 100%
rename from public/bootstrap/img/glyphicons-halflings.png
rename to editor/vendor/bootstrap/img/glyphicons-halflings.png
diff --git a/public/bootstrap/js/bootstrap.min.js b/editor/vendor/bootstrap/js/bootstrap.min.js
similarity index 100%
rename from public/bootstrap/js/bootstrap.min.js
rename to editor/vendor/bootstrap/js/bootstrap.min.js
diff --git a/public/d3.v3.min.js b/editor/vendor/d3/d3.v3.min.js
similarity index 100%
rename from public/d3.v3.min.js
rename to editor/vendor/d3/d3.v3.min.js
diff --git a/public/font-awesome/css/font-awesome.min.css b/editor/vendor/font-awesome/css/font-awesome.min.css
similarity index 100%
rename from public/font-awesome/css/font-awesome.min.css
rename to editor/vendor/font-awesome/css/font-awesome.min.css
diff --git a/public/font-awesome/fonts/FontAwesome.otf b/editor/vendor/font-awesome/fonts/FontAwesome.otf
similarity index 100%
rename from public/font-awesome/fonts/FontAwesome.otf
rename to editor/vendor/font-awesome/fonts/FontAwesome.otf
diff --git a/public/font-awesome/fonts/fontawesome-webfont.eot b/editor/vendor/font-awesome/fonts/fontawesome-webfont.eot
similarity index 100%
rename from public/font-awesome/fonts/fontawesome-webfont.eot
rename to editor/vendor/font-awesome/fonts/fontawesome-webfont.eot
diff --git a/public/font-awesome/fonts/fontawesome-webfont.svg b/editor/vendor/font-awesome/fonts/fontawesome-webfont.svg
similarity index 100%
rename from public/font-awesome/fonts/fontawesome-webfont.svg
rename to editor/vendor/font-awesome/fonts/fontawesome-webfont.svg
diff --git a/public/font-awesome/fonts/fontawesome-webfont.ttf b/editor/vendor/font-awesome/fonts/fontawesome-webfont.ttf
similarity index 100%
rename from public/font-awesome/fonts/fontawesome-webfont.ttf
rename to editor/vendor/font-awesome/fonts/fontawesome-webfont.ttf
diff --git a/public/font-awesome/fonts/fontawesome-webfont.woff b/editor/vendor/font-awesome/fonts/fontawesome-webfont.woff
similarity index 100%
rename from public/font-awesome/fonts/fontawesome-webfont.woff
rename to editor/vendor/font-awesome/fonts/fontawesome-webfont.woff
diff --git a/public/font-awesome/fonts/fontawesome-webfont.woff2 b/editor/vendor/font-awesome/fonts/fontawesome-webfont.woff2
similarity index 100%
rename from public/font-awesome/fonts/fontawesome-webfont.woff2
rename to editor/vendor/font-awesome/fonts/fontawesome-webfont.woff2
diff --git a/public/jquery/css/smoothness/images/animated-overlay.gif b/editor/vendor/jquery/css/smoothness/images/animated-overlay.gif
similarity index 100%
rename from public/jquery/css/smoothness/images/animated-overlay.gif
rename to editor/vendor/jquery/css/smoothness/images/animated-overlay.gif
diff --git a/public/jquery/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png b/editor/vendor/jquery/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
similarity index 100%
rename from public/jquery/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
rename to editor/vendor/jquery/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
diff --git a/public/jquery/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png b/editor/vendor/jquery/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
similarity index 100%
rename from public/jquery/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
rename to editor/vendor/jquery/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
diff --git a/public/jquery/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png b/editor/vendor/jquery/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
similarity index 100%
rename from public/jquery/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
rename to editor/vendor/jquery/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
diff --git a/public/jquery/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png b/editor/vendor/jquery/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
similarity index 100%
rename from public/jquery/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
rename to editor/vendor/jquery/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
diff --git a/public/jquery/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png b/editor/vendor/jquery/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png
similarity index 100%
rename from public/jquery/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png
rename to editor/vendor/jquery/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png
diff --git a/public/jquery/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png b/editor/vendor/jquery/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
similarity index 100%
rename from public/jquery/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
rename to editor/vendor/jquery/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
diff --git a/public/jquery/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png b/editor/vendor/jquery/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
similarity index 100%
rename from public/jquery/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
rename to editor/vendor/jquery/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
diff --git a/public/jquery/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/editor/vendor/jquery/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
similarity index 100%
rename from public/jquery/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
rename to editor/vendor/jquery/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
diff --git a/public/jquery/css/smoothness/images/ui-icons_222222_256x240.png b/editor/vendor/jquery/css/smoothness/images/ui-icons_222222_256x240.png
similarity index 100%
rename from public/jquery/css/smoothness/images/ui-icons_222222_256x240.png
rename to editor/vendor/jquery/css/smoothness/images/ui-icons_222222_256x240.png
diff --git a/public/jquery/css/smoothness/images/ui-icons_2e83ff_256x240.png b/editor/vendor/jquery/css/smoothness/images/ui-icons_2e83ff_256x240.png
similarity index 100%
rename from public/jquery/css/smoothness/images/ui-icons_2e83ff_256x240.png
rename to editor/vendor/jquery/css/smoothness/images/ui-icons_2e83ff_256x240.png
diff --git a/public/jquery/css/smoothness/images/ui-icons_454545_256x240.png b/editor/vendor/jquery/css/smoothness/images/ui-icons_454545_256x240.png
similarity index 100%
rename from public/jquery/css/smoothness/images/ui-icons_454545_256x240.png
rename to editor/vendor/jquery/css/smoothness/images/ui-icons_454545_256x240.png
diff --git a/public/jquery/css/smoothness/images/ui-icons_888888_256x240.png b/editor/vendor/jquery/css/smoothness/images/ui-icons_888888_256x240.png
similarity index 100%
rename from public/jquery/css/smoothness/images/ui-icons_888888_256x240.png
rename to editor/vendor/jquery/css/smoothness/images/ui-icons_888888_256x240.png
diff --git a/public/jquery/css/smoothness/images/ui-icons_cd0a0a_256x240.png b/editor/vendor/jquery/css/smoothness/images/ui-icons_cd0a0a_256x240.png
similarity index 100%
rename from public/jquery/css/smoothness/images/ui-icons_cd0a0a_256x240.png
rename to editor/vendor/jquery/css/smoothness/images/ui-icons_cd0a0a_256x240.png
diff --git a/public/jquery/css/smoothness/jquery-ui-1.10.3.custom.min.css b/editor/vendor/jquery/css/smoothness/jquery-ui-1.10.3.custom.min.css
similarity index 100%
rename from public/jquery/css/smoothness/jquery-ui-1.10.3.custom.min.css
rename to editor/vendor/jquery/css/smoothness/jquery-ui-1.10.3.custom.min.css
diff --git a/public/jquery/js/jquery-1.11.1.min.js b/editor/vendor/jquery/js/jquery-1.11.1.min.js
similarity index 100%
rename from public/jquery/js/jquery-1.11.1.min.js
rename to editor/vendor/jquery/js/jquery-1.11.1.min.js
diff --git a/public/jquery/js/jquery-ui-1.10.3.custom.min.js b/editor/vendor/jquery/js/jquery-ui-1.10.3.custom.min.js
similarity index 100%
rename from public/jquery/js/jquery-ui-1.10.3.custom.min.js
rename to editor/vendor/jquery/js/jquery-ui-1.10.3.custom.min.js
diff --git a/public/jquery/js/jquery.ui.touch-punch.min.js b/editor/vendor/jquery/js/jquery.ui.touch-punch.min.js
similarity index 100%
rename from public/jquery/js/jquery.ui.touch-punch.min.js
rename to editor/vendor/jquery/js/jquery.ui.touch-punch.min.js
diff --git a/public/marked/marked.min.js b/editor/vendor/marked/marked.min.js
similarity index 100%
rename from public/marked/marked.min.js
rename to editor/vendor/marked/marked.min.js
diff --git a/public/orion/built-editor.css b/editor/vendor/orion/built-editor.css
similarity index 100%
rename from public/orion/built-editor.css
rename to editor/vendor/orion/built-editor.css
diff --git a/public/orion/built-editor.min.js b/editor/vendor/orion/built-editor.min.js
similarity index 100%
rename from public/orion/built-editor.min.js
rename to editor/vendor/orion/built-editor.min.js
diff --git a/package.json b/package.json
index 28a142878..34e3bded9 100644
--- a/package.json
+++ b/package.json
@@ -65,8 +65,17 @@
     "devDependencies": {
         "grunt": "0.4.5",
         "grunt-cli": "0.1.13",
-        "grunt-simple-mocha": "0.4.0",
+        "grunt-concurrent":"1.0.0",
+        "grunt-contrib-clean":"0.6.0",
+        "grunt-contrib-compress": "0.13.0",
+        "grunt-contrib-concat":"0.5.0",
+        "grunt-contrib-copy": "0.8.0",
         "grunt-contrib-jshint": "0.11.0",
+        "grunt-contrib-uglify": "0.7.0",
+        "grunt-contrib-watch":"0.6.1",
+        "grunt-nodemon":"0.4.0",
+        "grunt-sass":"0.18.0",
+        "grunt-simple-mocha": "0.4.0",
         "mocha": "2.1.0",
         "should": "4.6.5",
         "sinon": "1.12.2",
diff --git a/red.js b/red.js
index 625e5a9a0..caaf71450 100755
--- a/red.js
+++ b/red.js
@@ -149,7 +149,21 @@ if (parsedArgs.userDir) {
     settings.userDir = parsedArgs.userDir;
 }
 
-RED.init(server,settings);
+try {
+    RED.init(server,settings);
+} catch(err) {
+    if (err.code == "not_built") {
+        console.log("Node-RED has not been built. See README.md for details");
+    } else {
+        console.log("Failed to start server:");
+        if (err.stack) {
+            console.log(err.stack);
+        } else {
+            console.log(err);
+        }
+    }
+    process.exit(1);
+}
 
 if (settings.httpAdminRoot !== false && settings.httpAdminAuth) {
     RED.log.warn("use of httpAdminAuth is deprecated. Use adminAuth instead");
diff --git a/red/red.js b/red/red.js
index b6e6a3e15..98a7cc7b9 100644
--- a/red/red.js
+++ b/red/red.js
@@ -29,8 +29,20 @@ var events = require("events");
 
 process.env.NODE_RED_HOME = process.env.NODE_RED_HOME || path.resolve(__dirname+"/..");
 
+function checkBuild() {
+    var editorFile = path.resolve(path.join(__dirname,"..","public","red","red.min.js"));
+    try {
+        var stats = fs.statSync(editorFile);
+    } catch(err) {
+        var e = new Error("Node-RED not built");
+        e.code = "not_built";
+        throw e;
+    }
+}
+
 var RED = {
     init: function(httpServer,userSettings) {
+        checkBuild();
         userSettings.version = this.version();
         log.init(userSettings);
         settings.init(userSettings);
diff --git a/test/red/red_spec.js b/test/red/red_spec.js
index cd002ebea..dcbf8a246 100644
--- a/test/red/red_spec.js
+++ b/test/red/red_spec.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 IBM Corp.
+ * Copyright 2014, 2015 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,33 +14,58 @@
  * limitations under the License.
  **/
 var should = require("should");
+var sinon = require("sinon");
+var fs = require("fs");
+var path = require("path");
+
+var RED = require("../../red/red");
+var log = require("../../red/log");
+var settings = require("../../red/settings");
+var server = require("../../red/server");
+
 
 describe("red/red", function() {
-    it('can be required without errors', function() {
-        require("../../red/red");
+
+    describe("check build", function() {
+        beforeEach(function() {
+            sinon.stub(log,"init",function() {});
+            sinon.stub(settings,"init",function() {});
+            sinon.stub(server,"init",function() {});
+            sinon.stub(RED,"version",function() { return "version";});
+        });
+        afterEach(function() {
+            log.init.restore();
+            settings.init.restore();
+            server.init.restore();
+            fs.statSync.restore();
+            RED.version.restore();
+        });
+        it('warns if build has not been run',function() {
+            sinon.stub(fs,"statSync",function() { throw new Error();});
+            
+            /*jshint immed: false */
+            (function() {
+                RED.init({},{});
+            }).should.throw("Node-RED not built");
+        });
+        it('passed if build has been run',function() {
+            sinon.stub(fs,"statSync",function() { });
+            RED.init({},{});
+        });
     });
-
-    var RED = require("../../red/red");
-
-    it('returns an app object', function() {
-        var srv = RED.app.use("/test", function() { return "app"; });
-        srv.should.be.an.instanceOf(Object);
-    });
-
-    it('returns an httpAdmin object', function() {
-        var srv = RED.httpAdmin.use("/test", function() { return "Admin"; });
-        srv.should.be.an.instanceOf(Object);
-    });
-
-    it('returns an httpNode object', function() {
-        var srv = RED.httpNode.use("/test", function() { return "Node"; });
-        srv.should.be.an.instanceOf(Object);
-    });
-
-    it('it returns a server object', function() {
-        var srv = RED.server;
-        srv.should.be.an.instanceOf(Object).and.have.property('domain', null);
-        //srv.should.be.an.instanceOf(Object).and.have.property('timeout', 120000);
+    
+    describe("externals", function() {
+        it('reports version', function() {
+            var p = require(path.join(process.env.NODE_RED_HOME,"package.json")).version;
+            RED.version().indexOf(p).should.eql(0);
+        });
+        it('access server externals', function() {
+            // TODO: unstubable accessors - need to make this testable
+            RED.app;
+            RED.httpAdmin;
+            RED.httpNode;
+            RED.server;
+        });
     });
 
 });