diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js b/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
index 22ee08558..a36c642b5 100755
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
@@ -35,7 +35,6 @@ RED.palette = (function() {
     var sidebarControls;
 
     function createCategory(originalCategory,rootCategory,category,ns) {
-        console.log("createCategory",originalCategory,rootCategory,category,ns);
         if ($("#red-ui-palette-base-category-"+rootCategory).length === 0) {
             createCategoryContainer(originalCategory,rootCategory, ns+":palette.label."+rootCategory);
         }
@@ -182,7 +181,7 @@ RED.palette = (function() {
 
             var d = $('<div>',{class:"red-ui-palette-node"}).attr("data-palette-type",nt).data('category',rootCategory);
 
-            var label = /^(.*?)([ -]in|[ -]out)?$/.exec(nt)[1];
+            var label = nt;///^(.*?)([ -]in|[ -]out)?$/.exec(nt)[1];
             if (typeof def.paletteLabel !== "undefined") {
                 try {
                     label = (typeof def.paletteLabel === "function" ? def.paletteLabel.call(def) : def.paletteLabel)||"";
diff --git a/packages/node_modules/@node-red/nodes/core/core/20-inject.html b/packages/node_modules/@node-red/nodes/core/common/20-inject.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/core/20-inject.html
rename to packages/node_modules/@node-red/nodes/core/common/20-inject.html
diff --git a/packages/node_modules/@node-red/nodes/core/core/20-inject.js b/packages/node_modules/@node-red/nodes/core/common/20-inject.js
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/core/20-inject.js
rename to packages/node_modules/@node-red/nodes/core/common/20-inject.js
diff --git a/packages/node_modules/@node-red/nodes/core/core/21-debug.html b/packages/node_modules/@node-red/nodes/core/common/21-debug.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/core/21-debug.html
rename to packages/node_modules/@node-red/nodes/core/common/21-debug.html
diff --git a/packages/node_modules/@node-red/nodes/core/core/21-debug.js b/packages/node_modules/@node-red/nodes/core/common/21-debug.js
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/core/21-debug.js
rename to packages/node_modules/@node-red/nodes/core/common/21-debug.js
diff --git a/packages/node_modules/@node-red/nodes/core/core/25-catch.html b/packages/node_modules/@node-red/nodes/core/common/25-catch.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/core/25-catch.html
rename to packages/node_modules/@node-red/nodes/core/common/25-catch.html
diff --git a/packages/node_modules/@node-red/nodes/core/core/25-catch.js b/packages/node_modules/@node-red/nodes/core/common/25-catch.js
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/core/25-catch.js
rename to packages/node_modules/@node-red/nodes/core/common/25-catch.js
diff --git a/packages/node_modules/@node-red/nodes/core/core/25-status.html b/packages/node_modules/@node-red/nodes/core/common/25-status.html
similarity index 99%
rename from packages/node_modules/@node-red/nodes/core/core/25-status.html
rename to packages/node_modules/@node-red/nodes/core/common/25-status.html
index f3aa7bd98..283d505a7 100644
--- a/packages/node_modules/@node-red/nodes/core/core/25-status.html
+++ b/packages/node_modules/@node-red/nodes/core/common/25-status.html
@@ -22,14 +22,14 @@
 <script type="text/javascript">
     RED.nodes.registerType('status',{
         category: 'common',
-        color:"#d9f4fd",
+        color:"#94c1d0",
         defaults: {
             name: {value:""},
             scope: {value:null}
         },
         inputs:0,
         outputs:1,
-        icon: "alert.svg",
+        icon: "status.svg",
         label: function() {
             return this.name||(this.scope?this._("status.statusNodes",{number:this.scope.length}):this._("status.status"));
         },
diff --git a/packages/node_modules/@node-red/nodes/core/core/25-status.js b/packages/node_modules/@node-red/nodes/core/common/25-status.js
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/core/25-status.js
rename to packages/node_modules/@node-red/nodes/core/common/25-status.js
diff --git a/packages/node_modules/@node-red/nodes/core/core/60-link.html b/packages/node_modules/@node-red/nodes/core/common/60-link.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/core/60-link.html
rename to packages/node_modules/@node-red/nodes/core/common/60-link.html
diff --git a/packages/node_modules/@node-red/nodes/core/core/60-link.js b/packages/node_modules/@node-red/nodes/core/common/60-link.js
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/core/60-link.js
rename to packages/node_modules/@node-red/nodes/core/common/60-link.js
diff --git a/packages/node_modules/@node-red/nodes/core/core/90-comment.html b/packages/node_modules/@node-red/nodes/core/common/90-comment.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/core/90-comment.html
rename to packages/node_modules/@node-red/nodes/core/common/90-comment.html
diff --git a/packages/node_modules/@node-red/nodes/core/core/90-comment.js b/packages/node_modules/@node-red/nodes/core/common/90-comment.js
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/core/90-comment.js
rename to packages/node_modules/@node-red/nodes/core/common/90-comment.js
diff --git a/packages/node_modules/@node-red/nodes/core/core/98-unknown.html b/packages/node_modules/@node-red/nodes/core/common/98-unknown.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/core/98-unknown.html
rename to packages/node_modules/@node-red/nodes/core/common/98-unknown.html
diff --git a/packages/node_modules/@node-red/nodes/core/core/98-unknown.js b/packages/node_modules/@node-red/nodes/core/common/98-unknown.js
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/core/98-unknown.js
rename to packages/node_modules/@node-red/nodes/core/common/98-unknown.js
diff --git a/packages/node_modules/@node-red/nodes/core/core/lib/debug/debug-utils.js b/packages/node_modules/@node-red/nodes/core/common/lib/debug/debug-utils.js
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/core/lib/debug/debug-utils.js
rename to packages/node_modules/@node-red/nodes/core/common/lib/debug/debug-utils.js
diff --git a/packages/node_modules/@node-red/nodes/core/core/lib/debug/debug.js b/packages/node_modules/@node-red/nodes/core/common/lib/debug/debug.js
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/core/lib/debug/debug.js
rename to packages/node_modules/@node-red/nodes/core/common/lib/debug/debug.js
diff --git a/packages/node_modules/@node-red/nodes/core/core/lib/debug/view.html b/packages/node_modules/@node-red/nodes/core/common/lib/debug/view.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/core/lib/debug/view.html
rename to packages/node_modules/@node-red/nodes/core/common/lib/debug/view.html
diff --git a/packages/node_modules/@node-red/nodes/core/core/80-function.html b/packages/node_modules/@node-red/nodes/core/function/10-function.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/core/80-function.html
rename to packages/node_modules/@node-red/nodes/core/function/10-function.html
diff --git a/packages/node_modules/@node-red/nodes/core/core/80-function.js b/packages/node_modules/@node-red/nodes/core/function/10-function.js
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/core/80-function.js
rename to packages/node_modules/@node-red/nodes/core/function/10-function.js
diff --git a/packages/node_modules/@node-red/nodes/core/logic/10-switch.html b/packages/node_modules/@node-red/nodes/core/function/10-switch.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/logic/10-switch.html
rename to packages/node_modules/@node-red/nodes/core/function/10-switch.html
diff --git a/packages/node_modules/@node-red/nodes/core/logic/10-switch.js b/packages/node_modules/@node-red/nodes/core/function/10-switch.js
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/logic/10-switch.js
rename to packages/node_modules/@node-red/nodes/core/function/10-switch.js
diff --git a/packages/node_modules/@node-red/nodes/core/logic/15-change.html b/packages/node_modules/@node-red/nodes/core/function/15-change.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/logic/15-change.html
rename to packages/node_modules/@node-red/nodes/core/function/15-change.html
diff --git a/packages/node_modules/@node-red/nodes/core/logic/15-change.js b/packages/node_modules/@node-red/nodes/core/function/15-change.js
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/logic/15-change.js
rename to packages/node_modules/@node-red/nodes/core/function/15-change.js
diff --git a/packages/node_modules/@node-red/nodes/core/logic/16-range.html b/packages/node_modules/@node-red/nodes/core/function/16-range.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/logic/16-range.html
rename to packages/node_modules/@node-red/nodes/core/function/16-range.html
diff --git a/packages/node_modules/@node-red/nodes/core/logic/16-range.js b/packages/node_modules/@node-red/nodes/core/function/16-range.js
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/logic/16-range.js
rename to packages/node_modules/@node-red/nodes/core/function/16-range.js
diff --git a/packages/node_modules/@node-red/nodes/core/core/80-template.html b/packages/node_modules/@node-red/nodes/core/function/80-template.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/core/80-template.html
rename to packages/node_modules/@node-red/nodes/core/function/80-template.html
diff --git a/packages/node_modules/@node-red/nodes/core/core/80-template.js b/packages/node_modules/@node-red/nodes/core/function/80-template.js
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/core/80-template.js
rename to packages/node_modules/@node-red/nodes/core/function/80-template.js
diff --git a/packages/node_modules/@node-red/nodes/core/core/89-delay.html b/packages/node_modules/@node-red/nodes/core/function/89-delay.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/core/89-delay.html
rename to packages/node_modules/@node-red/nodes/core/function/89-delay.html
diff --git a/packages/node_modules/@node-red/nodes/core/core/89-delay.js b/packages/node_modules/@node-red/nodes/core/function/89-delay.js
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/core/89-delay.js
rename to packages/node_modules/@node-red/nodes/core/function/89-delay.js
diff --git a/packages/node_modules/@node-red/nodes/core/core/89-trigger.html b/packages/node_modules/@node-red/nodes/core/function/89-trigger.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/core/89-trigger.html
rename to packages/node_modules/@node-red/nodes/core/function/89-trigger.html
diff --git a/packages/node_modules/@node-red/nodes/core/core/89-trigger.js b/packages/node_modules/@node-red/nodes/core/function/89-trigger.js
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/core/89-trigger.js
rename to packages/node_modules/@node-red/nodes/core/function/89-trigger.js
diff --git a/packages/node_modules/@node-red/nodes/core/core/75-exec.html b/packages/node_modules/@node-red/nodes/core/function/90-exec.html
similarity index 98%
rename from packages/node_modules/@node-red/nodes/core/core/75-exec.html
rename to packages/node_modules/@node-red/nodes/core/function/90-exec.html
index 264b60ba8..e3cb2cf45 100644
--- a/packages/node_modules/@node-red/nodes/core/core/75-exec.html
+++ b/packages/node_modules/@node-red/nodes/core/function/90-exec.html
@@ -73,8 +73,7 @@
                 this._("exec.label.retcode")
             ][i];
         },
-        icon: "arrow-in.svg",
-        align: "right",
+        icon: "cog.svg",
         label: function() {
             return this.name||this.command||(this.useSpawn=="true"?this._("exec.spawn"):this._("exec.exec"));
         },
diff --git a/packages/node_modules/@node-red/nodes/core/core/75-exec.js b/packages/node_modules/@node-red/nodes/core/function/90-exec.js
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/core/75-exec.js
rename to packages/node_modules/@node-red/nodes/core/function/90-exec.js
diff --git a/packages/node_modules/@node-red/nodes/core/logic/.DS_Store b/packages/node_modules/@node-red/nodes/core/logic/.DS_Store
deleted file mode 100644
index 5008ddfcf..000000000
Binary files a/packages/node_modules/@node-red/nodes/core/logic/.DS_Store and /dev/null differ
diff --git a/packages/node_modules/@node-red/nodes/core/logic/17-split.html b/packages/node_modules/@node-red/nodes/core/sequence/17-split.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/logic/17-split.html
rename to packages/node_modules/@node-red/nodes/core/sequence/17-split.html
diff --git a/packages/node_modules/@node-red/nodes/core/logic/17-split.js b/packages/node_modules/@node-red/nodes/core/sequence/17-split.js
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/logic/17-split.js
rename to packages/node_modules/@node-red/nodes/core/sequence/17-split.js
diff --git a/packages/node_modules/@node-red/nodes/core/logic/18-sort.html b/packages/node_modules/@node-red/nodes/core/sequence/18-sort.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/logic/18-sort.html
rename to packages/node_modules/@node-red/nodes/core/sequence/18-sort.html
diff --git a/packages/node_modules/@node-red/nodes/core/logic/18-sort.js b/packages/node_modules/@node-red/nodes/core/sequence/18-sort.js
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/logic/18-sort.js
rename to packages/node_modules/@node-red/nodes/core/sequence/18-sort.js
diff --git a/packages/node_modules/@node-red/nodes/core/logic/19-batch.html b/packages/node_modules/@node-red/nodes/core/sequence/19-batch.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/logic/19-batch.html
rename to packages/node_modules/@node-red/nodes/core/sequence/19-batch.html
diff --git a/packages/node_modules/@node-red/nodes/core/logic/19-batch.js b/packages/node_modules/@node-red/nodes/core/sequence/19-batch.js
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/logic/19-batch.js
rename to packages/node_modules/@node-red/nodes/core/sequence/19-batch.js
diff --git a/packages/node_modules/@node-red/nodes/core/storage/50-file.html b/packages/node_modules/@node-red/nodes/core/storage/10-file.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/storage/50-file.html
rename to packages/node_modules/@node-red/nodes/core/storage/10-file.html
diff --git a/packages/node_modules/@node-red/nodes/core/storage/50-file.js b/packages/node_modules/@node-red/nodes/core/storage/10-file.js
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/storage/50-file.js
rename to packages/node_modules/@node-red/nodes/core/storage/10-file.js
diff --git a/packages/node_modules/@node-red/nodes/core/io/23-watch.html b/packages/node_modules/@node-red/nodes/core/storage/23-watch.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/io/23-watch.html
rename to packages/node_modules/@node-red/nodes/core/storage/23-watch.html
diff --git a/packages/node_modules/@node-red/nodes/core/io/23-watch.js b/packages/node_modules/@node-red/nodes/core/storage/23-watch.js
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/io/23-watch.js
rename to packages/node_modules/@node-red/nodes/core/storage/23-watch.js
diff --git a/packages/node_modules/@node-red/nodes/icons/comment.svg b/packages/node_modules/@node-red/nodes/icons/comment.svg
index 43042723a..832dbf895 100644
--- a/packages/node_modules/@node-red/nodes/icons/comment.svg
+++ b/packages/node_modules/@node-red/nodes/icons/comment.svg
@@ -1 +1 @@
-<svg width="40" height="60" xmlns="http://www.w3.org/2000/svg"><path d="M36.19 28.6c0 6.088-7.289 11.024-16.28 11.024a23.98 23.98 0 0 1-2.982-.185c-1.272-.159-7.933 7.526-13.113 6.53.18-2.004 8.18-6.004 5.87-8.79C5.993 35.16 3.63 32.066 3.63 28.6c0-6.088 7.289-11.024 16.28-11.024 8.991 0 16.28 4.936 16.28 11.024z" fill="#fff" stroke="#868686" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" style="isolation:auto;mix-blend-mode:normal"/></svg>
+<svg width="40" height="60" xmlns="http://www.w3.org/2000/svg"><path d="M36.19 28.6c0 6.088-7.289 11.024-16.28 11.024a23.98 23.98 0 0 1-2.982-.185c-1.272-.159-7.933 7.526-13.113 6.53.18-2.004 8.18-6.004 5.87-8.79C5.993 35.16 3.63 32.066 3.63 28.6c0-6.088 7.289-11.024 16.28-11.024 8.991 0 16.28 4.936 16.28 11.024z" fill="#fff" stroke="#bababa" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" style="isolation:auto;mix-blend-mode:normal"/></svg>
diff --git a/packages/node_modules/@node-red/nodes/icons/status.svg b/packages/node_modules/@node-red/nodes/icons/status.svg
new file mode 100644
index 000000000..514e451aa
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/icons/status.svg
@@ -0,0 +1 @@
+<svg width="40" height="60" xmlns="http://www.w3.org/2000/svg"><path d="M0 30h9l3.5-10 5 25 5.125-30L27.5 40 31 30h9" fill="none" stroke="#fff" stroke-miterlimit="6.5" stroke-width="4"/></svg>
diff --git a/packages/node_modules/@node-red/nodes/locales/de/core/20-inject.html b/packages/node_modules/@node-red/nodes/locales/de/common/20-inject.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/de/core/20-inject.html
rename to packages/node_modules/@node-red/nodes/locales/de/common/20-inject.html
diff --git a/packages/node_modules/@node-red/nodes/locales/de/core/21-debug.html b/packages/node_modules/@node-red/nodes/locales/de/common/21-debug.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/de/core/21-debug.html
rename to packages/node_modules/@node-red/nodes/locales/de/common/21-debug.html
diff --git a/packages/node_modules/@node-red/nodes/locales/de/core/25-catch.html b/packages/node_modules/@node-red/nodes/locales/de/common/25-catch.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/de/core/25-catch.html
rename to packages/node_modules/@node-red/nodes/locales/de/common/25-catch.html
diff --git a/packages/node_modules/@node-red/nodes/locales/de/core/25-status.html b/packages/node_modules/@node-red/nodes/locales/de/common/25-status.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/de/core/25-status.html
rename to packages/node_modules/@node-red/nodes/locales/de/common/25-status.html
diff --git a/packages/node_modules/@node-red/nodes/locales/de/core/60-link.html b/packages/node_modules/@node-red/nodes/locales/de/common/60-link.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/de/core/60-link.html
rename to packages/node_modules/@node-red/nodes/locales/de/common/60-link.html
diff --git a/packages/node_modules/@node-red/nodes/locales/de/core/90-comment.html b/packages/node_modules/@node-red/nodes/locales/de/common/90-comment.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/de/core/90-comment.html
rename to packages/node_modules/@node-red/nodes/locales/de/common/90-comment.html
diff --git a/packages/node_modules/@node-red/nodes/locales/de/core/98-unknown.html b/packages/node_modules/@node-red/nodes/locales/de/common/98-unknown.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/de/core/98-unknown.html
rename to packages/node_modules/@node-red/nodes/locales/de/common/98-unknown.html
diff --git a/packages/node_modules/@node-red/nodes/locales/de/core/80-function.html b/packages/node_modules/@node-red/nodes/locales/de/function/10-function.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/de/core/80-function.html
rename to packages/node_modules/@node-red/nodes/locales/de/function/10-function.html
diff --git a/packages/node_modules/@node-red/nodes/locales/de/logic/10-switch.html b/packages/node_modules/@node-red/nodes/locales/de/function/10-switch.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/de/logic/10-switch.html
rename to packages/node_modules/@node-red/nodes/locales/de/function/10-switch.html
diff --git a/packages/node_modules/@node-red/nodes/locales/de/logic/15-change.html b/packages/node_modules/@node-red/nodes/locales/de/function/15-change.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/de/logic/15-change.html
rename to packages/node_modules/@node-red/nodes/locales/de/function/15-change.html
diff --git a/packages/node_modules/@node-red/nodes/locales/de/logic/16-range.html b/packages/node_modules/@node-red/nodes/locales/de/function/16-range.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/de/logic/16-range.html
rename to packages/node_modules/@node-red/nodes/locales/de/function/16-range.html
diff --git a/packages/node_modules/@node-red/nodes/locales/de/core/80-template.html b/packages/node_modules/@node-red/nodes/locales/de/function/80-template.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/de/core/80-template.html
rename to packages/node_modules/@node-red/nodes/locales/de/function/80-template.html
diff --git a/packages/node_modules/@node-red/nodes/locales/de/core/89-delay.html b/packages/node_modules/@node-red/nodes/locales/de/function/89-delay.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/de/core/89-delay.html
rename to packages/node_modules/@node-red/nodes/locales/de/function/89-delay.html
diff --git a/packages/node_modules/@node-red/nodes/locales/de/core/89-trigger.html b/packages/node_modules/@node-red/nodes/locales/de/function/89-trigger.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/de/core/89-trigger.html
rename to packages/node_modules/@node-red/nodes/locales/de/function/89-trigger.html
diff --git a/packages/node_modules/@node-red/nodes/locales/de/core/75-exec.html b/packages/node_modules/@node-red/nodes/locales/de/function/90-exec.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/de/core/75-exec.html
rename to packages/node_modules/@node-red/nodes/locales/de/function/90-exec.html
diff --git a/packages/node_modules/@node-red/nodes/locales/de/logic/17-split.html b/packages/node_modules/@node-red/nodes/locales/de/sequence/17-split.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/de/logic/17-split.html
rename to packages/node_modules/@node-red/nodes/locales/de/sequence/17-split.html
diff --git a/packages/node_modules/@node-red/nodes/locales/de/logic/18-sort.html b/packages/node_modules/@node-red/nodes/locales/de/sequence/18-sort.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/de/logic/18-sort.html
rename to packages/node_modules/@node-red/nodes/locales/de/sequence/18-sort.html
diff --git a/packages/node_modules/@node-red/nodes/locales/de/logic/19-batch.html b/packages/node_modules/@node-red/nodes/locales/de/sequence/19-batch.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/de/logic/19-batch.html
rename to packages/node_modules/@node-red/nodes/locales/de/sequence/19-batch.html
diff --git a/packages/node_modules/@node-red/nodes/locales/de/storage/50-file.html b/packages/node_modules/@node-red/nodes/locales/de/storage/10-file.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/de/storage/50-file.html
rename to packages/node_modules/@node-red/nodes/locales/de/storage/10-file.html
diff --git a/packages/node_modules/@node-red/nodes/locales/de/io/23-watch.html b/packages/node_modules/@node-red/nodes/locales/de/storage/23-watch.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/de/io/23-watch.html
rename to packages/node_modules/@node-red/nodes/locales/de/storage/23-watch.html
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/core/20-inject.html b/packages/node_modules/@node-red/nodes/locales/en-US/common/20-inject.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/en-US/core/20-inject.html
rename to packages/node_modules/@node-red/nodes/locales/en-US/common/20-inject.html
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/core/21-debug.html b/packages/node_modules/@node-red/nodes/locales/en-US/common/21-debug.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/en-US/core/21-debug.html
rename to packages/node_modules/@node-red/nodes/locales/en-US/common/21-debug.html
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/core/25-catch.html b/packages/node_modules/@node-red/nodes/locales/en-US/common/25-catch.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/en-US/core/25-catch.html
rename to packages/node_modules/@node-red/nodes/locales/en-US/common/25-catch.html
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/core/25-status.html b/packages/node_modules/@node-red/nodes/locales/en-US/common/25-status.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/en-US/core/25-status.html
rename to packages/node_modules/@node-red/nodes/locales/en-US/common/25-status.html
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/core/60-link.html b/packages/node_modules/@node-red/nodes/locales/en-US/common/60-link.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/en-US/core/60-link.html
rename to packages/node_modules/@node-red/nodes/locales/en-US/common/60-link.html
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/core/90-comment.html b/packages/node_modules/@node-red/nodes/locales/en-US/common/90-comment.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/en-US/core/90-comment.html
rename to packages/node_modules/@node-red/nodes/locales/en-US/common/90-comment.html
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/core/98-unknown.html b/packages/node_modules/@node-red/nodes/locales/en-US/common/98-unknown.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/en-US/core/98-unknown.html
rename to packages/node_modules/@node-red/nodes/locales/en-US/common/98-unknown.html
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/core/80-function.html b/packages/node_modules/@node-red/nodes/locales/en-US/function/10-function.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/en-US/core/80-function.html
rename to packages/node_modules/@node-red/nodes/locales/en-US/function/10-function.html
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/logic/10-switch.html b/packages/node_modules/@node-red/nodes/locales/en-US/function/10-switch.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/en-US/logic/10-switch.html
rename to packages/node_modules/@node-red/nodes/locales/en-US/function/10-switch.html
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/logic/15-change.html b/packages/node_modules/@node-red/nodes/locales/en-US/function/15-change.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/en-US/logic/15-change.html
rename to packages/node_modules/@node-red/nodes/locales/en-US/function/15-change.html
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/logic/16-range.html b/packages/node_modules/@node-red/nodes/locales/en-US/function/16-range.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/en-US/logic/16-range.html
rename to packages/node_modules/@node-red/nodes/locales/en-US/function/16-range.html
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/core/80-template.html b/packages/node_modules/@node-red/nodes/locales/en-US/function/80-template.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/en-US/core/80-template.html
rename to packages/node_modules/@node-red/nodes/locales/en-US/function/80-template.html
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/core/89-delay.html b/packages/node_modules/@node-red/nodes/locales/en-US/function/89-delay.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/en-US/core/89-delay.html
rename to packages/node_modules/@node-red/nodes/locales/en-US/function/89-delay.html
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/core/89-trigger.html b/packages/node_modules/@node-red/nodes/locales/en-US/function/89-trigger.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/en-US/core/89-trigger.html
rename to packages/node_modules/@node-red/nodes/locales/en-US/function/89-trigger.html
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/core/75-exec.html b/packages/node_modules/@node-red/nodes/locales/en-US/function/90-exec.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/en-US/core/75-exec.html
rename to packages/node_modules/@node-red/nodes/locales/en-US/function/90-exec.html
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/logic/17-split.html b/packages/node_modules/@node-red/nodes/locales/en-US/sequence/17-split.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/en-US/logic/17-split.html
rename to packages/node_modules/@node-red/nodes/locales/en-US/sequence/17-split.html
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/logic/18-sort.html b/packages/node_modules/@node-red/nodes/locales/en-US/sequence/18-sort.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/en-US/logic/18-sort.html
rename to packages/node_modules/@node-red/nodes/locales/en-US/sequence/18-sort.html
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/logic/19-batch.html b/packages/node_modules/@node-red/nodes/locales/en-US/sequence/19-batch.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/en-US/logic/19-batch.html
rename to packages/node_modules/@node-red/nodes/locales/en-US/sequence/19-batch.html
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/storage/50-file.html b/packages/node_modules/@node-red/nodes/locales/en-US/storage/10-file.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/en-US/storage/50-file.html
rename to packages/node_modules/@node-red/nodes/locales/en-US/storage/10-file.html
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/io/23-watch.html b/packages/node_modules/@node-red/nodes/locales/en-US/storage/23-watch.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/en-US/io/23-watch.html
rename to packages/node_modules/@node-red/nodes/locales/en-US/storage/23-watch.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/core/20-inject.html b/packages/node_modules/@node-red/nodes/locales/ja/common/20-inject.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ja/core/20-inject.html
rename to packages/node_modules/@node-red/nodes/locales/ja/common/20-inject.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/core/21-debug.html b/packages/node_modules/@node-red/nodes/locales/ja/common/21-debug.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ja/core/21-debug.html
rename to packages/node_modules/@node-red/nodes/locales/ja/common/21-debug.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/core/25-catch.html b/packages/node_modules/@node-red/nodes/locales/ja/common/25-catch.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ja/core/25-catch.html
rename to packages/node_modules/@node-red/nodes/locales/ja/common/25-catch.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/core/25-status.html b/packages/node_modules/@node-red/nodes/locales/ja/common/25-status.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ja/core/25-status.html
rename to packages/node_modules/@node-red/nodes/locales/ja/common/25-status.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/core/60-link.html b/packages/node_modules/@node-red/nodes/locales/ja/common/60-link.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ja/core/60-link.html
rename to packages/node_modules/@node-red/nodes/locales/ja/common/60-link.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/core/90-comment.html b/packages/node_modules/@node-red/nodes/locales/ja/common/90-comment.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ja/core/90-comment.html
rename to packages/node_modules/@node-red/nodes/locales/ja/common/90-comment.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/core/98-unknown.html b/packages/node_modules/@node-red/nodes/locales/ja/common/98-unknown.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ja/core/98-unknown.html
rename to packages/node_modules/@node-red/nodes/locales/ja/common/98-unknown.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/core/80-function.html b/packages/node_modules/@node-red/nodes/locales/ja/function/10-function.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ja/core/80-function.html
rename to packages/node_modules/@node-red/nodes/locales/ja/function/10-function.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/logic/10-switch.html b/packages/node_modules/@node-red/nodes/locales/ja/function/10-switch.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ja/logic/10-switch.html
rename to packages/node_modules/@node-red/nodes/locales/ja/function/10-switch.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/logic/15-change.html b/packages/node_modules/@node-red/nodes/locales/ja/function/15-change.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ja/logic/15-change.html
rename to packages/node_modules/@node-red/nodes/locales/ja/function/15-change.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/logic/16-range.html b/packages/node_modules/@node-red/nodes/locales/ja/function/16-range.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ja/logic/16-range.html
rename to packages/node_modules/@node-red/nodes/locales/ja/function/16-range.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/core/80-template.html b/packages/node_modules/@node-red/nodes/locales/ja/function/80-template.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ja/core/80-template.html
rename to packages/node_modules/@node-red/nodes/locales/ja/function/80-template.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/core/89-delay.html b/packages/node_modules/@node-red/nodes/locales/ja/function/89-delay.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ja/core/89-delay.html
rename to packages/node_modules/@node-red/nodes/locales/ja/function/89-delay.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/core/89-trigger.html b/packages/node_modules/@node-red/nodes/locales/ja/function/89-trigger.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ja/core/89-trigger.html
rename to packages/node_modules/@node-red/nodes/locales/ja/function/89-trigger.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/core/75-exec.html b/packages/node_modules/@node-red/nodes/locales/ja/function/90-exec.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ja/core/75-exec.html
rename to packages/node_modules/@node-red/nodes/locales/ja/function/90-exec.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/logic/17-split.html b/packages/node_modules/@node-red/nodes/locales/ja/sequence/17-split.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ja/logic/17-split.html
rename to packages/node_modules/@node-red/nodes/locales/ja/sequence/17-split.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/logic/18-sort.html b/packages/node_modules/@node-red/nodes/locales/ja/sequence/18-sort.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ja/logic/18-sort.html
rename to packages/node_modules/@node-red/nodes/locales/ja/sequence/18-sort.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/logic/19-batch.html b/packages/node_modules/@node-red/nodes/locales/ja/sequence/19-batch.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ja/logic/19-batch.html
rename to packages/node_modules/@node-red/nodes/locales/ja/sequence/19-batch.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/storage/50-file.html b/packages/node_modules/@node-red/nodes/locales/ja/storage/10-file.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ja/storage/50-file.html
rename to packages/node_modules/@node-red/nodes/locales/ja/storage/10-file.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/io/23-watch.html b/packages/node_modules/@node-red/nodes/locales/ja/storage/23-watch.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ja/io/23-watch.html
rename to packages/node_modules/@node-red/nodes/locales/ja/storage/23-watch.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/core/20-inject.html b/packages/node_modules/@node-red/nodes/locales/ko/common/20-inject.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ko/core/20-inject.html
rename to packages/node_modules/@node-red/nodes/locales/ko/common/20-inject.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/core/21-debug.html b/packages/node_modules/@node-red/nodes/locales/ko/common/21-debug.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ko/core/21-debug.html
rename to packages/node_modules/@node-red/nodes/locales/ko/common/21-debug.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/core/25-catch.html b/packages/node_modules/@node-red/nodes/locales/ko/common/25-catch.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ko/core/25-catch.html
rename to packages/node_modules/@node-red/nodes/locales/ko/common/25-catch.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/core/25-status.html b/packages/node_modules/@node-red/nodes/locales/ko/common/25-status.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ko/core/25-status.html
rename to packages/node_modules/@node-red/nodes/locales/ko/common/25-status.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/core/60-link.html b/packages/node_modules/@node-red/nodes/locales/ko/common/60-link.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ko/core/60-link.html
rename to packages/node_modules/@node-red/nodes/locales/ko/common/60-link.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/core/90-comment.html b/packages/node_modules/@node-red/nodes/locales/ko/common/90-comment.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ko/core/90-comment.html
rename to packages/node_modules/@node-red/nodes/locales/ko/common/90-comment.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/core/98-unknown.html b/packages/node_modules/@node-red/nodes/locales/ko/common/98-unknown.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ko/core/98-unknown.html
rename to packages/node_modules/@node-red/nodes/locales/ko/common/98-unknown.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/core/80-function.html b/packages/node_modules/@node-red/nodes/locales/ko/function/10-function.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ko/core/80-function.html
rename to packages/node_modules/@node-red/nodes/locales/ko/function/10-function.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/logic/10-switch.html b/packages/node_modules/@node-red/nodes/locales/ko/function/10-switch.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ko/logic/10-switch.html
rename to packages/node_modules/@node-red/nodes/locales/ko/function/10-switch.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/logic/15-change.html b/packages/node_modules/@node-red/nodes/locales/ko/function/15-change.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ko/logic/15-change.html
rename to packages/node_modules/@node-red/nodes/locales/ko/function/15-change.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/logic/16-range.html b/packages/node_modules/@node-red/nodes/locales/ko/function/16-range.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ko/logic/16-range.html
rename to packages/node_modules/@node-red/nodes/locales/ko/function/16-range.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/core/80-template.html b/packages/node_modules/@node-red/nodes/locales/ko/function/80-template.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ko/core/80-template.html
rename to packages/node_modules/@node-red/nodes/locales/ko/function/80-template.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/core/89-delay.html b/packages/node_modules/@node-red/nodes/locales/ko/function/89-delay.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ko/core/89-delay.html
rename to packages/node_modules/@node-red/nodes/locales/ko/function/89-delay.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/core/89-trigger.html b/packages/node_modules/@node-red/nodes/locales/ko/function/89-trigger.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ko/core/89-trigger.html
rename to packages/node_modules/@node-red/nodes/locales/ko/function/89-trigger.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/core/75-exec.html b/packages/node_modules/@node-red/nodes/locales/ko/function/90-exec.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ko/core/75-exec.html
rename to packages/node_modules/@node-red/nodes/locales/ko/function/90-exec.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/logic/17-split.html b/packages/node_modules/@node-red/nodes/locales/ko/sequence/17-split.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ko/logic/17-split.html
rename to packages/node_modules/@node-red/nodes/locales/ko/sequence/17-split.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/logic/18-sort.html b/packages/node_modules/@node-red/nodes/locales/ko/sequence/18-sort.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ko/logic/18-sort.html
rename to packages/node_modules/@node-red/nodes/locales/ko/sequence/18-sort.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/logic/19-batch.html b/packages/node_modules/@node-red/nodes/locales/ko/sequence/19-batch.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ko/logic/19-batch.html
rename to packages/node_modules/@node-red/nodes/locales/ko/sequence/19-batch.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/storage/50-file.html b/packages/node_modules/@node-red/nodes/locales/ko/storage/10-file.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ko/storage/50-file.html
rename to packages/node_modules/@node-red/nodes/locales/ko/storage/10-file.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/io/23-watch.html b/packages/node_modules/@node-red/nodes/locales/ko/storage/23-watch.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ko/io/23-watch.html
rename to packages/node_modules/@node-red/nodes/locales/ko/storage/23-watch.html
diff --git a/test/nodes/core/core/20-inject_spec.js b/test/nodes/core/common/20-inject_spec.js
similarity index 99%
rename from test/nodes/core/core/20-inject_spec.js
rename to test/nodes/core/common/20-inject_spec.js
index 8eeec3620..ea78d0f53 100644
--- a/test/nodes/core/core/20-inject_spec.js
+++ b/test/nodes/core/common/20-inject_spec.js
@@ -15,7 +15,7 @@
  **/
 
 var should = require("should");
-var injectNode = require("nr-test-utils").require("@node-red/nodes/core/core/20-inject.js");
+var injectNode = require("nr-test-utils").require("@node-red/nodes/core/common/20-inject.js");
 var Context = require("nr-test-utils").require("@node-red/runtime/lib/nodes/context");
 var helper = require("node-red-node-test-helper");
 
diff --git a/test/nodes/core/core/58-debug_spec.js b/test/nodes/core/common/21-debug_spec.js
similarity index 99%
rename from test/nodes/core/core/58-debug_spec.js
rename to test/nodes/core/common/21-debug_spec.js
index 1ae55062f..c3a5d4d2a 100644
--- a/test/nodes/core/core/58-debug_spec.js
+++ b/test/nodes/core/common/21-debug_spec.js
@@ -15,7 +15,7 @@
  **/
 
 var should = require("should");
-var debugNode = require("nr-test-utils").require("@node-red/nodes/core/core/58-debug.js");
+var debugNode = require("nr-test-utils").require("@node-red/nodes/core/common/21-debug.js");
 var helper = require("node-red-node-test-helper");
 var WebSocket = require('ws');
 
diff --git a/test/nodes/core/core/25-catch_spec.js b/test/nodes/core/common/25-catch_spec.js
similarity index 98%
rename from test/nodes/core/core/25-catch_spec.js
rename to test/nodes/core/common/25-catch_spec.js
index 5ab913cb3..466d912d7 100644
--- a/test/nodes/core/core/25-catch_spec.js
+++ b/test/nodes/core/common/25-catch_spec.js
@@ -15,7 +15,7 @@
  **/
 
 var should = require("should");
-var catchNode = require("nr-test-utils").require("@node-red/nodes/core/core/25-catch.js");
+var catchNode = require("nr-test-utils").require("@node-red/nodes/core/common/25-catch.js");
 var helper = require("node-red-node-test-helper");
 
 describe('catch Node', function() {
diff --git a/test/nodes/core/core/25-status_spec.js b/test/nodes/core/common/25-status_spec.js
similarity index 98%
rename from test/nodes/core/core/25-status_spec.js
rename to test/nodes/core/common/25-status_spec.js
index 33689248d..41b0a79c8 100644
--- a/test/nodes/core/core/25-status_spec.js
+++ b/test/nodes/core/common/25-status_spec.js
@@ -15,7 +15,7 @@
  **/
 
 var should = require("should");
-var catchNode = require("nr-test-utils").require("@node-red/nodes/core/core/25-status.js");
+var catchNode = require("nr-test-utils").require("@node-red/nodes/core/common/25-status.js");
 var helper = require("node-red-node-test-helper");
 
 describe('status Node', function() {
diff --git a/test/nodes/core/core/60-link_spec.js b/test/nodes/core/common/60-link_spec.js
similarity index 99%
rename from test/nodes/core/core/60-link_spec.js
rename to test/nodes/core/common/60-link_spec.js
index b52dee470..50072d761 100644
--- a/test/nodes/core/core/60-link_spec.js
+++ b/test/nodes/core/common/60-link_spec.js
@@ -15,7 +15,7 @@
  **/
 
 var should = require("should");
-var linkNode = require("nr-test-utils").require("@node-red/nodes/core/core/60-link.js");
+var linkNode = require("nr-test-utils").require("@node-red/nodes/core/common/60-link.js");
 var helper = require("node-red-node-test-helper");
 
 describe('link Node', function() {
diff --git a/test/nodes/core/core/90-comment_spec.js b/test/nodes/core/common/90-comment_spec.js
similarity index 97%
rename from test/nodes/core/core/90-comment_spec.js
rename to test/nodes/core/common/90-comment_spec.js
index d8740970c..a6f6a8284 100644
--- a/test/nodes/core/core/90-comment_spec.js
+++ b/test/nodes/core/common/90-comment_spec.js
@@ -15,7 +15,7 @@
  **/
 
 var should = require("should");
-var commentNode = require("nr-test-utils").require("@node-red/nodes/core/core/90-comment.js");
+var commentNode = require("nr-test-utils").require("@node-red/nodes/core/common/90-comment.js");
 var helper = require("node-red-node-test-helper");
 
 describe('comment Node', function() {
diff --git a/test/nodes/core/core/98-unknown_spec.js b/test/nodes/core/common/98-unknown_spec.js
similarity index 97%
rename from test/nodes/core/core/98-unknown_spec.js
rename to test/nodes/core/common/98-unknown_spec.js
index 04ca621f3..1b16a5c3b 100644
--- a/test/nodes/core/core/98-unknown_spec.js
+++ b/test/nodes/core/common/98-unknown_spec.js
@@ -15,7 +15,7 @@
  **/
 
 var should = require("should");
-var unknown = require("nr-test-utils").require("@node-red/nodes/core/core/98-unknown.js");
+var unknown = require("nr-test-utils").require("@node-red/nodes/core/common/98-unknown.js");
 var helper = require("node-red-node-test-helper");
 
 describe('unknown Node', function() {
diff --git a/test/nodes/core/core/80-function_spec.js b/test/nodes/core/function/10-function_spec.js
similarity index 99%
rename from test/nodes/core/core/80-function_spec.js
rename to test/nodes/core/function/10-function_spec.js
index 86d616ede..df44a66ee 100644
--- a/test/nodes/core/core/80-function_spec.js
+++ b/test/nodes/core/function/10-function_spec.js
@@ -15,7 +15,7 @@
 **/
 
 var should = require("should");
-var functionNode = require("nr-test-utils").require("@node-red/nodes/core/core/80-function.js");
+var functionNode = require("nr-test-utils").require("@node-red/nodes/core/function/10-function.js");
 var Context = require("nr-test-utils").require("@node-red/runtime/lib/nodes/context");
 var helper = require("node-red-node-test-helper");
 
diff --git a/test/nodes/core/logic/10-switch_spec.js b/test/nodes/core/function/10-switch_spec.js
similarity index 99%
rename from test/nodes/core/logic/10-switch_spec.js
rename to test/nodes/core/function/10-switch_spec.js
index 034198ccf..3865bdb99 100644
--- a/test/nodes/core/logic/10-switch_spec.js
+++ b/test/nodes/core/function/10-switch_spec.js
@@ -16,7 +16,7 @@
 
 var should = require("should");
 
-var switchNode = require("nr-test-utils").require("@node-red/nodes/core/logic/10-switch.js");
+var switchNode = require("nr-test-utils").require("@node-red/nodes/core/function/10-switch.js");
 var helper = require("node-red-node-test-helper");
 var RED = require("nr-test-utils").require("node-red/lib/red");
 var Context = require("nr-test-utils").require("@node-red/runtime/lib/nodes/context/");
diff --git a/test/nodes/core/logic/15-change_spec.js b/test/nodes/core/function/15-change_spec.js
similarity index 99%
rename from test/nodes/core/logic/15-change_spec.js
rename to test/nodes/core/function/15-change_spec.js
index a838ca4a6..1809d91d9 100644
--- a/test/nodes/core/logic/15-change_spec.js
+++ b/test/nodes/core/function/15-change_spec.js
@@ -17,7 +17,7 @@
 var should = require("should");
 var sinon = require("sinon");
 
-var changeNode = require("nr-test-utils").require("@node-red/nodes/core/logic/15-change.js");
+var changeNode = require("nr-test-utils").require("@node-red/nodes/core/function/15-change.js");
 var Context = require("nr-test-utils").require("@node-red/runtime/lib/nodes/context");
 var helper = require("node-red-node-test-helper");
 
diff --git a/test/nodes/core/logic/16-range_spec.js b/test/nodes/core/function/16-range_spec.js
similarity index 99%
rename from test/nodes/core/logic/16-range_spec.js
rename to test/nodes/core/function/16-range_spec.js
index ddf34be8f..a0dcd0078 100644
--- a/test/nodes/core/logic/16-range_spec.js
+++ b/test/nodes/core/function/16-range_spec.js
@@ -16,7 +16,7 @@
 
 var should = require("should");
 
-var rangeNode = require("nr-test-utils").require("@node-red/nodes/core/logic/16-range.js");
+var rangeNode = require("nr-test-utils").require("@node-red/nodes/core/function/16-range.js");
 var helper = require("node-red-node-test-helper");
 
 describe('range Node', function() {
diff --git a/test/nodes/core/core/80-template_spec.js b/test/nodes/core/function/80-template_spec.js
similarity index 99%
rename from test/nodes/core/core/80-template_spec.js
rename to test/nodes/core/function/80-template_spec.js
index 5c89d73a8..e944824b3 100644
--- a/test/nodes/core/core/80-template_spec.js
+++ b/test/nodes/core/function/80-template_spec.js
@@ -15,7 +15,7 @@
  **/
 
 var should = require("should");
-var templateNode = require("nr-test-utils").require("@node-red/nodes/core/core/80-template.js");
+var templateNode = require("nr-test-utils").require("@node-red/nodes/core/function/80-template.js");
 var Context = require("nr-test-utils").require("@node-red/runtime/lib/nodes/context");
 var helper = require("node-red-node-test-helper");
 
diff --git a/test/nodes/core/core/89-delay_spec.js b/test/nodes/core/function/89-delay_spec.js
similarity index 99%
rename from test/nodes/core/core/89-delay_spec.js
rename to test/nodes/core/function/89-delay_spec.js
index c516adb43..f16a13636 100644
--- a/test/nodes/core/core/89-delay_spec.js
+++ b/test/nodes/core/function/89-delay_spec.js
@@ -16,7 +16,7 @@
 
 var should = require("should");
 
-var delayNode = require("nr-test-utils").require("@node-red/nodes/core/core/89-delay.js");
+var delayNode = require("nr-test-utils").require("@node-red/nodes/core/function/89-delay.js");
 var helper = require("node-red-node-test-helper");
 
 var GRACE_PERCENTAGE=10;
diff --git a/test/nodes/core/core/89-trigger_spec.js b/test/nodes/core/function/89-trigger_spec.js
similarity index 99%
rename from test/nodes/core/core/89-trigger_spec.js
rename to test/nodes/core/function/89-trigger_spec.js
index 8f2f71b8c..5f7bfc2d1 100644
--- a/test/nodes/core/core/89-trigger_spec.js
+++ b/test/nodes/core/function/89-trigger_spec.js
@@ -17,7 +17,7 @@
 var should = require("should");
 var sinon = require("sinon");
 var helper = require("node-red-node-test-helper");
-var triggerNode = require("nr-test-utils").require("@node-red/nodes/core/core/89-trigger.js");
+var triggerNode = require("nr-test-utils").require("@node-red/nodes/core/function/89-trigger.js");
 var Context = require("nr-test-utils").require("@node-red/runtime/lib/nodes/context");
 var RED = require("nr-test-utils").require("node-red/lib/red");
 
diff --git a/test/nodes/core/core/75-exec_spec.js b/test/nodes/core/function/90-exec_spec.js
similarity index 99%
rename from test/nodes/core/core/75-exec_spec.js
rename to test/nodes/core/function/90-exec_spec.js
index 5b20dc658..6dbe8137d 100644
--- a/test/nodes/core/core/75-exec_spec.js
+++ b/test/nodes/core/function/90-exec_spec.js
@@ -17,7 +17,7 @@
 var should = require("should");
 var sinon = require("sinon");
 var helper = require("node-red-node-test-helper");
-var execNode = require("nr-test-utils").require("@node-red/nodes/core/core/75-exec.js");
+var execNode = require("nr-test-utils").require("@node-red/nodes/core/function/90-exec.js");
 var osType = require("os").type();
 
 var child_process = require('child_process');
diff --git a/test/nodes/core/logic/17-split_spec.js b/test/nodes/core/sequence/17-split_spec.js
similarity index 99%
rename from test/nodes/core/logic/17-split_spec.js
rename to test/nodes/core/sequence/17-split_spec.js
index e55682965..3d38a9ac8 100644
--- a/test/nodes/core/logic/17-split_spec.js
+++ b/test/nodes/core/sequence/17-split_spec.js
@@ -15,8 +15,8 @@
  **/
 
 var should = require("should");
-var splitNode = require("nr-test-utils").require("@node-red/nodes/core/logic/17-split.js");
-var joinNode = require("nr-test-utils").require("@node-red/nodes/core/logic/17-split.js");
+var splitNode = require("nr-test-utils").require("@node-red/nodes/core/sequence/17-split.js");
+var joinNode = require("nr-test-utils").require("@node-red/nodes/core/sequence/17-split.js");
 var helper = require("node-red-node-test-helper");
 var RED = require("nr-test-utils").require("node-red/lib/red.js");
 var Context = require("nr-test-utils").require("@node-red/runtime/lib/nodes/context");
diff --git a/test/nodes/core/logic/18-sort_spec.js b/test/nodes/core/sequence/18-sort_spec.js
similarity index 99%
rename from test/nodes/core/logic/18-sort_spec.js
rename to test/nodes/core/sequence/18-sort_spec.js
index 960a6d666..ac220216c 100644
--- a/test/nodes/core/logic/18-sort_spec.js
+++ b/test/nodes/core/sequence/18-sort_spec.js
@@ -15,7 +15,7 @@
  **/
 
 var should = require("should");
-var sortNode = require("nr-test-utils").require("@node-red/nodes/core/logic/18-sort.js");
+var sortNode = require("nr-test-utils").require("@node-red/nodes/core/sequence/18-sort.js");
 var helper = require("node-red-node-test-helper");
 var RED = require("nr-test-utils").require("node-red/lib/red.js");
 var Context = require("nr-test-utils").require("@node-red/runtime/lib/nodes/context");
diff --git a/test/nodes/core/logic/19-batch_spec.js b/test/nodes/core/sequence/19-batch_spec.js
similarity index 99%
rename from test/nodes/core/logic/19-batch_spec.js
rename to test/nodes/core/sequence/19-batch_spec.js
index e62f3bf6f..3a40ebfb5 100644
--- a/test/nodes/core/logic/19-batch_spec.js
+++ b/test/nodes/core/sequence/19-batch_spec.js
@@ -15,7 +15,7 @@
  **/
 
 var should = require("should");
-var batchNode = require("nr-test-utils").require("@node-red/nodes/core/logic/19-batch.js");
+var batchNode = require("nr-test-utils").require("@node-red/nodes/core/sequence/19-batch.js");
 var helper = require("node-red-node-test-helper");
 var RED = require("nr-test-utils").require("node-red/lib/red.js");
 
diff --git a/test/nodes/core/storage/50-file_spec.js b/test/nodes/core/storage/10-file_spec.js
similarity index 99%
rename from test/nodes/core/storage/50-file_spec.js
rename to test/nodes/core/storage/10-file_spec.js
index 19b7e804d..cb3dc5d07 100644
--- a/test/nodes/core/storage/50-file_spec.js
+++ b/test/nodes/core/storage/10-file_spec.js
@@ -20,7 +20,7 @@ var fs = require('fs-extra');
 var os = require('os');
 var sinon = require("sinon");
 var iconv = require("iconv-lite");
-var fileNode = require("nr-test-utils").require("@node-red/nodes/core/storage/50-file.js");
+var fileNode = require("nr-test-utils").require("@node-red/nodes/core/storage/10-file.js");
 var helper = require("node-red-node-test-helper");
 
 describe('file Nodes', function() {
@@ -31,7 +31,7 @@ describe('file Nodes', function() {
         }
         return iconv.encode(s, enc);
     }
-    
+
     function decode(data, enc) {
         if (enc === "none") {
             return data.toString();
@@ -780,7 +780,7 @@ describe('file Nodes', function() {
             it('should write to a file with "Big5" encoding', function(done) {
                 checkWriteWithEncoding("Big5", "test", done);
             });
-            
+
             it('should write to a file with "Big5-HKSCS" encoding', function(done) {
                 checkWriteWithEncoding("Big5-HKSCS", "test", done);
             });
@@ -1280,10 +1280,10 @@ describe('file Nodes', function() {
                     n1.receive({payload:""});
                 });
             }
-            
+
             // default
             it('should read in a file with "none" encoding', function(done) {
-                checkReadWithEncoding("none", "試験", done);                
+                checkReadWithEncoding("none", "試験", done);
             });
 
             // Native
@@ -1332,7 +1332,7 @@ describe('file Nodes', function() {
             it('should read in a file with "EUC-JP" encoding', function(done) {
                 checkReadWithEncoding("EUC-JP", "試験", done);
             });
-            
+
             // following encoding tests should be more specific
             // Chinese
             it('should read in a file with "GB2312" encoding', function(done) {
@@ -1372,7 +1372,7 @@ describe('file Nodes', function() {
             it('should read in a file with "Big5" encoding', function(done) {
                 checkReadWithEncoding("Big5", "test", done);
             });
-            
+
             it('should read in a file with "Big5-HKSCS" encoding', function(done) {
                 checkReadWithEncoding("Big5-HKSCS", "test", done);
             });
@@ -1621,8 +1621,8 @@ describe('file Nodes', function() {
             it('should read in a file with "tis620" encoding', function(done) {
                 checkReadWithEncoding("tis620", "test", done);
             });
-            
+
         });
-        
+
     });
 });
diff --git a/test/nodes/core/io/23-watch_spec.js b/test/nodes/core/storage/23-watch_spec.js
similarity index 99%
rename from test/nodes/core/io/23-watch_spec.js
rename to test/nodes/core/storage/23-watch_spec.js
index 87d68f0b8..a9942d5b1 100644
--- a/test/nodes/core/io/23-watch_spec.js
+++ b/test/nodes/core/storage/23-watch_spec.js
@@ -18,7 +18,7 @@ var fs = require("fs-extra");
 var path = require("path");
 var should = require("should");
 var helper = require("node-red-node-test-helper");
-var watchNode = require("nr-test-utils").require("@node-red/nodes/core/io/23-watch.js");
+var watchNode = require("nr-test-utils").require("@node-red/nodes/core/storage/23-watch.js");
 
 
 describe('watch Node', function() {
diff --git a/test/nodes/subflow/subflow_spec.js b/test/nodes/subflow/subflow_spec.js
index 84fba68dd..39f5f6b8a 100644
--- a/test/nodes/subflow/subflow_spec.js
+++ b/test/nodes/subflow/subflow_spec.js
@@ -15,7 +15,7 @@
 **/
 
 var should = require("should");
-var functionNode = require("nr-test-utils").require("@node-red/nodes/core/core/80-function.js");
+var functionNode = require("nr-test-utils").require("@node-red/nodes/core/function/10-function.js");
 var helper = require("node-red-node-test-helper");
 
 // Notice: