diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index aa07251d9b..54e9de899c 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -6,9 +6,9 @@ import rollupConfig from './rollup.config';
 
 gulp.task('run_rollup', () => {
   return gulp.src([
-    'src/core.js',
-    'src/compatibility.js',
-    'panels/automation/editor.js',
+    'js/core.js',
+    'js/compatibility.js',
+    'js/editor/editor.js',
     'demo_data/demo_data.js',
   ])
   .pipe(rollupEach(rollupConfig))
@@ -25,8 +25,7 @@ gulp.task('ru_all', ['run_rollup'], () => {
 
 gulp.task('watch_ru_all', ['ru_all'], () => {
   gulp.watch([
-    'src/**/*.js',
-    'panels/**/*.js',
+    'js/**/*.js',
     'demo_data/**/*.js'
   ], ['ru_all']);
 });
diff --git a/src/compatibility.js b/js/compatibility.js
similarity index 100%
rename from src/compatibility.js
rename to js/compatibility.js
diff --git a/src/core.js b/js/core.js
similarity index 100%
rename from src/core.js
rename to js/core.js
diff --git a/preact-src/automation.js b/js/editor/automation.js
similarity index 100%
rename from preact-src/automation.js
rename to js/editor/automation.js
diff --git a/panels/automation/editor.js b/js/editor/editor.js
similarity index 82%
rename from panels/automation/editor.js
rename to js/editor/editor.js
index 16e13daf49..c9ef63a0e0 100644
--- a/panels/automation/editor.js
+++ b/js/editor/editor.js
@@ -1,5 +1,5 @@
 import { h, render } from 'preact';
-import Automation from '../../preact-src/automation';
+import Automation from './automation';
 
 window.AutomationEditor = function (mountEl, props, mergeEl) {
   return render(h(Automation, props), mountEl, mergeEl);
diff --git a/preact-src/json_textarea.js b/js/editor/json_textarea.js
similarity index 100%
rename from preact-src/json_textarea.js
rename to js/editor/json_textarea.js
diff --git a/preact-src/script/call_service.js b/js/editor/script/call_service.js
similarity index 100%
rename from preact-src/script/call_service.js
rename to js/editor/script/call_service.js
diff --git a/preact-src/script/index.js b/js/editor/script/index.js
similarity index 100%
rename from preact-src/script/index.js
rename to js/editor/script/index.js
diff --git a/preact-src/script/script_action.js b/js/editor/script/script_action.js
similarity index 100%
rename from preact-src/script/script_action.js
rename to js/editor/script/script_action.js
diff --git a/preact-src/trigger/event.js b/js/editor/trigger/event.js
similarity index 100%
rename from preact-src/trigger/event.js
rename to js/editor/trigger/event.js
diff --git a/preact-src/trigger/index.js b/js/editor/trigger/index.js
similarity index 100%
rename from preact-src/trigger/index.js
rename to js/editor/trigger/index.js
diff --git a/preact-src/trigger/numeric_state.js b/js/editor/trigger/numeric_state.js
similarity index 100%
rename from preact-src/trigger/numeric_state.js
rename to js/editor/trigger/numeric_state.js
diff --git a/preact-src/trigger/state.js b/js/editor/trigger/state.js
similarity index 100%
rename from preact-src/trigger/state.js
rename to js/editor/trigger/state.js
diff --git a/preact-src/trigger/trigger_row.js b/js/editor/trigger/trigger_row.js
similarity index 100%
rename from preact-src/trigger/trigger_row.js
rename to js/editor/trigger/trigger_row.js
diff --git a/preact-src/trigger/util.js b/js/editor/trigger/util.js
similarity index 100%
rename from preact-src/trigger/util.js
rename to js/editor/trigger/util.js
diff --git a/preact-src/util.js b/js/editor/util.js
similarity index 100%
rename from preact-src/util.js
rename to js/editor/util.js