diff --git a/.gitignore b/.gitignore
index ef109a35a..ab0ae482a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,4 +17,5 @@ node_modules
 public
 locales/zz-ZZ
 nodes/core/locales/zz-ZZ
+!packages/node_modules
 packages/node_modules/@node-red/editor/public
diff --git a/Gruntfile.js b/Gruntfile.js
index 4c64e96e7..8ee5e6d6c 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -118,81 +118,81 @@ module.exports = function(grunt) {
                 src: [
                     // Ensure editor source files are concatenated in
                     // the right order
-                    "packages/node_modules/@node-red/editor/src/js/red.js",
-                    "packages/node_modules/@node-red/editor/src/js/events.js",
-                    "packages/node_modules/@node-red/editor/src/js/i18n.js",
-                    "packages/node_modules/@node-red/editor/src/js/settings.js",
-                    "packages/node_modules/@node-red/editor/src/js/user.js",
-                    "packages/node_modules/@node-red/editor/src/js/comms.js",
-                    "packages/node_modules/@node-red/editor/src/js/text/bidi.js",
-                    "packages/node_modules/@node-red/editor/src/js/text/format.js",
-                    "packages/node_modules/@node-red/editor/src/js/ui/state.js",
-                    "packages/node_modules/@node-red/editor/src/js/nodes.js",
-                    "packages/node_modules/@node-red/editor/src/js/history.js",
-                    "packages/node_modules/@node-red/editor/src/js/validators.js",
-                    "packages/node_modules/@node-red/editor/src/js/ui/utils.js",
-                    "packages/node_modules/@node-red/editor/src/js/ui/common/editableList.js",
-                    "packages/node_modules/@node-red/editor/src/js/ui/common/checkboxSet.js",
-                    "packages/node_modules/@node-red/editor/src/js/ui/common/menu.js",
-                    "packages/node_modules/@node-red/editor/src/js/ui/common/panels.js",
-                    "packages/node_modules/@node-red/editor/src/js/ui/common/popover.js",
-                    "packages/node_modules/@node-red/editor/src/js/ui/common/searchBox.js",
-                    "packages/node_modules/@node-red/editor/src/js/ui/common/tabs.js",
-                    "packages/node_modules/@node-red/editor/src/js/ui/common/stack.js",
-                    "packages/node_modules/@node-red/editor/src/js/ui/common/typedInput.js",
-                    "packages/node_modules/@node-red/editor/src/js/ui/actions.js",
-                    "packages/node_modules/@node-red/editor/src/js/ui/deploy.js",
-                    "packages/node_modules/@node-red/editor/src/js/ui/diff.js",
-                    "packages/node_modules/@node-red/editor/src/js/ui/keyboard.js",
-                    "packages/node_modules/@node-red/editor/src/js/ui/workspaces.js",
-                    "packages/node_modules/@node-red/editor/src/js/ui/view.js",
-                    "packages/node_modules/@node-red/editor/src/js/ui/view-navigator.js",
-                    "packages/node_modules/@node-red/editor/src/js/ui/sidebar.js",
-                    "packages/node_modules/@node-red/editor/src/js/ui/palette.js",
-                    "packages/node_modules/@node-red/editor/src/js/ui/tab-info.js",
-                    "packages/node_modules/@node-red/editor/src/js/ui/tab-config.js",
-                    "packages/node_modules/@node-red/editor/src/js/ui/tab-context.js",
-                    "packages/node_modules/@node-red/editor/src/js/ui/palette-editor.js",
-                    "packages/node_modules/@node-red/editor/src/js/ui/editor.js",
-                    "packages/node_modules/@node-red/editor/src/js/ui/editors/*.js",
-                    "packages/node_modules/@node-red/editor/src/js/ui/tray.js",
-                    "packages/node_modules/@node-red/editor/src/js/ui/clipboard.js",
-                    "packages/node_modules/@node-red/editor/src/js/ui/library.js",
-                    "packages/node_modules/@node-red/editor/src/js/ui/notifications.js",
-                    "packages/node_modules/@node-red/editor/src/js/ui/search.js",
-                    "packages/node_modules/@node-red/editor/src/js/ui/typeSearch.js",
-                    "packages/node_modules/@node-red/editor/src/js/ui/subflow.js",
-                    "packages/node_modules/@node-red/editor/src/js/ui/userSettings.js",
-                    "packages/node_modules/@node-red/editor/src/js/ui/projects/projects.js",
-                    "packages/node_modules/@node-red/editor/src/js/ui/projects/projectSettings.js",
-                    "packages/node_modules/@node-red/editor/src/js/ui/projects/projectUserSettings.js",
-                    "packages/node_modules/@node-red/editor/src/js/ui/projects/tab-versionControl.js",
-                    "packages/node_modules/@node-red/editor/src/js/ui/touch/radialMenu.js"
+                    "packages/node_modules/@node-red/editor-client/src/js/red.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/events.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/i18n.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/settings.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/user.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/comms.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/text/bidi.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/text/format.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/state.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/nodes.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/history.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/validators.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/utils.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/common/editableList.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/common/checkboxSet.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/common/menu.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/common/panels.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/common/popover.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/common/searchBox.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/common/tabs.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/common/stack.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/actions.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/deploy.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/diff.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/keyboard.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/view.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/view-navigator.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/sidebar.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/palette.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/tab-info.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/tab-config.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/tab-context.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/editor.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/editors/*.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/tray.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/library.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/notifications.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/search.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/typeSearch.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/userSettings.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/projects/projects.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/projects/projectSettings.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/projects/projectUserSettings.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/projects/tab-versionControl.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/touch/radialMenu.js"
                 ],
-                dest: "packages/node_modules/@node-red/editor/public/red/red.js"
+                dest: "packages/node_modules/@node-red/editor-client/public/red/red.js"
             },
             vendor: {
                 files: {
-                    "packages/node_modules/@node-red/editor/public/vendor/vendor.js": [
-                        "packages/node_modules/@node-red/editor/src/vendor/jquery/js/jquery-1.11.3.min.js",
-                        "packages/node_modules/@node-red/editor/src/vendor/bootstrap/js/bootstrap.min.js",
-                        "packages/node_modules/@node-red/editor/src/vendor/jquery/js/jquery-ui-1.10.3.custom.min.js",
-                        "packages/node_modules/@node-red/editor/src/vendor/jquery/js/jquery.ui.touch-punch.min.js",
-                        "packages/node_modules/@node-red/editor/src/vendor/marked/marked.min.js",
-                        "packages/node_modules/@node-red/editor/src/vendor/d3/d3.v3.min.js",
-                        "packages/node_modules/@node-red/editor/src/vendor/i18next/i18next.min.js"
+                    "packages/node_modules/@node-red/editor-client/public/vendor/vendor.js": [
+                        "packages/node_modules/@node-red/editor-client/src/vendor/jquery/js/jquery-1.11.3.min.js",
+                        "packages/node_modules/@node-red/editor-client/src/vendor/bootstrap/js/bootstrap.min.js",
+                        "packages/node_modules/@node-red/editor-client/src/vendor/jquery/js/jquery-ui-1.10.3.custom.min.js",
+                        "packages/node_modules/@node-red/editor-client/src/vendor/jquery/js/jquery.ui.touch-punch.min.js",
+                        "packages/node_modules/@node-red/editor-client/src/vendor/marked/marked.min.js",
+                        "packages/node_modules/@node-red/editor-client/src/vendor/d3/d3.v3.min.js",
+                        "packages/node_modules/@node-red/editor-client/src/vendor/i18next/i18next.min.js"
                     ],
-                    "packages/node_modules/@node-red/editor/public/vendor/vendor.css": [
+                    "packages/node_modules/@node-red/editor-client/public/vendor/vendor.css": [
                         // TODO: resolve relative resource paths in
                         //       bootstrap/FA/jquery
                     ],
-                    "packages/node_modules/@node-red/editor/public/vendor/jsonata/jsonata.min.js": [
+                    "packages/node_modules/@node-red/editor-client/public/vendor/jsonata/jsonata.min.js": [
                         "node_modules/jsonata/jsonata-es5.min.js",
-                        "packages/node_modules/@node-red/editor/src/vendor/jsonata/formatter.js"
+                        "packages/node_modules/@node-red/editor-client/src/vendor/jsonata/formatter.js"
                     ],
-                    "packages/node_modules/@node-red/editor/public/vendor/ace/worker-jsonata.js": [
+                    "packages/node_modules/@node-red/editor-client/public/vendor/ace/worker-jsonata.js": [
                         "node_modules/jsonata/jsonata-es5.min.js",
-                        "packages/node_modules/@node-red/editor/src/vendor/jsonata/worker-jsonata.js"
+                        "packages/node_modules/@node-red/editor-client/src/vendor/jsonata/worker-jsonata.js"
                     ]
                 }
             }
@@ -200,10 +200,10 @@ module.exports = function(grunt) {
         uglify: {
             build: {
                 files: {
-                    'packages/node_modules/@node-red/editor/public/red/red.min.js': 'packages/node_modules/@node-red/editor/public/red/red.js',
-                    'packages/node_modules/@node-red/editor/public/red/main.min.js': 'packages/node_modules/@node-red/editor/public/red/main.js',
-                    'packages/node_modules/@node-red/editor/public/vendor/ace/mode-jsonata.js': 'packages/node_modules/@node-red/editor/src/vendor/jsonata/mode-jsonata.js',
-                    'packages/node_modules/@node-red/editor/public/vendor/ace/snippets/jsonata.js': 'packages/node_modules/@node-red/editor/src/vendor/jsonata/snippets-jsonata.js'
+                    'packages/node_modules/@node-red/editor-client/public/red/red.min.js': 'packages/node_modules/@node-red/editor-client/public/red/red.js',
+                    'packages/node_modules/@node-red/editor-client/public/red/main.min.js': 'packages/node_modules/@node-red/editor-client/public/red/main.js',
+                    'packages/node_modules/@node-red/editor-client/public/vendor/ace/mode-jsonata.js': 'packages/node_modules/@node-red/editor-client/src/vendor/jsonata/mode-jsonata.js',
+                    'packages/node_modules/@node-red/editor-client/public/vendor/ace/snippets/jsonata.js': 'packages/node_modules/@node-red/editor-client/src/vendor/jsonata/snippets-jsonata.js'
                 }
             }
         },
@@ -213,12 +213,12 @@ module.exports = function(grunt) {
                     outputStyle: 'compressed'
                 },
                 files: [{
-                    dest: 'packages/node_modules/@node-red/editor/public/red/style.min.css',
-                    src: 'packages/node_modules/@node-red/editor/src/sass/style.scss'
+                    dest: 'packages/node_modules/@node-red/editor-client/public/red/style.min.css',
+                    src: 'packages/node_modules/@node-red/editor-client/src/sass/style.scss'
                 },
                 {
-                    dest: 'packages/node_modules/@node-red/editor/public/vendor/bootstrap/css/bootstrap.min.css',
-                    src: 'packages/node_modules/@node-red/editor/src/vendor/bootstrap/css/bootstrap.css'
+                    dest: 'packages/node_modules/@node-red/editor-client/public/vendor/bootstrap/css/bootstrap.min.css',
+                    src: 'packages/node_modules/@node-red/editor-client/src/vendor/bootstrap/css/bootstrap.css'
                 }]
             }
         },
@@ -232,31 +232,31 @@ module.exports = function(grunt) {
             },
             keymaps: {
                 src: [
-                    'packages/node_modules/@node-red/editor/src/js/keymap.json'
+                    'packages/node_modules/@node-red/editor-client/src/js/keymap.json'
                 ]
             }
         },
         attachCopyright: {
             js: {
                 src: [
-                    'packages/node_modules/@node-red/editor/public/red/red.min.js',
-                    'packages/node_modules/@node-red/editor/public/red/main.min.js'
+                    'packages/node_modules/@node-red/editor-client/public/red/red.min.js',
+                    'packages/node_modules/@node-red/editor-client/public/red/main.min.js'
                 ]
             },
             css: {
                 src: [
-                    'packages/node_modules/@node-red/editor/public/red/style.min.css'
+                    'packages/node_modules/@node-red/editor-client/public/red/style.min.css'
                 ]
             }
         },
         clean: {
             build: {
                 src: [
-                    "packages/node_modules/@node-red/editor/public/red",
-                    "packages/node_modules/@node-red/editor/public/index.html",
-                    "packages/node_modules/@node-red/editor/public/favicon.ico",
-                    "packages/node_modules/@node-red/editor/public/icons",
-                    "packages/node_modules/@node-red/editor/public/vendor"
+                    "packages/node_modules/@node-red/editor-client/public/red",
+                    "packages/node_modules/@node-red/editor-client/public/index.html",
+                    "packages/node_modules/@node-red/editor-client/public/favicon.ico",
+                    "packages/node_modules/@node-red/editor-client/public/icons",
+                    "packages/node_modules/@node-red/editor-client/public/vendor"
                 ]
             },
             release: {
@@ -268,13 +268,13 @@ module.exports = function(grunt) {
         watch: {
             js: {
                 files: [
-                    'packages/node_modules/@node-red/editor/src/js/**/*.js'
+                    'packages/node_modules/@node-red/editor-client/src/js/**/*.js'
                 ],
                 tasks: ['copy:build','concat','uglify','attachCopyright:js']
             },
             sass: {
                 files: [
-                    'packages/node_modules/@node-red/editor/src/sass/**/*.scss'
+                    'packages/node_modules/@node-red/editor-client/src/sass/**/*.scss'
                 ],
                 tasks: ['sass','attachCopyright:css']
             },
@@ -288,7 +288,7 @@ module.exports = function(grunt) {
             },
             keymaps: {
                 files: [
-                    'packages/node_modules/@node-red/editor/src/js/keymap.json'
+                    'packages/node_modules/@node-red/editor-client/src/js/keymap.json'
                 ],
                 tasks: ['jsonlint:keymaps','copy:build']
             },
@@ -327,21 +327,21 @@ module.exports = function(grunt) {
             build: {
                 files:[
                     {
-                        src: 'packages/node_modules/@node-red/editor/src/js/main.js',
-                        dest: 'packages/node_modules/@node-red/editor/public/red/main.js'
+                        src: 'packages/node_modules/@node-red/editor-client/src/js/main.js',
+                        dest: 'packages/node_modules/@node-red/editor-client/public/red/main.js'
                     },
                     {
-                        src: 'packages/node_modules/@node-red/editor/src/js/keymap.json',
-                        dest: 'packages/node_modules/@node-red/editor/public/red/keymap.json'
+                        src: 'packages/node_modules/@node-red/editor-client/src/js/keymap.json',
+                        dest: 'packages/node_modules/@node-red/editor-client/public/red/keymap.json'
                     },
                     {
-                        cwd: 'packages/node_modules/@node-red/editor/src/images',
+                        cwd: 'packages/node_modules/@node-red/editor-client/src/images',
                         src: '**',
                         expand: true,
-                        dest: 'packages/node_modules/@node-red/editor/public/red/images/'
+                        dest: 'packages/node_modules/@node-red/editor-client/public/red/images/'
                     },
                     {
-                        cwd: 'packages/node_modules/@node-red/editor/src/vendor',
+                        cwd: 'packages/node_modules/@node-red/editor-client/src/vendor',
                         src: [
                             'ace/**',
                             //'bootstrap/css/**',
@@ -350,23 +350,23 @@ module.exports = function(grunt) {
                             'font-awesome/**'
                         ],
                         expand: true,
-                        dest: 'packages/node_modules/@node-red/editor/public/vendor/'
+                        dest: 'packages/node_modules/@node-red/editor-client/public/vendor/'
                     },
                     {
-                        cwd: 'packages/node_modules/@node-red/editor/src/icons',
+                        cwd: 'packages/node_modules/@node-red/editor-client/src/icons',
                         src: '**',
                         expand: true,
-                        dest: 'packages/node_modules/@node-red/editor/public/icons/'
+                        dest: 'packages/node_modules/@node-red/editor-client/public/icons/'
                     },
                     {
                         expand: true,
-                        src: ['packages/node_modules/@node-red/editor/src/index.html','packages/node_modules/@node-red/editor/src/favicon.ico'],
-                        dest: 'packages/node_modules/@node-red/editor/public/',
+                        src: ['packages/node_modules/@node-red/editor-client/src/index.html','packages/node_modules/@node-red/editor-client/src/favicon.ico'],
+                        dest: 'packages/node_modules/@node-red/editor-client/public/',
                         flatten: true
                     },
                     {
                         src: 'CHANGELOG.md',
-                        dest: 'packages/node_modules/@node-red/editor/public/red/about'
+                        dest: 'packages/node_modules/@node-red/editor-client/public/red/about'
                     }
                 ]
             },
diff --git a/packages/node_modules/@node-red/editor/lib/admin/context.js b/packages/node_modules/@node-red/editor-api/lib/admin/context.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/lib/admin/context.js
rename to packages/node_modules/@node-red/editor-api/lib/admin/context.js
diff --git a/packages/node_modules/@node-red/editor/lib/admin/flow.js b/packages/node_modules/@node-red/editor-api/lib/admin/flow.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/lib/admin/flow.js
rename to packages/node_modules/@node-red/editor-api/lib/admin/flow.js
diff --git a/packages/node_modules/@node-red/editor/lib/admin/flows.js b/packages/node_modules/@node-red/editor-api/lib/admin/flows.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/lib/admin/flows.js
rename to packages/node_modules/@node-red/editor-api/lib/admin/flows.js
diff --git a/packages/node_modules/@node-red/editor/lib/admin/index.js b/packages/node_modules/@node-red/editor-api/lib/admin/index.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/lib/admin/index.js
rename to packages/node_modules/@node-red/editor-api/lib/admin/index.js
diff --git a/packages/node_modules/@node-red/editor/lib/admin/nodes.js b/packages/node_modules/@node-red/editor-api/lib/admin/nodes.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/lib/admin/nodes.js
rename to packages/node_modules/@node-red/editor-api/lib/admin/nodes.js
diff --git a/packages/node_modules/@node-red/editor/lib/auth/clients.js b/packages/node_modules/@node-red/editor-api/lib/auth/clients.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/lib/auth/clients.js
rename to packages/node_modules/@node-red/editor-api/lib/auth/clients.js
diff --git a/packages/node_modules/@node-red/editor/lib/auth/index.js b/packages/node_modules/@node-red/editor-api/lib/auth/index.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/lib/auth/index.js
rename to packages/node_modules/@node-red/editor-api/lib/auth/index.js
diff --git a/packages/node_modules/@node-red/editor/lib/auth/permissions.js b/packages/node_modules/@node-red/editor-api/lib/auth/permissions.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/lib/auth/permissions.js
rename to packages/node_modules/@node-red/editor-api/lib/auth/permissions.js
diff --git a/packages/node_modules/@node-red/editor/lib/auth/strategies.js b/packages/node_modules/@node-red/editor-api/lib/auth/strategies.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/lib/auth/strategies.js
rename to packages/node_modules/@node-red/editor-api/lib/auth/strategies.js
diff --git a/packages/node_modules/@node-red/editor/lib/auth/tokens.js b/packages/node_modules/@node-red/editor-api/lib/auth/tokens.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/lib/auth/tokens.js
rename to packages/node_modules/@node-red/editor-api/lib/auth/tokens.js
diff --git a/packages/node_modules/@node-red/editor/lib/auth/users.js b/packages/node_modules/@node-red/editor-api/lib/auth/users.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/lib/auth/users.js
rename to packages/node_modules/@node-red/editor-api/lib/auth/users.js
diff --git a/packages/node_modules/@node-red/editor/lib/editor/comms.js b/packages/node_modules/@node-red/editor-api/lib/editor/comms.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/lib/editor/comms.js
rename to packages/node_modules/@node-red/editor-api/lib/editor/comms.js
diff --git a/packages/node_modules/@node-red/editor/lib/editor/credentials.js b/packages/node_modules/@node-red/editor-api/lib/editor/credentials.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/lib/editor/credentials.js
rename to packages/node_modules/@node-red/editor-api/lib/editor/credentials.js
diff --git a/packages/node_modules/@node-red/editor/lib/editor/index.js b/packages/node_modules/@node-red/editor-api/lib/editor/index.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/lib/editor/index.js
rename to packages/node_modules/@node-red/editor-api/lib/editor/index.js
diff --git a/packages/node_modules/@node-red/editor/lib/editor/library.js b/packages/node_modules/@node-red/editor-api/lib/editor/library.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/lib/editor/library.js
rename to packages/node_modules/@node-red/editor-api/lib/editor/library.js
diff --git a/packages/node_modules/@node-red/editor/lib/editor/locales.js b/packages/node_modules/@node-red/editor-api/lib/editor/locales.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/lib/editor/locales.js
rename to packages/node_modules/@node-red/editor-api/lib/editor/locales.js
diff --git a/packages/node_modules/@node-red/editor/lib/editor/locales/en-US/editor.json b/packages/node_modules/@node-red/editor-api/lib/editor/locales/en-US/editor.json
similarity index 100%
rename from packages/node_modules/@node-red/editor/lib/editor/locales/en-US/editor.json
rename to packages/node_modules/@node-red/editor-api/lib/editor/locales/en-US/editor.json
diff --git a/packages/node_modules/@node-red/editor/lib/editor/locales/en-US/infotips.json b/packages/node_modules/@node-red/editor-api/lib/editor/locales/en-US/infotips.json
similarity index 100%
rename from packages/node_modules/@node-red/editor/lib/editor/locales/en-US/infotips.json
rename to packages/node_modules/@node-red/editor-api/lib/editor/locales/en-US/infotips.json
diff --git a/packages/node_modules/@node-red/editor/lib/editor/locales/en-US/jsonata.json b/packages/node_modules/@node-red/editor-api/lib/editor/locales/en-US/jsonata.json
similarity index 100%
rename from packages/node_modules/@node-red/editor/lib/editor/locales/en-US/jsonata.json
rename to packages/node_modules/@node-red/editor-api/lib/editor/locales/en-US/jsonata.json
diff --git a/packages/node_modules/@node-red/editor/lib/editor/locales/ja/editor.json b/packages/node_modules/@node-red/editor-api/lib/editor/locales/ja/editor.json
similarity index 100%
rename from packages/node_modules/@node-red/editor/lib/editor/locales/ja/editor.json
rename to packages/node_modules/@node-red/editor-api/lib/editor/locales/ja/editor.json
diff --git a/packages/node_modules/@node-red/editor/lib/editor/locales/ja/infotips.json b/packages/node_modules/@node-red/editor-api/lib/editor/locales/ja/infotips.json
similarity index 100%
rename from packages/node_modules/@node-red/editor/lib/editor/locales/ja/infotips.json
rename to packages/node_modules/@node-red/editor-api/lib/editor/locales/ja/infotips.json
diff --git a/packages/node_modules/@node-red/editor/lib/editor/locales/ja/jsonata.json b/packages/node_modules/@node-red/editor-api/lib/editor/locales/ja/jsonata.json
similarity index 100%
rename from packages/node_modules/@node-red/editor/lib/editor/locales/ja/jsonata.json
rename to packages/node_modules/@node-red/editor-api/lib/editor/locales/ja/jsonata.json
diff --git a/packages/node_modules/@node-red/editor/lib/editor/locales/zh-CN/editor.json b/packages/node_modules/@node-red/editor-api/lib/editor/locales/zh-CN/editor.json
similarity index 100%
rename from packages/node_modules/@node-red/editor/lib/editor/locales/zh-CN/editor.json
rename to packages/node_modules/@node-red/editor-api/lib/editor/locales/zh-CN/editor.json
diff --git a/packages/node_modules/@node-red/editor/lib/editor/locales/zh-CN/infotips.json b/packages/node_modules/@node-red/editor-api/lib/editor/locales/zh-CN/infotips.json
similarity index 100%
rename from packages/node_modules/@node-red/editor/lib/editor/locales/zh-CN/infotips.json
rename to packages/node_modules/@node-red/editor-api/lib/editor/locales/zh-CN/infotips.json
diff --git a/packages/node_modules/@node-red/editor/lib/editor/locales/zh-CN/jsonata.json b/packages/node_modules/@node-red/editor-api/lib/editor/locales/zh-CN/jsonata.json
similarity index 100%
rename from packages/node_modules/@node-red/editor/lib/editor/locales/zh-CN/jsonata.json
rename to packages/node_modules/@node-red/editor-api/lib/editor/locales/zh-CN/jsonata.json
diff --git a/packages/node_modules/@node-red/editor/lib/editor/projects.js b/packages/node_modules/@node-red/editor-api/lib/editor/projects.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/lib/editor/projects.js
rename to packages/node_modules/@node-red/editor-api/lib/editor/projects.js
diff --git a/packages/node_modules/@node-red/editor/lib/editor/settings.js b/packages/node_modules/@node-red/editor-api/lib/editor/settings.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/lib/editor/settings.js
rename to packages/node_modules/@node-red/editor-api/lib/editor/settings.js
diff --git a/packages/node_modules/@node-red/editor/lib/editor/sshkeys.js b/packages/node_modules/@node-red/editor-api/lib/editor/sshkeys.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/lib/editor/sshkeys.js
rename to packages/node_modules/@node-red/editor-api/lib/editor/sshkeys.js
diff --git a/packages/node_modules/@node-red/editor/lib/editor/theme.js b/packages/node_modules/@node-red/editor-api/lib/editor/theme.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/lib/editor/theme.js
rename to packages/node_modules/@node-red/editor-api/lib/editor/theme.js
diff --git a/packages/node_modules/@node-red/editor/lib/editor/ui.js b/packages/node_modules/@node-red/editor-api/lib/editor/ui.js
similarity index 84%
rename from packages/node_modules/@node-red/editor/lib/editor/ui.js
rename to packages/node_modules/@node-red/editor-api/lib/editor/ui.js
index 55e880980..01d8aa0b1 100644
--- a/packages/node_modules/@node-red/editor/lib/editor/ui.js
+++ b/packages/node_modules/@node-red/editor-api/lib/editor/ui.js
@@ -24,15 +24,14 @@ var apiUtils = require("../util");
 var theme = require("./theme");
 
 var runtimeAPI;
-
-var defaultNodeIcon = path.resolve(__dirname+"/../../src/images/icons/arrow-in.png")
-var templateDir = path.resolve(__dirname+"/../../src/templates");
-var editorTemplate;
+var editorClientDir = path.dirname(require.resolve("@node-red/editor-client"));
+var defaultNodeIcon = path.join(editorClientDir,"public","red","images","icons","arrow-in.png");
+var editorTemplate = path.join(editorClientDir,"src","templates","index.mst");
 
 module.exports = {
     init: function(_runtimeAPI) {
         runtimeAPI = _runtimeAPI;
-        editorTemplate = fs.readFileSync(path.join(templateDir,"index.mst"),"utf8");
+        editorTemplate = fs.readFileSync(editorTemplate,"utf8");
         Mustache.parse(editorTemplate);
     },
 
@@ -71,5 +70,5 @@ module.exports = {
     editor: function(req,res) {
         res.send(Mustache.render(editorTemplate,theme.context()));
     },
-    editorResources: express.static(__dirname + '/../../public')
+    editorResources: express.static(path.join(editorClientDir,'public'))
 };
diff --git a/packages/node_modules/@node-red/editor/lib/index.js b/packages/node_modules/@node-red/editor-api/lib/index.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/lib/index.js
rename to packages/node_modules/@node-red/editor-api/lib/index.js
diff --git a/packages/node_modules/@node-red/editor/lib/util.js b/packages/node_modules/@node-red/editor-api/lib/util.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/lib/util.js
rename to packages/node_modules/@node-red/editor-api/lib/util.js
diff --git a/packages/node_modules/@node-red/editor-api/package.json b/packages/node_modules/@node-red/editor-api/package.json
new file mode 100644
index 000000000..8fa2b7bc6
--- /dev/null
+++ b/packages/node_modules/@node-red/editor-api/package.json
@@ -0,0 +1,23 @@
+{
+    "name": "@node-red/editor",
+    "version": "0.20.0",
+    "license": "Apache-2.0",
+    "main": "./lib/index.js",
+    "dependencies": {
+        "body-parser": "1.18.3",
+        "clone": "2.1.2",
+        "express": "4.16.3",
+        "mime": "1.4.1",
+        "mustache": "2.3.1",
+        "oauth2orize": "1.11.0",
+        "passport": "0.4.0",
+        "ws": "1.1.5",
+        "bcryptjs": "2.4.3",
+        "cors": "2.8.4",
+        "express-session": "1.15.6",
+        "memorystore": "1.6.0",
+        "passport-http-bearer": "1.0.1",
+        "passport-oauth2-client-password": "0.1.2",
+        "when": "3.7.8"
+    }
+}
\ No newline at end of file
diff --git a/packages/node_modules/@node-red/editor-client/index.js b/packages/node_modules/@node-red/editor-client/index.js
new file mode 100644
index 000000000..14800aae9
--- /dev/null
+++ b/packages/node_modules/@node-red/editor-client/index.js
@@ -0,0 +1,17 @@
+/**
+ * Copyright JS Foundation and other contributors, http://js.foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+module.exports = false
diff --git a/packages/node_modules/@node-red/editor/package.json b/packages/node_modules/@node-red/editor-client/package.json
similarity index 68%
rename from packages/node_modules/@node-red/editor/package.json
rename to packages/node_modules/@node-red/editor-client/package.json
index 52ea2be3d..adb333c19 100644
--- a/packages/node_modules/@node-red/editor/package.json
+++ b/packages/node_modules/@node-red/editor-client/package.json
@@ -1,5 +1,5 @@
 {
-   "name": "@node-red/editor",
+   "name": "@node-red/editor-client",
    "version": "0.20.0",
    "license": "Apache-2.0",
    "main": "./lib/index.js"
diff --git a/packages/node_modules/@node-red/editor/src/favicon.ico b/packages/node_modules/@node-red/editor-client/src/favicon.ico
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/favicon.ico
rename to packages/node_modules/@node-red/editor-client/src/favicon.ico
diff --git a/packages/node_modules/@node-red/editor/src/images/deploy-flows-o.png b/packages/node_modules/@node-red/editor-client/src/images/deploy-flows-o.png
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/images/deploy-flows-o.png
rename to packages/node_modules/@node-red/editor-client/src/images/deploy-flows-o.png
diff --git a/packages/node_modules/@node-red/editor/src/images/deploy-flows.png b/packages/node_modules/@node-red/editor-client/src/images/deploy-flows.png
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/images/deploy-flows.png
rename to packages/node_modules/@node-red/editor-client/src/images/deploy-flows.png
diff --git a/packages/node_modules/@node-red/editor/src/images/deploy-full-o.png b/packages/node_modules/@node-red/editor-client/src/images/deploy-full-o.png
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/images/deploy-full-o.png
rename to packages/node_modules/@node-red/editor-client/src/images/deploy-full-o.png
diff --git a/packages/node_modules/@node-red/editor/src/images/deploy-full.png b/packages/node_modules/@node-red/editor-client/src/images/deploy-full.png
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/images/deploy-full.png
rename to packages/node_modules/@node-red/editor-client/src/images/deploy-full.png
diff --git a/packages/node_modules/@node-red/editor/src/images/deploy-nodes-o.png b/packages/node_modules/@node-red/editor-client/src/images/deploy-nodes-o.png
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/images/deploy-nodes-o.png
rename to packages/node_modules/@node-red/editor-client/src/images/deploy-nodes-o.png
diff --git a/packages/node_modules/@node-red/editor/src/images/deploy-nodes.png b/packages/node_modules/@node-red/editor-client/src/images/deploy-nodes.png
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/images/deploy-nodes.png
rename to packages/node_modules/@node-red/editor-client/src/images/deploy-nodes.png
diff --git a/packages/node_modules/@node-red/editor/src/images/grip.png b/packages/node_modules/@node-red/editor-client/src/images/grip.png
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/images/grip.png
rename to packages/node_modules/@node-red/editor-client/src/images/grip.png
diff --git a/packages/node_modules/@node-red/editor/src/images/icons/arrow-in.png b/packages/node_modules/@node-red/editor-client/src/images/icons/arrow-in.png
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/images/icons/arrow-in.png
rename to packages/node_modules/@node-red/editor-client/src/images/icons/arrow-in.png
diff --git a/packages/node_modules/@node-red/editor/src/images/icons/node-changed.png b/packages/node_modules/@node-red/editor-client/src/images/icons/node-changed.png
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/images/icons/node-changed.png
rename to packages/node_modules/@node-red/editor-client/src/images/icons/node-changed.png
diff --git a/packages/node_modules/@node-red/editor/src/images/icons/node-error.png b/packages/node_modules/@node-red/editor-client/src/images/icons/node-error.png
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/images/icons/node-error.png
rename to packages/node_modules/@node-red/editor-client/src/images/icons/node-error.png
diff --git a/packages/node_modules/@node-red/editor/src/images/node-red-256.png b/packages/node_modules/@node-red/editor-client/src/images/node-red-256.png
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/images/node-red-256.png
rename to packages/node_modules/@node-red/editor-client/src/images/node-red-256.png
diff --git a/packages/node_modules/@node-red/editor/src/images/node-red-icon-black.svg b/packages/node_modules/@node-red/editor-client/src/images/node-red-icon-black.svg
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/images/node-red-icon-black.svg
rename to packages/node_modules/@node-red/editor-client/src/images/node-red-icon-black.svg
diff --git a/packages/node_modules/@node-red/editor/src/images/node-red-icon.svg b/packages/node_modules/@node-red/editor-client/src/images/node-red-icon.svg
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/images/node-red-icon.svg
rename to packages/node_modules/@node-red/editor-client/src/images/node-red-icon.svg
diff --git a/packages/node_modules/@node-red/editor/src/images/node-red.png b/packages/node_modules/@node-red/editor-client/src/images/node-red.png
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/images/node-red.png
rename to packages/node_modules/@node-red/editor-client/src/images/node-red.png
diff --git a/packages/node_modules/@node-red/editor/src/images/pw_maze_white.png b/packages/node_modules/@node-red/editor-client/src/images/pw_maze_white.png
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/images/pw_maze_white.png
rename to packages/node_modules/@node-red/editor-client/src/images/pw_maze_white.png
diff --git a/packages/node_modules/@node-red/editor/src/images/spin.svg b/packages/node_modules/@node-red/editor-client/src/images/spin.svg
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/images/spin.svg
rename to packages/node_modules/@node-red/editor-client/src/images/spin.svg
diff --git a/packages/node_modules/@node-red/editor/src/images/subflow_tab.png b/packages/node_modules/@node-red/editor-client/src/images/subflow_tab.png
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/images/subflow_tab.png
rename to packages/node_modules/@node-red/editor-client/src/images/subflow_tab.png
diff --git a/packages/node_modules/@node-red/editor/src/images/typedInput/09.png b/packages/node_modules/@node-red/editor-client/src/images/typedInput/09.png
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/images/typedInput/09.png
rename to packages/node_modules/@node-red/editor-client/src/images/typedInput/09.png
diff --git a/packages/node_modules/@node-red/editor/src/images/typedInput/az.png b/packages/node_modules/@node-red/editor-client/src/images/typedInput/az.png
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/images/typedInput/az.png
rename to packages/node_modules/@node-red/editor-client/src/images/typedInput/az.png
diff --git a/packages/node_modules/@node-red/editor/src/images/typedInput/bin.png b/packages/node_modules/@node-red/editor-client/src/images/typedInput/bin.png
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/images/typedInput/bin.png
rename to packages/node_modules/@node-red/editor-client/src/images/typedInput/bin.png
diff --git a/packages/node_modules/@node-red/editor/src/images/typedInput/bool.png b/packages/node_modules/@node-red/editor-client/src/images/typedInput/bool.png
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/images/typedInput/bool.png
rename to packages/node_modules/@node-red/editor-client/src/images/typedInput/bool.png
diff --git a/packages/node_modules/@node-red/editor/src/images/typedInput/env.png b/packages/node_modules/@node-red/editor-client/src/images/typedInput/env.png
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/images/typedInput/env.png
rename to packages/node_modules/@node-red/editor-client/src/images/typedInput/env.png
diff --git a/packages/node_modules/@node-red/editor/src/images/typedInput/expr.png b/packages/node_modules/@node-red/editor-client/src/images/typedInput/expr.png
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/images/typedInput/expr.png
rename to packages/node_modules/@node-red/editor-client/src/images/typedInput/expr.png
diff --git a/packages/node_modules/@node-red/editor/src/images/typedInput/json.png b/packages/node_modules/@node-red/editor-client/src/images/typedInput/json.png
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/images/typedInput/json.png
rename to packages/node_modules/@node-red/editor-client/src/images/typedInput/json.png
diff --git a/packages/node_modules/@node-red/editor/src/images/typedInput/re.png b/packages/node_modules/@node-red/editor-client/src/images/typedInput/re.png
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/images/typedInput/re.png
rename to packages/node_modules/@node-red/editor-client/src/images/typedInput/re.png
diff --git a/packages/node_modules/@node-red/editor/src/js/comms.js b/packages/node_modules/@node-red/editor-client/src/js/comms.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/js/comms.js
rename to packages/node_modules/@node-red/editor-client/src/js/comms.js
diff --git a/packages/node_modules/@node-red/editor/src/js/events.js b/packages/node_modules/@node-red/editor-client/src/js/events.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/js/events.js
rename to packages/node_modules/@node-red/editor-client/src/js/events.js
diff --git a/packages/node_modules/@node-red/editor/src/js/history.js b/packages/node_modules/@node-red/editor-client/src/js/history.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/js/history.js
rename to packages/node_modules/@node-red/editor-client/src/js/history.js
diff --git a/packages/node_modules/@node-red/editor/src/js/i18n.js b/packages/node_modules/@node-red/editor-client/src/js/i18n.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/js/i18n.js
rename to packages/node_modules/@node-red/editor-client/src/js/i18n.js
diff --git a/packages/node_modules/@node-red/editor/src/js/keymap.json b/packages/node_modules/@node-red/editor-client/src/js/keymap.json
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/js/keymap.json
rename to packages/node_modules/@node-red/editor-client/src/js/keymap.json
diff --git a/packages/node_modules/@node-red/editor/src/js/main.js b/packages/node_modules/@node-red/editor-client/src/js/main.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/js/main.js
rename to packages/node_modules/@node-red/editor-client/src/js/main.js
diff --git a/packages/node_modules/@node-red/editor/src/js/nodes.js b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/js/nodes.js
rename to packages/node_modules/@node-red/editor-client/src/js/nodes.js
diff --git a/packages/node_modules/@node-red/editor/src/js/red.js b/packages/node_modules/@node-red/editor-client/src/js/red.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/js/red.js
rename to packages/node_modules/@node-red/editor-client/src/js/red.js
diff --git a/packages/node_modules/@node-red/editor/src/js/settings.js b/packages/node_modules/@node-red/editor-client/src/js/settings.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/js/settings.js
rename to packages/node_modules/@node-red/editor-client/src/js/settings.js
diff --git a/packages/node_modules/@node-red/editor/src/js/text/bidi.js b/packages/node_modules/@node-red/editor-client/src/js/text/bidi.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/js/text/bidi.js
rename to packages/node_modules/@node-red/editor-client/src/js/text/bidi.js
diff --git a/packages/node_modules/@node-red/editor/src/js/text/format.js b/packages/node_modules/@node-red/editor-client/src/js/text/format.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/js/text/format.js
rename to packages/node_modules/@node-red/editor-client/src/js/text/format.js
diff --git a/packages/node_modules/@node-red/editor/src/js/ui/actions.js b/packages/node_modules/@node-red/editor-client/src/js/ui/actions.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/js/ui/actions.js
rename to packages/node_modules/@node-red/editor-client/src/js/ui/actions.js
diff --git a/packages/node_modules/@node-red/editor/src/js/ui/clipboard.js b/packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/js/ui/clipboard.js
rename to packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js
diff --git a/packages/node_modules/@node-red/editor/src/js/ui/common/checkboxSet.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/checkboxSet.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/js/ui/common/checkboxSet.js
rename to packages/node_modules/@node-red/editor-client/src/js/ui/common/checkboxSet.js
diff --git a/packages/node_modules/@node-red/editor/src/js/ui/common/editableList.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/editableList.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/js/ui/common/editableList.js
rename to packages/node_modules/@node-red/editor-client/src/js/ui/common/editableList.js
diff --git a/packages/node_modules/@node-red/editor/src/js/ui/common/menu.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/menu.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/js/ui/common/menu.js
rename to packages/node_modules/@node-red/editor-client/src/js/ui/common/menu.js
diff --git a/packages/node_modules/@node-red/editor/src/js/ui/common/panels.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/panels.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/js/ui/common/panels.js
rename to packages/node_modules/@node-red/editor-client/src/js/ui/common/panels.js
diff --git a/packages/node_modules/@node-red/editor/src/js/ui/common/popover.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/popover.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/js/ui/common/popover.js
rename to packages/node_modules/@node-red/editor-client/src/js/ui/common/popover.js
diff --git a/packages/node_modules/@node-red/editor/src/js/ui/common/searchBox.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/searchBox.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/js/ui/common/searchBox.js
rename to packages/node_modules/@node-red/editor-client/src/js/ui/common/searchBox.js
diff --git a/packages/node_modules/@node-red/editor/src/js/ui/common/stack.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/stack.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/js/ui/common/stack.js
rename to packages/node_modules/@node-red/editor-client/src/js/ui/common/stack.js
diff --git a/packages/node_modules/@node-red/editor/src/js/ui/common/tabs.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/tabs.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/js/ui/common/tabs.js
rename to packages/node_modules/@node-red/editor-client/src/js/ui/common/tabs.js
diff --git a/packages/node_modules/@node-red/editor/src/js/ui/common/typedInput.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/js/ui/common/typedInput.js
rename to packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js
diff --git a/packages/node_modules/@node-red/editor/src/js/ui/deploy.js b/packages/node_modules/@node-red/editor-client/src/js/ui/deploy.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/js/ui/deploy.js
rename to packages/node_modules/@node-red/editor-client/src/js/ui/deploy.js
diff --git a/packages/node_modules/@node-red/editor/src/js/ui/diff.js b/packages/node_modules/@node-red/editor-client/src/js/ui/diff.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/js/ui/diff.js
rename to packages/node_modules/@node-red/editor-client/src/js/ui/diff.js
diff --git a/packages/node_modules/@node-red/editor/src/js/ui/editor.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/js/ui/editor.js
rename to packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
diff --git a/packages/node_modules/@node-red/editor/src/js/ui/editors/buffer.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/buffer.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/js/ui/editors/buffer.js
rename to packages/node_modules/@node-red/editor-client/src/js/ui/editors/buffer.js
diff --git a/packages/node_modules/@node-red/editor/src/js/ui/editors/expression.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/expression.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/js/ui/editors/expression.js
rename to packages/node_modules/@node-red/editor-client/src/js/ui/editors/expression.js
diff --git a/packages/node_modules/@node-red/editor/src/js/ui/editors/js.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/js.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/js/ui/editors/js.js
rename to packages/node_modules/@node-red/editor-client/src/js/ui/editors/js.js
diff --git a/packages/node_modules/@node-red/editor/src/js/ui/editors/json.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/json.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/js/ui/editors/json.js
rename to packages/node_modules/@node-red/editor-client/src/js/ui/editors/json.js
diff --git a/packages/node_modules/@node-red/editor/src/js/ui/editors/markdown.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/markdown.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/js/ui/editors/markdown.js
rename to packages/node_modules/@node-red/editor-client/src/js/ui/editors/markdown.js
diff --git a/packages/node_modules/@node-red/editor/src/js/ui/keyboard.js b/packages/node_modules/@node-red/editor-client/src/js/ui/keyboard.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/js/ui/keyboard.js
rename to packages/node_modules/@node-red/editor-client/src/js/ui/keyboard.js
diff --git a/packages/node_modules/@node-red/editor/src/js/ui/library.js b/packages/node_modules/@node-red/editor-client/src/js/ui/library.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/js/ui/library.js
rename to packages/node_modules/@node-red/editor-client/src/js/ui/library.js
diff --git a/packages/node_modules/@node-red/editor/src/js/ui/notifications.js b/packages/node_modules/@node-red/editor-client/src/js/ui/notifications.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/js/ui/notifications.js
rename to packages/node_modules/@node-red/editor-client/src/js/ui/notifications.js
diff --git a/packages/node_modules/@node-red/editor/src/js/ui/palette-editor.js b/packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/js/ui/palette-editor.js
rename to packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js
diff --git a/packages/node_modules/@node-red/editor/src/js/ui/palette.js b/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/js/ui/palette.js
rename to packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
diff --git a/packages/node_modules/@node-red/editor/src/js/ui/projects/projectSettings.js b/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projectSettings.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/js/ui/projects/projectSettings.js
rename to packages/node_modules/@node-red/editor-client/src/js/ui/projects/projectSettings.js
diff --git a/packages/node_modules/@node-red/editor/src/js/ui/projects/projectUserSettings.js b/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projectUserSettings.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/js/ui/projects/projectUserSettings.js
rename to packages/node_modules/@node-red/editor-client/src/js/ui/projects/projectUserSettings.js
diff --git a/packages/node_modules/@node-red/editor/src/js/ui/projects/projects.js b/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projects.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/js/ui/projects/projects.js
rename to packages/node_modules/@node-red/editor-client/src/js/ui/projects/projects.js
diff --git a/packages/node_modules/@node-red/editor/src/js/ui/projects/tab-versionControl.js b/packages/node_modules/@node-red/editor-client/src/js/ui/projects/tab-versionControl.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/js/ui/projects/tab-versionControl.js
rename to packages/node_modules/@node-red/editor-client/src/js/ui/projects/tab-versionControl.js
diff --git a/packages/node_modules/@node-red/editor/src/js/ui/search.js b/packages/node_modules/@node-red/editor-client/src/js/ui/search.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/js/ui/search.js
rename to packages/node_modules/@node-red/editor-client/src/js/ui/search.js
diff --git a/packages/node_modules/@node-red/editor/src/js/ui/sidebar.js b/packages/node_modules/@node-red/editor-client/src/js/ui/sidebar.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/js/ui/sidebar.js
rename to packages/node_modules/@node-red/editor-client/src/js/ui/sidebar.js
diff --git a/packages/node_modules/@node-red/editor/src/js/ui/state.js b/packages/node_modules/@node-red/editor-client/src/js/ui/state.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/js/ui/state.js
rename to packages/node_modules/@node-red/editor-client/src/js/ui/state.js
diff --git a/packages/node_modules/@node-red/editor/src/js/ui/subflow.js b/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/js/ui/subflow.js
rename to packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
diff --git a/packages/node_modules/@node-red/editor/src/js/ui/tab-config.js b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-config.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/js/ui/tab-config.js
rename to packages/node_modules/@node-red/editor-client/src/js/ui/tab-config.js
diff --git a/packages/node_modules/@node-red/editor/src/js/ui/tab-context.js b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-context.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/js/ui/tab-context.js
rename to packages/node_modules/@node-red/editor-client/src/js/ui/tab-context.js
diff --git a/packages/node_modules/@node-red/editor/src/js/ui/tab-info.js b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/js/ui/tab-info.js
rename to packages/node_modules/@node-red/editor-client/src/js/ui/tab-info.js
diff --git a/packages/node_modules/@node-red/editor/src/js/ui/touch/radialMenu.js b/packages/node_modules/@node-red/editor-client/src/js/ui/touch/radialMenu.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/js/ui/touch/radialMenu.js
rename to packages/node_modules/@node-red/editor-client/src/js/ui/touch/radialMenu.js
diff --git a/packages/node_modules/@node-red/editor/src/js/ui/tray.js b/packages/node_modules/@node-red/editor-client/src/js/ui/tray.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/js/ui/tray.js
rename to packages/node_modules/@node-red/editor-client/src/js/ui/tray.js
diff --git a/packages/node_modules/@node-red/editor/src/js/ui/typeSearch.js b/packages/node_modules/@node-red/editor-client/src/js/ui/typeSearch.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/js/ui/typeSearch.js
rename to packages/node_modules/@node-red/editor-client/src/js/ui/typeSearch.js
diff --git a/packages/node_modules/@node-red/editor/src/js/ui/userSettings.js b/packages/node_modules/@node-red/editor-client/src/js/ui/userSettings.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/js/ui/userSettings.js
rename to packages/node_modules/@node-red/editor-client/src/js/ui/userSettings.js
diff --git a/packages/node_modules/@node-red/editor/src/js/ui/utils.js b/packages/node_modules/@node-red/editor-client/src/js/ui/utils.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/js/ui/utils.js
rename to packages/node_modules/@node-red/editor-client/src/js/ui/utils.js
diff --git a/packages/node_modules/@node-red/editor/src/js/ui/view-navigator.js b/packages/node_modules/@node-red/editor-client/src/js/ui/view-navigator.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/js/ui/view-navigator.js
rename to packages/node_modules/@node-red/editor-client/src/js/ui/view-navigator.js
diff --git a/packages/node_modules/@node-red/editor/src/js/ui/view.js b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/js/ui/view.js
rename to packages/node_modules/@node-red/editor-client/src/js/ui/view.js
diff --git a/packages/node_modules/@node-red/editor/src/js/ui/workspaces.js b/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/js/ui/workspaces.js
rename to packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js
diff --git a/packages/node_modules/@node-red/editor/src/js/user.js b/packages/node_modules/@node-red/editor-client/src/js/user.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/js/user.js
rename to packages/node_modules/@node-red/editor-client/src/js/user.js
diff --git a/packages/node_modules/@node-red/editor/src/js/validators.js b/packages/node_modules/@node-red/editor-client/src/js/validators.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/js/validators.js
rename to packages/node_modules/@node-red/editor-client/src/js/validators.js
diff --git a/packages/node_modules/@node-red/editor/src/sass/ace.scss b/packages/node_modules/@node-red/editor-client/src/sass/ace.scss
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/sass/ace.scss
rename to packages/node_modules/@node-red/editor-client/src/sass/ace.scss
diff --git a/packages/node_modules/@node-red/editor/src/sass/bootstrap.scss b/packages/node_modules/@node-red/editor-client/src/sass/bootstrap.scss
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/sass/bootstrap.scss
rename to packages/node_modules/@node-red/editor-client/src/sass/bootstrap.scss
diff --git a/packages/node_modules/@node-red/editor/src/sass/colors.scss b/packages/node_modules/@node-red/editor-client/src/sass/colors.scss
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/sass/colors.scss
rename to packages/node_modules/@node-red/editor-client/src/sass/colors.scss
diff --git a/packages/node_modules/@node-red/editor/src/sass/debug.scss b/packages/node_modules/@node-red/editor-client/src/sass/debug.scss
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/sass/debug.scss
rename to packages/node_modules/@node-red/editor-client/src/sass/debug.scss
diff --git a/packages/node_modules/@node-red/editor/src/sass/diff.scss b/packages/node_modules/@node-red/editor-client/src/sass/diff.scss
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/sass/diff.scss
rename to packages/node_modules/@node-red/editor-client/src/sass/diff.scss
diff --git a/packages/node_modules/@node-red/editor/src/sass/dragdrop.scss b/packages/node_modules/@node-red/editor-client/src/sass/dragdrop.scss
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/sass/dragdrop.scss
rename to packages/node_modules/@node-red/editor-client/src/sass/dragdrop.scss
diff --git a/packages/node_modules/@node-red/editor/src/sass/dropdownMenu.scss b/packages/node_modules/@node-red/editor-client/src/sass/dropdownMenu.scss
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/sass/dropdownMenu.scss
rename to packages/node_modules/@node-red/editor-client/src/sass/dropdownMenu.scss
diff --git a/packages/node_modules/@node-red/editor/src/sass/editor.scss b/packages/node_modules/@node-red/editor-client/src/sass/editor.scss
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/sass/editor.scss
rename to packages/node_modules/@node-red/editor-client/src/sass/editor.scss
diff --git a/packages/node_modules/@node-red/editor/src/sass/flow.scss b/packages/node_modules/@node-red/editor-client/src/sass/flow.scss
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/sass/flow.scss
rename to packages/node_modules/@node-red/editor-client/src/sass/flow.scss
diff --git a/packages/node_modules/@node-red/editor/src/sass/forms.scss b/packages/node_modules/@node-red/editor-client/src/sass/forms.scss
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/sass/forms.scss
rename to packages/node_modules/@node-red/editor-client/src/sass/forms.scss
diff --git a/packages/node_modules/@node-red/editor/src/sass/header.scss b/packages/node_modules/@node-red/editor-client/src/sass/header.scss
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/sass/header.scss
rename to packages/node_modules/@node-red/editor-client/src/sass/header.scss
diff --git a/packages/node_modules/@node-red/editor/src/sass/jquery.scss b/packages/node_modules/@node-red/editor-client/src/sass/jquery.scss
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/sass/jquery.scss
rename to packages/node_modules/@node-red/editor-client/src/sass/jquery.scss
diff --git a/packages/node_modules/@node-red/editor/src/sass/keyboard.scss b/packages/node_modules/@node-red/editor-client/src/sass/keyboard.scss
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/sass/keyboard.scss
rename to packages/node_modules/@node-red/editor-client/src/sass/keyboard.scss
diff --git a/packages/node_modules/@node-red/editor/src/sass/library.scss b/packages/node_modules/@node-red/editor-client/src/sass/library.scss
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/sass/library.scss
rename to packages/node_modules/@node-red/editor-client/src/sass/library.scss
diff --git a/packages/node_modules/@node-red/editor/src/sass/mixins.scss b/packages/node_modules/@node-red/editor-client/src/sass/mixins.scss
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/sass/mixins.scss
rename to packages/node_modules/@node-red/editor-client/src/sass/mixins.scss
diff --git a/packages/node_modules/@node-red/editor/src/sass/notifications.scss b/packages/node_modules/@node-red/editor-client/src/sass/notifications.scss
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/sass/notifications.scss
rename to packages/node_modules/@node-red/editor-client/src/sass/notifications.scss
diff --git a/packages/node_modules/@node-red/editor/src/sass/palette-editor.scss b/packages/node_modules/@node-red/editor-client/src/sass/palette-editor.scss
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/sass/palette-editor.scss
rename to packages/node_modules/@node-red/editor-client/src/sass/palette-editor.scss
diff --git a/packages/node_modules/@node-red/editor/src/sass/palette.scss b/packages/node_modules/@node-red/editor-client/src/sass/palette.scss
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/sass/palette.scss
rename to packages/node_modules/@node-red/editor-client/src/sass/palette.scss
diff --git a/packages/node_modules/@node-red/editor/src/sass/panels.scss b/packages/node_modules/@node-red/editor-client/src/sass/panels.scss
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/sass/panels.scss
rename to packages/node_modules/@node-red/editor-client/src/sass/panels.scss
diff --git a/packages/node_modules/@node-red/editor/src/sass/popover.scss b/packages/node_modules/@node-red/editor-client/src/sass/popover.scss
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/sass/popover.scss
rename to packages/node_modules/@node-red/editor-client/src/sass/popover.scss
diff --git a/packages/node_modules/@node-red/editor/src/sass/projects.scss b/packages/node_modules/@node-red/editor-client/src/sass/projects.scss
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/sass/projects.scss
rename to packages/node_modules/@node-red/editor-client/src/sass/projects.scss
diff --git a/packages/node_modules/@node-red/editor/src/sass/search.scss b/packages/node_modules/@node-red/editor-client/src/sass/search.scss
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/sass/search.scss
rename to packages/node_modules/@node-red/editor-client/src/sass/search.scss
diff --git a/packages/node_modules/@node-red/editor/src/sass/sidebar.scss b/packages/node_modules/@node-red/editor-client/src/sass/sidebar.scss
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/sass/sidebar.scss
rename to packages/node_modules/@node-red/editor-client/src/sass/sidebar.scss
diff --git a/packages/node_modules/@node-red/editor/src/sass/style.scss b/packages/node_modules/@node-red/editor-client/src/sass/style.scss
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/sass/style.scss
rename to packages/node_modules/@node-red/editor-client/src/sass/style.scss
diff --git a/packages/node_modules/@node-red/editor/src/sass/tab-config.scss b/packages/node_modules/@node-red/editor-client/src/sass/tab-config.scss
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/sass/tab-config.scss
rename to packages/node_modules/@node-red/editor-client/src/sass/tab-config.scss
diff --git a/packages/node_modules/@node-red/editor/src/sass/tab-context.scss b/packages/node_modules/@node-red/editor-client/src/sass/tab-context.scss
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/sass/tab-context.scss
rename to packages/node_modules/@node-red/editor-client/src/sass/tab-context.scss
diff --git a/packages/node_modules/@node-red/editor/src/sass/tab-info.scss b/packages/node_modules/@node-red/editor-client/src/sass/tab-info.scss
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/sass/tab-info.scss
rename to packages/node_modules/@node-red/editor-client/src/sass/tab-info.scss
diff --git a/packages/node_modules/@node-red/editor/src/sass/tabs.scss b/packages/node_modules/@node-red/editor-client/src/sass/tabs.scss
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/sass/tabs.scss
rename to packages/node_modules/@node-red/editor-client/src/sass/tabs.scss
diff --git a/packages/node_modules/@node-red/editor/src/sass/ui/common/checkboxSet.scss b/packages/node_modules/@node-red/editor-client/src/sass/ui/common/checkboxSet.scss
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/sass/ui/common/checkboxSet.scss
rename to packages/node_modules/@node-red/editor-client/src/sass/ui/common/checkboxSet.scss
diff --git a/packages/node_modules/@node-red/editor/src/sass/ui/common/editableList.scss b/packages/node_modules/@node-red/editor-client/src/sass/ui/common/editableList.scss
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/sass/ui/common/editableList.scss
rename to packages/node_modules/@node-red/editor-client/src/sass/ui/common/editableList.scss
diff --git a/packages/node_modules/@node-red/editor/src/sass/ui/common/nodeList.scss b/packages/node_modules/@node-red/editor-client/src/sass/ui/common/nodeList.scss
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/sass/ui/common/nodeList.scss
rename to packages/node_modules/@node-red/editor-client/src/sass/ui/common/nodeList.scss
diff --git a/packages/node_modules/@node-red/editor/src/sass/ui/common/searchBox.scss b/packages/node_modules/@node-red/editor-client/src/sass/ui/common/searchBox.scss
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/sass/ui/common/searchBox.scss
rename to packages/node_modules/@node-red/editor-client/src/sass/ui/common/searchBox.scss
diff --git a/packages/node_modules/@node-red/editor/src/sass/ui/common/stack.scss b/packages/node_modules/@node-red/editor-client/src/sass/ui/common/stack.scss
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/sass/ui/common/stack.scss
rename to packages/node_modules/@node-red/editor-client/src/sass/ui/common/stack.scss
diff --git a/packages/node_modules/@node-red/editor/src/sass/ui/common/typedInput.scss b/packages/node_modules/@node-red/editor-client/src/sass/ui/common/typedInput.scss
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/sass/ui/common/typedInput.scss
rename to packages/node_modules/@node-red/editor-client/src/sass/ui/common/typedInput.scss
diff --git a/packages/node_modules/@node-red/editor/src/sass/userSettings.scss b/packages/node_modules/@node-red/editor-client/src/sass/userSettings.scss
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/sass/userSettings.scss
rename to packages/node_modules/@node-red/editor-client/src/sass/userSettings.scss
diff --git a/packages/node_modules/@node-red/editor/src/sass/widgetStyle.scss b/packages/node_modules/@node-red/editor-client/src/sass/widgetStyle.scss
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/sass/widgetStyle.scss
rename to packages/node_modules/@node-red/editor-client/src/sass/widgetStyle.scss
diff --git a/packages/node_modules/@node-red/editor/src/sass/workspace.scss b/packages/node_modules/@node-red/editor-client/src/sass/workspace.scss
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/sass/workspace.scss
rename to packages/node_modules/@node-red/editor-client/src/sass/workspace.scss
diff --git a/packages/node_modules/@node-red/editor/src/sass/workspaceToolbar.scss b/packages/node_modules/@node-red/editor-client/src/sass/workspaceToolbar.scss
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/sass/workspaceToolbar.scss
rename to packages/node_modules/@node-red/editor-client/src/sass/workspaceToolbar.scss
diff --git a/packages/node_modules/@node-red/editor/src/templates/index.mst b/packages/node_modules/@node-red/editor-client/src/templates/index.mst
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/templates/index.mst
rename to packages/node_modules/@node-red/editor-client/src/templates/index.mst
diff --git a/packages/node_modules/@node-red/editor/src/vendor/ace/LICENSE b/packages/node_modules/@node-red/editor-client/src/vendor/ace/LICENSE
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/ace/LICENSE
rename to packages/node_modules/@node-red/editor-client/src/vendor/ace/LICENSE
diff --git a/packages/node_modules/@node-red/editor/src/vendor/ace/ace.js b/packages/node_modules/@node-red/editor-client/src/vendor/ace/ace.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/ace/ace.js
rename to packages/node_modules/@node-red/editor-client/src/vendor/ace/ace.js
diff --git a/packages/node_modules/@node-red/editor/src/vendor/ace/ext-language_tools.js b/packages/node_modules/@node-red/editor-client/src/vendor/ace/ext-language_tools.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/ace/ext-language_tools.js
rename to packages/node_modules/@node-red/editor-client/src/vendor/ace/ext-language_tools.js
diff --git a/packages/node_modules/@node-red/editor/src/vendor/ace/ext-searchbox.js b/packages/node_modules/@node-red/editor-client/src/vendor/ace/ext-searchbox.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/ace/ext-searchbox.js
rename to packages/node_modules/@node-red/editor-client/src/vendor/ace/ext-searchbox.js
diff --git a/packages/node_modules/@node-red/editor/src/vendor/ace/mode-css.js b/packages/node_modules/@node-red/editor-client/src/vendor/ace/mode-css.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/ace/mode-css.js
rename to packages/node_modules/@node-red/editor-client/src/vendor/ace/mode-css.js
diff --git a/packages/node_modules/@node-red/editor/src/vendor/ace/mode-handlebars.js b/packages/node_modules/@node-red/editor-client/src/vendor/ace/mode-handlebars.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/ace/mode-handlebars.js
rename to packages/node_modules/@node-red/editor-client/src/vendor/ace/mode-handlebars.js
diff --git a/packages/node_modules/@node-red/editor/src/vendor/ace/mode-html.js b/packages/node_modules/@node-red/editor-client/src/vendor/ace/mode-html.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/ace/mode-html.js
rename to packages/node_modules/@node-red/editor-client/src/vendor/ace/mode-html.js
diff --git a/packages/node_modules/@node-red/editor/src/vendor/ace/mode-javascript.js b/packages/node_modules/@node-red/editor-client/src/vendor/ace/mode-javascript.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/ace/mode-javascript.js
rename to packages/node_modules/@node-red/editor-client/src/vendor/ace/mode-javascript.js
diff --git a/packages/node_modules/@node-red/editor/src/vendor/ace/mode-json.js b/packages/node_modules/@node-red/editor-client/src/vendor/ace/mode-json.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/ace/mode-json.js
rename to packages/node_modules/@node-red/editor-client/src/vendor/ace/mode-json.js
diff --git a/packages/node_modules/@node-red/editor/src/vendor/ace/mode-markdown.js b/packages/node_modules/@node-red/editor-client/src/vendor/ace/mode-markdown.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/ace/mode-markdown.js
rename to packages/node_modules/@node-red/editor-client/src/vendor/ace/mode-markdown.js
diff --git a/packages/node_modules/@node-red/editor/src/vendor/ace/mode-properties.js b/packages/node_modules/@node-red/editor-client/src/vendor/ace/mode-properties.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/ace/mode-properties.js
rename to packages/node_modules/@node-red/editor-client/src/vendor/ace/mode-properties.js
diff --git a/packages/node_modules/@node-red/editor/src/vendor/ace/mode-python.js b/packages/node_modules/@node-red/editor-client/src/vendor/ace/mode-python.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/ace/mode-python.js
rename to packages/node_modules/@node-red/editor-client/src/vendor/ace/mode-python.js
diff --git a/packages/node_modules/@node-red/editor/src/vendor/ace/mode-sql.js b/packages/node_modules/@node-red/editor-client/src/vendor/ace/mode-sql.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/ace/mode-sql.js
rename to packages/node_modules/@node-red/editor-client/src/vendor/ace/mode-sql.js
diff --git a/packages/node_modules/@node-red/editor/src/vendor/ace/mode-swift.js b/packages/node_modules/@node-red/editor-client/src/vendor/ace/mode-swift.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/ace/mode-swift.js
rename to packages/node_modules/@node-red/editor-client/src/vendor/ace/mode-swift.js
diff --git a/packages/node_modules/@node-red/editor/src/vendor/ace/mode-yaml.js b/packages/node_modules/@node-red/editor-client/src/vendor/ace/mode-yaml.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/ace/mode-yaml.js
rename to packages/node_modules/@node-red/editor-client/src/vendor/ace/mode-yaml.js
diff --git a/packages/node_modules/@node-red/editor/src/vendor/ace/snippets/css.js b/packages/node_modules/@node-red/editor-client/src/vendor/ace/snippets/css.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/ace/snippets/css.js
rename to packages/node_modules/@node-red/editor-client/src/vendor/ace/snippets/css.js
diff --git a/packages/node_modules/@node-red/editor/src/vendor/ace/snippets/handlebars.js b/packages/node_modules/@node-red/editor-client/src/vendor/ace/snippets/handlebars.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/ace/snippets/handlebars.js
rename to packages/node_modules/@node-red/editor-client/src/vendor/ace/snippets/handlebars.js
diff --git a/packages/node_modules/@node-red/editor/src/vendor/ace/snippets/html.js b/packages/node_modules/@node-red/editor-client/src/vendor/ace/snippets/html.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/ace/snippets/html.js
rename to packages/node_modules/@node-red/editor-client/src/vendor/ace/snippets/html.js
diff --git a/packages/node_modules/@node-red/editor/src/vendor/ace/snippets/javascript.js b/packages/node_modules/@node-red/editor-client/src/vendor/ace/snippets/javascript.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/ace/snippets/javascript.js
rename to packages/node_modules/@node-red/editor-client/src/vendor/ace/snippets/javascript.js
diff --git a/packages/node_modules/@node-red/editor/src/vendor/ace/snippets/json.js b/packages/node_modules/@node-red/editor-client/src/vendor/ace/snippets/json.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/ace/snippets/json.js
rename to packages/node_modules/@node-red/editor-client/src/vendor/ace/snippets/json.js
diff --git a/packages/node_modules/@node-red/editor/src/vendor/ace/snippets/markdown.js b/packages/node_modules/@node-red/editor-client/src/vendor/ace/snippets/markdown.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/ace/snippets/markdown.js
rename to packages/node_modules/@node-red/editor-client/src/vendor/ace/snippets/markdown.js
diff --git a/packages/node_modules/@node-red/editor/src/vendor/ace/snippets/properties.js b/packages/node_modules/@node-red/editor-client/src/vendor/ace/snippets/properties.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/ace/snippets/properties.js
rename to packages/node_modules/@node-red/editor-client/src/vendor/ace/snippets/properties.js
diff --git a/packages/node_modules/@node-red/editor/src/vendor/ace/snippets/python.js b/packages/node_modules/@node-red/editor-client/src/vendor/ace/snippets/python.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/ace/snippets/python.js
rename to packages/node_modules/@node-red/editor-client/src/vendor/ace/snippets/python.js
diff --git a/packages/node_modules/@node-red/editor/src/vendor/ace/snippets/sql.js b/packages/node_modules/@node-red/editor-client/src/vendor/ace/snippets/sql.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/ace/snippets/sql.js
rename to packages/node_modules/@node-red/editor-client/src/vendor/ace/snippets/sql.js
diff --git a/packages/node_modules/@node-red/editor/src/vendor/ace/snippets/swift.js b/packages/node_modules/@node-red/editor-client/src/vendor/ace/snippets/swift.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/ace/snippets/swift.js
rename to packages/node_modules/@node-red/editor-client/src/vendor/ace/snippets/swift.js
diff --git a/packages/node_modules/@node-red/editor/src/vendor/ace/snippets/text.js b/packages/node_modules/@node-red/editor-client/src/vendor/ace/snippets/text.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/ace/snippets/text.js
rename to packages/node_modules/@node-red/editor-client/src/vendor/ace/snippets/text.js
diff --git a/packages/node_modules/@node-red/editor/src/vendor/ace/snippets/yaml.js b/packages/node_modules/@node-red/editor-client/src/vendor/ace/snippets/yaml.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/ace/snippets/yaml.js
rename to packages/node_modules/@node-red/editor-client/src/vendor/ace/snippets/yaml.js
diff --git a/packages/node_modules/@node-red/editor/src/vendor/ace/theme-chrome.js b/packages/node_modules/@node-red/editor-client/src/vendor/ace/theme-chrome.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/ace/theme-chrome.js
rename to packages/node_modules/@node-red/editor-client/src/vendor/ace/theme-chrome.js
diff --git a/packages/node_modules/@node-red/editor/src/vendor/ace/theme-tomorrow.js b/packages/node_modules/@node-red/editor-client/src/vendor/ace/theme-tomorrow.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/ace/theme-tomorrow.js
rename to packages/node_modules/@node-red/editor-client/src/vendor/ace/theme-tomorrow.js
diff --git a/packages/node_modules/@node-red/editor/src/vendor/ace/worker-html.js b/packages/node_modules/@node-red/editor-client/src/vendor/ace/worker-html.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/ace/worker-html.js
rename to packages/node_modules/@node-red/editor-client/src/vendor/ace/worker-html.js
diff --git a/packages/node_modules/@node-red/editor/src/vendor/ace/worker-javascript.js b/packages/node_modules/@node-red/editor-client/src/vendor/ace/worker-javascript.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/ace/worker-javascript.js
rename to packages/node_modules/@node-red/editor-client/src/vendor/ace/worker-javascript.js
diff --git a/packages/node_modules/@node-red/editor/src/vendor/ace/worker-json.js b/packages/node_modules/@node-red/editor-client/src/vendor/ace/worker-json.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/ace/worker-json.js
rename to packages/node_modules/@node-red/editor-client/src/vendor/ace/worker-json.js
diff --git a/packages/node_modules/@node-red/editor/src/vendor/bootstrap/css/bootstrap.css b/packages/node_modules/@node-red/editor-client/src/vendor/bootstrap/css/bootstrap.css
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/bootstrap/css/bootstrap.css
rename to packages/node_modules/@node-red/editor-client/src/vendor/bootstrap/css/bootstrap.css
diff --git a/packages/node_modules/@node-red/editor/src/vendor/bootstrap/css/bootstrap.min.css b/packages/node_modules/@node-red/editor-client/src/vendor/bootstrap/css/bootstrap.min.css
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/bootstrap/css/bootstrap.min.css
rename to packages/node_modules/@node-red/editor-client/src/vendor/bootstrap/css/bootstrap.min.css
diff --git a/packages/node_modules/@node-red/editor/src/vendor/bootstrap/img/glyphicons-halflings-white.png b/packages/node_modules/@node-red/editor-client/src/vendor/bootstrap/img/glyphicons-halflings-white.png
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/bootstrap/img/glyphicons-halflings-white.png
rename to packages/node_modules/@node-red/editor-client/src/vendor/bootstrap/img/glyphicons-halflings-white.png
diff --git a/packages/node_modules/@node-red/editor/src/vendor/bootstrap/img/glyphicons-halflings.png b/packages/node_modules/@node-red/editor-client/src/vendor/bootstrap/img/glyphicons-halflings.png
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/bootstrap/img/glyphicons-halflings.png
rename to packages/node_modules/@node-red/editor-client/src/vendor/bootstrap/img/glyphicons-halflings.png
diff --git a/packages/node_modules/@node-red/editor/src/vendor/bootstrap/js/bootstrap.min.js b/packages/node_modules/@node-red/editor-client/src/vendor/bootstrap/js/bootstrap.min.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/bootstrap/js/bootstrap.min.js
rename to packages/node_modules/@node-red/editor-client/src/vendor/bootstrap/js/bootstrap.min.js
diff --git a/packages/node_modules/@node-red/editor/src/vendor/d3/d3.v3.min.js b/packages/node_modules/@node-red/editor-client/src/vendor/d3/d3.v3.min.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/d3/d3.v3.min.js
rename to packages/node_modules/@node-red/editor-client/src/vendor/d3/d3.v3.min.js
diff --git a/packages/node_modules/@node-red/editor/src/vendor/font-awesome/css/font-awesome.min.css b/packages/node_modules/@node-red/editor-client/src/vendor/font-awesome/css/font-awesome.min.css
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/font-awesome/css/font-awesome.min.css
rename to packages/node_modules/@node-red/editor-client/src/vendor/font-awesome/css/font-awesome.min.css
diff --git a/packages/node_modules/@node-red/editor/src/vendor/font-awesome/fonts/FontAwesome.otf b/packages/node_modules/@node-red/editor-client/src/vendor/font-awesome/fonts/FontAwesome.otf
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/font-awesome/fonts/FontAwesome.otf
rename to packages/node_modules/@node-red/editor-client/src/vendor/font-awesome/fonts/FontAwesome.otf
diff --git a/packages/node_modules/@node-red/editor/src/vendor/font-awesome/fonts/fontawesome-webfont.eot b/packages/node_modules/@node-red/editor-client/src/vendor/font-awesome/fonts/fontawesome-webfont.eot
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/font-awesome/fonts/fontawesome-webfont.eot
rename to packages/node_modules/@node-red/editor-client/src/vendor/font-awesome/fonts/fontawesome-webfont.eot
diff --git a/packages/node_modules/@node-red/editor/src/vendor/font-awesome/fonts/fontawesome-webfont.svg b/packages/node_modules/@node-red/editor-client/src/vendor/font-awesome/fonts/fontawesome-webfont.svg
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/font-awesome/fonts/fontawesome-webfont.svg
rename to packages/node_modules/@node-red/editor-client/src/vendor/font-awesome/fonts/fontawesome-webfont.svg
diff --git a/packages/node_modules/@node-red/editor/src/vendor/font-awesome/fonts/fontawesome-webfont.ttf b/packages/node_modules/@node-red/editor-client/src/vendor/font-awesome/fonts/fontawesome-webfont.ttf
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/font-awesome/fonts/fontawesome-webfont.ttf
rename to packages/node_modules/@node-red/editor-client/src/vendor/font-awesome/fonts/fontawesome-webfont.ttf
diff --git a/packages/node_modules/@node-red/editor/src/vendor/font-awesome/fonts/fontawesome-webfont.woff b/packages/node_modules/@node-red/editor-client/src/vendor/font-awesome/fonts/fontawesome-webfont.woff
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/font-awesome/fonts/fontawesome-webfont.woff
rename to packages/node_modules/@node-red/editor-client/src/vendor/font-awesome/fonts/fontawesome-webfont.woff
diff --git a/packages/node_modules/@node-red/editor/src/vendor/font-awesome/fonts/fontawesome-webfont.woff2 b/packages/node_modules/@node-red/editor-client/src/vendor/font-awesome/fonts/fontawesome-webfont.woff2
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/font-awesome/fonts/fontawesome-webfont.woff2
rename to packages/node_modules/@node-red/editor-client/src/vendor/font-awesome/fonts/fontawesome-webfont.woff2
diff --git a/packages/node_modules/@node-red/editor/src/vendor/i18next/i18next.min.js b/packages/node_modules/@node-red/editor-client/src/vendor/i18next/i18next.min.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/i18next/i18next.min.js
rename to packages/node_modules/@node-red/editor-client/src/vendor/i18next/i18next.min.js
diff --git a/packages/node_modules/@node-red/editor/src/vendor/jquery/css/smoothness/images/animated-overlay.gif b/packages/node_modules/@node-red/editor-client/src/vendor/jquery/css/smoothness/images/animated-overlay.gif
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/jquery/css/smoothness/images/animated-overlay.gif
rename to packages/node_modules/@node-red/editor-client/src/vendor/jquery/css/smoothness/images/animated-overlay.gif
diff --git a/packages/node_modules/@node-red/editor/src/vendor/jquery/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png b/packages/node_modules/@node-red/editor-client/src/vendor/jquery/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/jquery/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
rename to packages/node_modules/@node-red/editor-client/src/vendor/jquery/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
diff --git a/packages/node_modules/@node-red/editor/src/vendor/jquery/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png b/packages/node_modules/@node-red/editor-client/src/vendor/jquery/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/jquery/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
rename to packages/node_modules/@node-red/editor-client/src/vendor/jquery/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
diff --git a/packages/node_modules/@node-red/editor/src/vendor/jquery/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png b/packages/node_modules/@node-red/editor-client/src/vendor/jquery/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/jquery/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
rename to packages/node_modules/@node-red/editor-client/src/vendor/jquery/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
diff --git a/packages/node_modules/@node-red/editor/src/vendor/jquery/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png b/packages/node_modules/@node-red/editor-client/src/vendor/jquery/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/jquery/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
rename to packages/node_modules/@node-red/editor-client/src/vendor/jquery/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
diff --git a/packages/node_modules/@node-red/editor/src/vendor/jquery/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png b/packages/node_modules/@node-red/editor-client/src/vendor/jquery/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/jquery/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png
rename to packages/node_modules/@node-red/editor-client/src/vendor/jquery/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png
diff --git a/packages/node_modules/@node-red/editor/src/vendor/jquery/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png b/packages/node_modules/@node-red/editor-client/src/vendor/jquery/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/jquery/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
rename to packages/node_modules/@node-red/editor-client/src/vendor/jquery/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
diff --git a/packages/node_modules/@node-red/editor/src/vendor/jquery/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png b/packages/node_modules/@node-red/editor-client/src/vendor/jquery/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/jquery/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
rename to packages/node_modules/@node-red/editor-client/src/vendor/jquery/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
diff --git a/packages/node_modules/@node-red/editor/src/vendor/jquery/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/packages/node_modules/@node-red/editor-client/src/vendor/jquery/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/jquery/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
rename to packages/node_modules/@node-red/editor-client/src/vendor/jquery/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
diff --git a/packages/node_modules/@node-red/editor/src/vendor/jquery/css/smoothness/images/ui-icons_222222_256x240.png b/packages/node_modules/@node-red/editor-client/src/vendor/jquery/css/smoothness/images/ui-icons_222222_256x240.png
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/jquery/css/smoothness/images/ui-icons_222222_256x240.png
rename to packages/node_modules/@node-red/editor-client/src/vendor/jquery/css/smoothness/images/ui-icons_222222_256x240.png
diff --git a/packages/node_modules/@node-red/editor/src/vendor/jquery/css/smoothness/images/ui-icons_2e83ff_256x240.png b/packages/node_modules/@node-red/editor-client/src/vendor/jquery/css/smoothness/images/ui-icons_2e83ff_256x240.png
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/jquery/css/smoothness/images/ui-icons_2e83ff_256x240.png
rename to packages/node_modules/@node-red/editor-client/src/vendor/jquery/css/smoothness/images/ui-icons_2e83ff_256x240.png
diff --git a/packages/node_modules/@node-red/editor/src/vendor/jquery/css/smoothness/images/ui-icons_454545_256x240.png b/packages/node_modules/@node-red/editor-client/src/vendor/jquery/css/smoothness/images/ui-icons_454545_256x240.png
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/jquery/css/smoothness/images/ui-icons_454545_256x240.png
rename to packages/node_modules/@node-red/editor-client/src/vendor/jquery/css/smoothness/images/ui-icons_454545_256x240.png
diff --git a/packages/node_modules/@node-red/editor/src/vendor/jquery/css/smoothness/images/ui-icons_888888_256x240.png b/packages/node_modules/@node-red/editor-client/src/vendor/jquery/css/smoothness/images/ui-icons_888888_256x240.png
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/jquery/css/smoothness/images/ui-icons_888888_256x240.png
rename to packages/node_modules/@node-red/editor-client/src/vendor/jquery/css/smoothness/images/ui-icons_888888_256x240.png
diff --git a/packages/node_modules/@node-red/editor/src/vendor/jquery/css/smoothness/images/ui-icons_cd0a0a_256x240.png b/packages/node_modules/@node-red/editor-client/src/vendor/jquery/css/smoothness/images/ui-icons_cd0a0a_256x240.png
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/jquery/css/smoothness/images/ui-icons_cd0a0a_256x240.png
rename to packages/node_modules/@node-red/editor-client/src/vendor/jquery/css/smoothness/images/ui-icons_cd0a0a_256x240.png
diff --git a/packages/node_modules/@node-red/editor/src/vendor/jquery/css/smoothness/jquery-ui-1.10.3.custom.min.css b/packages/node_modules/@node-red/editor-client/src/vendor/jquery/css/smoothness/jquery-ui-1.10.3.custom.min.css
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/jquery/css/smoothness/jquery-ui-1.10.3.custom.min.css
rename to packages/node_modules/@node-red/editor-client/src/vendor/jquery/css/smoothness/jquery-ui-1.10.3.custom.min.css
diff --git a/packages/node_modules/@node-red/editor/src/vendor/jquery/js/jquery-1.11.3.min.js b/packages/node_modules/@node-red/editor-client/src/vendor/jquery/js/jquery-1.11.3.min.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/jquery/js/jquery-1.11.3.min.js
rename to packages/node_modules/@node-red/editor-client/src/vendor/jquery/js/jquery-1.11.3.min.js
diff --git a/packages/node_modules/@node-red/editor/src/vendor/jquery/js/jquery-ui-1.10.3.custom.min.js b/packages/node_modules/@node-red/editor-client/src/vendor/jquery/js/jquery-ui-1.10.3.custom.min.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/jquery/js/jquery-ui-1.10.3.custom.min.js
rename to packages/node_modules/@node-red/editor-client/src/vendor/jquery/js/jquery-ui-1.10.3.custom.min.js
diff --git a/packages/node_modules/@node-red/editor/src/vendor/jquery/js/jquery.ui.touch-punch.min.js b/packages/node_modules/@node-red/editor-client/src/vendor/jquery/js/jquery.ui.touch-punch.min.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/jquery/js/jquery.ui.touch-punch.min.js
rename to packages/node_modules/@node-red/editor-client/src/vendor/jquery/js/jquery.ui.touch-punch.min.js
diff --git a/packages/node_modules/@node-red/editor/src/vendor/jsonata/formatter.js b/packages/node_modules/@node-red/editor-client/src/vendor/jsonata/formatter.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/jsonata/formatter.js
rename to packages/node_modules/@node-red/editor-client/src/vendor/jsonata/formatter.js
diff --git a/packages/node_modules/@node-red/editor/src/vendor/jsonata/mode-jsonata.js b/packages/node_modules/@node-red/editor-client/src/vendor/jsonata/mode-jsonata.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/jsonata/mode-jsonata.js
rename to packages/node_modules/@node-red/editor-client/src/vendor/jsonata/mode-jsonata.js
diff --git a/packages/node_modules/@node-red/editor/src/vendor/jsonata/snippets-jsonata.js b/packages/node_modules/@node-red/editor-client/src/vendor/jsonata/snippets-jsonata.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/jsonata/snippets-jsonata.js
rename to packages/node_modules/@node-red/editor-client/src/vendor/jsonata/snippets-jsonata.js
diff --git a/packages/node_modules/@node-red/editor/src/vendor/jsonata/worker-jsonata.js b/packages/node_modules/@node-red/editor-client/src/vendor/jsonata/worker-jsonata.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/jsonata/worker-jsonata.js
rename to packages/node_modules/@node-red/editor-client/src/vendor/jsonata/worker-jsonata.js
diff --git a/packages/node_modules/@node-red/editor/src/vendor/marked/marked.min.js b/packages/node_modules/@node-red/editor-client/src/vendor/marked/marked.min.js
similarity index 100%
rename from packages/node_modules/@node-red/editor/src/vendor/marked/marked.min.js
rename to packages/node_modules/@node-red/editor-client/src/vendor/marked/marked.min.js
diff --git a/packages/node_modules/@node-red/editor/src/images/.DS_Store b/packages/node_modules/@node-red/editor/src/images/.DS_Store
deleted file mode 100644
index 4845c4fde..000000000
Binary files a/packages/node_modules/@node-red/editor/src/images/.DS_Store and /dev/null differ
diff --git a/packages/node_modules/@node-red/editor/src/js/.DS_Store b/packages/node_modules/@node-red/editor/src/js/.DS_Store
deleted file mode 100644
index aced132cb..000000000
Binary files a/packages/node_modules/@node-red/editor/src/js/.DS_Store and /dev/null differ
diff --git a/packages/node_modules/@node-red/editor/src/js/ui/.DS_Store b/packages/node_modules/@node-red/editor/src/js/ui/.DS_Store
deleted file mode 100644
index ed11f8bbb..000000000
Binary files a/packages/node_modules/@node-red/editor/src/js/ui/.DS_Store and /dev/null differ
diff --git a/packages/node_modules/@node-red/nodes/core/io/lib/mqttConnectionPool.js b/packages/node_modules/@node-red/nodes/core/io/lib/mqttConnectionPool.js
deleted file mode 100644
index e7b520582..000000000
--- a/packages/node_modules/@node-red/nodes/core/io/lib/mqttConnectionPool.js
+++ /dev/null
@@ -1,159 +0,0 @@
-/**
- * Copyright JS Foundation and other contributors, http://js.foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- **/
-var util = require("util");
-var mqtt = require("./mqtt");
-var settings = require(process.env.NODE_RED_HOME+"/red/red").settings;
-
-util.log("[warn] nodes/core/io/lib/mqttConnectionPool.js is deprecated and will be removed in a future release of Node-RED. Please report this usage to the Node-RED mailing list.");
-
-var connections = {};
-
-function matchTopic(ts,t) {
-    if (ts == "#") {
-        return true;
-    }
-    var re = new RegExp("^"+ts.replace(/([\[\]\?\(\)\\\\$\^\*\.|])/g,"\\$1").replace(/\+/g,"[^/]+").replace(/\/#$/,"(\/.*)?")+"$");
-    return re.test(t);
-}
-
-module.exports = {
-    get: function(broker,port,clientid,username,password,will) {
-        var id = "["+(username||"")+":"+(password||"")+"]["+(clientid||"")+"]@"+broker+":"+port;
-        if (!connections[id]) {
-            connections[id] = function() {
-                var uid = (1+Math.random()*4294967295).toString(16);
-                var client = mqtt.createClient(port,broker);
-                client.uid = uid;
-                client.setMaxListeners(0);
-                var options = {keepalive:15};
-                options.clientId = clientid || 'mqtt_' + (1+Math.random()*4294967295).toString(16);
-                options.username = username;
-                options.password = password;
-                options.will = will;
-                var queue = [];
-                var subscriptions = {};
-                var connecting = false;
-                var obj = {
-                    _instances: 0,
-                    publish: function(msg) {
-                        if (client.isConnected()) {
-                            client.publish(msg.topic,msg.payload,msg.qos,msg.retain);
-                        } else {
-                            if (!connecting) {
-                                connecting = true;
-                                client.connect(options);
-                            }
-                            queue.push(msg);
-                        }
-                    },
-                    subscribe: function(topic,qos,callback,ref) {
-                        ref = ref||0;
-                        subscriptions[topic] = subscriptions[topic]||{};
-
-                        var sub = {
-                            topic:topic,
-                            qos:qos,
-                            handler:function(mtopic,mpayload,mqos,mretain) {
-                                if (matchTopic(topic,mtopic)) {
-                                    callback(mtopic,mpayload,mqos,mretain);
-                                }
-                            },
-                            ref: ref
-                        };
-                        subscriptions[topic][ref] = sub;
-                        client.on('message',sub.handler);
-                        if (client.isConnected()) {
-                            client.subscribe(topic,qos);
-                        }
-                    },
-                    unsubscribe: function(topic,ref) {
-                        ref = ref||0;
-                        var sub = subscriptions[topic];
-                        if (sub) {
-                            if (sub[ref]) {
-                                client.removeListener('message',sub[ref].handler);
-                                delete sub[ref];
-                            }
-                            if (Object.keys(sub).length == 0) {
-                                delete subscriptions[topic];
-                                client.unsubscribe(topic);
-                            }
-                        }
-                    },
-                    on: function(a,b){
-                        client.on(a,b);
-                    },
-                    once: function(a,b){
-                        client.once(a,b);
-                    },
-                    connect: function() {
-                        if (client && !client.isConnected() && !connecting) {
-                            connecting = true;
-                            client.connect(options);
-                        }
-                    },
-                    disconnect: function(ref) {
-
-                        this._instances -= 1;
-                        if (this._instances == 0) {
-                            client.disconnect();
-                            client = null;
-                            delete connections[id];
-                        }
-                    },
-                    isConnected: function() {
-                        return client.isConnected();
-                    }
-                };
-                client.on('connect',function() {
-                        if (client) {
-                            util.log('[mqtt] ['+uid+'] connected to broker tcp://'+broker+':'+port);
-                            connecting = false;
-                            for (var s in subscriptions) {
-                                var topic = s;
-                                var qos = 0;
-                                for (var r in subscriptions[s]) {
-                                    qos = Math.max(qos,subscriptions[s][r].qos);
-                                }
-                                client.subscribe(topic,qos);
-                            }
-                            //console.log("connected - publishing",queue.length,"messages");
-                            while(queue.length) {
-                                var msg = queue.shift();
-                                //console.log(msg);
-                                client.publish(msg.topic,msg.payload,msg.qos,msg.retain);
-                            }
-                        }
-                });
-                client.on('connectionlost', function(err) {
-                        util.log('[mqtt] ['+uid+'] connection lost to broker tcp://'+broker+':'+port);
-                        connecting = false;
-                        setTimeout(function() {
-                            obj.connect();
-                        }, settings.mqttReconnectTime||5000);
-                });
-                client.on('disconnect', function() {
-                        connecting = false;
-                        util.log('[mqtt] ['+uid+'] disconnected from broker tcp://'+broker+':'+port);
-                });
-
-                return obj
-            }();
-        }
-        connections[id]._instances += 1;
-        return connections[id];
-    }
-};
diff --git a/packages/node_modules/@node-red/nodes/index.js b/packages/node_modules/@node-red/nodes/index.js
new file mode 100644
index 000000000..baae7e069
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/index.js
@@ -0,0 +1,17 @@
+/**
+ * Copyright JS Foundation and other contributors, http://js.foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+modules.exports = false
diff --git a/packages/node_modules/@node-red/nodes/package.json b/packages/node_modules/@node-red/nodes/package.json
new file mode 100644
index 000000000..bbb0c63e7
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/package.json
@@ -0,0 +1,30 @@
+{
+    "name": "@node-red/nodes",
+    "version": "0.20.0",
+    "license": "Apache-2.0",
+    "dependencies": {
+        "body-parser": "1.18.3",
+        "cookie": "0.3.1",
+        "cookie-parser": "1.4.3",
+        "cron": "1.3.0",
+        "fs-extra": "5.0.0",
+        "fs.notify": "0.0.4",
+        "hash-sum": "1.0.2",
+        "js-yaml": "3.12.0",
+        "mqtt": "2.18.3",
+        "multer": "1.3.1",
+        "mustache": "2.3.1",
+        "request": "2.88.0",
+        "ws": "1.1.5",
+        "ajv": "6.5.2",
+        "cheerio": "0.22.0",
+        "cors": "2.8.4",
+        "denque": "1.3.0",
+        "is-utf8": "0.2.1",
+        "media-typer": "0.3.0",
+        "on-headers": "1.0.1",
+        "raw-body": "2.3.3",
+        "sentiment": "2.1.0",
+        "xml2js": "0.4.19"
+    }
+}
\ No newline at end of file
diff --git a/packages/node_modules/@node-red/registry/deprecated.js b/packages/node_modules/@node-red/registry/lib/deprecated.js
similarity index 100%
rename from packages/node_modules/@node-red/registry/deprecated.js
rename to packages/node_modules/@node-red/registry/lib/deprecated.js
diff --git a/packages/node_modules/@node-red/registry/index.js b/packages/node_modules/@node-red/registry/lib/index.js
similarity index 100%
rename from packages/node_modules/@node-red/registry/index.js
rename to packages/node_modules/@node-red/registry/lib/index.js
diff --git a/packages/node_modules/@node-red/registry/installer.js b/packages/node_modules/@node-red/registry/lib/installer.js
similarity index 100%
rename from packages/node_modules/@node-red/registry/installer.js
rename to packages/node_modules/@node-red/registry/lib/installer.js
diff --git a/packages/node_modules/@node-red/registry/library.js b/packages/node_modules/@node-red/registry/lib/library.js
similarity index 100%
rename from packages/node_modules/@node-red/registry/library.js
rename to packages/node_modules/@node-red/registry/lib/library.js
diff --git a/packages/node_modules/@node-red/registry/loader.js b/packages/node_modules/@node-red/registry/lib/loader.js
similarity index 100%
rename from packages/node_modules/@node-red/registry/loader.js
rename to packages/node_modules/@node-red/registry/lib/loader.js
diff --git a/packages/node_modules/@node-red/registry/localfilesystem.js b/packages/node_modules/@node-red/registry/lib/localfilesystem.js
similarity index 100%
rename from packages/node_modules/@node-red/registry/localfilesystem.js
rename to packages/node_modules/@node-red/registry/lib/localfilesystem.js
diff --git a/packages/node_modules/@node-red/registry/registry.js b/packages/node_modules/@node-red/registry/lib/registry.js
similarity index 100%
rename from packages/node_modules/@node-red/registry/registry.js
rename to packages/node_modules/@node-red/registry/lib/registry.js
diff --git a/packages/node_modules/@node-red/registry/package.json b/packages/node_modules/@node-red/registry/package.json
index d8903f72a..9ecaedb69 100644
--- a/packages/node_modules/@node-red/registry/package.json
+++ b/packages/node_modules/@node-red/registry/package.json
@@ -1,5 +1,11 @@
 {
-   "name": "@node-red/registry",
-   "version": "0.20.0",
-   "license": "Apache-2.0"
-}
+    "name": "@node-red/registry",
+    "version": "0.20.0",
+    "license": "Apache-2.0",
+    "main": "./lib/index.js",
+    "dependencies": {
+        "semver": "5.5.0",
+        "uglify-js": "3.4.7",
+        "when": "3.7.8"
+    }
+}
\ No newline at end of file
diff --git a/packages/node_modules/@node-red/runtime/api/comms.js b/packages/node_modules/@node-red/runtime/lib/api/comms.js
similarity index 100%
rename from packages/node_modules/@node-red/runtime/api/comms.js
rename to packages/node_modules/@node-red/runtime/lib/api/comms.js
diff --git a/packages/node_modules/@node-red/runtime/api/context.js b/packages/node_modules/@node-red/runtime/lib/api/context.js
similarity index 99%
rename from packages/node_modules/@node-red/runtime/api/context.js
rename to packages/node_modules/@node-red/runtime/lib/api/context.js
index 99c3efa9a..1ef875356 100644
--- a/packages/node_modules/@node-red/runtime/api/context.js
+++ b/packages/node_modules/@node-red/runtime/lib/api/context.js
@@ -21,7 +21,7 @@
 var runtime;
 
 // TODO: move runtime/util to util/index
-var util = require("../util");
+var util = require("@node-red/util").util;
 
 function exportContextStore(scope,ctx, store, result, callback) {
     ctx.keys(store,function(err, keys) {
diff --git a/packages/node_modules/@node-red/runtime/api/flows.js b/packages/node_modules/@node-red/runtime/lib/api/flows.js
similarity index 100%
rename from packages/node_modules/@node-red/runtime/api/flows.js
rename to packages/node_modules/@node-red/runtime/lib/api/flows.js
diff --git a/packages/node_modules/@node-red/runtime/api/index.js b/packages/node_modules/@node-red/runtime/lib/api/index.js
similarity index 100%
rename from packages/node_modules/@node-red/runtime/api/index.js
rename to packages/node_modules/@node-red/runtime/lib/api/index.js
diff --git a/packages/node_modules/@node-red/runtime/api/library.js b/packages/node_modules/@node-red/runtime/lib/api/library.js
similarity index 100%
rename from packages/node_modules/@node-red/runtime/api/library.js
rename to packages/node_modules/@node-red/runtime/lib/api/library.js
diff --git a/packages/node_modules/@node-red/runtime/api/nodes.js b/packages/node_modules/@node-red/runtime/lib/api/nodes.js
similarity index 100%
rename from packages/node_modules/@node-red/runtime/api/nodes.js
rename to packages/node_modules/@node-red/runtime/lib/api/nodes.js
diff --git a/packages/node_modules/@node-red/runtime/api/projects.js b/packages/node_modules/@node-red/runtime/lib/api/projects.js
similarity index 100%
rename from packages/node_modules/@node-red/runtime/api/projects.js
rename to packages/node_modules/@node-red/runtime/lib/api/projects.js
diff --git a/packages/node_modules/@node-red/runtime/api/settings.js b/packages/node_modules/@node-red/runtime/lib/api/settings.js
similarity index 100%
rename from packages/node_modules/@node-red/runtime/api/settings.js
rename to packages/node_modules/@node-red/runtime/lib/api/settings.js
diff --git a/packages/node_modules/@node-red/runtime/events.js b/packages/node_modules/@node-red/runtime/lib/events.js
similarity index 100%
rename from packages/node_modules/@node-red/runtime/events.js
rename to packages/node_modules/@node-red/runtime/lib/events.js
diff --git a/packages/node_modules/@node-red/runtime/index.js b/packages/node_modules/@node-red/runtime/lib/index.js
similarity index 98%
rename from packages/node_modules/@node-red/runtime/index.js
rename to packages/node_modules/@node-red/runtime/lib/index.js
index 20580d2d0..fb4e74b93 100644
--- a/packages/node_modules/@node-red/runtime/index.js
+++ b/packages/node_modules/@node-red/runtime/lib/index.js
@@ -77,7 +77,7 @@ var version;
 
 function getVersion() {
     if (!version) {
-        version = require(path.join(__dirname,"package.json")).version;
+        version = require(path.join(__dirname,"..","package.json")).version;
         /* istanbul ignore else */
         try {
             fs.statSync(path.join(__dirname,"..","..","..","..",".git"));
@@ -91,7 +91,7 @@ function getVersion() {
 
 function start() {
 
-    return i18n.registerMessageCatalog("runtime",path.resolve(path.join(__dirname,"locales")),"runtime.json")
+    return i18n.registerMessageCatalog("runtime",path.resolve(path.join(__dirname,"..","locales")),"runtime.json")
         .then(function() { return storage.init(runtime)})
         .then(function() { return settings.load(storage)})
         .then(function() {
@@ -248,7 +248,7 @@ var runtime = {
     events: events,
     nodes: redNodes,
     library: library,
-    util: require("./util"),
+    util: require("@node-red/util").util,
     get adminApi() { return adminApi },
     get nodeApp() { return nodeApp },
     isStarted: function() {
diff --git a/packages/node_modules/@node-red/runtime/library/index.js b/packages/node_modules/@node-red/runtime/lib/library/index.js
similarity index 100%
rename from packages/node_modules/@node-red/runtime/library/index.js
rename to packages/node_modules/@node-red/runtime/lib/library/index.js
diff --git a/packages/node_modules/@node-red/runtime/nodes/Node.js b/packages/node_modules/@node-red/runtime/lib/nodes/Node.js
similarity index 99%
rename from packages/node_modules/@node-red/runtime/nodes/Node.js
rename to packages/node_modules/@node-red/runtime/lib/nodes/Node.js
index 7dbd2c6a9..6f2998d06 100644
--- a/packages/node_modules/@node-red/runtime/nodes/Node.js
+++ b/packages/node_modules/@node-red/runtime/lib/nodes/Node.js
@@ -18,7 +18,7 @@ var util = require("util");
 var EventEmitter = require("events").EventEmitter;
 var when = require("when");
 
-var redUtil = require("../util");
+var redUtil = require("@node-red/util").util;
 var Log = require("@node-red/util").log; // TODO: separate module
 var context = require("./context");
 var flows = require("./flows");
diff --git a/packages/node_modules/@node-red/runtime/nodes/context/index.js b/packages/node_modules/@node-red/runtime/lib/nodes/context/index.js
similarity index 100%
rename from packages/node_modules/@node-red/runtime/nodes/context/index.js
rename to packages/node_modules/@node-red/runtime/lib/nodes/context/index.js
diff --git a/packages/node_modules/@node-red/runtime/nodes/context/localfilesystem.js b/packages/node_modules/@node-red/runtime/lib/nodes/context/localfilesystem.js
similarity index 100%
rename from packages/node_modules/@node-red/runtime/nodes/context/localfilesystem.js
rename to packages/node_modules/@node-red/runtime/lib/nodes/context/localfilesystem.js
diff --git a/packages/node_modules/@node-red/runtime/nodes/context/memory.js b/packages/node_modules/@node-red/runtime/lib/nodes/context/memory.js
similarity index 98%
rename from packages/node_modules/@node-red/runtime/nodes/context/memory.js
rename to packages/node_modules/@node-red/runtime/lib/nodes/context/memory.js
index 3e7f37ad1..287227e0e 100644
--- a/packages/node_modules/@node-red/runtime/nodes/context/memory.js
+++ b/packages/node_modules/@node-red/runtime/lib/nodes/context/memory.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  **/
 
-var util = require("../../util");
+var util = require("@node-red/util").util;
 
 function Memory(config){
     this.data = {};
diff --git a/packages/node_modules/@node-red/runtime/nodes/credentials.js b/packages/node_modules/@node-red/runtime/lib/nodes/credentials.js
similarity index 100%
rename from packages/node_modules/@node-red/runtime/nodes/credentials.js
rename to packages/node_modules/@node-red/runtime/lib/nodes/credentials.js
diff --git a/packages/node_modules/@node-red/runtime/nodes/flows/Flow.js b/packages/node_modules/@node-red/runtime/lib/nodes/flows/Flow.js
similarity index 99%
rename from packages/node_modules/@node-red/runtime/nodes/flows/Flow.js
rename to packages/node_modules/@node-red/runtime/lib/nodes/flows/Flow.js
index e6588b98f..7319b6aac 100644
--- a/packages/node_modules/@node-red/runtime/nodes/flows/Flow.js
+++ b/packages/node_modules/@node-red/runtime/lib/nodes/flows/Flow.js
@@ -18,7 +18,7 @@ var when = require("when");
 var clone = require("clone");
 var typeRegistry = require("@node-red/registry");
 var Log;
-var redUtil = require("../../util");
+var redUtil = require("@node-red/util").util;
 var flowUtil = require("./util");
 var Node;
 
diff --git a/packages/node_modules/@node-red/runtime/nodes/flows/index.js b/packages/node_modules/@node-red/runtime/lib/nodes/flows/index.js
similarity index 99%
rename from packages/node_modules/@node-red/runtime/nodes/flows/index.js
rename to packages/node_modules/@node-red/runtime/lib/nodes/flows/index.js
index 2b016e066..861d16dd8 100644
--- a/packages/node_modules/@node-red/runtime/nodes/flows/index.js
+++ b/packages/node_modules/@node-red/runtime/lib/nodes/flows/index.js
@@ -29,7 +29,7 @@ var credentials = require("../credentials");
 var flowUtil = require("./util");
 var log;
 var events = require("../../events");
-var redUtil = require("../../util");
+var redUtil = require("@node-red/util").util;
 
 var storage = null;
 var settings = null;
diff --git a/packages/node_modules/@node-red/runtime/nodes/flows/util.js b/packages/node_modules/@node-red/runtime/lib/nodes/flows/util.js
similarity index 99%
rename from packages/node_modules/@node-red/runtime/nodes/flows/util.js
rename to packages/node_modules/@node-red/runtime/lib/nodes/flows/util.js
index 2b8c10a02..52fcc9138 100644
--- a/packages/node_modules/@node-red/runtime/nodes/flows/util.js
+++ b/packages/node_modules/@node-red/runtime/lib/nodes/flows/util.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  **/
 var clone = require("clone");
-var redUtil = require("../../util");
+var redUtil = require("@node-red/util").util;
 var subflowInstanceRE = /^subflow:(.+)$/;
 var typeRegistry = require("@node-red/registry");
 
diff --git a/packages/node_modules/@node-red/runtime/nodes/index.js b/packages/node_modules/@node-red/runtime/lib/nodes/index.js
similarity index 100%
rename from packages/node_modules/@node-red/runtime/nodes/index.js
rename to packages/node_modules/@node-red/runtime/lib/nodes/index.js
diff --git a/packages/node_modules/@node-red/runtime/settings.js b/packages/node_modules/@node-red/runtime/lib/settings.js
similarity index 99%
rename from packages/node_modules/@node-red/runtime/settings.js
rename to packages/node_modules/@node-red/runtime/lib/settings.js
index 8bf762e17..35417a497 100644
--- a/packages/node_modules/@node-red/runtime/settings.js
+++ b/packages/node_modules/@node-red/runtime/lib/settings.js
@@ -18,7 +18,7 @@ var when = require("when");
 var clone = require("clone");
 var assert = require("assert");
 var log = require("@node-red/util").log; // TODO: separate module
-var util = require("./util");
+var util = require("@node-red/util").util;
 
 // localSettings are those provided in the runtime settings.js file
 var localSettings = null;
diff --git a/packages/node_modules/@node-red/runtime/storage/index.js b/packages/node_modules/@node-red/runtime/lib/storage/index.js
similarity index 100%
rename from packages/node_modules/@node-red/runtime/storage/index.js
rename to packages/node_modules/@node-red/runtime/lib/storage/index.js
diff --git a/packages/node_modules/@node-red/runtime/storage/localfilesystem/index.js b/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/index.js
similarity index 100%
rename from packages/node_modules/@node-red/runtime/storage/localfilesystem/index.js
rename to packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/index.js
diff --git a/packages/node_modules/@node-red/runtime/storage/localfilesystem/library.js b/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/library.js
similarity index 100%
rename from packages/node_modules/@node-red/runtime/storage/localfilesystem/library.js
rename to packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/library.js
diff --git a/packages/node_modules/@node-red/runtime/storage/localfilesystem/projects/Project.js b/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/Project.js
similarity index 100%
rename from packages/node_modules/@node-red/runtime/storage/localfilesystem/projects/Project.js
rename to packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/Project.js
diff --git a/packages/node_modules/@node-red/runtime/storage/localfilesystem/projects/defaultFileSet.js b/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/defaultFileSet.js
similarity index 100%
rename from packages/node_modules/@node-red/runtime/storage/localfilesystem/projects/defaultFileSet.js
rename to packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/defaultFileSet.js
diff --git a/packages/node_modules/@node-red/runtime/storage/localfilesystem/projects/git/authCache.js b/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/git/authCache.js
similarity index 100%
rename from packages/node_modules/@node-red/runtime/storage/localfilesystem/projects/git/authCache.js
rename to packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/git/authCache.js
diff --git a/packages/node_modules/@node-red/runtime/storage/localfilesystem/projects/git/authServer.js b/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/git/authServer.js
similarity index 100%
rename from packages/node_modules/@node-red/runtime/storage/localfilesystem/projects/git/authServer.js
rename to packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/git/authServer.js
diff --git a/packages/node_modules/@node-red/runtime/storage/localfilesystem/projects/git/authWriter.js b/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/git/authWriter.js
similarity index 100%
rename from packages/node_modules/@node-red/runtime/storage/localfilesystem/projects/git/authWriter.js
rename to packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/git/authWriter.js
diff --git a/packages/node_modules/@node-red/runtime/storage/localfilesystem/projects/git/index.js b/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/git/index.js
similarity index 100%
rename from packages/node_modules/@node-red/runtime/storage/localfilesystem/projects/git/index.js
rename to packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/git/index.js
diff --git a/packages/node_modules/@node-red/runtime/storage/localfilesystem/projects/git/node-red-ask-pass.sh b/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/git/node-red-ask-pass.sh
similarity index 100%
rename from packages/node_modules/@node-red/runtime/storage/localfilesystem/projects/git/node-red-ask-pass.sh
rename to packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/git/node-red-ask-pass.sh
diff --git a/packages/node_modules/@node-red/runtime/storage/localfilesystem/projects/git/node-red-ssh.sh b/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/git/node-red-ssh.sh
similarity index 100%
rename from packages/node_modules/@node-red/runtime/storage/localfilesystem/projects/git/node-red-ssh.sh
rename to packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/git/node-red-ssh.sh
diff --git a/packages/node_modules/@node-red/runtime/storage/localfilesystem/projects/index.js b/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/index.js
similarity index 99%
rename from packages/node_modules/@node-red/runtime/storage/localfilesystem/projects/index.js
rename to packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/index.js
index 2ae44ac91..88c7663eb 100644
--- a/packages/node_modules/@node-red/runtime/storage/localfilesystem/projects/index.js
+++ b/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/index.js
@@ -136,7 +136,7 @@ function init(_settings, _runtime) {
                                     // if it resolves to a dir - use it... but:
                                     // - where to get credsecret from?
                                     // - what if the name clashes with a known project?
-                                    
+
                                     // var stat = fs.statSync(settings.flowFile);
                                     // if (stat && stat.isDirectory()) {
                                     //     activeProject = settings.flowFile;
diff --git a/packages/node_modules/@node-red/runtime/storage/localfilesystem/projects/ssh/index.js b/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/ssh/index.js
similarity index 100%
rename from packages/node_modules/@node-red/runtime/storage/localfilesystem/projects/ssh/index.js
rename to packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/ssh/index.js
diff --git a/packages/node_modules/@node-red/runtime/storage/localfilesystem/projects/ssh/keygen.js b/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/ssh/keygen.js
similarity index 100%
rename from packages/node_modules/@node-red/runtime/storage/localfilesystem/projects/ssh/keygen.js
rename to packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/ssh/keygen.js
diff --git a/packages/node_modules/@node-red/runtime/storage/localfilesystem/sessions.js b/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/sessions.js
similarity index 100%
rename from packages/node_modules/@node-red/runtime/storage/localfilesystem/sessions.js
rename to packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/sessions.js
diff --git a/packages/node_modules/@node-red/runtime/storage/localfilesystem/settings.js b/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/settings.js
similarity index 100%
rename from packages/node_modules/@node-red/runtime/storage/localfilesystem/settings.js
rename to packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/settings.js
diff --git a/packages/node_modules/@node-red/runtime/storage/localfilesystem/util.js b/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/util.js
similarity index 100%
rename from packages/node_modules/@node-red/runtime/storage/localfilesystem/util.js
rename to packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/util.js
diff --git a/packages/node_modules/@node-red/runtime/package.json b/packages/node_modules/@node-red/runtime/package.json
index d70248575..d1f6ad9bc 100644
--- a/packages/node_modules/@node-red/runtime/package.json
+++ b/packages/node_modules/@node-red/runtime/package.json
@@ -1,5 +1,13 @@
 {
-   "name": "@node-red/runtime",
-   "version": "0.20.0",
-   "license": "Apache-2.0"
-}
+    "name": "@node-red/runtime",
+    "version": "0.20.0",
+    "license": "Apache-2.0",
+    "main": "./lib/index.js",
+    "dependencies": {
+        "clone": "2.1.2",
+        "express": "4.16.3",
+        "fs-extra": "5.0.0",
+        "json-stringify-safe": "5.0.1",
+        "when": "3.7.8"
+    }
+}
\ No newline at end of file
diff --git a/packages/node_modules/@node-red/util/index.js b/packages/node_modules/@node-red/util/index.js
index 342d2dfff..f9640ba9b 100644
--- a/packages/node_modules/@node-red/util/index.js
+++ b/packages/node_modules/@node-red/util/index.js
@@ -15,8 +15,9 @@
  **/
 
 
-var log = require("./log");
-var i18n = require("./i18n");
+const log = require("./lib/log");
+const i18n = require("./lib/i18n");
+const util = require("./lib/util");
 
 module.exports = {
     init: function(settings) {
@@ -24,5 +25,6 @@ module.exports = {
         i18n.init();
     },
     log: log,
-    i18n: i18n
+    i18n: i18n,
+    util: util
 }
diff --git a/packages/node_modules/@node-red/util/i18n.js b/packages/node_modules/@node-red/util/lib/i18n.js
similarity index 100%
rename from packages/node_modules/@node-red/util/i18n.js
rename to packages/node_modules/@node-red/util/lib/i18n.js
diff --git a/packages/node_modules/@node-red/util/log.js b/packages/node_modules/@node-red/util/lib/log.js
similarity index 100%
rename from packages/node_modules/@node-red/util/log.js
rename to packages/node_modules/@node-red/util/lib/log.js
diff --git a/packages/node_modules/@node-red/runtime/util.js b/packages/node_modules/@node-red/util/lib/util.js
similarity index 100%
rename from packages/node_modules/@node-red/runtime/util.js
rename to packages/node_modules/@node-red/util/lib/util.js
diff --git a/packages/node_modules/@node-red/util/package.json b/packages/node_modules/@node-red/util/package.json
index 6e02cb29b..d8858b91a 100644
--- a/packages/node_modules/@node-red/util/package.json
+++ b/packages/node_modules/@node-red/util/package.json
@@ -1,5 +1,12 @@
 {
-   "name": "@node-red/util",
-   "version": "0.20.0",
-   "license": "Apache-2.0"
-}
+    "name": "@node-red/util",
+    "version": "0.20.0",
+    "license": "Apache-2.0",
+    "dependencies": {
+        "clone": "2.1.2",
+        "i18next": "11.6.0",
+        "json-stringify-safe": "5.0.1",
+        "jsonata": "1.5.4",
+        "when": "3.7.8"
+    }
+}
\ No newline at end of file
diff --git a/packages/node_modules/node-red/red/red.js b/packages/node_modules/node-red/red/red.js
index b239de47a..b6eed50ac 100644
--- a/packages/node_modules/node-red/red/red.js
+++ b/packages/node_modules/node-red/red/red.js
@@ -20,9 +20,7 @@ var path = require('path');
 var runtime = require("@node-red/runtime");
 var redUtil = require("@node-red/util");
 
-var api = require("@node-red/editor");
-
-process.env.NODE_RED_HOME = process.env.NODE_RED_HOME || path.resolve(__dirname+"/..");
+var api = require("@node-red/editor-api");
 
 var nodeApp = null;
 var adminApp = null;
@@ -31,7 +29,7 @@ var apiEnabled = false;
 
 function checkVersion(userSettings) {
     var semver = require('semver');
-    if (!semver.satisfies(process.version,">=4.0.0")) {
+    if (!semver.satisfies(process.version,">=4.8.0")) {
         // TODO: in the future, make this a hard error.
         // var e = new Error("Unsupported version of node.js");
         // e.code = "unsupported_version";
@@ -65,7 +63,7 @@ module.exports = {
         }
 
         if (!userSettings.coreNodesDir) {
-            userSettings.coreNodesDir = path.resolve(path.join(__dirname,"..","..","@node-red","nodes"));
+            userSettings.coreNodesDir = path.dirname(require.resolve("@node-red/nodes"))
         }
         redUtil.init(userSettings);
         if (userSettings.httpAdminRoot !== false) {
diff --git a/red.js b/red.js
index f28967158..e9850e03e 100755
--- a/red.js
+++ b/red.js
@@ -77,6 +77,8 @@ if (parsedArgs.argv.remain.length > 0) {
     flowFile = parsedArgs.argv.remain[0];
 }
 
+process.env.NODE_RED_HOME = process.env.NODE_RED_HOME || __dirname;
+
 if (parsedArgs.settings) {
     // User-specified settings file
     settingsFile = parsedArgs.settings;