diff --git a/Makefile b/Makefile
index b4208862..eee3d056 100644
--- a/Makefile
+++ b/Makefile
@@ -514,7 +514,7 @@ electron-develop:
 		-s "$(PLATFORM)"
 
 sass:
-	node-sass lib/gui/scss/main.scss > lib/gui/css/main.css
+	node-sass lib/gui/app/scss/main.scss > lib/gui/css/main.css
 
 lint-js:
 	eslint lib tests scripts bin versionist.conf.js
diff --git a/lib/gui/app.js b/lib/gui/app/app.js
similarity index 94%
rename from lib/gui/app.js
rename to lib/gui/app/app.js
index d491cb7c..41b73921 100644
--- a/lib/gui/app.js
+++ b/lib/gui/app/app.js
@@ -29,20 +29,20 @@ var angular = require('angular')
 const electron = require('electron')
 const Bluebird = require('bluebird')
 const semver = require('semver')
-const EXIT_CODES = require('../shared/exit-codes')
-const messages = require('../shared/messages')
-const s3Packages = require('../shared/s3-packages')
-const release = require('../shared/release')
-const store = require('../shared/store')
-const errors = require('../shared/errors')
-const packageJSON = require('../../package.json')
-const flashState = require('../shared/models/flash-state')
+const EXIT_CODES = require('../../shared/exit-codes')
+const messages = require('../../shared/messages')
+const s3Packages = require('../../shared/s3-packages')
+const release = require('../../shared/release')
+const store = require('../../shared/store')
+const errors = require('../../shared/errors')
+const packageJSON = require('../../../package.json')
+const flashState = require('../../shared/models/flash-state')
 const settings = require('./models/settings')
 const windowProgress = require('./os/window-progress')
 const analytics = require('./modules/analytics')
 const updateNotifier = require('./components/update-notifier')
-const availableDrives = require('../shared/models/available-drives')
-const selectionState = require('../shared/models/selection-state')
+const availableDrives = require('../../shared/models/available-drives')
+const selectionState = require('../../shared/models/selection-state')
 const driveScanner = require('./modules/drive-scanner')
 const osDialog = require('./os/dialog')
 const exceptionReporter = require('./modules/exception-reporter')
diff --git a/lib/gui/components/drive-selector/controllers/drive-selector.js b/lib/gui/app/components/drive-selector/controllers/drive-selector.js
similarity index 96%
rename from lib/gui/components/drive-selector/controllers/drive-selector.js
rename to lib/gui/app/components/drive-selector/controllers/drive-selector.js
index 48be1331..241f9f9f 100644
--- a/lib/gui/components/drive-selector/controllers/drive-selector.js
+++ b/lib/gui/app/components/drive-selector/controllers/drive-selector.js
@@ -18,11 +18,11 @@
 
 const angular = require('angular')
 const _ = require('lodash')
-const messages = require('../../../../shared/messages')
-const constraints = require('../../../../shared/drive-constraints')
+const messages = require('../../../../../shared/messages')
+const constraints = require('../../../../../shared/drive-constraints')
 const analytics = require('../../../modules/analytics')
