diff --git a/hassio/addon-store/hassio-addon-repository.js b/hassio/addon-store/hassio-addon-repository.js
index 1485fa8800..d4a0afb687 100644
--- a/hassio/addon-store/hassio-addon-repository.js
+++ b/hassio/addon-store/hassio-addon-repository.js
@@ -4,9 +4,9 @@ import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
 import '../../src/components/hassio-card-content.js';
 import '../../src/resources/hassio-style.js';
-import '../../src/util/hass-mixins.js';
+import NavigateMixin from '../../src/mixins/navigate-mixin.js';
 
-class HassioAddonRepository extends window.hassMixins.NavigateMixin(PolymerElement) {
+class HassioAddonRepository extends NavigateMixin(PolymerElement) {
   static get template() {
     return html`
     <style include="iron-flex ha-style hassio-style">
diff --git a/hassio/addon-store/hassio-addon-store.js b/hassio/addon-store/hassio-addon-store.js
index 030b6e53e4..c3b52c77e0 100644
--- a/hassio/addon-store/hassio-addon-store.js
+++ b/hassio/addon-store/hassio-addon-store.js
@@ -1,7 +1,6 @@
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../../src/util/hass-mixins.js';
 import './hassio-addon-repository.js';
 import './hassio-repositories-editor.js';
 
diff --git a/hassio/addon-view/hassio-addon-audio.js b/hassio/addon-view/hassio-addon-audio.js
index d35fdc7125..283ee44fb2 100644
--- a/hassio/addon-view/hassio-addon-audio.js
+++ b/hassio/addon-view/hassio-addon-audio.js
@@ -9,9 +9,9 @@ import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
 import '../../src/resources/ha-style.js';
-import '../../src/util/hass-mixins.js';
+import EventsMixin from '../../src/mixins/events-mixin.js';
 
-class HassioAddonAudio extends window.hassMixins.EventsMixin(PolymerElement) {
+class HassioAddonAudio extends EventsMixin(PolymerElement) {
   static get template() {
     return html`
     <style include="ha-style">
diff --git a/hassio/addon-view/hassio-addon-info.js b/hassio/addon-view/hassio-addon-info.js
index ce29687330..b8734c04f5 100644
--- a/hassio/addon-view/hassio-addon-info.js
+++ b/hassio/addon-view/hassio-addon-info.js
@@ -9,9 +9,9 @@ import '../../src/components/buttons/ha-call-api-button.js';
 import '../../src/components/ha-markdown.js';
 import '../../src/components/hassio-card-content.js';
 import '../../src/resources/ha-style.js';
-import '../../src/util/hass-mixins.js';
+import EventsMixin from '../../src/mixins/events-mixin.js';
 
-class HassioAddonInfo extends window.hassMixins.EventsMixin(PolymerElement) {
+class HassioAddonInfo extends EventsMixin(PolymerElement) {
   static get template() {
     return html`
     <style include="ha-style">
diff --git a/hassio/addon-view/hassio-addon-network.js b/hassio/addon-view/hassio-addon-network.js
index f7ef624929..7655b6e268 100644
--- a/hassio/addon-view/hassio-addon-network.js
+++ b/hassio/addon-view/hassio-addon-network.js
@@ -5,9 +5,9 @@ import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
 import '../../src/components/buttons/ha-call-api-button.js';
 import '../../src/resources/ha-style.js';
-import '../../src/util/hass-mixins.js';
+import EventsMixin from '../../src/mixins/events-mixin.js';
 
-class HassioAddonNetwork extends window.hassMixins.EventsMixin(PolymerElement) {
+class HassioAddonNetwork extends EventsMixin(PolymerElement) {
   static get template() {
     return html`
     <style include="ha-style">
diff --git a/hassio/dashboard/hassio-addons.js b/hassio/dashboard/hassio-addons.js
index 617955e753..8ccc3591e6 100644
--- a/hassio/dashboard/hassio-addons.js
+++ b/hassio/dashboard/hassio-addons.js
@@ -4,9 +4,9 @@ import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
 import '../../src/components/hassio-card-content.js';
 import '../../src/resources/hassio-style.js';
-import '../../src/util/hass-mixins.js';
+import NavigateMixin from '../../src/mixins/navigate-mixin.js';
 
-class HassioAddons extends window.hassMixins.NavigateMixin(PolymerElement) {
+class HassioAddons extends NavigateMixin(PolymerElement) {
   static get template() {
     return html`
     <style include="ha-style hassio-style">
diff --git a/hassio/dashboard/hassio-dashboard.js b/hassio/dashboard/hassio-dashboard.js
index 3de9fcccd5..67bebbf3e6 100644
--- a/hassio/dashboard/hassio-dashboard.js
+++ b/hassio/dashboard/hassio-dashboard.js
@@ -3,8 +3,9 @@ import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
 import './hassio-addons.js';
 import './hassio-hass-update.js';
+import EventsMixin from '../../src/mixins/events-mixin.js';
 
-class HassioDashboard extends window.hassMixins.EventsMixin(PolymerElement) {
+class HassioDashboard extends EventsMixin(PolymerElement) {
   static get template() {
     return html`
     <style include="iron-flex ha-style">
diff --git a/hassio/hassio-main.js b/hassio/hassio-main.js
index 6fb2b79c79..c7b65418a2 100644
--- a/hassio/hassio-main.js
+++ b/hassio/hassio-main.js
@@ -7,9 +7,10 @@ import './addon-view/hassio-addon-view.js';
 import './hassio-data.js';
 import './hassio-pages-with-tabs.js';
 
-import applyThemesOnElement from '../js/common/dom/apply_themes_on_element.js';
+import applyThemesOnElement from '../src/common/dom/apply_themes_on_element.js';
+import EventsMixin from '../src/mixins/events-mixin.js';
 
-class HassioMain extends window.hassMixins.EventsMixin(PolymerElement) {
+class HassioMain extends EventsMixin(PolymerElement) {
   static get template() {
     return html`
     <app-route route="[[route]]" pattern="/:page" data="{{routeData}}"></app-route>
diff --git a/hassio/hassio-pages-with-tabs.js b/hassio/hassio-pages-with-tabs.js
index c46c8cf6d1..30ac4d2a70 100644
--- a/hassio/hassio-pages-with-tabs.js
+++ b/hassio/hassio-pages-with-tabs.js
@@ -9,15 +9,15 @@ import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
 import '../src/components/ha-menu-button.js';
 import '../src/resources/ha-style.js';
-import '../src/util/hass-mixins.js';
 import './addon-store/hassio-addon-store.js';
 import './dashboard/hassio-dashboard.js';
 import './hassio-markdown-dialog.js';
 import './snapshots/hassio-snapshot.js';
 import './snapshots/hassio-snapshots.js';
 import './system/hassio-system.js';
+import NavigateMixin from '../src/mixins/navigate-mixin.js';
 
-class HassioPagesWithTabs extends window.hassMixins.NavigateMixin(PolymerElement) {
+class HassioPagesWithTabs extends NavigateMixin(PolymerElement) {
   static get template() {
     return html`
     <style include="iron-flex iron-positioning ha-style">
diff --git a/hassio/snapshots/hassio-snapshots.js b/hassio/snapshots/hassio-snapshots.js
index 10be564af8..831fd472b3 100644
--- a/hassio/snapshots/hassio-snapshots.js
+++ b/hassio/snapshots/hassio-snapshots.js
@@ -9,9 +9,9 @@ import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
 import '../../src/components/hassio-card-content.js';
 import '../../src/resources/hassio-style.js';
-import '../../src/util/hass-mixins.js';
+import EventsMixin from '../../src/mixins/events-mixin.js';
 
-class HassioSnapshots extends window.hassMixins.EventsMixin(PolymerElement) {
+class HassioSnapshots extends EventsMixin(PolymerElement) {
   static get template() {
     return html`
     <style include="ha-style hassio-style">
diff --git a/hassio/system/hassio-host-info.js b/hassio/system/hassio-host-info.js
index c1bd5100f3..0e8380a2fa 100644
--- a/hassio/system/hassio-host-info.js
+++ b/hassio/system/hassio-host-info.js
@@ -4,9 +4,9 @@ import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
 import '../../src/components/buttons/ha-call-api-button.js';
-import '../../src/util/hass-mixins.js';
+import EventsMixin from '../../src/mixins/events-mixin.js';
 
-class HassioHostInfo extends window.hassMixins.EventsMixin(PolymerElement) {
+class HassioHostInfo extends EventsMixin(PolymerElement) {
   static get template() {
     return html`
     <style include="iron-flex ha-style">
diff --git a/hassio/system/hassio-supervisor-info.js b/hassio/system/hassio-supervisor-info.js
index 98440e8ec7..79fe2f94c8 100644
--- a/hassio/system/hassio-supervisor-info.js
+++ b/hassio/system/hassio-supervisor-info.js
@@ -4,9 +4,9 @@ import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
 import '../../src/components/buttons/ha-call-api-button.js';
-import '../../src/util/hass-mixins.js';
+import EventsMixin from '../../src/mixins/events-mixin.js';
 
-class HassioSupervisorInfo extends window.hassMixins.EventsMixin(PolymerElement) {
+class HassioSupervisorInfo extends EventsMixin(PolymerElement) {
   static get template() {
     return html`
     <style include="iron-flex ha-style">
diff --git a/js/util.js b/js/util.js
deleted file mode 100644
index 70996c0f55..0000000000
--- a/js/util.js
+++ /dev/null
@@ -1,97 +0,0 @@
-/**
- * Export hass util functions to window.
- *
- * This file is a workaround for the fact that Polymer 2 doesn't work well with
- * ES6 JS imports. Once we move to Polymer 3, we should be able to simply
- * import these functions where we need them.
- */
-import fecha from 'fecha';
-
-// const
-import {
-  DEFAULT_DOMAIN_ICON,
-  DOMAINS_MORE_INFO_NO_HISTORY,
-  STATES_OFF,
-} from './common/const.js';
-
-// config
-import computeLocationName from './common/config/location_name';
-import isComponentLoaded from './common/config/is_component_loaded.js';
-
-// dom
-import applyThemesOnElement from './common/dom/apply_themes_on_element.js';
-import dynamicContentUpdater from './common/dom/dynamic_content_updater.js';
-
-// datetime
-import durationToSeconds from './common/datetime/duration_to_seconds.js';
-import formatDate from './common/datetime/format_date.js';
-import formatDateTime from './common/datetime/format_date_time.js';
-import formatTime from './common/datetime/format_time.js';
-import relativeTime from './common/datetime/relative_time.js';
-import secondsToDuration from './common/datetime/seconds_to_duration.js';
-
-// entity
-import attributeClassNames from './common/entity/attribute_class_names.js';
-import binarySensorIcon from './common/entity/binary_sensor_icon.js';
-import canToggleDomain from './common/entity/can_toggle_domain.js';
-import canToggleState from './common/entity/can_toggle_state.js';
-import computeDomain from './common/entity/compute_state_domain.js';
-import computeObjectId from './common/entity/compute_object_id.js';
-import computeStateDisplay from './common/entity/compute_state_display.js';
-import computeStateName from './common/entity/compute_state_name.js';
-import coverIcon from './common/entity/cover_icon.js';
-import domainIcon from './common/entity/domain_icon.js';
-import featureClassNames from './common/entity/feature_class_names.js';
-import sensorIcon from './common/entity/sensor_icon.js';
-import sortByName from './common/entity/states_sort_by_name.js';
-import stateCardType from './common/entity/state_card_type.js';
-import stateIcon from './common/entity/state_icon.js';
-import stateMoreInfoType from './common/entity/state_more_info_type.js';
-import timerTimeRemaining from './common/entity/timer_time_remaining.js';
-
-const language = navigator.languages ?
-  navigator.languages[0] : navigator.language || navigator.userLanguage;
-
-fecha.masks.haDateTime = `${fecha.masks.shortTime} ${fecha.masks.mediumDate}`;
-
-window.hassUtil = {
-  // const
-  DEFAULT_ICON: DEFAULT_DOMAIN_ICON,
-  OFF_STATES: STATES_OFF,
-  DOMAINS_WITH_NO_HISTORY: DOMAINS_MORE_INFO_NO_HISTORY,
-
-  // config
-  computeLocationName,
-  isComponentLoaded,
-
-  // datetime
-  durationToSeconds,
-  formatDate: dateObj => formatDate(dateObj, language),
-  formatDateTime: dateObj => formatDateTime(dateObj, language),
-  formatTime: dateObj => formatTime(dateObj, language),
-  relativeTime,
-
-  // dom
-  applyThemesOnElement,
-  dynamicContentUpdater,
-
-  // entity
-  attributeClassNames,
-  binarySensorIcon,
-  canToggleDomain,
-  canToggleState,
-  computeDomain,
-  computeObjectId,
-  computeStateDisplay,
-  computeStateName,
-  coverIcon,
-  domainIcon,
-  featureClassNames,
-  secondsToDuration,
-  sensorIcon,
-  sortByName,
-  stateCardType,
-  stateIcon,
-  stateMoreInfoType,
-  timerTimeRemaining,
-};
diff --git a/package.json b/package.json
index 20aa192cc3..1867a0081d 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
     "clean": "rm -rf build/* build-temp/* build-es5/* build-temp-es5/* build-translations/*",
     "build": "script/build_frontend",
     "dev": "npm run gulp ru_all gen-service-worker",
-    "lint_js": "eslint src panels js hassio test-mocha",
+    "lint_js": "eslint src hassio test-mocha",
     "lint_html": "polymer lint",
     "mocha": "node_modules/.bin/mocha --opts test-mocha/mocha.opts",
     "test": "npm run lint_js && npm run lint_html && npm run mocha"
diff --git a/polymer.json b/polymer.json
index e11288bfaf..4a329fe02a 100644
--- a/polymer.json
+++ b/polymer.json
@@ -2,33 +2,33 @@
   "entrypoint": "index.html",
   "shell": "src/home-assistant.js",
   "fragments": [
-    "panels/config/ha-panel-config.js",
-    "panels/dev-event/ha-panel-dev-event.js",
-    "panels/dev-info/ha-panel-dev-info.js",
-    "panels/dev-mqtt/ha-panel-dev-mqtt.js",
-    "panels/dev-service/ha-panel-dev-service.js",
-    "panels/dev-state/ha-panel-dev-state.js",
-    "panels/dev-template/ha-panel-dev-template.js",
-    "panels/hassio/ha-panel-hassio.js",
-    "panels/history/ha-panel-history.js",
-    "panels/iframe/ha-panel-iframe.js",
-    "panels/kiosk/ha-panel-kiosk.js",
-    "panels/logbook/ha-panel-logbook.js",
-    "panels/map/ha-panel-map.js",
-    "panels/shopping-list/ha-panel-shopping-list.js",
-    "panels/mailbox/ha-panel-mailbox.js"
+    "src/panels/config/ha-panel-config.js",
+    "src/panels/dev-event/ha-panel-dev-event.js",
+    "src/panels/dev-info/ha-panel-dev-info.js",
+    "src/panels/dev-mqtt/ha-panel-dev-mqtt.js",
+    "src/panels/dev-service/ha-panel-dev-service.js",
+    "src/panels/dev-state/ha-panel-dev-state.js",
+    "src/panels/dev-template/ha-panel-dev-template.js",
+    "src/panels/hassio/ha-panel-hassio.js",
+    "src/panels/history/ha-panel-history.js",
+    "src/panels/iframe/ha-panel-iframe.js",
+    "src/panels/kiosk/ha-panel-kiosk.js",
+    "src/panels/logbook/ha-panel-logbook.js",
+    "src/panels/map/ha-panel-map.js",
+    "src/panels/shopping-list/ha-panel-shopping-list.js",
+    "src/panels/mailbox/ha-panel-mailbox.js"
   ],
   "sources": [
     "src/**/*",
-    "panels/**/*",
     "!src/translations/*"
   ],
   "lint": {
     "rules": ["polymer-3"],
+    "ignoreWarnings": ["could-not-resolve-reference"],
     "filesToIgnore": [
       "**/*.html",
+      "**/src/panels/config/js/**/*.js",
       "**/ha-paper-slider.js",
-      "**/hass-mixins.js",
       "**/ha-iconset-svg.js",
       "**/ha-script-editor.js",
       "**/ha-automation-editor.js"
diff --git a/src/auth/ha-auth-flow.js b/src/auth/ha-auth-flow.js
index 814db1ceb4..70d3652700 100644
--- a/src/auth/ha-auth-flow.js
+++ b/src/auth/ha-auth-flow.js
@@ -2,12 +2,12 @@ import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 import '@polymer/paper-button/paper-button.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import '../components/ha-form.js';
-import '../util/hass-mixins.js';
+import EventsMixin from '../mixins/events-mixin.js';
 
 /*
- * @appliesMixin window.hassMixins.EventsMixin
+ * @appliesMixin EventsMixin
  */
-class HaAuthFlow extends window.hassMixins.EventsMixin(PolymerElement) {
+class HaAuthFlow extends EventsMixin(PolymerElement) {
   static get template() {
     return html`
     <template is="dom-if" if="[[_equals(_state, &quot;loading&quot;)]]">
diff --git a/src/auth/ha-pick-auth-provider.js b/src/auth/ha-pick-auth-provider.js
index 44c56246ab..7be58e73c8 100644
--- a/src/auth/ha-pick-auth-provider.js
+++ b/src/auth/ha-pick-auth-provider.js
@@ -2,12 +2,12 @@ import '@polymer/paper-item/paper-item.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../util/hass-mixins.js';
+import EventsMixin from '../mixins/events-mixin.js';
 
 /*
- * @appliesMixin window.hassMixins.EventsMixin
+ * @appliesMixin EventsMixin
  */
-class HaPickAuthProvider extends window.hassMixins.EventsMixin(PolymerElement) {
+class HaPickAuthProvider extends EventsMixin(PolymerElement) {
   static get template() {
     return html`
     <style>
diff --git a/src/cards/ha-camera-card.js b/src/cards/ha-camera-card.js
index 8ac6be5206..0b943199a9 100644
--- a/src/cards/ha-camera-card.js
+++ b/src/cards/ha-camera-card.js
@@ -2,18 +2,18 @@ import '@polymer/paper-styles/element-styles/paper-material-styles.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../util/hass-mixins.js';
 
-import computeStateName from '../../js/common/entity/compute_state_name.js';
+import computeStateName from '../common/entity/compute_state_name.js';
+import EventsMixin from '../mixins/events-mixin.js';
+import LocalizeMixin from '../mixins/localize-mixin.js';
 
 {
   const UPDATE_INTERVAL = 10000; // ms
   /*
-   * @appliesMixin window.hassMixins.LocalizeMixin
-   * @appliesMixin window.hassMixins.EventsMixin
+   * @appliesMixin LocalizeMixin
+   * @appliesMixin EventsMixin
    */
-  class HaCameraCard extends
-    window.hassMixins.LocalizeMixin(window.hassMixins.EventsMixin(PolymerElement)) {
+  class HaCameraCard extends LocalizeMixin(EventsMixin(PolymerElement)) {
     static get template() {
       return html`
     <style include="paper-material-styles">
diff --git a/src/cards/ha-card-chooser.js b/src/cards/ha-card-chooser.js
index d3396458e1..48c3f156fe 100644
--- a/src/cards/ha-card-chooser.js
+++ b/src/cards/ha-card-chooser.js
@@ -8,7 +8,7 @@ import './ha-persistent_notification-card.js';
 import './ha-plant-card.js';
 import './ha-weather-card.js';
 
-import dynamicContentUpdater from '../../js/common/dom/dynamic_content_updater.js';
+import dynamicContentUpdater from '../common/dom/dynamic_content_updater.js';
 
 class HaCardChooser extends PolymerElement {
   static get properties() {
diff --git a/src/cards/ha-entities-card.js b/src/cards/ha-entities-card.js
index 0729cebe4e..e3e4385084 100644
--- a/src/cards/ha-entities-card.js
+++ b/src/cards/ha-entities-card.js
@@ -5,15 +5,16 @@ import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 import '../components/entity/ha-entity-toggle.js';
 import '../components/ha-card.js';
 import '../state-summary/state-card-content.js';
-import '../util/hass-mixins.js';
 
-import computeStateDomain from '../../js/common/entity/compute_state_domain.js';
-import computeStateName from '../../js/common/entity/compute_state_name.js';
-import stateMoreInfoType from '../../js/common/entity/state_more_info_type.js';
-import canToggleState from '../../js/common/entity/can_toggle_state.js';
 
-class HaEntitiesCard extends
-  window.hassMixins.LocalizeMixin(window.hassMixins.EventsMixin(PolymerElement)) {
+import computeStateDomain from '../common/entity/compute_state_domain.js';
+import computeStateName from '../common/entity/compute_state_name.js';
+import stateMoreInfoType from '../common/entity/state_more_info_type.js';
+import canToggleState from '../common/entity/can_toggle_state.js';
+import EventsMixin from '../mixins/events-mixin.js';
+import LocalizeMixin from '../mixins/localize-mixin.js';
+
+class HaEntitiesCard extends LocalizeMixin(EventsMixin(PolymerElement)) {
   static get template() {
     return html`
     <style is="custom-style" include="iron-flex"></style>
diff --git a/src/cards/ha-history_graph-card.js b/src/cards/ha-history_graph-card.js
index be7c0021eb..e018706e28 100644
--- a/src/cards/ha-history_graph-card.js
+++ b/src/cards/ha-history_graph-card.js
@@ -4,11 +4,15 @@ import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
 import '../components/state-history-charts.js';
 import '../data/ha-state-history-data.js';
-import '../util/hass-mixins.js';
 
-import computeStateName from '../../js/common/entity/compute_state_name.js';
 
-class HaHistoryGraphCard extends window.hassMixins.EventsMixin(PolymerElement) {
+import computeStateName from '../common/entity/compute_state_name.js';
+import EventsMixin from '../mixins/events-mixin.js';
+
+/*
+ * @appliesMixin EventsMixin
+ */
+class HaHistoryGraphCard extends EventsMixin(PolymerElement) {
   static get template() {
     return html`
     <style>
diff --git a/src/cards/ha-media_player-card.js b/src/cards/ha-media_player-card.js
index 0aa79eef99..07aca9626c 100644
--- a/src/cards/ha-media_player-card.js
+++ b/src/cards/ha-media_player-card.js
@@ -6,16 +6,16 @@ import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
 import '../util/hass-media-player-model.js';
-import '../util/hass-mixins.js';
 
-import computeStateName from '../../js/common/entity/compute_state_name.js';
+import computeStateName from '../common/entity/compute_state_name.js';
+import EventsMixin from '../mixins/events-mixin.js';
+import LocalizeMixin from '../mixins/localize-mixin.js';
 
 /*
- * @appliesMixin window.hassMixins.LocalizeMixin
- * @appliesMixin window.hassMixins.EventsMixin
+ * @appliesMixin LocalizeMixin
+ * @appliesMixin EventsMixin
  */
-class HaMediaPlayerCard extends
-  window.hassMixins.LocalizeMixin(window.hassMixins.EventsMixin(PolymerElement)) {
+class HaMediaPlayerCard extends LocalizeMixin(EventsMixin(PolymerElement)) {
   static get template() {
     return html`
     <style include="paper-material-styles iron-flex iron-flex-alignment iron-positioning">
diff --git a/src/cards/ha-persistent_notification-card.js b/src/cards/ha-persistent_notification-card.js
index 551d0ee772..d80195ba08 100644
--- a/src/cards/ha-persistent_notification-card.js
+++ b/src/cards/ha-persistent_notification-card.js
@@ -4,14 +4,15 @@ import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
 import '../components/ha-card.js';
 import '../components/ha-markdown.js';
-import '../util/hass-mixins.js';
 
-import computeStateName from '../../js/common/entity/compute_state_name.js';
+
+import computeStateName from '../common/entity/compute_state_name.js';
+import LocalizeMixin from '../mixins/localize-mixin.js';
 
 /*
- * @appliesMixin window.hassMixins.LocalizeMixin
+ * @appliesMixin LocalizeMixin
  */
-class HaPersistentNotificationCard extends window.hassMixins.LocalizeMixin(PolymerElement) {
+class HaPersistentNotificationCard extends LocalizeMixin(PolymerElement) {
   static get template() {
     return html`
     <style>
diff --git a/src/cards/ha-plant-card.js b/src/cards/ha-plant-card.js
index 567e4c885a..20aa0b87ea 100644
--- a/src/cards/ha-plant-card.js
+++ b/src/cards/ha-plant-card.js
@@ -3,11 +3,11 @@ import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
 import '../components/ha-card.js';
-import '../util/hass-mixins.js';
 
-import computeStateName from '../../js/common/entity/compute_state_name.js';
+import computeStateName from '../common/entity/compute_state_name.js';
+import EventsMixin from '../mixins/events-mixin.js';
 
-class HaPlantCard extends window.hassMixins.EventsMixin(PolymerElement) {
+class HaPlantCard extends EventsMixin(PolymerElement) {
   static get template() {
     return html`
     <style>
diff --git a/src/cards/ha-weather-card.js b/src/cards/ha-weather-card.js
index b5e07a1916..aae795b3c5 100644
--- a/src/cards/ha-weather-card.js
+++ b/src/cards/ha-weather-card.js
@@ -3,13 +3,15 @@ import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
 import '../components/ha-card.js';
-import '../util/hass-mixins.js';
+
+import EventsMixin from '../mixins/events-mixin.js';
+import LocalizeMixin from '../mixins/localize-mixin.js';
 
 /*
- * @appliesMixin window.hassMixins.LocalizeMixin
+ * @appliesMixin LocalizeMixin
  */
 class HaWeatherCard extends
-  window.hassMixins.LocalizeMixin(window.hassMixins.EventsMixin(PolymerElement)) {
+  LocalizeMixin(EventsMixin(PolymerElement)) {
   static get template() {
     return html`
     <style>
diff --git a/js/common/auth/fetch_token.js b/src/common/auth/fetch_token.js
similarity index 100%
rename from js/common/auth/fetch_token.js
rename to src/common/auth/fetch_token.js
diff --git a/js/common/auth/refresh_token.js b/src/common/auth/refresh_token.js
similarity index 100%
rename from js/common/auth/refresh_token.js
rename to src/common/auth/refresh_token.js
diff --git a/js/common/config/is_component_loaded.js b/src/common/config/is_component_loaded.js
similarity index 100%
rename from js/common/config/is_component_loaded.js
rename to src/common/config/is_component_loaded.js
diff --git a/js/common/config/location_name.js b/src/common/config/location_name.js
similarity index 100%
rename from js/common/config/location_name.js
rename to src/common/config/location_name.js
diff --git a/js/common/const.js b/src/common/const.js
similarity index 100%
rename from js/common/const.js
rename to src/common/const.js
diff --git a/js/common/datetime/duration_to_seconds.js b/src/common/datetime/duration_to_seconds.js
similarity index 100%
rename from js/common/datetime/duration_to_seconds.js
rename to src/common/datetime/duration_to_seconds.js
diff --git a/js/common/datetime/format_date.js b/src/common/datetime/format_date.js
similarity index 100%
rename from js/common/datetime/format_date.js
rename to src/common/datetime/format_date.js
diff --git a/js/common/datetime/format_date_time.js b/src/common/datetime/format_date_time.js
similarity index 100%
rename from js/common/datetime/format_date_time.js
rename to src/common/datetime/format_date_time.js
diff --git a/js/common/datetime/format_time.js b/src/common/datetime/format_time.js
similarity index 100%
rename from js/common/datetime/format_time.js
rename to src/common/datetime/format_time.js
diff --git a/js/common/datetime/relative_time.js b/src/common/datetime/relative_time.js
similarity index 100%
rename from js/common/datetime/relative_time.js
rename to src/common/datetime/relative_time.js
diff --git a/js/common/datetime/seconds_to_duration.js b/src/common/datetime/seconds_to_duration.js
similarity index 100%
rename from js/common/datetime/seconds_to_duration.js
rename to src/common/datetime/seconds_to_duration.js
diff --git a/js/common/dom/apply_themes_on_element.js b/src/common/dom/apply_themes_on_element.js
similarity index 100%
rename from js/common/dom/apply_themes_on_element.js
rename to src/common/dom/apply_themes_on_element.js
diff --git a/js/common/dom/dynamic_content_updater.js b/src/common/dom/dynamic_content_updater.js
similarity index 100%
rename from js/common/dom/dynamic_content_updater.js
rename to src/common/dom/dynamic_content_updater.js
diff --git a/js/common/entity/attribute_class_names.js b/src/common/entity/attribute_class_names.js
similarity index 100%
rename from js/common/entity/attribute_class_names.js
rename to src/common/entity/attribute_class_names.js
diff --git a/js/common/entity/binary_sensor_icon.js b/src/common/entity/binary_sensor_icon.js
similarity index 100%
rename from js/common/entity/binary_sensor_icon.js
rename to src/common/entity/binary_sensor_icon.js
diff --git a/js/common/entity/can_toggle_domain.js b/src/common/entity/can_toggle_domain.js
similarity index 100%
rename from js/common/entity/can_toggle_domain.js
rename to src/common/entity/can_toggle_domain.js
diff --git a/js/common/entity/can_toggle_state.js b/src/common/entity/can_toggle_state.js
similarity index 100%
rename from js/common/entity/can_toggle_state.js
rename to src/common/entity/can_toggle_state.js
diff --git a/js/common/entity/compute_domain.js b/src/common/entity/compute_domain.js
similarity index 100%
rename from js/common/entity/compute_domain.js
rename to src/common/entity/compute_domain.js
diff --git a/js/common/entity/compute_object_id.js b/src/common/entity/compute_object_id.js
similarity index 100%
rename from js/common/entity/compute_object_id.js
rename to src/common/entity/compute_object_id.js
diff --git a/js/common/entity/compute_state_display.js b/src/common/entity/compute_state_display.js
similarity index 100%
rename from js/common/entity/compute_state_display.js
rename to src/common/entity/compute_state_display.js
diff --git a/js/common/entity/compute_state_domain.js b/src/common/entity/compute_state_domain.js
similarity index 100%
rename from js/common/entity/compute_state_domain.js
rename to src/common/entity/compute_state_domain.js
diff --git a/js/common/entity/compute_state_name.js b/src/common/entity/compute_state_name.js
similarity index 100%
rename from js/common/entity/compute_state_name.js
rename to src/common/entity/compute_state_name.js
diff --git a/js/common/entity/cover_icon.js b/src/common/entity/cover_icon.js
similarity index 100%
rename from js/common/entity/cover_icon.js
rename to src/common/entity/cover_icon.js
diff --git a/js/common/entity/domain_icon.js b/src/common/entity/domain_icon.js
similarity index 100%
rename from js/common/entity/domain_icon.js
rename to src/common/entity/domain_icon.js
diff --git a/js/common/entity/feature_class_names.js b/src/common/entity/feature_class_names.js
similarity index 100%
rename from js/common/entity/feature_class_names.js
rename to src/common/entity/feature_class_names.js
diff --git a/js/common/entity/has_location.js b/src/common/entity/has_location.js
similarity index 100%
rename from js/common/entity/has_location.js
rename to src/common/entity/has_location.js
diff --git a/js/common/entity/input_dateteime_icon.js b/src/common/entity/input_dateteime_icon.js
similarity index 100%
rename from js/common/entity/input_dateteime_icon.js
rename to src/common/entity/input_dateteime_icon.js
diff --git a/js/common/entity/sensor_icon.js b/src/common/entity/sensor_icon.js
similarity index 100%
rename from js/common/entity/sensor_icon.js
rename to src/common/entity/sensor_icon.js
diff --git a/js/common/entity/state_card_type.js b/src/common/entity/state_card_type.js
similarity index 100%
rename from js/common/entity/state_card_type.js
rename to src/common/entity/state_card_type.js
diff --git a/js/common/entity/state_icon.js b/src/common/entity/state_icon.js
similarity index 100%
rename from js/common/entity/state_icon.js
rename to src/common/entity/state_icon.js
diff --git a/js/common/entity/state_more_info_type.js b/src/common/entity/state_more_info_type.js
similarity index 100%
rename from js/common/entity/state_more_info_type.js
rename to src/common/entity/state_more_info_type.js
diff --git a/js/common/entity/states_sort_by_name.js b/src/common/entity/states_sort_by_name.js
similarity index 100%
rename from js/common/entity/states_sort_by_name.js
rename to src/common/entity/states_sort_by_name.js
diff --git a/js/common/entity/timer_time_remaining.js b/src/common/entity/timer_time_remaining.js
similarity index 100%
rename from js/common/entity/timer_time_remaining.js
rename to src/common/entity/timer_time_remaining.js
diff --git a/js/common/entity/valid_entity_id.js b/src/common/entity/valid_entity_id.js
similarity index 100%
rename from js/common/entity/valid_entity_id.js
rename to src/common/entity/valid_entity_id.js
diff --git a/js/common/preact/event.js b/src/common/preact/event.js
similarity index 100%
rename from js/common/preact/event.js
rename to src/common/preact/event.js
diff --git a/js/common/preact/unmount.js b/src/common/preact/unmount.js
similarity index 100%
rename from js/common/preact/unmount.js
rename to src/common/preact/unmount.js
diff --git a/js/common/util/parse_query.js b/src/common/util/parse_query.js
similarity index 100%
rename from js/common/util/parse_query.js
rename to src/common/util/parse_query.js
diff --git a/js/compatibility.js b/src/compatibility.js
similarity index 100%
rename from js/compatibility.js
rename to src/compatibility.js
diff --git a/src/components/buttons/ha-call-api-button.js b/src/components/buttons/ha-call-api-button.js
index f8e1bb814a..4601a1bf94 100644
--- a/src/components/buttons/ha-call-api-button.js
+++ b/src/components/buttons/ha-call-api-button.js
@@ -1,10 +1,14 @@
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../../util/hass-mixins.js';
-import './ha-progress-button.js';
 
-class HaCallApiButton extends window.hassMixins.EventsMixin(PolymerElement) {
+import './ha-progress-button.js';
+import EventsMixin from '../../mixins/events-mixin.js';
+
+/*
+ * @appliesMixin EventsMixin
+ */
+class HaCallApiButton extends EventsMixin(PolymerElement) {
   static get template() {
     return html`
     <ha-progress-button id="progress" progress="[[progress]]" on-click="buttonTapped" disabled="[[disabled]]"><slot></slot></ha-progress-button>
diff --git a/src/components/buttons/ha-call-service-button.js b/src/components/buttons/ha-call-service-button.js
index f7626986de..20c97812c3 100644
--- a/src/components/buttons/ha-call-service-button.js
+++ b/src/components/buttons/ha-call-service-button.js
@@ -1,10 +1,13 @@
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../../util/hass-mixins.js';
 import './ha-progress-button.js';
+import EventsMixin from '../../mixins/events-mixin.js';
 
-class HaCallServiceButton extends window.hassMixins.EventsMixin(PolymerElement) {
+/*
+ * @appliesMixin EventsMixin
+ */
+class HaCallServiceButton extends EventsMixin(PolymerElement) {
   static get template() {
     return html`
     <ha-progress-button id="progress" progress="[[progress]]" on-click="buttonTapped"><slot></slot></ha-progress-button>
diff --git a/src/components/domain-icon.js b/src/components/domain-icon.js
index cd96177340..9cf6c857ce 100644
--- a/src/components/domain-icon.js
+++ b/src/components/domain-icon.js
@@ -2,7 +2,7 @@ import '@polymer/iron-icon/iron-icon.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import domainIcon from '../../js/common/entity/domain_icon.js';
+import domainIcon from '../common/entity/domain_icon.js';
 
 class DomainIcon extends PolymerElement {
   static get template() {
diff --git a/src/components/entity/ha-chart-base.js b/src/components/entity/ha-chart-base.js
index bf674c4df8..333d219a93 100644
--- a/src/components/entity/ha-chart-base.js
+++ b/src/components/entity/ha-chart-base.js
@@ -6,7 +6,7 @@ import { Debouncer } from '@polymer/polymer/lib/utils/debounce.js';
 import { timeOut } from '@polymer/polymer/lib/utils/async.js';
 import { mixinBehaviors } from '@polymer/polymer/lib/legacy/class.js';
 
-import formatTime from '../../../js/common/datetime/format_time.js';
+import formatTime from '../../common/datetime/format_time.js';
 // eslint-disable-next-line no-unused-vars
 /* global Chart moment Color */
 
diff --git a/src/components/entity/ha-entity-picker.js b/src/components/entity/ha-entity-picker.js
index b1a2e144a1..20e3eda119 100644
--- a/src/components/entity/ha-entity-picker.js
+++ b/src/components/entity/ha-entity-picker.js
@@ -6,15 +6,16 @@ import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 import '@vaadin/vaadin-combo-box/vaadin-combo-box-light.js';
 
-import '../../util/hass-mixins.js';
+
 import './state-badge.js';
 
-import computeStateName from '../../../js/common/entity/compute_state_name.js';
+import computeStateName from '../../common/entity/compute_state_name.js';
+import LocalizeMixin from '../../mixins/localize-mixin.js';
 
 /*
- * @appliesMixin window.hassMixins.LocalizeMixin
+ * @appliesMixin LocalizeMixin
  */
-class HaEntityPicker extends window.hassMixins.LocalizeMixin(PolymerElement) {
+class HaEntityPicker extends LocalizeMixin(PolymerElement) {
   static get template() {
     return html`
     <style>
diff --git a/src/components/entity/ha-entity-toggle.js b/src/components/entity/ha-entity-toggle.js
index 0907cffa26..60ea7bc3fc 100644
--- a/src/components/entity/ha-entity-toggle.js
+++ b/src/components/entity/ha-entity-toggle.js
@@ -3,8 +3,8 @@ import '@polymer/paper-toggle-button/paper-toggle-button.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import { STATES_OFF } from '../../../js/common/const.js';
-import computeStateDomain from '../../../js/common/entity/compute_state_domain';
+import { STATES_OFF } from '../../common/const.js';
+import computeStateDomain from '../../common/entity/compute_state_domain';
 
 class HaEntityToggle extends PolymerElement {
   static get template() {
diff --git a/src/components/entity/ha-state-icon.js b/src/components/entity/ha-state-icon.js
index 108ee4946c..4f7efd3eed 100644
--- a/src/components/entity/ha-state-icon.js
+++ b/src/components/entity/ha-state-icon.js
@@ -2,7 +2,7 @@ import '@polymer/iron-icon/iron-icon.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import stateIcon from '../../../js/common/entity/state_icon.js';
+import stateIcon from '../../common/entity/state_icon.js';
 
 class HaStateIcon extends PolymerElement {
   static get template() {
diff --git a/src/components/entity/ha-state-label-badge.js b/src/components/entity/ha-state-label-badge.js
index 8b97c2f070..1f442f3eb5 100644
--- a/src/components/entity/ha-state-label-badge.js
+++ b/src/components/entity/ha-state-label-badge.js
@@ -1,23 +1,26 @@
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../../util/hass-mixins.js';
+
 import '../ha-label-badge.js';
 
-import computeStateDomain from '../../../js/common/entity/compute_state_domain.js';
-import computeStateName from '../../../js/common/entity/compute_state_name.js';
-import domainIcon from '../../../js/common/entity/domain_icon.js';
-import stateIcon from '../../../js/common/entity/state_icon.js';
-import timerTimeRemaining from '../../../js/common/entity/timer_time_remaining.js';
-import attributeClassNames from '../../../js/common/entity/attribute_class_names.js';
-import secondsToDuration from '../../../js/common/datetime/seconds_to_duration.js';
+import computeStateDomain from '../../common/entity/compute_state_domain.js';
+import computeStateName from '../../common/entity/compute_state_name.js';
+import domainIcon from '../../common/entity/domain_icon.js';
+import stateIcon from '../../common/entity/state_icon.js';
+import timerTimeRemaining from '../../common/entity/timer_time_remaining.js';
+import attributeClassNames from '../../common/entity/attribute_class_names.js';
+import secondsToDuration from '../../common/datetime/seconds_to_duration.js';
+
+import EventsMixin from '../../mixins/events-mixin.js';
+import LocalizeMixin from '../../mixins/localize-mixin.js';
 
 /*
- * @appliesMixin window.hassMixins.LocalizeMixin
- * @appliesMixin window.hassMixins.EventsMixin
+ * @appliesMixin LocalizeMixin
+ * @appliesMixin EventsMixin
  */
 class HaStateLabelBadge extends
-  window.hassMixins.LocalizeMixin(window.hassMixins.EventsMixin(PolymerElement)) {
+  LocalizeMixin(EventsMixin(PolymerElement)) {
   static get template() {
     return html`
     <style>
diff --git a/src/components/entity/state-badge.js b/src/components/entity/state-badge.js
index c0b6e9dc7b..2b5873ddb3 100644
--- a/src/components/entity/state-badge.js
+++ b/src/components/entity/state-badge.js
@@ -2,7 +2,7 @@ import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
 import './ha-state-icon.js';
-import computeStateDomain from '../../../js/common/entity/compute_state_domain.js';
+import computeStateDomain from '../../common/entity/compute_state_domain.js';
 
 class StateBadge extends PolymerElement {
   static get template() {
diff --git a/src/components/entity/state-info.js b/src/components/entity/state-info.js
index e752780819..1974b60fb4 100644
--- a/src/components/entity/state-info.js
+++ b/src/components/entity/state-info.js
@@ -3,7 +3,7 @@ import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
 import '../ha-relative-time.js';
 import './state-badge.js';
-import computeStateName from '../../../js/common/entity/compute_state_name.js';
+import computeStateName from '../../common/entity/compute_state_name.js';
 
 class StateInfo extends PolymerElement {
   static get template() {
diff --git a/src/components/ha-cards.js b/src/components/ha-cards.js
index 4b89b2ebc8..2463032f27 100644
--- a/src/components/ha-cards.js
+++ b/src/components/ha-cards.js
@@ -8,7 +8,7 @@ import '../cards/ha-badges-card.js';
 import '../cards/ha-card-chooser.js';
 import './ha-demo-badge.js';
 
-import computeStateDomain from '../../js/common/entity/compute_state_domain.js';
+import computeStateDomain from '../common/entity/compute_state_domain.js';
 
 {
   // mapping domain to size of the card.
diff --git a/src/components/ha-climate-control.js b/src/components/ha-climate-control.js
index 95e178515d..bc3ede0cc7 100644
--- a/src/components/ha-climate-control.js
+++ b/src/components/ha-climate-control.js
@@ -3,9 +3,12 @@ import '@polymer/paper-icon-button/paper-icon-button.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../util/hass-mixins.js';
+import EventsMixin from '../mixins/events-mixin.js';
 
-class HaClimateControl extends window.hassMixins.EventsMixin(PolymerElement) {
+/*
+ * @appliesMixin EventsMixin
+ */
+class HaClimateControl extends EventsMixin(PolymerElement) {
   static get template() {
     return html`
     <style is="custom-style" include="iron-flex iron-flex-alignment"></style>
diff --git a/src/components/ha-color-picker.js b/src/components/ha-color-picker.js
index 071693db64..c15d04b090 100644
--- a/src/components/ha-color-picker.js
+++ b/src/components/ha-color-picker.js
@@ -1,12 +1,14 @@
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../util/hass-mixins.js';
+import EventsMixin from '../mixins/events-mixin.js';
 
 /**
  * Color-picker custom element
+ *
+ * @appliesMixin EventsMixin
  */
-class HaColorPicker extends window.hassMixins.EventsMixin(PolymerElement) {
+class HaColorPicker extends EventsMixin(PolymerElement) {
   static get template() {
     return html`
     <style>
diff --git a/src/components/ha-form.js b/src/components/ha-form.js
index eab926c558..7bc0c8e671 100644
--- a/src/components/ha-form.js
+++ b/src/components/ha-form.js
@@ -6,10 +6,13 @@ import '@polymer/paper-listbox/paper-listbox.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../util/hass-mixins.js';
 import './ha-paper-slider.js';
+import EventsMixin from '../mixins/events-mixin.js';
 
-class HaForm extends window.hassMixins.EventsMixin(PolymerElement) {
+/*
+ * @appliesMixin EventsMixin
+ */
+class HaForm extends EventsMixin(PolymerElement) {
   static get template() {
     return html`
     <style>
diff --git a/src/components/ha-markdown.js b/src/components/ha-markdown.js
index f12f529a2f..a23ab70728 100644
--- a/src/components/ha-markdown.js
+++ b/src/components/ha-markdown.js
@@ -1,12 +1,12 @@
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
-import '../util/hass-mixins.js';
+import EventsMixin from '../mixins/events-mixin.js';
 
 let loaded = null;
 
 /*
- * @appliesMixin window.hassMixins.EventsMixin
+ * @appliesMixin EventsMixin
  */
-class HaMarkdown extends window.hassMixins.EventsMixin(PolymerElement) {
+class HaMarkdown extends EventsMixin(PolymerElement) {
   static get properties() {
     return {
       content: {
diff --git a/src/components/ha-menu-button.js b/src/components/ha-menu-button.js
index 216db65a91..df60eba822 100644
--- a/src/components/ha-menu-button.js
+++ b/src/components/ha-menu-button.js
@@ -2,9 +2,12 @@ import '@polymer/paper-icon-button/paper-icon-button.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../util/hass-mixins.js';
+import EventsMixin from '../mixins/events-mixin.js';
 
-class HaMenuButton extends window.hassMixins.EventsMixin(PolymerElement) {
+/*
+ * @appliesMixin EventsMixin
+ */
+class HaMenuButton extends EventsMixin(PolymerElement) {
   static get template() {
     return html`
     <style>
diff --git a/src/components/ha-push-notifications-toggle.js b/src/components/ha-push-notifications-toggle.js
index 7a11d82730..13f260069e 100644
--- a/src/components/ha-push-notifications-toggle.js
+++ b/src/components/ha-push-notifications-toggle.js
@@ -2,9 +2,12 @@ import '@polymer/paper-toggle-button/paper-toggle-button.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../util/hass-mixins.js';
+import EventsMixin from '../mixins/events-mixin.js';
 
-class HaPushNotificationsToggle extends window.hassMixins.EventsMixin(PolymerElement) {
+/*
+ * @appliesMixin EventsMixin
+ */
+class HaPushNotificationsToggle extends EventsMixin(PolymerElement) {
   static get template() {
     return html`
     <paper-toggle-button hidden\$="[[!pushSupported]]" disabled="[[loading]]" checked="{{pushChecked}}"></paper-toggle-button>
diff --git a/src/components/ha-relative-time.js b/src/components/ha-relative-time.js
index f5c2539e73..43cea0ae71 100644
--- a/src/components/ha-relative-time.js
+++ b/src/components/ha-relative-time.js
@@ -1,7 +1,7 @@
 import { dom } from '@polymer/polymer/lib/legacy/polymer.dom.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import relativeTime from '../../js/common/datetime/relative_time.js';
+import relativeTime from '../common/datetime/relative_time.js';
 
 class HaRelativeTime extends PolymerElement {
   static get properties() {
diff --git a/src/components/ha-service-picker.js b/src/components/ha-service-picker.js
index e7e79d6c15..4003de341c 100644
--- a/src/components/ha-service-picker.js
+++ b/src/components/ha-service-picker.js
@@ -1,13 +1,15 @@
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../util/hass-mixins.js';
+
 import './ha-combo-box.js';
 
+import LocalizeMixin from '../mixins/localize-mixin.js';
+
 /*
- * @appliesMixin window.hassMixins.LocalizeMixin
+ * @appliesMixin LocalizeMixin
  */
-class HaServicePicker extends window.hassMixins.LocalizeMixin(PolymerElement) {
+class HaServicePicker extends LocalizeMixin(PolymerElement) {
   static get template() {
     return html`
     <ha-combo-box label="[[localize('ui.components.service-picker.service')]]" items="[[_services]]" value="{{value}}" allow-custom-value=""></ha-combo-box>
diff --git a/src/components/ha-sidebar.js b/src/components/ha-sidebar.js
index 3a4dd6270d..0051b743c0 100644
--- a/src/components/ha-sidebar.js
+++ b/src/components/ha-sidebar.js
@@ -8,15 +8,17 @@ import '@polymer/paper-listbox/paper-listbox.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../util/hass-mixins.js';
+
 import '../util/hass-translation.js';
+import NavigateMixin from '../mixins/navigate-mixin.js';
+import LocalizeMixin from '../mixins/localize-mixin.js';
 
 /*
- * @appliesMixin window.hassMixins.LocalizeMixin
- * @appliesMixin window.hassMixins.EventsMixin
+ * @appliesMixin LocalizeMixin
+ * @appliesMixin NavigateMixin
  */
 class HaSidebar extends
-  window.hassMixins.LocalizeMixin(window.hassMixins.NavigateMixin(PolymerElement)) {
+  LocalizeMixin(NavigateMixin(PolymerElement)) {
   static get template() {
     return html`
     <style include="iron-flex iron-flex-alignment iron-positioning">
diff --git a/src/components/ha-start-voice-button.js b/src/components/ha-start-voice-button.js
index 6475d4d3d3..dddf716992 100644
--- a/src/components/ha-start-voice-button.js
+++ b/src/components/ha-start-voice-button.js
@@ -2,11 +2,14 @@ import '@polymer/paper-icon-button/paper-icon-button.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../util/hass-mixins.js';
+import EventsMixin from '../mixins/events-mixin.js';
 
-import isComponentLoaded from '../../js/common/config/is_component_loaded.js';
+import isComponentLoaded from '../common/config/is_component_loaded.js';
 
-class HaStartVoiceButton extends window.hassMixins.EventsMixin(PolymerElement) {
+/*
+ * @appliesMixin EventsMixin
+ */
+class HaStartVoiceButton extends EventsMixin(PolymerElement) {
   static get template() {
     return html`
     <paper-icon-button icon="mdi:microphone" hidden\$="[[!canListen]]" on-click="handleListenClick"></paper-icon-button>
diff --git a/src/components/state-history-chart-line.js b/src/components/state-history-chart-line.js
index bdef489cba..ff044f89c3 100644
--- a/src/components/state-history-chart-line.js
+++ b/src/components/state-history-chart-line.js
@@ -4,7 +4,7 @@ import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
 import './entity/ha-chart-base.js';
 
-import formatDateTime from '../../js/common/datetime/format_date_time.js';
+import formatDateTime from '../common/datetime/format_date_time.js';
 
 class StateHistoryChartLine extends PolymerElement {
   static get template() {
diff --git a/src/components/state-history-chart-timeline.js b/src/components/state-history-chart-timeline.js
index ce7bfd24db..ae774e09e2 100644
--- a/src/components/state-history-chart-timeline.js
+++ b/src/components/state-history-chart-timeline.js
@@ -4,7 +4,7 @@ import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
 import './entity/ha-chart-base.js';
 
-import formatDateTime from '../../js/common/datetime/format_date_time';
+import formatDateTime from '../common/datetime/format_date_time';
 
 class StateHistoryChartTimeline extends PolymerElement {
   static get template() {
diff --git a/js/core.js b/src/core.js
similarity index 100%
rename from js/core.js
rename to src/core.js
diff --git a/src/data/ha-state-history-data.js b/src/data/ha-state-history-data.js
index 61f7ffdb6d..ff90c91740 100644
--- a/src/data/ha-state-history-data.js
+++ b/src/data/ha-state-history-data.js
@@ -2,11 +2,11 @@ import { timeOut } from '@polymer/polymer/lib/utils/async.js';
 import { Debouncer } from '@polymer/polymer/lib/utils/debounce.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../util/hass-mixins.js';
 
-import computeStateName from '../../js/common/entity/compute_state_name.js';
-import computeStateDomain from '../../js/common/entity/compute_state_domain.js';
-import computeStateDisplay from '../../js/common/entity/compute_state_display.js';
+import computeStateName from '../common/entity/compute_state_name.js';
+import computeStateDomain from '../common/entity/compute_state_domain.js';
+import computeStateDisplay from '../common/entity/compute_state_display.js';
+import LocalizeMixin from '../mixins/localize-mixin.js';
 
 {
   const RECENT_THRESHOLD = 60000; // 1 minute
@@ -99,9 +99,9 @@ import computeStateDisplay from '../../js/common/entity/compute_state_display.js
   }
 
   /*
-   * @appliesMixin window.hassMixins.LocalizeMixin
+   * @appliesMixin LocalizeMixin
    */
-  class HaStateHistoryData extends window.hassMixins.LocalizeMixin(PolymerElement) {
+  class HaStateHistoryData extends LocalizeMixin(PolymerElement) {
     static get properties() {
       return {
         hass: {
diff --git a/src/dialogs/ha-more-info-dialog.js b/src/dialogs/ha-more-info-dialog.js
index b44a0cd4db..ec314e2a17 100644
--- a/src/dialogs/ha-more-info-dialog.js
+++ b/src/dialogs/ha-more-info-dialog.js
@@ -4,14 +4,19 @@ import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
 import '../resources/ha-style.js';
-import '../util/hass-mixins.js';
+
 import './more-info/more-info-controls.js';
 import './more-info/more-info-settings.js';
 
-import computeStateDomain from '../../js/common/entity/compute_state_domain';
-import isComponentLoaded from '../../js/common/config/is_component_loaded.js';
+import computeStateDomain from '../common/entity/compute_state_domain';
+import isComponentLoaded from '../common/config/is_component_loaded.js';
 
-class HaMoreInfoDialog extends window.hassMixins.DialogMixin(PolymerElement) {
+import DialogMixin from '../mixins/dialog-mixin.js';
+
+/*
+ * @appliesMixin DialogMixin
+ */
+class HaMoreInfoDialog extends DialogMixin(PolymerElement) {
   static get template() {
     return html`
     <style include="ha-style-dialog paper-dialog-shared-styles">
diff --git a/src/dialogs/ha-voice-command-dialog.js b/src/dialogs/ha-voice-command-dialog.js
index f884a489a8..15190a247b 100644
--- a/src/dialogs/ha-voice-command-dialog.js
+++ b/src/dialogs/ha-voice-command-dialog.js
@@ -4,7 +4,12 @@ import '@polymer/paper-icon-button/paper-icon-button.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-class HaVoiceCommandDialog extends window.hassMixins.DialogMixin(PolymerElement) {
+import DialogMixin from '../mixins/dialog-mixin.js';
+
+/*
+ * @appliesMixin DialogMixin
+ */
+class HaVoiceCommandDialog extends DialogMixin(PolymerElement) {
   static get template() {
     return html`
     <style include="paper-dialog-shared-styles">
diff --git a/src/dialogs/more-info/controls/more-info-alarm_control_panel.js b/src/dialogs/more-info/controls/more-info-alarm_control_panel.js
index bf6d55d8ee..eecf605762 100644
--- a/src/dialogs/more-info/controls/more-info-alarm_control_panel.js
+++ b/src/dialogs/more-info/controls/more-info-alarm_control_panel.js
@@ -4,9 +4,12 @@ import '@polymer/paper-input/paper-input.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../../../util/hass-mixins.js';
+import EventsMixin from '../../../mixins/events-mixin.js';
 
-class MoreInfoAlarmControlPanel extends window.hassMixins.EventsMixin(PolymerElement) {
+/*
+ * @appliesMixin EventsMixin
+ */
+class MoreInfoAlarmControlPanel extends EventsMixin(PolymerElement) {
   static get template() {
     return html`
     <style is="custom-style" include="iron-flex"></style>
diff --git a/src/dialogs/more-info/controls/more-info-camera.js b/src/dialogs/more-info/controls/more-info-camera.js
index 3106449e2e..98009bb5bb 100644
--- a/src/dialogs/more-info/controls/more-info-camera.js
+++ b/src/dialogs/more-info/controls/more-info-camera.js
@@ -1,11 +1,13 @@
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../../../util/hass-mixins.js';
+import computeStateName from '../../../common/entity/compute_state_name.js';
+import EventsMixin from '../../../mixins/events-mixin.js';
 
-import computeStateName from '../../../../js/common/entity/compute_state_name.js';
-
-class MoreInfoCamera extends window.hassMixins.EventsMixin(PolymerElement) {
+/*
+ * @appliesMixin EventsMixin
+ */
+class MoreInfoCamera extends EventsMixin(PolymerElement) {
   static get template() {
     return html`
     <style>
diff --git a/src/dialogs/more-info/controls/more-info-climate.js b/src/dialogs/more-info/controls/more-info-climate.js
index 3ebf61faa4..da9cffa72f 100644
--- a/src/dialogs/more-info/controls/more-info-climate.js
+++ b/src/dialogs/more-info/controls/more-info-climate.js
@@ -10,12 +10,16 @@ import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
 import '../../../components/ha-climate-control.js';
 import '../../../components/ha-paper-slider.js';
-import '../../../util/hass-mixins.js';
 
-import attributeClassNames from '../../../../js/common/entity/attribute_class_names.js';
-import featureClassNames from '../../../../js/common/entity/feature_class_names';
 
-class MoreInfoClimate extends window.hassMixins.EventsMixin(PolymerElement) {
+import attributeClassNames from '../../../common/entity/attribute_class_names.js';
+import featureClassNames from '../../../common/entity/feature_class_names';
+import EventsMixin from '../../../mixins/events-mixin.js';
+
+/*
+ * @appliesMixin EventsMixin
+ */
+class MoreInfoClimate extends EventsMixin(PolymerElement) {
   static get template() {
     return html`
     <style is="custom-style" include="iron-flex"></style>
diff --git a/src/dialogs/more-info/controls/more-info-content.js b/src/dialogs/more-info/controls/more-info-content.js
index bab60e6b61..d2ffe21cff 100644
--- a/src/dialogs/more-info/controls/more-info-content.js
+++ b/src/dialogs/more-info/controls/more-info-content.js
@@ -20,8 +20,8 @@ import './more-info-updater.js';
 import './more-info-vacuum.js';
 import './more-info-weather.js';
 
-import stateMoreInfoType from '../../../../js/common/entity/state_more_info_type.js';
-import dynamicContentUpdater from '../../../../js/common/dom/dynamic_content_updater.js';
+import stateMoreInfoType from '../../../common/entity/state_more_info_type.js';
+import dynamicContentUpdater from '../../../common/dom/dynamic_content_updater.js';
 
 class MoreInfoContent extends PolymerElement {
   static get properties() {
diff --git a/src/dialogs/more-info/controls/more-info-cover.js b/src/dialogs/more-info/controls/more-info-cover.js
index 9d2b281a56..a5c81d0042 100644
--- a/src/dialogs/more-info/controls/more-info-cover.js
+++ b/src/dialogs/more-info/controls/more-info-cover.js
@@ -7,8 +7,8 @@ import '../../../components/ha-cover-tilt-controls.js';
 import '../../../components/ha-paper-slider.js';
 import '../../../util/cover-model.js';
 
-import attributeClassNames from '../../../../js/common/entity/attribute_class_names';
-import featureClassNames from '../../../../js/common/entity/feature_class_names';
+import attributeClassNames from '../../../common/entity/attribute_class_names';
+import featureClassNames from '../../../common/entity/feature_class_names';
 
 {
   const FEATURE_CLASS_NAMES = {
diff --git a/src/dialogs/more-info/controls/more-info-fan.js b/src/dialogs/more-info/controls/more-info-fan.js
index 86d6d610a0..8315bc6287 100644
--- a/src/dialogs/more-info/controls/more-info-fan.js
+++ b/src/dialogs/more-info/controls/more-info-fan.js
@@ -8,11 +8,15 @@ import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
 import '../../../components/ha-attributes.js';
-import '../../../util/hass-mixins.js';
 
-import attributeClassNames from '../../../../js/common/entity/attribute_class_names';
 
-class MoreInfoFan extends window.hassMixins.EventsMixin(PolymerElement) {
+import attributeClassNames from '../../../common/entity/attribute_class_names';
+import EventsMixin from '../../../mixins/events-mixin.js';
+
+/*
+ * @appliesMixin EventsMixin
+ */
+class MoreInfoFan extends EventsMixin(PolymerElement) {
   static get template() {
     return html`
     <style is="custom-style" include="iron-flex"></style>
diff --git a/src/dialogs/more-info/controls/more-info-group.js b/src/dialogs/more-info/controls/more-info-group.js
index 0cc5fbe938..e4e78965d9 100644
--- a/src/dialogs/more-info/controls/more-info-group.js
+++ b/src/dialogs/more-info/controls/more-info-group.js
@@ -4,9 +4,9 @@ import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
 import '../../../state-summary/state-card-content.js';
 
-import computeStateDomain from '../../../../js/common/entity/compute_state_domain';
-import dynamicContentUpdater from '../../../../js/common/dom/dynamic_content_updater.js';
-import stateMoreInfoType from '../../../../js/common/entity/state_more_info_type.js';
+import computeStateDomain from '../../../common/entity/compute_state_domain';
+import dynamicContentUpdater from '../../../common/dom/dynamic_content_updater.js';
+import stateMoreInfoType from '../../../common/entity/state_more_info_type.js';
 
 class MoreInfoGroup extends PolymerElement {
   static get template() {
diff --git a/src/dialogs/more-info/controls/more-info-input_datetime.js b/src/dialogs/more-info/controls/more-info-input_datetime.js
index 6cdb81886e..91d50556e1 100644
--- a/src/dialogs/more-info/controls/more-info-input_datetime.js
+++ b/src/dialogs/more-info/controls/more-info-input_datetime.js
@@ -7,7 +7,7 @@ import '@vaadin/vaadin-date-picker/vaadin-date-picker.js';
 
 import '../../../components/ha-relative-time.js';
 
-import attributeClassNames from '../../../../js/common/entity/attribute_class_names.js';
+import attributeClassNames from '../../../common/entity/attribute_class_names.js';
 
 class DatetimeInput extends PolymerElement {
   static get template() {
diff --git a/src/dialogs/more-info/controls/more-info-light.js b/src/dialogs/more-info/controls/more-info-light.js
index bb50919988..d216929750 100644
--- a/src/dialogs/more-info/controls/more-info-light.js
+++ b/src/dialogs/more-info/controls/more-info-light.js
@@ -8,9 +8,10 @@ import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 import '../../../components/ha-attributes.js';
 import '../../../components/ha-color-picker.js';
 import '../../../components/ha-labeled-slider.js';
-import '../../../util/hass-mixins.js';
 
-import featureClassNames from '../../../../js/common/entity/feature_class_names';
+
+import featureClassNames from '../../../common/entity/feature_class_names';
+import EventsMixin from '../../../mixins/events-mixin.js';
 
 {
   const FEATURE_CLASS_NAMES = {
@@ -20,7 +21,10 @@ import featureClassNames from '../../../../js/common/entity/feature_class_names'
     16: 'has-color',
     128: 'has-white_value',
   };
-  class MoreInfoLight extends window.hassMixins.EventsMixin(PolymerElement) {
+  /*
+   * @appliesMixin EventsMixin
+   */
+  class MoreInfoLight extends EventsMixin(PolymerElement) {
     static get template() {
       return html`
     <style is="custom-style" include="iron-flex"></style>
diff --git a/src/dialogs/more-info/controls/more-info-media_player.js b/src/dialogs/more-info/controls/more-info-media_player.js
index 9de4c42d65..f0ba849e78 100644
--- a/src/dialogs/more-info/controls/more-info-media_player.js
+++ b/src/dialogs/more-info/controls/more-info-media_player.js
@@ -9,13 +9,17 @@ import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
 import '../../../components/ha-paper-slider.js';
 import '../../../util/hass-media-player-model.js';
-import '../../../util/hass-mixins.js';
 
-import attributeClassNames from '../../../../js/common/entity/attribute_class_names';
-import isComponentLoaded from '../../../../js/common/config/is_component_loaded.js';
+
+import attributeClassNames from '../../../common/entity/attribute_class_names';
+import isComponentLoaded from '../../../common/config/is_component_loaded.js';
+import EventsMixin from '../../../mixins/events-mixin.js';
 
 {
-  class MoreInfoMediaPlayer extends window.hassMixins.EventsMixin(PolymerElement) {
+  /*
+   * @appliesMixin EventsMixin
+   */
+  class MoreInfoMediaPlayer extends EventsMixin(PolymerElement) {
     static get template() {
       return html`
     <style is="custom-style" include="iron-flex iron-flex-alignment"></style>
diff --git a/src/dialogs/more-info/controls/more-info-sun.js b/src/dialogs/more-info/controls/more-info-sun.js
index 5c53df8e34..7287cacc2b 100644
--- a/src/dialogs/more-info/controls/more-info-sun.js
+++ b/src/dialogs/more-info/controls/more-info-sun.js
@@ -4,7 +4,7 @@ import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
 import '../../../components/ha-relative-time.js';
 
-import formatTime from '../../../../js/common/datetime/format_time.js';
+import formatTime from '../../../common/datetime/format_time.js';
 
 class MoreInfoSun extends PolymerElement {
   static get template() {
diff --git a/src/dialogs/more-info/controls/more-info-weather.js b/src/dialogs/more-info/controls/more-info-weather.js
index 67b0fa9e9e..c99c175f6b 100644
--- a/src/dialogs/more-info/controls/more-info-weather.js
+++ b/src/dialogs/more-info/controls/more-info-weather.js
@@ -2,12 +2,12 @@ import '@polymer/iron-icon/iron-icon.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../../../util/hass-mixins.js';
+import LocalizeMixin from '../../../mixins/localize-mixin.js';
 
 /*
- * @appliesMixin window.hassMixins.LocalizeMixin
+ * @appliesMixin LocalizeMixin
  */
-class MoreInfoWeather extends window.hassMixins.LocalizeMixin(PolymerElement) {
+class MoreInfoWeather extends LocalizeMixin(PolymerElement) {
   static get template() {
     return html`
     <style>
diff --git a/src/dialogs/more-info/more-info-controls.js b/src/dialogs/more-info/more-info-controls.js
index ae968fda24..c21c25b75c 100644
--- a/src/dialogs/more-info/more-info-controls.js
+++ b/src/dialogs/more-info/more-info-controls.js
@@ -8,13 +8,14 @@ import '../../components/state-history-charts.js';
 import '../../data/ha-state-history-data.js';
 import '../../resources/ha-style.js';
 import '../../state-summary/state-card-content.js';
-import '../../util/hass-mixins.js';
+
 import './controls/more-info-content.js';
 
-import computeStateName from '../../../js/common/entity/compute_state_name.js';
-import computeStateDomain from '../../../js/common/entity/compute_state_domain.js';
-import isComponentLoaded from '../../../js/common/config/is_component_loaded.js';
-import { DOMAINS_MORE_INFO_NO_HISTORY } from '../../../js/common/const.js';
+import computeStateName from '../../common/entity/compute_state_name.js';
+import computeStateDomain from '../../common/entity/compute_state_domain.js';
+import isComponentLoaded from '../../common/config/is_component_loaded.js';
+import { DOMAINS_MORE_INFO_NO_HISTORY } from '../../common/const.js';
+import EventsMixin from '../../mixins/events-mixin.js';
 
 {
   const DOMAINS_NO_INFO = [
@@ -22,7 +23,10 @@ import { DOMAINS_MORE_INFO_NO_HISTORY } from '../../../js/common/const.js';
     'configurator',
     'history_graph',
   ];
-  class MoreInfoControls extends window.hassMixins.EventsMixin(PolymerElement) {
+  /*
+   * @appliesMixin EventsMixin
+   */
+  class MoreInfoControls extends EventsMixin(PolymerElement) {
     static get template() {
       return html`
     <style include="ha-style-dialog">
diff --git a/src/dialogs/more-info/more-info-settings.js b/src/dialogs/more-info/more-info-settings.js
index 77cd682af9..ec0c3c9d9c 100644
--- a/src/dialogs/more-info/more-info-settings.js
+++ b/src/dialogs/more-info/more-info-settings.js
@@ -5,12 +5,15 @@ import '@polymer/paper-input/paper-input.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../../util/hass-mixins.js';
+import EventsMixin from '../../mixins/events-mixin.js';
 
-import computeStateName from '../../../js/common/entity/compute_state_name.js';
-import isComponentLoaded from '../../../js/common/config/is_component_loaded.js';
+import computeStateName from '../../common/entity/compute_state_name.js';
+import isComponentLoaded from '../../common/config/is_component_loaded.js';
 
-class MoreInfoSettings extends window.hassMixins.EventsMixin(PolymerElement) {
+/*
+ * @appliesMixin EventsMixin
+ */
+class MoreInfoSettings extends EventsMixin(PolymerElement) {
   static get template() {
     return html`
     <style>
diff --git a/src/home-assistant.js b/src/home-assistant.js
index 03b11e66f7..30fa4760fc 100644
--- a/src/home-assistant.js
+++ b/src/home-assistant.js
@@ -23,8 +23,8 @@ import './util/roboto.js';
 // For mdi icons.
 import './components/ha-iconset-svg.js';
 
-import computeStateName from '../js/common/entity/compute_state_name.js';
-import applyThemesOnElement from '../js/common/dom/apply_themes_on_element.js';
+import computeStateName from './common/entity/compute_state_name.js';
+import applyThemesOnElement from './common/dom/apply_themes_on_element.js';
 
 setPassiveTouchGestures(true);
 /* LastPass createElement workaround. See #428 */
diff --git a/src/layouts/home-assistant-main.js b/src/layouts/home-assistant-main.js
index 66902a036e..a9f95920ee 100644
--- a/src/layouts/home-assistant-main.js
+++ b/src/layouts/home-assistant-main.js
@@ -8,9 +8,10 @@ import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
 import '../components/ha-sidebar.js';
 import '../util/ha-url-sync.js';
-import '../util/hass-mixins.js';
+
 import './partial-cards.js';
 import './partial-panel-resolver.js';
+import EventsMixin from '../mixins/events-mixin.js';
 
 import(/* webpackChunkName: "more-info-dialog" */ '../dialogs/ha-more-info-dialog.js');
 import(/* webpackChunkName: "voice-command-dialog" */ '../dialogs/ha-voice-command-dialog.js');
@@ -18,7 +19,7 @@ import(/* webpackChunkName: "voice-command-dialog" */ '../dialogs/ha-voice-comma
 {
   const NON_SWIPABLE_PANELS = ['kiosk', 'map'];
 
-  class HomeAssistantMain extends window.hassMixins.EventsMixin(PolymerElement) {
+  class HomeAssistantMain extends EventsMixin(PolymerElement) {
     static get template() {
       return html`
     <style>
diff --git a/src/layouts/login-form.js b/src/layouts/login-form.js
index 6836ba5e86..7898deff1e 100644
--- a/src/layouts/login-form.js
+++ b/src/layouts/login-form.js
@@ -6,12 +6,12 @@ import '@polymer/paper-spinner/paper-spinner.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../util/hass-mixins.js';
+import LocalizeMixin from '../mixins/localize-mixin.js';
 
 /*
- * @appliesMixin window.hassMixins.LocalizeMixin
+ * @appliesMixin LocalizeMixin
  */
-class LoginForm extends window.hassMixins.LocalizeMixin(PolymerElement) {
+class LoginForm extends LocalizeMixin(PolymerElement) {
   static get template() {
     return html`
     <style is="custom-style" include="iron-flex iron-positioning"></style>
diff --git a/src/layouts/partial-cards.js b/src/layouts/partial-cards.js
index 383d99cd64..caa64a878a 100644
--- a/src/layouts/partial-cards.js
+++ b/src/layouts/partial-cards.js
@@ -13,19 +13,24 @@ import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 import '../components/ha-cards.js';
 import '../components/ha-menu-button.js';
 import '../components/ha-start-voice-button.js';
-import '../util/hass-mixins.js';
+
 import './ha-app-layout.js';
 
-import computeStateName from '../../js/common/entity/compute_state_name.js';
-import computeStateDomain from '../../js/common/entity/compute_state_domain.js';
-import computeLocationName from '../../js/common/config/location_name.js';
+import computeStateName from '../common/entity/compute_state_name.js';
+import computeStateDomain from '../common/entity/compute_state_domain.js';
+import computeLocationName from '../common/config/location_name.js';
+import NavigateMixin from '../mixins/navigate-mixin.js';
+import EventsMixin from '../mixins/events-mixin.js';
 
 {
   const DEFAULT_VIEW_ENTITY_ID = 'group.default_view';
   const ALWAYS_SHOW_DOMAIN = ['persistent_notification', 'configurator'];
 
-  // eslint-disable-next-line
-  class PartialCards extends window.hassMixins.EventsMixin(window.hassMixins.NavigateMixin(PolymerElement)) {
+  /*
+   * @appliesMixin EventsMixin
+   * @appliesMixin NavigateMixin
+   */
+  class PartialCards extends EventsMixin(NavigateMixin(PolymerElement)) {
     static get template() {
       return html`
     <style include="iron-flex iron-positioning ha-style">
diff --git a/src/layouts/partial-panel-resolver.js b/src/layouts/partial-panel-resolver.js
index d14e366662..78acd62c84 100644
--- a/src/layouts/partial-panel-resolver.js
+++ b/src/layouts/partial-panel-resolver.js
@@ -2,11 +2,12 @@ import '@polymer/app-route/app-route.js';
 import { dom } from '@polymer/polymer/lib/legacy/polymer.dom.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
-import '../util/hass-mixins.js';
+
 import './hass-loading-screen.js';
 import { importHref } from '../resources/html-import/import-href';
 
-import dynamicContentUpdater from '../../js/common/dom/dynamic_content_updater.js';
+import dynamicContentUpdater from '../common/dom/dynamic_content_updater.js';
+import NavigateMixin from '../mixins/navigate-mixin.js';
 
 const loaded = {};
 
@@ -17,63 +18,63 @@ function ensureLoaded(panel) {
   // Name each panel we support here, that way Webpack knows about it.
   switch (panel) {
     case 'config':
-      imported = import(/* webpackChunkName: "panel-config" */ '../../panels/config/ha-panel-config.js');
+      imported = import(/* webpackChunkName: "panel-config" */ '../panels/config/ha-panel-config.js');
       break;
 
     case 'dev-event':
-      imported = import(/* webpackChunkName: "panel-dev-event" */ '../../panels/dev-event/ha-panel-dev-event.js');
+      imported = import(/* webpackChunkName: "panel-dev-event" */ '../panels/dev-event/ha-panel-dev-event.js');
       break;
 
     case 'dev-info':
-      imported = import(/* webpackChunkName: "panel-dev-info" */ '../../panels/dev-info/ha-panel-dev-info.js');
+      imported = import(/* webpackChunkName: "panel-dev-info" */ '../panels/dev-info/ha-panel-dev-info.js');
       break;
 
     case 'dev-mqtt':
-      imported = import(/* webpackChunkName: "panel-dev-mqtt" */ '../../panels/dev-mqtt/ha-panel-dev-mqtt.js');
+      imported = import(/* webpackChunkName: "panel-dev-mqtt" */ '../panels/dev-mqtt/ha-panel-dev-mqtt.js');
       break;
 
     case 'dev-service':
-      imported = import(/* webpackChunkName: "panel-dev-service" */ '../../panels/dev-service/ha-panel-dev-service.js');
+      imported = import(/* webpackChunkName: "panel-dev-service" */ '../panels/dev-service/ha-panel-dev-service.js');
       break;
 
     case 'dev-state':
-      imported = import(/* webpackChunkName: "panel-dev-state" */ '../../panels/dev-state/ha-panel-dev-state.js');
+      imported = import(/* webpackChunkName: "panel-dev-state" */ '../panels/dev-state/ha-panel-dev-state.js');
       break;
 
     case 'dev-template':
-      imported = import(/* webpackChunkName: "panel-dev-template" */ '../../panels/dev-template/ha-panel-dev-template.js');
+      imported = import(/* webpackChunkName: "panel-dev-template" */ '../panels/dev-template/ha-panel-dev-template.js');
       break;
 
     case 'hassio':
-      imported = import(/* webpackChunkName: "panel-hassio" */ '../../panels/hassio/ha-panel-hassio.js');
+      imported = import(/* webpackChunkName: "panel-hassio" */ '../panels/hassio/ha-panel-hassio.js');
       break;
 
     case 'history':
-      imported = import(/* webpackChunkName: "panel-history" */ '../../panels/history/ha-panel-history.js');
+      imported = import(/* webpackChunkName: "panel-history" */ '../panels/history/ha-panel-history.js');
       break;
 
     case 'iframe':
-      imported = import(/* webpackChunkName: "panel-iframe" */ '../../panels/iframe/ha-panel-iframe.js');
+      imported = import(/* webpackChunkName: "panel-iframe" */ '../panels/iframe/ha-panel-iframe.js');
       break;
 
     case 'kiosk':
-      imported = import(/* webpackChunkName: "panel-kiosk" */ '../../panels/kiosk/ha-panel-kiosk.js');
+      imported = import(/* webpackChunkName: "panel-kiosk" */ '../panels/kiosk/ha-panel-kiosk.js');
       break;
 
     case 'logbook':
-      imported = import(/* webpackChunkName: "panel-logbook" */ '../../panels/logbook/ha-panel-logbook.js');
+      imported = import(/* webpackChunkName: "panel-logbook" */ '../panels/logbook/ha-panel-logbook.js');
       break;
 
     case 'mailbox':
-      imported = import(/* webpackChunkName: "panel-mailbox" */ '../../panels/mailbox/ha-panel-mailbox.js');
+      imported = import(/* webpackChunkName: "panel-mailbox" */ '../panels/mailbox/ha-panel-mailbox.js');
       break;
 
     case 'map':
-      imported = import(/* webpackChunkName: "panel-map" */ '../../panels/map/ha-panel-map.js');
+      imported = import(/* webpackChunkName: "panel-map" */ '../panels/map/ha-panel-map.js');
       break;
 
     case 'shopping-list':
-      imported = import(/* webpackChunkName: "panel-shopping-list" */ '../../panels/shopping-list/ha-panel-shopping-list.js');
+      imported = import(/* webpackChunkName: "panel-shopping-list" */ '../panels/shopping-list/ha-panel-shopping-list.js');
       break;
 
     default:
@@ -87,7 +88,10 @@ function ensureLoaded(panel) {
   return imported;
 }
 
-class PartialPanelResolver extends window.hassMixins.NavigateMixin(PolymerElement) {
+/*
+ * @appliesMixin NavigateMixin
+ */
+class PartialPanelResolver extends NavigateMixin(PolymerElement) {
   static get template() {
     return html`
     <style>
diff --git a/src/mixins/dialog-mixin.js b/src/mixins/dialog-mixin.js
new file mode 100644
index 0000000000..696872093a
--- /dev/null
+++ b/src/mixins/dialog-mixin.js
@@ -0,0 +1,20 @@
+import { dedupingMixin } from '@polymer/polymer/lib/utils/mixin.js';
+import { PaperDialogBehavior } from '@polymer/paper-dialog-behavior/paper-dialog-behavior.js';
+import { mixinBehaviors } from '@polymer/polymer/lib/legacy/class.js';
+import EventsMixin from './events-mixin';
+/**
+ * @polymerMixin
+ * @appliesMixin EventsMixin
+ * @appliesMixin PaperDialogBehavior
+ */
+export default dedupingMixin(superClass =>
+  class extends mixinBehaviors([EventsMixin, PaperDialogBehavior], superClass) {
+    static get properties() {
+      return {
+        withBackdrop: {
+          type: Boolean,
+          value: true,
+        },
+      };
+    }
+  });
diff --git a/src/util/hass-mixins.js b/src/mixins/events-mixin.js
similarity index 53%
rename from src/util/hass-mixins.js
rename to src/mixins/events-mixin.js
index 86012c65cb..6140f901f4 100644
--- a/src/util/hass-mixins.js
+++ b/src/mixins/events-mixin.js
@@ -1,9 +1,4 @@
-import { PaperDialogBehavior } from '@polymer/paper-dialog-behavior/paper-dialog-behavior.js';
-import { mixinBehaviors } from '@polymer/polymer/lib/legacy/class.js';
 import { dedupingMixin } from '@polymer/polymer/lib/utils/mixin.js';
-import '@polymer/polymer/lib/mixins/element-mixin.js';
-import { AppLocalizeBehavior } from './app-localize-behavior.js';
-
 
 // Polymer legacy event helpers used courtesy of the Polymer project.
 //
@@ -35,10 +30,8 @@ import { AppLocalizeBehavior } from './app-localize-behavior.js';
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-window.hassMixins = window.hassMixins || {};
-
 /* @polymerMixin */
-window.hassMixins.EventsMixin = dedupingMixin(superClass => class extends superClass {
+export default dedupingMixin(superClass => class extends superClass {
   /**
      * Dispatches a custom event with an optional detail value.
      *
@@ -47,13 +40,13 @@ window.hassMixins.EventsMixin = dedupingMixin(superClass => class extends superC
      *   payload.
      * @param {{ bubbles: (boolean|undefined),
                  cancelable: (boolean|undefined),
-                 composed: (boolean|undefined) }=}
-     *  options Object specifying options.  These may include:
-     *  `bubbles` (boolean, defaults to `true`),
-     *  `cancelable` (boolean, defaults to false), and
-     *  `node` on which to fire the event (HTMLElement, defaults to `this`).
-     * @return {Event} The new event that was fired.
-     */
+                  composed: (boolean|undefined) }=}
+      *  options Object specifying options.  These may include:
+      *  `bubbles` (boolean, defaults to `true`),
+      *  `cancelable` (boolean, defaults to false), and
+      *  `node` on which to fire the event (HTMLElement, defaults to `this`).
+      * @return {Event} The new event that was fired.
+      */
   fire(type, detail, options) {
     options = options || {};
     detail = (detail === null || detail === undefined) ? {} : detail;
@@ -68,63 +61,3 @@ window.hassMixins.EventsMixin = dedupingMixin(superClass => class extends superC
     return event;
   }
 });
-
-/* @polymerMixin */
-window.hassMixins.NavigateMixin = dedupingMixin(superClass =>
-  class extends window.hassMixins.EventsMixin(superClass) {
-    navigate(path, replace = false) {
-      if (replace) {
-        history.replaceState(null, null, path);
-      } else {
-        history.pushState(null, null, path);
-      }
-      this.fire('location-changed');
-    }
-  });
-
-/**
- * @polymerMixin
- * @appliesMixin AppLocalizeBehavior
- */
-window.hassMixins.LocalizeMixin = dedupingMixin(superClass =>
-  class extends mixinBehaviors([AppLocalizeBehavior], superClass) {
-    static get properties() {
-      return {
-        hass: Object,
-        language: {
-          type: String,
-          computed: 'computeLanguage(hass)',
-        },
-        resources: {
-          type: Object,
-          computed: 'computeResources(hass)',
-        },
-      };
-    }
-
-    computeLanguage(hass) {
-      return hass && hass.language;
-    }
-
-    computeResources(hass) {
-      return hass && hass.resources;
-    }
-  });
-
-/**
- * @polymerMixin
- * @appliesMixin window.hassMixins.EventsMixin
- * @appliesMixin PaperDialogBehavior
- */
-window.hassMixins.DialogMixin = dedupingMixin(superClass =>
-  class extends mixinBehaviors([window.hassMixins.EventsMixin,
-    PaperDialogBehavior], superClass) {
-    static get properties() {
-      return {
-        withBackdrop: {
-          type: Boolean,
-          value: true,
-        },
-      };
-    }
-  });
diff --git a/src/mixins/localize-mixin.js b/src/mixins/localize-mixin.js
new file mode 100644
index 0000000000..e7db74c224
--- /dev/null
+++ b/src/mixins/localize-mixin.js
@@ -0,0 +1,32 @@
+import { mixinBehaviors } from '@polymer/polymer/lib/legacy/class.js';
+import { dedupingMixin } from '@polymer/polymer/lib/utils/mixin.js';
+import { AppLocalizeBehavior } from '../util/app-localize-behavior.js';
+
+/**
+ * @polymerMixin
+ * @appliesMixin AppLocalizeBehavior
+ */
+export default dedupingMixin(superClass =>
+  class extends mixinBehaviors([AppLocalizeBehavior], superClass) {
+    static get properties() {
+      return {
+        hass: Object,
+        language: {
+          type: String,
+          computed: 'computeLanguage(hass)',
+        },
+        resources: {
+          type: Object,
+          computed: 'computeResources(hass)',
+        },
+      };
+    }
+
+    computeLanguage(hass) {
+      return hass && hass.language;
+    }
+
+    computeResources(hass) {
+      return hass && hass.resources;
+    }
+  });
diff --git a/src/mixins/navigate-mixin.js b/src/mixins/navigate-mixin.js
new file mode 100644
index 0000000000..c22d019279
--- /dev/null
+++ b/src/mixins/navigate-mixin.js
@@ -0,0 +1,18 @@
+import { dedupingMixin } from '@polymer/polymer/lib/utils/mixin.js';
+import EventsMixin from './events-mixin';
+
+/*
+ * @polymerMixin
+ * @appliesMixin EventsMixin
+ */
+export default dedupingMixin(superClass =>
+  class extends EventsMixin(superClass) {
+    navigate(path, replace = false) {
+      if (replace) {
+        history.replaceState(null, null, path);
+      } else {
+        history.pushState(null, null, path);
+      }
+      this.fire('location-changed');
+    }
+  });
diff --git a/panels/config/automation/ha-automation-editor.js b/src/panels/config/automation/ha-automation-editor.js
similarity index 91%
rename from panels/config/automation/ha-automation-editor.js
rename to src/panels/config/automation/ha-automation-editor.js
index 1616901ae7..2395cc680e 100644
--- a/panels/config/automation/ha-automation-editor.js
+++ b/src/panels/config/automation/ha-automation-editor.js
@@ -17,28 +17,30 @@ import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 import { h, render } from 'preact';
 
-import '../../../src/components/entity/ha-entity-picker.js';
-import '../../../src/components/ha-combo-box.js';
-import '../../../src/components/ha-markdown.js';
-import '../../../src/components/ha-service-picker.js';
-import '../../../src/layouts/ha-app-layout.js';
-import '../../../src/util/hass-mixins.js';
+import '../../../components/entity/ha-entity-picker.js';
+import '../../../components/ha-combo-box.js';
+import '../../../components/ha-markdown.js';
+import '../../../components/ha-service-picker.js';
+import '../../../layouts/ha-app-layout.js';
+
 import '../ha-config-section.js';
 
-import Automation from '../../../js/panel-config/automation.js';
-import unmountPreact from '../../../js/common/preact/unmount.js';
-import computeStateName from '../../../js/common/entity/compute_state_name.js';
+import Automation from '../js/automation.js';
+import unmountPreact from '../../../common/preact/unmount.js';
+import computeStateName from '../../../common/entity/compute_state_name.js';
+import NavigateMixin from '../../../mixins/navigate-mixin.js';
+import LocalizeMixin from '../../../mixins/localize-mixin.js';
 
 function AutomationEditor(mountEl, props, mergeEl) {
   return render(h(Automation, props), mountEl, mergeEl);
 }
 
 /*
- * @appliesMixin window.hassMixins.LocalizeMixin
- * @appliesMixin window.hassMixins.EventsMixin
+ * @appliesMixin LocalizeMixin
+ * @appliesMixin NavigateMixin
  */
 class HaAutomationEditor extends
-  window.hassMixins.LocalizeMixin(window.hassMixins.NavigateMixin(PolymerElement)) {
+  LocalizeMixin(NavigateMixin(PolymerElement)) {
   static get template() {
     return html`
     <style include="ha-style">
diff --git a/panels/config/automation/ha-automation-picker.js b/src/panels/config/automation/ha-automation-picker.js
similarity index 89%
rename from panels/config/automation/ha-automation-picker.js
rename to src/panels/config/automation/ha-automation-picker.js
index 61f1ca08f2..bb310fc2c6 100644
--- a/panels/config/automation/ha-automation-picker.js
+++ b/src/panels/config/automation/ha-automation-picker.js
@@ -8,18 +8,20 @@ import '@polymer/paper-item/paper-item.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../../../src/components/ha-markdown.js';
-import '../../../src/layouts/ha-app-layout.js';
-import '../../../src/util/hass-mixins.js';
+import '../../../components/ha-markdown.js';
+import '../../../layouts/ha-app-layout.js';
+
 import '../ha-config-section.js';
 
-import computeStateName from '../../../js/common/entity/compute_state_name.js';
+import NavigateMixin from '../../../mixins/navigate-mixin.js';
+import LocalizeMixin from '../../../mixins/localize-mixin.js';
+import computeStateName from '../../../common/entity/compute_state_name.js';
 /*
- * @appliesMixin window.hassMixins.LocalizeMixin
- * @appliesMixin window.hassMixins.EventsMixin
+ * @appliesMixin LocalizeMixin
+ * @appliesMixin NavigateMixin
  */
 class HaAutomationPicker extends
-  window.hassMixins.LocalizeMixin(window.hassMixins.NavigateMixin(PolymerElement)) {
+  LocalizeMixin(NavigateMixin(PolymerElement)) {
   static get template() {
     return html`
     <style include="ha-style">
diff --git a/panels/config/automation/ha-config-automation.js b/src/panels/config/automation/ha-config-automation.js
similarity index 97%
rename from panels/config/automation/ha-config-automation.js
rename to src/panels/config/automation/ha-config-automation.js
index d5d1f6ad54..25f8ad76e4 100644
--- a/panels/config/automation/ha-config-automation.js
+++ b/src/panels/config/automation/ha-config-automation.js
@@ -5,7 +5,7 @@ import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 import './ha-automation-editor.js';
 import './ha-automation-picker.js';
 
-import computeStateDomain from '../../../js/common/entity/compute_state_domain.js';
+import computeStateDomain from '../../../common/entity/compute_state_domain.js';
 
 class HaConfigAutomation extends PolymerElement {
   static get template() {
diff --git a/panels/config/cloud/ha-config-cloud-account.js b/src/panels/config/cloud/ha-config-cloud-account.js
similarity index 93%
rename from panels/config/cloud/ha-config-cloud-account.js
rename to src/panels/config/cloud/ha-config-cloud-account.js
index b41de3d0ee..1892cbd8db 100644
--- a/panels/config/cloud/ha-config-cloud-account.js
+++ b/src/panels/config/cloud/ha-config-cloud-account.js
@@ -4,15 +4,19 @@ import '@polymer/paper-item/paper-item-body.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../../../src/components/buttons/ha-call-api-button.js';
-import '../../../src/layouts/hass-subpage.js';
-import '../../../src/resources/ha-style.js';
-import '../../../src/util/hass-mixins.js';
+import '../../../components/buttons/ha-call-api-button.js';
+import '../../../layouts/hass-subpage.js';
+import '../../../resources/ha-style.js';
+
 import '../ha-config-section.js';
 
-import formatDateTime from '../../../js/common/datetime/format_date_time.js';
+import formatDateTime from '../../../common/datetime/format_date_time.js';
+import EventsMixin from '../../../mixins/events-mixin.js';
 
-class HaConfigCloudAccount extends window.hassMixins.EventsMixin(PolymerElement) {
+/*
+ * @appliesMixin EventsMixin
+ */
+class HaConfigCloudAccount extends EventsMixin(PolymerElement) {
   static get template() {
     return html`
     <style include="iron-flex ha-style">
diff --git a/panels/config/cloud/ha-config-cloud-forgot-password.js b/src/panels/config/cloud/ha-config-cloud-forgot-password.js
similarity index 90%
rename from panels/config/cloud/ha-config-cloud-forgot-password.js
rename to src/panels/config/cloud/ha-config-cloud-forgot-password.js
index e871a753b7..c0a20ae93e 100644
--- a/panels/config/cloud/ha-config-cloud-forgot-password.js
+++ b/src/panels/config/cloud/ha-config-cloud-forgot-password.js
@@ -3,12 +3,15 @@ import '@polymer/paper-input/paper-input.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../../../src/components/buttons/ha-progress-button.js';
-import '../../../src/layouts/hass-subpage.js';
-import '../../../src/resources/ha-style.js';
-import '../../../src/util/hass-mixins.js';
+import '../../../components/buttons/ha-progress-button.js';
+import '../../../layouts/hass-subpage.js';
+import '../../../resources/ha-style.js';
+import EventsMixin from '../../../mixins/events-mixin.js';
 
-class HaConfigCloudForgotPassword extends window.hassMixins.EventsMixin(PolymerElement) {
+/*
+ * @appliesMixin EventsMixin
+ */
+class HaConfigCloudForgotPassword extends EventsMixin(PolymerElement) {
   static get template() {
     return html`
     <style include="iron-flex ha-style">
diff --git a/panels/config/cloud/ha-config-cloud-login.js b/src/panels/config/cloud/ha-config-cloud-login.js
similarity index 94%
rename from panels/config/cloud/ha-config-cloud-login.js
rename to src/panels/config/cloud/ha-config-cloud-login.js
index 93ff4ea87d..3f77d38719 100644
--- a/panels/config/cloud/ha-config-cloud-login.js
+++ b/src/panels/config/cloud/ha-config-cloud-login.js
@@ -8,14 +8,20 @@ import '@polymer/paper-ripple/paper-ripple.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../../../src/components/buttons/ha-progress-button.js';
-import '../../../src/layouts/hass-subpage.js';
-import '../../../src/resources/ha-style.js';
-import '../../../src/util/hass-mixins.js';
-import '../ha-config-section.js';
+import '../../../components/buttons/ha-progress-button.js';
+import '../../../layouts/hass-subpage.js';
+import '../../../resources/ha-style.js';
 
+import '../ha-config-section.js';
+import EventsMixin from '../../../mixins/events-mixin.js';
+import NavigateMixin from '../../../mixins/navigate-mixin.js';
+
+/*
+ * @appliesMixin NavigateMixin
+ * @appliesMixin EventsMixin
+ */
 class HaConfigCloudLogin extends
-  window.hassMixins.NavigateMixin(window.hassMixins.EventsMixin(PolymerElement)) {
+  NavigateMixin(EventsMixin(PolymerElement)) {
   static get template() {
     return html`
     <style include="iron-flex ha-style">
diff --git a/panels/config/cloud/ha-config-cloud-register.js b/src/panels/config/cloud/ha-config-cloud-register.js
similarity index 94%
rename from panels/config/cloud/ha-config-cloud-register.js
rename to src/panels/config/cloud/ha-config-cloud-register.js
index 467e8bfaa2..9a5b34c413 100644
--- a/panels/config/cloud/ha-config-cloud-register.js
+++ b/src/panels/config/cloud/ha-config-cloud-register.js
@@ -3,13 +3,16 @@ import '@polymer/paper-input/paper-input.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../../../src/components/buttons/ha-progress-button.js';
-import '../../../src/layouts/hass-subpage.js';
-import '../../../src/resources/ha-style.js';
-import '../../../src/util/hass-mixins.js';
+import '../../../components/buttons/ha-progress-button.js';
+import '../../../layouts/hass-subpage.js';
+import '../../../resources/ha-style.js';
 import '../ha-config-section.js';
+import EventsMixin from '../../../mixins/events-mixin.js';
 
-class HaConfigCloudRegister extends window.hassMixins.EventsMixin(PolymerElement) {
+/*
+ * @appliesMixin EventsMixin
+ */
+class HaConfigCloudRegister extends EventsMixin(PolymerElement) {
   static get template() {
     return html`
     <style include="iron-flex ha-style">
diff --git a/panels/config/cloud/ha-config-cloud.js b/src/panels/config/cloud/ha-config-cloud.js
similarity index 94%
rename from panels/config/cloud/ha-config-cloud.js
rename to src/panels/config/cloud/ha-config-cloud.js
index e8ec509f8c..7778634c17 100644
--- a/panels/config/cloud/ha-config-cloud.js
+++ b/src/panels/config/cloud/ha-config-cloud.js
@@ -4,12 +4,13 @@ import { Debouncer } from '@polymer/polymer/lib/utils/debounce.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../../../src/util/hass-mixins.js';
+
 import '../ha-config-section.js';
 import './ha-config-cloud-account.js';
 import './ha-config-cloud-forgot-password.js';
 import './ha-config-cloud-login.js';
 import './ha-config-cloud-register.js';
+import NavigateMixin from '../../../mixins/navigate-mixin.js';
 
 {
   const LOGGED_IN_URLS = [
@@ -21,7 +22,10 @@ import './ha-config-cloud-register.js';
     '/cloud/forgot-password',
   ];
 
-  class HaConfigCloud extends window.hassMixins.NavigateMixin(PolymerElement) {
+  /*
+   * @appliesMixin NavigateMixin
+   */
+  class HaConfigCloud extends NavigateMixin(PolymerElement) {
     static get template() {
       return html`
     <app-route route="[[route]]" pattern="/cloud/:page" data="{{_routeData}}" tail="{{_routeTail}}"></app-route>
diff --git a/panels/config/config-entries/ha-config-entries.js b/src/panels/config/config-entries/ha-config-entries.js
similarity index 94%
rename from panels/config/config-entries/ha-config-entries.js
rename to src/panels/config/config-entries/ha-config-entries.js
index 44fb7389a2..c961825458 100644
--- a/panels/config/config-entries/ha-config-entries.js
+++ b/src/panels/config/config-entries/ha-config-entries.js
@@ -5,19 +5,21 @@ import '@polymer/paper-item/paper-item-body.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../../../src/layouts/hass-subpage.js';
-import '../../../src/resources/ha-style.js';
-import '../../../src/util/hass-mixins.js';
+import '../../../layouts/hass-subpage.js';
+import '../../../resources/ha-style.js';
+
 import '../ha-config-section.js';
 import './ha-config-flow.js';
+import EventsMixin from '../../../mixins/events-mixin.js';
+import LocalizeMixin from '../../../mixins/localize-mixin.js';
 
 {
   /*
-   * @appliesMixin window.hassMixins.LocalizeMixin
-   * @appliesMixin window.hassMixins.EventsMixin
+   * @appliesMixin LocalizeMixin
+   * @appliesMixin EventsMixin
    */
   class HaConfigManager extends
-    window.hassMixins.LocalizeMixin(window.hassMixins.EventsMixin(PolymerElement)) {
+    LocalizeMixin(EventsMixin(PolymerElement)) {
     static get template() {
       return html`
     <style include="iron-flex ha-style">
diff --git a/panels/config/config-entries/ha-config-flow.js b/src/panels/config/config-entries/ha-config-flow.js
similarity index 94%
rename from panels/config/config-entries/ha-config-flow.js
rename to src/panels/config/config-entries/ha-config-flow.js
index 2afe1a845e..a7f07ee5af 100644
--- a/panels/config/config-entries/ha-config-flow.js
+++ b/src/panels/config/config-entries/ha-config-flow.js
@@ -4,17 +4,19 @@ import '@polymer/paper-dialog/paper-dialog.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../../../src/components/ha-form.js';
-import '../../../src/components/ha-markdown.js';
-import '../../../src/resources/ha-style.js';
-import '../../../src/util/hass-mixins.js';
+import '../../../components/ha-form.js';
+import '../../../components/ha-markdown.js';
+import '../../../resources/ha-style.js';
+
+import EventsMixin from '../../../mixins/events-mixin.js';
+import LocalizeMixin from '../../../mixins/localize-mixin.js';
 
 /*
- * @appliesMixin window.hassMixins.LocalizeMixin
- * @appliesMixin window.hassMixins.EventsMixin
+ * @appliesMixin LocalizeMixin
+ * @appliesMixin EventsMixin
  */
 class HaConfigFlow extends
-  window.hassMixins.LocalizeMixin(window.hassMixins.EventsMixin(PolymerElement)) {
+  LocalizeMixin(EventsMixin(PolymerElement)) {
   static get template() {
     return html`
     <style include="ha-style-dialog">
diff --git a/panels/config/core/ha-config-core.js b/src/panels/config/core/ha-config-core.js
similarity index 89%
rename from panels/config/core/ha-config-core.js
rename to src/panels/config/core/ha-config-core.js
index 630528d67f..5b1b2eaba8 100644
--- a/panels/config/core/ha-config-core.js
+++ b/src/panels/config/core/ha-config-core.js
@@ -4,20 +4,21 @@ import '@polymer/paper-icon-button/paper-icon-button.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../../../src/layouts/ha-app-layout.js';
-import '../../../src/resources/ha-style.js';
-import '../../../src/util/hass-mixins.js';
+import '../../../layouts/ha-app-layout.js';
+import '../../../resources/ha-style.js';
+
 import './ha-config-section-core.js';
 import './ha-config-section-push-notifications.js';
 import './ha-config-section-themes.js';
 import './ha-config-section-translation.js';
 
-import isComponentLoaded from '../../../js/common/config/is_component_loaded.js';
+import isComponentLoaded from '../../../common/config/is_component_loaded.js';
+import LocalizeMixin from '../../../mixins/localize-mixin.js';
 
 /*
- * @appliesMixin window.hassMixins.LocalizeMixin
+ * @appliesMixin LocalizeMixin
  */
-class HaConfigCore extends window.hassMixins.LocalizeMixin(PolymerElement) {
+class HaConfigCore extends LocalizeMixin(PolymerElement) {
   static get template() {
     return html`
     <style include="iron-flex ha-style">
diff --git a/panels/config/core/ha-config-section-core.js b/src/panels/config/core/ha-config-section-core.js
similarity index 93%
rename from panels/config/core/ha-config-section-core.js
rename to src/panels/config/core/ha-config-section-core.js
index ae06b90042..7498ca90c3 100644
--- a/panels/config/core/ha-config-section-core.js
+++ b/src/panels/config/core/ha-config-section-core.js
@@ -4,17 +4,18 @@ import '@polymer/paper-input/paper-input.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../../../src/components/buttons/ha-call-service-button.js';
-import '../../../src/resources/ha-style.js';
-import '../../../src/util/hass-mixins.js';
+import '../../../components/buttons/ha-call-service-button.js';
+import '../../../resources/ha-style.js';
+
 import '../ha-config-section.js';
 
-import isComponentLoaded from '../../../js/common/config/is_component_loaded.js';
+import isComponentLoaded from '../../../common/config/is_component_loaded.js';
+import LocalizeMixin from '../../../mixins/localize-mixin.js';
 
 /*
- * @appliesMixin window.hassMixins.LocalizeMixin
+ * @appliesMixin LocalizeMixin
  */
-class HaConfigSectionCore extends window.hassMixins.LocalizeMixin(PolymerElement) {
+class HaConfigSectionCore extends LocalizeMixin(PolymerElement) {
   static get template() {
     return html`
     <style include="iron-flex ha-style">
diff --git a/panels/config/core/ha-config-section-push-notifications.js b/src/panels/config/core/ha-config-section-push-notifications.js
similarity index 85%
rename from panels/config/core/ha-config-section-push-notifications.js
rename to src/panels/config/core/ha-config-section-push-notifications.js
index bdb1f6e1e6..eb5ac25a34 100644
--- a/panels/config/core/ha-config-section-push-notifications.js
+++ b/src/panels/config/core/ha-config-section-push-notifications.js
@@ -4,14 +4,15 @@ import '@polymer/paper-card/paper-card.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../../../src/components/ha-push-notifications-toggle.js';
-import '../../../src/util/hass-mixins.js';
+import '../../../components/ha-push-notifications-toggle.js';
+
 import '../ha-config-section.js';
+import LocalizeMixin from '../../../mixins/localize-mixin.js';
 
 /*
- * @appliesMixin window.hassMixins.LocalizeMixin
+ * @appliesMixin LocalizeMixin
  */
-class HaConfigSectionPushNotifications extends window.hassMixins.LocalizeMixin(PolymerElement) {
+class HaConfigSectionPushNotifications extends LocalizeMixin(PolymerElement) {
   static get template() {
     return html`
     <style include="iron-flex iron-flex-alignment iron-positioning">
diff --git a/panels/config/core/ha-config-section-themes.js b/src/panels/config/core/ha-config-section-themes.js
similarity index 91%
rename from panels/config/core/ha-config-section-themes.js
rename to src/panels/config/core/ha-config-section-themes.js
index c597c27f9c..161b700758 100644
--- a/panels/config/core/ha-config-section-themes.js
+++ b/src/panels/config/core/ha-config-section-themes.js
@@ -5,15 +5,17 @@ import '@polymer/paper-listbox/paper-listbox.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../../../src/util/hass-mixins.js';
+
 import '../ha-config-section.js';
+import EventsMixin from '../../../mixins/events-mixin.js';
+import LocalizeMixin from '../../../mixins/localize-mixin.js';
 
 /*
- * @appliesMixin window.hassMixins.LocalizeMixin
- * @appliesMixin window.hassMixins.EventsMixin
+ * @appliesMixin LocalizeMixin
+ * @appliesMixin EventsMixin
  */
 class HaConfigSectionThemes extends
-  window.hassMixins.LocalizeMixin(window.hassMixins.EventsMixin(PolymerElement)) {
+  LocalizeMixin(EventsMixin(PolymerElement)) {
   static get template() {
     return html`
     <ha-config-section is-wide="[[isWide]]">
diff --git a/panels/config/core/ha-config-section-translation.js b/src/panels/config/core/ha-config-section-translation.js
similarity index 91%
rename from panels/config/core/ha-config-section-translation.js
rename to src/panels/config/core/ha-config-section-translation.js
index 30f8a813f8..7d59853c5a 100644
--- a/panels/config/core/ha-config-section-translation.js
+++ b/src/panels/config/core/ha-config-section-translation.js
@@ -5,15 +5,17 @@ import '@polymer/paper-listbox/paper-listbox.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../../../src/util/hass-mixins.js';
+
 import '../ha-config-section.js';
+import EventsMixin from '../../../mixins/events-mixin.js';
+import LocalizeMixin from '../../../mixins/localize-mixin.js';
 
 /*
- * @appliesMixin window.hassMixins.LocalizeMixin
- * @appliesMixin window.hassMixins.EventsMixin
+ * @appliesMixin LocalizeMixin
+ * @appliesMixin EventsMixin
  */
 class HaConfigSectionTranslation extends
-  window.hassMixins.LocalizeMixin(window.hassMixins.EventsMixin(PolymerElement)) {
+  LocalizeMixin(EventsMixin(PolymerElement)) {
   static get template() {
     return html`
     <ha-config-section is-wide="[[isWide]]">
diff --git a/panels/config/customize/ha-config-customize.js b/src/panels/config/customize/ha-config-customize.js
similarity index 83%
rename from panels/config/customize/ha-config-customize.js
rename to src/panels/config/customize/ha-config-customize.js
index 6ac6e8b000..e18a6d2356 100644
--- a/panels/config/customize/ha-config-customize.js
+++ b/src/panels/config/customize/ha-config-customize.js
@@ -5,20 +5,21 @@ import '@polymer/paper-icon-button/paper-icon-button.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../../../src/resources/ha-style.js';
-import '../../../src/util/hass-mixins.js';
+import '../../../resources/ha-style.js';
+
 import '../ha-config-section.js';
 import '../ha-entity-config.js';
 import './ha-form-customize.js';
 
-import computeStateName from '../../../js/common/entity/compute_state_name.js';
-import computeStateDomain from '../../../js/common/entity/compute_state_domain.js';
-import sortByName from '../../../js/common/entity/states_sort_by_name.js';
+import computeStateName from '../../../common/entity/compute_state_name.js';
+import computeStateDomain from '../../../common/entity/compute_state_domain.js';
+import sortByName from '../../../common/entity/states_sort_by_name.js';
+import LocalizeMixin from '../../../mixins/localize-mixin.js';
 
 /*
- * @appliesMixin window.hassMixins.LocalizeMixin
+ * @appliesMixin LocalizeMixin
  */
-class HaConfigCustomize extends window.hassMixins.LocalizeMixin(PolymerElement) {
+class HaConfigCustomize extends LocalizeMixin(PolymerElement) {
   static get template() {
     return html`
     <style include="ha-style">
diff --git a/panels/config/customize/ha-customize-attribute.js b/src/panels/config/customize/ha-customize-attribute.js
similarity index 97%
rename from panels/config/customize/ha-customize-attribute.js
rename to src/panels/config/customize/ha-customize-attribute.js
index 643fb90a9c..3fdd516473 100644
--- a/panels/config/customize/ha-customize-attribute.js
+++ b/src/panels/config/customize/ha-customize-attribute.js
@@ -2,7 +2,7 @@ import '@polymer/paper-icon-button/paper-icon-button.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../../../src/util/hass-attributes-util.js';
+import '../../../util/hass-attributes-util.js';
 import '../ha-form-style.js';
 import './types/ha-customize-array.js';
 import './types/ha-customize-boolean.js';
diff --git a/panels/config/customize/ha-form-customize-attributes.js b/src/panels/config/customize/ha-form-customize-attributes.js
similarity index 100%
rename from panels/config/customize/ha-form-customize-attributes.js
rename to src/panels/config/customize/ha-form-customize-attributes.js
diff --git a/panels/config/customize/ha-form-customize.js b/src/panels/config/customize/ha-form-customize.js
similarity index 98%
rename from panels/config/customize/ha-form-customize.js
rename to src/panels/config/customize/ha-form-customize.js
index 02b0b7466d..46e739e567 100644
--- a/panels/config/customize/ha-form-customize.js
+++ b/src/panels/config/customize/ha-form-customize.js
@@ -4,10 +4,10 @@ import '@polymer/paper-listbox/paper-listbox.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../../../src/util/hass-attributes-util.js';
+import '../../../util/hass-attributes-util.js';
 import './ha-form-customize-attributes.js';
 
-import computeDomain from '../../../js/common/entity/compute_domain';
+import computeDomain from '../../../common/entity/compute_domain';
 
 class HaFormCustomize extends PolymerElement {
   static get template() {
diff --git a/panels/config/customize/types/ha-customize-array.js b/src/panels/config/customize/types/ha-customize-array.js
similarity index 89%
rename from panels/config/customize/types/ha-customize-array.js
rename to src/panels/config/customize/types/ha-customize-array.js
index ce6d2e9e7d..56e249c7d0 100644
--- a/panels/config/customize/types/ha-customize-array.js
+++ b/src/panels/config/customize/types/ha-customize-array.js
@@ -4,9 +4,12 @@ import '@polymer/paper-listbox/paper-listbox.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../../../../src/util/hass-mixins.js';
+import EventsMixin from '../../../../mixins/events-mixin.js';
 
-class HaCustomizeArray extends window.hassMixins.EventsMixin(PolymerElement) {
+/*
+ * @appliesMixin EventsMixin
+ */
+class HaCustomizeArray extends EventsMixin(PolymerElement) {
   static get template() {
     return html`
     <style>
diff --git a/panels/config/customize/types/ha-customize-boolean.js b/src/panels/config/customize/types/ha-customize-boolean.js
similarity index 100%
rename from panels/config/customize/types/ha-customize-boolean.js
rename to src/panels/config/customize/types/ha-customize-boolean.js
diff --git a/panels/config/customize/types/ha-customize-icon.js b/src/panels/config/customize/types/ha-customize-icon.js
similarity index 100%
rename from panels/config/customize/types/ha-customize-icon.js
rename to src/panels/config/customize/types/ha-customize-icon.js
diff --git a/panels/config/customize/types/ha-customize-key-value.js b/src/panels/config/customize/types/ha-customize-key-value.js
similarity index 100%
rename from panels/config/customize/types/ha-customize-key-value.js
rename to src/panels/config/customize/types/ha-customize-key-value.js
diff --git a/panels/config/customize/types/ha-customize-string.js b/src/panels/config/customize/types/ha-customize-string.js
similarity index 100%
rename from panels/config/customize/types/ha-customize-string.js
rename to src/panels/config/customize/types/ha-customize-string.js
diff --git a/panels/config/dashboard/ha-config-cloud-menu.js b/src/panels/config/dashboard/ha-config-cloud-menu.js
similarity index 88%
rename from panels/config/dashboard/ha-config-cloud-menu.js
rename to src/panels/config/dashboard/ha-config-cloud-menu.js
index 7906d90f7c..f3a381bf5d 100644
--- a/panels/config/dashboard/ha-config-cloud-menu.js
+++ b/src/panels/config/dashboard/ha-config-cloud-menu.js
@@ -5,9 +5,12 @@ import '@polymer/paper-item/paper-item.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../../../src/util/hass-mixins.js';
+import NavigateMixin from '../../../mixins/navigate-mixin.js';
 
-class HaConfigCloudMenu extends window.hassMixins.NavigateMixin(PolymerElement) {
+/*
+ * @appliesMixin NavigateMixin
+ */
+class HaConfigCloudMenu extends NavigateMixin(PolymerElement) {
   static get template() {
     return html`
     <style include="iron-flex">
diff --git a/panels/config/dashboard/ha-config-dashboard.js b/src/panels/config/dashboard/ha-config-dashboard.js
similarity index 86%
rename from panels/config/dashboard/ha-config-dashboard.js
rename to src/panels/config/dashboard/ha-config-dashboard.js
index ef9308dfb1..2919d63b5c 100644
--- a/panels/config/dashboard/ha-config-dashboard.js
+++ b/src/panels/config/dashboard/ha-config-dashboard.js
@@ -4,19 +4,20 @@ import '@polymer/app-layout/app-toolbar/app-toolbar.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../../../src/components/ha-menu-button.js';
-import '../../../src/util/hass-mixins.js';
+import '../../../components/ha-menu-button.js';
+
 import '../ha-config-section.js';
 import './ha-config-cloud-menu.js';
 import './ha-config-entries-menu.js';
 import './ha-config-navigation.js';
 
-import isComponentLoaded from '../../../js/common/config/is_component_loaded.js';
+import isComponentLoaded from '../../../common/config/is_component_loaded.js';
+import LocalizeMixin from '../../../mixins/localize-mixin.js';
 
 /*
- * @appliesMixin window.hassMixins.LocalizeMixin
+ * @appliesMixin LocalizeMixin
  */
-class HaConfigDashboard extends window.hassMixins.LocalizeMixin(PolymerElement) {
+class HaConfigDashboard extends LocalizeMixin(PolymerElement) {
   static get template() {
     return html`
     <style include="iron-flex ha-style">
diff --git a/panels/config/dashboard/ha-config-entries-menu.js b/src/panels/config/dashboard/ha-config-entries-menu.js
similarity index 86%
rename from panels/config/dashboard/ha-config-entries-menu.js
rename to src/panels/config/dashboard/ha-config-entries-menu.js
index 8cd919bbb1..a83666b35d 100644
--- a/panels/config/dashboard/ha-config-entries-menu.js
+++ b/src/panels/config/dashboard/ha-config-entries-menu.js
@@ -5,9 +5,12 @@ import '@polymer/paper-item/paper-item.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../../../src/util/hass-mixins.js';
+import NavigateMixin from '../../../mixins/navigate-mixin.js';
 
-class HaConfigEntriesMenu extends window.hassMixins.NavigateMixin(PolymerElement) {
+/*
+ * @appliesMixin NavigateMixin
+ */
+class HaConfigEntriesMenu extends NavigateMixin(PolymerElement) {
   static get template() {
     return html`
     <style include="iron-flex">
diff --git a/panels/config/dashboard/ha-config-navigation.js b/src/panels/config/dashboard/ha-config-navigation.js
similarity index 85%
rename from panels/config/dashboard/ha-config-navigation.js
rename to src/panels/config/dashboard/ha-config-navigation.js
index 7f24293a8b..bce835a014 100644
--- a/panels/config/dashboard/ha-config-navigation.js
+++ b/src/panels/config/dashboard/ha-config-navigation.js
@@ -5,9 +5,11 @@ import '@polymer/paper-item/paper-item.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../../../src/util/hass-mixins.js';
 
-import isComponentLoaded from '../../../js/common/config/is_component_loaded.js';
+import NavigateMixin from '../../../mixins/navigate-mixin.js';
+import LocalizeMixin from '../../../mixins/localize-mixin.js';
+
+import isComponentLoaded from '../../../common/config/is_component_loaded.js';
 
 {
   const CORE_PAGES = [
@@ -15,11 +17,11 @@ import isComponentLoaded from '../../../js/common/config/is_component_loaded.js'
     'customize',
   ];
   /*
-   * @appliesMixin window.hassMixins.LocalizeMixin
-   * @appliesMixin window.hassMixins.EventsMixin
+   * @appliesMixin LocalizeMixin
+   * @appliesMixin NavigateMixin
    */
   class HaConfigNavigation extends
-    window.hassMixins.LocalizeMixin(window.hassMixins.NavigateMixin(PolymerElement)) {
+    LocalizeMixin(NavigateMixin(PolymerElement)) {
     static get template() {
       return html`
     <style include="iron-flex">
diff --git a/panels/config/ha-config-section.js b/src/panels/config/ha-config-section.js
similarity index 98%
rename from panels/config/ha-config-section.js
rename to src/panels/config/ha-config-section.js
index 68253d8d07..3d1207c43a 100644
--- a/panels/config/ha-config-section.js
+++ b/src/panels/config/ha-config-section.js
@@ -1,7 +1,7 @@
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../../src/resources/ha-style.js';
+import '../../resources/ha-style.js';
 
 class HaConfigSection extends PolymerElement {
   static get template() {
diff --git a/panels/config/ha-entity-config.js b/src/panels/config/ha-entity-config.js
similarity index 98%
rename from panels/config/ha-entity-config.js
rename to src/panels/config/ha-entity-config.js
index a9f1389d61..292743da66 100644
--- a/panels/config/ha-entity-config.js
+++ b/src/panels/config/ha-entity-config.js
@@ -7,7 +7,7 @@ import '@polymer/paper-spinner/paper-spinner.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import computeStateName from '../../js/common/entity/compute_state_name.js';
+import computeStateName from '../../common/entity/compute_state_name.js';
 
 class HaEntityConfig extends PolymerElement {
   static get template() {
diff --git a/panels/config/ha-form-style.js b/src/panels/config/ha-form-style.js
similarity index 100%
rename from panels/config/ha-form-style.js
rename to src/panels/config/ha-form-style.js
diff --git a/panels/config/ha-panel-config.js b/src/panels/config/ha-panel-config.js
similarity index 93%
rename from panels/config/ha-panel-config.js
rename to src/panels/config/ha-panel-config.js
index 153af1ccb8..9aee750918 100644
--- a/panels/config/ha-panel-config.js
+++ b/src/panels/config/ha-panel-config.js
@@ -3,8 +3,8 @@ import '@polymer/iron-media-query/iron-media-query.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../../src/layouts/hass-error-screen.js';
-import '../../src/util/hass-mixins.js';
+import '../../layouts/hass-error-screen.js';
+
 import './automation/ha-config-automation.js';
 import './cloud/ha-config-cloud.js';
 import './config-entries/ha-config-entries.js';
@@ -14,9 +14,13 @@ import './dashboard/ha-config-dashboard.js';
 import './script/ha-config-script.js';
 import './zwave/ha-config-zwave.js';
 
-import isComponentLoaded from '../../js/common/config/is_component_loaded.js';
+import isComponentLoaded from '../../common/config/is_component_loaded.js';
+import NavigateMixin from '../../mixins/navigate-mixin.js';
 
-class HaPanelConfig extends window.hassMixins.NavigateMixin(PolymerElement) {
+/*
+ * @appliesMixin NavigateMixin
+ */
+class HaPanelConfig extends NavigateMixin(PolymerElement) {
   static get template() {
     return html`
     <app-route
diff --git a/js/panel-config/automation.js b/src/panels/config/js/automation.js
similarity index 100%
rename from js/panel-config/automation.js
rename to src/panels/config/js/automation.js
diff --git a/js/panel-config/condition/condition_edit.js b/src/panels/config/js/condition/condition_edit.js
similarity index 100%
rename from js/panel-config/condition/condition_edit.js
rename to src/panels/config/js/condition/condition_edit.js
diff --git a/js/panel-config/condition/condition_row.js b/src/panels/config/js/condition/condition_row.js
similarity index 100%
rename from js/panel-config/condition/condition_row.js
rename to src/panels/config/js/condition/condition_row.js
diff --git a/js/panel-config/condition/index.js b/src/panels/config/js/condition/index.js
similarity index 100%
rename from js/panel-config/condition/index.js
rename to src/panels/config/js/condition/index.js
diff --git a/js/panel-config/condition/numeric_state.js b/src/panels/config/js/condition/numeric_state.js
similarity index 95%
rename from js/panel-config/condition/numeric_state.js
rename to src/panels/config/js/condition/numeric_state.js
index a1647860af..cfe1c4c72a 100644
--- a/js/panel-config/condition/numeric_state.js
+++ b/src/panels/config/js/condition/numeric_state.js
@@ -1,6 +1,6 @@
 import { h, Component } from 'preact';
 
-import { onChangeEvent } from '../../common/preact/event.js';
+import { onChangeEvent } from '../../../../common/preact/event.js';
 
 export default class NumericStateCondition extends Component {
   constructor() {
diff --git a/js/panel-config/condition/state.js b/src/panels/config/js/condition/state.js
similarity index 94%
rename from js/panel-config/condition/state.js
rename to src/panels/config/js/condition/state.js
index 414aaf2032..2e04d27442 100644
--- a/js/panel-config/condition/state.js
+++ b/src/panels/config/js/condition/state.js
@@ -1,6 +1,6 @@
 import { h, Component } from 'preact';
 
-import { onChangeEvent } from '../../common/preact/event.js';
+import { onChangeEvent } from '../../../../common/preact/event.js';
 
 export default class StateCondition extends Component {
   constructor() {
diff --git a/js/panel-config/condition/sun.js b/src/panels/config/js/condition/sun.js
similarity index 97%
rename from js/panel-config/condition/sun.js
rename to src/panels/config/js/condition/sun.js
index e4786c693e..c57c8ca9cd 100644
--- a/js/panel-config/condition/sun.js
+++ b/src/panels/config/js/condition/sun.js
@@ -1,6 +1,6 @@
 import { h, Component } from 'preact';
 
-import { onChangeEvent } from '../../common/preact/event.js';
+import { onChangeEvent } from '../../../../common/preact/event.js';
 
 export default class SunCondition extends Component {
   constructor() {
diff --git a/js/panel-config/condition/template.js b/src/panels/config/js/condition/template.js
similarity index 90%
rename from js/panel-config/condition/template.js
rename to src/panels/config/js/condition/template.js
index 2f6481e55c..07033e9bcf 100644
--- a/js/panel-config/condition/template.js
+++ b/src/panels/config/js/condition/template.js
@@ -1,6 +1,6 @@
 import { h, Component } from 'preact';
 
-import { onChangeEvent } from '../../common/preact/event.js';
+import { onChangeEvent } from '../../../../common/preact/event.js';
 
 export default class TemplateCondition extends Component {
   constructor() {
diff --git a/js/panel-config/condition/time.js b/src/panels/config/js/condition/time.js
similarity index 92%
rename from js/panel-config/condition/time.js
rename to src/panels/config/js/condition/time.js
index ded00c3c75..2f78b977ee 100644
--- a/js/panel-config/condition/time.js
+++ b/src/panels/config/js/condition/time.js
@@ -1,6 +1,6 @@
 import { h, Component } from 'preact';
 
-import { onChangeEvent } from '../../common/preact/event.js';
+import { onChangeEvent } from '../../../../common/preact/event.js';
 
 export default class TimeCondition extends Component {
   constructor() {
diff --git a/js/panel-config/condition/zone.js b/src/panels/config/js/condition/zone.js
similarity index 87%
rename from js/panel-config/condition/zone.js
rename to src/panels/config/js/condition/zone.js
index f28259d8ef..459d4dddd8 100644
--- a/js/panel-config/condition/zone.js
+++ b/src/panels/config/js/condition/zone.js
@@ -1,8 +1,8 @@
 import { h, Component } from 'preact';
 
-import { onChangeEvent } from '../../common/preact/event.js';
-import hasLocation from '../../common/entity/has_location.js';
-import computeStateDomain from '../../common/entity/compute_state_domain.js';
+import { onChangeEvent } from '../../../../common/preact/event.js';
+import hasLocation from '../../../../common/entity/has_location.js';
+import computeStateDomain from '../../../../common/entity/compute_state_domain.js';
 
 function zoneAndLocationFilter(stateObj) {
   return hasLocation(stateObj) && computeStateDomain(stateObj) !== 'zone';
diff --git a/js/panel-config/json_textarea.js b/src/panels/config/js/json_textarea.js
similarity index 100%
rename from js/panel-config/json_textarea.js
rename to src/panels/config/js/json_textarea.js
diff --git a/js/panel-config/script.js b/src/panels/config/js/script.js
similarity index 100%
rename from js/panel-config/script.js
rename to src/panels/config/js/script.js
diff --git a/js/panel-config/script/action_edit.js b/src/panels/config/js/script/action_edit.js
similarity index 100%
rename from js/panel-config/script/action_edit.js
rename to src/panels/config/js/script/action_edit.js
diff --git a/js/panel-config/script/action_row.js b/src/panels/config/js/script/action_row.js
similarity index 100%
rename from js/panel-config/script/action_row.js
rename to src/panels/config/js/script/action_row.js
diff --git a/js/panel-config/script/call_service.js b/src/panels/config/js/script/call_service.js
similarity index 100%
rename from js/panel-config/script/call_service.js
rename to src/panels/config/js/script/call_service.js
diff --git a/js/panel-config/script/condition.js b/src/panels/config/js/script/condition.js
similarity index 100%
rename from js/panel-config/script/condition.js
rename to src/panels/config/js/script/condition.js
diff --git a/js/panel-config/script/delay.js b/src/panels/config/js/script/delay.js
similarity index 89%
rename from js/panel-config/script/delay.js
rename to src/panels/config/js/script/delay.js
index a962f330d0..2d9ffe280d 100644
--- a/js/panel-config/script/delay.js
+++ b/src/panels/config/js/script/delay.js
@@ -1,5 +1,5 @@
 import { h, Component } from 'preact';
-import { onChangeEvent } from '../../common/preact/event.js';
+import { onChangeEvent } from '../../../../common/preact/event.js';
 
 export default class DelayAction extends Component {
   constructor() {
diff --git a/js/panel-config/script/event.js b/src/panels/config/js/script/event.js
similarity index 94%
rename from js/panel-config/script/event.js
rename to src/panels/config/js/script/event.js
index 085ed6236f..f9850969cd 100644
--- a/js/panel-config/script/event.js
+++ b/src/panels/config/js/script/event.js
@@ -1,7 +1,7 @@
 import { h, Component } from 'preact';
 
 import JSONTextArea from '../json_textarea.js';
-import { onChangeEvent } from '../../common/preact/event.js';
+import { onChangeEvent } from '../../../../common/preact/event.js';
 
 export default class EventAction extends Component {
   constructor() {
diff --git a/js/panel-config/script/index.js b/src/panels/config/js/script/index.js
similarity index 100%
rename from js/panel-config/script/index.js
rename to src/panels/config/js/script/index.js
diff --git a/js/panel-config/script/wait.js b/src/panels/config/js/script/wait.js
similarity index 94%
rename from js/panel-config/script/wait.js
rename to src/panels/config/js/script/wait.js
index 66945a5e8d..c27974d967 100644
--- a/js/panel-config/script/wait.js
+++ b/src/panels/config/js/script/wait.js
@@ -1,5 +1,5 @@
 import { h, Component } from 'preact';
-import { onChangeEvent } from '../../common/preact/event.js';
+import { onChangeEvent } from '../../../../common/preact/event.js';
 
 export default class WaitAction extends Component {
   constructor() {
diff --git a/js/panel-config/trigger/event.js b/src/panels/config/js/trigger/event.js
similarity index 94%
rename from js/panel-config/trigger/event.js
rename to src/panels/config/js/trigger/event.js
index b00beae029..4c6d043b35 100644
--- a/js/panel-config/trigger/event.js
+++ b/src/panels/config/js/trigger/event.js
@@ -1,7 +1,7 @@
 import { h, Component } from 'preact';
 
 import JSONTextArea from '../json_textarea.js';
-import { onChangeEvent } from '../../common/preact/event.js';
+import { onChangeEvent } from '../../../../common/preact/event.js';
 
 export default class EventTrigger extends Component {
   constructor() {
diff --git a/js/panel-config/trigger/homeassistant.js b/src/panels/config/js/trigger/homeassistant.js
similarity index 100%
rename from js/panel-config/trigger/homeassistant.js
rename to src/panels/config/js/trigger/homeassistant.js
diff --git a/js/panel-config/trigger/index.js b/src/panels/config/js/trigger/index.js
similarity index 100%
rename from js/panel-config/trigger/index.js
rename to src/panels/config/js/trigger/index.js
diff --git a/js/panel-config/trigger/mqtt.js b/src/panels/config/js/trigger/mqtt.js
similarity index 92%
rename from js/panel-config/trigger/mqtt.js
rename to src/panels/config/js/trigger/mqtt.js
index 5f4c2bd012..20917dd777 100644
--- a/js/panel-config/trigger/mqtt.js
+++ b/src/panels/config/js/trigger/mqtt.js
@@ -1,6 +1,6 @@
 import { h, Component } from 'preact';
 
-import { onChangeEvent } from '../../common/preact/event.js';
+import { onChangeEvent } from '../../../../common/preact/event.js';
 
 export default class MQTTTrigger extends Component {
   constructor() {
diff --git a/js/panel-config/trigger/numeric_state.js b/src/panels/config/js/trigger/numeric_state.js
similarity index 95%
rename from js/panel-config/trigger/numeric_state.js
rename to src/panels/config/js/trigger/numeric_state.js
index f680c95833..1f716a50f9 100644
--- a/js/panel-config/trigger/numeric_state.js
+++ b/src/panels/config/js/trigger/numeric_state.js
@@ -1,6 +1,6 @@
 import { h, Component } from 'preact';
 
-import { onChangeEvent } from '../../common/preact/event.js';
+import { onChangeEvent } from '../../../../common/preact/event.js';
 
 export default class NumericStateTrigger extends Component {
   constructor() {
diff --git a/js/panel-config/trigger/state.js b/src/panels/config/js/trigger/state.js
similarity index 95%
rename from js/panel-config/trigger/state.js
rename to src/panels/config/js/trigger/state.js
index 933fbd3490..aea4f8d60f 100644
--- a/js/panel-config/trigger/state.js
+++ b/src/panels/config/js/trigger/state.js
@@ -1,6 +1,6 @@
 import { h, Component } from 'preact';
 
-import { onChangeEvent } from '../../common/preact/event.js';
+import { onChangeEvent } from '../../../../common/preact/event.js';
 
 export default class StateTrigger extends Component {
   constructor() {
diff --git a/js/panel-config/trigger/sun.js b/src/panels/config/js/trigger/sun.js
similarity index 95%
rename from js/panel-config/trigger/sun.js
rename to src/panels/config/js/trigger/sun.js
index 43e0126147..28e6444ccb 100644
--- a/js/panel-config/trigger/sun.js
+++ b/src/panels/config/js/trigger/sun.js
@@ -1,6 +1,6 @@
 import { h, Component } from 'preact';
 
-import { onChangeEvent } from '../../common/preact/event.js';
+import { onChangeEvent } from '../../../../common/preact/event.js';
 
 export default class SunTrigger extends Component {
   constructor() {
diff --git a/js/panel-config/trigger/template.js b/src/panels/config/js/trigger/template.js
similarity index 90%
rename from js/panel-config/trigger/template.js
rename to src/panels/config/js/trigger/template.js
index 527eb3c208..395afa4328 100644
--- a/js/panel-config/trigger/template.js
+++ b/src/panels/config/js/trigger/template.js
@@ -1,6 +1,6 @@
 import { h, Component } from 'preact';
 
-import { onChangeEvent } from '../../common/preact/event.js';
+import { onChangeEvent } from '../../../../common/preact/event.js';
 
 export default class TemplateTrigger extends Component {
   constructor() {
diff --git a/js/panel-config/trigger/time.js b/src/panels/config/js/trigger/time.js
similarity index 89%
rename from js/panel-config/trigger/time.js
rename to src/panels/config/js/trigger/time.js
index 58c6e67ac4..e1e2fc2f71 100644
--- a/js/panel-config/trigger/time.js
+++ b/src/panels/config/js/trigger/time.js
@@ -1,6 +1,6 @@
 import { h, Component } from 'preact';
 
-import { onChangeEvent } from '../../common/preact/event.js';
+import { onChangeEvent } from '../../../../common/preact/event.js';
 
 export default class TimeTrigger extends Component {
   constructor() {
diff --git a/js/panel-config/trigger/trigger_edit.js b/src/panels/config/js/trigger/trigger_edit.js
similarity index 100%
rename from js/panel-config/trigger/trigger_edit.js
rename to src/panels/config/js/trigger/trigger_edit.js
diff --git a/js/panel-config/trigger/trigger_row.js b/src/panels/config/js/trigger/trigger_row.js
similarity index 100%
rename from js/panel-config/trigger/trigger_row.js
rename to src/panels/config/js/trigger/trigger_row.js
diff --git a/js/panel-config/trigger/zone.js b/src/panels/config/js/trigger/zone.js
similarity index 91%
rename from js/panel-config/trigger/zone.js
rename to src/panels/config/js/trigger/zone.js
index e4d77182d2..2e6df1b491 100644
--- a/js/panel-config/trigger/zone.js
+++ b/src/panels/config/js/trigger/zone.js
@@ -1,8 +1,8 @@
 import { h, Component } from 'preact';
 
-import { onChangeEvent } from '../../common/preact/event.js';
-import hasLocation from '../../common/entity/has_location.js';
-import computeStateDomain from '../../common/entity/compute_state_domain.js';
+import { onChangeEvent } from '../../../../common/preact/event.js';
+import hasLocation from '../../../../common/entity/has_location.js';
+import computeStateDomain from '../../../../common/entity/compute_state_domain.js';
 
 function zoneAndLocationFilter(stateObj) {
   return hasLocation(stateObj) && computeStateDomain(stateObj) !== 'zone';
diff --git a/panels/config/script/ha-config-script.js b/src/panels/config/script/ha-config-script.js
similarity index 94%
rename from panels/config/script/ha-config-script.js
rename to src/panels/config/script/ha-config-script.js
index b43ad9975e..1ad58d300c 100644
--- a/panels/config/script/ha-config-script.js
+++ b/src/panels/config/script/ha-config-script.js
@@ -5,8 +5,8 @@ import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 import './ha-script-editor.js';
 import './ha-script-picker.js';
 
-import computeStateName from '../../../js/common/entity/compute_state_name.js';
-import computeStateDomain from '../../../js/common/entity/compute_state_domain.js';
+import computeStateName from '../../../common/entity/compute_state_name.js';
+import computeStateDomain from '../../../common/entity/compute_state_domain.js';
 
 class HaConfigScript extends PolymerElement {
   static get template() {
diff --git a/panels/config/script/ha-script-editor.js b/src/panels/config/script/ha-script-editor.js
similarity index 91%
rename from panels/config/script/ha-script-editor.js
rename to src/panels/config/script/ha-script-editor.js
index c8b547247f..bc74b7be84 100644
--- a/panels/config/script/ha-script-editor.js
+++ b/src/panels/config/script/ha-script-editor.js
@@ -17,26 +17,29 @@ import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 import { h, render } from 'preact';
 
-import '../../../src/components/entity/ha-entity-picker.js';
-import '../../../src/components/ha-combo-box.js';
-import '../../../src/layouts/ha-app-layout.js';
-import '../../../src/util/hass-mixins.js';
-import '../ha-config-section.js';
-import Script from '../../../js/panel-config/script.js';
-import unmountPreact from '../../../js/common/preact/unmount.js';
+import '../../../components/entity/ha-entity-picker.js';
+import '../../../components/ha-combo-box.js';
+import '../../../layouts/ha-app-layout.js';
 
-import computeObjectId from '../../../js/common/entity/compute_object_id.js';
-import computeStateName from '../../../js/common/entity/compute_state_name.js';
+import '../ha-config-section.js';
+import Script from '../js/script.js';
+import unmountPreact from '../../../common/preact/unmount.js';
+
+import computeObjectId from '../../../common/entity/compute_object_id.js';
+import computeStateName from '../../../common/entity/compute_state_name.js';
+import NavigateMixin from '../../../mixins/navigate-mixin.js';
+import LocalizeMixin from '../../../mixins/localize-mixin.js';
 
 function ScriptEditor(mountEl, props, mergeEl) {
   return render(h(Script, props), mountEl, mergeEl);
 }
 
 /*
- * @appliesMixin window.hassMixins.LocalizeMixin
+ * @appliesMixin LocalizeMixin
+ * @appliesMixin NavigateMixin
  */
 class HaScriptEditor extends
-  window.hassMixins.LocalizeMixin(window.hassMixins.NavigateMixin(PolymerElement)) {
+  LocalizeMixin(NavigateMixin(PolymerElement)) {
   static get template() {
     return html`
     <style include="ha-style">
diff --git a/panels/config/script/ha-script-picker.js b/src/panels/config/script/ha-script-picker.js
similarity index 89%
rename from panels/config/script/ha-script-picker.js
rename to src/panels/config/script/ha-script-picker.js
index 43a5f97f3e..3e6cb898ee 100644
--- a/panels/config/script/ha-script-picker.js
+++ b/src/panels/config/script/ha-script-picker.js
@@ -8,18 +8,19 @@ import '@polymer/paper-item/paper-item.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../../../src/layouts/ha-app-layout.js';
-import '../../../src/util/hass-mixins.js';
+import '../../../layouts/ha-app-layout.js';
+
 import '../ha-config-section.js';
 
-import computeStateName from '../../../js/common/entity/compute_state_name.js';
+import computeStateName from '../../../common/entity/compute_state_name.js';
+import NavigateMixin from '../../../mixins/navigate-mixin.js';
+import LocalizeMixin from '../../../mixins/localize-mixin.js';
 
 /*
- * @appliesMixin window.hassMixins.LocalizeMixin
- * @appliesMixin window.hassMixins.EventsMixin
+ * @appliesMixin LocalizeMixin
+ * @appliesMixin NavigateMixin
  */
-class HaScriptPicker extends
-  window.hassMixins.LocalizeMixin(window.hassMixins.NavigateMixin(PolymerElement)) {
+class HaScriptPicker extends LocalizeMixin(NavigateMixin(PolymerElement)) {
   static get template() {
     return html`
     <style include="ha-style">
diff --git a/panels/config/zwave/ha-config-zwave.js b/src/panels/config/zwave/ha-config-zwave.js
similarity index 95%
rename from panels/config/zwave/ha-config-zwave.js
rename to src/panels/config/zwave/ha-config-zwave.js
index 89b7f00ca2..6a1c0a5e55 100644
--- a/panels/config/zwave/ha-config-zwave.js
+++ b/src/panels/config/zwave/ha-config-zwave.js
@@ -9,12 +9,12 @@ import '@polymer/paper-listbox/paper-listbox.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../../../src/components/buttons/ha-call-service-button.js';
-import '../../../src/components/ha-menu-button.js';
-import '../../../src/components/ha-service-description.js';
-import '../../../src/layouts/ha-app-layout.js';
-import '../../../src/resources/ha-style.js';
-import '../../../src/util/hass-mixins.js';
+import '../../../components/buttons/ha-call-service-button.js';
+import '../../../components/ha-menu-button.js';
+import '../../../components/ha-service-description.js';
+import '../../../layouts/ha-app-layout.js';
+import '../../../resources/ha-style.js';
+
 import '../ha-config-section.js';
 import '../ha-form-style.js';
 import './zwave-groups.js';
@@ -25,13 +25,15 @@ import './zwave-node-information.js';
 import './zwave-usercodes.js';
 import './zwave-values.js';
 
-import sortByName from '../../../js/common/entity/states_sort_by_name.js';
-import computeStateName from '../../../js/common/entity/compute_state_name.js';
-import computeStateDomain from '../../../js/common/entity/compute_state_domain.js';
+import sortByName from '../../../common/entity/states_sort_by_name.js';
+import computeStateName from '../../../common/entity/compute_state_name.js';
+import computeStateDomain from '../../../common/entity/compute_state_domain.js';
+import LocalizeMixin from '../../../mixins/localize-mixin.js';
+
 /*
- * @appliesMixin window.hassMixins.LocalizeMixin
+ * @appliesMixin LocalizeMixin
  */
-class HaConfigZwave extends window.hassMixins.LocalizeMixin(PolymerElement) {
+class HaConfigZwave extends LocalizeMixin(PolymerElement) {
   static get template() {
     return html`
     <style include="iron-flex ha-style ha-form-style">
diff --git a/panels/config/zwave/zwave-groups.js b/src/panels/config/zwave/zwave-groups.js
similarity index 98%
rename from panels/config/zwave/zwave-groups.js
rename to src/panels/config/zwave/zwave-groups.js
index d61fabaf83..3db14ad4f5 100644
--- a/panels/config/zwave/zwave-groups.js
+++ b/src/panels/config/zwave/zwave-groups.js
@@ -5,9 +5,9 @@ import '@polymer/paper-listbox/paper-listbox.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../../../src/components/buttons/ha-call-service-button.js';
+import '../../../components/buttons/ha-call-service-button.js';
 
-import computeStateName from '../../../js/common/entity/compute_state_name.js';
+import computeStateName from '../../../common/entity/compute_state_name.js';
 
 class ZwaveGroups extends PolymerElement {
   static get template() {
diff --git a/panels/config/zwave/zwave-log.js b/src/panels/config/zwave/zwave-log.js
similarity index 100%
rename from panels/config/zwave/zwave-log.js
rename to src/panels/config/zwave/zwave-log.js
diff --git a/panels/config/zwave/zwave-network.js b/src/panels/config/zwave/zwave-network.js
similarity index 95%
rename from panels/config/zwave/zwave-network.js
rename to src/panels/config/zwave/zwave-network.js
index fb07c6b7c5..a4b25b14f8 100644
--- a/panels/config/zwave/zwave-network.js
+++ b/src/panels/config/zwave/zwave-network.js
@@ -3,9 +3,9 @@ import '@polymer/paper-icon-button/paper-icon-button.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../../../src/components/buttons/ha-call-api-button.js';
-import '../../../src/components/buttons/ha-call-service-button.js';
-import '../../../src/components/ha-service-description.js';
+import '../../../components/buttons/ha-call-api-button.js';
+import '../../../components/buttons/ha-call-service-button.js';
+import '../../../components/ha-service-description.js';
 import '../ha-config-section.js';
 
 class ZwaveNetwork extends PolymerElement {
diff --git a/panels/config/zwave/zwave-node-config.js b/src/panels/config/zwave/zwave-node-config.js
similarity index 99%
rename from panels/config/zwave/zwave-node-config.js
rename to src/panels/config/zwave/zwave-node-config.js
index 8f75aaf459..0e6dc02723 100644
--- a/panels/config/zwave/zwave-node-config.js
+++ b/src/panels/config/zwave/zwave-node-config.js
@@ -6,7 +6,7 @@ import '@polymer/paper-listbox/paper-listbox.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../../../src/components/buttons/ha-call-service-button.js';
+import '../../../components/buttons/ha-call-service-button.js';
 
 class ZwaveNodeConfig extends PolymerElement {
   static get template() {
diff --git a/panels/config/zwave/zwave-node-information.js b/src/panels/config/zwave/zwave-node-information.js
similarity index 100%
rename from panels/config/zwave/zwave-node-information.js
rename to src/panels/config/zwave/zwave-node-information.js
diff --git a/panels/config/zwave/zwave-usercodes.js b/src/panels/config/zwave/zwave-usercodes.js
similarity index 98%
rename from panels/config/zwave/zwave-usercodes.js
rename to src/panels/config/zwave/zwave-usercodes.js
index ac1356e38f..a6c3822754 100644
--- a/panels/config/zwave/zwave-usercodes.js
+++ b/src/panels/config/zwave/zwave-usercodes.js
@@ -6,7 +6,7 @@ import '@polymer/paper-listbox/paper-listbox.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../../../src/components/buttons/ha-call-service-button.js';
+import '../../../components/buttons/ha-call-service-button.js';
 
 class ZwaveUsercodes extends PolymerElement {
   static get template() {
diff --git a/panels/config/zwave/zwave-values.js b/src/panels/config/zwave/zwave-values.js
similarity index 98%
rename from panels/config/zwave/zwave-values.js
rename to src/panels/config/zwave/zwave-values.js
index 18dfba7140..5495798fb3 100644
--- a/panels/config/zwave/zwave-values.js
+++ b/src/panels/config/zwave/zwave-values.js
@@ -5,7 +5,7 @@ import '@polymer/paper-listbox/paper-listbox.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../../../src/components/buttons/ha-call-service-button.js';
+import '../../../components/buttons/ha-call-service-button.js';
 
 class ZwaveValues extends PolymerElement {
   static get template() {
diff --git a/panels/dev-event/events-list.js b/src/panels/dev-event/events-list.js
similarity index 88%
rename from panels/dev-event/events-list.js
rename to src/panels/dev-event/events-list.js
index 6b0a35d61d..7fb5763fe7 100644
--- a/panels/dev-event/events-list.js
+++ b/src/panels/dev-event/events-list.js
@@ -1,9 +1,12 @@
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../../src/util/hass-mixins.js';
+import EventsMixin from '../../mixins/events-mixin.js';
 
-class EventsList extends window.hassMixins.EventsMixin(PolymerElement) {
+/*
+ * @appliesMixin EventsMixin
+ */
+class EventsList extends EventsMixin(PolymerElement) {
   static get template() {
     return html`
     <style>
diff --git a/panels/dev-event/ha-panel-dev-event.js b/src/panels/dev-event/ha-panel-dev-event.js
similarity index 93%
rename from panels/dev-event/ha-panel-dev-event.js
rename to src/panels/dev-event/ha-panel-dev-event.js
index 02a3255bb7..287d08518d 100644
--- a/panels/dev-event/ha-panel-dev-event.js
+++ b/src/panels/dev-event/ha-panel-dev-event.js
@@ -8,12 +8,15 @@ import '@polymer/paper-input/paper-textarea.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../../src/components/ha-menu-button.js';
-import '../../src/resources/ha-style.js';
-import '../../src/util/hass-mixins.js';
+import '../../components/ha-menu-button.js';
+import '../../resources/ha-style.js';
 import './events-list.js';
+import EventsMixin from '../../mixins/events-mixin.js';
 
-class HaPanelDevEvent extends window.hassMixins.EventsMixin(PolymerElement) {
+/*
+ * @appliesMixin EventsMixin
+ */
+class HaPanelDevEvent extends EventsMixin(PolymerElement) {
   static get template() {
     return html`
     <style is="custom-style" include="ha-style iron-flex iron-positioning"></style>
diff --git a/panels/dev-info/ha-panel-dev-info.js b/src/panels/dev-info/ha-panel-dev-info.js
similarity index 96%
rename from panels/dev-info/ha-panel-dev-info.js
rename to src/panels/dev-info/ha-panel-dev-info.js
index 7a6603d5a2..da51b87185 100644
--- a/panels/dev-info/ha-panel-dev-info.js
+++ b/src/panels/dev-info/ha-panel-dev-info.js
@@ -10,12 +10,12 @@ import '@polymer/paper-item/paper-item.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../../src/components/buttons/ha-call-service-button.js';
-import '../../src/components/ha-menu-button.js';
-import '../../src/resources/ha-style.js';
+import '../../components/buttons/ha-call-service-button.js';
+import '../../components/ha-menu-button.js';
+import '../../resources/ha-style.js';
 
-import formatDateTime from '../../js/common/datetime/format_date_time.js';
-import formatTime from '../../js/common/datetime/format_time.js';
+import formatDateTime from '../../common/datetime/format_date_time.js';
+import formatTime from '../../common/datetime/format_time.js';
 
 class HaPanelDevInfo extends PolymerElement {
   static get template() {
diff --git a/panels/dev-mqtt/ha-panel-dev-mqtt.js b/src/panels/dev-mqtt/ha-panel-dev-mqtt.js
similarity index 94%
rename from panels/dev-mqtt/ha-panel-dev-mqtt.js
rename to src/panels/dev-mqtt/ha-panel-dev-mqtt.js
index c94fe4566c..a68e74765b 100644
--- a/panels/dev-mqtt/ha-panel-dev-mqtt.js
+++ b/src/panels/dev-mqtt/ha-panel-dev-mqtt.js
@@ -8,9 +8,9 @@ import '@polymer/paper-input/paper-textarea.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../../src/components/ha-menu-button.js';
-import '../../src/resources/ha-style.js';
-import '../../src/util/app-localstorage-document.js';
+import '../../components/ha-menu-button.js';
+import '../../resources/ha-style.js';
+import '../../util/app-localstorage-document.js';
 
 class HaPanelDevMqtt extends PolymerElement {
   static get template() {
diff --git a/panels/dev-service/ha-panel-dev-service.js b/src/panels/dev-service/ha-panel-dev-service.js
similarity index 96%
rename from panels/dev-service/ha-panel-dev-service.js
rename to src/panels/dev-service/ha-panel-dev-service.js
index b27c48770e..a73a9a19d0 100644
--- a/panels/dev-service/ha-panel-dev-service.js
+++ b/src/panels/dev-service/ha-panel-dev-service.js
@@ -6,11 +6,11 @@ import '@polymer/paper-input/paper-textarea.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../../src/components/entity/ha-entity-picker.js';
-import '../../src/components/ha-menu-button.js';
-import '../../src/components/ha-service-picker.js';
-import '../../src/resources/ha-style.js';
-import '../../src/util/app-localstorage-document.js';
+import '../../components/entity/ha-entity-picker.js';
+import '../../components/ha-menu-button.js';
+import '../../components/ha-service-picker.js';
+import '../../resources/ha-style.js';
+import '../../util/app-localstorage-document.js';
 
 {
   const ERROR_SENTINEL = {};
diff --git a/panels/dev-state/ha-panel-dev-state.js b/src/panels/dev-state/ha-panel-dev-state.js
similarity index 96%
rename from panels/dev-state/ha-panel-dev-state.js
rename to src/panels/dev-state/ha-panel-dev-state.js
index c9cf00374e..347066e60b 100644
--- a/panels/dev-state/ha-panel-dev-state.js
+++ b/src/panels/dev-state/ha-panel-dev-state.js
@@ -8,12 +8,15 @@ import '@polymer/paper-input/paper-textarea.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../../src/components/entity/ha-entity-picker.js';
-import '../../src/components/ha-menu-button.js';
-import '../../src/resources/ha-style.js';
-import '../../src/util/hass-mixins.js';
+import '../../components/entity/ha-entity-picker.js';
+import '../../components/ha-menu-button.js';
+import '../../resources/ha-style.js';
+import EventsMixin from '../../mixins/events-mixin.js';
 
-class HaPanelDevState extends window.hassMixins.EventsMixin(PolymerElement) {
+/*
+ * @appliesMixin EventsMixin
+ */
+class HaPanelDevState extends EventsMixin(PolymerElement) {
   static get template() {
     return html`
     <style include="ha-style">
diff --git a/panels/dev-template/ha-panel-dev-template.js b/src/panels/dev-template/ha-panel-dev-template.js
similarity index 98%
rename from panels/dev-template/ha-panel-dev-template.js
rename to src/panels/dev-template/ha-panel-dev-template.js
index aa57f38042..972169aa57 100644
--- a/panels/dev-template/ha-panel-dev-template.js
+++ b/src/panels/dev-template/ha-panel-dev-template.js
@@ -8,8 +8,8 @@ import { Debouncer } from '@polymer/polymer/lib/utils/debounce.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../../src/components/ha-menu-button.js';
-import '../../src/resources/ha-style.js';
+import '../../components/ha-menu-button.js';
+import '../../resources/ha-style.js';
 
 class HaPanelDevTemplate extends PolymerElement {
   static get template() {
diff --git a/panels/hassio/ha-panel-hassio.js b/src/panels/hassio/ha-panel-hassio.js
similarity index 91%
rename from panels/hassio/ha-panel-hassio.js
rename to src/panels/hassio/ha-panel-hassio.js
index eb4e0f0efe..19c90b22fe 100644
--- a/panels/hassio/ha-panel-hassio.js
+++ b/src/panels/hassio/ha-panel-hassio.js
@@ -1,10 +1,7 @@
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../../src/util/hass-mixins.js';
-
-class HaPanelHassio extends
-  window.hassMixins.NavigateMixin(window.hassMixins.EventsMixin(PolymerElement)) {
+class HaPanelHassio extends PolymerElement {
   static get template() {
     return html`
     <style>
diff --git a/panels/history/ha-panel-history.js b/src/panels/history/ha-panel-history.js
similarity index 90%
rename from panels/history/ha-panel-history.js
rename to src/panels/history/ha-panel-history.js
index 1b2aba1862..2b116174d6 100644
--- a/panels/history/ha-panel-history.js
+++ b/src/panels/history/ha-panel-history.js
@@ -10,19 +10,20 @@ import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 import '@vaadin/vaadin-date-picker/vaadin-date-picker.js';
 
-import '../../src/components/ha-menu-button.js';
-import '../../src/components/state-history-charts.js';
-import '../../src/data/ha-state-history-data.js';
-import '../../src/resources/ha-date-picker-style.js';
-import '../../src/resources/ha-style.js';
-import '../../src/util/hass-mixins.js';
+import '../../components/ha-menu-button.js';
+import '../../components/state-history-charts.js';
+import '../../data/ha-state-history-data.js';
+import '../../resources/ha-date-picker-style.js';
+import '../../resources/ha-style.js';
 
-import formatDate from '../../js/common/datetime/format_date.js';
+
+import formatDate from '../../common/datetime/format_date.js';
+import LocalizeMixin from '../../mixins/localize-mixin.js';
 
 /*
- * @appliesMixin window.hassMixins.LocalizeMixin
+ * @appliesMixin LocalizeMixin
  */
-class HaPanelHistory extends window.hassMixins.LocalizeMixin(PolymerElement) {
+class HaPanelHistory extends LocalizeMixin(PolymerElement) {
   static get template() {
     return html`
         <style include="iron-flex ha-style">
diff --git a/panels/iframe/ha-panel-iframe.js b/src/panels/iframe/ha-panel-iframe.js
similarity index 92%
rename from panels/iframe/ha-panel-iframe.js
rename to src/panels/iframe/ha-panel-iframe.js
index fcd7a76bae..797f568203 100644
--- a/panels/iframe/ha-panel-iframe.js
+++ b/src/panels/iframe/ha-panel-iframe.js
@@ -2,8 +2,8 @@ import '@polymer/app-layout/app-toolbar/app-toolbar.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../../src/components/ha-menu-button.js';
-import '../../src/resources/ha-style.js';
+import '../../components/ha-menu-button.js';
+import '../../resources/ha-style.js';
 
 class HaPanelIframe extends PolymerElement {
   static get template() {
diff --git a/panels/kiosk/ha-panel-kiosk.js b/src/panels/kiosk/ha-panel-kiosk.js
similarity index 92%
rename from panels/kiosk/ha-panel-kiosk.js
rename to src/panels/kiosk/ha-panel-kiosk.js
index b3fc5aea1e..54e9759f3c 100644
--- a/panels/kiosk/ha-panel-kiosk.js
+++ b/src/panels/kiosk/ha-panel-kiosk.js
@@ -1,7 +1,7 @@
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../../src/layouts/partial-cards.js';
+import '../../layouts/partial-cards.js';
 
 class HaPanelKiosk extends PolymerElement {
   static get template() {
diff --git a/panels/logbook/ha-logbook-data.js b/src/panels/logbook/ha-logbook-data.js
similarity index 100%
rename from panels/logbook/ha-logbook-data.js
rename to src/panels/logbook/ha-logbook-data.js
diff --git a/panels/logbook/ha-logbook.js b/src/panels/logbook/ha-logbook.js
similarity index 88%
rename from panels/logbook/ha-logbook.js
rename to src/panels/logbook/ha-logbook.js
index 42ba9cda6e..18ea2df829 100644
--- a/panels/logbook/ha-logbook.js
+++ b/src/panels/logbook/ha-logbook.js
@@ -2,12 +2,16 @@ import '@polymer/iron-flex-layout/iron-flex-layout-classes.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../../src/components/domain-icon.js';
-import '../../src/util/hass-mixins.js';
+import '../../components/domain-icon.js';
 
-import formatTime from '../../js/common/datetime/format_time.js';
 
-class HaLogbook extends window.hassMixins.EventsMixin(PolymerElement) {
+import formatTime from '../../common/datetime/format_time.js';
+import EventsMixin from '../../mixins/events-mixin.js';
+
+/*
+ * @appliesMixin EventsMixin
+ */
+class HaLogbook extends EventsMixin(PolymerElement) {
   static get template() {
     return html`
     <style is="custom-style" include="iron-flex"></style>
diff --git a/panels/logbook/ha-panel-logbook.js b/src/panels/logbook/ha-panel-logbook.js
similarity index 90%
rename from panels/logbook/ha-panel-logbook.js
rename to src/panels/logbook/ha-panel-logbook.js
index ef7f9b63d5..c80e7547c5 100644
--- a/panels/logbook/ha-panel-logbook.js
+++ b/src/panels/logbook/ha-panel-logbook.js
@@ -8,19 +8,20 @@ import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 import '@vaadin/vaadin-date-picker/vaadin-date-picker.js';
 
-import '../../src/components/ha-menu-button.js';
-import '../../src/resources/ha-date-picker-style.js';
-import '../../src/resources/ha-style.js';
-import '../../src/util/hass-mixins.js';
+import '../../components/ha-menu-button.js';
+import '../../resources/ha-date-picker-style.js';
+import '../../resources/ha-style.js';
+
 import './ha-logbook-data.js';
 import './ha-logbook.js';
 
-import formatDate from '../../js/common/datetime/format_date.js';
+import formatDate from '../../common/datetime/format_date.js';
+import LocalizeMixin from '../../mixins/localize-mixin.js';
 
 /*
- * @appliesMixin window.hassMixins.LocalizeMixin
+ * @appliesMixin LocalizeMixin
  */
-class HaPanelLogbook extends window.hassMixins.LocalizeMixin(PolymerElement) {
+class HaPanelLogbook extends LocalizeMixin(PolymerElement) {
   static get template() {
     return html`
     <style include="ha-style">
diff --git a/panels/mailbox/ha-panel-mailbox.js b/src/panels/mailbox/ha-panel-mailbox.js
similarity index 95%
rename from panels/mailbox/ha-panel-mailbox.js
rename to src/panels/mailbox/ha-panel-mailbox.js
index 0efd27686f..f0fb1bfccb 100644
--- a/panels/mailbox/ha-panel-mailbox.js
+++ b/src/panels/mailbox/ha-panel-mailbox.js
@@ -10,16 +10,17 @@ import '@polymer/paper-item/paper-item.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../../src/components/ha-menu-button.js';
-import '../../src/resources/ha-style.js';
-import '../../src/util/hass-mixins.js';
+import '../../components/ha-menu-button.js';
+import '../../resources/ha-style.js';
 
-import formatDateTime from '../../js/common/datetime/format_date_time.js';
+
+import formatDateTime from '../../common/datetime/format_date_time.js';
+import LocalizeMixin from '../../mixins/localize-mixin.js';
 
 /*
- * @appliesMixin window.hassMixins.LocalizeMixin
+ * @appliesMixin LocalizeMixin
  */
-class HaPanelMailbox extends window.hassMixins.LocalizeMixin(PolymerElement) {
+class HaPanelMailbox extends LocalizeMixin(PolymerElement) {
   static get template() {
     return html`
     <style include='ha-style'>
diff --git a/panels/map/ha-entity-marker.js b/src/panels/map/ha-entity-marker.js
similarity index 91%
rename from panels/map/ha-entity-marker.js
rename to src/panels/map/ha-entity-marker.js
index b33dd5ee18..110743af3f 100644
--- a/panels/map/ha-entity-marker.js
+++ b/src/panels/map/ha-entity-marker.js
@@ -3,9 +3,13 @@ import '@polymer/iron-image/iron-image.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../../src/util/hass-mixins.js';
 
-class HaEntityMarker extends window.hassMixins.EventsMixin(PolymerElement) {
+import EventsMixin from '../../mixins/events-mixin.js';
+
+/*
+ * @appliesMixin EventsMixin
+ */
+class HaEntityMarker extends EventsMixin(PolymerElement) {
   static get template() {
     return html`
     <style is="custom-style" include="iron-positioning"></style>
diff --git a/panels/map/ha-panel-map.js b/src/panels/map/ha-panel-map.js
similarity index 93%
rename from panels/map/ha-panel-map.js
rename to src/panels/map/ha-panel-map.js
index 8e14a2a23e..b73128c71e 100644
--- a/panels/map/ha-panel-map.js
+++ b/src/panels/map/ha-panel-map.js
@@ -4,19 +4,20 @@ import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 import Leaflet from 'leaflet';
 
-import '../../src/components/ha-menu-button.js';
-import '../../src/util/hass-mixins.js';
+import '../../components/ha-menu-button.js';
+
 import './ha-entity-marker.js';
 
-import computeStateDomain from '../../js/common/entity/compute_state_domain.js';
-import computeStateName from '../../js/common/entity/compute_state_name.js';
+import computeStateDomain from '../../common/entity/compute_state_domain.js';
+import computeStateName from '../../common/entity/compute_state_name.js';
+import LocalizeMixin from '../../mixins/localize-mixin.js';
 
 Leaflet.Icon.Default.imagePath = '/static/images/leaflet';
 
 /*
- * @appliesMixin window.hassMixins.LocalizeMixin
+ * @appliesMixin LocalizeMixin
  */
-class HaPanelMap extends window.hassMixins.LocalizeMixin(PolymerElement) {
+class HaPanelMap extends LocalizeMixin(PolymerElement) {
   static get template() {
     return html`
     <style include="ha-style">
diff --git a/panels/shopping-list/ha-panel-shopping-list.js b/src/panels/shopping-list/ha-panel-shopping-list.js
similarity index 95%
rename from panels/shopping-list/ha-panel-shopping-list.js
rename to src/panels/shopping-list/ha-panel-shopping-list.js
index 24228b4e0c..a755d29645 100644
--- a/panels/shopping-list/ha-panel-shopping-list.js
+++ b/src/panels/shopping-list/ha-panel-shopping-list.js
@@ -13,14 +13,14 @@ import '@polymer/paper-menu-button/paper-menu-button.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../../src/components/ha-menu-button.js';
-import '../../src/components/ha-start-voice-button.js';
-import '../../src/util/hass-mixins.js';
+import '../../components/ha-menu-button.js';
+import '../../components/ha-start-voice-button.js';
+import LocalizeMixin from '../../mixins/localize-mixin.js';
 
 /*
- * @appliesMixin window.hassMixins.LocalizeMixin
+ * @appliesMixin LocalizeMixin
  */
-class HaPanelShoppingList extends window.hassMixins.LocalizeMixin(PolymerElement) {
+class HaPanelShoppingList extends LocalizeMixin(PolymerElement) {
   static get template() {
     return html`
     <style include="ha-style">
diff --git a/src/state-summary/state-card-content.js b/src/state-summary/state-card-content.js
index 12312d5cc8..93a78b90f5 100644
--- a/src/state-summary/state-card-content.js
+++ b/src/state-summary/state-card-content.js
@@ -14,8 +14,8 @@ import './state-card-timer.js';
 import './state-card-toggle.js';
 import './state-card-weblink.js';
 
-import stateCardType from '../../js/common/entity/state_card_type.js';
-import dynamicContentUpdater from '../../js/common/dom/dynamic_content_updater.js';
+import stateCardType from '../common/entity/state_card_type.js';
+import dynamicContentUpdater from '../common/dom/dynamic_content_updater.js';
 
 class StateCardContent extends PolymerElement {
   static get properties() {
diff --git a/src/state-summary/state-card-display.js b/src/state-summary/state-card-display.js
index 32bafee91a..6c8aec455e 100644
--- a/src/state-summary/state-card-display.js
+++ b/src/state-summary/state-card-display.js
@@ -3,15 +3,15 @@ import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
 import '../components/entity/state-info.js';
-import '../util/hass-mixins.js';
+import LocalizeMixin from '../mixins/localize-mixin.js';
 
-import computeStateDisplay from '../../js/common/entity/compute_state_display.js';
-import attributeClassNames from '../../js/common/entity/attribute_class_names.js';
+import computeStateDisplay from '../common/entity/compute_state_display.js';
+import attributeClassNames from '../common/entity/attribute_class_names.js';
 
 /*
- * @appliesMixin window.hassMixins.LocalizeMixin
+ * @appliesMixin LocalizeMixin
  */
-class StateCardDisplay extends window.hassMixins.LocalizeMixin(PolymerElement) {
+class StateCardDisplay extends LocalizeMixin(PolymerElement) {
   static get template() {
     return html`
     <style>
diff --git a/src/state-summary/state-card-input_select.js b/src/state-summary/state-card-input_select.js
index 5feca23772..ad85dd53d8 100644
--- a/src/state-summary/state-card-input_select.js
+++ b/src/state-summary/state-card-input_select.js
@@ -6,7 +6,7 @@ import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
 import '../components/entity/state-badge.js';
 
-import computeStateName from '../../js/common/entity/compute_state_name.js';
+import computeStateName from '../common/entity/compute_state_name.js';
 
 class StateCardInputSelect extends PolymerElement {
   static get template() {
diff --git a/src/state-summary/state-card-media_player.js b/src/state-summary/state-card-media_player.js
index 68a1e3e904..a9bedbccf0 100644
--- a/src/state-summary/state-card-media_player.js
+++ b/src/state-summary/state-card-media_player.js
@@ -3,12 +3,12 @@ import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
 import '../components/entity/state-info.js';
-import '../util/hass-mixins.js';
+import LocalizeMixin from '../mixins/localize-mixin.js';
 
 /*
- * @appliesMixin window.hassMixins.LocalizeMixin
+ * @appliesMixin LocalizeMixin
  */
-class StateCardMediaPlayer extends window.hassMixins.LocalizeMixin(PolymerElement) {
+class StateCardMediaPlayer extends LocalizeMixin(PolymerElement) {
   static get template() {
     return html`
     <style is="custom-style" include="iron-flex iron-flex-alignment"></style>
diff --git a/src/state-summary/state-card-scene.js b/src/state-summary/state-card-scene.js
index e2f7280ba0..f5f3124feb 100644
--- a/src/state-summary/state-card-scene.js
+++ b/src/state-summary/state-card-scene.js
@@ -4,12 +4,12 @@ import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
 import '../components/entity/state-info.js';
-import '../util/hass-mixins.js';
+import LocalizeMixin from '../mixins/localize-mixin.js';
 
 /*
- * @appliesMixin window.hassMixins.LocalizeMixin
+ * @appliesMixin LocalizeMixin
  */
-class StateCardScene extends window.hassMixins.LocalizeMixin(PolymerElement) {
+class StateCardScene extends LocalizeMixin(PolymerElement) {
   static get template() {
     return html`
     <style is="custom-style" include="iron-flex iron-flex-alignment"></style>
diff --git a/src/state-summary/state-card-script.js b/src/state-summary/state-card-script.js
index 4cd5a56150..4ac2ee71b2 100644
--- a/src/state-summary/state-card-script.js
+++ b/src/state-summary/state-card-script.js
@@ -5,12 +5,13 @@ import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
 import '../components/entity/ha-entity-toggle.js';
 import '../components/entity/state-info.js';
-import '../util/hass-mixins.js';
+
+import LocalizeMixin from '../mixins/localize-mixin.js';
 
 /*
- * @appliesMixin window.hassMixins.LocalizeMixin
+ * @appliesMixin LocalizeMixin
  */
-class StateCardScript extends window.hassMixins.LocalizeMixin(PolymerElement) {
+class StateCardScript extends LocalizeMixin(PolymerElement) {
   static get template() {
     return html`
     <style is="custom-style" include="iron-flex iron-flex-alignment"></style>
diff --git a/src/state-summary/state-card-timer.js b/src/state-summary/state-card-timer.js
index 743fab7416..dbf9fd3a7f 100644
--- a/src/state-summary/state-card-timer.js
+++ b/src/state-summary/state-card-timer.js
@@ -3,12 +3,16 @@ import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
 import '../components/entity/state-info.js';
-import '../util/hass-mixins.js';
 
-import timerTimeRemaining from '../../js/common/entity/timer_time_remaining.js';
-import secondsToDuration from '../../js/common/datetime/seconds_to_duration.js';
 
-class StateCardTimer extends window.hassMixins.LocalizeMixin(PolymerElement) {
+import timerTimeRemaining from '../common/entity/timer_time_remaining.js';
+import secondsToDuration from '../common/datetime/seconds_to_duration.js';
+import LocalizeMixin from '../mixins/localize-mixin.js';
+
+/*
+ * @appliesMixin LocalizeMixin
+ */
+class StateCardTimer extends LocalizeMixin(PolymerElement) {
   static get template() {
     return html`
     <style is="custom-style" include="iron-flex iron-flex-alignment"></style>
diff --git a/src/state-summary/state-card-weblink.js b/src/state-summary/state-card-weblink.js
index 4fd54d6f58..d07f2d1a0f 100644
--- a/src/state-summary/state-card-weblink.js
+++ b/src/state-summary/state-card-weblink.js
@@ -3,7 +3,7 @@ import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
 import '../components/entity/state-badge.js';
 
-import computeStateName from '../../js/common/entity/compute_state_name.js';
+import computeStateName from '../common/entity/compute_state_name.js';
 
 class StateCardWeblink extends PolymerElement {
   static get template() {
diff --git a/src/util/ha-url-sync.js b/src/util/ha-url-sync.js
index 8abe4b42ca..e38529fbd5 100644
--- a/src/util/ha-url-sync.js
+++ b/src/util/ha-url-sync.js
@@ -1,12 +1,15 @@
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import './hass-mixins.js';
+import EventsMixin from '../mixins/events-mixin.js';
 
 {
   /* eslint-disable no-console */
   const DEBUG = false;
 
-  class HaUrlSync extends window.hassMixins.EventsMixin(PolymerElement) {
+  /*
+   * @appliesMixin EventsMixin
+   */
+  class HaUrlSync extends EventsMixin(PolymerElement) {
     static get properties() {
       return {
         hass: {
diff --git a/src/util/hass-call-api.js b/src/util/hass-call-api.js
index 50989d8d42..7fe06ff65a 100644
--- a/src/util/hass-call-api.js
+++ b/src/util/hass-call-api.js
@@ -47,7 +47,7 @@ window.hassCallApi = function (host, auth, method, path, parameters) {
     };
 
     if (parameters) {
-      req.setRequestHeader('Content-Type', 'application/json;charset=UTF-8');
+      req.setRequestHeader('Content-Type', 'application;charset=UTF-8');
       req.send(JSON.stringify(parameters));
     } else {
       req.send();
diff --git a/src/util/hass-util.js b/src/util/hass-util.js
deleted file mode 100644
index 370690a0ec..0000000000
--- a/src/util/hass-util.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import '../../js/util.js';
-
diff --git a/test-mocha/common/datetime/duration_to_seconds_test.js b/test-mocha/common/datetime/duration_to_seconds_test.js
index c4e503cee9..79ca028d36 100644
--- a/test-mocha/common/datetime/duration_to_seconds_test.js
+++ b/test-mocha/common/datetime/duration_to_seconds_test.js
@@ -1,6 +1,6 @@
 import { assert } from 'chai';
 
-import durationToSeconds from '../../../js/common/datetime/duration_to_seconds.js';
+import durationToSeconds from '../../../src/common/datetime/duration_to_seconds.js';
 
 describe('durationToSeconds', () => {
   it('works', () => {
diff --git a/test-mocha/common/datetime/format_date.js b/test-mocha/common/datetime/format_date.js
index 28fe0c2680..d7fd426de8 100644
--- a/test-mocha/common/datetime/format_date.js
+++ b/test-mocha/common/datetime/format_date.js
@@ -1,6 +1,6 @@
 import { assert } from 'chai';
 
-import formatDate from '../../../js/common/datetime/format_date';
+import formatDate from '../../../src/common/datetime/format_date';
 
 describe('formatDate', () => {
   const dateObj = new Date(
diff --git a/test-mocha/common/datetime/format_date_time.js b/test-mocha/common/datetime/format_date_time.js
index 0c800d631d..e519011db1 100644
--- a/test-mocha/common/datetime/format_date_time.js
+++ b/test-mocha/common/datetime/format_date_time.js
@@ -1,6 +1,6 @@
 import { assert } from 'chai';
 
-import formatDateTime from '../../../js/common/datetime/format_date_time';
+import formatDateTime from '../../../src/common/datetime/format_date_time';
 
 describe('formatDateTime', () => {
   const dateObj = new Date(
diff --git a/test-mocha/common/datetime/format_time.js b/test-mocha/common/datetime/format_time.js
index 92f1a5513a..acf3be190d 100644
--- a/test-mocha/common/datetime/format_time.js
+++ b/test-mocha/common/datetime/format_time.js
@@ -1,6 +1,6 @@
 import { assert } from 'chai';
 
-import formatTime from '../../../js/common/datetime/format_time';
+import formatTime from '../../../src/common/datetime/format_time';
 
 describe('formatTime', () => {
   const dateObj = new Date(
diff --git a/test-mocha/common/datetime/seconds_to_duration_test.js b/test-mocha/common/datetime/seconds_to_duration_test.js
index 35a9b1e457..23bb744b7f 100644
--- a/test-mocha/common/datetime/seconds_to_duration_test.js
+++ b/test-mocha/common/datetime/seconds_to_duration_test.js
@@ -1,6 +1,6 @@
 import { assert } from 'chai';
 
-import secondsToDuration from '../../../js/common/datetime/seconds_to_duration.js';
+import secondsToDuration from '../../../src/common/datetime/seconds_to_duration.js';
 
 describe('secondsToDuration', () => {
   it('works', () => {
diff --git a/test-mocha/common/entity/attribute_class_names_test.js b/test-mocha/common/entity/attribute_class_names_test.js
index 278880e56c..4a79dd088c 100644
--- a/test-mocha/common/entity/attribute_class_names_test.js
+++ b/test-mocha/common/entity/attribute_class_names_test.js
@@ -1,6 +1,6 @@
 import { assert } from 'chai';
 
-import attributeClassNames from '../../../js/common/entity/attribute_class_names';
+import attributeClassNames from '../../../src/common/entity/attribute_class_names';
 
 describe('attributeClassNames', () => {
   const attrs = ['mock_attr1', 'mock_attr2'];
diff --git a/test-mocha/common/entity/can_toggle_domain_test.js b/test-mocha/common/entity/can_toggle_domain_test.js
index 0a422900e4..26bf5d99a4 100644
--- a/test-mocha/common/entity/can_toggle_domain_test.js
+++ b/test-mocha/common/entity/can_toggle_domain_test.js
@@ -1,6 +1,6 @@
 import { assert } from 'chai';
 
-import canToggleDomain from '../../../js/common/entity/can_toggle_domain';
+import canToggleDomain from '../../../src/common/entity/can_toggle_domain';
 
 describe('canToggleDomain', () => {
   const hass = {
diff --git a/test-mocha/common/entity/can_toggle_state_test.js b/test-mocha/common/entity/can_toggle_state_test.js
index 9055ceb087..0f17c84f55 100644
--- a/test-mocha/common/entity/can_toggle_state_test.js
+++ b/test-mocha/common/entity/can_toggle_state_test.js
@@ -1,6 +1,6 @@
 import { assert } from 'chai';
 
-import canToggleState from '../../../js/common/entity/can_toggle_state';
+import canToggleState from '../../../src/common/entity/can_toggle_state';
 
 describe('canToggleState', () => {
   const hass = {
diff --git a/test-mocha/common/entity/compute_domain.js b/test-mocha/common/entity/compute_domain.js
index c949c3e43e..eaf5a424b0 100644
--- a/test-mocha/common/entity/compute_domain.js
+++ b/test-mocha/common/entity/compute_domain.js
@@ -1,6 +1,6 @@
 import { assert } from 'chai';
 
-import computeDomain from '../../../js/common/entity/compute_domain';
+import computeDomain from '../../../src/common/entity/compute_domain';
 
 describe('computeDomain', () => {
   it('Returns domains', () => {
diff --git a/test-mocha/common/entity/compute_state_display.js b/test-mocha/common/entity/compute_state_display.js
index b871a5923f..e89cbd79b1 100644
--- a/test-mocha/common/entity/compute_state_display.js
+++ b/test-mocha/common/entity/compute_state_display.js
@@ -1,6 +1,6 @@
 import { assert } from 'chai';
 
-import computeStateDisplay from '../../../js/common/entity/compute_state_display';
+import computeStateDisplay from '../../../src/common/entity/compute_state_display';
 
 describe('computeStateDisplay', () => {
   const localize = function (message, ...args) {
diff --git a/test-mocha/common/entity/compute_state_domain.js b/test-mocha/common/entity/compute_state_domain.js
index 662e6e1516..5e2bb69041 100644
--- a/test-mocha/common/entity/compute_state_domain.js
+++ b/test-mocha/common/entity/compute_state_domain.js
@@ -1,6 +1,6 @@
 import { assert } from 'chai';
 
-import computeStateDomain from '../../../js/common/entity/compute_state_domain.js';
+import computeStateDomain from '../../../src/common/entity/compute_state_domain.js';
 
 describe('computeStateDomain', () => {
   it('Detects sensor domain', () => {
diff --git a/test-mocha/common/entity/feature_class_names_test.js b/test-mocha/common/entity/feature_class_names_test.js
index 623ff1d735..3468c62069 100644
--- a/test-mocha/common/entity/feature_class_names_test.js
+++ b/test-mocha/common/entity/feature_class_names_test.js
@@ -1,6 +1,6 @@
 import { assert } from 'chai';
 
-import featureClassNames from '../../../js/common/entity/feature_class_names';
+import featureClassNames from '../../../src/common/entity/feature_class_names';
 
 describe('featureClassNames', () => {
   const classNames = {
diff --git a/test-mocha/common/entity/has_location.test.js b/test-mocha/common/entity/has_location.test.js
index b5ed28b651..235c5ce30e 100644
--- a/test-mocha/common/entity/has_location.test.js
+++ b/test-mocha/common/entity/has_location.test.js
@@ -1,6 +1,6 @@
 import { assert } from 'chai';
 
-import hasLocation from '../../../js/common/entity/has_location.js';
+import hasLocation from '../../../src/common/entity/has_location.js';
 
 describe('hasLocation', () => {
   it('flags states with location', () => {
diff --git a/test-mocha/common/entity/state_card_type_test.js b/test-mocha/common/entity/state_card_type_test.js
index 11d149d4b3..c655db0981 100644
--- a/test-mocha/common/entity/state_card_type_test.js
+++ b/test-mocha/common/entity/state_card_type_test.js
@@ -1,6 +1,6 @@
 import { assert } from 'chai';
 
-import stateCardType from '../../../js/common/entity/state_card_type.js';
+import stateCardType from '../../../src/common/entity/state_card_type.js';
 
 describe('stateCardType', () => {
   const hass = {
diff --git a/test-mocha/common/entity/state_more_info_type_test.js b/test-mocha/common/entity/state_more_info_type_test.js
index 7d3afe770b..38e7c03db3 100644
--- a/test-mocha/common/entity/state_more_info_type_test.js
+++ b/test-mocha/common/entity/state_more_info_type_test.js
@@ -1,6 +1,6 @@
 import { assert } from 'chai';
 
-import stateMoreInfoType from '../../../js/common/entity/state_more_info_type.js';
+import stateMoreInfoType from '../../../src/common/entity/state_more_info_type.js';
 
 describe('stateMoreInfoType', () => {
   it('Returns media_player for media_player states', () => {
diff --git a/test-mocha/common/entity/timer_time_remaining_test.js b/test-mocha/common/entity/timer_time_remaining_test.js
index f2e69ec7a5..e8759764bf 100644
--- a/test-mocha/common/entity/timer_time_remaining_test.js
+++ b/test-mocha/common/entity/timer_time_remaining_test.js
@@ -1,7 +1,7 @@
 import { assert } from 'chai';
 import sinon from 'sinon';
 
-import timerTimeRemaining from '../../../js/common/entity/timer_time_remaining.js';
+import timerTimeRemaining from '../../../src/common/entity/timer_time_remaining.js';
 
 describe('timerTimeRemaining', () => {
   it('works with idle timers', () => {
diff --git a/test-mocha/common/util/parse_query_test.js b/test-mocha/common/util/parse_query_test.js
index 07c06b427c..849c60c2bc 100644
--- a/test-mocha/common/util/parse_query_test.js
+++ b/test-mocha/common/util/parse_query_test.js
@@ -1,6 +1,6 @@
 import { assert } from 'chai';
 
-import parseQuery from '../../../js/common/util/parse_query.js';
+import parseQuery from '../../../src/common/util/parse_query.js';
 
 describe('parseQuery', () => {
   it('works', () => {
diff --git a/webpack.config.js b/webpack.config.js
index d9e68b7040..967d8bebb6 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -22,7 +22,7 @@ function createConfig(isProdBuild, latestBuild) {
   const entry = {
     app: './src/home-assistant.js',
     authorize: './src/auth/ha-authorize.js',
-    core: './js/core.js',
+    core: './src/core.js',
   };
 
   const babelOptions = {
@@ -61,7 +61,7 @@ function createConfig(isProdBuild, latestBuild) {
     babelOptions.presets = [
       ['es2015', { modules: false }]
     ];
-    entry.compatibility = './js/compatibility.js';
+    entry.compatibility = './src/compatibility.js';
   }
 
   const chunkFilename = isProdBuild ?
diff --git a/yarn.lock b/yarn.lock
index dc4c7bfb00..c25b3e66e8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -16,27 +16,27 @@
   dependencies:
     "@babel/highlight" "7.0.0-beta.44"
 
-"@babel/code-frame@7.0.0-beta.46":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.46.tgz#e0d002100805daab1461c0fcb32a07e304f3a4f4"
+"@babel/code-frame@7.0.0-beta.47":
+  version "7.0.0-beta.47"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.47.tgz#d18c2f4c4ba8d093a2bcfab5616593bfe2441a27"
   dependencies:
-    "@babel/highlight" "7.0.0-beta.46"
+    "@babel/highlight" "7.0.0-beta.47"
 
 "@babel/core@^7.0.0-beta.46":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.0.0-beta.46.tgz#dbe2189bcdef9a2c84becb1ec624878d31a95689"
+  version "7.0.0-beta.47"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.0.0-beta.47.tgz#b9c164fb9a1e1083f067c236a9da1d7a7d759271"
   dependencies:
-    "@babel/code-frame" "7.0.0-beta.46"
-    "@babel/generator" "7.0.0-beta.46"
-    "@babel/helpers" "7.0.0-beta.46"
-    "@babel/template" "7.0.0-beta.46"
-    "@babel/traverse" "7.0.0-beta.46"
-    "@babel/types" "7.0.0-beta.46"
-    babylon "7.0.0-beta.46"
+    "@babel/code-frame" "7.0.0-beta.47"
+    "@babel/generator" "7.0.0-beta.47"
+    "@babel/helpers" "7.0.0-beta.47"
+    "@babel/template" "7.0.0-beta.47"
+    "@babel/traverse" "7.0.0-beta.47"
+    "@babel/types" "7.0.0-beta.47"
+    babylon "7.0.0-beta.47"
     convert-source-map "^1.1.0"
     debug "^3.1.0"
     json5 "^0.5.0"
-    lodash "^4.2.0"
+    lodash "^4.17.5"
     micromatch "^2.3.11"
     resolve "^1.3.2"
     semver "^5.4.1"
@@ -52,13 +52,13 @@
     source-map "^0.5.0"
     trim-right "^1.0.1"
 
-"@babel/generator@7.0.0-beta.46", "@babel/generator@^7.0.0-beta.42":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.0.0-beta.46.tgz#6f57159bcc28bf8c3ed6b549789355cebfa3faa7"
+"@babel/generator@7.0.0-beta.47", "@babel/generator@^7.0.0-beta.42":
+  version "7.0.0-beta.47"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.0.0-beta.47.tgz#1835709f377cc4d2a4affee6d9258a10bbf3b9d1"
   dependencies:
-    "@babel/types" "7.0.0-beta.46"
+    "@babel/types" "7.0.0-beta.47"
     jsesc "^2.5.1"
-    lodash "^4.2.0"
+    lodash "^4.17.5"
     source-map "^0.5.0"
     trim-right "^1.0.1"
 
@@ -68,26 +68,26 @@
   dependencies:
     "@babel/types" "7.0.0-beta.35"
 
-"@babel/helper-annotate-as-pure@7.0.0-beta.46":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0-beta.46.tgz#4cd76d5c93409ea01d31be66395a3b98a372792e"
+"@babel/helper-annotate-as-pure@7.0.0-beta.47":
+  version "7.0.0-beta.47"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0-beta.47.tgz#354fb596055d9db369211bf075f0d5e93904d6f6"
   dependencies:
-    "@babel/types" "7.0.0-beta.46"
+    "@babel/types" "7.0.0-beta.47"
 
-"@babel/helper-builder-binary-assignment-operator-visitor@7.0.0-beta.46":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.0.0-beta.46.tgz#b6c8de48693b66bf90239e99856be4c2257e43ba"
+"@babel/helper-builder-binary-assignment-operator-visitor@7.0.0-beta.47":
+  version "7.0.0-beta.47"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.0.0-beta.47.tgz#d5917c29ee3d68abc2c72f604bc043f6e056e907"
   dependencies:
-    "@babel/helper-explode-assignable-expression" "7.0.0-beta.46"
-    "@babel/types" "7.0.0-beta.46"
+    "@babel/helper-explode-assignable-expression" "7.0.0-beta.47"
+    "@babel/types" "7.0.0-beta.47"
 
-"@babel/helper-call-delegate@7.0.0-beta.46":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.0.0-beta.46.tgz#a9e8b46cece47726308f015ce979293ef3d36ab7"
+"@babel/helper-call-delegate@7.0.0-beta.47":
+  version "7.0.0-beta.47"
+  resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.0.0-beta.47.tgz#96b7804397075f722a4030d3876f51ec19d8829b"
   dependencies:
-    "@babel/helper-hoist-variables" "7.0.0-beta.46"
-    "@babel/traverse" "7.0.0-beta.46"
-    "@babel/types" "7.0.0-beta.46"
+    "@babel/helper-hoist-variables" "7.0.0-beta.47"
+    "@babel/traverse" "7.0.0-beta.47"
+    "@babel/types" "7.0.0-beta.47"
 
 "@babel/helper-define-map@7.0.0-beta.35":
   version "7.0.0-beta.35"
@@ -97,12 +97,12 @@
     "@babel/types" "7.0.0-beta.35"
     lodash "^4.2.0"
 
-"@babel/helper-explode-assignable-expression@7.0.0-beta.46":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.0.0-beta.46.tgz#6a34a7533761b97ce4f7bf6fc586dcfb204ffa11"
+"@babel/helper-explode-assignable-expression@7.0.0-beta.47":
+  version "7.0.0-beta.47"
+  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.0.0-beta.47.tgz#56b688e282a698f4d1cf135453a11ae8af870a19"
   dependencies:
-    "@babel/traverse" "7.0.0-beta.46"
-    "@babel/types" "7.0.0-beta.46"
+    "@babel/traverse" "7.0.0-beta.47"
+    "@babel/types" "7.0.0-beta.47"
 
 "@babel/helper-function-name@7.0.0-beta.35":
   version "7.0.0-beta.35"
@@ -120,13 +120,13 @@
     "@babel/template" "7.0.0-beta.44"
     "@babel/types" "7.0.0-beta.44"
 
-"@babel/helper-function-name@7.0.0-beta.46":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.46.tgz#d0c4eed2e220e180f91b02e008dcc4594afe1d39"
+"@babel/helper-function-name@7.0.0-beta.47":
+  version "7.0.0-beta.47"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.47.tgz#8057d63e951e85c57c02cdfe55ad7608d73ffb7d"
   dependencies:
-    "@babel/helper-get-function-arity" "7.0.0-beta.46"
-    "@babel/template" "7.0.0-beta.46"
-    "@babel/types" "7.0.0-beta.46"
+    "@babel/helper-get-function-arity" "7.0.0-beta.47"
+    "@babel/template" "7.0.0-beta.47"
+    "@babel/types" "7.0.0-beta.47"
 
 "@babel/helper-get-function-arity@7.0.0-beta.35":
   version "7.0.0-beta.35"
@@ -140,41 +140,41 @@
   dependencies:
     "@babel/types" "7.0.0-beta.44"
 
-"@babel/helper-get-function-arity@7.0.0-beta.46":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.46.tgz#7161bfe449b4183dbe25d1fe5579338b7429e5f2"
+"@babel/helper-get-function-arity@7.0.0-beta.47":
+  version "7.0.0-beta.47"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.47.tgz#2de04f97c14b094b55899d3fa83144a16d207510"
   dependencies:
-    "@babel/types" "7.0.0-beta.46"
+    "@babel/types" "7.0.0-beta.47"
 
-"@babel/helper-hoist-variables@7.0.0-beta.46":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.0.0-beta.46.tgz#2d656215bea3f044ff1ee391fc51d55fce46ddf5"
+"@babel/helper-hoist-variables@7.0.0-beta.47":
+  version "7.0.0-beta.47"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.0.0-beta.47.tgz#ce295d1d723fe22b2820eaec748ed701aa5ae3d0"
   dependencies:
-    "@babel/types" "7.0.0-beta.46"
+    "@babel/types" "7.0.0-beta.47"
 
-"@babel/helper-member-expression-to-functions@7.0.0-beta.46":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.0.0-beta.46.tgz#736344c1d68fb2c4b75cbe62370eb610c0578427"
+"@babel/helper-member-expression-to-functions@7.0.0-beta.47":
+  version "7.0.0-beta.47"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.0.0-beta.47.tgz#35bfcf1d16dce481ef3dec66d5a1ae6a7d80bb45"
   dependencies:
-    "@babel/types" "7.0.0-beta.46"
+    "@babel/types" "7.0.0-beta.47"
 
-"@babel/helper-module-imports@7.0.0-beta.46":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.0.0-beta.46.tgz#8bd2e1fcfae883d28149a350e31ce606aa24eda6"
+"@babel/helper-module-imports@7.0.0-beta.47":
+  version "7.0.0-beta.47"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.0.0-beta.47.tgz#5af072029ffcfbece6ffbaf5d9984c75580f3f04"
   dependencies:
-    "@babel/types" "7.0.0-beta.46"
-    lodash "^4.2.0"
+    "@babel/types" "7.0.0-beta.47"
+    lodash "^4.17.5"
 
-"@babel/helper-module-transforms@7.0.0-beta.46":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.0.0-beta.46.tgz#90ad981f3a0020d9a8e526296555a5dd7e87cf5e"
+"@babel/helper-module-transforms@7.0.0-beta.47":
+  version "7.0.0-beta.47"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.0.0-beta.47.tgz#7eff91fc96873bd7b8d816698f1a69bbc01f3c38"
   dependencies:
-    "@babel/helper-module-imports" "7.0.0-beta.46"
-    "@babel/helper-simple-access" "7.0.0-beta.46"
-    "@babel/helper-split-export-declaration" "7.0.0-beta.46"
-    "@babel/template" "7.0.0-beta.46"
-    "@babel/types" "7.0.0-beta.46"
-    lodash "^4.2.0"
+    "@babel/helper-module-imports" "7.0.0-beta.47"
+    "@babel/helper-simple-access" "7.0.0-beta.47"
+    "@babel/helper-split-export-declaration" "7.0.0-beta.47"
+    "@babel/template" "7.0.0-beta.47"
+    "@babel/types" "7.0.0-beta.47"
+    lodash "^4.17.5"
 
 "@babel/helper-optimise-call-expression@7.0.0-beta.35":
   version "7.0.0-beta.35"
@@ -182,31 +182,31 @@
   dependencies:
     "@babel/types" "7.0.0-beta.35"
 
-"@babel/helper-optimise-call-expression@7.0.0-beta.46":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0-beta.46.tgz#50f060b4e4af01c73b40986fa593ae7958422e89"
+"@babel/helper-optimise-call-expression@7.0.0-beta.47":
+  version "7.0.0-beta.47"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0-beta.47.tgz#085d864d0613c5813c1b7c71b61bea36f195929e"
   dependencies:
-    "@babel/types" "7.0.0-beta.46"
+    "@babel/types" "7.0.0-beta.47"
 
-"@babel/helper-plugin-utils@7.0.0-beta.46":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0-beta.46.tgz#f630adbd9d645d0ba2e43f4955b4ad61f44ccdf4"
+"@babel/helper-plugin-utils@7.0.0-beta.47":
+  version "7.0.0-beta.47"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0-beta.47.tgz#4f564117ec39f96cf60fafcde35c9ddce0e008fd"
 
-"@babel/helper-regex@7.0.0-beta.46":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.0.0-beta.46.tgz#df3675cec700e062d823225c52830e012f32308f"
+"@babel/helper-regex@7.0.0-beta.47":
+  version "7.0.0-beta.47"
+  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.0.0-beta.47.tgz#b8e3b53132c4edbb04804242c02ffe4d60316971"
   dependencies:
-    lodash "^4.2.0"
+    lodash "^4.17.5"
 
-"@babel/helper-remap-async-to-generator@7.0.0-beta.46":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.0.0-beta.46.tgz#275d455dbced4c807543f001302a40303a3f0914"
+"@babel/helper-remap-async-to-generator@7.0.0-beta.47":
+  version "7.0.0-beta.47"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.0.0-beta.47.tgz#444dc362f61470bd61a745ebb364431d9ca186c2"
   dependencies:
-    "@babel/helper-annotate-as-pure" "7.0.0-beta.46"
-    "@babel/helper-wrap-function" "7.0.0-beta.46"
-    "@babel/template" "7.0.0-beta.46"
-    "@babel/traverse" "7.0.0-beta.46"
-    "@babel/types" "7.0.0-beta.46"
+    "@babel/helper-annotate-as-pure" "7.0.0-beta.47"
+    "@babel/helper-wrap-function" "7.0.0-beta.47"
+    "@babel/template" "7.0.0-beta.47"
+    "@babel/traverse" "7.0.0-beta.47"
+    "@babel/types" "7.0.0-beta.47"
 
 "@babel/helper-replace-supers@7.0.0-beta.35":
   version "7.0.0-beta.35"
@@ -217,22 +217,22 @@
     "@babel/traverse" "7.0.0-beta.35"
     "@babel/types" "7.0.0-beta.35"
 
-"@babel/helper-replace-supers@7.0.0-beta.46":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.0.0-beta.46.tgz#921c0f25d875026a8fb12feda1b72323595ea156"
+"@babel/helper-replace-supers@7.0.0-beta.47":
+  version "7.0.0-beta.47"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.0.0-beta.47.tgz#310b206a302868a792b659455ceba27db686cbb7"
   dependencies:
-    "@babel/helper-member-expression-to-functions" "7.0.0-beta.46"
-    "@babel/helper-optimise-call-expression" "7.0.0-beta.46"
-    "@babel/traverse" "7.0.0-beta.46"
-    "@babel/types" "7.0.0-beta.46"
+    "@babel/helper-member-expression-to-functions" "7.0.0-beta.47"
+    "@babel/helper-optimise-call-expression" "7.0.0-beta.47"
+    "@babel/traverse" "7.0.0-beta.47"
+    "@babel/types" "7.0.0-beta.47"
 
-"@babel/helper-simple-access@7.0.0-beta.46":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.0.0-beta.46.tgz#8eb0edf978c85915d11b6a7aa8591434e158170d"
+"@babel/helper-simple-access@7.0.0-beta.47":
+  version "7.0.0-beta.47"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.0.0-beta.47.tgz#234d754acbda9251a10db697ef50181eab125042"
   dependencies:
-    "@babel/template" "7.0.0-beta.46"
-    "@babel/types" "7.0.0-beta.46"
-    lodash "^4.2.0"
+    "@babel/template" "7.0.0-beta.47"
+    "@babel/types" "7.0.0-beta.47"
+    lodash "^4.17.5"
 
 "@babel/helper-split-export-declaration@7.0.0-beta.44":
   version "7.0.0-beta.44"
@@ -240,28 +240,28 @@
   dependencies:
     "@babel/types" "7.0.0-beta.44"
 
-"@babel/helper-split-export-declaration@7.0.0-beta.46":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0-beta.46.tgz#6903893c72bb2a3d54ed20b5ff2aa8a28e8d2ea1"
+"@babel/helper-split-export-declaration@7.0.0-beta.47":
+  version "7.0.0-beta.47"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0-beta.47.tgz#e11277855472d8d83baf22f2d0186c4a2059b09a"
   dependencies:
-    "@babel/types" "7.0.0-beta.46"
+    "@babel/types" "7.0.0-beta.47"
 
-"@babel/helper-wrap-function@7.0.0-beta.46":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.0.0-beta.46.tgz#d0fb836516d8a38ab80df1b434e4b76015be9035"
+"@babel/helper-wrap-function@7.0.0-beta.47":
+  version "7.0.0-beta.47"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.0.0-beta.47.tgz#6528b44a3ccb4f3aeeb79add0a88192f7eb81161"
   dependencies:
-    "@babel/helper-function-name" "7.0.0-beta.46"
-    "@babel/template" "7.0.0-beta.46"
-    "@babel/traverse" "7.0.0-beta.46"
-    "@babel/types" "7.0.0-beta.46"
+    "@babel/helper-function-name" "7.0.0-beta.47"
+    "@babel/template" "7.0.0-beta.47"
+    "@babel/traverse" "7.0.0-beta.47"
+    "@babel/types" "7.0.0-beta.47"
 
-"@babel/helpers@7.0.0-beta.46":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.0.0-beta.46.tgz#b5f988dfd77f4f713792cf7818b687050736ee52"
+"@babel/helpers@7.0.0-beta.47":
+  version "7.0.0-beta.47"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.0.0-beta.47.tgz#f9b42ed2e4d5f75ec0fb2e792c173e451e8d40fd"
   dependencies:
-    "@babel/template" "7.0.0-beta.46"
-    "@babel/traverse" "7.0.0-beta.46"
-    "@babel/types" "7.0.0-beta.46"
+    "@babel/template" "7.0.0-beta.47"
+    "@babel/traverse" "7.0.0-beta.47"
+    "@babel/types" "7.0.0-beta.47"
 
 "@babel/highlight@7.0.0-beta.44":
   version "7.0.0-beta.44"
@@ -271,85 +271,85 @@
     esutils "^2.0.2"
     js-tokens "^3.0.0"
 
-"@babel/highlight@7.0.0-beta.46":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-beta.46.tgz#c553c51e65f572bdedd6eff66fc0bb563016645e"
+"@babel/highlight@7.0.0-beta.47":
+  version "7.0.0-beta.47"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-beta.47.tgz#8fbc83fb2a21f0bd2b95cdbeb238cf9689cad494"
   dependencies:
     chalk "^2.0.0"
     esutils "^2.0.2"
     js-tokens "^3.0.0"
 
 "@babel/plugin-external-helpers@^7.0.0-beta.46":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-external-helpers/-/plugin-external-helpers-7.0.0-beta.46.tgz#293c1ed7a5257eb50dfc93e468f1129a7802a3cf"
+  version "7.0.0-beta.47"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-external-helpers/-/plugin-external-helpers-7.0.0-beta.47.tgz#b348b80da9b5fa3acebbe21979aa3839f6f7b875"
   dependencies:
-    "@babel/helper-plugin-utils" "7.0.0-beta.46"
+    "@babel/helper-plugin-utils" "7.0.0-beta.47"
 
 "@babel/plugin-proposal-async-generator-functions@^7.0.0-beta.46":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.0.0-beta.46.tgz#395330d1d5d7fb76c33b7bd99750adeafc37c68c"
+  version "7.0.0-beta.47"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.0.0-beta.47.tgz#571142284708c5ad4ec904d9aa705461a010be53"
   dependencies:
-    "@babel/helper-plugin-utils" "7.0.0-beta.46"
-    "@babel/helper-remap-async-to-generator" "7.0.0-beta.46"
-    "@babel/plugin-syntax-async-generators" "7.0.0-beta.46"
+    "@babel/helper-plugin-utils" "7.0.0-beta.47"
+    "@babel/helper-remap-async-to-generator" "7.0.0-beta.47"
+    "@babel/plugin-syntax-async-generators" "7.0.0-beta.47"
 
 "@babel/plugin-proposal-object-rest-spread@^7.0.0-beta.46":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.0.0-beta.46.tgz#fb3979488a52c1246cdced4a438ace0f47ac985b"
+  version "7.0.0-beta.47"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.0.0-beta.47.tgz#e1529fddc88e948868ee1d0edaa27ebd9502322d"
   dependencies:
-    "@babel/helper-plugin-utils" "7.0.0-beta.46"
-    "@babel/plugin-syntax-object-rest-spread" "7.0.0-beta.46"
+    "@babel/helper-plugin-utils" "7.0.0-beta.47"
+    "@babel/plugin-syntax-object-rest-spread" "7.0.0-beta.47"
 
-"@babel/plugin-syntax-async-generators@7.0.0-beta.46", "@babel/plugin-syntax-async-generators@^7.0.0-beta.46":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.0.0-beta.46.tgz#b35149e02748922d8e39506b0ac001a27bf449ed"
+"@babel/plugin-syntax-async-generators@7.0.0-beta.47", "@babel/plugin-syntax-async-generators@^7.0.0-beta.46":
+  version "7.0.0-beta.47"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.0.0-beta.47.tgz#8ab94852bf348badc866af85bd852221f0961256"
   dependencies:
-    "@babel/helper-plugin-utils" "7.0.0-beta.46"
+    "@babel/helper-plugin-utils" "7.0.0-beta.47"
 
 "@babel/plugin-syntax-dynamic-import@^7.0.0-beta.46":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.0.0-beta.46.tgz#651459c419d5ec0609a518370a417b8b47c52583"
+  version "7.0.0-beta.47"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.0.0-beta.47.tgz#ee964915014a687701ee8e15c289e31a7c899e60"
   dependencies:
-    "@babel/helper-plugin-utils" "7.0.0-beta.46"
+    "@babel/helper-plugin-utils" "7.0.0-beta.47"
 
 "@babel/plugin-syntax-import-meta@^7.0.0-beta.46":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.0.0-beta.46.tgz#b86f3ceb94b1744555b3c9271be51ca31b1aedf3"
+  version "7.0.0-beta.47"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.0.0-beta.47.tgz#8ab5174209a954b91e327004a7d16737bcc4774d"
   dependencies:
-    "@babel/helper-plugin-utils" "7.0.0-beta.46"
+    "@babel/helper-plugin-utils" "7.0.0-beta.47"
 
-"@babel/plugin-syntax-object-rest-spread@7.0.0-beta.46", "@babel/plugin-syntax-object-rest-spread@^7.0.0-beta.46":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.0.0-beta.46.tgz#03d46637f549757b2d6877b6449901698059d7d8"
+"@babel/plugin-syntax-object-rest-spread@7.0.0-beta.47", "@babel/plugin-syntax-object-rest-spread@^7.0.0-beta.46":
+  version "7.0.0-beta.47"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.0.0-beta.47.tgz#21da514d94c138b2261ca09f0dec9abadce16185"
   dependencies:
-    "@babel/helper-plugin-utils" "7.0.0-beta.46"
+    "@babel/helper-plugin-utils" "7.0.0-beta.47"
 
 "@babel/plugin-transform-arrow-functions@^7.0.0-beta.46":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.0.0-beta.46.tgz#130e79b1d4508767c47e5febb809f8dca80c05f5"
+  version "7.0.0-beta.47"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.0.0-beta.47.tgz#d6eecda4c652b909e3088f0983ebaf8ec292984b"
   dependencies:
-    "@babel/helper-plugin-utils" "7.0.0-beta.46"
+    "@babel/helper-plugin-utils" "7.0.0-beta.47"
 
 "@babel/plugin-transform-async-to-generator@^7.0.0-beta.46":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.0.0-beta.46.tgz#29fd5967f5056ca80f3a97db4d2ffa38a0dc2dce"
+  version "7.0.0-beta.47"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.0.0-beta.47.tgz#5723816ea1e91fa313a84e6ee9cc12ff31d46610"
   dependencies:
-    "@babel/helper-module-imports" "7.0.0-beta.46"
-    "@babel/helper-plugin-utils" "7.0.0-beta.46"
-    "@babel/helper-remap-async-to-generator" "7.0.0-beta.46"
+    "@babel/helper-module-imports" "7.0.0-beta.47"
+    "@babel/helper-plugin-utils" "7.0.0-beta.47"
+    "@babel/helper-remap-async-to-generator" "7.0.0-beta.47"
 
 "@babel/plugin-transform-block-scoped-functions@^7.0.0-beta.46":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.0.0-beta.46.tgz#0925a549931f61b45880618b0b42da4790b7c0b3"
+  version "7.0.0-beta.47"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.0.0-beta.47.tgz#e422278e06c797b43c45f459d83c7af9d6237002"
   dependencies:
-    "@babel/helper-plugin-utils" "7.0.0-beta.46"
+    "@babel/helper-plugin-utils" "7.0.0-beta.47"
 
 "@babel/plugin-transform-block-scoping@^7.0.0-beta.46":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.0.0-beta.46.tgz#da42dd17fbed675c72233988dbad9ace5ab9e4a7"
+  version "7.0.0-beta.47"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.0.0-beta.47.tgz#b737cc58a81bea57efd5bda0baef9a43a25859ad"
   dependencies:
-    "@babel/helper-plugin-utils" "7.0.0-beta.46"
-    lodash "^4.2.0"
+    "@babel/helper-plugin-utils" "7.0.0-beta.47"
+    lodash "^4.17.5"
 
 "@babel/plugin-transform-classes@=7.0.0-beta.35":
   version "7.0.0-beta.35"
@@ -362,121 +362,121 @@
     "@babel/helper-replace-supers" "7.0.0-beta.35"
 
 "@babel/plugin-transform-computed-properties@^7.0.0-beta.46":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.0.0-beta.46.tgz#ca1ece27615f7324345713fb6a93dd288788e891"
+  version "7.0.0-beta.47"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.0.0-beta.47.tgz#56ef2a021769a2b65e90a3e12fd10b791da9f3e0"
   dependencies:
-    "@babel/helper-plugin-utils" "7.0.0-beta.46"
+    "@babel/helper-plugin-utils" "7.0.0-beta.47"
 
 "@babel/plugin-transform-destructuring@^7.0.0-beta.46":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.0.0-beta.46.tgz#6e6a097da31063f545f7818afe48ef09165ce5ff"
+  version "7.0.0-beta.47"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.0.0-beta.47.tgz#452b607775fd1c4d10621997837189efc0a6d428"
   dependencies:
-    "@babel/helper-plugin-utils" "7.0.0-beta.46"
+    "@babel/helper-plugin-utils" "7.0.0-beta.47"
 
 "@babel/plugin-transform-duplicate-keys@^7.0.0-beta.46":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.0.0-beta.46.tgz#7e94e42099b099742617838237b0d6e1a9b2690f"
+  version "7.0.0-beta.47"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.0.0-beta.47.tgz#4aabeda051ca3007e33a207db08f1a0cf9bd253b"
   dependencies:
-    "@babel/helper-plugin-utils" "7.0.0-beta.46"
+    "@babel/helper-plugin-utils" "7.0.0-beta.47"
 
 "@babel/plugin-transform-exponentiation-operator@^7.0.0-beta.46":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.0.0-beta.46.tgz#95ae2e03456e417d2f5eace6d05a8fccb7af1bcc"
+  version "7.0.0-beta.47"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.0.0-beta.47.tgz#930e1abf5db9f4db5b63dbf97f3581ad0be1e907"
   dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "7.0.0-beta.46"
-    "@babel/helper-plugin-utils" "7.0.0-beta.46"
+    "@babel/helper-builder-binary-assignment-operator-visitor" "7.0.0-beta.47"
+    "@babel/helper-plugin-utils" "7.0.0-beta.47"
 
 "@babel/plugin-transform-for-of@^7.0.0-beta.46":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.0.0-beta.46.tgz#ce643487384c96d1bd1f57a112b2ccba6c34da5c"
+  version "7.0.0-beta.47"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.0.0-beta.47.tgz#527d5dc24e4a4ad0fc1d0a3990d29968cb984e76"
   dependencies:
-    "@babel/helper-plugin-utils" "7.0.0-beta.46"
+    "@babel/helper-plugin-utils" "7.0.0-beta.47"
 
 "@babel/plugin-transform-function-name@^7.0.0-beta.46":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.0.0-beta.46.tgz#2479f5188de9ab1f99396bce83b3b9d39bc13bdb"
+  version "7.0.0-beta.47"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.0.0-beta.47.tgz#fb443c81cc77f3206a863b730b35c8c553ce5041"
   dependencies:
-    "@babel/helper-function-name" "7.0.0-beta.46"
-    "@babel/helper-plugin-utils" "7.0.0-beta.46"
+    "@babel/helper-function-name" "7.0.0-beta.47"
+    "@babel/helper-plugin-utils" "7.0.0-beta.47"
 
 "@babel/plugin-transform-instanceof@^7.0.0-beta.46":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-instanceof/-/plugin-transform-instanceof-7.0.0-beta.46.tgz#4d320f4c57d3acf8390ffb8110ee0d3642cefc3f"
+  version "7.0.0-beta.47"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-instanceof/-/plugin-transform-instanceof-7.0.0-beta.47.tgz#41d4541588e898dbcea26789845693b788c7df42"
   dependencies:
-    "@babel/helper-plugin-utils" "7.0.0-beta.46"
+    "@babel/helper-plugin-utils" "7.0.0-beta.47"
 
 "@babel/plugin-transform-literals@^7.0.0-beta.46":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.0.0-beta.46.tgz#84f5bcfe914b9fd4385c0ddf469f9ed403ee68bd"
+  version "7.0.0-beta.47"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.0.0-beta.47.tgz#448fad196f062163684a38f10f14e83315892e9c"
   dependencies:
-    "@babel/helper-plugin-utils" "7.0.0-beta.46"
+    "@babel/helper-plugin-utils" "7.0.0-beta.47"
 
 "@babel/plugin-transform-modules-amd@^7.0.0-beta.46":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.0.0-beta.46.tgz#01aeb4887c7df7059cefe4a206eefdf190c79f48"
+  version "7.0.0-beta.47"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.0.0-beta.47.tgz#84564419b11c1be6b9fcd4c7b3a6737f2335aac4"
   dependencies:
-    "@babel/helper-module-transforms" "7.0.0-beta.46"
-    "@babel/helper-plugin-utils" "7.0.0-beta.46"
+    "@babel/helper-module-transforms" "7.0.0-beta.47"
+    "@babel/helper-plugin-utils" "7.0.0-beta.47"
 
 "@babel/plugin-transform-object-super@^7.0.0-beta.46":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.0.0-beta.46.tgz#b5376fe93f5e154b765468f1a58a717717f95827"
+  version "7.0.0-beta.47"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.0.0-beta.47.tgz#ca8e5f326c5011c879f3a6ed749e58bd10fff05d"
   dependencies:
-    "@babel/helper-plugin-utils" "7.0.0-beta.46"
-    "@babel/helper-replace-supers" "7.0.0-beta.46"
+    "@babel/helper-plugin-utils" "7.0.0-beta.47"
+    "@babel/helper-replace-supers" "7.0.0-beta.47"
 
 "@babel/plugin-transform-parameters@^7.0.0-beta.46":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.0.0-beta.46.tgz#33bbd2e3bd499d99016034dcaf8c6b72c2a69ec3"
+  version "7.0.0-beta.47"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.0.0-beta.47.tgz#46a4236040a6552a5f165fb3ddd60368954b0ddd"
   dependencies:
-    "@babel/helper-call-delegate" "7.0.0-beta.46"
-    "@babel/helper-get-function-arity" "7.0.0-beta.46"
-    "@babel/helper-plugin-utils" "7.0.0-beta.46"
+    "@babel/helper-call-delegate" "7.0.0-beta.47"
+    "@babel/helper-get-function-arity" "7.0.0-beta.47"
+    "@babel/helper-plugin-utils" "7.0.0-beta.47"
 
 "@babel/plugin-transform-regenerator@^7.0.0-beta.46":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.0.0-beta.46.tgz#875ceb5b37ec0e898c23b60af760715d9d462b4f"
+  version "7.0.0-beta.47"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.0.0-beta.47.tgz#86500e1c404055fb98fc82b73b09bd053cacb516"
   dependencies:
     regenerator-transform "^0.12.3"
 
 "@babel/plugin-transform-shorthand-properties@^7.0.0-beta.46":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.0.0-beta.46.tgz#aa21512b0fef7b916fc5cbc87df717465c25515c"
+  version "7.0.0-beta.47"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.0.0-beta.47.tgz#00be44c4fad8fe2c00ed18ea15ea3c88dd519dbb"
   dependencies:
-    "@babel/helper-plugin-utils" "7.0.0-beta.46"
+    "@babel/helper-plugin-utils" "7.0.0-beta.47"
 
 "@babel/plugin-transform-spread@^7.0.0-beta.46":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.0.0-beta.46.tgz#48eabb219f1e0c16e9b0a6166072ae9d4c7cd397"
+  version "7.0.0-beta.47"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.0.0-beta.47.tgz#3feadb02292ed1e9b75090d651b9df88a7ab5c50"
   dependencies:
-    "@babel/helper-plugin-utils" "7.0.0-beta.46"
+    "@babel/helper-plugin-utils" "7.0.0-beta.47"
 
 "@babel/plugin-transform-sticky-regex@^7.0.0-beta.46":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.0.0-beta.46.tgz#c96c41f31272ec1cdc47dd91a22c6d75c4db70d2"
+  version "7.0.0-beta.47"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.0.0-beta.47.tgz#c0aa347d76b5dc87d3b37ac016ada3f950605131"
   dependencies:
-    "@babel/helper-plugin-utils" "7.0.0-beta.46"
-    "@babel/helper-regex" "7.0.0-beta.46"
+    "@babel/helper-plugin-utils" "7.0.0-beta.47"
+    "@babel/helper-regex" "7.0.0-beta.47"
 
 "@babel/plugin-transform-template-literals@^7.0.0-beta.46":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.0.0-beta.46.tgz#e8bcc798dece29807893e8ee27ccf3176f658c62"
+  version "7.0.0-beta.47"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.0.0-beta.47.tgz#5f7b5badf64c4c5da79026aeab03001e62a6ee5f"
   dependencies:
-    "@babel/helper-annotate-as-pure" "7.0.0-beta.46"
-    "@babel/helper-plugin-utils" "7.0.0-beta.46"
+    "@babel/helper-annotate-as-pure" "7.0.0-beta.47"
+    "@babel/helper-plugin-utils" "7.0.0-beta.47"
 
 "@babel/plugin-transform-typeof-symbol@^7.0.0-beta.46":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.0.0-beta.46.tgz#643529184cbb07199237c94537c89ea9a721fa0a"
+  version "7.0.0-beta.47"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.0.0-beta.47.tgz#03c612ec09213eb386a81d5fa67c234ee4b2034c"
   dependencies:
-    "@babel/helper-plugin-utils" "7.0.0-beta.46"
+    "@babel/helper-plugin-utils" "7.0.0-beta.47"
 
 "@babel/plugin-transform-unicode-regex@^7.0.0-beta.46":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.0.0-beta.46.tgz#10e6edcc8eb0db71ff2f0e3fc87ed88337d24fb9"
+  version "7.0.0-beta.47"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.0.0-beta.47.tgz#efed0b2f1dfbf28283502234a95b4be88f7fdcb6"
   dependencies:
-    "@babel/helper-plugin-utils" "7.0.0-beta.46"
-    "@babel/helper-regex" "7.0.0-beta.46"
+    "@babel/helper-plugin-utils" "7.0.0-beta.47"
+    "@babel/helper-regex" "7.0.0-beta.47"
     regexpu-core "^4.1.3"
 
 "@babel/template@7.0.0-beta.35":
@@ -497,14 +497,14 @@
     babylon "7.0.0-beta.44"
     lodash "^4.2.0"
 
-"@babel/template@7.0.0-beta.46":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.46.tgz#8b23982411d5b5dbfa479437bfe414adb1411bb9"
+"@babel/template@7.0.0-beta.47":
+  version "7.0.0-beta.47"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.47.tgz#0473970a7c0bee7a1a18c1ca999d3ba5e5bad83d"
   dependencies:
-    "@babel/code-frame" "7.0.0-beta.46"
-    "@babel/types" "7.0.0-beta.46"
-    babylon "7.0.0-beta.46"
-    lodash "^4.2.0"
+    "@babel/code-frame" "7.0.0-beta.47"
+    "@babel/types" "7.0.0-beta.47"
+    babylon "7.0.0-beta.47"
+    lodash "^4.17.5"
 
 "@babel/traverse@7.0.0-beta.35":
   version "7.0.0-beta.35"
@@ -534,20 +534,20 @@
     invariant "^2.2.0"
     lodash "^4.2.0"
 
-"@babel/traverse@7.0.0-beta.46", "@babel/traverse@^7.0.0-beta.42", "@babel/traverse@^7.0.0-beta.46":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.46.tgz#29a0c0395b3642f0297e6f8e475bde89f9343755"
+"@babel/traverse@7.0.0-beta.47", "@babel/traverse@^7.0.0-beta.42", "@babel/traverse@^7.0.0-beta.46":
+  version "7.0.0-beta.47"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.47.tgz#0e57fdbb9ff3a909188b6ebf1e529c641e6c82a4"
   dependencies:
-    "@babel/code-frame" "7.0.0-beta.46"
-    "@babel/generator" "7.0.0-beta.46"
-    "@babel/helper-function-name" "7.0.0-beta.46"
-    "@babel/helper-split-export-declaration" "7.0.0-beta.46"
-    "@babel/types" "7.0.0-beta.46"
-    babylon "7.0.0-beta.46"
+    "@babel/code-frame" "7.0.0-beta.47"
+    "@babel/generator" "7.0.0-beta.47"
+    "@babel/helper-function-name" "7.0.0-beta.47"
+    "@babel/helper-split-export-declaration" "7.0.0-beta.47"
+    "@babel/types" "7.0.0-beta.47"
+    babylon "7.0.0-beta.47"
     debug "^3.1.0"
     globals "^11.1.0"
     invariant "^2.2.0"
-    lodash "^4.2.0"
+    lodash "^4.17.5"
 
 "@babel/types@7.0.0-beta.35":
   version "7.0.0-beta.35"
@@ -565,12 +565,12 @@
     lodash "^4.2.0"
     to-fast-properties "^2.0.0"
 
-"@babel/types@7.0.0-beta.46", "@babel/types@^7.0.0-beta.42":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.46.tgz#eb84399a699af9fcb244440cce78e1acbeb40e0c"
+"@babel/types@7.0.0-beta.47", "@babel/types@^7.0.0-beta.42":
+  version "7.0.0-beta.47"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.47.tgz#e6fcc1a691459002c2671d558a586706dddaeef8"
   dependencies:
     esutils "^2.0.2"
-    lodash "^4.2.0"
+    lodash "^4.17.5"
     to-fast-properties "^2.0.0"
 
 "@mrmlnc/readdir-enhanced@^2.2.1":
@@ -580,6 +580,10 @@
     call-me-maybe "^1.0.1"
     glob-to-regexp "^0.3.0"
 
+"@nodelib/fs.stat@^1.0.1":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.0.2.tgz#d056b68999769728a1cff8d643bc59eb6f0be436"
+
 "@polymer/app-layout@^3.0.0-pre.18":
   version "3.0.0-pre.19"
   resolved "https://registry.yarnpkg.com/@polymer/app-layout/-/app-layout-3.0.0-pre.19.tgz#76b0ace980fa3033ffa4810b931a58d29fc48b33"
@@ -1120,8 +1124,8 @@
     "@types/babel-types" "*"
 
 "@types/babel-types@*":
-  version "6.25.1"
-  resolved "https://registry.yarnpkg.com/@types/babel-types/-/babel-types-6.25.1.tgz#ce8f126a4403e11e1b0033a424f11638afac7889"
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/@types/babel-types/-/babel-types-7.0.2.tgz#63dc3e5e7f6367e1819d2bba5213783cd926c5d5"
 
 "@types/babel-types@^6.25.1":
   version "6.25.2"
@@ -1134,8 +1138,15 @@
     "@types/babel-types" "*"
 
 "@types/bluebird@*":
-  version "3.5.14"
-  resolved "https://registry.yarnpkg.com/@types/bluebird/-/bluebird-3.5.14.tgz#370ca8814b902da06f24115a23ea40c60610878c"
+  version "3.5.20"
+  resolved "https://registry.yarnpkg.com/@types/bluebird/-/bluebird-3.5.20.tgz#f6363172add6f4eabb8cada53ca9af2781e8d6a1"
+
+"@types/body-parser@*":
+  version "1.17.0"
+  resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.17.0.tgz#9f5c9d9bd04bb54be32d5eb9fc0d8c974e6cf58c"
+  dependencies:
+    "@types/connect" "*"
+    "@types/node" "*"
 
 "@types/chai-subset@^1.3.0":
   version "1.3.1"
@@ -1144,8 +1155,8 @@
     "@types/chai" "*"
 
 "@types/chai@*":
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.0.4.tgz#fe86315d9a66827feeb16f73bc954688ec950e18"
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.1.3.tgz#b8a74352977a23b604c01aa784f5b793443fb7dc"
 
 "@types/chalk@^0.4.30", "@types/chalk@^0.4.31":
   version "0.4.31"
@@ -1165,9 +1176,15 @@
   dependencies:
     "@types/express" "*"
 
+"@types/connect@*":
+  version "3.4.32"
+  resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.32.tgz#aa0e9616b9435ccad02bc52b5b454ffc2c70ba28"
+  dependencies:
+    "@types/node" "*"
+
 "@types/content-type@^1.1.0":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@types/content-type/-/content-type-1.1.1.tgz#3bf6a613cd3cc400699f30a62d602757f7898c97"
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@types/content-type/-/content-type-1.1.2.tgz#bff0a1b7aa5bd48516c8ed7a6efefb1e85813245"
 
 "@types/cssbeautify@^0.3.1":
   version "0.3.1"
@@ -1197,21 +1214,38 @@
   dependencies:
     "@types/estree" "*"
 
-"@types/estree@*", "@types/estree@^0.0.37":
-  version "0.0.37"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.37.tgz#48949c1516d46139c1e521195f9e12993b69d751"
+"@types/estree@*":
+  version "0.0.39"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
 
 "@types/estree@0.0.38":
   version "0.0.38"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.38.tgz#c1be40aa933723c608820a99a373a16d215a1ca2"
 
+"@types/estree@^0.0.37":
+  version "0.0.37"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.37.tgz#48949c1516d46139c1e521195f9e12993b69d751"
+
+"@types/events@*":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@types/events/-/events-1.2.0.tgz#81a6731ce4df43619e5c8c945383b3e62a89ea86"
+
 "@types/express-serve-static-core@*":
-  version "4.0.53"
-  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.0.53.tgz#1723a35d1447f2c55e13c8721eab3448e42f4d82"
+  version "4.11.1"
+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.11.1.tgz#f6f7212382d59b19d696677bcaa48a37280f5d45"
   dependencies:
+    "@types/events" "*"
     "@types/node" "*"
 
-"@types/express@*", "@types/express@^4.0.30", "@types/express@^4.0.36":
+"@types/express@*", "@types/express@^4.0.36":
+  version "4.11.1"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.11.1.tgz#f99663b3ab32d04cb11db612ef5dd7933f75465b"
+  dependencies:
+    "@types/body-parser" "*"
+    "@types/express-serve-static-core" "*"
+    "@types/serve-static" "*"
+
+"@types/express@^4.0.30":
   version "4.0.37"
   resolved "https://registry.yarnpkg.com/@types/express/-/express-4.0.37.tgz#625ac3765169676e01897ca47011c26375784971"
   dependencies:
@@ -1229,8 +1263,8 @@
     "@types/minimatch" "*"
 
 "@types/form-data@*":
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/@types/form-data/-/form-data-2.2.0.tgz#a98aac91dc99857b6af24caef7ca6df302f31565"
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/@types/form-data/-/form-data-2.2.1.tgz#ee2b3b8eaa11c0938289953606b745b738c54b1e"
   dependencies:
     "@types/node" "*"
 
@@ -1239,16 +1273,17 @@
   resolved "https://registry.yarnpkg.com/@types/freeport/-/freeport-1.0.21.tgz#73f6543ed67d3ca3fff97b985591598b7092066f"
 
 "@types/glob-stream@*":
-  version "3.1.31"
-  resolved "https://registry.yarnpkg.com/@types/glob-stream/-/glob-stream-3.1.31.tgz#015842260c01dab3b56578d8b37de2e57483d4ad"
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/@types/glob-stream/-/glob-stream-6.1.0.tgz#7ede8a33e59140534f8d8adfb8ac9edfb31897bc"
   dependencies:
     "@types/glob" "*"
     "@types/node" "*"
 
 "@types/glob@*":
-  version "5.0.33"
-  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-5.0.33.tgz#3dff7c6ce09d65abe919c7961dc3dee016f36ad7"
+  version "5.0.35"
+  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-5.0.35.tgz#1ae151c802cece940443b5ac246925c85189f32a"
   dependencies:
+    "@types/events" "*"
     "@types/minimatch" "*"
     "@types/node" "*"
 
@@ -1274,8 +1309,8 @@
     "@types/uglify-js" "*"
 
 "@types/inquirer@*":
-  version "0.0.35"
-  resolved "https://registry.yarnpkg.com/@types/inquirer/-/inquirer-0.0.35.tgz#e054657cf2d10963823957d4d06ec244f05c65be"
+  version "0.0.41"
+  resolved "https://registry.yarnpkg.com/@types/inquirer/-/inquirer-0.0.41.tgz#0c33027dcd0b0dde234e22afa454f2c75d8b30d2"
   dependencies:
     "@types/rx" "*"
     "@types/through" "*"
@@ -1296,8 +1331,8 @@
   resolved "https://registry.yarnpkg.com/@types/launchpad/-/launchpad-0.6.0.tgz#37296109b7f277f6e6c5fd7e0c0706bc918fbb51"
 
 "@types/merge-stream@^1.0.28":
-  version "1.0.28"
-  resolved "https://registry.yarnpkg.com/@types/merge-stream/-/merge-stream-1.0.28.tgz#7cabfaaab6c64d51e3410d95e17dd9061e413532"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@types/merge-stream/-/merge-stream-1.1.0.tgz#7bed9fa3fb5a0b3d13712c7c7099bf0939d96a8c"
   dependencies:
     "@types/node" "*"
 
@@ -1309,11 +1344,7 @@
   version "0.0.29"
   resolved "https://registry.yarnpkg.com/@types/mime/-/mime-0.0.29.tgz#fbcfd330573b912ef59eeee14602bface630754b"
 
-"@types/minimatch@*":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.1.tgz#b683eb60be358304ef146f5775db4c0e3696a550"
-
-"@types/minimatch@^3.0.1":
+"@types/minimatch@*", "@types/minimatch@^3.0.1":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
 
@@ -1331,21 +1362,29 @@
     "@types/node" "*"
 
 "@types/node@*":
-  version "8.0.25"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.25.tgz#66ecaf4df93f5281b48427ee96fbcdfc4f0cdce1"
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.1.0.tgz#2783ee1b6c47cbd4044f4a233976c1ac5fa9e942"
 
 "@types/node@^4.0.30", "@types/node@^4.2.3":
-  version "4.2.20"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-4.2.20.tgz#3f7dceff43e07cfff4407fc3495d98a533b32267"
+  version "4.2.23"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-4.2.23.tgz#9241f00d64eb91084f68367746ef10d5fb2f2fc4"
 
-"@types/node@^6.0.0", "@types/node@^6.0.41", "@types/node@^6.0.77":
+"@types/node@^6.0.0":
+  version "6.0.110"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.110.tgz#6bbfc1c14d671348e3db4f89f3b487785e684684"
+
+"@types/node@^6.0.41", "@types/node@^6.0.77":
   version "6.0.88"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.88.tgz#f618f11a944f6a18d92b5c472028728a3e3d4b66"
 
-"@types/node@^9.3.0", "@types/node@^9.6.4":
+"@types/node@^9.3.0":
   version "9.6.15"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.15.tgz#8a5a313ea0a43a95277235841be5d3f5fb3dfeda"
 
+"@types/node@^9.6.4":
+  version "9.6.16"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.16.tgz#a20616348c3006277d458972ae16fe3b43b24ec1"
+
 "@types/opn@^3.0.28":
   version "3.0.28"
   resolved "https://registry.yarnpkg.com/@types/opn/-/opn-3.0.28.tgz#097d0d1c9b5749573a5d96df132387bb6d02118a"
@@ -1363,8 +1402,8 @@
   resolved "https://registry.yarnpkg.com/@types/path-is-inside/-/path-is-inside-1.0.0.tgz#02d6ff38975d684bdec96204494baf9f29f0e17f"
 
 "@types/pem@^1.8.1":
-  version "1.9.2"
-  resolved "https://registry.yarnpkg.com/@types/pem/-/pem-1.9.2.tgz#cd0b195d161dffbcb0aa88fa9fd94b24dd2af10b"
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/@types/pem/-/pem-1.9.3.tgz#0c864c8b79e43fef6367db895f60fd1edd10e86c"
 
 "@types/relateurl@*":
   version "0.2.28"
@@ -1464,8 +1503,8 @@
     "@types/rx-lite" "*"
 
 "@types/rx-lite@*":
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/@types/rx-lite/-/rx-lite-4.0.4.tgz#710ebf89d0a2d596c21047d91b1242bcef51c30b"
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/@types/rx-lite/-/rx-lite-4.0.5.tgz#b3581525dff69423798daa9a0d33c1e66a5e8c4c"
   dependencies:
     "@types/rx-core" "*"
     "@types/rx-core-binding" "*"
@@ -1488,29 +1527,25 @@
     "@types/rx-lite-virtualtime" "*"
 
 "@types/semver@^5.3.30":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-5.4.0.tgz#f3658535af7f1f502acd6da7daf405ffeb1f7ee4"
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-5.5.0.tgz#146c2a29ee7d3bae4bf2fcb274636e264c813c45"
 
 "@types/serve-static@*", "@types/serve-static@^1.7.31":
-  version "1.7.32"
-  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.7.32.tgz#0f6732e4dab0813771dd8fc8fe14940f34728b4c"
+  version "1.13.2"
+  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.2.tgz#f5ac4d7a6420a99a6a45af4719f4dcd8cd907a48"
   dependencies:
     "@types/express-serve-static-core" "*"
     "@types/mime" "*"
 
-"@types/source-map@*":
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/@types/source-map/-/source-map-0.5.1.tgz#7e74db5d06ab373a712356eebfaea2fad0ea2367"
-
 "@types/spdy@^3.4.1":
-  version "3.4.3"
-  resolved "https://registry.yarnpkg.com/@types/spdy/-/spdy-3.4.3.tgz#b60dce7174687df28066e5da4e4e211bc84b41f1"
+  version "3.4.4"
+  resolved "https://registry.yarnpkg.com/@types/spdy/-/spdy-3.4.4.tgz#3282fd4ad8c4603aa49f7017dd520a08a345b2bc"
   dependencies:
     "@types/node" "*"
 
 "@types/temp@^0.8.28":
-  version "0.8.29"
-  resolved "https://registry.yarnpkg.com/@types/temp/-/temp-0.8.29.tgz#c3cdc113e3c138f90e5e970d51e41b0b7f62678d"
+  version "0.8.32"
+  resolved "https://registry.yarnpkg.com/@types/temp/-/temp-0.8.32.tgz#b0e7a6ad37f59041a1968ddb835592256ac7ad65"
   dependencies:
     "@types/node" "*"
 
@@ -1525,14 +1560,14 @@
   resolved "https://registry.yarnpkg.com/@types/ua-parser-js/-/ua-parser-js-0.7.32.tgz#8827d451d6702307248073b5d98aa9293d02b5e5"
 
 "@types/uglify-js@*":
-  version "2.6.29"
-  resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-2.6.29.tgz#521347f69e20201d218f5991ae66e10878afcf1a"
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.0.2.tgz#f30c75458d18e8ee885c792c04adcb78a13bc286"
   dependencies:
-    "@types/source-map" "*"
+    source-map "^0.6.1"
 
 "@types/update-notifier@^1.0.0":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@types/update-notifier/-/update-notifier-1.0.2.tgz#7a9269a38545bfd90155aac1350669a19f8ecb4a"
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@types/update-notifier/-/update-notifier-1.0.3.tgz#3c7ee1921af6f16149cdcaef356baf57d7a0b806"
 
 "@types/uuid@^3.4.3":
   version "3.4.3"
@@ -1557,8 +1592,8 @@
     "@types/vinyl" "*"
 
 "@types/vinyl@*", "@types/vinyl@^2.0.0":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@types/vinyl/-/vinyl-2.0.1.tgz#6b414dfdcd4a785e8e76e87565ed29e79490d9b7"
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@types/vinyl/-/vinyl-2.0.2.tgz#4f3b8dae8f5828d3800ef709b0cff488ee852de3"
   dependencies:
     "@types/node" "*"
 
@@ -1573,15 +1608,16 @@
   resolved "https://registry.yarnpkg.com/@types/which/-/which-1.3.1.tgz#7802c380887986ca909008afea4e08025b130f8d"
 
 "@types/winston@^2.2.0":
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/@types/winston/-/winston-2.3.6.tgz#0f0954b9e16abd40598dc6e9cc2ea43044237997"
+  version "2.3.9"
+  resolved "https://registry.yarnpkg.com/@types/winston/-/winston-2.3.9.tgz#1ff9f1bb57952fe3d88c1b21c4899ede316a35bc"
   dependencies:
     "@types/node" "*"
 
-"@types/yeoman-generator@^1.0.0":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@types/yeoman-generator/-/yeoman-generator-1.0.3.tgz#cb90cd0c3fd9bb18c093a377d756caff13a2b48a"
+"@types/yeoman-generator@^2.0.3":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@types/yeoman-generator/-/yeoman-generator-2.0.3.tgz#f4b161ee354078b526e0901a5a5f87d4f8e085f6"
   dependencies:
+    "@types/events" "*"
     "@types/inquirer" "*"
 
 "@vaadin/vaadin-button@^2.0.0-pre.2":
@@ -1820,8 +1856,8 @@
   resolved "https://registry.yarnpkg.com/@webcomponents/webcomponentsjs/-/webcomponentsjs-2.0.0.tgz#166e7489b9ce66f5c082a3360120cb27505f762f"
 
 abbrev@1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f"
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
 
 accepts@1.3.3:
   version "1.3.3"
@@ -1830,11 +1866,11 @@ accepts@1.3.3:
     mime-types "~2.1.11"
     negotiator "0.6.1"
 
-accepts@~1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.4.tgz#86246758c7dd6d21a6474ff084a4740ec05eb21f"
+accepts@~1.3.4, accepts@~1.3.5:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2"
   dependencies:
-    mime-types "~2.1.16"
+    mime-types "~2.1.18"
     negotiator "0.6.1"
 
 accessibility-developer-tools@^2.12.0:
@@ -1905,16 +1941,7 @@ ajv@^4.9.1:
     co "^4.6.0"
     json-stable-stringify "^1.0.1"
 
-ajv@^5.1.0:
-  version "5.2.3"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.2.3.tgz#c06f598778c44c6b161abafe3466b81ad1814ed2"
-  dependencies:
-    co "^4.6.0"
-    fast-deep-equal "^1.0.0"
-    json-schema-traverse "^0.3.0"
-    json-stable-stringify "^1.0.1"
-
-ajv@^5.2.3, ajv@^5.3.0:
+ajv@^5.1.0, ajv@^5.2.3, ajv@^5.3.0:
   version "5.5.2"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
   dependencies:
@@ -2060,11 +2087,7 @@ append-field@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/append-field/-/append-field-0.1.0.tgz#6ddc58fa083c7bc545d3c5995b2830cc2366d44a"
 
-aproba@^1.0.3:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.1.2.tgz#45c6629094de4e96f693ef7eab74ae079c240fc1"
-
-aproba@^1.1.1:
+aproba@^1.0.3, aproba@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
 
@@ -2110,6 +2133,13 @@ argparse@^1.0.7:
   dependencies:
     sprintf-js "~1.0.2"
 
+argv-tools@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/argv-tools/-/argv-tools-0.1.1.tgz#588283f3393ada47141440b12981cd41bf6b7032"
+  dependencies:
+    array-back "^2.0.0"
+    find-replace "^2.0.1"
+
 arr-diff@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-1.1.0.tgz#687c32758163588fef7de7b36fabe495eb1a399a"
@@ -2145,6 +2175,12 @@ array-back@^1.0.3, array-back@^1.0.4:
   dependencies:
     typical "^2.6.0"
 
+array-back@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/array-back/-/array-back-2.0.0.tgz#6877471d51ecc9c9bfa6136fb6c7d5fe69748022"
+  dependencies:
+    typical "^2.6.1"
+
 array-differ@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031"
@@ -2266,15 +2302,15 @@ async@^1.5.0, async@^1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
 
-async@^2.0.0, async@^2.0.1, async@^2.1.2:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.5.0.tgz#843190fd6b7357a0b9e1c956edddd5ec8462b54d"
+async@^2.0.0, async@^2.1.4, async@^2.4.1, async@^2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4"
   dependencies:
     lodash "^4.14.0"
 
-async@^2.1.4, async@^2.4.1, async@^2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4"
+async@^2.0.1, async@^2.1.2:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.5.0.tgz#843190fd6b7357a0b9e1c956edddd5ec8462b54d"
   dependencies:
     lodash "^4.14.0"
 
@@ -2303,8 +2339,8 @@ aws-sign2@~0.7.0:
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
 
 aws4@^1.2.1, aws4@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.7.0.tgz#d4d0e9b9dbfca77bf08eeb0a8a471550fe39e289"
 
 babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
   version "6.26.0"
@@ -2417,9 +2453,9 @@ babel-helper-define-map@^6.24.1:
     babel-types "^6.26.0"
     lodash "^4.17.4"
 
-babel-helper-evaluate-path@^0.4.2:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/babel-helper-evaluate-path/-/babel-helper-evaluate-path-0.4.2.tgz#5bf57e3763778795651514b0eb87d68f78d22a2a"
+babel-helper-evaluate-path@^0.4.3:
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/babel-helper-evaluate-path/-/babel-helper-evaluate-path-0.4.3.tgz#0a89af702c06b217027fa371908dd4989d3e633f"
 
 babel-helper-explode-assignable-expression@^6.24.1:
   version "6.24.1"
@@ -2438,9 +2474,9 @@ babel-helper-explode-class@^6.24.1:
     babel-traverse "^6.24.1"
     babel-types "^6.24.1"
 
-babel-helper-flip-expressions@^0.4.2:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/babel-helper-flip-expressions/-/babel-helper-flip-expressions-0.4.2.tgz#c53ffc7cc5f3e625b2673260b8f9f7ba95c853db"
+babel-helper-flip-expressions@^0.4.1, babel-helper-flip-expressions@^0.4.3:
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/babel-helper-flip-expressions/-/babel-helper-flip-expressions-0.4.3.tgz#3696736a128ac18bc25254b5f40a22ceb3c1d3fd"
 
 babel-helper-function-name@^6.24.1:
   version "6.24.1"
@@ -2470,13 +2506,13 @@ babel-helper-is-nodes-equiv@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/babel-helper-is-nodes-equiv/-/babel-helper-is-nodes-equiv-0.0.1.tgz#34e9b300b1479ddd98ec77ea0bbe9342dfe39684"
 
-babel-helper-is-void-0@^0.4.2:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/babel-helper-is-void-0/-/babel-helper-is-void-0-0.4.2.tgz#f5539bb934b8ffc99c6eb2dc38f322d22af9d43b"
+babel-helper-is-void-0@^0.4.3:
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/babel-helper-is-void-0/-/babel-helper-is-void-0-0.4.3.tgz#7d9c01b4561e7b95dbda0f6eee48f5b60e67313e"
 
-babel-helper-mark-eval-scopes@^0.4.2:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/babel-helper-mark-eval-scopes/-/babel-helper-mark-eval-scopes-0.4.2.tgz#bd68e8556aa12b7eeccb3f00ae86a63c0bd774d6"
+babel-helper-mark-eval-scopes@^0.4.3:
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/babel-helper-mark-eval-scopes/-/babel-helper-mark-eval-scopes-0.4.3.tgz#d244a3bef9844872603ffb46e22ce8acdf551562"
 
 babel-helper-optimise-call-expression@^6.24.1:
   version "6.24.1"
@@ -2503,9 +2539,9 @@ babel-helper-remap-async-to-generator@^6.24.1:
     babel-traverse "^6.24.1"
     babel-types "^6.24.1"
 
-babel-helper-remove-or-void@^0.4.2:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/babel-helper-remove-or-void/-/babel-helper-remove-or-void-0.4.2.tgz#86733475d7ea2498ac498055f8974b751788d79c"
+babel-helper-remove-or-void@^0.4.3:
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/babel-helper-remove-or-void/-/babel-helper-remove-or-void-0.4.3.tgz#a4f03b40077a0ffe88e45d07010dee241ff5ae60"
 
 babel-helper-replace-supers@^6.24.1:
   version "6.24.1"
@@ -2518,9 +2554,9 @@ babel-helper-replace-supers@^6.24.1:
     babel-traverse "^6.24.1"
     babel-types "^6.24.1"
 
-babel-helper-to-multiple-sequence-expressions@^0.4.2:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/babel-helper-to-multiple-sequence-expressions/-/babel-helper-to-multiple-sequence-expressions-0.4.2.tgz#566f5e93fb7051a36ae51c0f861aa8a4ff08b7a0"
+babel-helper-to-multiple-sequence-expressions@^0.4.3:
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/babel-helper-to-multiple-sequence-expressions/-/babel-helper-to-multiple-sequence-expressions-0.4.3.tgz#5b518b1127f47b3038773386a1561a2b48e632b6"
 
 babel-helpers@^6.24.1:
   version "6.24.1"
@@ -2556,69 +2592,75 @@ babel-plugin-external-helpers@^6.22.0:
     babel-runtime "^6.22.0"
 
 babel-plugin-minify-builtins@^0.4.0-alpha.caaefb4c:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-builtins/-/babel-plugin-minify-builtins-0.4.2.tgz#8d61f79d2ea815177f0eddba366d1a66b9e97b00"
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-builtins/-/babel-plugin-minify-builtins-0.4.3.tgz#9ea3d59f4ac4a7bb958d712d29556a1f86f7f81e"
   dependencies:
-    babel-helper-evaluate-path "^0.4.2"
+    babel-helper-evaluate-path "^0.4.3"
 
 babel-plugin-minify-constant-folding@^0.4.0-alpha.caaefb4c:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-constant-folding/-/babel-plugin-minify-constant-folding-0.4.2.tgz#8a4826669310ad559623e310bb050a5f1149cfc5"
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-constant-folding/-/babel-plugin-minify-constant-folding-0.4.3.tgz#300f9de8dda0844a176b193653960e24ad33e191"
   dependencies:
-    babel-helper-evaluate-path "^0.4.2"
+    babel-helper-evaluate-path "^0.4.3"
 
 babel-plugin-minify-dead-code-elimination@^0.4.0-alpha.caaefb4c:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-dead-code-elimination/-/babel-plugin-minify-dead-code-elimination-0.4.2.tgz#b9cfa0efba1ef2d02dff4b4da1a8f7a40006c9c3"
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-dead-code-elimination/-/babel-plugin-minify-dead-code-elimination-0.4.3.tgz#73628265864f9008d0027506f58abeb3c1d02d98"
   dependencies:
-    babel-helper-evaluate-path "^0.4.2"
-    babel-helper-mark-eval-scopes "^0.4.2"
-    babel-helper-remove-or-void "^0.4.2"
+    babel-helper-evaluate-path "^0.4.3"
+    babel-helper-mark-eval-scopes "^0.4.3"
+    babel-helper-remove-or-void "^0.4.3"
     lodash.some "^4.6.0"
 
 babel-plugin-minify-flip-comparisons@^0.4.0-alpha.caaefb4c:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-flip-comparisons/-/babel-plugin-minify-flip-comparisons-0.4.2.tgz#f754a8aa88b7a1b00fb86d7cf468358513a217ad"
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-flip-comparisons/-/babel-plugin-minify-flip-comparisons-0.4.3.tgz#00ca870cb8f13b45c038b3c1ebc0f227293c965a"
   dependencies:
-    babel-helper-is-void-0 "^0.4.2"
+    babel-helper-is-void-0 "^0.4.3"
+
+babel-plugin-minify-guarded-expressions@=0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-guarded-expressions/-/babel-plugin-minify-guarded-expressions-0.4.1.tgz#ca5a59a06bc1c22dd5cfd996a675163a6f619b7d"
+  dependencies:
+    babel-helper-flip-expressions "^0.4.1"
 
 babel-plugin-minify-guarded-expressions@^0.4.0-alpha.caaefb4c:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-guarded-expressions/-/babel-plugin-minify-guarded-expressions-0.4.2.tgz#b47ca0bf89eabbd710531d4c43fa03f2705f1add"
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-guarded-expressions/-/babel-plugin-minify-guarded-expressions-0.4.3.tgz#cc709b4453fd21b1f302877444c89f88427ce397"
   dependencies:
-    babel-helper-flip-expressions "^0.4.2"
+    babel-helper-flip-expressions "^0.4.3"
 
 babel-plugin-minify-infinity@^0.4.0-alpha.caaefb4c:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-infinity/-/babel-plugin-minify-infinity-0.4.2.tgz#fcb5d55fb1d2d51f324ba410801235257a63417f"
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-infinity/-/babel-plugin-minify-infinity-0.4.3.tgz#dfb876a1b08a06576384ef3f92e653ba607b39ca"
 
 babel-plugin-minify-mangle-names@^0.4.0-alpha.caaefb4c:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-mangle-names/-/babel-plugin-minify-mangle-names-0.4.2.tgz#50f44a141be07152945c2164c7d59cbcf34b497b"
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-mangle-names/-/babel-plugin-minify-mangle-names-0.4.3.tgz#16f1bff74b7a7c93dfc241e7831dd5fb4b023ef7"
   dependencies:
-    babel-helper-mark-eval-scopes "^0.4.2"
+    babel-helper-mark-eval-scopes "^0.4.3"
 
 babel-plugin-minify-numeric-literals@^0.4.0-alpha.caaefb4c:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-numeric-literals/-/babel-plugin-minify-numeric-literals-0.4.2.tgz#4a0101957110bd63a304cd86ce8d9205592726c1"
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-numeric-literals/-/babel-plugin-minify-numeric-literals-0.4.3.tgz#8e4fd561c79f7801286ff60e8c5fd9deee93c0bc"
 
 babel-plugin-minify-replace@^0.4.0-alpha.caaefb4c:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-replace/-/babel-plugin-minify-replace-0.4.2.tgz#0e42dedd46b8b2dfda6d825a034f3956c847f998"
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-replace/-/babel-plugin-minify-replace-0.4.3.tgz#9d289f4ba15d4e6011e8799fa5f1ba77ec81219d"
 
 babel-plugin-minify-simplify@^0.4.0-alpha.caaefb4c:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-simplify/-/babel-plugin-minify-simplify-0.4.2.tgz#1bc4f1cc0784295427dff0e2f3b9103ce79229ce"
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-simplify/-/babel-plugin-minify-simplify-0.4.3.tgz#37756d85c614464b4b0927f2b4e417191d55738a"
   dependencies:
-    babel-helper-flip-expressions "^0.4.2"
+    babel-helper-flip-expressions "^0.4.3"
     babel-helper-is-nodes-equiv "^0.0.1"
-    babel-helper-to-multiple-sequence-expressions "^0.4.2"
+    babel-helper-to-multiple-sequence-expressions "^0.4.3"
 
 babel-plugin-minify-type-constructors@^0.4.0-alpha.caaefb4c:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-type-constructors/-/babel-plugin-minify-type-constructors-0.4.2.tgz#0a2fb314df7d54a9b8f8a2041272ba9c3f7bd73a"
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-type-constructors/-/babel-plugin-minify-type-constructors-0.4.3.tgz#1bc6f15b87f7ab1085d42b330b717657a2156500"
   dependencies:
-    babel-helper-is-void-0 "^0.4.2"
+    babel-helper-is-void-0 "^0.4.3"
 
 babel-plugin-syntax-async-functions@^6.8.0:
   version "6.13.0"
@@ -2902,8 +2944,8 @@ babel-plugin-transform-flow-strip-types@^6.8.0:
     babel-runtime "^6.22.0"
 
 babel-plugin-transform-inline-consecutive-adds@^0.4.0-alpha.caaefb4c:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-inline-consecutive-adds/-/babel-plugin-transform-inline-consecutive-adds-0.4.2.tgz#98dba9acc3b73b1c59214ba69a3200c41870c3e9"
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-inline-consecutive-adds/-/babel-plugin-transform-inline-consecutive-adds-0.4.3.tgz#323d47a3ea63a83a7ac3c811ae8e6941faf2b0d1"
 
 babel-plugin-transform-member-expression-literals@^6.10.0-alpha.caaefb4c:
   version "6.10.0-alpha.f95869d4"
@@ -2945,8 +2987,8 @@ babel-plugin-transform-regenerator@^6.22.0, babel-plugin-transform-regenerator@^
     regenerator-transform "^0.10.0"
 
 babel-plugin-transform-regexp-constructors@^0.4.0-alpha.caaefb4c:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-regexp-constructors/-/babel-plugin-transform-regexp-constructors-0.4.2.tgz#455ee632ff70d0deecf34a1758cb74d3fb8b47f4"
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-regexp-constructors/-/babel-plugin-transform-regexp-constructors-0.4.3.tgz#58b7775b63afcf33328fae9a5f88fbd4fb0b4965"
 
 babel-plugin-transform-remove-console@^6.10.0-alpha.caaefb4c:
   version "6.10.0-alpha.f95869d4"
@@ -2957,10 +2999,10 @@ babel-plugin-transform-remove-debugger@^6.10.0-alpha.caaefb4c:
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-remove-debugger/-/babel-plugin-transform-remove-debugger-6.10.0-alpha.f95869d4.tgz#1fc35c29c7c0878cf30e558a733651906e888e44"
 
 babel-plugin-transform-remove-undefined@^0.4.0-alpha.caaefb4c:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-remove-undefined/-/babel-plugin-transform-remove-undefined-0.4.2.tgz#d7e038a08d60222773ca4e33c007946e3b06e865"
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-remove-undefined/-/babel-plugin-transform-remove-undefined-0.4.3.tgz#d40b0da7f91c08c06cc72b767474c01c4894de02"
   dependencies:
-    babel-helper-evaluate-path "^0.4.2"
+    babel-helper-evaluate-path "^0.4.3"
 
 babel-plugin-transform-simplify-comparison-operators@^6.10.0-alpha.caaefb4c:
   version "6.10.0-alpha.f95869d4"
@@ -3156,14 +3198,18 @@ babylon@7.0.0-beta.44:
   version "7.0.0-beta.44"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.44.tgz#89159e15e6e30c5096e22d738d8c0af8a0e8ca1d"
 
-babylon@7.0.0-beta.46, babylon@^7.0.0-beta.30, babylon@^7.0.0-beta.42:
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.46.tgz#b6ddaba81bbb130313932757ff9c195d527088b6"
+babylon@7.0.0-beta.47, babylon@^7.0.0-beta.42:
+  version "7.0.0-beta.47"
+  resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.47.tgz#6d1fa44f0abec41ab7c780481e62fd9aafbdea80"
 
 babylon@^6.17.3, babylon@^6.18.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
 
+babylon@^7.0.0-beta.30:
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.46.tgz#b6ddaba81bbb130313932757ff9c195d527088b6"
+
 backo2@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
@@ -3221,22 +3267,19 @@ big.js@^3.1.3:
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
 
 binary-extensions@^1.0.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.10.0.tgz#9aeb9a6c5e88638aad171e167f5900abe24835d0"
-
-"binaryextensions@1 || 2":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/binaryextensions/-/binaryextensions-2.0.0.tgz#e597d1a7a6a3558a2d1c7241a16c99965e6aa40f"
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205"
 
 binaryextensions@2:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/binaryextensions/-/binaryextensions-2.1.1.tgz#3209a51ca4a4ad541a3b8d3d6a6d5b83a2485935"
 
 bl@^1.0.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.1.tgz#cac328f7bee45730d404b692203fcb590e172d5e"
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.2.tgz#a160911717103c07410cef63ef51b397c025af9c"
   dependencies:
-    readable-stream "^2.0.5"
+    readable-stream "^2.3.5"
+    safe-buffer "^5.1.1"
 
 blob@0.0.4:
   version "0.0.4"
@@ -3469,10 +3512,25 @@ browserstack@^1.2.0:
   dependencies:
     https-proxy-agent "1.0.0"
 
+buffer-alloc-unsafe@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-0.1.1.tgz#ffe1f67551dd055737de253337bfe853dfab1a6a"
+
+buffer-alloc@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.1.0.tgz#05514d33bf1656d3540c684f65b1202e90eca303"
+  dependencies:
+    buffer-alloc-unsafe "^0.1.0"
+    buffer-fill "^0.1.0"
+
 buffer-crc32@^0.2.1, buffer-crc32@~0.2.3:
   version "0.2.13"
   resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
 
+buffer-fill@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-0.1.1.tgz#76d825c4d6e50e06b7a31eb520c04d08cc235071"
+
 buffer-from@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.0.0.tgz#4cb8832d23612589b0406e9e2956c17f06fdf531"
@@ -3681,7 +3739,7 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.0, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.2:
+chalk@^2.0.0, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.2, chalk@^2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
   dependencies:
@@ -3817,12 +3875,6 @@ circular-json@^0.3.1:
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz#815c99ea84f6809529d2f45791bdf82711352d66"
 
-class-extend@^0.1.0:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/class-extend/-/class-extend-0.1.2.tgz#8057a82b00f53f82a5d62c50ef8cffdec6fabc34"
-  dependencies:
-    object-assign "^2.0.0"
-
 class-utils@^0.3.5:
   version "0.3.6"
   resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
@@ -3840,8 +3892,8 @@ clean-css@3.4.x:
     source-map "0.4.x"
 
 clean-css@4.1.x:
-  version "4.1.7"
-  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.1.7.tgz#b9aea4f85679889cf3eae8b40349ec4ebdfdd032"
+  version "4.1.11"
+  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.1.11.tgz#2ecdf145aba38f54740f26cefd0ff3e03e125d6a"
   dependencies:
     source-map "0.5.x"
 
@@ -3925,8 +3977,8 @@ clone@^0.2.0:
   resolved "https://registry.yarnpkg.com/clone/-/clone-0.2.0.tgz#c6126a90ad4f72dbf5acdb243cc37724fe93fc1f"
 
 clone@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.3.tgz#298d7e2231660f40c003c2ed3140decf3f53085f"
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
 
 clone@^1.0.2:
   version "1.0.2"
@@ -3937,12 +3989,12 @@ clone@^2.0.0, clone@^2.1.0, clone@^2.1.1:
   resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.1.tgz#d217d1e961118e3ac9a4b8bba3285553bf647cdb"
 
 cloneable-readable@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.0.0.tgz#a6290d413f217a61232f95e458ff38418cfb0117"
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.1.2.tgz#d591dee4a8f8bc15da43ce97dceeba13d43e2a65"
   dependencies:
     inherits "^2.0.1"
-    process-nextick-args "^1.0.6"
-    through2 "^2.0.1"
+    process-nextick-args "^2.0.0"
+    readable-stream "^2.3.5"
 
 co@^4.6.0:
   version "4.6.0"
@@ -3985,9 +4037,9 @@ colors@^1.1.2:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.2.4.tgz#e0cb41d3e4b20806b3bfc27f4559f01b94bc2f7c"
 
-combined-stream@^1.0.5, combined-stream@~1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009"
+combined-stream@1.0.6, combined-stream@^1.0.5, combined-stream@~1.0.5:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
   dependencies:
     delayed-stream "~1.0.0"
 
@@ -4000,6 +4052,16 @@ command-line-args@^3.0.0, command-line-args@^3.0.1:
     find-replace "^1.0.2"
     typical "^2.6.0"
 
+command-line-args@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/command-line-args/-/command-line-args-5.0.2.tgz#c4e56b016636af1323cf485aa25c3cb203dfbbe4"
+  dependencies:
+    argv-tools "^0.1.1"
+    array-back "^2.0.0"
+    find-replace "^2.0.1"
+    lodash.camelcase "^4.3.0"
+    typical "^2.6.1"
+
 command-line-commands@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/command-line-commands/-/command-line-commands-1.0.4.tgz#034f9b167b5188afbdcf6b2efbb150fc8442c32b"
@@ -4017,6 +4079,15 @@ command-line-usage@^3.0.1, command-line-usage@^3.0.3, command-line-usage@^3.0.5:
     table-layout "^0.3.0"
     typical "^2.6.0"
 
+command-line-usage@^5.0.5:
+  version "5.0.5"
+  resolved "https://registry.yarnpkg.com/command-line-usage/-/command-line-usage-5.0.5.tgz#5f25933ffe6dedd983c635d38a21d7e623fda357"
+  dependencies:
+    array-back "^2.0.0"
+    chalk "^2.4.1"
+    table-layout "^0.4.3"
+    typical "^2.6.1"
+
 commander@2.11.0, commander@2.11.x, commander@^2.9.0, commander@~2.11.0:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
@@ -4070,19 +4141,19 @@ compress-commons@^1.2.0:
     normalize-path "^2.0.0"
     readable-stream "^2.0.0"
 
-compressible@~2.0.11:
-  version "2.0.11"
-  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.11.tgz#16718a75de283ed8e604041625a2064586797d8a"
+compressible@~2.0.13:
+  version "2.0.13"
+  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.13.tgz#0d1020ab924b2fdb4d6279875c7d6daba6baa7a9"
   dependencies:
-    mime-db ">= 1.29.0 < 2"
+    mime-db ">= 1.33.0 < 2"
 
 compression@^1.6.2:
-  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.1.tgz#eff2603efc2e22cf86f35d2eb93589f9875373db"
+  version "1.7.2"
+  resolved "http://registry.npmjs.org/compression/-/compression-1.7.2.tgz#aaffbcd6aaf854b44ebb280353d5ad1651f59a69"
   dependencies:
     accepts "~1.3.4"
     bytes "3.0.0"
-    compressible "~2.0.11"
+    compressible "~2.0.13"
     debug "2.6.9"
     on-headers "~1.0.1"
     safe-buffer "5.1.1"
@@ -4100,15 +4171,7 @@ concat-stream@1.5.x:
     readable-stream "~2.0.0"
     typedarray "~0.0.5"
 
-concat-stream@^1.4.7, concat-stream@^1.5.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7"
-  dependencies:
-    inherits "^2.0.3"
-    readable-stream "^2.2.2"
-    typedarray "^0.0.6"
-
-concat-stream@^1.6.0:
+concat-stream@^1.4.7, concat-stream@^1.6.0:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
   dependencies:
@@ -4117,6 +4180,14 @@ concat-stream@^1.6.0:
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
 
+concat-stream@^1.5.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7"
+  dependencies:
+    inherits "^2.0.3"
+    readable-stream "^2.2.2"
+    typedarray "^0.0.6"
+
 configstore@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/configstore/-/configstore-2.1.0.tgz#737a3a7036e9886102aa6099e47bb33ab1aba1a1"
@@ -4175,11 +4246,11 @@ content-type@^1.0.2, content-type@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
 
-convert-source-map@^1.1.0:
+convert-source-map@^1.1.0, convert-source-map@^1.1.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5"
 
-convert-source-map@^1.1.1, convert-source-map@^1.5.0:
+convert-source-map@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.0.tgz#9acd70851c6d5dfdd93d9282e5edf94a03ff46b5"
 
@@ -4223,7 +4294,11 @@ core-js@^1.0.0:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
 
-core-js@^2.4.0, core-js@^2.4.1, core-js@^2.5.0:
+core-js@^2.4.0, core-js@^2.4.1:
+  version "2.5.6"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.6.tgz#0fe6d45bf3cac3ac364a9d72de7576f4eb221b9d"
+
+core-js@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.0.tgz#569c050918be6486b3837552028ae0466b717086"
 
@@ -4345,11 +4420,11 @@ css-slam@^2.0.2:
     shady-css-parser "^0.1.0"
 
 css-slam@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/css-slam/-/css-slam-2.1.1.tgz#455da20958caddbe35a9fc2999f5aab4a4681dfe"
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/css-slam/-/css-slam-2.1.2.tgz#3d35b1922cb3e0002a45c89ab189492508c493e5"
   dependencies:
-    command-line-args "^3.0.1"
-    command-line-usage "^3.0.5"
+    command-line-args "^5.0.2"
+    command-line-usage "^5.0.5"
     dom5 "^3.0.0"
     parse5 "^4.0.0"
     shady-css-parser "^0.1.0"
@@ -4413,13 +4488,13 @@ dateformat@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
 
-debug@2, debug@2.6.9, debug@^2.0.0, debug@^2.1.0, debug@^2.1.2, debug@^2.3.3, debug@~2.6.4, debug@~2.6.6, debug@~2.6.9:
+debug@2, debug@2.6.9, debug@^2.0.0, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@~2.6.4, debug@~2.6.6, debug@~2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   dependencies:
     ms "2.0.0"
 
-debug@2.6.8, debug@^2.2.0, debug@^2.6.8:
+debug@2.6.8:
   version "2.6.8"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
   dependencies:
@@ -4469,11 +4544,11 @@ deep-eql@^3.0.0:
   dependencies:
     type-detect "^4.0.0"
 
-deep-extend@^0.4.0, deep-extend@~0.4.0, deep-extend@~0.4.1:
+deep-extend@^0.4.0, deep-extend@~0.4.1:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f"
 
-deep-extend@^0.5.1:
+deep-extend@^0.5.1, deep-extend@~0.5.0:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.5.1.tgz#b894a9dd90d3023fbf1c55a394fb858eb2066f1f"
 
@@ -4544,7 +4619,7 @@ delegates@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
 
-depd@1.1.1, depd@~1.1.0, depd@~1.1.1:
+depd@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.1.tgz#5783b4e1c459f06fa5ca27f991f3d06e7a310359"
 
@@ -4552,6 +4627,10 @@ depd@~1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.0.1.tgz#80aec64c9d6d97e65cc2a9caa93c0aa6abf73aaa"
 
+depd@~1.1.0, depd@~1.1.1, depd@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
+
 deprecate@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/deprecate/-/deprecate-1.0.0.tgz#661490ed2428916a6c8883d8834e5646f4e4a4a8"
@@ -4752,16 +4831,7 @@ duplexer@~0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
 
-duplexify@^3.1.2, duplexify@^3.2.0, duplexify@^3.5.0:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.5.1.tgz#4e1516be68838bc90a49994f0b39a6e5960befcd"
-  dependencies:
-    end-of-stream "^1.0.0"
-    inherits "^2.0.1"
-    readable-stream "^2.0.0"
-    stream-shift "^1.0.0"
-
-duplexify@^3.4.2:
+duplexify@^3.2.0, duplexify@^3.4.2, duplexify@^3.5.0, duplexify@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.6.0.tgz#592903f5d80b38d037220541264d69a198fb3410"
   dependencies:
@@ -4776,10 +4846,6 @@ ecc-jsbn@~0.1.1:
   dependencies:
     jsbn "~0.1.0"
 
-editions@^1.1.1:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/editions/-/editions-1.3.3.tgz#0907101bdda20fac3cbe334c27cbd0688dc99a5b"
-
 editions@^1.3.3:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/editions/-/editions-1.3.4.tgz#3662cb592347c3168eb8e498a0ff73271d67f50b"
@@ -4792,10 +4858,6 @@ ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
 
-ejs@^2.3.1:
-  version "2.5.7"
-  resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.7.tgz#cc872c168880ae3c7189762fd5ffc00896c9518a"
-
 ejs@^2.5.9:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.1.tgz#498ec0d495655abc6f23cd61868d926464071aa0"
@@ -4828,9 +4890,9 @@ emojis-list@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
 
-encodeurl@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.1.tgz#79e3d58655346909fe6f0f45a5de68103b294d20"
+encodeurl@~1.0.1, encodeurl@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
 
 encoding@^0.1.11:
   version "0.1.12"
@@ -4839,8 +4901,8 @@ encoding@^0.1.11:
     iconv-lite "~0.4.13"
 
 end-of-stream@^1.0.0, end-of-stream@^1.1.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.0.tgz#7a90d833efda6cfa6eac0f4949dbb0fad3a63206"
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
   dependencies:
     once "^1.4.0"
 
@@ -5167,9 +5229,9 @@ event-stream@^3.0.20, event-stream@latest:
     stream-combiner "~0.0.4"
     through "~2.3.1"
 
-eventemitter3@1.x.x:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-1.2.0.tgz#1c86991d816ad1e504750e73874224ecf3bec508"
+eventemitter3@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.0.tgz#090b4d6cdbd645ed10bf750d4b5407942d7ba163"
 
 events@^1.0.0:
   version "1.1.1"
@@ -5234,7 +5296,7 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2:
   dependencies:
     homedir-polyfill "^1.0.1"
 
-express@^4.15.3, express@^4.8.5:
+express@^4.15.3:
   version "4.16.1"
   resolved "https://registry.yarnpkg.com/express/-/express-4.16.1.tgz#6b33b560183c9b253b7b62144df33a4654ac9ed0"
   dependencies:
@@ -5269,6 +5331,41 @@ express@^4.15.3, express@^4.8.5:
     utils-merge "1.0.1"
     vary "~1.1.2"
 
+express@^4.8.5:
+  version "4.16.3"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.16.3.tgz#6af8a502350db3246ecc4becf6b5a34d22f7ed53"
+  dependencies:
+    accepts "~1.3.5"
+    array-flatten "1.1.1"
+    body-parser "1.18.2"
+    content-disposition "0.5.2"
+    content-type "~1.0.4"
+    cookie "0.3.1"
+    cookie-signature "1.0.6"
+    debug "2.6.9"
+    depd "~1.1.2"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    finalhandler "1.1.1"
+    fresh "0.5.2"
+    merge-descriptors "1.0.1"
+    methods "~1.1.2"
+    on-finished "~2.3.0"
+    parseurl "~1.3.2"
+    path-to-regexp "0.1.7"
+    proxy-addr "~2.0.3"
+    qs "6.5.1"
+    range-parser "~1.2.0"
+    safe-buffer "5.1.1"
+    send "0.16.2"
+    serve-static "1.13.2"
+    setprototypeof "1.1.0"
+    statuses "~1.4.0"
+    type-is "~1.6.16"
+    utils-merge "1.0.1"
+    vary "~1.1.2"
+
 ext-list@^2.0.0:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/ext-list/-/ext-list-2.2.2.tgz#0b98e64ed82f5acf0f2931babf69212ef52ddd37"
@@ -5342,10 +5439,14 @@ extglob@^2.0.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-extsprintf@1.3.0, extsprintf@^1.2.0:
+extsprintf@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
 
+extsprintf@^1.2.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
+
 eyes@0.1.x:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/eyes/-/eyes-0.1.8.tgz#62cf120234c683785d902348a800ef3e0cc20bc0"
@@ -5367,10 +5468,11 @@ fast-deep-equal@^2.0.1:
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
 
 fast-glob@^2.0.2:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.1.tgz#686c2345be88f3741e174add0be6f2e5b6078889"
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.2.tgz#71723338ac9b4e0e2fff1d6748a2a13d5ed352bf"
   dependencies:
     "@mrmlnc/readdir-enhanced" "^2.2.1"
+    "@nodelib/fs.stat" "^1.0.1"
     glob-parent "^3.1.0"
     is-glob "^4.0.0"
     merge2 "^1.2.1"
@@ -5403,10 +5505,10 @@ fd-slicer@~1.0.1:
     pend "~1.2.0"
 
 feature-detect-es6@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/feature-detect-es6/-/feature-detect-es6-1.3.1.tgz#f888736af9cb0c91f55663bfa4762eb96ee7047f"
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/feature-detect-es6/-/feature-detect-es6-1.4.1.tgz#1a37d8f1cade260e846462d41621eb3dbd3c4ef8"
   dependencies:
-    array-back "^1.0.3"
+    array-back "^1.0.4"
 
 fecha@^2.3.3, "fecha@https://github.com/balloob/fecha/archive/51d14fd0eb4781e2ecf265d1c3080706259133b5.tar.gz":
   version "2.3.3"
@@ -5437,12 +5539,12 @@ filename-regex@^2.0.0:
   resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
 
 fill-range@^2.1.0:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723"
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565"
   dependencies:
     is-number "^2.1.0"
     isobject "^2.0.0"
-    randomatic "^1.1.3"
+    randomatic "^3.0.0"
     repeat-element "^1.1.2"
     repeat-string "^1.5.2"
 
@@ -5471,6 +5573,18 @@ finalhandler@1.1.0:
     statuses "~1.3.1"
     unpipe "~1.0.0"
 
+finalhandler@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.1.tgz#eebf4ed840079c83f4249038c9d703008301b105"
+  dependencies:
+    debug "2.6.9"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    on-finished "~2.3.0"
+    parseurl "~1.3.2"
+    statuses "~1.4.0"
+    unpipe "~1.0.0"
+
 find-cache-dir@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f"
@@ -5496,6 +5610,13 @@ find-replace@^1.0.2:
     array-back "^1.0.4"
     test-value "^2.1.0"
 
+find-replace@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/find-replace/-/find-replace-2.0.1.tgz#6d9683a7ca20f8f9aabeabad07e4e2580f528550"
+  dependencies:
+    array-back "^2.0.0"
+    test-value "^3.0.0"
+
 find-up@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
@@ -5578,6 +5699,12 @@ follow-redirects@0.0.7:
     debug "^2.2.0"
     stream-consume "^0.1.0"
 
+follow-redirects@^1.0.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.4.1.tgz#d8120f4518190f55aac65bb6fc7b85fcd666d6aa"
+  dependencies:
+    debug "^3.1.0"
+
 for-in@^1.0.1, for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
@@ -5615,11 +5742,11 @@ form-data@~2.1.1:
     mime-types "^2.1.12"
 
 form-data@~2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.1.tgz#6fb94fbd71885306d73d15cc497fe4cc4ecd44bf"
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
   dependencies:
     asynckit "^0.4.0"
-    combined-stream "^1.0.5"
+    combined-stream "1.0.6"
     mime-types "^2.1.12"
 
 formatio@1.1.1:
@@ -5671,6 +5798,10 @@ from@~0:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe"
 
+fs-constants@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
+
 fs-exists-sync@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add"
@@ -5695,11 +5826,11 @@ fs.realpath@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
 
 fsevents@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.2.tgz#3282b713fb3ad80ede0e9fcf4611b5aa6fc033f4"
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.4.tgz#f41dcb1af2582af3692da36fc55cbd8e1041c426"
   dependencies:
-    nan "^2.3.0"
-    node-pre-gyp "^0.6.36"
+    nan "^2.9.2"
+    node-pre-gyp "^0.10.0"
 
 fsevents@^1.1.2:
   version "1.2.3"
@@ -5788,13 +5919,6 @@ getpass@^0.1.1:
   dependencies:
     assert-plus "^1.0.0"
 
-gh-got@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/gh-got/-/gh-got-5.0.0.tgz#ee95be37106fd8748a96f8d1db4baea89e1bfa8a"
-  dependencies:
-    got "^6.2.0"
-    is-plain-obj "^1.1.0"
-
 gh-got@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/gh-got/-/gh-got-6.0.0.tgz#d74353004c6ec466647520a10bd46f7299d268d0"
@@ -5802,12 +5926,6 @@ gh-got@^6.0.0:
     got "^7.0.0"
     is-plain-obj "^1.1.0"
 
-github-username@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/github-username/-/github-username-3.0.0.tgz#0a772219b3130743429f2456d0bdd3db55dce7b1"
-  dependencies:
-    gh-got "^5.0.0"
-
 github-username@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/github-username/-/github-username-4.1.0.tgz#cbe280041883206da4212ae9e4b5f169c30bf417"
@@ -6097,7 +6215,7 @@ got@^5.0.0:
     unzip-response "^1.0.2"
     url-parse-lax "^1.0.0"
 
-got@^6.2.0, got@^6.7.1:
+got@^6.7.1:
   version "6.7.1"
   resolved "https://registry.yarnpkg.com/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0"
   dependencies:
@@ -6588,8 +6706,8 @@ hoek@2.x.x:
   resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
 
 hoek@4.x.x:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.0.tgz#72d9d0754f7fe25ca2d01ad8f8f9a9449a89526d"
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.1.tgz#9634502aa12c445dd5a7c5734b572bb8738aacbb"
 
 home-assistant-js-websocket@^1.2.1:
   version "1.2.1"
@@ -6609,8 +6727,8 @@ homedir-polyfill@^1.0.0, homedir-polyfill@^1.0.1:
     parse-passwd "^1.0.0"
 
 hosted-git-info@^2.1.4:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.5.0.tgz#6d60e34b3abbc8313062c3b798ef8d901a07af3c"
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.6.0.tgz#23235b29ab230c576aab0d4f13fc046b0b038222"
 
 hpack.js@^2.1.6:
   version "2.1.6"
@@ -6687,7 +6805,7 @@ http-deceiver@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
 
-http-errors@1.6.2, http-errors@~1.6.2:
+http-errors@1.6.2:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.2.tgz#0a002cc85707192a7e7946ceedc11155f60ec736"
   dependencies:
@@ -6704,6 +6822,15 @@ http-errors@~1.5.1:
     setprototypeof "1.0.2"
     statuses ">= 1.3.1 < 2"
 
+http-errors@~1.6.2:
+  version "1.6.3"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.3"
+    setprototypeof "1.1.0"
+    statuses ">= 1.4.0 < 2"
+
 http-proxy-middleware@^0.17.2:
   version "0.17.4"
   resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.17.4.tgz#642e8848851d66f09d4f124912846dbaeb41b833"
@@ -6714,11 +6841,12 @@ http-proxy-middleware@^0.17.2:
     micromatch "^2.3.11"
 
 http-proxy@^1.16.2:
-  version "1.16.2"
-  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.16.2.tgz#06dff292952bf64dbe8471fa9df73066d4f37742"
+  version "1.17.0"
+  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.17.0.tgz#7ad38494658f84605e2f6db4436df410f4e5be9a"
   dependencies:
-    eventemitter3 "1.x.x"
-    requires-port "1.x.x"
+    eventemitter3 "^3.0.0"
+    follow-redirects "^1.0.0"
+    requires-port "^1.0.0"
 
 http-signature@~1.1.0:
   version "1.1.1"
@@ -6820,11 +6948,7 @@ inherits@1, inherits@2, inherits@2.0.1, inherits@2.0.3, inherits@^2.0.1, inherit
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
 
-ini@^1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
-
-ini@~1.3.0:
+ini@^1.3.4, ini@~1.3.0:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
 
@@ -6884,11 +7008,7 @@ inquirer@^5.1.0:
     strip-ansi "^4.0.0"
     through "^2.3.6"
 
-interpret@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.3.tgz#cbc35c62eeee73f19ab7b10a801511401afc0f90"
-
-interpret@^1.0.4:
+interpret@^1.0.0, interpret@^1.0.4:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
 
@@ -6913,25 +7033,19 @@ into-stream@^3.1.0:
     from2 "^2.1.1"
     p-is-promise "^1.1.0"
 
-invariant@^2.2.0:
+invariant@^2.2.0, invariant@^2.2.2:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
   dependencies:
     loose-envify "^1.0.0"
 
-invariant@^2.2.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360"
-  dependencies:
-    loose-envify "^1.0.0"
-
 invert-kv@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
 
-ipaddr.js@1.5.2:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.5.2.tgz#d4b505bde9946987ccf0fc58d9010ff9607e3fa0"
+ipaddr.js@1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.6.0.tgz#e3fa357b773da619f26e95f049d055c72796f86b"
 
 is-absolute@^0.2.3:
   version "0.2.6"
@@ -6962,14 +7076,10 @@ is-binary-path@^1.0.0:
   dependencies:
     binary-extensions "^1.0.0"
 
-is-buffer@^1.1.5:
+is-buffer@^1.1.5, is-buffer@~1.1.1:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
 
-is-buffer@~1.1.1:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.5.tgz#1f3b26ef613b214b88cbca23cc6c01d87961eecc"
-
 is-builtin-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
@@ -7305,14 +7415,6 @@ isstream@0.1.x, isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
 
-istextorbinary@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/istextorbinary/-/istextorbinary-2.1.0.tgz#dbed2a6f51be2f7475b68f89465811141b758874"
-  dependencies:
-    binaryextensions "1 || 2"
-    editions "^1.1.1"
-    textextensions "1 || 2"
-
 istextorbinary@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/istextorbinary/-/istextorbinary-2.2.1.tgz#a5231a08ef6dd22b268d0895084cf8d58b5bec53"
@@ -7446,8 +7548,8 @@ jsonpointer@^4.0.0:
   resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
 
 jsonschema@^1.1.0, jsonschema@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/jsonschema/-/jsonschema-1.2.0.tgz#d6ebaf70798db7b3a20c544f6c9ef9319b077de2"
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/jsonschema/-/jsonschema-1.2.4.tgz#a46bac5d3506a254465bc548876e267c6d0d6464"
 
 jsprim@^1.2.2:
   version "1.4.1"
@@ -7821,6 +7923,10 @@ lodash.bind@~2.4.1:
     lodash._createwrapper "~2.4.1"
     lodash._slice "~2.4.1"
 
+lodash.camelcase@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
+
 lodash.cond@^4.3.0:
   version "4.5.2"
   resolved "https://registry.yarnpkg.com/lodash.cond/-/lodash.cond-4.5.2.tgz#f471a1da486be60f6ab955d17115523dd1d255d5"
@@ -7920,6 +8026,10 @@ lodash.noop@~2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/lodash.noop/-/lodash.noop-2.4.1.tgz#4fb54f816652e5ae10e8f72f717a388c7326538a"
 
+lodash.padend@^4.6.1:
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/lodash.padend/-/lodash.padend-4.6.1.tgz#53ccba047d06e158d311f45da625f4e49e6f166e"
+
 lodash.restparam@^3.0.0:
   version "3.6.1"
   resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
@@ -8009,14 +8119,14 @@ lodash@^3.0.0, lodash@^3.0.1, lodash@^3.10.1:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
 
-lodash@^4.11.1, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.16.6, lodash@^4.17.2, lodash@^4.8.0:
-  version "4.17.4"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
-
-lodash@^4.17.10, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.3.0:
+lodash@^4.11.1, lodash@^4.14.0, lodash@^4.17.10, lodash@^4.17.2, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.3.0:
   version "4.17.10"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
 
+lodash@^4.13.1, lodash@^4.16.6, lodash@^4.8.0:
+  version "4.17.4"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
+
 lodash@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-1.0.2.tgz#8f57560c83b59fc270bd3d561b690043430e2551"
@@ -8083,33 +8193,30 @@ lower-case@^1.1.0, lower-case@^1.1.1, lower-case@^1.1.2:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
 
-lowercase-keys@1.0.0, lowercase-keys@^1.0.0:
+lowercase-keys@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"
 
+lowercase-keys@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
+
 lru-cache@2:
   version "2.7.3"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952"
 
-lru-cache@^4.0.1, lru-cache@^4.1.1:
+lru-cache@^4.0.1, lru-cache@^4.0.2, lru-cache@^4.1.1:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c"
   dependencies:
     pseudomap "^1.0.2"
     yallist "^2.1.2"
 
-lru-cache@^4.0.2:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.1.tgz#622e32e82488b49279114a4f9ecf45e7cd6bba55"
-  dependencies:
-    pseudomap "^1.0.2"
-    yallist "^2.1.2"
-
 magic-string@^0.22.4:
-  version "0.22.4"
-  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.22.4.tgz#31039b4e40366395618c1d6cf8193c53917475ff"
+  version "0.22.5"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.22.5.tgz#8e9cf5afddf44385c1da5bc2a6a0dbd10b03657e"
   dependencies:
-    vlq "^0.2.1"
+    vlq "^0.2.2"
 
 make-dir@^1.0.0:
   version "1.1.0"
@@ -8161,6 +8268,10 @@ matcher@^1.1.0:
   dependencies:
     escape-string-regexp "^1.0.4"
 
+math-random@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.1.tgz#8b3aac588b8a66e4975e3cdea67f7bb329601fac"
+
 md5.js@^1.3.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.4.tgz#e9bdbde94a20a5ac18b04340fc5764d5b09d901d"
@@ -8184,21 +8295,6 @@ media-typer@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
 
-mem-fs-editor@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/mem-fs-editor/-/mem-fs-editor-3.0.2.tgz#dd0a6eaf2bb8a6b37740067aa549eb530105af9f"
-  dependencies:
-    commondir "^1.0.1"
-    deep-extend "^0.4.0"
-    ejs "^2.3.1"
-    glob "^7.0.3"
-    globby "^6.1.0"
-    mkdirp "^0.5.0"
-    multimatch "^2.0.0"
-    rimraf "^2.2.8"
-    through2 "^2.0.0"
-    vinyl "^2.0.1"
-
 mem-fs-editor@^4.0.0:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/mem-fs-editor/-/mem-fs-editor-4.0.2.tgz#55a79b1e824da631254c4c95ba6366602c77af90"
@@ -8312,21 +8408,21 @@ miller-rabin@^4.0.0:
     bn.js "^4.0.0"
     brorand "^1.0.1"
 
-"mime-db@>= 1.29.0 < 2", mime-db@^1.28.0, mime-db@~1.30.0:
+"mime-db@>= 1.33.0 < 2", mime-db@^1.28.0, mime-db@~1.33.0:
+  version "1.33.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db"
+
+mime-db@~1.30.0:
   version "1.30.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01"
 
-mime-db@~1.29.0:
-  version "1.29.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.29.0.tgz#48d26d235589651704ac5916ca06001914266878"
-
-mime-types@^2.1.12, mime-types@~2.1.7:
-  version "2.1.16"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.16.tgz#2b858a52e5ecd516db897ac2be87487830698e23"
+mime-types@^2.1.12, mime-types@~2.1.15, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.7:
+  version "2.1.18"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8"
   dependencies:
-    mime-db "~1.29.0"
+    mime-db "~1.33.0"
 
-mime-types@~2.1.11, mime-types@~2.1.15, mime-types@~2.1.16, mime-types@~2.1.17:
+mime-types@~2.1.11:
   version "2.1.17"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.17.tgz#09d7a393f03e995a79f8af857b70a9e0ab16557a"
   dependencies:
@@ -8340,10 +8436,14 @@ mime@1.3.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53"
 
-mime@1.4.1, mime@^1.2.11, mime@^1.3.4:
+mime@1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
 
+mime@^1.2.11, mime@^1.3.4:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
+
 mimic-fn@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
@@ -8353,8 +8453,8 @@ mimic-response@^1.0.0:
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.0.tgz#df3d3652a73fded6b9b0b24146e6fd052353458e"
 
 minimalistic-assert@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz#702be2dda6b37f4836bcb3f5db56641b64a1d3d3"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
 
 minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
@@ -8581,10 +8681,6 @@ nan@^2.0.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a"
 
-nan@^2.3.0:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.6.2.tgz#e4ff34e6c95fdfb5aecc08de6596f43605a7db45"
-
 nan@^2.9.2:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
@@ -8659,8 +8755,8 @@ nise@^1.2.0:
     text-encoding "^0.6.4"
 
 no-case@^2.2.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.1.tgz#7aeba1c73a52184265554b7dc03baf720df80081"
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac"
   dependencies:
     lower-case "^1.1.1"
 
@@ -8703,19 +8799,20 @@ node-libs-browser@^2.0.0:
     util "^0.10.3"
     vm-browserify "0.0.4"
 
-node-pre-gyp@^0.6.36:
-  version "0.6.36"
-  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz#db604112cb74e0d477554e9b505b17abddfab786"
+node-pre-gyp@^0.10.0:
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.0.tgz#6e4ef5bb5c5203c6552448828c852c40111aac46"
   dependencies:
+    detect-libc "^1.0.2"
     mkdirp "^0.5.1"
+    needle "^2.2.0"
     nopt "^4.0.1"
+    npm-packlist "^1.1.6"
     npmlog "^4.0.2"
     rc "^1.1.7"
-    request "^2.81.0"
     rimraf "^2.6.1"
     semver "^5.3.0"
-    tar "^2.2.1"
-    tar-pack "^3.4.0"
+    tar "^4"
 
 node-pre-gyp@^0.6.4:
   version "0.6.39"
@@ -8839,10 +8936,6 @@ oauth-sign@~0.8.1, oauth-sign@~0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
 
-object-assign@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-2.1.1.tgz#43c36e5d569ff8e4816c4efa8be02d26967c18aa"
-
 object-assign@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-3.0.0.tgz#9bedd5ca0897949bca47e7ff408062d549f587f2"
@@ -8900,8 +8993,8 @@ object.pick@^1.2.0, object.pick@^1.3.0:
     isobject "^3.0.1"
 
 obuf@^1.0.0, obuf@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.1.tgz#104124b6c602c6796881a042541d36db43a5264e"
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
 
 on-finished@^2.3.0, on-finished@~2.3.0:
   version "2.3.0"
@@ -8933,7 +9026,7 @@ once@~1.3.0:
 
 onetime@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
+  resolved "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
 
 onetime@^2.0.0:
   version "2.0.1"
@@ -9017,20 +9110,13 @@ os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
 
-osenv@^0.1.0, osenv@^0.1.3:
+osenv@^0.1.0, osenv@^0.1.3, osenv@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
   dependencies:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.0"
 
-osenv@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.4.tgz#42fe6d5953df06c8064be6f176c3d05aaaa34644"
-  dependencies:
-    os-homedir "^1.0.0"
-    os-tmpdir "^1.0.0"
-
 p-cancelable@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.3.0.tgz#b9e123800bcebb7ac13a479be195b507b98d30fa"
@@ -9057,16 +9143,12 @@ p-lazy@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-lazy/-/p-lazy-1.0.0.tgz#ec53c802f2ee3ac28f166cc82d0b2b02de27a835"
 
-p-limit@^1.0.0:
+p-limit@^1.0.0, p-limit@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.2.0.tgz#0e92b6bedcb59f022c13d0f1949dc82d15909f1c"
   dependencies:
     p-try "^1.0.0"
 
-p-limit@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.1.0.tgz#b07ff2d9a5d88bec806035895a2bab66a27988bc"
-
 p-locate@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
@@ -9329,15 +9411,16 @@ pbkdf2@^3.0.3:
     sha.js "^2.4.8"
 
 peek-stream@^1.1.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/peek-stream/-/peek-stream-1.1.2.tgz#97eb76365bcfd8c89e287f55c8b69d4c3e9bcc52"
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/peek-stream/-/peek-stream-1.1.3.tgz#3b35d84b7ccbbd262fff31dc10da56856ead6d67"
   dependencies:
+    buffer-from "^1.0.0"
     duplexify "^3.5.0"
     through2 "^2.0.3"
 
 pem@^1.8.3:
-  version "1.12.0"
-  resolved "https://registry.yarnpkg.com/pem/-/pem-1.12.0.tgz#603d8207b9b5f83225e37ffcc36268c3aa3fecf3"
+  version "1.12.5"
+  resolved "https://registry.yarnpkg.com/pem/-/pem-1.12.5.tgz#97bf2e459537c54e0ee5b0aa11b5ca18d6b5fef2"
   dependencies:
     md5 "^2.2.1"
     os-tmpdir "^1.0.1"
@@ -9452,9 +9535,9 @@ polymer-analyzer@^2.0.2, polymer-analyzer@^2.3.0:
     shady-css-parser "^0.1.0"
     strip-indent "^2.0.0"
 
-polymer-analyzer@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/polymer-analyzer/-/polymer-analyzer-3.0.0.tgz#4358b389f924ce9cd4a45a2edf589c2b6f0b6e5a"
+polymer-analyzer@^3.0.0, polymer-analyzer@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/polymer-analyzer/-/polymer-analyzer-3.0.1.tgz#61340ccf8422048c6f9f5607df8d4fdace08bba9"
   dependencies:
     "@babel/generator" "^7.0.0-beta.42"
     "@babel/traverse" "^7.0.0-beta.42"
@@ -9516,9 +9599,9 @@ polymer-build@^2.1.0:
     vinyl "^1.2.0"
     vinyl-fs "^2.4.4"
 
-polymer-build@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/polymer-build/-/polymer-build-3.0.0.tgz#d78872e0d28dea4532123bf8f7dc8f4429585913"
+polymer-build@^3.0.0, polymer-build@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/polymer-build/-/polymer-build-3.0.1.tgz#d0dca1ab397bcf70268edbe439f784df863639eb"
   dependencies:
     "@babel/core" "^7.0.0-beta.46"
     "@babel/plugin-external-helpers" "^7.0.0-beta.46"
@@ -9565,6 +9648,7 @@ polymer-build@^3.0.0:
     "@types/uuid" "^3.4.3"
     "@types/vinyl" "^2.0.0"
     "@types/vinyl-fs" "^2.4.8"
+    babel-plugin-minify-guarded-expressions "=0.4.1"
     babel-preset-minify "=0.4.0-alpha.caaefb4c"
     babylon "^7.0.0-beta.42"
     css-slam "^2.1.1"
@@ -9600,9 +9684,9 @@ polymer-bundler@^3.1.0:
     polymer-analyzer "^2.3.0"
     source-map "^0.5.6"
 
-polymer-bundler@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/polymer-bundler/-/polymer-bundler-4.0.0.tgz#a3dbd0652e2f7c8ecee96d6be36e5c70e1d248ff"
+polymer-bundler@^4.0.0, polymer-bundler@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/polymer-bundler/-/polymer-bundler-4.0.1.tgz#0edd161027c60619553bd205b12ec61611b67d84"
   dependencies:
     "@types/acorn" "^4.0.3"
     "@types/babel-generator" "^6.25.1"
@@ -9610,6 +9694,7 @@ polymer-bundler@^4.0.0:
     acorn-import-meta "^0.2.1"
     babel-generator "^6.26.1"
     babel-traverse "^6.26.0"
+    babel-types "^6.26.0"
     clone "^2.1.0"
     command-line-args "^3.0.1"
     command-line-usage "^3.0.3"
@@ -9618,14 +9703,14 @@ polymer-bundler@^4.0.0:
     magic-string "^0.22.4"
     mkdirp "^0.5.1"
     parse5 "^2.2.2"
-    polymer-analyzer "^3.0.0"
+    polymer-analyzer "^3.0.1"
     rollup "^0.58.2"
     source-map "^0.5.6"
     vscode-uri "^1.0.1"
 
 polymer-cli@^1.7.0:
-  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/polymer-cli/-/polymer-cli-1.7.1.tgz#d578bef0b492c0275514ac8a3a7dbafca3edd210"
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/polymer-cli/-/polymer-cli-1.7.2.tgz#fe81c30773a511cb1d385ebc866f6cfb3db8ab1a"
   dependencies:
     "@types/chalk" "^0.4.31"
     "@types/del" "^3.0.0"
@@ -9642,7 +9727,7 @@ polymer-cli@^1.7.0:
     "@types/update-notifier" "^1.0.0"
     "@types/vinyl" "^2.0.0"
     "@types/vinyl-fs" "0.0.28"
-    "@types/yeoman-generator" "^1.0.0"
+    "@types/yeoman-generator" "^2.0.3"
     bower "1.8.2"
     bower-json "^0.8.1"
     bower-logger "^0.2.2"
@@ -9660,11 +9745,11 @@ polymer-cli@^1.7.0:
     merge-stream "^1.0.1"
     mz "^2.6.0"
     plylog "^0.5.0"
-    polymer-analyzer "^3.0.0"
-    polymer-build "^3.0.0"
-    polymer-bundler "^4.0.0"
+    polymer-analyzer "^3.0.1"
+    polymer-build "^3.0.1"
+    polymer-bundler "^4.0.1"
     polymer-linter "^3.0.0"
-    polymer-project-config "^4.0.0"
+    polymer-project-config "^4.0.1"
     polyserve "^0.27.11"
     request "^2.72.0"
     rimraf "^2.6.1"
@@ -9677,7 +9762,7 @@ polymer-cli@^1.7.0:
     vinyl-fs "^2.4.3"
     web-component-tester "^6.6.0"
     yeoman-environment "^1.5.2"
-    yeoman-generator "^1.0.1"
+    yeoman-generator "^2.0.1"
 
 polymer-linter@^3.0.0:
   version "3.0.0"
@@ -9707,9 +9792,9 @@ polymer-project-config@^3.2.1:
     minimatch-all "^1.1.0"
     plylog "^0.5.0"
 
-polymer-project-config@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/polymer-project-config/-/polymer-project-config-4.0.0.tgz#a6d830123ed1ab0751c28ed4f68d26569846f818"
+polymer-project-config@^4.0.0, polymer-project-config@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/polymer-project-config/-/polymer-project-config-4.0.1.tgz#b703a3ebad73be328ca210dfcfe978d9f580e3cd"
   dependencies:
     "@types/node" "^9.6.4"
     browser-capabilities "^1.0.0"
@@ -9792,22 +9877,22 @@ pretty-hrtime@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1"
 
-private@^0.1.6, private@^0.1.7:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/private/-/private-0.1.7.tgz#68ce5e8a1ef0a23bb570cc28537b5332aba63ef1"
-
-private@~0.1.5:
+private@^0.1.6, private@~0.1.5:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
 
-process-nextick-args@^1.0.6, process-nextick-args@~1.0.6:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
+private@^0.1.7:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/private/-/private-0.1.7.tgz#68ce5e8a1ef0a23bb570cc28537b5332aba63ef1"
 
-process-nextick-args@~2.0.0:
+process-nextick-args@^2.0.0, process-nextick-args@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
 
+process-nextick-args@~1.0.6:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
+
 process@^0.11.10:
   version "0.11.10"
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
@@ -9853,12 +9938,12 @@ prop-types@^15.6.0:
     loose-envify "^1.3.1"
     object-assign "^4.1.1"
 
-proxy-addr@~2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.2.tgz#6571504f47bb988ec8180253f85dd7e14952bdec"
+proxy-addr@~2.0.2, proxy-addr@~2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.3.tgz#355f262505a621646b3130a728eb647e22055341"
   dependencies:
     forwarded "~0.1.2"
-    ipaddr.js "1.5.2"
+    ipaddr.js "1.6.0"
 
 prr@~1.0.1:
   version "1.0.1"
@@ -9879,13 +9964,13 @@ public-encrypt@^4.0.0:
     randombytes "^2.0.1"
 
 pump@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-1.0.2.tgz#3b3ee6512f94f0e575538c17995f9f16990a5d51"
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-1.0.3.tgz#5dfe8311c33bbf6fc18261f9f34702c47c08a954"
   dependencies:
     end-of-stream "^1.1.0"
     once "^1.3.1"
 
-pump@^2.0.1:
+pump@^2.0.0, pump@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
   dependencies:
@@ -9900,12 +9985,12 @@ pump@^3.0.0:
     once "^1.3.1"
 
 pumpify@^1.3.3:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.3.5.tgz#1b671c619940abcaeac0ad0e3a3c164be760993b"
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce"
   dependencies:
-    duplexify "^3.1.2"
-    inherits "^2.0.1"
-    pump "^1.0.0"
+    duplexify "^3.6.0"
+    inherits "^2.0.3"
+    pump "^2.0.0"
 
 punycode@1.3.2:
   version "1.3.2"
@@ -9927,7 +10012,7 @@ q@^1.4.1:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.0.tgz#dd01bac9d06d30e6f219aecb8253ee9ebdc308f1"
 
-qs@6.5.1, qs@~6.5.1:
+qs@6.5.1:
   version "6.5.1"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
 
@@ -9939,6 +10024,10 @@ qs@~6.4.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
 
+qs@~6.5.1:
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
+
 query-string@^5.0.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.1.1.tgz#a78c012b71c17e05f2e3fa2319dd330682efb3cb"
@@ -9955,12 +10044,13 @@ querystring@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
 
-randomatic@^1.1.3:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c"
+randomatic@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.0.0.tgz#d35490030eb4f7578de292ce6dfb04a91a128923"
   dependencies:
-    is-number "^3.0.0"
-    kind-of "^4.0.0"
+    is-number "^4.0.0"
+    kind-of "^6.0.0"
+    math-random "^1.0.1"
 
 randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
   version "2.0.6"
@@ -9992,20 +10082,11 @@ raw-body@2.3.2:
     iconv-lite "0.4.19"
     unpipe "1.0.0"
 
-rc@^1.0.1, rc@^1.1.6:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.5.tgz#275cd687f6e3b36cc756baa26dfee80a790301fd"
+rc@^1.0.1, rc@^1.1.6, rc@^1.1.7:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.7.tgz#8a10ca30d588d00464360372b890d06dacd02297"
   dependencies:
-    deep-extend "~0.4.0"
-    ini "~1.3.0"
-    minimist "^1.2.0"
-    strip-json-comments "~2.0.1"
-
-rc@^1.1.7:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.1.tgz#2e03e8e42ee450b8cb3dce65be1bf8974e1dfd95"
-  dependencies:
-    deep-extend "~0.4.0"
+    deep-extend "^0.5.1"
     ini "~1.3.0"
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
@@ -10017,7 +10098,7 @@ read-all-stream@^3.0.0:
     pinkie-promise "^2.0.0"
     readable-stream "^2.0.0"
 
-read-chunk@^2.0.0, read-chunk@^2.1.0:
+read-chunk@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/read-chunk/-/read-chunk-2.1.0.tgz#6a04c0928005ed9d42e1a6ac5600e19cbc7ff655"
   dependencies:
@@ -10069,7 +10150,7 @@ read-pkg@^3.0.0:
     normalize-package-data "^2.3.2"
     path-type "^3.0.0"
 
-"readable-stream@1 || 2", readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
   dependencies:
@@ -10099,30 +10180,6 @@ readable-stream@1.1.x, readable-stream@^1.0.26-2, readable-stream@^1.0.26-4, rea
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.1.5:
-  version "2.3.4"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.4.tgz#c946c3f47fa7d8eabc0b6150f4a12f69a4574071"
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~2.0.0"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.0.3"
-    util-deprecate "~1.0.1"
-
-readable-stream@^2.0.1, readable-stream@^2.0.4, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.2.9:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c"
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~1.0.6"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.0.3"
-    util-deprecate "~1.0.1"
-
 readable-stream@~2.0.0:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
@@ -10193,11 +10250,7 @@ regenerate@^1.3.3, regenerate@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
 
-regenerator-runtime@^0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz#7e54fe5b5ccd5d6624ea6255c3473be090b802e1"
-
-regenerator-runtime@^0.11.1:
+regenerator-runtime@^0.11.0, regenerator-runtime@^0.11.1:
   version "0.11.1"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
 
@@ -10241,8 +10294,8 @@ regexpu-core@^2.0.0:
     regjsparser "^0.1.4"
 
 regexpu-core@^4.1.3:
-  version "4.1.4"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.1.4.tgz#f6c847261ba4cf869a7874442f9d25251b713fc8"
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.1.5.tgz#57fdfe1148f8a7a069086228515130cf1820ddd0"
   dependencies:
     regenerate "^1.4.0"
     regenerate-unicode-properties "^6.0.0"
@@ -10347,7 +10400,7 @@ request@2.79.0:
     tunnel-agent "~0.4.1"
     uuid "^3.0.0"
 
-request@2.81.0, request@^2.81.0:
+request@2.81.0:
   version "2.81.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
   dependencies:
@@ -10375,8 +10428,8 @@ request@2.81.0, request@^2.81.0:
     uuid "^3.0.0"
 
 request@^2.72.0:
-  version "2.83.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356"
+  version "2.86.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.86.0.tgz#2b9497f449b0a32654c081a5cf426bbfb5bf5b69"
   dependencies:
     aws-sign2 "~0.7.0"
     aws4 "^1.6.0"
@@ -10396,7 +10449,6 @@ request@^2.72.0:
     performance-now "^2.1.0"
     qs "~6.5.1"
     safe-buffer "^5.1.1"
-    stringstream "~0.0.5"
     tough-cookie "~2.3.3"
     tunnel-agent "^0.6.0"
     uuid "^3.1.0"
@@ -10455,7 +10507,7 @@ requirejs@^2.3.4:
   version "2.3.5"
   resolved "https://registry.yarnpkg.com/requirejs/-/requirejs-2.3.5.tgz#617b9acbbcb336540ef4914d790323a8d4b861b0"
 
-requires-port@1.x.x:
+requires-port@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
 
@@ -10491,9 +10543,9 @@ resolve-url@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
 
-resolve@^1.1.6, resolve@^1.4.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.5.0.tgz#1f09acce796c9a762579f31b2c1cc4c3cddf9f36"
+resolve@^1.1.6, resolve@^1.3.2, resolve@^1.5.0:
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.7.1.tgz#aadd656374fd298aee895bc026b8297418677fd3"
   dependencies:
     path-parse "^1.0.5"
 
@@ -10503,9 +10555,9 @@ resolve@^1.1.7, resolve@^1.2.0:
   dependencies:
     path-parse "^1.0.5"
 
-resolve@^1.3.2, resolve@^1.5.0:
-  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.7.1.tgz#aadd656374fd298aee895bc026b8297418677fd3"
+resolve@^1.4.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.5.0.tgz#1f09acce796c9a762579f31b2c1cc4c3cddf9f36"
   dependencies:
     path-parse "^1.0.5"
 
@@ -10539,13 +10591,7 @@ right-align@^0.1.1:
   dependencies:
     align-text "^0.1.1"
 
-rimraf@2, rimraf@^2.5.1, rimraf@^2.6.1:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.1.tgz#c2338ec643df7a1b7fe5c54fa86f57428a55f33d"
-  dependencies:
-    glob "^7.0.5"
-
-rimraf@^2.2.0, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.2:
+rimraf@2, rimraf@^2.2.8, rimraf@^2.5.1, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
   dependencies:
@@ -10671,11 +10717,11 @@ rxjs@^5.4.2, rxjs@^5.5.2:
   dependencies:
     symbol-observable "1.0.1"
 
-safe-buffer@5.1.1, safe-buffer@^5.0.1, safe-buffer@^5.1.1:
+safe-buffer@5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
 
-safe-buffer@^5.1.0, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
 
@@ -10780,6 +10826,24 @@ send@0.16.1:
     range-parser "~1.2.0"
     statuses "~1.3.1"
 
+send@0.16.2:
+  version "0.16.2"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1"
+  dependencies:
+    debug "2.6.9"
+    depd "~1.1.2"
+    destroy "~1.0.4"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    fresh "0.5.2"
+    http-errors "~1.6.2"
+    mime "1.4.1"
+    ms "2.0.0"
+    on-finished "~2.3.0"
+    range-parser "~1.2.0"
+    statuses "~1.4.0"
+
 send@^0.11.1:
   version "0.11.1"
   resolved "https://registry.yarnpkg.com/send/-/send-0.11.1.tgz#1beabfd42f9e2709f99028af3078ac12b47092d5"
@@ -10836,6 +10900,15 @@ serve-static@1.13.1:
     parseurl "~1.3.2"
     send "0.16.1"
 
+serve-static@1.13.2:
+  version "1.13.2"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1"
+  dependencies:
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    parseurl "~1.3.2"
+    send "0.16.2"
+
 server-destroy@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/server-destroy/-/server-destroy-1.0.1.tgz#f13bf928e42b9c3e79383e61cc3998b5d14e6cdd"
@@ -10907,14 +10980,6 @@ shebang-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
 
-shelljs@^0.7.0:
-  version "0.7.8"
-  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.8.tgz#decbcf874b0d1e5fb72e14b164a9683048e9acb3"
-  dependencies:
-    glob "^7.0.0"
-    interpret "^1.0.0"
-    rechoir "^0.6.2"
-
 shelljs@^0.8.0:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.2.tgz#345b7df7763f4c2340d584abb532c5f752ca9e35"
@@ -11027,8 +11092,8 @@ sntp@1.x.x:
     hoek "2.x.x"
 
 sntp@2.x.x:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.0.2.tgz#5064110f0af85f7cfdb7d6b67a40028ce52b4b2b"
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.1.0.tgz#2c6cec14fedc2222739caf9b5c3d85d1cc5a2cc8"
   dependencies:
     hoek "4.x.x"
 
@@ -11146,23 +11211,31 @@ spawn-sync@^1.0.15:
     concat-stream "^1.4.7"
     os-shim "^0.1.2"
 
-spdx-correct@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40"
+spdx-correct@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.0.0.tgz#05a5b4d7153a195bc92c3c425b69f3b2a9524c82"
   dependencies:
-    spdx-license-ids "^1.0.2"
+    spdx-expression-parse "^3.0.0"
+    spdx-license-ids "^3.0.0"
 
-spdx-expression-parse@~1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz#9bdf2f20e1f40ed447fbe273266191fced51626c"
+spdx-exceptions@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz#2c7ae61056c714a5b9b9b2b2af7d311ef5c78fe9"
 
-spdx-license-ids@^1.0.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57"
+spdx-expression-parse@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0"
+  dependencies:
+    spdx-exceptions "^2.1.0"
+    spdx-license-ids "^3.0.0"
+
+spdx-license-ids@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz#7a7cd28470cc6d3a1cfe6d66886f6bc430d3ac87"
 
 spdy-transport@^2.0.18:
-  version "2.0.20"
-  resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-2.0.20.tgz#735e72054c486b2354fe89e702256004a39ace4d"
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-2.1.0.tgz#4bbb15aaffed0beefdd56ad61dbdc8ba3e2cb7a1"
   dependencies:
     debug "^2.6.8"
     detect-node "^2.0.3"
@@ -11204,8 +11277,8 @@ sprintf-js@~1.0.2:
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
 
 sshpk@^1.7.0:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.1.tgz#512df6da6287144316dc4c18fe1cf1d940739be3"
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.14.1.tgz#130f5975eddad963f1d56f92b9ac6c51fa9f83eb"
   dependencies:
     asn1 "~0.2.3"
     assert-plus "^1.0.0"
@@ -11245,10 +11318,18 @@ static-extend@^0.1.1:
     define-property "^0.2.5"
     object-copy "^0.1.0"
 
-"statuses@>= 1.3.1 < 2", statuses@~1.3.1:
+"statuses@>= 1.3.1 < 2", "statuses@>= 1.4.0 < 2":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
+
+statuses@~1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
 
+statuses@~1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
+
 stream-browserify@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
@@ -11262,7 +11343,11 @@ stream-combiner@~0.0.4:
   dependencies:
     duplexer "~0.1.1"
 
-stream-consume@^0.1.0, stream-consume@~0.1.0:
+stream-consume@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/stream-consume/-/stream-consume-0.1.1.tgz#d3bdb598c2bd0ae82b8cac7ac50b1107a7996c48"
+
+stream-consume@~0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/stream-consume/-/stream-consume-0.1.0.tgz#a41ead1a6d6081ceb79f65b061901b6d8f3d1d0f"
 
@@ -11354,12 +11439,6 @@ string_decoder@~0.10.x:
   version "0.10.31"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
 
-string_decoder@~1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab"
-  dependencies:
-    safe-buffer "~5.1.0"
-
 stringstream@~0.0.4, stringstream@~0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
@@ -11441,22 +11520,7 @@ supports-color@3.1.2, supports-color@4.4.0, supports-color@^0.2.0, supports-colo
   dependencies:
     has-flag "^1.0.0"
 
-sw-precache@^5.1.1:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/sw-precache/-/sw-precache-5.2.0.tgz#eb6225ce580ceaae148194578a0ad01ab7ea199c"
-  dependencies:
-    dom-urls "^1.1.0"
-    es6-promise "^4.0.5"
-    glob "^7.1.1"
-    lodash.defaults "^4.2.0"
-    lodash.template "^4.4.0"
-    meow "^3.7.0"
-    mkdirp "^0.5.1"
-    pretty-bytes "^4.0.2"
-    sw-toolbox "^3.4.0"
-    update-notifier "^1.0.3"
-
-sw-precache@^5.2.0:
+sw-precache@^5.1.1, sw-precache@^5.2.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/sw-precache/-/sw-precache-5.2.1.tgz#06134f319eec68f3b9583ce9a7036b1c119f7179"
   dependencies:
@@ -11504,6 +11568,16 @@ table-layout@^0.3.0:
     typical "^2.6.0"
     wordwrapjs "^2.0.0-0"
 
+table-layout@^0.4.3:
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/table-layout/-/table-layout-0.4.3.tgz#07509e1d72599f2c128a58ac67682ec4ba002af0"
+  dependencies:
+    array-back "^2.0.0"
+    deep-extend "~0.5.0"
+    lodash.padend "^4.6.1"
+    typical "^2.6.1"
+    wordwrapjs "^3.0.0"
+
 table@4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/table/-/table-4.0.2.tgz#a33447375391e766ad34d3486e6e2aedc84d2e36"
@@ -11520,8 +11594,8 @@ tapable@^1.0.0:
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.0.0.tgz#cbb639d9002eed9c6b5975eb20598d7936f1f9f2"
 
 tar-fs@^1.12.0:
-  version "1.16.0"
-  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-1.16.0.tgz#e877a25acbcc51d8c790da1c57c9cf439817b896"
+  version "1.16.2"
+  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-1.16.2.tgz#17e5239747e399f7e77344f5f53365f04af53577"
   dependencies:
     chownr "^1.0.1"
     mkdirp "^0.5.1"
@@ -11529,8 +11603,8 @@ tar-fs@^1.12.0:
     tar-stream "^1.1.2"
 
 tar-pack@^3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.0.tgz#23be2d7f671a8339376cbdb0b8fe3fdebf317984"
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.1.tgz#e1dbc03a9b9d3ba07e896ad027317eb679a10a1f"
   dependencies:
     debug "^2.2.0"
     fstream "^1.0.10"
@@ -11550,7 +11624,19 @@ tar-stream@1.5.2:
     readable-stream "^2.0.0"
     xtend "^4.0.0"
 
-tar-stream@^1.1.2, tar-stream@^1.5.0:
+tar-stream@^1.1.2:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.1.tgz#f84ef1696269d6223ca48f6e1eeede3f7e81f395"
+  dependencies:
+    bl "^1.0.0"
+    buffer-alloc "^1.1.0"
+    end-of-stream "^1.0.0"
+    fs-constants "^1.0.0"
+    readable-stream "^2.3.0"
+    to-buffer "^1.1.0"
+    xtend "^4.0.0"
+
+tar-stream@^1.5.0:
   version "1.5.4"
   resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.5.4.tgz#36549cf04ed1aee9b2a30c0143252238daf94016"
   dependencies:
@@ -11608,6 +11694,13 @@ test-value@^2.1.0:
     array-back "^1.0.3"
     typical "^2.6.0"
 
+test-value@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/test-value/-/test-value-3.0.0.tgz#9168c062fab11a86b8d444dd968bb4b73851ce92"
+  dependencies:
+    array-back "^2.0.0"
+    typical "^2.6.1"
+
 text-encoding@0.6.4, text-encoding@^0.6.4:
   version "0.6.4"
   resolved "https://registry.yarnpkg.com/text-encoding/-/text-encoding-0.6.4.tgz#e399a982257a276dae428bb92845cb71bdc26d19"
@@ -11616,10 +11709,6 @@ text-table@^0.2.0, text-table@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
 
-"textextensions@1 || 2":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/textextensions/-/textextensions-2.1.0.tgz#1be0dc2a0dc244d44be8a09af6a85afb93c4dbc3"
-
 textextensions@2:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/textextensions/-/textextensions-2.2.0.tgz#38ac676151285b658654581987a0ce1a4490d286"
@@ -11732,6 +11821,10 @@ to-arraybuffer@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
 
+to-buffer@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.1.1.tgz#493bd48f62d7c43fcded313a03dcadb2e1213a80"
+
 to-fast-properties@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
@@ -11762,15 +11855,9 @@ to-regex@^3.0.1, to-regex@^3.0.2:
     regex-not "^1.0.2"
     safe-regex "^1.1.0"
 
-tough-cookie@~2.3.0:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.2.tgz#f081f76e4c85720e6c37a5faced737150d84072a"
-  dependencies:
-    punycode "^1.4.1"
-
-tough-cookie@~2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.3.tgz#0b618a5565b6dea90bf3425d04d55edc475a7561"
+tough-cookie@~2.3.0, tough-cookie@~2.3.3:
+  version "2.3.4"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
   dependencies:
     punycode "^1.4.1"
 
@@ -11816,18 +11903,25 @@ type-detect@0.1.1, type-detect@1.0.0, type-detect@^1.0.0, type-detect@^4.0.0, ty
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-1.0.0.tgz#762217cc06db258ec48908a1298e8b95121e8ea2"
 
-type-is@^1.6.4, type-is@~1.6.15:
+type-is@^1.6.4:
   version "1.6.15"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.15.tgz#cab10fb4909e441c82842eafe1ad646c81804410"
   dependencies:
     media-typer "0.3.0"
     mime-types "~2.1.15"
 
+type-is@~1.6.15, type-is@~1.6.16:
+  version "1.6.16"
+  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
+  dependencies:
+    media-typer "0.3.0"
+    mime-types "~2.1.18"
+
 typedarray@^0.0.6, typedarray@~0.0.5:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
-typical@^2.6.0:
+typical@^2.6.0, typical@^2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/typical/-/typical-2.6.1.tgz#5c080e5d661cbbe38259d2e70a3c7253e873881d"
 
@@ -12021,7 +12115,7 @@ upath@^1.0.0:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.0.5.tgz#02cab9ecebe95bbec6d5fc2566325725ab6d1a73"
 
-update-notifier@^1.0.0, update-notifier@^1.0.3:
+update-notifier@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-1.0.3.tgz#8f92c515482bd6831b7c93013e70f87552c7cf5a"
   dependencies:
@@ -12105,12 +12199,6 @@ user-home@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/user-home/-/user-home-1.1.1.tgz#2b5be23a32b63a7c9deb8d0f28d485724a3df190"
 
-user-home@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/user-home/-/user-home-2.0.0.tgz#9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"
-  dependencies:
-    os-homedir "^1.0.0"
-
 util-deprecate@^1.0.2, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
@@ -12129,11 +12217,7 @@ uuid@^2.0.1:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a"
 
-uuid@^3.0.0, uuid@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04"
-
-uuid@^3.2.1:
+uuid@^3.0.0, uuid@^3.1.0, uuid@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14"
 
@@ -12164,11 +12248,11 @@ validate-element-name@^2.1.1:
     meow "^3.7.0"
 
 validate-npm-package-license@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc"
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz#81643bcbef1bdfecd4623793dc4648948ba98338"
   dependencies:
-    spdx-correct "~1.0.0"
-    spdx-expression-parse "~1.0.0"
+    spdx-correct "^3.0.0"
+    spdx-expression-parse "^3.0.0"
 
 vargs@0.1.0:
   version "0.1.0"
@@ -12278,7 +12362,7 @@ vinyl@^2.0.1, vinyl@^2.1.0:
     remove-trailing-separator "^1.0.1"
     replace-ext "^1.0.0"
 
-vlq@^0.2.1:
+vlq@^0.2.2:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.3.tgz#8f3e4328cf63b1540c0d67e1b2778386f8975b26"
 
@@ -12305,8 +12389,8 @@ watchpack@^1.5.0:
     neo-async "^2.5.0"
 
 wbuf@^1.1.0, wbuf@^1.7.2:
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.2.tgz#d697b99f1f59512df2751be42769c1580b5801fe"
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df"
   dependencies:
     minimalistic-assert "^1.0.0"
 
@@ -12534,8 +12618,8 @@ window-size@0.1.0:
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
 
 winston@^2.2.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/winston/-/winston-2.4.0.tgz#808050b93d52661ed9fb6c26b3f0c826708b0aee"
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/winston/-/winston-2.4.2.tgz#3ca01f763116fc48db61053b7544e750431f8db0"
   dependencies:
     async "~1.0.0"
     colors "1.0.x"
@@ -12565,6 +12649,13 @@ wordwrapjs@^2.0.0-0:
     reduce-flatten "^1.0.1"
     typical "^2.6.0"
 
+wordwrapjs@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/wordwrapjs/-/wordwrapjs-3.0.0.tgz#c94c372894cadc6feb1a66bff64e1d9af92c5d1e"
+  dependencies:
+    reduce-flatten "^1.0.1"
+    typical "^2.6.1"
+
 worker-farm@^1.5.2:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.6.0.tgz#aecc405976fab5a95526180846f0dba288f3a4a0"
@@ -12723,7 +12814,7 @@ yeast@0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
 
-yeoman-environment@^1.1.0, yeoman-environment@^1.5.2:
+yeoman-environment@^1.5.2:
   version "1.6.6"
   resolved "https://registry.yarnpkg.com/yeoman-environment/-/yeoman-environment-1.6.6.tgz#cd85fa67d156060e440d7807d7ef7cf0d2d1d671"
   dependencies:
@@ -12758,42 +12849,7 @@ yeoman-environment@^2.0.0, yeoman-environment@^2.0.5:
     text-table "^0.2.0"
     untildify "^3.0.2"
 
-yeoman-generator@^1.0.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/yeoman-generator/-/yeoman-generator-1.1.1.tgz#40c2b4f6cdfbe05e1952fdd72933f0d8925dbdf5"
-  dependencies:
-    async "^2.0.0"
-    chalk "^1.0.0"
-    class-extend "^0.1.0"
-    cli-table "^0.3.1"
-    cross-spawn "^5.0.1"
-    dargs "^5.1.0"
-    dateformat "^2.0.0"
-    debug "^2.1.0"
-    detect-conflict "^1.0.0"
-    error "^7.0.2"
-    find-up "^2.1.0"
-    github-username "^3.0.0"
-    glob "^7.0.3"
-    istextorbinary "^2.1.0"
-    lodash "^4.11.1"
-    mem-fs-editor "^3.0.0"
-    minimist "^1.2.0"
-    mkdirp "^0.5.0"
-    path-exists "^3.0.0"
-    path-is-absolute "^1.0.0"
-    pretty-bytes "^4.0.2"
-    read-chunk "^2.0.0"
-    read-pkg-up "^2.0.0"
-    rimraf "^2.2.0"
-    run-async "^2.0.0"
-    shelljs "^0.7.0"
-    text-table "^0.2.0"
-    through2 "^2.0.0"
-    user-home "^2.0.0"
-    yeoman-environment "^1.1.0"
-
-yeoman-generator@^2.0.4:
+yeoman-generator@^2.0.1, yeoman-generator@^2.0.4:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/yeoman-generator/-/yeoman-generator-2.0.5.tgz#57b0b3474701293cc9ec965288f3400b00887c81"
   dependencies: