diff --git a/Gruntfile.js b/Gruntfile.js
index 6849b8a76..272290495 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -227,7 +227,7 @@ module.exports = function(grunt) {
             messages: {
                 src: [
                     'packages/node_modules/@node-red/nodes/locales/**/*.json',
-                    'packages/node_modules/@node-red/editor-api/lib/editor/locales/**/*.json',
+                    'packages/node_modules/@node-red/editor-client/locales/**/*.json',
                     'packages/node_modules/@node-red/runtime/locales/**/*.json'
                 ]
             },
@@ -282,7 +282,7 @@ module.exports = function(grunt) {
             json: {
                 files: [
                     'packages/node_modules/@node-red/nodes/locales/**/*.json',
-                    'packages/node_modules/@node-red/editor-api/lib/editor/locales/**/*.json',
+                    'packages/node_modules/@node-red/editor-client/locales/**/*.json',
                     'packages/node_modules/@node-red/runtime/locales/**/*.json'
                 ],
                 tasks: ['jsonlint:messages']
diff --git a/packages/node_modules/@node-red/editor-api/lib/editor/index.js b/packages/node_modules/@node-red/editor-api/lib/editor/index.js
index e84f0d765..596fba67e 100644
--- a/packages/node_modules/@node-red/editor-api/lib/editor/index.js
+++ b/packages/node_modules/@node-red/editor-api/lib/editor/index.js
@@ -111,7 +111,7 @@ module.exports = {
         }
     },
     start: function() {
-        var catalogPath = path.resolve(path.join(__dirname,"locales"));
+        var catalogPath = path.resolve(path.join(path.dirname(require.resolve("@node-red/editor-client")),"locales"));
         return i18n.registerMessageCatalogs([
             {namespace: "editor",   dir: catalogPath, file:"editor.json"},
             {namespace: "jsonata",  dir: catalogPath, file:"jsonata.json"},
diff --git a/packages/node_modules/@node-red/editor-api/lib/editor/locales/en-US/editor.json b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
similarity index 100%
rename from packages/node_modules/@node-red/editor-api/lib/editor/locales/en-US/editor.json
rename to packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
diff --git a/packages/node_modules/@node-red/editor-api/lib/editor/locales/en-US/infotips.json b/packages/node_modules/@node-red/editor-client/locales/en-US/infotips.json
similarity index 100%
rename from packages/node_modules/@node-red/editor-api/lib/editor/locales/en-US/infotips.json
rename to packages/node_modules/@node-red/editor-client/locales/en-US/infotips.json
diff --git a/packages/node_modules/@node-red/editor-api/lib/editor/locales/en-US/jsonata.json b/packages/node_modules/@node-red/editor-client/locales/en-US/jsonata.json
similarity index 100%
rename from packages/node_modules/@node-red/editor-api/lib/editor/locales/en-US/jsonata.json
rename to packages/node_modules/@node-red/editor-client/locales/en-US/jsonata.json
diff --git a/packages/node_modules/@node-red/editor-api/lib/editor/locales/ja/editor.json b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
similarity index 100%
rename from packages/node_modules/@node-red/editor-api/lib/editor/locales/ja/editor.json
rename to packages/node_modules/@node-red/editor-client/locales/ja/editor.json
diff --git a/packages/node_modules/@node-red/editor-api/lib/editor/locales/ja/infotips.json b/packages/node_modules/@node-red/editor-client/locales/ja/infotips.json
similarity index 100%
rename from packages/node_modules/@node-red/editor-api/lib/editor/locales/ja/infotips.json
rename to packages/node_modules/@node-red/editor-client/locales/ja/infotips.json
diff --git a/packages/node_modules/@node-red/editor-api/lib/editor/locales/ja/jsonata.json b/packages/node_modules/@node-red/editor-client/locales/ja/jsonata.json
similarity index 100%
rename from packages/node_modules/@node-red/editor-api/lib/editor/locales/ja/jsonata.json
rename to packages/node_modules/@node-red/editor-client/locales/ja/jsonata.json
diff --git a/packages/node_modules/@node-red/editor-api/lib/editor/locales/zh-CN/editor.json b/packages/node_modules/@node-red/editor-client/locales/zh-CN/editor.json
similarity index 100%
rename from packages/node_modules/@node-red/editor-api/lib/editor/locales/zh-CN/editor.json
rename to packages/node_modules/@node-red/editor-client/locales/zh-CN/editor.json
diff --git a/packages/node_modules/@node-red/editor-api/lib/editor/locales/zh-CN/infotips.json b/packages/node_modules/@node-red/editor-client/locales/zh-CN/infotips.json
similarity index 100%
rename from packages/node_modules/@node-red/editor-api/lib/editor/locales/zh-CN/infotips.json
rename to packages/node_modules/@node-red/editor-client/locales/zh-CN/infotips.json
diff --git a/packages/node_modules/@node-red/editor-api/lib/editor/locales/zh-CN/jsonata.json b/packages/node_modules/@node-red/editor-client/locales/zh-CN/jsonata.json
similarity index 100%
rename from packages/node_modules/@node-red/editor-api/lib/editor/locales/zh-CN/jsonata.json
rename to packages/node_modules/@node-red/editor-client/locales/zh-CN/jsonata.json