diff --git a/gulpfile.js b/gulpfile.js
index 604314bd..0eb12ca5 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -29,9 +29,9 @@ const paths = {
     'gulpfile.js'
   ],
   sass: [
-    './lib/**/*.scss'
+    './lib/gui/**/*.scss'
   ],
-  sassMain: './lib/scss/main.scss'
+  sassMain: './lib/gui/scss/main.scss'
 };
 
 gulp.task('sass', function() {
diff --git a/lib/browser/app.js b/lib/gui/app.js
similarity index 87%
rename from lib/browser/app.js
rename to lib/gui/app.js
index 9fc4e154..9676d651 100644
--- a/lib/browser/app.js
+++ b/lib/gui/app.js
@@ -23,40 +23,40 @@
 var angular = require('angular');
 const _ = require('lodash');
 const electron = require('electron');
-const dialog = electron.remote.require('./src/dialog');
+const dialog = electron.remote.require('./dialog');
 
 const app = angular.module('Etcher', [
   require('angular-ui-router'),
 
   // Etcher modules
-  require('./browser/modules/drive-scanner'),
-  require('./browser/modules/image-writer'),
-  require('./browser/modules/analytics'),
+  require('./modules/drive-scanner'),
+  require('./modules/image-writer'),
+  require('./modules/analytics'),
 
   // Models
-  require('./browser/models/selection-state'),
-  require('./browser/models/settings'),
+  require('./models/selection-state'),
+  require('./models/settings'),
 
   // Components
-  require('./browser/components/progress-button/progress-button'),
-  require('./browser/components/drive-selector/drive-selector'),
-  require('./browser/components/svg-icon/svg-icon'),
+  require('./components/progress-button/progress-button'),
+  require('./components/drive-selector/drive-selector'),
+  require('./components/svg-icon/svg-icon'),
 
   // Pages
-  require('./browser/pages/finish/finish'),
-  require('./browser/pages/settings/settings'),
+  require('./pages/finish/finish'),
+  require('./pages/settings/settings'),
 
   // OS
-  require('./browser/os/notification/notification'),
-  require('./browser/os/window-progress/window-progress'),
-  require('./browser/os/open-external/open-external'),
-  require('./browser/os/dropzone/dropzone'),
+  require('./os/notification/notification'),
+  require('./os/window-progress/window-progress'),
+  require('./os/open-external/open-external'),
+  require('./os/dropzone/dropzone'),
 
   // Utils
-  require('./browser/utils/if-state/if-state'),
-  require('./browser/utils/notifier/notifier'),
-  require('./browser/utils/path/path'),
-  require('./browser/utils/manifest-bind/manifest-bind')
+  require('./utils/if-state/if-state'),
+  require('./utils/notifier/notifier'),
+  require('./utils/path/path'),
+  require('./utils/manifest-bind/manifest-bind')
 ]);
 
 app.run(function(AnalyticsService) {
diff --git a/assets/images/drive.svg b/lib/gui/assets/drive.svg
similarity index 100%
rename from assets/images/drive.svg
rename to lib/gui/assets/drive.svg
diff --git a/assets/images/etcher.svg b/lib/gui/assets/etcher.svg
similarity index 100%
rename from assets/images/etcher.svg
rename to lib/gui/assets/etcher.svg
diff --git a/assets/images/flash.svg b/lib/gui/assets/flash.svg
similarity index 100%
rename from assets/images/flash.svg
rename to lib/gui/assets/flash.svg
diff --git a/assets/images/image.svg b/lib/gui/assets/image.svg
similarity index 100%
rename from assets/images/image.svg
rename to lib/gui/assets/image.svg
diff --git a/assets/images/resin.svg b/lib/gui/assets/resin.svg
similarity index 100%
rename from assets/images/resin.svg
rename to lib/gui/assets/resin.svg
diff --git a/lib/browser/components/drive-selector/controllers/drive-selector.js b/lib/gui/components/drive-selector/controllers/drive-selector.js
similarity index 100%
rename from lib/browser/components/drive-selector/controllers/drive-selector.js
rename to lib/gui/components/drive-selector/controllers/drive-selector.js
diff --git a/lib/browser/components/drive-selector/drive-selector.js b/lib/gui/components/drive-selector/drive-selector.js
similarity index 91%
rename from lib/browser/components/drive-selector/drive-selector.js
rename to lib/gui/components/drive-selector/drive-selector.js
index 3c8112a4..76e59b44 100644
--- a/lib/browser/components/drive-selector/drive-selector.js
+++ b/lib/gui/components/drive-selector/drive-selector.js
@@ -24,8 +24,8 @@ const angular = require('angular');
 const MODULE_NAME = 'Etcher.Components.DriveSelector';
 const DriveSelector = angular.module(MODULE_NAME, [
   require('angular-ui-bootstrap'),
-  require('../../../browser/modules/drive-scanner'),
-  require('../../../browser/models/selection-state')
+  require('../../modules/drive-scanner'),
+  require('../../models/selection-state')
 ]);
 
 DriveSelector.controller('DriveSelectorController', require('./controllers/drive-selector'));
diff --git a/lib/browser/components/drive-selector/services/drive-selector-state.js b/lib/gui/components/drive-selector/services/drive-selector-state.js
similarity index 100%
rename from lib/browser/components/drive-selector/services/drive-selector-state.js
rename to lib/gui/components/drive-selector/services/drive-selector-state.js
diff --git a/lib/browser/components/drive-selector/services/drive-selector.js b/lib/gui/components/drive-selector/services/drive-selector.js
similarity index 93%
rename from lib/browser/components/drive-selector/services/drive-selector.js
rename to lib/gui/components/drive-selector/services/drive-selector.js
index 05887e18..78c423c3 100644
--- a/lib/browser/components/drive-selector/services/drive-selector.js
+++ b/lib/gui/components/drive-selector/services/drive-selector.js
@@ -36,7 +36,7 @@ module.exports = function($uibModal, $q) {
   this.open = function() {
     modal = $uibModal.open({
       animation: true,
-      templateUrl: './browser/components/drive-selector/templates/drive-selector-modal.tpl.html',
+      templateUrl: './components/drive-selector/templates/drive-selector-modal.tpl.html',
       controller: 'DriveSelectorController as modal',
       size: 'sm'
     });
diff --git a/lib/browser/components/drive-selector/templates/drive-selector-modal.tpl.html b/lib/gui/components/drive-selector/templates/drive-selector-modal.tpl.html
similarity index 100%
rename from lib/browser/components/drive-selector/templates/drive-selector-modal.tpl.html
rename to lib/gui/components/drive-selector/templates/drive-selector-modal.tpl.html
diff --git a/lib/browser/components/progress-button/directives/progress-button.js b/lib/gui/components/progress-button/directives/progress-button.js
similarity index 92%
rename from lib/browser/components/progress-button/directives/progress-button.js
rename to lib/gui/components/progress-button/directives/progress-button.js
index 1398ab41..2066cdbc 100644
--- a/lib/browser/components/progress-button/directives/progress-button.js
+++ b/lib/gui/components/progress-button/directives/progress-button.js
@@ -32,7 +32,7 @@
  */
 module.exports = function() {
   return {
-    templateUrl: './browser/components/progress-button/templates/progress-button.tpl.html',
+    templateUrl: './components/progress-button/templates/progress-button.tpl.html',
     restrict: 'E',
     replace: true,
     transclude: true,
diff --git a/lib/browser/components/progress-button/progress-button.js b/lib/gui/components/progress-button/progress-button.js
similarity index 100%
rename from lib/browser/components/progress-button/progress-button.js
rename to lib/gui/components/progress-button/progress-button.js
diff --git a/lib/browser/components/progress-button/styles/_progress-button.scss b/lib/gui/components/progress-button/styles/_progress-button.scss
similarity index 100%
rename from lib/browser/components/progress-button/styles/_progress-button.scss
rename to lib/gui/components/progress-button/styles/_progress-button.scss
diff --git a/lib/browser/components/progress-button/templates/progress-button.tpl.html b/lib/gui/components/progress-button/templates/progress-button.tpl.html
similarity index 100%
rename from lib/browser/components/progress-button/templates/progress-button.tpl.html
rename to lib/gui/components/progress-button/templates/progress-button.tpl.html
diff --git a/lib/browser/components/svg-icon/directives/svg-icon.js b/lib/gui/components/svg-icon/directives/svg-icon.js
similarity index 95%
rename from lib/browser/components/svg-icon/directives/svg-icon.js
rename to lib/gui/components/svg-icon/directives/svg-icon.js
index 2ec96d0c..3b44f314 100644
--- a/lib/browser/components/svg-icon/directives/svg-icon.js
+++ b/lib/gui/components/svg-icon/directives/svg-icon.js
@@ -34,7 +34,7 @@ const fs = require('fs');
  */
 module.exports = function() {
   return {
-    templateUrl: './browser/components/svg-icon/templates/svg-icon.tpl.html',
+    templateUrl: './components/svg-icon/templates/svg-icon.tpl.html',
     replace: true,
     restrict: 'E',
     scope: {
diff --git a/lib/browser/components/svg-icon/styles/_svg-icon.scss b/lib/gui/components/svg-icon/styles/_svg-icon.scss
similarity index 100%
rename from lib/browser/components/svg-icon/styles/_svg-icon.scss
rename to lib/gui/components/svg-icon/styles/_svg-icon.scss
diff --git a/lib/browser/components/svg-icon/svg-icon.js b/lib/gui/components/svg-icon/svg-icon.js
similarity index 100%
rename from lib/browser/components/svg-icon/svg-icon.js
rename to lib/gui/components/svg-icon/svg-icon.js
diff --git a/lib/browser/components/svg-icon/templates/svg-icon.tpl.html b/lib/gui/components/svg-icon/templates/svg-icon.tpl.html
similarity index 100%
rename from lib/browser/components/svg-icon/templates/svg-icon.tpl.html
rename to lib/gui/components/svg-icon/templates/svg-icon.tpl.html
diff --git a/lib/css/angular.css b/lib/gui/css/angular.css
similarity index 100%
rename from lib/css/angular.css
rename to lib/gui/css/angular.css
diff --git a/lib/css/desktop.css b/lib/gui/css/desktop.css
similarity index 100%
rename from lib/css/desktop.css
rename to lib/gui/css/desktop.css
diff --git a/lib/src/dialog.js b/lib/gui/dialog.js
similarity index 100%
rename from lib/src/dialog.js
rename to lib/gui/dialog.js
diff --git a/lib/etcher.js b/lib/gui/etcher.js
similarity index 92%
rename from lib/etcher.js
rename to lib/gui/etcher.js
index 7a012db1..94d37291 100644
--- a/lib/etcher.js
+++ b/lib/gui/etcher.js
@@ -19,8 +19,8 @@
 const electron = require('electron');
 const globalShortcut = require('global-shortcut');
 const path = require('path');
-const elevate = require('./elevate');
-const packageJSON = require('../package.json');
+const elevate = require('../src/elevate');
+const packageJSON = require('../../package.json');
 let mainWindow = null;
 
 electron.app.on('window-all-closed', electron.app.quit);
@@ -45,7 +45,7 @@ electron.app.on('ready', function() {
       resizable: false,
       fullscreen: false,
       titleBarStyle: 'hidden-inset',
-      icon: path.join(__dirname, '..', 'assets', 'icon.png')
+      icon: path.join(__dirname, '..', '..', 'assets', 'icon.png')
     });
 
     // Prevent flash of white when starting the application
diff --git a/lib/index.html b/lib/gui/index.html
similarity index 79%
rename from lib/index.html
rename to lib/gui/index.html
index c7538493..81714340 100644
--- a/lib/index.html
+++ b/lib/gui/index.html
@@ -2,8 +2,8 @@
 <html>
   <head>
     <title>Etcher</title>
-    <link rel="stylesheet" type="text/css" href="../node_modules/flexboxgrid/dist/flexboxgrid.css">
-    <link rel="stylesheet" type="text/css" href="../build/css/main.css">
+    <link rel="stylesheet" type="text/css" href="../../node_modules/flexboxgrid/dist/flexboxgrid.css">
+    <link rel="stylesheet" type="text/css" href="../../build/css/main.css">
     <link rel="stylesheet" type="text/css" href="css/desktop.css">
     <link rel="stylesheet" type="text/css" href="css/angular.css">
 
@@ -13,9 +13,9 @@
         application: 'etcher'
       };
     </script>
-    <script src="../node_modules/trackjs/tracker.js"></script>
+    <script src="../../node_modules/trackjs/tracker.js"></script>
 
-    <script src="./browser/app.js"></script>
+    <script src="./app.js"></script>
   </head>
   <body ng-app="Etcher" style="display: none">
     <header class="section-header">
@@ -35,7 +35,7 @@
     <main class="wrapper" ui-view></main>
 
     <footer class="section-footer">
-      <svg-icon path="../../../../../assets/images/etcher.svg"
+      <svg-icon path="../../../assets/etcher.svg"
         width="83px"
         height="13px"
         os-open-external="http://etcher.io"></svg-icon>
@@ -44,7 +44,7 @@
         IS <span class="caption" os-open-external="https://github.com/resin-io/etcher">AN OPEN SOURCE PROJECT</span> BY
       </span>
 
-      <svg-icon path="../../../../../assets/images/resin.svg"
+      <svg-icon path="../../../assets/resin.svg"
         width="79px"
         height="23px"
         os-open-external="https://resin.io"></svg-icon>
diff --git a/lib/browser/models/selection-state.js b/lib/gui/models/selection-state.js
similarity index 100%
rename from lib/browser/models/selection-state.js
rename to lib/gui/models/selection-state.js
diff --git a/lib/browser/models/settings.js b/lib/gui/models/settings.js
similarity index 100%
rename from lib/browser/models/settings.js
rename to lib/gui/models/settings.js
diff --git a/lib/browser/modules/analytics.js b/lib/gui/modules/analytics.js
similarity index 98%
rename from lib/browser/modules/analytics.js
rename to lib/gui/modules/analytics.js
index a2f08c51..7e2c52be 100644
--- a/lib/browser/modules/analytics.js
+++ b/lib/gui/modules/analytics.js
@@ -28,7 +28,7 @@ const packageJSON = require('../../../package.json');
 
 // Force Mixpanel snippet to load Mixpanel locally
 // instead of using a CDN for performance reasons
-window.MIXPANEL_CUSTOM_LIB_URL = '../bower_components/mixpanel/mixpanel.js';
+window.MIXPANEL_CUSTOM_LIB_URL = '../../bower_components/mixpanel/mixpanel.js';
 
 require('../../../bower_components/mixpanel/mixpanel-jslib-snippet.js');
 require('../../../bower_components/angular-mixpanel/src/angular-mixpanel');
diff --git a/lib/browser/modules/drive-scanner.js b/lib/gui/modules/drive-scanner.js
similarity index 100%
rename from lib/browser/modules/drive-scanner.js
rename to lib/gui/modules/drive-scanner.js
diff --git a/lib/browser/modules/image-writer.js b/lib/gui/modules/image-writer.js
similarity index 98%
rename from lib/browser/modules/image-writer.js
rename to lib/gui/modules/image-writer.js
index 324896e5..12674eed 100644
--- a/lib/browser/modules/image-writer.js
+++ b/lib/gui/modules/image-writer.js
@@ -26,7 +26,7 @@ const electron = require('electron');
 if (window.mocha) {
   var writer = electron.remote.require(require('path').join(__dirname, '..', '..', 'src', 'writer'));
 } else {
-  var writer = electron.remote.require('./src/writer');
+  var writer = electron.remote.require('../src/writer');
 }
 
 const MODULE_NAME = 'Etcher.image-writer';
diff --git a/lib/browser/os/dropzone/directives/dropzone.js b/lib/gui/os/dropzone/directives/dropzone.js
similarity index 100%
rename from lib/browser/os/dropzone/directives/dropzone.js
rename to lib/gui/os/dropzone/directives/dropzone.js
diff --git a/lib/browser/os/dropzone/dropzone.js b/lib/gui/os/dropzone/dropzone.js
similarity index 100%
rename from lib/browser/os/dropzone/dropzone.js
rename to lib/gui/os/dropzone/dropzone.js
diff --git a/lib/browser/os/notification/notification.js b/lib/gui/os/notification/notification.js
similarity index 100%
rename from lib/browser/os/notification/notification.js
rename to lib/gui/os/notification/notification.js
diff --git a/lib/browser/os/notification/services/notification.js b/lib/gui/os/notification/services/notification.js
similarity index 100%
rename from lib/browser/os/notification/services/notification.js
rename to lib/gui/os/notification/services/notification.js
diff --git a/lib/browser/os/open-external/directives/open-external.js b/lib/gui/os/open-external/directives/open-external.js
similarity index 100%
rename from lib/browser/os/open-external/directives/open-external.js
rename to lib/gui/os/open-external/directives/open-external.js
diff --git a/lib/browser/os/open-external/open-external.js b/lib/gui/os/open-external/open-external.js
similarity index 100%
rename from lib/browser/os/open-external/open-external.js
rename to lib/gui/os/open-external/open-external.js
diff --git a/lib/browser/os/window-progress/services/window-progress.js b/lib/gui/os/window-progress/services/window-progress.js
similarity index 100%
rename from lib/browser/os/window-progress/services/window-progress.js
rename to lib/gui/os/window-progress/services/window-progress.js
diff --git a/lib/browser/os/window-progress/window-progress.js b/lib/gui/os/window-progress/window-progress.js
similarity index 100%
rename from lib/browser/os/window-progress/window-progress.js
rename to lib/gui/os/window-progress/window-progress.js
diff --git a/lib/browser/pages/finish/controllers/finish.js b/lib/gui/pages/finish/controllers/finish.js
similarity index 100%
rename from lib/browser/pages/finish/controllers/finish.js
rename to lib/gui/pages/finish/controllers/finish.js
diff --git a/lib/browser/pages/finish/finish.js b/lib/gui/pages/finish/finish.js
similarity index 95%
rename from lib/browser/pages/finish/finish.js
rename to lib/gui/pages/finish/finish.js
index d03ffcc0..10bd8d8e 100644
--- a/lib/browser/pages/finish/finish.js
+++ b/lib/gui/pages/finish/finish.js
@@ -43,7 +43,7 @@ FinishPage.config(function($stateProvider) {
     .state('success', {
       url: '/success',
       controller: 'FinishController as finish',
-      templateUrl: './browser/pages/finish/templates/success.tpl.html'
+      templateUrl: './pages/finish/templates/success.tpl.html'
     });
 });
 
diff --git a/lib/browser/pages/finish/templates/success.tpl.html b/lib/gui/pages/finish/templates/success.tpl.html
similarity index 100%
rename from lib/browser/pages/finish/templates/success.tpl.html
rename to lib/gui/pages/finish/templates/success.tpl.html
diff --git a/lib/browser/pages/settings/controllers/settings.js b/lib/gui/pages/settings/controllers/settings.js
similarity index 100%
rename from lib/browser/pages/settings/controllers/settings.js
rename to lib/gui/pages/settings/controllers/settings.js
diff --git a/lib/browser/pages/settings/settings.js b/lib/gui/pages/settings/settings.js
similarity index 93%
rename from lib/browser/pages/settings/settings.js
rename to lib/gui/pages/settings/settings.js
index 6dfd8252..fd75a2cf 100644
--- a/lib/browser/pages/settings/settings.js
+++ b/lib/gui/pages/settings/settings.js
@@ -34,7 +34,7 @@ SettingsPage.config(function($stateProvider) {
     .state('settings', {
       url: '/settings',
       controller: 'SettingsController as settings',
-      templateUrl: './browser/pages/settings/templates/settings.tpl.html'
+      templateUrl: './pages/settings/templates/settings.tpl.html'
     });
 });
 
diff --git a/lib/browser/pages/settings/templates/settings.tpl.html b/lib/gui/pages/settings/templates/settings.tpl.html
similarity index 100%
rename from lib/browser/pages/settings/templates/settings.tpl.html
rename to lib/gui/pages/settings/templates/settings.tpl.html
diff --git a/lib/partials/main.html b/lib/gui/partials/main.html
similarity index 96%
rename from lib/partials/main.html
rename to lib/gui/partials/main.html
index 496fb845..7e0b77d4 100644
--- a/lib/partials/main.html
+++ b/lib/gui/partials/main.html
@@ -1,7 +1,7 @@
 <div class="row around-xs">
   <div class="col-xs">
     <div class="box text-center" os-dropzone="app.selectImage($file)">
-      <svg-icon class="center-block" path="../../../../../assets/images/image.svg"></svg-icon>
+      <svg-icon class="center-block" path="../../../assets/image.svg"></svg-icon>
       <span class="icon-caption">SELECT IMAGE</span>
       <span class="badge space-top-medium">1</span>
 
@@ -27,7 +27,7 @@
       <div class="step-border-right" ng-disabled="!app.selection.hasImage() || !app.selection.hasDrive()"></div>
 
       <svg-icon class="center-block"
-        path="../../../../../assets/images/drive.svg"
+        path="../../../assets/drive.svg"
         ng-disabled="!app.selection.hasImage()"></svg-icon>
       <span class="icon-caption"
         ng-disabled="!app.selection.hasImage()">SELECT DRIVE</span>
@@ -62,7 +62,7 @@
   <div class="col-xs">
     <div class="box text-center">
       <svg-icon class="center-block"
-        path="../../../../../assets/images/flash.svg"
+        path="../../../assets/flash.svg"
         ng-disabled="!app.selection.hasImage() || !app.selection.hasDrive()"></svg-icon>
       <span class="icon-caption"
         ng-disabled="!app.selection.hasImage() || !app.selection.hasDrive()">FLASH IMAGE</span>
diff --git a/lib/scss/components/_alert-ribbon.scss b/lib/gui/scss/components/_alert-ribbon.scss
similarity index 100%
rename from lib/scss/components/_alert-ribbon.scss
rename to lib/gui/scss/components/_alert-ribbon.scss
diff --git a/lib/scss/components/_badge.scss b/lib/gui/scss/components/_badge.scss
similarity index 100%
rename from lib/scss/components/_badge.scss
rename to lib/gui/scss/components/_badge.scss
diff --git a/lib/scss/components/_button.scss b/lib/gui/scss/components/_button.scss
similarity index 100%
rename from lib/scss/components/_button.scss
rename to lib/gui/scss/components/_button.scss
diff --git a/lib/scss/components/_caption.scss b/lib/gui/scss/components/_caption.scss
similarity index 100%
rename from lib/scss/components/_caption.scss
rename to lib/gui/scss/components/_caption.scss
diff --git a/lib/scss/components/_modal.scss b/lib/gui/scss/components/_modal.scss
similarity index 100%
rename from lib/scss/components/_modal.scss
rename to lib/gui/scss/components/_modal.scss
diff --git a/lib/scss/components/_tick.scss b/lib/gui/scss/components/_tick.scss
similarity index 100%
rename from lib/scss/components/_tick.scss
rename to lib/gui/scss/components/_tick.scss
diff --git a/lib/scss/main.scss b/lib/gui/scss/main.scss
similarity index 94%
rename from lib/scss/main.scss
rename to lib/gui/scss/main.scss
index 9f3075e0..297fdb37 100644
--- a/lib/scss/main.scss
+++ b/lib/gui/scss/main.scss
@@ -33,7 +33,7 @@ $alert-warning-bg: $brand-warning;
 $alert-warning-text: #fff;
 $alert-padding: 13px;
 
-@import "../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap";
+@import "../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap";
 
 @import "./modules/bootstrap";
 @import "./modules/space";
@@ -41,8 +41,8 @@ $alert-padding: 13px;
 @import "./components/caption";
 @import "./components/button";
 @import "./components/tick";
-@import "../browser/components/progress-button/styles/progress-button";
-@import "../browser/components/svg-icon/styles/svg-icon";
+@import "../components/progress-button/styles/progress-button";
+@import "../components/svg-icon/styles/svg-icon";
 @import "./components/modal";
 @import "./components/alert-ribbon";
 
diff --git a/lib/scss/modules/_bootstrap.scss b/lib/gui/scss/modules/_bootstrap.scss
similarity index 100%
rename from lib/scss/modules/_bootstrap.scss
rename to lib/gui/scss/modules/_bootstrap.scss
diff --git a/lib/scss/modules/_space.scss b/lib/gui/scss/modules/_space.scss
similarity index 100%
rename from lib/scss/modules/_space.scss
rename to lib/gui/scss/modules/_space.scss
diff --git a/lib/browser/utils/if-state/directives/hide-if-state.js b/lib/gui/utils/if-state/directives/hide-if-state.js
similarity index 100%
rename from lib/browser/utils/if-state/directives/hide-if-state.js
rename to lib/gui/utils/if-state/directives/hide-if-state.js
diff --git a/lib/browser/utils/if-state/directives/show-if-state.js b/lib/gui/utils/if-state/directives/show-if-state.js
similarity index 100%
rename from lib/browser/utils/if-state/directives/show-if-state.js
rename to lib/gui/utils/if-state/directives/show-if-state.js
diff --git a/lib/browser/utils/if-state/if-state.js b/lib/gui/utils/if-state/if-state.js
similarity index 100%
rename from lib/browser/utils/if-state/if-state.js
rename to lib/gui/utils/if-state/if-state.js
diff --git a/lib/browser/utils/manifest-bind/directives/manifest-bind.js b/lib/gui/utils/manifest-bind/directives/manifest-bind.js
similarity index 100%
rename from lib/browser/utils/manifest-bind/directives/manifest-bind.js
rename to lib/gui/utils/manifest-bind/directives/manifest-bind.js
diff --git a/lib/browser/utils/manifest-bind/manifest-bind.js b/lib/gui/utils/manifest-bind/manifest-bind.js
similarity index 100%
rename from lib/browser/utils/manifest-bind/manifest-bind.js
rename to lib/gui/utils/manifest-bind/manifest-bind.js
diff --git a/lib/browser/utils/notifier/notifier.js b/lib/gui/utils/notifier/notifier.js
similarity index 100%
rename from lib/browser/utils/notifier/notifier.js
rename to lib/gui/utils/notifier/notifier.js
diff --git a/lib/browser/utils/notifier/services/notifier.js b/lib/gui/utils/notifier/services/notifier.js
similarity index 100%
rename from lib/browser/utils/notifier/services/notifier.js
rename to lib/gui/utils/notifier/services/notifier.js
diff --git a/lib/browser/utils/path/filters/basename.js b/lib/gui/utils/path/filters/basename.js
similarity index 100%
rename from lib/browser/utils/path/filters/basename.js
rename to lib/gui/utils/path/filters/basename.js
diff --git a/lib/browser/utils/path/path.js b/lib/gui/utils/path/path.js
similarity index 100%
rename from lib/browser/utils/path/path.js
rename to lib/gui/utils/path/path.js
diff --git a/lib/elevate.js b/lib/src/elevate.js
similarity index 100%
rename from lib/elevate.js
rename to lib/src/elevate.js
diff --git a/package.json b/package.json
index 1ffc64a1..5555181e 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "etcher",
   "displayName": "Etcher",
   "version": "1.0.0-beta.4",
-  "main": "lib/etcher.js",
+  "main": "lib/gui/etcher.js",
   "description": "An image flasher with support for Windows, OS X and GNU/Linux.",
   "homepage": "https://github.com/resin-io/etcher",
   "repository": {
@@ -11,9 +11,9 @@
   },
   "scripts": {
     "test:main": "electron-mocha --recursive tests/src -R progress",
-    "test:browser": "electron-mocha --recursive --renderer tests/browser -R progress",
-    "test": "npm run-script test:main && npm run-script test:browser",
-    "start": "electron lib/etcher.js"
+    "test:gui": "electron-mocha --recursive --renderer tests/gui -R progress",
+    "test": "npm run-script test:main && npm run-script test:gui",
+    "start": "electron lib/gui/etcher.js"
   },
   "author": "Juan Cruz Viotti <juan@resin.io>",
   "license": "Apache-2.0",
diff --git a/tests/browser/components/drive-selector.spec.js b/tests/gui/components/drive-selector.spec.js
similarity index 98%
rename from tests/browser/components/drive-selector.spec.js
rename to tests/gui/components/drive-selector.spec.js
index ccb7d4db..41c6a703 100644
--- a/tests/browser/components/drive-selector.spec.js
+++ b/tests/gui/components/drive-selector.spec.js
@@ -7,7 +7,7 @@ require('angular-mocks');
 describe('Browser: DriveSelector', function() {
 
   beforeEach(angular.mock.module(
-    require('../../../lib/browser/components/drive-selector/drive-selector')
+    require('../../../lib/gui/components/drive-selector/drive-selector')
   ));
 
   describe('DriveSelectorStateService', function() {
diff --git a/tests/browser/components/svg-icon.spec.js b/tests/gui/components/svg-icon.spec.js
similarity index 81%
rename from tests/browser/components/svg-icon.spec.js
rename to tests/gui/components/svg-icon.spec.js
index 2b89131f..e39353c6 100644
--- a/tests/browser/components/svg-icon.spec.js
+++ b/tests/gui/components/svg-icon.spec.js
@@ -9,7 +9,7 @@ require('angular-mocks');
 describe('Browser: SVGIcon', function() {
 
   beforeEach(angular.mock.module(
-    require('../../../lib/browser/components/svg-icon/svg-icon')
+    require('../../../lib/gui/components/svg-icon/svg-icon')
   ));
 
   describe('svgIcon', function() {
@@ -23,8 +23,8 @@ describe('Browser: SVGIcon', function() {
 
       // Workaround `Unexpected request: GET template.html. No more request expected` error.
       // See http://stackoverflow.com/a/29437480/1641422
-      const templatePath = './browser/components/svg-icon/templates/svg-icon.tpl.html';
-      const template = fs.readFileSync(path.resolve('lib', templatePath), {
+      const templatePath = './components/svg-icon/templates/svg-icon.tpl.html';
+      const template = fs.readFileSync(path.resolve('lib', 'gui', templatePath), {
         encoding: 'utf8'
       });
       $templateCache.put(templatePath, template);
@@ -32,8 +32,8 @@ describe('Browser: SVGIcon', function() {
     }));
 
     it('should inline the svg contents in the element', function() {
-      const icon = '../../../../../assets/images/etcher.svg';
-      let iconContents = fs.readFileSync(path.join(__dirname, '../../../assets/images/etcher.svg'), {
+      const icon = '../../../../../lib/gui/assets/etcher.svg';
+      let iconContents = fs.readFileSync(path.join(__dirname, '../../../lib/gui/assets/etcher.svg'), {
         encoding: 'utf8'
       }).split('\n');
 
@@ -48,7 +48,7 @@ describe('Browser: SVGIcon', function() {
     });
 
     it('should default the size to 40x40 pixels', function() {
-      const icon = '../../../../../assets/images/etcher.svg';
+      const icon = '../../../../../lib/gui/assets/etcher.svg';
       const element = $compile(`<svg-icon path="${icon}">Resin.io</svg-icon>`)($rootScope);
       $rootScope.$digest();
       m.chai.expect(element.css('width')).to.equal('40px');
@@ -56,7 +56,7 @@ describe('Browser: SVGIcon', function() {
     });
 
     it('should be able to set a custom height', function() {
-      const icon = '../../../../../assets/images/etcher.svg';
+      const icon = '../../../../../lib/gui/assets/etcher.svg';
       const element = $compile(`<svg-icon path="${icon}" width="20px">Resin.io</svg-icon>`)($rootScope);
       $rootScope.$digest();
       m.chai.expect(element.css('width')).to.equal('20px');
@@ -64,7 +64,7 @@ describe('Browser: SVGIcon', function() {
     });
 
     it('should be able to set a custom height', function() {
-      const icon = '../../../../../assets/images/etcher.svg';
+      const icon = '../../../../../lib/gui/assets/etcher.svg';
       const element = $compile(`<svg-icon path="${icon}" height="20px">Resin.io</svg-icon>`)($rootScope);
       $rootScope.$digest();
       m.chai.expect(element.css('width')).to.equal('40px');
diff --git a/tests/browser/models/selection-state.spec.js b/tests/gui/models/selection-state.spec.js
similarity index 99%
rename from tests/browser/models/selection-state.spec.js
rename to tests/gui/models/selection-state.spec.js
index c449a3b2..15d4133d 100644
--- a/tests/browser/models/selection-state.spec.js
+++ b/tests/gui/models/selection-state.spec.js
@@ -7,7 +7,7 @@ require('angular-mocks');
 describe('Browser: SelectionState', function() {
 
   beforeEach(angular.mock.module(
-    require('../../../lib/browser/models/selection-state')
+    require('../../../lib/gui/models/selection-state')
   ));
 
   describe('SelectionStateModel', function() {
diff --git a/tests/browser/modules/drive-scanner.spec.js b/tests/gui/modules/drive-scanner.spec.js
similarity index 99%
rename from tests/browser/modules/drive-scanner.spec.js
rename to tests/gui/modules/drive-scanner.spec.js
index 5caa31ed..6b0756fa 100644
--- a/tests/browser/modules/drive-scanner.spec.js
+++ b/tests/gui/modules/drive-scanner.spec.js
@@ -8,7 +8,7 @@ require('angular-mocks');
 describe('Browser: DriveScanner', function() {
 
   beforeEach(angular.mock.module(
-    require('../../../lib/browser/modules/drive-scanner')
+    require('../../../lib/gui/modules/drive-scanner')
   ));
 
   describe('DriveScannerService', function() {
diff --git a/tests/browser/modules/image-writer.spec.js b/tests/gui/modules/image-writer.spec.js
similarity index 98%
rename from tests/browser/modules/image-writer.spec.js
rename to tests/gui/modules/image-writer.spec.js
index 365ab8a8..16d0de62 100644
--- a/tests/browser/modules/image-writer.spec.js
+++ b/tests/gui/modules/image-writer.spec.js
@@ -7,7 +7,7 @@ require('angular-mocks');
 describe('Browser: ImageWriter', function() {
 
   beforeEach(angular.mock.module(
-    require('../../../lib/browser/modules/image-writer')
+    require('../../../lib/gui/modules/image-writer')
   ));
 
   describe('ImageWriterService', function() {
diff --git a/tests/browser/os/dropzone.spec.js b/tests/gui/os/dropzone.spec.js
similarity index 97%
rename from tests/browser/os/dropzone.spec.js
rename to tests/gui/os/dropzone.spec.js
index f9d6c7e0..1b3658f6 100644
--- a/tests/browser/os/dropzone.spec.js
+++ b/tests/gui/os/dropzone.spec.js
@@ -23,7 +23,7 @@ require('angular-mocks');
 describe('Browser: OSDropzone', function() {
 
   beforeEach(angular.mock.module(
-    require('../../../lib/browser/os/dropzone/dropzone')
+    require('../../../lib/gui/os/dropzone/dropzone')
   ));
 
   describe('osDropzone', function() {
diff --git a/tests/browser/os/open-external.spec.js b/tests/gui/os/open-external.spec.js
similarity index 96%
rename from tests/browser/os/open-external.spec.js
rename to tests/gui/os/open-external.spec.js
index f7737d56..2cddf356 100644
--- a/tests/browser/os/open-external.spec.js
+++ b/tests/gui/os/open-external.spec.js
@@ -25,7 +25,7 @@ require('angular-mocks');
 describe('Browser: OSOpenExternal', function() {
 
   beforeEach(angular.mock.module(
-    require('../../../lib/browser/os/open-external/open-external')
+    require('../../../lib/gui/os/open-external/open-external')
   ));
 
   describe('osOpenExternal', function() {
diff --git a/tests/browser/os/window-progress.spec.js b/tests/gui/os/window-progress.spec.js
similarity index 97%
rename from tests/browser/os/window-progress.spec.js
rename to tests/gui/os/window-progress.spec.js
index 9f6e4281..c9945289 100644
--- a/tests/browser/os/window-progress.spec.js
+++ b/tests/gui/os/window-progress.spec.js
@@ -23,7 +23,7 @@ require('angular-mocks');
 describe('Browser: OSWindowProgress', function() {
 
   beforeEach(angular.mock.module(
-    require('../../../lib/browser/os/window-progress/window-progress')
+    require('../../../lib/gui/os/window-progress/window-progress')
   ));
 
   describe('OSWindowProgressService', function() {
diff --git a/tests/browser/utils/if-state.spec.js b/tests/gui/utils/if-state.spec.js
similarity index 98%
rename from tests/browser/utils/if-state.spec.js
rename to tests/gui/utils/if-state.spec.js
index c103d2e5..c032f03d 100644
--- a/tests/browser/utils/if-state.spec.js
+++ b/tests/gui/utils/if-state.spec.js
@@ -23,7 +23,7 @@ require('angular-mocks');
 describe('Browser: IfState', function() {
 
   beforeEach(angular.mock.module(
-    require('../../../lib/browser/utils/if-state/if-state')
+    require('../../../lib/gui/utils/if-state/if-state')
   ));
 
   let $compile;
diff --git a/tests/browser/utils/manifest-bind.spec.js b/tests/gui/utils/manifest-bind.spec.js
similarity index 96%
rename from tests/browser/utils/manifest-bind.spec.js
rename to tests/gui/utils/manifest-bind.spec.js
index 80eeeca3..550ea8ab 100644
--- a/tests/browser/utils/manifest-bind.spec.js
+++ b/tests/gui/utils/manifest-bind.spec.js
@@ -24,7 +24,7 @@ require('angular-mocks');
 describe('Browser: ManifestBind', function() {
 
   beforeEach(angular.mock.module(
-    require('../../../lib/browser/utils/manifest-bind/manifest-bind')
+    require('../../../lib/gui/utils/manifest-bind/manifest-bind')
   ));
 
   let $compile;
diff --git a/tests/browser/utils/notifier.spec.js b/tests/gui/utils/notifier.spec.js
similarity index 96%
rename from tests/browser/utils/notifier.spec.js
rename to tests/gui/utils/notifier.spec.js
index eeffad21..dcb37cf0 100644
--- a/tests/browser/utils/notifier.spec.js
+++ b/tests/gui/utils/notifier.spec.js
@@ -7,7 +7,7 @@ require('angular-mocks');
 describe('Browser: Notifier', function() {
 
   beforeEach(angular.mock.module(
-    require('../../../lib/browser/utils/notifier/notifier')
+    require('../../../lib/gui/utils/notifier/notifier')
   ));
 
   describe('NotifierService', function() {
diff --git a/tests/browser/utils/path.spec.js b/tests/gui/utils/path.spec.js
similarity index 93%
rename from tests/browser/utils/path.spec.js
rename to tests/gui/utils/path.spec.js
index 5b54e067..30af15af 100644
--- a/tests/browser/utils/path.spec.js
+++ b/tests/gui/utils/path.spec.js
@@ -8,7 +8,7 @@ require('angular-mocks');
 describe('Browser: Path', function() {
 
   beforeEach(angular.mock.module(
-    require('../../../lib/browser/utils/path/path')
+    require('../../../lib/gui/utils/path/path')
   ));
 
   describe('BasenameFilter', function() {
diff --git a/tests/src/dialog.spec.js b/tests/src/dialog.spec.js
index 4f577ece..adb847e3 100644
--- a/tests/src/dialog.spec.js
+++ b/tests/src/dialog.spec.js
@@ -2,7 +2,7 @@
 
 const m = require('mochainon');
 const electron = require('electron');
-const dialog = require('../../lib/src/dialog');
+const dialog = require('../../lib/gui/dialog');
 
 describe('Dialog:', function() {