-const availableDrives = require('../../../../shared/models/available-drives')
-const selectionState = require('../../../../shared/models/selection-state')
+const availableDrives = require('../../../../../shared/models/available-drives')
+const selectionState = require('../../../../../shared/models/selection-state')
 
 module.exports = function (
   $q,
diff --git a/lib/gui/components/drive-selector/drive-selector.js b/lib/gui/app/components/drive-selector/drive-selector.js
similarity index 100%
rename from lib/gui/components/drive-selector/drive-selector.js
rename to lib/gui/app/components/drive-selector/drive-selector.js
diff --git a/lib/gui/components/drive-selector/services/drive-selector.js b/lib/gui/app/components/drive-selector/services/drive-selector.js
similarity index 100%
rename from lib/gui/components/drive-selector/services/drive-selector.js
rename to lib/gui/app/components/drive-selector/services/drive-selector.js
diff --git a/lib/gui/components/drive-selector/styles/_drive-selector.scss b/lib/gui/app/components/drive-selector/styles/_drive-selector.scss
similarity index 100%
rename from lib/gui/components/drive-selector/styles/_drive-selector.scss
rename to lib/gui/app/components/drive-selector/styles/_drive-selector.scss
diff --git a/lib/gui/components/drive-selector/templates/drive-selector-modal.tpl.html b/lib/gui/app/components/drive-selector/templates/drive-selector-modal.tpl.html
similarity index 100%
rename from lib/gui/components/drive-selector/templates/drive-selector-modal.tpl.html
rename to lib/gui/app/components/drive-selector/templates/drive-selector-modal.tpl.html
diff --git a/lib/gui/components/flash-error-modal/flash-error-modal.js b/lib/gui/app/components/flash-error-modal/flash-error-modal.js
similarity index 100%
rename from lib/gui/components/flash-error-modal/flash-error-modal.js
rename to lib/gui/app/components/flash-error-modal/flash-error-modal.js
diff --git a/lib/gui/components/flash-error-modal/services/flash-error-modal.js b/lib/gui/app/components/flash-error-modal/services/flash-error-modal.js
similarity index 89%
rename from lib/gui/components/flash-error-modal/services/flash-error-modal.js
rename to lib/gui/app/components/flash-error-modal/services/flash-error-modal.js
index 574c867d..811b203b 100644
--- a/lib/gui/components/flash-error-modal/services/flash-error-modal.js
+++ b/lib/gui/app/components/flash-error-modal/services/flash-error-modal.js
@@ -16,8 +16,8 @@
 
 'use strict'
 
-const flashState = require('../../../../shared/models/flash-state')
-const selectionState = require('../../../../shared/models/selection-state')
+const flashState = require('../../../../../shared/models/flash-state')
+const selectionState = require('../../../../../shared/models/selection-state')
 const analytics = require('../../../modules/analytics')
 
 module.exports = function (WarningModalService) {
diff --git a/lib/gui/components/modal/modal.js b/lib/gui/app/components/modal/modal.js
similarity index 100%
rename from lib/gui/components/modal/modal.js
rename to lib/gui/app/components/modal/modal.js
diff --git a/lib/gui/components/modal/services/modal.js b/lib/gui/app/components/modal/services/modal.js
similarity index 100%
rename from lib/gui/components/modal/services/modal.js
rename to lib/gui/app/components/modal/services/modal.js
diff --git a/lib/gui/components/modal/styles/_modal.scss b/lib/gui/app/components/modal/styles/_modal.scss
similarity index 100%
rename from lib/gui/components/modal/styles/_modal.scss
rename to lib/gui/app/components/modal/styles/_modal.scss
diff --git a/lib/gui/components/progress-button/directives/progress-button.js b/lib/gui/app/components/progress-button/directives/progress-button.js
similarity index 100%
rename from lib/gui/components/progress-button/directives/progress-button.js
rename to lib/gui/app/components/progress-button/directives/progress-button.js
diff --git a/lib/gui/components/progress-button/progress-button.js b/lib/gui/app/components/progress-button/progress-button.js
similarity index 100%
rename from lib/gui/components/progress-button/progress-button.js
rename to lib/gui/app/components/progress-button/progress-button.js
diff --git a/lib/gui/components/progress-button/styles/_progress-button.scss b/lib/gui/app/components/progress-button/styles/_progress-button.scss
similarity index 100%
rename from lib/gui/components/progress-button/styles/_progress-button.scss
rename to lib/gui/app/components/progress-button/styles/_progress-button.scss
diff --git a/lib/gui/components/progress-button/templates/progress-button.tpl.html b/lib/gui/app/components/progress-button/templates/progress-button.tpl.html
similarity index 100%
rename from lib/gui/components/progress-button/templates/progress-button.tpl.html
rename to lib/gui/app/components/progress-button/templates/progress-button.tpl.html
diff --git a/lib/gui/components/safe-webview.js b/lib/gui/app/components/safe-webview.js
similarity index 98%
rename from lib/gui/components/safe-webview.js
rename to lib/gui/app/components/safe-webview.js
index 94fbd2ca..697b1604 100644
--- a/lib/gui/components/safe-webview.js
+++ b/lib/gui/app/components/safe-webview.js
@@ -25,8 +25,8 @@ const react = require('react')
 const propTypes = require('prop-types')
 const react2angular = require('react2angular').react2angular
 const analytics = require('../modules/analytics')
-const packageJSON = require('../../../package.json')
-const robot = require('../../shared/robot')
+const packageJSON = require('../../../../package.json')
+const robot = require('../../../shared/robot')
 
 const MODULE_NAME = 'Etcher.Components.SafeWebview'
 const angularSafeWebview = angular.module(MODULE_NAME, [])
diff --git a/lib/gui/components/svg-icon.js b/lib/gui/app/components/svg-icon.js
similarity index 100%
rename from lib/gui/components/svg-icon.js
rename to lib/gui/app/components/svg-icon.js
diff --git a/lib/gui/components/svg-icon/styles/_svg-icon.scss b/lib/gui/app/components/svg-icon/styles/_svg-icon.scss
similarity index 100%
rename from lib/gui/components/svg-icon/styles/_svg-icon.scss
rename to lib/gui/app/components/svg-icon/styles/_svg-icon.scss
diff --git a/lib/gui/components/tooltip-modal/controllers/tooltip-modal.js b/lib/gui/app/components/tooltip-modal/controllers/tooltip-modal.js
similarity index 100%
rename from lib/gui/components/tooltip-modal/controllers/tooltip-modal.js
rename to lib/gui/app/components/tooltip-modal/controllers/tooltip-modal.js
diff --git a/lib/gui/components/tooltip-modal/services/tooltip-modal.js b/lib/gui/app/components/tooltip-modal/services/tooltip-modal.js
similarity index 100%
rename from lib/gui/components/tooltip-modal/services/tooltip-modal.js
rename to lib/gui/app/components/tooltip-modal/services/tooltip-modal.js
diff --git a/lib/gui/components/tooltip-modal/styles/_tooltip-modal.scss b/lib/gui/app/components/tooltip-modal/styles/_tooltip-modal.scss
similarity index 100%
rename from lib/gui/components/tooltip-modal/styles/_tooltip-modal.scss
rename to lib/gui/app/components/tooltip-modal/styles/_tooltip-modal.scss
diff --git a/lib/gui/components/tooltip-modal/templates/tooltip-modal.tpl.html b/lib/gui/app/components/tooltip-modal/templates/tooltip-modal.tpl.html
similarity index 100%
rename from lib/gui/components/tooltip-modal/templates/tooltip-modal.tpl.html
rename to lib/gui/app/components/tooltip-modal/templates/tooltip-modal.tpl.html
diff --git a/lib/gui/components/tooltip-modal/tooltip-modal.js b/lib/gui/app/components/tooltip-modal/tooltip-modal.js
similarity index 100%
rename from lib/gui/components/tooltip-modal/tooltip-modal.js
rename to lib/gui/app/components/tooltip-modal/tooltip-modal.js
diff --git a/lib/gui/components/update-notifier.js b/lib/gui/app/components/update-notifier.js
similarity index 96%
rename from lib/gui/components/update-notifier.js
rename to lib/gui/app/components/update-notifier.js
index 0e7315c8..8fc7dd7a 100644
--- a/lib/gui/components/update-notifier.js
+++ b/lib/gui/app/components/update-notifier.js
@@ -21,9 +21,9 @@ const Bluebird = require('bluebird')
 const _ = require('lodash')
 const settings = require('../models/settings')
 const analytics = require('../modules/analytics')
-const units = require('../../shared/units')
-const release = require('../../shared/release')
-const packageJSON = require('../../../package.json')
+const units = require('../../../shared/units')
+const release = require('../../../shared/release')
+const packageJSON = require('../../../../package.json')
 
 /**
  * @summary The number of days the update notifier can be put to sleep
diff --git a/lib/gui/components/warning-modal/controllers/warning-modal.js b/lib/gui/app/components/warning-modal/controllers/warning-modal.js
similarity index 100%
rename from lib/gui/components/warning-modal/controllers/warning-modal.js
rename to lib/gui/app/components/warning-modal/controllers/warning-modal.js
diff --git a/lib/gui/components/warning-modal/services/warning-modal.js b/lib/gui/app/components/warning-modal/services/warning-modal.js
similarity index 100%
rename from lib/gui/components/warning-modal/services/warning-modal.js
rename to lib/gui/app/components/warning-modal/services/warning-modal.js
diff --git a/lib/gui/components/warning-modal/styles/_warning-modal.scss b/lib/gui/app/components/warning-modal/styles/_warning-modal.scss
similarity index 100%
rename from lib/gui/components/warning-modal/styles/_warning-modal.scss
rename to lib/gui/app/components/warning-modal/styles/_warning-modal.scss
diff --git a/lib/gui/components/warning-modal/templates/warning-modal.tpl.html b/lib/gui/app/components/warning-modal/templates/warning-modal.tpl.html
similarity index 100%
rename from lib/gui/components/warning-modal/templates/warning-modal.tpl.html
rename to lib/gui/app/components/warning-modal/templates/warning-modal.tpl.html
diff --git a/lib/gui/components/warning-modal/warning-modal.js b/lib/gui/app/components/warning-modal/warning-modal.js
similarity index 100%
rename from lib/gui/components/warning-modal/warning-modal.js
rename to lib/gui/app/components/warning-modal/warning-modal.js
diff --git a/lib/gui/index.html b/lib/gui/app/index.html
similarity index 83%
rename from lib/gui/index.html
rename to lib/gui/app/index.html
index 5dc037e6..7b2de075 100644
--- a/lib/gui/index.html
+++ b/lib/gui/app/index.html
@@ -3,10 +3,10 @@
   <head>
     <meta charset="UTF-8" />
     <title>Etcher</title>
-    <link rel="stylesheet" type="text/css" href="../../node_modules/flexboxgrid/dist/flexboxgrid.css">
-    <link rel="stylesheet" type="text/css" href="css/main.css">
-    <link rel="stylesheet" type="text/css" href="css/desktop.css">
-    <link rel="stylesheet" type="text/css" href="css/angular.css">
+    <link rel="stylesheet" type="text/css" href="../../../node_modules/flexboxgrid/dist/flexboxgrid.css">
+    <link rel="stylesheet" type="text/css" href="../css/main.css">
+    <link rel="stylesheet" type="text/css" href="../css/desktop.css">
+    <link rel="stylesheet" type="text/css" href="../css/angular.css">
     <script src="./app.js"></script>
   </head>
   <body>
@@ -38,7 +38,7 @@
       ng-hide="state.currentName === 'success'">
       <span os-open-external="https://etcher.io?ref=etcher_footer"
         tabindex="100">
-        <svg-icon path="'../assets/etcher.svg'"
+        <svg-icon path="'../../assets/etcher.svg'"
           width="'83px'"
           height="'13px'"></svg-icon>
       </span>
@@ -51,7 +51,7 @@
 
       <span os-open-external="https://resin.io?ref=etcher"
         tabindex="102">
-        <svg-icon path="'../assets/resin.svg'"
+        <svg-icon path="'../../assets/resin.svg'"
           width="'79px'"
           height="'23px'"></svg-icon>
       </span>
diff --git a/lib/gui/models/local-settings.js b/lib/gui/app/models/local-settings.js
similarity index 100%
rename from lib/gui/models/local-settings.js
rename to lib/gui/app/models/local-settings.js
diff --git a/lib/gui/models/settings.js b/lib/gui/app/models/settings.js
similarity index 97%
rename from lib/gui/models/settings.js
rename to lib/gui/app/models/settings.js
index a6990b37..48ce87dd 100644
--- a/lib/gui/models/settings.js
+++ b/lib/gui/app/models/settings.js
@@ -23,8 +23,8 @@
 const _ = require('lodash')
 const Bluebird = require('bluebird')
 const localSettings = require('./local-settings')
-const store = require('../../shared/store')
-const errors = require('../../shared/errors')
+const store = require('../../../shared/store')
+const errors = require('../../../shared/errors')
 
 /**
  * @summary Set a settings object
diff --git a/lib/gui/modules/analytics.js b/lib/gui/app/modules/analytics.js
similarity index 97%
rename from lib/gui/modules/analytics.js
rename to lib/gui/app/modules/analytics.js
index baa3fb02..41e8c595 100644
--- a/lib/gui/modules/analytics.js
+++ b/lib/gui/app/modules/analytics.js
@@ -18,7 +18,7 @@
 
 const _ = require('lodash')
 const resinCorvus = require('resin-corvus/browser')
-const packageJSON = require('../../../package.json')
+const packageJSON = require('../../../../package.json')
 const settings = require('../models/settings')
 
 resinCorvus.install({
diff --git a/lib/gui/modules/drive-scanner.js b/lib/gui/app/modules/drive-scanner.js
similarity index 97%
rename from lib/gui/modules/drive-scanner.js
rename to lib/gui/app/modules/drive-scanner.js
index 788b1c0c..06eff093 100644
--- a/lib/gui/modules/drive-scanner.js
+++ b/lib/gui/app/modules/drive-scanner.js
@@ -21,7 +21,7 @@ const Bluebird = require('bluebird')
 const fs = Bluebird.promisifyAll(require('fs'))
 const path = require('path')
 const settings = require('../models/settings')
-const SDK = require('../../shared/sdk')
+const SDK = require('../../../shared/sdk')
 
 /**
  * @summary The Etcher "blobs" directory path
diff --git a/lib/gui/modules/exception-reporter.js b/lib/gui/app/modules/exception-reporter.js
similarity index 100%
rename from lib/gui/modules/exception-reporter.js
rename to lib/gui/app/modules/exception-reporter.js
diff --git a/lib/gui/modules/image-writer.js b/lib/gui/app/modules/image-writer.js
similarity index 95%
rename from lib/gui/modules/image-writer.js
rename to lib/gui/app/modules/image-writer.js
index 2921b9af..2995e320 100644
--- a/lib/gui/modules/image-writer.js
+++ b/lib/gui/app/modules/image-writer.js
@@ -24,12 +24,12 @@ const ipc = require('node-ipc')
 const isRunningInAsar = require('electron-is-running-in-asar')
 const electron = require('electron')
 const settings = require('../models/settings')
-const flashState = require('../../shared/models/flash-state')
-const errors = require('../../shared/errors')
-const permissions = require('../../shared/permissions')
+const flashState = require('../../../shared/models/flash-state')
+const errors = require('../../../shared/errors')
+const permissions = require('../../../shared/permissions')
 const windowProgress = require('../os/window-progress')
 const analytics = require('../modules/analytics')
-const packageJSON = require('../../../package.json')
+const packageJSON = require('../../../../package.json')
 
 /**
  * @summary Get application entry point
@@ -49,8 +49,8 @@ const getApplicationEntryPoint = () => {
   const ENTRY_POINT_ARGV_INDEX = 1
   const relativeEntryPoint = electron.remote.process.argv[ENTRY_POINT_ARGV_INDEX]
 
-  const PROJECT_ROOT = path.join(__dirname, '..', '..', '..')
-  return path.join(PROJECT_ROOT, relativeEntryPoint)
+  const PROJECT_ROOT = path.join(__dirname, '..', '..', '..', '..')
+  return path.resolve(PROJECT_ROOT, relativeEntryPoint)
 }
 
 /**
diff --git a/lib/gui/modules/progress-status.js b/lib/gui/app/modules/progress-status.js
similarity index 97%
rename from lib/gui/modules/progress-status.js
rename to lib/gui/app/modules/progress-status.js
index bdba120a..9ed1cd89 100644
--- a/lib/gui/modules/progress-status.js
+++ b/lib/gui/app/modules/progress-status.js
@@ -17,7 +17,7 @@
 'use strict'
 
 const settings = require('../models/settings')
-const utils = require('../../shared/utils')
+const utils = require('../../../shared/utils')
 
 /**
  * @summary Make the progress status subtitle string
diff --git a/lib/gui/os/dialog.js b/lib/gui/app/os/dialog.js
similarity index 97%
rename from lib/gui/os/dialog.js
rename to lib/gui/app/os/dialog.js
index 56f8da4e..97ca1e27 100644
--- a/lib/gui/os/dialog.js
+++ b/lib/gui/app/os/dialog.js
@@ -19,8 +19,8 @@
 const _ = require('lodash')
 const electron = require('electron')
 const Bluebird = require('bluebird')
-const errors = require('../../shared/errors')
-const supportedFormats = require('../../shared/supported-formats')
+const errors = require('../../../shared/errors')
+const supportedFormats = require('../../../shared/supported-formats')
 
 /**
  * @summary Current renderer BrowserWindow instance
diff --git a/lib/gui/os/dropzone/directives/dropzone.js b/lib/gui/app/os/dropzone/directives/dropzone.js
similarity index 100%
rename from lib/gui/os/dropzone/directives/dropzone.js
rename to lib/gui/app/os/dropzone/directives/dropzone.js
diff --git a/lib/gui/os/dropzone/dropzone.js b/lib/gui/app/os/dropzone/dropzone.js
similarity index 100%
rename from lib/gui/os/dropzone/dropzone.js
rename to lib/gui/app/os/dropzone/dropzone.js
diff --git a/lib/gui/os/notification.js b/lib/gui/app/os/notification.js
similarity index 100%
rename from lib/gui/os/notification.js
rename to lib/gui/app/os/notification.js
diff --git a/lib/gui/os/open-external/directives/open-external.js b/lib/gui/app/os/open-external/directives/open-external.js
similarity index 100%
rename from lib/gui/os/open-external/directives/open-external.js
rename to lib/gui/app/os/open-external/directives/open-external.js
diff --git a/lib/gui/os/open-external/open-external.js b/lib/gui/app/os/open-external/open-external.js
similarity index 100%
rename from lib/gui/os/open-external/open-external.js
rename to lib/gui/app/os/open-external/open-external.js
diff --git a/lib/gui/os/open-external/services/open-external.js b/lib/gui/app/os/open-external/services/open-external.js
similarity index 100%
rename from lib/gui/os/open-external/services/open-external.js
rename to lib/gui/app/os/open-external/services/open-external.js
diff --git a/lib/gui/os/window-progress.js b/lib/gui/app/os/window-progress.js
similarity index 98%
rename from lib/gui/os/window-progress.js
rename to lib/gui/app/os/window-progress.js
index 1cd8494a..65308748 100644
--- a/lib/gui/os/window-progress.js
+++ b/lib/gui/app/os/window-progress.js
@@ -17,7 +17,7 @@
 'use strict'
 
 const electron = require('electron')
-const utils = require('../../shared/utils')
+const utils = require('../../../shared/utils')
 const progressStatus = require('../modules/progress-status')
 
 /**
diff --git a/lib/gui/pages/finish/controllers/finish.js b/lib/gui/app/pages/finish/controllers/finish.js
similarity index 90%
rename from lib/gui/pages/finish/controllers/finish.js
rename to lib/gui/app/pages/finish/controllers/finish.js
index cdcbeb3c..468314f4 100644
--- a/lib/gui/pages/finish/controllers/finish.js
+++ b/lib/gui/app/pages/finish/controllers/finish.js
@@ -17,8 +17,8 @@
 'use strict'
 
 const settings = require('../../../models/settings')
-const flashState = require('../../../../shared/models/flash-state')
-const selectionState = require('../../../../shared/models/selection-state')
+const flashState = require('../../../../../shared/models/flash-state')
+const selectionState = require('../../../../../shared/models/selection-state')
 const analytics = require('../../../modules/analytics')
 
 module.exports = function ($state) {
diff --git a/lib/gui/pages/finish/finish.js b/lib/gui/app/pages/finish/finish.js
similarity index 100%
rename from lib/gui/pages/finish/finish.js
rename to lib/gui/app/pages/finish/finish.js
diff --git a/lib/gui/pages/finish/styles/_finish.scss b/lib/gui/app/pages/finish/styles/_finish.scss
similarity index 100%
rename from lib/gui/pages/finish/styles/_finish.scss
rename to lib/gui/app/pages/finish/styles/_finish.scss
diff --git a/lib/gui/pages/finish/templates/success.tpl.html b/lib/gui/app/pages/finish/templates/success.tpl.html
similarity index 89%
rename from lib/gui/pages/finish/templates/success.tpl.html
rename to lib/gui/app/pages/finish/templates/success.tpl.html
index 57545f02..953ee6ab 100644
--- a/lib/gui/pages/finish/templates/success.tpl.html
+++ b/lib/gui/app/pages/finish/templates/success.tpl.html
@@ -16,7 +16,7 @@
       <div class="fallback-banner">
         <div class="caption caption-big">Thanks for using
           <span os-open-external="https://etcher.io?ref=etcher_offline_banner">
-            <svg-icon path="'../assets/etcher.svg'"
+            <svg-icon path="'../../assets/etcher.svg'"
               width="'150px'"
               height="'auto'">
             </svg-icon>
@@ -24,12 +24,12 @@
         </div>
         <div class="caption caption-small">
           made with
-          <svg-icon path="'../assets/love.svg'"
+          <svg-icon path="'../../assets/love.svg'"
             width="'20px'"
             height="'auto'"></svg-icon>
           by
           <span os-open-external="https://resin.io?ref=etcher_success">
-            <svg-icon path="'../assets/resin.svg'"
+            <svg-icon path="'../../assets/resin.svg'"
               width="'100px'"
               height="'auto'">
             </svg-icon>
diff --git a/lib/gui/pages/main/controllers/drive-selection.js b/lib/gui/app/pages/main/controllers/drive-selection.js
similarity index 95%
rename from lib/gui/pages/main/controllers/drive-selection.js
rename to lib/gui/app/pages/main/controllers/drive-selection.js
index 5215cb03..6a6ad56b 100644
--- a/lib/gui/pages/main/controllers/drive-selection.js
+++ b/lib/gui/app/pages/main/controllers/drive-selection.js
@@ -17,7 +17,7 @@
 'use strict'
 
 const settings = require('../../../models/settings')
-const selectionState = require('../../../../shared/models/selection-state')
+const selectionState = require('../../../../../shared/models/selection-state')
 const analytics = require('../../../modules/analytics')
 const exceptionReporter = require('../../../modules/exception-reporter')
 
diff --git a/lib/gui/pages/main/controllers/flash.js b/lib/gui/app/pages/main/controllers/flash.js
similarity index 95%
rename from lib/gui/pages/main/controllers/flash.js
rename to lib/gui/app/pages/main/controllers/flash.js
index 62637bd9..8a5252f6 100644
--- a/lib/gui/pages/main/controllers/flash.js
+++ b/lib/gui/app/pages/main/controllers/flash.js
@@ -16,15 +16,15 @@
 
 'use strict'
 
-const messages = require('../../../../shared/messages')
-const flashState = require('../../../../shared/models/flash-state')
+const messages = require('../../../../../shared/messages')
+const flashState = require('../../../../../shared/models/flash-state')
 const driveScanner = require('../../../modules/drive-scanner')
 const progressStatus = require('../../../modules/progress-status')
 const notification = require('../../../os/notification')
 const exceptionReporter = require('../../../modules/exception-reporter')
 const imageWriter = require('../../../modules/image-writer')
 const path = require('path')
-const store = require('../../../../shared/store')
+const store = require('../../../../../shared/store')
 
 module.exports = function (
   $state,
diff --git a/lib/gui/pages/main/controllers/image-selection.js b/lib/gui/app/pages/main/controllers/image-selection.js
similarity index 94%
rename from lib/gui/pages/main/controllers/image-selection.js
rename to lib/gui/app/pages/main/controllers/image-selection.js
index e67c9914..a94b74e7 100644
--- a/lib/gui/pages/main/controllers/image-selection.js
+++ b/lib/gui/app/pages/main/controllers/image-selection.js
@@ -19,12 +19,12 @@
 const _ = require('lodash')
 const Bluebird = require('bluebird')
 const path = require('path')
-const messages = require('../../../../shared/messages')
-const errors = require('../../../../shared/errors')
-const imageStream = require('../../../../image-stream')
-const supportedFormats = require('../../../../shared/supported-formats')
+const messages = require('../../../../../shared/messages')
+const errors = require('../../../../../shared/errors')
+const imageStream = require('../../../../../image-stream')
+const supportedFormats = require('../../../../../shared/supported-formats')
 const analytics = require('../../../modules/analytics')
-const selectionState = require('../../../../shared/models/selection-state')
+const selectionState = require('../../../../../shared/models/selection-state')
 const osDialog = require('../../../os/dialog')
 const exceptionReporter = require('../../../modules/exception-reporter')
 
diff --git a/lib/gui/pages/main/controllers/main.js b/lib/gui/app/pages/main/controllers/main.js
similarity index 91%
rename from lib/gui/pages/main/controllers/main.js
rename to lib/gui/app/pages/main/controllers/main.js
index 190a0547..8d9c00db 100644
--- a/lib/gui/pages/main/controllers/main.js
+++ b/lib/gui/app/pages/main/controllers/main.js
@@ -17,11 +17,11 @@
 'use strict'
 
 const settings = require('../../../models/settings')
-const flashState = require('../../../../shared/models/flash-state')
+const flashState = require('../../../../../shared/models/flash-state')
 const analytics = require('../../../modules/analytics')
 const exceptionReporter = require('../../../modules/exception-reporter')
-const availableDrives = require('../../../../shared/models/available-drives')
-const selectionState = require('../../../../shared/models/selection-state')
+const availableDrives = require('../../../../../shared/models/available-drives')
+const selectionState = require('../../../../../shared/models/selection-state')
 
 module.exports = function (
   TooltipModalService,
diff --git a/lib/gui/pages/main/main.js b/lib/gui/app/pages/main/main.js
similarity index 100%
rename from lib/gui/pages/main/main.js
rename to lib/gui/app/pages/main/main.js
diff --git a/lib/gui/pages/main/styles/_main.scss b/lib/gui/app/pages/main/styles/_main.scss
similarity index 100%
rename from lib/gui/pages/main/styles/_main.scss
rename to lib/gui/app/pages/main/styles/_main.scss
diff --git a/lib/gui/pages/main/templates/main.tpl.html b/lib/gui/app/pages/main/templates/main.tpl.html
similarity index 95%
rename from lib/gui/pages/main/templates/main.tpl.html
rename to lib/gui/app/pages/main/templates/main.tpl.html
index 71b2cce9..91d15cb7 100644
--- a/lib/gui/pages/main/templates/main.tpl.html
+++ b/lib/gui/app/pages/main/templates/main.tpl.html
@@ -3,7 +3,7 @@
     <div class="box text-center relative" os-dropzone="image.selectImageByPath($file)">
 
       <div class="center-block">
-        <svg-icon path="main.selection.getImageLogo() || '../assets/image.svg'"></svg-icon>
+        <svg-icon path="main.selection.getImageLogo() || '../../assets/image.svg'"></svg-icon>
       </div>
 
       <div class="space-vertical-large">
@@ -44,7 +44,7 @@
       <div class="step-border-right" ng-disabled="main.shouldFlashStepBeDisabled()"></div>
 
       <div class="center-block">
-        <svg-icon path="'../assets/drive.svg'"
+        <svg-icon path="'../../assets/drive.svg'"
           disabled="main.shouldDriveStepBeDisabled()"></svg-icon>
       </div>
 
@@ -84,7 +84,7 @@
   <div class="col-xs" ng-controller="FlashController as flash">
     <div class="box text-center">
       <div class="center-block">
-        <svg-icon path="'../assets/flash.svg'"
+        <svg-icon path="'../../assets/flash.svg'"
           disabled="main.shouldFlashStepBeDisabled()"></svg-icon>
       </div>
 
diff --git a/lib/gui/pages/settings/controllers/settings.js b/lib/gui/app/pages/settings/controllers/settings.js
similarity index 100%
rename from lib/gui/pages/settings/controllers/settings.js
rename to lib/gui/app/pages/settings/controllers/settings.js
diff --git a/lib/gui/pages/settings/settings.js b/lib/gui/app/pages/settings/settings.js
similarity index 100%
rename from lib/gui/pages/settings/settings.js
rename to lib/gui/app/pages/settings/settings.js
diff --git a/lib/gui/pages/settings/styles/_settings.scss b/lib/gui/app/pages/settings/styles/_settings.scss
similarity index 100%
rename from lib/gui/pages/settings/styles/_settings.scss
rename to lib/gui/app/pages/settings/styles/_settings.scss
diff --git a/lib/gui/pages/settings/templates/settings.tpl.html b/lib/gui/app/pages/settings/templates/settings.tpl.html
similarity index 100%
rename from lib/gui/pages/settings/templates/settings.tpl.html
rename to lib/gui/app/pages/settings/templates/settings.tpl.html
diff --git a/lib/gui/scss/components/_badge.scss b/lib/gui/app/scss/components/_badge.scss
similarity index 100%
rename from lib/gui/scss/components/_badge.scss
rename to lib/gui/app/scss/components/_badge.scss
diff --git a/lib/gui/scss/components/_button.scss b/lib/gui/app/scss/components/_button.scss
similarity index 100%
rename from lib/gui/scss/components/_button.scss
rename to lib/gui/app/scss/components/_button.scss
diff --git a/lib/gui/scss/components/_caption.scss b/lib/gui/app/scss/components/_caption.scss
similarity index 100%
rename from lib/gui/scss/components/_caption.scss
rename to lib/gui/app/scss/components/_caption.scss
diff --git a/lib/gui/scss/components/_label.scss b/lib/gui/app/scss/components/_label.scss
similarity index 100%
rename from lib/gui/scss/components/_label.scss
rename to lib/gui/app/scss/components/_label.scss
diff --git a/lib/gui/scss/components/_tick.scss b/lib/gui/app/scss/components/_tick.scss
similarity index 100%
rename from lib/gui/scss/components/_tick.scss
rename to lib/gui/app/scss/components/_tick.scss
diff --git a/lib/gui/scss/main.scss b/lib/gui/app/scss/main.scss
similarity index 97%
rename from lib/gui/scss/main.scss
rename to lib/gui/app/scss/main.scss
index 983ddafd..26ce6cc6 100644
--- a/lib/gui/scss/main.scss
+++ b/lib/gui/app/scss/main.scss
@@ -22,7 +22,7 @@ $btn-min-width: 170px;
 $link-color: #ddd;
 $disabled-opacity: 0.2;
 
-@import "../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap";
+@import "../../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap";
 @import "./modules/theme";
 @import "./modules/bootstrap";
 @import "./modules/space";
diff --git a/lib/gui/scss/modules/_bootstrap.scss b/lib/gui/app/scss/modules/_bootstrap.scss
similarity index 100%
rename from lib/gui/scss/modules/_bootstrap.scss
rename to lib/gui/app/scss/modules/_bootstrap.scss
diff --git a/lib/gui/scss/modules/_space.scss b/lib/gui/app/scss/modules/_space.scss
similarity index 100%
rename from lib/gui/scss/modules/_space.scss
rename to lib/gui/app/scss/modules/_space.scss
diff --git a/lib/gui/scss/modules/_theme.scss b/lib/gui/app/scss/modules/_theme.scss
similarity index 100%
rename from lib/gui/scss/modules/_theme.scss
rename to lib/gui/app/scss/modules/_theme.scss
diff --git a/lib/gui/utils/byte-size/byte-size.js b/lib/gui/app/utils/byte-size/byte-size.js
similarity index 100%
rename from lib/gui/utils/byte-size/byte-size.js
rename to lib/gui/app/utils/byte-size/byte-size.js
diff --git a/lib/gui/utils/byte-size/filter.js b/lib/gui/app/utils/byte-size/filter.js
similarity index 94%
rename from lib/gui/utils/byte-size/filter.js
rename to lib/gui/app/utils/byte-size/filter.js
index 3eed6ee3..74f4eb7c 100644
--- a/lib/gui/utils/byte-size/filter.js
+++ b/lib/gui/app/utils/byte-size/filter.js
@@ -16,7 +16,7 @@
 
 'use strict'
 
-const units = require('../../../shared/units')
+const units = require('../../../../shared/units')
 
 module.exports = () => {
   /**
diff --git a/lib/gui/utils/manifest-bind/directives/manifest-bind.js b/lib/gui/app/utils/manifest-bind/directives/manifest-bind.js
similarity index 96%
rename from lib/gui/utils/manifest-bind/directives/manifest-bind.js
rename to lib/gui/app/utils/manifest-bind/directives/manifest-bind.js
index 6ae4570e..65818a06 100644
--- a/lib/gui/utils/manifest-bind/directives/manifest-bind.js
+++ b/lib/gui/app/utils/manifest-bind/directives/manifest-bind.js
@@ -16,7 +16,7 @@
 
 'use strict'
 
-const errors = require('../../../../shared/errors')
+const errors = require('../../../../../shared/errors')
 
 /**
  * @summary ManifestBind directive
diff --git a/lib/gui/utils/manifest-bind/manifest-bind.js b/lib/gui/app/utils/manifest-bind/manifest-bind.js
similarity index 100%
rename from lib/gui/utils/manifest-bind/manifest-bind.js
rename to lib/gui/app/utils/manifest-bind/manifest-bind.js
diff --git a/lib/gui/utils/manifest-bind/services/manifest-bind.js b/lib/gui/app/utils/manifest-bind/services/manifest-bind.js
similarity index 94%
rename from lib/gui/utils/manifest-bind/services/manifest-bind.js
rename to lib/gui/app/utils/manifest-bind/services/manifest-bind.js
index 92ac635a..39c399c2 100644
--- a/lib/gui/utils/manifest-bind/services/manifest-bind.js
+++ b/lib/gui/app/utils/manifest-bind/services/manifest-bind.js
@@ -17,7 +17,7 @@
 'use strict'
 
 const _ = require('lodash')
-const packageJSON = require('../../../../../package.json')
+const packageJSON = require('../../../../../../package.json')
 
 module.exports = function () {
   /**
diff --git a/lib/gui/etcher.js b/lib/gui/etcher.js
index 8891f9a8..fa4f16b9 100644
--- a/lib/gui/etcher.js
+++ b/lib/gui/etcher.js
@@ -74,5 +74,5 @@ electron.app.on('ready', () => {
     event.preventDefault()
   })
 
-  mainWindow.loadURL(`file://${path.join(__dirname, 'index.html')}`)
+  mainWindow.loadURL(`file://${path.join(__dirname, 'app', 'index.html')}`)
 })
diff --git a/tests/gui/components/drive-selector.spec.js b/tests/gui/components/drive-selector.spec.js
index 2c985207..f0e8fe0b 100644
--- a/tests/gui/components/drive-selector.spec.js
+++ b/tests/gui/components/drive-selector.spec.js
@@ -23,7 +23,7 @@ require('angular-mocks')
 
 describe('Browser: DriveSelector', function () {
   beforeEach(angular.mock.module(
-    require('../../../lib/gui/components/drive-selector/drive-selector')
+    require('../../../lib/gui/app/components/drive-selector/drive-selector')
   ))
 
   describe('DriveSelectorController', function () {
diff --git a/tests/gui/components/svg-icon.spec.js b/tests/gui/components/svg-icon.spec.js
index 5eca6b21..94c31e86 100644
--- a/tests/gui/components/svg-icon.spec.js
+++ b/tests/gui/components/svg-icon.spec.js
@@ -25,7 +25,7 @@ require('angular-mocks')
 
 describe('Browser: SVGIcon', function () {
   beforeEach(angular.mock.module(
-    require('../../../lib/gui/components/svg-icon')
+    require('../../../lib/gui/app/components/svg-icon')
   ))
 
   describe('svgIcon', function () {
@@ -38,7 +38,7 @@ describe('Browser: SVGIcon', function () {
     }))
 
     it('should inline the svg contents in the element', function () {
-      const icon = '../../../lib/gui/assets/etcher.svg'
+      const icon = '../../../gui/assets/etcher.svg'
       let iconContents = _.split(fs.readFileSync(path.join(__dirname, '../../../lib/gui/assets/etcher.svg'), {
         encoding: 'utf8'
       }), /\r?\n/)
@@ -84,7 +84,7 @@ describe('Browser: SVGIcon', function () {
     })
 
     it('should default the size to 40x40 pixels', function () {
-      const icon = '../../../lib/gui/assets/etcher.svg'
+      const icon = '../../../gui/assets/etcher.svg'
       const element = $compile(`<svg-icon path="'${icon}'">Resin.io</svg-icon>`)($rootScope)
       $rootScope.$digest()
       m.chai.expect(element.children().css('width')).to.equal('40px')
@@ -92,7 +92,7 @@ describe('Browser: SVGIcon', function () {
     })
 
     it('should be able to set a custom width', function () {
-      const icon = '../../../lib/gui/assets/etcher.svg'
+      const icon = '../../../gui/assets/etcher.svg'
       const element = $compile(`<svg-icon path="'${icon}'" width="'20px'">Resin.io</svg-icon>`)($rootScope)
       $rootScope.$digest()
       m.chai.expect(element.children().css('width')).to.equal('20px')
@@ -100,7 +100,7 @@ describe('Browser: SVGIcon', function () {
     })
 
     it('should be able to set a custom height', function () {
-      const icon = '../../../lib/gui/assets/etcher.svg'
+      const icon = '../../../gui/assets/etcher.svg'
       const element = $compile(`<svg-icon path="'${icon}'" height="'20px'">Resin.io</svg-icon>`)($rootScope)
       $rootScope.$digest()
       m.chai.expect(element.children().css('width')).to.equal('40px')
diff --git a/tests/gui/components/update-notifier.spec.js b/tests/gui/components/update-notifier.spec.js
index 6465b847..a68af42d 100644
--- a/tests/gui/components/update-notifier.spec.js
+++ b/tests/gui/components/update-notifier.spec.js
@@ -19,7 +19,7 @@
 const m = require('mochainon')
 const _ = require('lodash')
 const units = require('../../../lib/shared/units')
-const updateNotifier = require('../../../lib/gui/components/update-notifier')
+const updateNotifier = require('../../../lib/gui/app/components/update-notifier')
 
 describe('Browser: updateNotifier', function () {
   describe('.UPDATE_NOTIFIER_SLEEP_DAYS', function () {
diff --git a/tests/gui/models/settings.spec.js b/tests/gui/models/settings.spec.js
index 0dcafc10..23d91c4d 100644
--- a/tests/gui/models/settings.spec.js
+++ b/tests/gui/models/settings.spec.js
@@ -20,8 +20,8 @@ const m = require('mochainon')
 const _ = require('lodash')
 const Bluebird = require('bluebird')
 const store = require('../../../lib/shared/store')
-const settings = require('../../../lib/gui/models/settings')
-const localSettings = require('../../../lib/gui/models/local-settings')
+const settings = require('../../../lib/gui/app/models/settings')
+const localSettings = require('../../../lib/gui/app/models/local-settings')
 
 describe('Browser: settings', function () {
   beforeEach(function () {
diff --git a/tests/gui/modules/drive-scanner.spec.js b/tests/gui/modules/drive-scanner.spec.js
index c0eb76a5..f2cdbbc0 100644
--- a/tests/gui/modules/drive-scanner.spec.js
+++ b/tests/gui/modules/drive-scanner.spec.js
@@ -19,7 +19,7 @@
 const m = require('mochainon')
 const os = require('os')
 const drivelist = require('drivelist')
-const driveScanner = require('../../../lib/gui/modules/drive-scanner')
+const driveScanner = require('../../../lib/gui/app/modules/drive-scanner')
 
 describe('Browser: driveScanner', function () {
   describe('detected devices should be an array', function () {
diff --git a/tests/gui/modules/image-writer.spec.js b/tests/gui/modules/image-writer.spec.js
index 36131cbe..a01d67a9 100644
--- a/tests/gui/modules/image-writer.spec.js
+++ b/tests/gui/modules/image-writer.spec.js
@@ -5,7 +5,7 @@ const ipc = require('node-ipc')
 const angular = require('angular')
 const Bluebird = require('bluebird')
 const flashState = require('../../../lib/shared/models/flash-state')
-const imageWriter = require('../../../lib/gui/modules/image-writer')
+const imageWriter = require('../../../lib/gui/app/modules/image-writer')
 require('angular-mocks')
 
 describe('Browser: imageWriter', () => {
diff --git a/tests/gui/modules/progress-status.spec.js b/tests/gui/modules/progress-status.spec.js
index 3ca719d7..67fbb6fe 100644
--- a/tests/gui/modules/progress-status.spec.js
+++ b/tests/gui/modules/progress-status.spec.js
@@ -1,8 +1,8 @@
 'use strict'
 
 const m = require('mochainon')
-const settings = require('../../../lib/gui/models/settings')
-const progressStatus = require('../../../lib/gui/modules/progress-status')
+const settings = require('../../../lib/gui/app/models/settings')
+const progressStatus = require('../../../lib/gui/app/modules/progress-status')
 
 describe('Browser: progressStatus', function () {
   describe('.fromFlashState()', function () {
diff --git a/tests/gui/os/dropzone.spec.js b/tests/gui/os/dropzone.spec.js
index 3247faba..f6523d73 100644
--- a/tests/gui/os/dropzone.spec.js
+++ b/tests/gui/os/dropzone.spec.js
@@ -22,7 +22,7 @@ require('angular-mocks')
 
 describe('Browser: OSDropzone', function () {
   beforeEach(angular.mock.module(
-    require('../../../lib/gui/os/dropzone/dropzone')
+    require('../../../lib/gui/app/os/dropzone/dropzone')
   ))
 
   describe('osDropzone', function () {
diff --git a/tests/gui/os/open-external.spec.js b/tests/gui/os/open-external.spec.js
index 0ed75a7f..c36aa52c 100644
--- a/tests/gui/os/open-external.spec.js
+++ b/tests/gui/os/open-external.spec.js
@@ -23,7 +23,7 @@ require('angular-mocks')
 
 describe('Browser: OSOpenExternal', function () {
   beforeEach(angular.mock.module(
-    require('../../../lib/gui/os/open-external/open-external')
+    require('../../../lib/gui/app/os/open-external/open-external')
   ))
 
   describe('osOpenExternal', function () {
diff --git a/tests/gui/os/window-progress.spec.js b/tests/gui/os/window-progress.spec.js
index ae3d8814..dd9cf55f 100644
--- a/tests/gui/os/window-progress.spec.js
+++ b/tests/gui/os/window-progress.spec.js
@@ -17,7 +17,7 @@
 'use strict'
 
 const m = require('mochainon')
-const windowProgress = require('../../../lib/gui/os/window-progress')
+const windowProgress = require('../../../lib/gui/app/os/window-progress')
 
 describe('Browser: WindowProgress', function () {
   describe('windowProgress', function () {
diff --git a/tests/gui/pages/main.spec.js b/tests/gui/pages/main.spec.js
index bdab3b95..c31fea0e 100644
--- a/tests/gui/pages/main.spec.js
+++ b/tests/gui/pages/main.spec.js
@@ -28,7 +28,7 @@ require('angular-mocks')
 
 describe('Browser: MainPage', function () {
   beforeEach(angular.mock.module(
-    require('../../../lib/gui/pages/main/main')
+    require('../../../lib/gui/app/pages/main/main')
   ))
 
   describe('MainController', function () {
diff --git a/tests/gui/utils/byte-size.spec.js b/tests/gui/utils/byte-size.spec.js
index b05c790f..360b4cc0 100644
--- a/tests/gui/utils/byte-size.spec.js
+++ b/tests/gui/utils/byte-size.spec.js
@@ -23,7 +23,7 @@ const units = require('../../../lib/shared/units')
 
 describe('Browser: ByteSize', function () {
   beforeEach(angular.mock.module(
-    require('../../../lib/gui/utils/byte-size/byte-size')
+    require('../../../lib/gui/app/utils/byte-size/byte-size')
   ))
 
   describe('ClosestUnitFilter', function () {
diff --git a/tests/gui/utils/manifest-bind.spec.js b/tests/gui/utils/manifest-bind.spec.js
index e6e4603c..8b4d29b3 100644
--- a/tests/gui/utils/manifest-bind.spec.js
+++ b/tests/gui/utils/manifest-bind.spec.js
@@ -23,7 +23,7 @@ require('angular-mocks')
 
 describe('Browser: ManifestBind', function () {
   beforeEach(angular.mock.module(
-    require('../../../lib/gui/utils/manifest-bind/manifest-bind')
+    require('../../../lib/gui/app/utils/manifest-bind/manifest-bind')
   ))
 
   let $compile