diff --git a/src/changelog.html b/changelog.html
similarity index 100%
rename from src/changelog.html
rename to changelog.html
diff --git a/gulpfile.js b/gulpfile.js
index d8ee0d02..34a6836a 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -52,7 +52,7 @@ gulp.task('clean-release', clean_release);
 
 gulp.task('clean-cache', clean_cache);
 
-var distBuild = gulp.series(clean_dist, dist);
+var distBuild = gulp.series(clean_dist, dist_src, dist_locale, dist_libraries, dist_resources);
 gulp.task('dist', distBuild);
 
 var appsBuild = gulp.series(gulp.parallel(clean_apps, distBuild), apps, gulp.parallel(listPostBuildTasks(APPS_DIR)));
@@ -197,63 +197,41 @@ function clean_cache() {
 
 // Real work for dist task. Done in another task to call it via
 // run-sequence.
-function dist() {
+function dist_src() {
     var distSources = [
         // CSS files
-        './src/main.css',
-        './src/tabs/power.css',
-        './src/tabs/firmware_flasher.css',
-        './src/tabs/onboard_logging.css',
-        './src/tabs/receiver.css',
-        './src/tabs/cli.css',
-        './src/tabs/servos.css',
-        './src/tabs/adjustments.css',
-        './src/tabs/configuration.css',
-        './src/tabs/auxiliary.css',
-        './src/tabs/pid_tuning.css',
-        './src/tabs/transponder.css',
-        './src/tabs/gps.css',
-        './src/tabs/led_strip.css',
-        './src/tabs/sensors.css',
-        './src/tabs/osd.css',
-        './src/tabs/motors.css',
-        './src/tabs/receiver_msp.css',
-        './src/tabs/logging.css',
-        './src/tabs/landing.css',
-        './src/tabs/setup_osd.css',
-        './src/tabs/help.css',
-        './src/tabs/failsafe.css',
-        './src/tabs/ports.css',
-        './src/tabs/setup.css',
+        './src/css/main.css',
+        './src/css/tabs/power.css',
+        './src/css/tabs/firmware_flasher.css',
+        './src/css/tabs/onboard_logging.css',
+        './src/css/tabs/receiver.css',
+        './src/css/tabs/cli.css',
+        './src/css/tabs/servos.css',
+        './src/css/tabs/adjustments.css',
+        './src/css/tabs/configuration.css',
+        './src/css/tabs/auxiliary.css',
+        './src/css/tabs/pid_tuning.css',
+        './src/css/tabs/transponder.css',
+        './src/css/tabs/gps.css',
+        './src/css/tabs/led_strip.css',
+        './src/css/tabs/sensors.css',
+        './src/css/tabs/osd.css',
+        './src/css/tabs/motors.css',
+        './src/css/tabs/receiver_msp.css',
+        './src/css/tabs/logging.css',
+        './src/css/tabs/landing.css',
+        './src/css/tabs/setup_osd.css',
+        './src/css/tabs/help.css',
+        './src/css/tabs/failsafe.css',
+        './src/css/tabs/ports.css',
+        './src/css/tabs/setup.css',
         './src/css/opensans_webfontkit/fonts.css',
         './src/css/dropdown-lists/css/style_lists.css',
         './src/css/font-awesome/css/font-awesome.min.css',
-        './src/js/libraries/flightindicators.css',
-        './src/js/libraries/jbox/jBox.css',
-        './src/js/libraries/jbox/themes/NoticeBorder.css',
-        './src/js/libraries/jbox/themes/ModalBorder.css',
-        './src/js/libraries/jbox/themes/TooltipDark.css',
-        './src/js/libraries/jbox/themes/TooltipBorder.css',
-        './src/js/libraries/jquery.nouislider.pips.min.css',
-        './src/js/libraries/switchery/switchery.css',
-        './src/js/libraries/jquery.nouislider.min.css',
+        './src/css/font-awesome/fonts/*',
+        './src/css/opensans_webfontkit/*.{eot,svg,ttf,woff,woff2}',
 
-        // JavaScript
-        './src/js/libraries/q.js',
-        './src/js/libraries/jquery-2.1.4.min.js',
-        './src/js/libraries/jquery-ui-1.11.4.min.js',
-        './src/js/libraries/d3.min.js',
-        './src/js/libraries/jquery.nouislider.all.min.js',
-        './src/js/libraries/three/three.min.js',
-        './src/js/libraries/three/Projector.js',
-        './src/js/libraries/three/CanvasRenderer.js',
-        './src/js/libraries/jquery.flightindicators.js',
-        './src/js/libraries/semver.js',
-        './src/js/libraries/jbox/jBox.min.js',
-        './src/js/libraries/switchery/switchery.js',
-        './src/js/libraries/bluebird.min.js',
-        './src/js/libraries/jquery.ba-throttle-debounce.min.js',
-        './src/js/libraries/inflection.min.js',
+        // JS files
         './src/js/injected_methods.js',
         './src/js/data_storage.js',
         './src/js/workers/hex_parser.js',
@@ -279,55 +257,62 @@ function dist() {
         './src/js/Features.js',
         './src/js/Beepers.js',
         './src/js/release_checker.js',
-        './src/tabs/adjustments.js',
-        './src/tabs/auxiliary.js',
-        './src/tabs/cli.js',
-        './src/tabs/configuration.js',
-        './src/tabs/failsafe.js',
-        './src/tabs/firmware_flasher.js',
-        './src/tabs/gps.js',
-        './src/tabs/help.js',
-        './src/tabs/landing.js',
-        './src/tabs/led_strip.js',
-        './src/tabs/logging.js',
-        './src/tabs/map.js',
-        './src/tabs/motors.js',
-        './src/tabs/onboard_logging.js',
-        './src/tabs/osd.js',
-        './src/tabs/pid_tuning.js',
-        './src/tabs/ports.js',
-        './src/tabs/power.js',
-        './src/tabs/receiver.js',
-        './src/tabs/receiver_msp.js',
-        './src/tabs/sensors.js',
-        './src/tabs/servos.js',
-        './src/tabs/setup.js',
-        './src/tabs/setup_osd.js',
-        './src/tabs/transponder.js',
-        './src/main.js',
+        './src/js/tabs/adjustments.js',
+        './src/js/tabs/auxiliary.js',
+        './src/js/tabs/cli.js',
+        './src/js/tabs/configuration.js',
+        './src/js/tabs/failsafe.js',
+        './src/js/tabs/firmware_flasher.js',
+        './src/js/tabs/gps.js',
+        './src/js/tabs/help.js',
+        './src/js/tabs/landing.js',
+        './src/js/tabs/led_strip.js',
+        './src/js/tabs/logging.js',
+        './src/js/tabs/map.js',
+        './src/js/tabs/motors.js',
+        './src/js/tabs/onboard_logging.js',
+        './src/js/tabs/osd.js',
+        './src/js/tabs/pid_tuning.js',
+        './src/js/tabs/ports.js',
+        './src/js/tabs/power.js',
+        './src/js/tabs/receiver.js',
+        './src/js/tabs/receiver_msp.js',
+        './src/js/tabs/sensors.js',
+        './src/js/tabs/servos.js',
+        './src/js/tabs/setup.js',
+        './src/js/tabs/setup_osd.js',
+        './src/js/tabs/transponder.js',
+        './src/js/main.js',
+        './src/js/eventPage.js',
 
-        // everything else
-        './src/eventPage.js',
+        // Src
         './src/*.html',
         './src/tabs/*.html',
         './src/images/**/*',
-        './src/_locales/**/*',
-        './src/css/font-awesome/fonts/*',
-        './src/css/opensans_webfontkit/*.{eot,svg,ttf,woff,woff2}',
-        './src/resources/*.json',
-        './src/resources/models/*',
-        './src/resources/osd/*.mcm',
-        './src/resources/motor_order/*.svg',
     ];
+
     return gulp.src(distSources, { base: 'src' })
         .pipe(gulp.src('manifest.json', { passthrougth: true }))
         .pipe(gulp.src('package.json', { passthrougth: true }))
-        .pipe(gulp.dest(DIST_DIR))
-        .pipe(install({
-            npm: '--production --ignore-scripts'
-        }));;
+        .pipe(gulp.src('changelog.html', { passthrougth: true }))
+        .pipe(gulp.dest(DIST_DIR));
 };
 
+function dist_locale() {
+    return gulp.src('./locales/**/*', { base: 'locales'})
+        .pipe(gulp.dest(DIST_DIR + '_locales'));
+}
+
+function dist_libraries() {
+    return gulp.src('./libraries/**/*', { base: '.'})
+        .pipe(gulp.dest(DIST_DIR + 'js'));
+}
+
+function dist_resources() {
+    return gulp.src('./resources/**/*', { base: '.'})
+        .pipe(gulp.dest(DIST_DIR));
+}
+
 // Create runable app directories in ./apps
 function apps(done) {
     var platforms = getPlatforms();
diff --git a/src/js/libraries/bluebird.min.js b/libraries/bluebird.min.js
similarity index 100%
rename from src/js/libraries/bluebird.min.js
rename to libraries/bluebird.min.js
diff --git a/src/js/libraries/d3.min.js b/libraries/d3.min.js
similarity index 100%
rename from src/js/libraries/d3.min.js
rename to libraries/d3.min.js
diff --git a/src/js/libraries/flightindicators.css b/libraries/flightindicators.css
similarity index 100%
rename from src/js/libraries/flightindicators.css
rename to libraries/flightindicators.css
diff --git a/src/js/libraries/inflection.min.js b/libraries/inflection.min.js
similarity index 100%
rename from src/js/libraries/inflection.min.js
rename to libraries/inflection.min.js
diff --git a/src/js/libraries/jbox/jBox.css b/libraries/jbox/jBox.css
similarity index 100%
rename from src/js/libraries/jbox/jBox.css
rename to libraries/jbox/jBox.css
diff --git a/src/js/libraries/jbox/jBox.min.js b/libraries/jbox/jBox.min.js
similarity index 100%
rename from src/js/libraries/jbox/jBox.min.js
rename to libraries/jbox/jBox.min.js
diff --git a/src/js/libraries/jbox/themes/ModalBorder.css b/libraries/jbox/themes/ModalBorder.css
similarity index 100%
rename from src/js/libraries/jbox/themes/ModalBorder.css
rename to libraries/jbox/themes/ModalBorder.css
diff --git a/src/js/libraries/jbox/themes/NoticeBorder.css b/libraries/jbox/themes/NoticeBorder.css
similarity index 100%
rename from src/js/libraries/jbox/themes/NoticeBorder.css
rename to libraries/jbox/themes/NoticeBorder.css
diff --git a/src/js/libraries/jbox/themes/TooltipBorder.css b/libraries/jbox/themes/TooltipBorder.css
similarity index 100%
rename from src/js/libraries/jbox/themes/TooltipBorder.css
rename to libraries/jbox/themes/TooltipBorder.css
diff --git a/src/js/libraries/jbox/themes/TooltipDark.css b/libraries/jbox/themes/TooltipDark.css
similarity index 100%
rename from src/js/libraries/jbox/themes/TooltipDark.css
rename to libraries/jbox/themes/TooltipDark.css
diff --git a/src/js/libraries/jquery-2.1.4.min.js b/libraries/jquery-2.1.4.min.js
similarity index 100%
rename from src/js/libraries/jquery-2.1.4.min.js
rename to libraries/jquery-2.1.4.min.js
diff --git a/src/js/libraries/jquery-2.1.4.min.map b/libraries/jquery-2.1.4.min.map
similarity index 100%
rename from src/js/libraries/jquery-2.1.4.min.map
rename to libraries/jquery-2.1.4.min.map
diff --git a/src/js/libraries/jquery-ui-1.11.2.min.js b/libraries/jquery-ui-1.11.2.min.js
similarity index 100%
rename from src/js/libraries/jquery-ui-1.11.2.min.js
rename to libraries/jquery-ui-1.11.2.min.js
diff --git a/src/js/libraries/jquery-ui-1.11.4.min.js b/libraries/jquery-ui-1.11.4.min.js
similarity index 100%
rename from src/js/libraries/jquery-ui-1.11.4.min.js
rename to libraries/jquery-ui-1.11.4.min.js
diff --git a/src/js/libraries/jquery.ba-throttle-debounce.min.js b/libraries/jquery.ba-throttle-debounce.min.js
similarity index 100%
rename from src/js/libraries/jquery.ba-throttle-debounce.min.js
rename to libraries/jquery.ba-throttle-debounce.min.js
diff --git a/src/js/libraries/jquery.flightindicators.js b/libraries/jquery.flightindicators.js
similarity index 100%
rename from src/js/libraries/jquery.flightindicators.js
rename to libraries/jquery.flightindicators.js
diff --git a/src/js/libraries/jquery.liblink.js b/libraries/jquery.liblink.js
similarity index 100%
rename from src/js/libraries/jquery.liblink.js
rename to libraries/jquery.liblink.js
diff --git a/src/js/libraries/jquery.nouislider.all.min.js b/libraries/jquery.nouislider.all.min.js
similarity index 100%
rename from src/js/libraries/jquery.nouislider.all.min.js
rename to libraries/jquery.nouislider.all.min.js
diff --git a/src/js/libraries/jquery.nouislider.min.css b/libraries/jquery.nouislider.min.css
similarity index 100%
rename from src/js/libraries/jquery.nouislider.min.css
rename to libraries/jquery.nouislider.min.css
diff --git a/src/js/libraries/jquery.nouislider.pips.min.css b/libraries/jquery.nouislider.pips.min.css
similarity index 100%
rename from src/js/libraries/jquery.nouislider.pips.min.css
rename to libraries/jquery.nouislider.pips.min.css
diff --git a/src/js/libraries/q.js b/libraries/q.js
similarity index 100%
rename from src/js/libraries/q.js
rename to libraries/q.js
diff --git a/src/js/libraries/semver.js b/libraries/semver.js
similarity index 100%
rename from src/js/libraries/semver.js
rename to libraries/semver.js
diff --git a/src/js/libraries/switchery/switchery.css b/libraries/switchery/switchery.css
similarity index 100%
rename from src/js/libraries/switchery/switchery.css
rename to libraries/switchery/switchery.css
diff --git a/src/js/libraries/switchery/switchery.js b/libraries/switchery/switchery.js
similarity index 100%
rename from src/js/libraries/switchery/switchery.js
rename to libraries/switchery/switchery.js
diff --git a/src/js/libraries/three/CanvasRenderer.js b/libraries/three/CanvasRenderer.js
similarity index 100%
rename from src/js/libraries/three/CanvasRenderer.js
rename to libraries/three/CanvasRenderer.js
diff --git a/src/js/libraries/three/Projector.js b/libraries/three/Projector.js
similarity index 100%
rename from src/js/libraries/three/Projector.js
rename to libraries/three/Projector.js
diff --git a/src/js/libraries/three/three.min.js b/libraries/three/three.min.js
similarity index 100%
rename from src/js/libraries/three/three.min.js
rename to libraries/three/three.min.js
diff --git a/src/_locales/ca/messages.json b/locales/ca/messages.json
similarity index 100%
rename from src/_locales/ca/messages.json
rename to locales/ca/messages.json
diff --git a/src/_locales/de/messages.json b/locales/de/messages.json
similarity index 100%
rename from src/_locales/de/messages.json
rename to locales/de/messages.json
diff --git a/src/_locales/en/messages.json b/locales/en/messages.json
similarity index 100%
rename from src/_locales/en/messages.json
rename to locales/en/messages.json
diff --git a/src/_locales/es/messages.json b/locales/es/messages.json
similarity index 100%
rename from src/_locales/es/messages.json
rename to locales/es/messages.json
diff --git a/src/_locales/fr/messages.json b/locales/fr/messages.json
similarity index 100%
rename from src/_locales/fr/messages.json
rename to locales/fr/messages.json
diff --git a/src/_locales/ko/messages.json b/locales/ko/messages.json
similarity index 100%
rename from src/_locales/ko/messages.json
rename to locales/ko/messages.json
diff --git a/manifest.json b/manifest.json
index 7a08f8bd..b6fe8c09 100755
--- a/manifest.json
+++ b/manifest.json
@@ -13,7 +13,7 @@
 
     "app": {
         "background": {
-            "scripts": ["eventPage.js"],
+            "scripts": ["js/eventPage.js"],
             "persistent": false
         }
     },
diff --git a/package.json b/package.json
index 0ea1c3d8..7d971cf3 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "description": "Crossplatform configuration tool for Betaflight flight control system.",
   "version": "10.2.0",
   "main": "main_nwjs.html",
-  "bg-script": "eventPage.js",
+  "bg-script": "js/eventPage.js",
   "default_locale": "en",
   "scripts": {
     "start": "node node_modules/gulp/bin/gulp.js debug",
diff --git a/src/resources/models/fallback.json b/resources/models/fallback.json
similarity index 100%
rename from src/resources/models/fallback.json
rename to resources/models/fallback.json
diff --git a/src/resources/models/fallback.png b/resources/models/fallback.png
similarity index 100%
rename from src/resources/models/fallback.png
rename to resources/models/fallback.png
diff --git a/src/resources/models/hex_plus.json b/resources/models/hex_plus.json
similarity index 100%
rename from src/resources/models/hex_plus.json
rename to resources/models/hex_plus.json
diff --git a/src/resources/models/hex_x.json b/resources/models/hex_x.json
similarity index 100%
rename from src/resources/models/hex_x.json
rename to resources/models/hex_x.json
diff --git a/src/resources/models/quad_atail.json b/resources/models/quad_atail.json
similarity index 100%
rename from src/resources/models/quad_atail.json
rename to resources/models/quad_atail.json
diff --git a/src/resources/models/quad_vtail.json b/resources/models/quad_vtail.json
similarity index 100%
rename from src/resources/models/quad_vtail.json
rename to resources/models/quad_vtail.json
diff --git a/src/resources/models/quad_x.json b/resources/models/quad_x.json
similarity index 100%
rename from src/resources/models/quad_x.json
rename to resources/models/quad_x.json
diff --git a/src/resources/models/tricopter.json b/resources/models/tricopter.json
similarity index 100%
rename from src/resources/models/tricopter.json
rename to resources/models/tricopter.json
diff --git a/src/resources/models/y4.json b/resources/models/y4.json
similarity index 100%
rename from src/resources/models/y4.json
rename to resources/models/y4.json
diff --git a/src/resources/models/y6.json b/resources/models/y6.json
similarity index 100%
rename from src/resources/models/y6.json
rename to resources/models/y6.json
diff --git a/src/resources/motor_order/airplane.svg b/resources/motor_order/airplane.svg
similarity index 100%
rename from src/resources/motor_order/airplane.svg
rename to resources/motor_order/airplane.svg
diff --git a/src/resources/motor_order/airplane_reversed.svg b/resources/motor_order/airplane_reversed.svg
similarity index 100%
rename from src/resources/motor_order/airplane_reversed.svg
rename to resources/motor_order/airplane_reversed.svg
diff --git a/src/resources/motor_order/atail_quad.svg b/resources/motor_order/atail_quad.svg
similarity index 100%
rename from src/resources/motor_order/atail_quad.svg
rename to resources/motor_order/atail_quad.svg
diff --git a/src/resources/motor_order/atail_quad_reversed.svg b/resources/motor_order/atail_quad_reversed.svg
similarity index 100%
rename from src/resources/motor_order/atail_quad_reversed.svg
rename to resources/motor_order/atail_quad_reversed.svg
diff --git a/src/resources/motor_order/bicopter.svg b/resources/motor_order/bicopter.svg
similarity index 100%
rename from src/resources/motor_order/bicopter.svg
rename to resources/motor_order/bicopter.svg
diff --git a/src/resources/motor_order/bicopter_reversed.svg b/resources/motor_order/bicopter_reversed.svg
similarity index 100%
rename from src/resources/motor_order/bicopter_reversed.svg
rename to resources/motor_order/bicopter_reversed.svg
diff --git a/src/resources/motor_order/custom.svg b/resources/motor_order/custom.svg
similarity index 100%
rename from src/resources/motor_order/custom.svg
rename to resources/motor_order/custom.svg
diff --git a/src/resources/motor_order/custom_reversed.svg b/resources/motor_order/custom_reversed.svg
similarity index 100%
rename from src/resources/motor_order/custom_reversed.svg
rename to resources/motor_order/custom_reversed.svg
diff --git a/src/resources/motor_order/flying_wing.svg b/resources/motor_order/flying_wing.svg
similarity index 100%
rename from src/resources/motor_order/flying_wing.svg
rename to resources/motor_order/flying_wing.svg
diff --git a/src/resources/motor_order/flying_wing_reversed.svg b/resources/motor_order/flying_wing_reversed.svg
similarity index 100%
rename from src/resources/motor_order/flying_wing_reversed.svg
rename to resources/motor_order/flying_wing_reversed.svg
diff --git a/src/resources/motor_order/hex_p.svg b/resources/motor_order/hex_p.svg
similarity index 100%
rename from src/resources/motor_order/hex_p.svg
rename to resources/motor_order/hex_p.svg
diff --git a/src/resources/motor_order/hex_p_reversed.svg b/resources/motor_order/hex_p_reversed.svg
similarity index 100%
rename from src/resources/motor_order/hex_p_reversed.svg
rename to resources/motor_order/hex_p_reversed.svg
diff --git a/src/resources/motor_order/hex_x.svg b/resources/motor_order/hex_x.svg
similarity index 100%
rename from src/resources/motor_order/hex_x.svg
rename to resources/motor_order/hex_x.svg
diff --git a/src/resources/motor_order/hex_x_reversed.svg b/resources/motor_order/hex_x_reversed.svg
similarity index 100%
rename from src/resources/motor_order/hex_x_reversed.svg
rename to resources/motor_order/hex_x_reversed.svg
diff --git a/src/resources/motor_order/octo_flat_p.svg b/resources/motor_order/octo_flat_p.svg
similarity index 100%
rename from src/resources/motor_order/octo_flat_p.svg
rename to resources/motor_order/octo_flat_p.svg
diff --git a/src/resources/motor_order/octo_flat_p_reversed.svg b/resources/motor_order/octo_flat_p_reversed.svg
similarity index 100%
rename from src/resources/motor_order/octo_flat_p_reversed.svg
rename to resources/motor_order/octo_flat_p_reversed.svg
diff --git a/src/resources/motor_order/octo_flat_x.svg b/resources/motor_order/octo_flat_x.svg
similarity index 100%
rename from src/resources/motor_order/octo_flat_x.svg
rename to resources/motor_order/octo_flat_x.svg
diff --git a/src/resources/motor_order/octo_flat_x_reversed.svg b/resources/motor_order/octo_flat_x_reversed.svg
similarity index 100%
rename from src/resources/motor_order/octo_flat_x_reversed.svg
rename to resources/motor_order/octo_flat_x_reversed.svg
diff --git a/src/resources/motor_order/octo_x8.svg b/resources/motor_order/octo_x8.svg
similarity index 100%
rename from src/resources/motor_order/octo_x8.svg
rename to resources/motor_order/octo_x8.svg
diff --git a/src/resources/motor_order/octo_x8_reversed.svg b/resources/motor_order/octo_x8_reversed.svg
similarity index 100%
rename from src/resources/motor_order/octo_x8_reversed.svg
rename to resources/motor_order/octo_x8_reversed.svg
diff --git a/src/resources/motor_order/quad_p.svg b/resources/motor_order/quad_p.svg
similarity index 100%
rename from src/resources/motor_order/quad_p.svg
rename to resources/motor_order/quad_p.svg
diff --git a/src/resources/motor_order/quad_p_reversed.svg b/resources/motor_order/quad_p_reversed.svg
similarity index 100%
rename from src/resources/motor_order/quad_p_reversed.svg
rename to resources/motor_order/quad_p_reversed.svg
diff --git a/src/resources/motor_order/quad_x.svg b/resources/motor_order/quad_x.svg
similarity index 100%
rename from src/resources/motor_order/quad_x.svg
rename to resources/motor_order/quad_x.svg
diff --git a/src/resources/motor_order/quad_x_1234.svg b/resources/motor_order/quad_x_1234.svg
similarity index 100%
rename from src/resources/motor_order/quad_x_1234.svg
rename to resources/motor_order/quad_x_1234.svg
diff --git a/src/resources/motor_order/quad_x_1234_reversed.svg b/resources/motor_order/quad_x_1234_reversed.svg
similarity index 100%
rename from src/resources/motor_order/quad_x_1234_reversed.svg
rename to resources/motor_order/quad_x_1234_reversed.svg
diff --git a/src/resources/motor_order/quad_x_reversed.svg b/resources/motor_order/quad_x_reversed.svg
similarity index 100%
rename from src/resources/motor_order/quad_x_reversed.svg
rename to resources/motor_order/quad_x_reversed.svg
diff --git a/src/resources/motor_order/tri.svg b/resources/motor_order/tri.svg
similarity index 100%
rename from src/resources/motor_order/tri.svg
rename to resources/motor_order/tri.svg
diff --git a/src/resources/motor_order/tri_reversed.svg b/resources/motor_order/tri_reversed.svg
similarity index 100%
rename from src/resources/motor_order/tri_reversed.svg
rename to resources/motor_order/tri_reversed.svg
diff --git a/src/resources/motor_order/vtail_quad.svg b/resources/motor_order/vtail_quad.svg
similarity index 100%
rename from src/resources/motor_order/vtail_quad.svg
rename to resources/motor_order/vtail_quad.svg
diff --git a/src/resources/motor_order/vtail_quad_reversed.svg b/resources/motor_order/vtail_quad_reversed.svg
similarity index 100%
rename from src/resources/motor_order/vtail_quad_reversed.svg
rename to resources/motor_order/vtail_quad_reversed.svg
diff --git a/src/resources/motor_order/y4.svg b/resources/motor_order/y4.svg
similarity index 100%
rename from src/resources/motor_order/y4.svg
rename to resources/motor_order/y4.svg
diff --git a/src/resources/motor_order/y4_reversed.svg b/resources/motor_order/y4_reversed.svg
similarity index 100%
rename from src/resources/motor_order/y4_reversed.svg
rename to resources/motor_order/y4_reversed.svg
diff --git a/src/resources/motor_order/y6.svg b/resources/motor_order/y6.svg
similarity index 100%
rename from src/resources/motor_order/y6.svg
rename to resources/motor_order/y6.svg
diff --git a/src/resources/motor_order/y6_reversed.svg b/resources/motor_order/y6_reversed.svg
similarity index 100%
rename from src/resources/motor_order/y6_reversed.svg
rename to resources/motor_order/y6_reversed.svg
diff --git a/src/resources/osd/betaflight.mcm b/resources/osd/betaflight.mcm
similarity index 100%
rename from src/resources/osd/betaflight.mcm
rename to resources/osd/betaflight.mcm
diff --git a/src/resources/osd/bold.mcm b/resources/osd/bold.mcm
similarity index 100%
rename from src/resources/osd/bold.mcm
rename to resources/osd/bold.mcm
diff --git a/src/resources/osd/clarity.mcm b/resources/osd/clarity.mcm
similarity index 100%
rename from src/resources/osd/clarity.mcm
rename to resources/osd/clarity.mcm
diff --git a/src/resources/osd/default.mcm b/resources/osd/default.mcm
similarity index 100%
rename from src/resources/osd/default.mcm
rename to resources/osd/default.mcm
diff --git a/src/resources/osd/digital.mcm b/resources/osd/digital.mcm
similarity index 100%
rename from src/resources/osd/digital.mcm
rename to resources/osd/digital.mcm
diff --git a/src/resources/osd/extra_large.mcm b/resources/osd/extra_large.mcm
similarity index 100%
rename from src/resources/osd/extra_large.mcm
rename to resources/osd/extra_large.mcm
diff --git a/src/resources/osd/large.mcm b/resources/osd/large.mcm
similarity index 100%
rename from src/resources/osd/large.mcm
rename to resources/osd/large.mcm
diff --git a/src/main.css b/src/css/main.css
similarity index 82%
rename from src/main.css
rename to src/css/main.css
index 9d76dbcd..aff01ce2 100644
--- a/src/main.css
+++ b/src/css/main.css
@@ -45,7 +45,7 @@ a.disabled {
     height: 14px;
     width: 14px;
     opacity: 0.2;
-    background-image: url(images/icons/cf_icon_info_grey.svg);
+    background-image: url(../images/icons/cf_icon_info_grey.svg);
     background-size: contain;
     background-position: center;
     transition: none;
@@ -53,7 +53,7 @@ a.disabled {
 
 .helpicon:hover {
     opacity: 0.9;
-    background-image: url(images/icons/cf_icon_info_green.svg);
+    background-image: url(../images/icons/cf_icon_info_green.svg);
     transition: none;
 }
 
@@ -130,7 +130,7 @@ input[type="number"]::-webkit-inner-spin-button {
     float: left;
     height: 70px;
     z-index: 0;
-    background-image: url("images/light-wide-2.svg");
+    background-image: url(../images/light-wide-2.svg);
     background-repeat: no-repeat;
     width: 340px;
     background-position: left center;
@@ -237,7 +237,7 @@ input[type="number"]::-webkit-inner-spin-button {
 }
 
 .gyroicon {
-    background-image: url(images/icons/sensor_gyro_off.png);
+    background-image: url(../images/icons/sensor_gyro_off.png);
     background-size: 43px;
     background-position: top;
     background-repeat: no-repeat;
@@ -250,13 +250,13 @@ input[type="number"]::-webkit-inner-spin-button {
 }
 
 .gyroicon.active {
-    background-image: url(images/icons/sensor_gyro_on.png);
+    background-image: url(../images/icons/sensor_gyro_on.png);
     color: #61d514;
     color: #818181;
 }
 
 .accicon {
-    background-image: url(images/icons/sensor_acc_off.png);
+    background-image: url(../images/icons/sensor_acc_off.png);
     background-size: 40px;
     background-position: -5px 2px;
     background-repeat: no-repeat;
@@ -269,13 +269,13 @@ input[type="number"]::-webkit-inner-spin-button {
 }
 
 .accicon.active {
-    background-image: url(images/icons/sensor_acc_on.png);
+    background-image: url(../images/icons/sensor_acc_on.png);
     color: #61d514;
     color: #818181;
 }
 
 .magicon {
-    background-image: url(images/icons/sensor_mag_off.png);
+    background-image: url(../images/icons/sensor_mag_off.png);
     background-size: 42px;
     background-position: -5px 2px;
     background-repeat: no-repeat;
@@ -288,12 +288,12 @@ input[type="number"]::-webkit-inner-spin-button {
 }
 
 .magicon.active {
-    background-image: url(images/icons/sensor_mag_on.png);
+    background-image: url(../images/icons/sensor_mag_on.png);
     color: #818181;
 }
 
 .gpsicon {
-    background-image: url(images/icons/sensor_sat_off.png);
+    background-image: url(../images/icons/sensor_sat_off.png);
     background-size: 42px;
     background-position: -5px 2px;
     background-repeat: no-repeat;
@@ -306,12 +306,12 @@ input[type="number"]::-webkit-inner-spin-button {
 }
 
 .gpsicon.active {
-    background-image: url(images/icons/sensor_sat_on.png);
+    background-image: url(../images/icons/sensor_sat_on.png);
     color: #818181;
 }
 
 .baroicon {
-    background-image: url(images/icons/sensor_baro_off.png);
+    background-image: url(../images/icons/sensor_baro_off.png);
     background-size: 40px;
     background-position: -5px 2px;
     background-repeat: no-repeat;
@@ -324,12 +324,12 @@ input[type="number"]::-webkit-inner-spin-button {
 }
 
 .baroicon.active {
-    background-image: url(images/icons/sensor_baro_on.png);
+    background-image: url(../images/icons/sensor_baro_on.png);
     color: #818181;
 }
 
 .sonaricon {
-    background-image: url(images/icons/sensor_sonar_off.png);
+    background-image: url(../images/icons/sensor_sonar_off.png);
     background-size: 41px;
     background-position: -4px 1px;
     background-repeat: no-repeat;
@@ -342,7 +342,7 @@ input[type="number"]::-webkit-inner-spin-button {
 }
 
 .sonaricon.active {
-    background-image: url(images/icons/sensor_sonar_on.png);
+    background-image: url(../images/icons/sensor_sonar_on.png);
     color: #818181;
 }
 
@@ -369,7 +369,7 @@ input[type="number"]::-webkit-inner-spin-button {
     height: 20px;
     margin-top: 10px;
     margin-right: 10px;
-    background-image: url('./images/CF_settings_white.svg');
+    background-image: url(../images/CF_settings_white.svg);
     background-position: -1px -1px;
     background-repeat: no-repeat;
     opacity: 0.4;
@@ -424,7 +424,7 @@ input[type="number"]::-webkit-inner-spin-button {
     top: 113px;
     height: 27px;
     width: 27px;
-    background-image: url(images/icons/scroll.svg);
+    background-image: url(../images/icons/scroll.svg);
     background-repeat: no-repeat;
     background-size: 100%;
     opacity: 0.0;
@@ -583,309 +583,309 @@ input[type="number"]::-webkit-inner-spin-button {
 
 /* Tab-Icons */
 .ic_setup {
-    background-image: url(images/icons/cf_icon_setup_grey.svg);
+    background-image: url(../images/icons/cf_icon_setup_grey.svg);
 }
 
 .ic_setup:hover {
-    background-image: url(images/icons/cf_icon_setup_white.svg);
+    background-image: url(../images/icons/cf_icon_setup_white.svg);
 }
 
 li.active .ic_setup {
-    background-image: url(images/icons/cf_icon_setup_white.svg);
+    background-image: url(../images/icons/cf_icon_setup_white.svg);
 }
 
 .ic_ports {
-    background-image: url(images/icons/cf_icon_ports_grey.svg);
+    background-image: url(../images/icons/cf_icon_ports_grey.svg);
 }
 
 .ic_ports:hover {
-    background-image: url(images/icons/cf_icon_ports_white.svg);
+    background-image: url(../images/icons/cf_icon_ports_white.svg);
 }
 
 li.active .ic_ports {
-    background-image: url(images/icons/cf_icon_ports_white.svg);
+    background-image: url(../images/icons/cf_icon_ports_white.svg);
 }
 
 .ic_config {
-    background-image: url(images/icons/cf_icon_config_grey.svg);
+    background-image: url(../images/icons/cf_icon_config_grey.svg);
 }
 
 .ic_config:hover {
-    background-image: url(images/icons/cf_icon_config_white.svg);
+    background-image: url(../images/icons/cf_icon_config_white.svg);
 }
 
 li.active .ic_config {
-    background-image: url(images/icons/cf_icon_config_white.svg);
+    background-image: url(../images/icons/cf_icon_config_white.svg);
 }
 
 .ic_pid {
-    background-image: url(images/icons/cf_icon_pid_grey.svg);
+    background-image: url(../images/icons/cf_icon_pid_grey.svg);
 }
 
 .ic_pid:hover {
-    background-image: url(images/icons/cf_icon_pid_white.svg);
+    background-image: url(../images/icons/cf_icon_pid_white.svg);
 }
 
 li.active .ic_pid {
-    background-image: url(images/icons/cf_icon_pid_white.svg);
+    background-image: url(../images/icons/cf_icon_pid_white.svg);
 }
 
 .ic_rx {
-    background-image: url(images/icons/cf_icon_rx_grey.svg);
+    background-image: url(../images/icons/cf_icon_rx_grey.svg);
 }
 
 .ic_rx:hover {
-    background-image: url(images/icons/cf_icon_rx_white.svg);
+    background-image: url(../images/icons/cf_icon_rx_white.svg);
 }
 
 li.active .ic_rx {
-    background-image: url(images/icons/cf_icon_rx_white.svg);
+    background-image: url(../images/icons/cf_icon_rx_white.svg);
 }
 
 .ic_modes {
-    background-image: url(images/icons/cf_icon_modes_grey.svg);
+    background-image: url(../images/icons/cf_icon_modes_grey.svg);
 }
 
 .ic_modes:hover {
-    background-image: url(images/icons/cf_icon_modes_white.svg);
+    background-image: url(../images/icons/cf_icon_modes_white.svg);
 }
 
 li.active .ic_modes {
-    background-image: url(images/icons/cf_icon_modes_white.svg);
+    background-image: url(../images/icons/cf_icon_modes_white.svg);
 }
 
 .ic_adjust {
-    background-image: url(images/icons/cf_icon_adjust_grey.svg);
+    background-image: url(../images/icons/cf_icon_adjust_grey.svg);
 }
 
 .ic_adjust:hover {
-    background-image: url(images/icons/cf_icon_adjust_white.svg);
+    background-image: url(../images/icons/cf_icon_adjust_white.svg);
 }
 
 li.active .ic_adjust {
-    background-image: url(images/icons/cf_icon_adjust_white.svg);
+    background-image: url(../images/icons/cf_icon_adjust_white.svg);
 }
 
 .ic_servo {
-    background-image: url(images/icons/cf_icon_servo_grey.svg);
+    background-image: url(../images/icons/cf_icon_servo_grey.svg);
 }
 
 .ic_servo:hover {
-    background-image: url(images/icons/cf_icon_servo_white.svg);
+    background-image: url(../images/icons/cf_icon_servo_white.svg);
 }
 
 li.active .ic_servo {
-    background-image: url(images/icons/cf_icon_servo_white.svg);
+    background-image: url(../images/icons/cf_icon_servo_white.svg);
 }
 
 .ic_gps {
-    background-image: url(images/icons/cf_icon_gps_grey.svg);
+    background-image: url(../images/icons/cf_icon_gps_grey.svg);
 }
 
 .ic_gps:hover {
-    background-image: url(images/icons/cf_icon_gps_white.svg);
+    background-image: url(../images/icons/cf_icon_gps_white.svg);
 }
 
 li.active .ic_gps {
-    background-image: url(images/icons/cf_icon_gps_white.svg);
+    background-image: url(../images/icons/cf_icon_gps_white.svg);
 }
 
 .ic_led {
-    background-image: url(images/icons/cf_icon_led_grey.svg);
+    background-image: url(../images/icons/cf_icon_led_grey.svg);
 }
 
 .ic_led:hover {
-    background-image: url(images/icons/cf_icon_led_white.svg);
+    background-image: url(../images/icons/cf_icon_led_white.svg);
 }
 
 li.active .ic_led {
-    background-image: url(images/icons/cf_icon_led_white.svg);
+    background-image: url(../images/icons/cf_icon_led_white.svg);
 }
 
 .ic_sensors {
-    background-image: url(images/icons/cf_icon_sensors_grey.svg);
+    background-image: url(../images/icons/cf_icon_sensors_grey.svg);
 }
 
 .ic_sensors:hover {
-    background-image: url(images/icons/cf_icon_sensors_white.svg);
+    background-image: url(../images/icons/cf_icon_sensors_white.svg);
 }
 
 li.active .ic_sensors {
-    background-image: url(images/icons/cf_icon_sensors_white.svg);
+    background-image: url(../images/icons/cf_icon_sensors_white.svg);
 }
 
 .ic_log {
-    background-image: url(images/icons/cf_icon_log_grey.svg);
+    background-image: url(../images/icons/cf_icon_log_grey.svg);
 }
 
 .ic_log:hover {
-    background-image: url(images/icons/cf_icon_log_white.svg);
+    background-image: url(../images/icons/cf_icon_log_white.svg);
 }
 
 li.active .ic_log {
-    background-image: url(images/icons/cf_icon_log_white.svg);
+    background-image: url(../images/icons/cf_icon_log_white.svg);
 }
 
 .ic_data {
-    background-image: url(images/icons/cf_icon_data_grey.svg);
+    background-image: url(../images/icons/cf_icon_data_grey.svg);
 }
 
 .ic_data:hover {
-    background-image: url(images/icons/cf_icon_data_white.svg);
+    background-image: url(../images/icons/cf_icon_data_white.svg);
 }
 
 li.active .ic_data {
-    background-image: url(images/icons/cf_icon_data_white.svg);
+    background-image: url(../images/icons/cf_icon_data_white.svg);
 }
 
 .ic_cli {
-    background-image: url(images/icons/cf_icon_cli_grey.svg);
+    background-image: url(../images/icons/cf_icon_cli_grey.svg);
 }
 
 .ic_cli:hover {
-    background-image: url(images/icons/cf_icon_cli_white.svg);
+    background-image: url(../images/icons/cf_icon_cli_white.svg);
 }
 
 li.active .ic_cli {
-    background-image: url(images/icons/cf_icon_cli_white.svg);
+    background-image: url(../images/icons/cf_icon_cli_white.svg);
 }
 
 .ic_motor {
-    background-image: url(images/icons/cf_icon_motor_grey.svg);
+    background-image: url(../images/icons/cf_icon_motor_grey.svg);
 }
 
 .ic_motor:hover {
-    background-image: url(images/icons/cf_icon_motor_white.svg);
+    background-image: url(../images/icons/cf_icon_motor_white.svg);
 }
 
 li.active .ic_motor {
-    background-image: url(images/icons/cf_icon_motor_white.svg);
+    background-image: url(../images/icons/cf_icon_motor_white.svg);
 }
 
 .ic_welcome {
-    background-image: url(images/icons/cf_icon_welcome_grey.svg);
+    background-image: url(../images/icons/cf_icon_welcome_grey.svg);
 }
 
 .ic_welcome:hover {
-    background-image: url(images/icons/cf_icon_welcome_white.svg);
+    background-image: url(../images/icons/cf_icon_welcome_white.svg);
 }
 
 li.active .ic_welcome {
-    background-image: url(images/icons/cf_icon_welcome_white.svg);
+    background-image: url(../images/icons/cf_icon_welcome_white.svg);
 }
 
 .ic_help {
-    background-image: url(images/icons/cf_icon_help_grey.svg);
+    background-image: url(../images/icons/cf_icon_help_grey.svg);
 }
 
 .ic_help:hover {
-    background-image: url(images/icons/cf_icon_help_white.svg);
+    background-image: url(../images/icons/cf_icon_help_white.svg);
 }
 
 li.active .ic_help {
-    background-image: url(images/icons/cf_icon_help_white.svg);
+    background-image: url(../images/icons/cf_icon_help_white.svg);
 }
 
 .ic_flasher {
-    background-image: url(images/icons/cf_icon_flasher_grey.svg);
+    background-image: url(../images/icons/cf_icon_flasher_grey.svg);
 }
 
 .ic_flasher:hover {
-    background-image: url(images/icons/cf_icon_flasher_white.svg);
+    background-image: url(../images/icons/cf_icon_flasher_white.svg);
 }
 
 li.active .ic_flasher {
-    background-image: url(images/icons/cf_icon_flasher_white.svg);
+    background-image: url(../images/icons/cf_icon_flasher_white.svg);
 }
 
 .ic_transponder {
-    background-image: url(images/icons/cf_icon_transponder_grey.svg);
+    background-image: url(../images/icons/cf_icon_transponder_grey.svg);
 }
 
 .ic_transponder:hover {
-    background-image: url(images/icons/cf_icon_transponder_white.svg);
+    background-image: url(../images/icons/cf_icon_transponder_white.svg);
 }
 
 li.active .ic_transponder {
-    background-image: url(images/icons/cf_icon_transponder_white.svg);
+    background-image: url(../images/icons/cf_icon_transponder_white.svg);
 }
 
 .ic_osd {
-    background-image: url(images/icons/icon_osd.svg);
+    background-image: url(../images/icons/icon_osd.svg);
     background-position-y: 4px;
 }
 
 .ic_osd:hover, li.active .ic_osd {
-    background-image: url(images/icons/icon_osd_white.svg);
+    background-image: url(../images/icons/icon_osd_white.svg);
 }
 
 .ic_power {
-    background-image: url(images/icons/cf_icon_power_grey.svg);
+    background-image: url(../images/icons/cf_icon_power_grey.svg);
     background-position-y: 9px;
 }
 
 .ic_power:hover {
-    background-image: url(images/icons/cf_icon_power_white.svg);
+    background-image: url(../images/icons/cf_icon_power_white.svg);
 }
 
 li.active .ic_power {
-    background-image: url(images/icons/cf_icon_power_white.svg);
+    background-image: url(../images/icons/cf_icon_power_white.svg);
 }
 
 /* SPARE Tab-Icons */
 .ic_failsafe {
-    background-image: url(images/icons/cf_icon_failsafe_grey.svg);
+    background-image: url(../images/icons/cf_icon_failsafe_grey.svg);
 }
 
 .ic_failsafe:hover {
-    background-image: url(images/icons/cf_icon_failsafe_white.svg);
+    background-image: url(../images/icons/cf_icon_failsafe_white.svg);
 }
 
 li.active .ic_failsafe {
-    background-image: url(images/icons/cf_icon_failsafe_white.svg);
+    background-image: url(../images/icons/cf_icon_failsafe_white.svg);
 }
 .ic_backup {
-    background-image: url(images/icons/cf_icon_backup_grey.svg);
+    background-image: url(../images/icons/cf_icon_backup_grey.svg);
 }
 .ic_backup:hover {
-    background-image: url(images/icons/cf_icon_backup_white.svg);
+    background-image: url(../images/icons/cf_icon_backup_white.svg);
 }
 
 li.active .ic_backup {
-    background-image: url(images/icons/cf_icon_backup_white.svg);
+    background-image: url(../images/icons/cf_icon_backup_white.svg);
 }
 
 .ic_wizzard {
-    background-image: url(images/icons/cf_icon_wizard_grey.svg);
+    background-image: url(../images/icons/cf_icon_wizard_grey.svg);
 }
 .ic_wizzard:hover {
-    background-image: url(images/icons/cf_icon_wizard_white.svg);
+    background-image: url(../images/icons/cf_icon_wizard_white.svg);
 }
 
 li.active .ic_wizard {
-    background-image: url(images/icons/cf_icon_wizard_white.svg);
+    background-image: url(../images/icons/cf_icon_wizard_white.svg);
 }
 
 .ic_advanced {
-    background-image: url(images/icons/cf_icon_advanced_grey.svg);
+    background-image: url(../images/icons/cf_icon_advanced_grey.svg);
 }
 .ic_advanced:hover {
-    background-image: url(images/icons/cf_icon_advanced_white.svg);
+    background-image: url(../images/icons/cf_icon_advanced_white.svg);
 }
 
 li.active .ic_advanced {
-    background-image: url(images/icons/cf_icon_advanced_white.svg);
+    background-image: url(../images/icons/cf_icon_advanced_white.svg);
 }
 
 .ic_mission {
-    background-image: url(images/icons/cf_icon_mission_grey.svg);
+    background-image: url(../images/icons/cf_icon_mission_grey.svg);
 }
 .ic_mission:hover {
-    background-image: url(images/icons/cf_icon_mission_white.svg);
+    background-image: url(../images/icons/cf_icon_mission_white.svg);
 }
 
 li.active .ic_mission {
-    background-image: url(images/icons/cf_icon_mission_white.svg);
+    background-image: url(../images/icons/cf_icon_mission_white.svg);
 }
 
 #content {
@@ -946,7 +946,7 @@ li.active .ic_mission {
 .data-loading {
     width: 100%;
     height: 100%;
-    background-image: url('../images/loading-spin.svg');
+    background-image: url(../images/loading-spin.svg);
     background-repeat: no-repeat;
     background-position: center 45%;
 }
@@ -1461,7 +1461,7 @@ dialog {
 .connect_b a.connect {
     background-color: #ffbb00;
     border: 1px solid #dba718;
-    background-image: url(images/icons/cf_icon_usb2_white.svg);
+    background-image: url(../images/icons/cf_icon_usb2_white.svg);
     background-repeat: no-repeat;
     background-size: 44px;
     background-position: center 6px;
@@ -1475,7 +1475,7 @@ dialog {
 .connect_b a.connect.active {
     background-color: #e60000;
     border: 1px solid #fe0000;
-    background-image: url(images/icons/cf_icon_usb1_white.svg);
+    background-image: url(../images/icons/cf_icon_usb1_white.svg);
     transition: none;
 }
 
@@ -1695,7 +1695,7 @@ dialog {
 }
 
 .battery-icon {
-    background-image: url(images/icons/cf_icon_bat_grey.svg);
+    background-image: url(../images/icons/cf_icon_bat_grey.svg);
     background-size: contain;
     background-position: center;
     display: inline-block;
@@ -1723,14 +1723,14 @@ dialog {
 }
 
 .armedicon {
-    background-image: url(images/icons/cf_icon_armed_grey.svg);
+    background-image: url(../images/icons/cf_icon_armed_grey.svg);
 }
 .failsafeicon {
-    background-image: url(images/icons/cf_icon_failsafe_grey.svg);
+    background-image: url(../images/icons/cf_icon_failsafe_grey.svg);
 }
 
 .linkicon {
-    background-image: url(images/icons/cf_icon_link_grey.svg);
+    background-image: url(../images/icons/cf_icon_link_grey.svg);
 }
 
 .bottomStatusIcons {
diff --git a/src/tabs/adjustments.css b/src/css/tabs/adjustments.css
similarity index 100%
rename from src/tabs/adjustments.css
rename to src/css/tabs/adjustments.css
diff --git a/src/tabs/auxiliary.css b/src/css/tabs/auxiliary.css
similarity index 98%
rename from src/tabs/auxiliary.css
rename to src/css/tabs/auxiliary.css
index 2e0a350b..50ccbc66 100644
--- a/src/tabs/auxiliary.css
+++ b/src/css/tabs/auxiliary.css
@@ -184,7 +184,7 @@
     float: right;
     margin-right: 5px;
     margin-top: -9px;
-    background-image: url('../images/icons/close1.svg');
+    background-image: url('../../images/icons/close1.svg');
     background-repeat: no-repeat;
     background-position: center 100%;
     display: block;
diff --git a/src/tabs/cli.css b/src/css/tabs/cli.css
similarity index 95%
rename from src/tabs/cli.css
rename to src/css/tabs/cli.css
index 9cac5dc7..5f5d5808 100644
--- a/src/tabs/cli.css
+++ b/src/css/tabs/cli.css
@@ -20,7 +20,7 @@
     background-color: rgba(0, 0, 0, 0.75);
     margin-top: 0px;
     height: calc(100% - 90px); /* - (p, textarea) */
-    background-image: url("../images/light-wide-1.svg");
+    background-image: url("../../images/light-wide-1.svg");
     background-repeat: no-repeat;
     background-position: 50% 80%;
     background-size: 600px;
diff --git a/src/tabs/configuration.css b/src/css/tabs/configuration.css
similarity index 98%
rename from src/tabs/configuration.css
rename to src/css/tabs/configuration.css
index e15022db..c9308a16 100644
--- a/src/tabs/configuration.css
+++ b/src/css/tabs/configuration.css
@@ -373,21 +373,21 @@
 }
 
 .tab-configuration .pitch {
-    background-image: url(../images/icons/cf_icon_pitch.svg);
+    background-image: url(../../images/icons/cf_icon_pitch.svg);
     background-repeat: no-repeat;
     background-size: 20px;
     background-position: center;
 }
 
 .tab-configuration .yaw {
-    background-image: url(../images/icons/cf_icon_yaw.svg);
+    background-image: url(../../images/icons/cf_icon_yaw.svg);
     background-repeat: no-repeat;
     background-size: 20px;
     background-position: center;
 }
 
 .tab-configuration .roll {
-    background-image: url(../images/icons/cf_icon_roll.svg);
+    background-image: url(../../images/icons/cf_icon_roll.svg);
     background-repeat: no-repeat;
     background-size: 20px;
     background-position: center;
diff --git a/src/tabs/failsafe.css b/src/css/tabs/failsafe.css
similarity index 94%
rename from src/tabs/failsafe.css
rename to src/css/tabs/failsafe.css
index 27ea6fd9..17fd3bf8 100644
--- a/src/tabs/failsafe.css
+++ b/src/css/tabs/failsafe.css
@@ -92,28 +92,28 @@
 }
 
 .tab-failsafe .pro1 {
-    background-image: url(../images/icons/cf_failsafe_procedure1.svg);
+    background-image: url(../../images/icons/cf_failsafe_procedure1.svg);
     background-position: top right 10px;
     background-size: 200px;
     background-repeat: no-repeat;
 }
 
 .tab-failsafe .pro2 {
-    background-image: url(../images/icons/cf_failsafe_procedure2.svg);
+    background-image: url(../../images/icons/cf_failsafe_procedure2.svg);
     background-position: top right 10px;
     background-size: 200px;
     background-repeat: no-repeat;
 }
 
 .tab-failsafe .pro3 {
-    background-image: url(../images/icons/cf_failsafe_procedure3.svg);
+    background-image: url(../../images/icons/cf_failsafe_procedure3.svg);
     background-position: top right 10px;
     background-size: 200px;
     background-repeat: no-repeat;
 }
 
 .tab-failsafe .pro4 {
-    background-image: url(../images/icons/cf_failsafe_procedure4.svg);
+    background-image: url(../../images/icons/cf_failsafe_procedure4.svg);
     background-position: top right 10px;
     background-size: 200px;
     background-repeat: no-repeat;
diff --git a/src/tabs/firmware_flasher.css b/src/css/tabs/firmware_flasher.css
similarity index 100%
rename from src/tabs/firmware_flasher.css
rename to src/css/tabs/firmware_flasher.css
diff --git a/src/tabs/gps.css b/src/css/tabs/gps.css
similarity index 97%
rename from src/tabs/gps.css
rename to src/css/tabs/gps.css
index a0bc0f4a..3ece72e5 100644
--- a/src/tabs/gps.css
+++ b/src/css/tabs/gps.css
@@ -28,7 +28,7 @@
     display: none;
     text-align: center;
     padding-top: 0px;
-    background-image: url(../images/loading-bars.svg);
+    background-image: url(../../images/loading-bars.svg);
     background-position: center 40%;
     background-size: 15%;
     height: 100%;
diff --git a/src/tabs/help.css b/src/css/tabs/help.css
similarity index 91%
rename from src/tabs/help.css
rename to src/css/tabs/help.css
index 8a12de73..bd3e5974 100644
--- a/src/tabs/help.css
+++ b/src/css/tabs/help.css
@@ -16,7 +16,7 @@
     border-top: 1px dotted silver;
     padding-top: 5px;
     padding-bottom: 5px;
-    background-image: url(../images/arrow.svg);
+    background-image: url(../../images/arrow.svg);
     background-repeat: no-repeat;
     background-position: 0px 8px;
     background-size: 12px;
diff --git a/src/tabs/landing.css b/src/css/tabs/landing.css
similarity index 98%
rename from src/tabs/landing.css
rename to src/css/tabs/landing.css
index 4858ce4e..59cd8c19 100755
--- a/src/tabs/landing.css
+++ b/src/css/tabs/landing.css
@@ -16,7 +16,7 @@
     height: 140px;
     background: #fff;
     padding: 20px;
-    background-image: url(../images/pattern.png);
+    background-image: url(../../images/pattern.png);
     background-size: 300px;
 }
 
diff --git a/src/tabs/led_strip.css b/src/css/tabs/led_strip.css
similarity index 100%
rename from src/tabs/led_strip.css
rename to src/css/tabs/led_strip.css
diff --git a/src/tabs/logging.css b/src/css/tabs/logging.css
similarity index 100%
rename from src/tabs/logging.css
rename to src/css/tabs/logging.css
diff --git a/src/tabs/motors.css b/src/css/tabs/motors.css
similarity index 100%
rename from src/tabs/motors.css
rename to src/css/tabs/motors.css
diff --git a/src/tabs/onboard_logging.css b/src/css/tabs/onboard_logging.css
similarity index 99%
rename from src/tabs/onboard_logging.css
rename to src/css/tabs/onboard_logging.css
index a05a731a..c04a1328 100644
--- a/src/tabs/onboard_logging.css
+++ b/src/css/tabs/onboard_logging.css
@@ -248,7 +248,7 @@
 	box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.35);
 	width: 90px;
     height: 90px;
-    background-image: url(/images/icons/cf_icon_sdcard.svg);
+    background-image: url(../../images/icons/cf_icon_sdcard.svg);
     background-position: 21px 20px;
     background-size: 50px 50px;
     background-repeat: no-repeat;
diff --git a/src/tabs/osd.css b/src/css/tabs/osd.css
similarity index 99%
rename from src/tabs/osd.css
rename to src/css/tabs/osd.css
index 30938075..e9d71d9c 100644
--- a/src/tabs/osd.css
+++ b/src/css/tabs/osd.css
@@ -419,7 +419,7 @@ button {
   /* please don't copy the generic background image from another project
    * and replace the one that @nathantsoi took :)
    */
-  background: url(/images/osd-bg-1.jpg);
+  background: url(../../images/osd-bg-1.jpg);
   background-size: cover;
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 3px;
diff --git a/src/tabs/pid_tuning.css b/src/css/tabs/pid_tuning.css
similarity index 98%
rename from src/tabs/pid_tuning.css
rename to src/css/tabs/pid_tuning.css
index 0f678219..8b83d0ce 100644
--- a/src/tabs/pid_tuning.css
+++ b/src/css/tabs/pid_tuning.css
@@ -56,7 +56,7 @@
     margin: 0 2px 0px 0;
     border: 1px solid silver;
     border-radius: 3px;
-    background-image: url(../images/paper.jpg);
+    background-image: url(../../images/paper.jpg);
     background-size: 200%;
     background-position: center;
 }
@@ -208,7 +208,7 @@
     min-width: 250px;
     border: 1px solid silver;
     border-radius: 3px;
-    background-image: url(../images/paper.jpg);
+    background-image: url(../../images/paper.jpg);
     background-size: 200%;
     background-position: center;
 }
@@ -657,7 +657,7 @@
 }
 
 .tab-pid_tuning .bracket {
-    background-image: url(/images/icons/icon_bracket.svg);
+    background-image: url(../../images/icons/icon_bracket.svg);
     background-repeat: no-repeat;
     height: 35px;
     width: 14px;
@@ -677,7 +677,7 @@
     left: 0;
     right: 0;
     bottom: 0;
-    background-image: url(../images/paper.jpg);
+    background-image: url(../../images/paper.jpg);
     background-size: 100%;
     background-position: center;
     border: 1px solid silver;
diff --git a/src/tabs/ports.css b/src/css/tabs/ports.css
similarity index 100%
rename from src/tabs/ports.css
rename to src/css/tabs/ports.css
diff --git a/src/tabs/power.css b/src/css/tabs/power.css
similarity index 100%
rename from src/tabs/power.css
rename to src/css/tabs/power.css
diff --git a/src/tabs/receiver.css b/src/css/tabs/receiver.css
similarity index 98%
rename from src/tabs/receiver.css
rename to src/css/tabs/receiver.css
index 95dc7408..05193e24 100644
--- a/src/tabs/receiver.css
+++ b/src/css/tabs/receiver.css
@@ -351,7 +351,7 @@
     height: 117px;
     border: 1px solid silver;
     border-radius: 3px;
-    background-image: url(../images/paper.jpg);
+    background-image: url(../../images/paper.jpg);
     background-size: 200%;
     background-position: center;
 }
@@ -481,7 +481,7 @@
     left: 0;
     right: 0;
     bottom: 0;
-    background-image: url(../images/paper.jpg);
+    background-image: url(../../images/paper.jpg);
     background-size: 100%;
     background-position: center;
     margin-top: -1px;
diff --git a/src/tabs/receiver_msp.css b/src/css/tabs/receiver_msp.css
similarity index 100%
rename from src/tabs/receiver_msp.css
rename to src/css/tabs/receiver_msp.css
diff --git a/src/tabs/sensors.css b/src/css/tabs/sensors.css
similarity index 100%
rename from src/tabs/sensors.css
rename to src/css/tabs/sensors.css
diff --git a/src/tabs/servos.css b/src/css/tabs/servos.css
similarity index 100%
rename from src/tabs/servos.css
rename to src/css/tabs/servos.css
diff --git a/src/tabs/setup.css b/src/css/tabs/setup.css
similarity index 99%
rename from src/tabs/setup.css
rename to src/css/tabs/setup.css
index 8a5aebd8..dd154974 100644
--- a/src/tabs/setup.css
+++ b/src/css/tabs/setup.css
@@ -67,7 +67,7 @@
     height: 100%;
     top: 0;
     left: 0;
-    background-image: url(../images/paper.jpg);
+    background-image: url(../../images/paper.jpg);
     background-size: 100%;
     background-position: center;
     border-radius: 5px;
diff --git a/src/tabs/setup_osd.css b/src/css/tabs/setup_osd.css
similarity index 100%
rename from src/tabs/setup_osd.css
rename to src/css/tabs/setup_osd.css
diff --git a/src/tabs/transponder.css b/src/css/tabs/transponder.css
similarity index 100%
rename from src/tabs/transponder.css
rename to src/css/tabs/transponder.css
diff --git a/src/eventPage.js b/src/js/eventPage.js
similarity index 100%
rename from src/eventPage.js
rename to src/js/eventPage.js
diff --git a/src/main.js b/src/js/main.js
similarity index 100%
rename from src/main.js
rename to src/js/main.js
diff --git a/src/tabs/adjustments.js b/src/js/tabs/adjustments.js
similarity index 100%
rename from src/tabs/adjustments.js
rename to src/js/tabs/adjustments.js
diff --git a/src/tabs/auxiliary.js b/src/js/tabs/auxiliary.js
similarity index 100%
rename from src/tabs/auxiliary.js
rename to src/js/tabs/auxiliary.js
diff --git a/src/tabs/cli.js b/src/js/tabs/cli.js
similarity index 100%
rename from src/tabs/cli.js
rename to src/js/tabs/cli.js
diff --git a/src/tabs/configuration.js b/src/js/tabs/configuration.js
similarity index 100%
rename from src/tabs/configuration.js
rename to src/js/tabs/configuration.js
diff --git a/src/tabs/failsafe.js b/src/js/tabs/failsafe.js
similarity index 100%
rename from src/tabs/failsafe.js
rename to src/js/tabs/failsafe.js
diff --git a/src/tabs/firmware_flasher.js b/src/js/tabs/firmware_flasher.js
similarity index 100%
rename from src/tabs/firmware_flasher.js
rename to src/js/tabs/firmware_flasher.js
diff --git a/src/tabs/gps.js b/src/js/tabs/gps.js
similarity index 100%
rename from src/tabs/gps.js
rename to src/js/tabs/gps.js
diff --git a/src/tabs/help.js b/src/js/tabs/help.js
similarity index 100%
rename from src/tabs/help.js
rename to src/js/tabs/help.js
diff --git a/src/tabs/landing.js b/src/js/tabs/landing.js
similarity index 100%
rename from src/tabs/landing.js
rename to src/js/tabs/landing.js
diff --git a/src/tabs/led_strip.js b/src/js/tabs/led_strip.js
similarity index 100%
rename from src/tabs/led_strip.js
rename to src/js/tabs/led_strip.js
diff --git a/src/tabs/logging.js b/src/js/tabs/logging.js
similarity index 100%
rename from src/tabs/logging.js
rename to src/js/tabs/logging.js
diff --git a/src/tabs/map.js b/src/js/tabs/map.js
similarity index 100%
rename from src/tabs/map.js
rename to src/js/tabs/map.js
diff --git a/src/tabs/motors.js b/src/js/tabs/motors.js
similarity index 100%
rename from src/tabs/motors.js
rename to src/js/tabs/motors.js
diff --git a/src/tabs/onboard_logging.js b/src/js/tabs/onboard_logging.js
similarity index 100%
rename from src/tabs/onboard_logging.js
rename to src/js/tabs/onboard_logging.js
diff --git a/src/tabs/osd.js b/src/js/tabs/osd.js
similarity index 100%
rename from src/tabs/osd.js
rename to src/js/tabs/osd.js
diff --git a/src/tabs/pid_tuning.js b/src/js/tabs/pid_tuning.js
similarity index 100%
rename from src/tabs/pid_tuning.js
rename to src/js/tabs/pid_tuning.js
diff --git a/src/tabs/ports.js b/src/js/tabs/ports.js
similarity index 100%
rename from src/tabs/ports.js
rename to src/js/tabs/ports.js
diff --git a/src/tabs/power.js b/src/js/tabs/power.js
similarity index 100%
rename from src/tabs/power.js
rename to src/js/tabs/power.js
diff --git a/src/tabs/receiver.js b/src/js/tabs/receiver.js
similarity index 100%
rename from src/tabs/receiver.js
rename to src/js/tabs/receiver.js
diff --git a/src/tabs/receiver_msp.js b/src/js/tabs/receiver_msp.js
similarity index 100%
rename from src/tabs/receiver_msp.js
rename to src/js/tabs/receiver_msp.js
diff --git a/src/tabs/sensors.js b/src/js/tabs/sensors.js
similarity index 100%
rename from src/tabs/sensors.js
rename to src/js/tabs/sensors.js
diff --git a/src/tabs/servos.js b/src/js/tabs/servos.js
similarity index 100%
rename from src/tabs/servos.js
rename to src/js/tabs/servos.js
diff --git a/src/tabs/setup.js b/src/js/tabs/setup.js
similarity index 100%
rename from src/tabs/setup.js
rename to src/js/tabs/setup.js
diff --git a/src/tabs/setup_osd.js b/src/js/tabs/setup_osd.js
similarity index 100%
rename from src/tabs/setup_osd.js
rename to src/js/tabs/setup_osd.js
diff --git a/src/tabs/transponder.js b/src/js/tabs/transponder.js
similarity index 100%
rename from src/tabs/transponder.js
rename to src/js/tabs/transponder.js
diff --git a/src/main.html b/src/main.html
index 5bf483b9..bef3ccdc 100755
--- a/src/main.html
+++ b/src/main.html
@@ -3,33 +3,33 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
     <meta name="author" content="cTn"/>
-    <link type="text/css" rel="stylesheet" href="./main.css" media="all"/>
+    <link type="text/css" rel="stylesheet" href="./css/main.css" media="all"/>
     <link type="text/css" rel="stylesheet" href="./js/libraries/jquery.nouislider.min.css"/>
     <link type="text/css" rel="stylesheet" href="./js/libraries/jquery.nouislider.pips.min.css"/>
     <link type="text/css" rel="stylesheet" href="./js/libraries/flightindicators.css"/>
-    <link type="text/css" rel="stylesheet" href="./tabs/landing.css" media="all"/>
-    <link type="text/css" rel="stylesheet" href="./tabs/setup.css" media="all"/>
-    <link type="text/css" rel="stylesheet" href="./tabs/setup_osd.css" media="all" />
-    <link type="text/css" rel="stylesheet" href="./tabs/help.css" media="all"/>
-    <link type="text/css" rel="stylesheet" href="./tabs/ports.css" media="all"/>
-    <link type="text/css" rel="stylesheet" href="./tabs/configuration.css" media="all"/>
-    <link type="text/css" rel="stylesheet" href="./tabs/pid_tuning.css" media="all"/>
-    <link type="text/css" rel="stylesheet" href="./tabs/receiver.css" media="all"/>
-    <link type="text/css" rel="stylesheet" href="./tabs/servos.css" media="all"/>
-    <link type="text/css" rel="stylesheet" href="./tabs/gps.css" media="all"/>
-    <link type="text/css" rel="stylesheet" href="./tabs/motors.css" media="all"/>
-    <link type="text/css" rel="stylesheet" href="./tabs/led_strip.css" media="all"/>
-    <link type="text/css" rel="stylesheet" href="./tabs/sensors.css" media="all"/>
-    <link type="text/css" rel="stylesheet" href="./tabs/cli.css" media="all"/>
-    <link type="text/css" rel="stylesheet" href="./tabs/logging.css" media="all"/>
-    <link type="text/css" rel="stylesheet" href="./tabs/onboard_logging.css" media="all"/>
-    <link type="text/css" rel="stylesheet" href="./tabs/firmware_flasher.css" media="all"/>
-    <link type="text/css" rel="stylesheet" href="./tabs/adjustments.css" media="all"/>
-    <link type="text/css" rel="stylesheet" href="./tabs/auxiliary.css" media="all"/>
-    <link type="text/css" rel="stylesheet" href="./tabs/failsafe.css" media="all"/>
-    <link type="text/css" rel="stylesheet" href="./tabs/osd.css" media="all"/>
-    <link type="text/css" rel="stylesheet" href="./tabs/power.css" media="all"/>
-    <link type="text/css" rel="stylesheet" href="./tabs/transponder.css" media="all"/>
+    <link type="text/css" rel="stylesheet" href="./css/tabs/landing.css" media="all"/>
+    <link type="text/css" rel="stylesheet" href="./css/tabs/setup.css" media="all"/>
+    <link type="text/css" rel="stylesheet" href="./css/tabs/setup_osd.css" media="all" />
+    <link type="text/css" rel="stylesheet" href="./css/tabs/help.css" media="all"/>
+    <link type="text/css" rel="stylesheet" href="./css/tabs/ports.css" media="all"/>
+    <link type="text/css" rel="stylesheet" href="./css/tabs/configuration.css" media="all"/>
+    <link type="text/css" rel="stylesheet" href="./css/tabs/pid_tuning.css" media="all"/>
+    <link type="text/css" rel="stylesheet" href="./css/tabs/receiver.css" media="all"/>
+    <link type="text/css" rel="stylesheet" href="./css/tabs/servos.css" media="all"/>
+    <link type="text/css" rel="stylesheet" href="./css/tabs/gps.css" media="all"/>
+    <link type="text/css" rel="stylesheet" href="./css/tabs/motors.css" media="all"/>
+    <link type="text/css" rel="stylesheet" href="./css/tabs/led_strip.css" media="all"/>
+    <link type="text/css" rel="stylesheet" href="./css/tabs/sensors.css" media="all"/>
+    <link type="text/css" rel="stylesheet" href="./css/tabs/cli.css" media="all"/>
+    <link type="text/css" rel="stylesheet" href="./css/tabs/logging.css" media="all"/>
+    <link type="text/css" rel="stylesheet" href="./css/tabs/onboard_logging.css" media="all"/>
+    <link type="text/css" rel="stylesheet" href="./css/tabs/firmware_flasher.css" media="all"/>
+    <link type="text/css" rel="stylesheet" href="./css/tabs/adjustments.css" media="all"/>
+    <link type="text/css" rel="stylesheet" href="./css/tabs/auxiliary.css" media="all"/>
+    <link type="text/css" rel="stylesheet" href="./css/tabs/failsafe.css" media="all"/>
+    <link type="text/css" rel="stylesheet" href="./css/tabs/osd.css" media="all"/>
+    <link type="text/css" rel="stylesheet" href="./css/tabs/power.css" media="all"/>
+    <link type="text/css" rel="stylesheet" href="./css/tabs/transponder.css" media="all"/>
     <link type="text/css" rel="stylesheet" href="./css/font-awesome/css/font-awesome.min.css" media="all">
     <link type="text/css" rel="stylesheet" href="./css/opensans_webfontkit/fonts.css" media="all"/>
     <link type="text/css" rel="stylesheet" href="./css/dropdown-lists/css/style_lists.css" media="all"/>
@@ -74,30 +74,30 @@
     <script type="text/javascript" src="./js/Features.js"></script>
     <script type="text/javascript" src="./js/Beepers.js"></script>
     <script type="text/javascript" src="./js/release_checker.js"></script>
-    <script type="text/javascript" src="./main.js"></script>
-    <script type="text/javascript" src="./tabs/landing.js"></script>
-    <script type="text/javascript" src="./tabs/setup.js"></script>
-    <script type="text/javascript" src="./tabs/setup_osd.js"></script>
-    <script type="text/javascript" src="./tabs/help.js"></script>
-    <script type="text/javascript" src="./tabs/ports.js"></script>
-    <script type="text/javascript" src="./tabs/configuration.js"></script>
-    <script type="text/javascript" src="./tabs/pid_tuning.js"></script>
-    <script type="text/javascript" src="./tabs/receiver.js"></script>
-    <script type="text/javascript" src="./tabs/auxiliary.js"></script>
-    <script type="text/javascript" src="./tabs/adjustments.js"></script>
-    <script type="text/javascript" src="./tabs/servos.js"></script>
-    <script type="text/javascript" src="./tabs/gps.js"></script>
-    <script type="text/javascript" src="./tabs/motors.js"></script>
-    <script type="text/javascript" src="./tabs/led_strip.js"></script>
-    <script type="text/javascript" src="./tabs/sensors.js"></script>
-    <script type="text/javascript" src="./tabs/cli.js"></script>
-    <script type="text/javascript" src="./tabs/logging.js"></script>
-    <script type="text/javascript" src="./tabs/onboard_logging.js"></script>
-    <script type="text/javascript" src="./tabs/firmware_flasher.js"></script>
-    <script type="text/javascript" src="./tabs/failsafe.js"></script>
-    <script type="text/javascript" src="./tabs/osd.js"></script>
-    <script type="text/javascript" src="./tabs/power.js"></script>
-    <script type="text/javascript" src="./tabs/transponder.js"></script>
+    <script type="text/javascript" src="./js/main.js"></script>
+    <script type="text/javascript" src="./js/tabs/landing.js"></script>
+    <script type="text/javascript" src="./js/tabs/setup.js"></script>
+    <script type="text/javascript" src="./js/tabs/setup_osd.js"></script>
+    <script type="text/javascript" src="./js/tabs/help.js"></script>
+    <script type="text/javascript" src="./js/tabs/ports.js"></script>
+    <script type="text/javascript" src="./js/tabs/configuration.js"></script>
+    <script type="text/javascript" src="./js/tabs/pid_tuning.js"></script>
+    <script type="text/javascript" src="./js/tabs/receiver.js"></script>
+    <script type="text/javascript" src="./js/tabs/auxiliary.js"></script>
+    <script type="text/javascript" src="./js/tabs/adjustments.js"></script>
+    <script type="text/javascript" src="./js/tabs/servos.js"></script>
+    <script type="text/javascript" src="./js/tabs/gps.js"></script>
+    <script type="text/javascript" src="./js/tabs/motors.js"></script>
+    <script type="text/javascript" src="./js/tabs/led_strip.js"></script>
+    <script type="text/javascript" src="./js/tabs/sensors.js"></script>
+    <script type="text/javascript" src="./js/tabs/cli.js"></script>
+    <script type="text/javascript" src="./js/tabs/logging.js"></script>
+    <script type="text/javascript" src="./js/tabs/onboard_logging.js"></script>
+    <script type="text/javascript" src="./js/tabs/firmware_flasher.js"></script>
+    <script type="text/javascript" src="./js/tabs/failsafe.js"></script>
+    <script type="text/javascript" src="./js/tabs/osd.js"></script>
+    <script type="text/javascript" src="./js/tabs/power.js"></script>
+    <script type="text/javascript" src="./js/tabs/transponder.js"></script>
     <title i18n="windowTitle"></title>
 </head>
 <body>