diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0c76b8ce75..dd164a4383 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -20,7 +20,6 @@ jobs:
       - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org"
       - COMMIT_AUTHOR: "Circle CI"
     working_directory: ~/remix-project
-
     steps:
       - checkout
 
diff --git a/apps/remix-ide-e2e/src/helpers/init.ts b/apps/remix-ide-e2e/src/helpers/init.ts
index e934ae2f7b..8b56b54b5a 100644
--- a/apps/remix-ide-e2e/src/helpers/init.ts
+++ b/apps/remix-ide-e2e/src/helpers/init.ts
@@ -13,7 +13,7 @@ export default function (browser: NightwatchBrowser, callback: VoidFunction, url
     .fullscreenWindow(() => {
       if (preloadPlugins) {
         initModules(browser, () => {
-          browser.clickLaunchIcon('solidity')
+          browser.pause(2000).clickLaunchIcon('solidity')
             .waitForElementVisible('[for="autoCompile"]')
             .click('[for="autoCompile"]')
             .verify.elementPresent('[data-id="compilerContainerAutoCompile"]:checked')
diff --git a/apps/remix-ide-e2e/src/tests/migrateFileSystem.test.ts b/apps/remix-ide-e2e/src/tests/migrateFileSystem.test.ts
new file mode 100644
index 0000000000..f10e6c713b
--- /dev/null
+++ b/apps/remix-ide-e2e/src/tests/migrateFileSystem.test.ts
@@ -0,0 +1,39 @@
+'use strict'
+import { NightwatchBrowser } from 'nightwatch'
+import init from '../helpers/init'
+
+module.exports = {
+  before: function (browser: NightwatchBrowser, done: VoidFunction) {
+    init(browser, done, 'http://127.0.0.1:8080?e2e_testmigration=true', false)
+  },
+  'Should have README file with TEST README as content': function (browser: NightwatchBrowser) {
+    browser.waitForElementVisible('*[data-id="remixIdeSidePanel"]', 5000)
+      .waitForElementVisible('div[data-id="filePanelFileExplorerTree"]')
+      .openFile('TEST_README.txt')
+      .getEditorValue((content) => {
+        browser.assert.equal(content, 'TEST README')
+      })
+  },
+  'Should have a workspace_test': function (browser: NightwatchBrowser) {
+    browser.waitForElementVisible('*[data-id="remixIdeSidePanel"]', 5000)
+      .click('*[data-id="workspacesSelect"] option[value="workspace_test"]')
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemtest_contracts"]')
+  },
+  'Should have a sol file with test data': function (browser: NightwatchBrowser) {
+    browser.waitForElementVisible('*[data-id="remixIdeSidePanel"]', 5000)
+      .click('*[data-id="treeViewLitreeViewItemtest_contracts"]')
+      .openFile('test_contracts/1_Storage.sol')
+      .getEditorValue((content) => {
+        browser.assert.equal(content, 'testing')
+      })
+  },
+  'Should have a artifacts file with JSON test data': function (browser: NightwatchBrowser) {
+    browser.waitForElementVisible('*[data-id="remixIdeSidePanel"]', 5000)
+      .click('*[data-id="treeViewLitreeViewItemtest_contracts/artifacts"]')
+      .openFile('test_contracts/artifacts/Storage_metadata.json')
+      .getEditorValue((content) => {
+        const metadata = JSON.parse(content)
+        browser.assert.equal(metadata.test, 'data')
+      })
+  }
+}
diff --git a/apps/remix-ide-e2e/src/tests/plugin_api.ts b/apps/remix-ide-e2e/src/tests/plugin_api.ts
index 86701d9323..063487794a 100644
--- a/apps/remix-ide-e2e/src/tests/plugin_api.ts
+++ b/apps/remix-ide-e2e/src/tests/plugin_api.ts
@@ -235,7 +235,9 @@ module.exports = {
   },
   'Should write to file #group2': async function (browser: NightwatchBrowser) {
     await clickAndCheckLog(browser, 'fileManager:writeFile', null, { event: 'fileSaved', args: ['README.txt'] }, ['README.txt', 'test'])
-    await clickAndCheckLog(browser, 'fileManager:readFile', 'test', null, 'README.txt')
+    browser.pause(4000, async () => {
+      await clickAndCheckLog(browser, 'fileManager:getFile', 'test', null, 'README.txt')
+    })
   },
   'Should set file #group2': async function (browser: NightwatchBrowser) {
     await clickAndCheckLog(browser, 'fileManager:setFile', null, { event: 'fileAdded', args: ['new.sol'] }, ['new.sol', 'test'])
diff --git a/apps/remix-ide-e2e/src/tests/recorder.test.ts b/apps/remix-ide-e2e/src/tests/recorder.test.ts
index 838ac567da..fc77f0ef0f 100644
--- a/apps/remix-ide-e2e/src/tests/recorder.test.ts
+++ b/apps/remix-ide-e2e/src/tests/recorder.test.ts
@@ -11,7 +11,7 @@ module.exports = {
     return sources
   },
 
-  'Test Recorder': function (browser: NightwatchBrowser) {
+  'Run Scenario': function (browser: NightwatchBrowser) {
     let addressRef
     browser.addFile('scenario.json', { content: records })
       .pause(5000)
@@ -34,7 +34,10 @@ module.exports = {
           .perform(() => done())
       })
       .click('*[data-id="deployAndRunClearInstances"]')
-      .testContracts('testRecorder.sol', sources[0]['testRecorder.sol'], ['testRecorder'])
+
+    },
+    'Save scenario': function (browser: NightwatchBrowser) {
+      browser.testContracts('testRecorder.sol', sources[0]['testRecorder.sol'], ['testRecorder'])
       .clickLaunchIcon('udapp')
       .createContract('12')
       .clickInstance(0)
@@ -45,7 +48,7 @@ module.exports = {
         const modalOk = document.querySelector('[data-id="udappNotify-modal-footer-ok-react"]') as any
 
         modalOk.click()
-      })
+      }).pause(1000)
       .getEditorValue(function (result) {
         const parsed = JSON.parse(result)
         browser.assert.equal(JSON.stringify(parsed.transactions[0].record.parameters), JSON.stringify(scenario.transactions[0].record.parameters))
diff --git a/apps/remix-ide-e2e/src/tests/solidityImport.test.ts b/apps/remix-ide-e2e/src/tests/solidityImport.test.ts
index c67265f9c1..2c0e8d4b99 100644
--- a/apps/remix-ide-e2e/src/tests/solidityImport.test.ts
+++ b/apps/remix-ide-e2e/src/tests/solidityImport.test.ts
@@ -18,7 +18,7 @@ module.exports = {
 
   'Test Success Import #group1': function (browser: NightwatchBrowser) {
     browser.addFile('Untitled1.sol', sources[1]['Untitled1.sol'])
-      .addFile('Untitled2.sol', sources[1]['Untitled2.sol'])
+      .addFile('Untitled2.sol', sources[1]['Untitled2.sol']).pause(4000)
       .openFile('Untitled1.sol')
       .verifyContracts(['test6', 'test4', 'test5'])
       .pause(1000)
diff --git a/apps/remix-ide-e2e/src/tests/solidityUnittests.test.ts b/apps/remix-ide-e2e/src/tests/solidityUnittests.test.ts
index 1ca31687c9..30d1a2c83c 100644
--- a/apps/remix-ide-e2e/src/tests/solidityUnittests.test.ts
+++ b/apps/remix-ide-e2e/src/tests/solidityUnittests.test.ts
@@ -263,7 +263,7 @@ module.exports = {
       .removeFile('tests/ballotFailedLog_test.sol', 'workspace_new')
   },
 
-  'Debug tests using debugger #group5': function (browser: NightwatchBrowser) {
+  'Debug tests using debugger #group7': function (browser: NightwatchBrowser) {
     browser
       .waitForElementPresent('*[data-id="verticalIconsKindfilePanel"]')
       .addFile('tests/ballotFailedDebug_test.sol', sources[0]['tests/ballotFailedDebug_test.sol'])
@@ -288,9 +288,10 @@ module.exports = {
       .setValue('*[data-id="slider"]', new Array(1).fill(browser.Keys.RIGHT_ARROW))
       .waitForElementContainsText('*[data-id="functionPanel"]', 'checkWinningProposalFailed()', 60000)
       .waitForElementContainsText('*[data-id="functionPanel"]', 'vote(proposal)', 60000)
-      .pause(1000)
+      .pause(5000)
       .checkVariableDebug('soliditylocals', locals)
-      .clickLaunchIcon('solidityUnitTesting')
+      .pause(5000)
+      .clickLaunchIcon('solidityUnitTesting').pause(2000)
       .scrollAndClick('#Check_winning_proposal_passed')
       .waitForElementContainsText('*[data-id="sidePanelSwapitTitle"]', 'DEBUGGER', 60000)
       .waitForElementContainsText('*[data-id="functionPanel"]', 'checkWinningProposalPassed()', 60000)
@@ -301,8 +302,8 @@ module.exports = {
       .waitForElementContainsText('*[data-id="functionPanel"]', 'checkWinningProposalPassed()', 60000)
       // remix_test.sol should be opened in editor
       .getEditorValue((content) => browser.assert.ok(content.indexOf('library Assert {') !== -1))
-      .pause(1000)
-      .clickLaunchIcon('solidityUnitTesting')
+      .pause(5000)
+      .clickLaunchIcon('solidityUnitTesting').pause(2000)
       .scrollAndClick('#Check_winning_proposal_again')
       .waitForElementContainsText('*[data-id="sidePanelSwapitTitle"]', 'DEBUGGER', 60000)
       .waitForElementContainsText('*[data-id="functionPanel"]', 'checkWinningProposalAgain()', 60000)
@@ -311,9 +312,9 @@ module.exports = {
       .setValue('*[data-id="slider"]', new Array(1).fill(browser.Keys.RIGHT_ARROW))
       .waitForElementContainsText('*[data-id="functionPanel"]', 'equal(a, b, message)', 60000)
       .waitForElementContainsText('*[data-id="functionPanel"]', 'checkWinningProposalAgain()', 60000)
-      .pause(1000)
-      .clickLaunchIcon('solidityUnitTesting')
-      .scrollAndClick('#Check_winnin_proposal_with_return_value')
+      .pause(5000)
+      .clickLaunchIcon('solidityUnitTesting').pause(5000)
+      .scrollAndClick('#Check_winnin_proposal_with_return_value').pause(5000)
       .waitForElementContainsText('*[data-id="sidePanelSwapitTitle"]', 'DEBUGGER', 60000)
       .waitForElementContainsText('*[data-id="functionPanel"]', 'checkWinninProposalWithReturnValue()', 60000)
       // eslint-disable-next-line dot-notation
diff --git a/apps/remix-ide-e2e/src/tests/workspace.test.ts b/apps/remix-ide-e2e/src/tests/workspace.test.ts
index 8824167b4c..15c9e34294 100644
--- a/apps/remix-ide-e2e/src/tests/workspace.test.ts
+++ b/apps/remix-ide-e2e/src/tests/workspace.test.ts
@@ -19,9 +19,9 @@ module.exports = {
     browser
       .pause(5000)
       .refresh()
-      .pause(10000)
+      .waitForElementVisible('#editorView', 30000)
       .getEditorValue((content) => {
-        browser.assert.ok(content.indexOf('contract Ballot {') !== -1, 'content doesn\'t include Ballot contract')
+        browser.assert.ok(content.indexOf('contract Ballot {') !== -1, 'content includes Ballot contract')
       })
   },
 
diff --git a/apps/remix-ide/src/app.js b/apps/remix-ide/src/app.js
index 25fc2e92b4..033c1b1bb0 100644
--- a/apps/remix-ide/src/app.js
+++ b/apps/remix-ide/src/app.js
@@ -19,6 +19,7 @@ import { OffsetToLineColumnConverter, CompilerMetadata, CompilerArtefacts, Fetch
 
 import Registry from './app/state/registry'
 import { ConfigPlugin } from './app/plugins/config'
+import { StoragePlugin } from './app/plugins/storage'
 import { Layout } from './app/panels/layout'
 import { NotificationPlugin } from './app/plugins/notification'
 import { Blockchain } from './blockchain/blockchain.js'
@@ -143,6 +144,9 @@ class AppComponent {
     // ----------------- dGit provider ---------------------------------
     const dGitProvider = new DGitProvider()
 
+    // ----------------- Storage plugin ---------------------------------
+    const storagePlugin = new StoragePlugin()
+
     // ----------------- import content service ------------------------
     const contentImport = new CompilerImports()
 
@@ -215,6 +219,7 @@ class AppComponent {
       web3Provider,
       fetchAndCompile,
       dGitProvider,
+      storagePlugin,
       hardhatProvider,
       this.walkthroughService
     ])
@@ -327,7 +332,7 @@ class AppComponent {
     await this.appManager.activatePlugin(['settings', 'config'])
     await this.appManager.activatePlugin(['hiddenPanel', 'pluginManager', 'contextualListener', 'terminal', 'blockchain', 'fetchAndCompile', 'contentImport', 'gistHandler'])
     await this.appManager.activatePlugin(['settings'])
-    await this.appManager.activatePlugin(['walkthrough'])
+    await this.appManager.activatePlugin(['walkthrough','storage'])
 
     this.appManager.on(
       'filePanel',
diff --git a/apps/remix-ide/src/app/editor/editor.js b/apps/remix-ide/src/app/editor/editor.js
index 6712c7456b..e7887df7e2 100644
--- a/apps/remix-ide/src/app/editor/editor.js
+++ b/apps/remix-ide/src/app/editor/editor.js
@@ -180,11 +180,11 @@ class Editor extends Plugin {
     if (this.saveTimeout) {
       window.clearTimeout(this.saveTimeout)
     }
-    this.triggerEvent('contentChanged', [])
 
     this.saveTimeout = window.setTimeout(() => {
+      this.triggerEvent('contentChanged', [])
       this.triggerEvent('requiringToSaveCurrentfile', [])
-    }, 5000)
+    }, 500)
   }
 
   _switchSession (path) {
diff --git a/apps/remix-ide/src/app/files/dgitProvider.js b/apps/remix-ide/src/app/files/dgitProvider.js
index fb0aed7530..9a2fcc8e80 100644
--- a/apps/remix-ide/src/app/files/dgitProvider.js
+++ b/apps/remix-ide/src/app/files/dgitProvider.js
@@ -51,8 +51,8 @@ class DGitProvider extends Plugin {
   async getGitConfig () {
     const workspace = await this.call('filePanel', 'getCurrentWorkspace')
     return {
-      fs: window.remixFileSystem,
-      dir: workspace.absolutePath
+      fs: window.remixFileSystemCallback,
+      dir: addSlash(workspace.absolutePath)
     }
   }
 
@@ -91,7 +91,9 @@ class DGitProvider extends Plugin {
       ...await this.getGitConfig(),
       ...cmd
     })
-    await this.call('fileManager', 'refresh')
+    setTimeout(async () => {
+      await this.call('fileManager', 'refresh')
+    }, 1000)
   }
 
   async rm (cmd) {
@@ -99,7 +101,9 @@ class DGitProvider extends Plugin {
       ...await this.getGitConfig(),
       ...cmd
     })
-    await this.call('fileManager', 'refresh')
+    setTimeout(async () => {
+      await this.call('fileManager', 'refresh')
+    }, 1000)
   }
 
   async checkout (cmd) {
@@ -107,7 +111,9 @@ class DGitProvider extends Plugin {
       ...await this.getGitConfig(),
       ...cmd
     })
-    await this.call('fileManager', 'refresh')
+    setTimeout(async () => {
+      await this.call('fileManager', 'refresh')
+    }, 1000)
   }
 
   async log (cmd) {
@@ -133,7 +139,9 @@ class DGitProvider extends Plugin {
       ...await this.getGitConfig(),
       ...cmd
     })
-    await this.call('fileManager', 'refresh')
+    setTimeout(async () => {
+      await this.call('fileManager', 'refresh')
+    }, 1000)
     return status
   }
 
@@ -241,7 +249,9 @@ class DGitProvider extends Plugin {
     }
 
     const result = await git.clone(cmd)
-    await this.call('fileManager', 'refresh')
+    setTimeout(async () => {
+      await this.call('fileManager', 'refresh')
+    }, 1000)
     return result
   }
 
@@ -274,7 +284,9 @@ class DGitProvider extends Plugin {
       ...await this.getGitConfig()
     }
     const result = await git.pull(cmd)
-    await this.call('fileManager', 'refresh')
+    setTimeout(async () => {
+      await this.call('fileManager', 'refresh')
+    }, 1000)
     return result
   }
 
@@ -291,7 +303,9 @@ class DGitProvider extends Plugin {
       ...await this.getGitConfig()
     }
     const result = await git.fetch(cmd)
-    await this.call('fileManager', 'refresh')
+    setTimeout(async () => {
+      await this.call('fileManager', 'refresh')
+    }, 1000)
     return result
   }
 
@@ -301,7 +315,7 @@ class DGitProvider extends Plugin {
     const files = await this.getDirectory('/')
     this.filesToSend = []
     for (const file of files) {
-      const c = window.remixFileSystem.readFileSync(`${workspace.absolutePath}/${file}`)
+      const c = await window.remixFileSystem.readFile(`${workspace.absolutePath}/${file}`)
       const ob = {
         path: file,
         content: c
@@ -321,10 +335,10 @@ class DGitProvider extends Plugin {
     this.filesToSend = []
 
     const data = new FormData()
-    files.forEach(async (file) => {
-      const c = window.remixFileSystem.readFileSync(`${workspace.absolutePath}/${file}`)
+    for (const file of files) {
+      const c = await window.remixFileSystem.readFile(`${workspace.absolutePath}/${file}`)
       data.append('file', new Blob([c]), `base/${file}`)
-    })
+    }
     // get last commit data
     let ob
     try {
@@ -430,10 +444,10 @@ class DGitProvider extends Plugin {
         }
         const dir = path.dirname(file.path)
         try {
-          this.createDirectories(`${workspace.absolutePath}/${dir}`)
+          await this.createDirectories(`${workspace.absolutePath}/${dir}`)
         } catch (e) { throw new Error(e) }
         try {
-          window.remixFileSystem.writeFileSync(`${workspace.absolutePath}/${file.path}`, Buffer.concat(content) || new Uint8Array())
+          await window.remixFileSystem.writeFile(`${workspace.absolutePath}/${file.path}`, Buffer.concat(content) || new Uint8Array())
         } catch (e) { throw new Error(e) }
       }
     } catch (e) {
@@ -469,7 +483,9 @@ class DGitProvider extends Plugin {
     } else {
       result = await this.importIPFSFiles(this.remixIPFS, cid, workspace) || await this.importIPFSFiles(this.ipfsconfig, cid, workspace) || await this.importIPFSFiles(this.globalIPFSConfig, cid, workspace)
     }
-    await this.call('fileManager', 'refresh')
+    setTimeout(async () => {
+      await this.call('fileManager', 'refresh')
+    }, 1000)
     if (!result) throw new Error(`Cannot pull files from IPFS at ${cid}`)
   }
 
@@ -497,7 +513,7 @@ class DGitProvider extends Plugin {
     const files = await this.getDirectory('/')
     this.filesToSend = []
     for (const file of files) {
-      const c = window.remixFileSystem.readFileSync(`${workspace.absolutePath}/${file}`)
+      const c = await window.remixFileSystem.readFile(`${workspace.absolutePath}/${file}`)
       zip.file(file, c)
     }
     await zip.generateAsync({
@@ -517,8 +533,8 @@ class DGitProvider extends Plugin {
       if (i > 0) previouspath = '/' + directories.slice(0, i).join('/')
       const finalPath = previouspath + '/' + directories[i]
       try {
-        if (!window.remixFileSystem.existsSync(finalPath)) {
-          window.remixFileSystem.mkdirSync(finalPath)
+        if (!await window.remixFileSystem.exists(finalPath)) {
+          await window.remixFileSystem.mkdir(finalPath)
         }
       } catch (e) {
         console.log(e)
@@ -549,6 +565,11 @@ class DGitProvider extends Plugin {
   }
 }
 
+const addSlash = (file) => {
+  if (!file.startsWith('/'))file = '/' + file
+  return file
+}
+
 const normalize = (filesList) => {
   const folders = []
   const files = []
diff --git a/apps/remix-ide/src/app/files/fileManager.ts b/apps/remix-ide/src/app/files/fileManager.ts
index a3828d68b3..d9789f4512 100644
--- a/apps/remix-ide/src/app/files/fileManager.ts
+++ b/apps/remix-ide/src/app/files/fileManager.ts
@@ -1,12 +1,11 @@
 'use strict'
-import async from 'async'
 import { Plugin } from '@remixproject/engine'
 import * as packageJson from '../../../../../package.json'
 import Registry from '../state/registry'
 import { EventEmitter } from 'events'
 import { RemixAppManager } from '../../../../../libs/remix-ui/plugin-manager/src/types'
 import { fileChangedToastMsg } from '@remix-ui/helper'
-const helper = require('../../lib/helper.js')
+import helper from '../../lib/helper.js'
 
 /*
   attach to files event (removed renamed)
@@ -47,7 +46,7 @@ class FileManager extends Plugin {
   getFolder: (path: any) => Promise<unknown>
   setFile: (path: any, data: any) => Promise<unknown>
   switchFile: (path: any) => Promise<void>
-  constructor (editor, appManager) {
+  constructor(editor, appManager) {
     super(profile)
     this.mode = 'browser'
     this.openedFiles = {} // list all opened files
@@ -59,19 +58,19 @@ class FileManager extends Plugin {
     this.init()
   }
 
-  getOpenedFiles () {
+  getOpenedFiles() {
     return this.openedFiles
   }
 
-  setMode (mode) {
+  setMode(mode) {
     this.mode = mode
   }
 
-  limitPluginScope (path) {
+  limitPluginScope(path) {
     return path.replace(/^\/browser\//, '').replace(/^browser\//, '') // forbids plugin to access the root filesystem
   }
 
-  normalize (path) {
+  normalize(path) {
     return path.replace(/^\/+/, '')
   }
 
@@ -80,7 +79,7 @@ class FileManager extends Plugin {
    * @param {string} path path of the file/directory
    * @param {string} message message to display if path doesn't exist.
    */
-  async _handleExists (path: string, message?:string) {
+  async _handleExists(path: string, message?: string) {
     const exists = await this.exists(path)
 
     if (!exists) {
@@ -93,7 +92,7 @@ class FileManager extends Plugin {
    * @param {string} path path of the file/directory
    * @param {string} message message to display if path is not a file.
    */
-  async _handleIsFile (path, message) {
+  async _handleIsFile(path, message) {
     const isFile = await this.isFile(path)
 
     if (!isFile) {
@@ -106,7 +105,7 @@ class FileManager extends Plugin {
    * @param {string} path path of the file/directory
    * @param {string} message message to display if path is not a directory.
    */
-  async _handleIsDir (path: string, message?: string) {
+  async _handleIsDir(path: string, message?: string) {
     const isDir = await this.isDirectory(path)
 
     if (!isDir) {
@@ -115,7 +114,7 @@ class FileManager extends Plugin {
   }
 
   /** The current opened file */
-  file () {
+  file() {
     try {
       const file = this.currentFile()
 
@@ -131,12 +130,12 @@ class FileManager extends Plugin {
    * @param {string} path path of the directory or file
    * @returns {boolean} true if the path exists
    */
-  exists (path) {
+  async exists(path) {
     try {
       path = this.normalize(path)
       path = this.limitPluginScope(path)
       const provider = this.fileProviderOf(path)
-      const result = provider.exists(path)
+      const result = await provider.exists(path)
 
       return result
     } catch (e) {
@@ -147,7 +146,7 @@ class FileManager extends Plugin {
   /*
   * refresh the file explorer
   */
-  refresh () {
+  refresh() {
     const provider = this.fileProviderOf('/')
     // emit rootFolderChanged so that File Explorer reloads the file tree
     provider.event.emit('rootFolderChanged', provider.workspace || '/')
@@ -159,10 +158,9 @@ class FileManager extends Plugin {
    * @param {string} path path of the directory or file
    * @returns {boolean} true if path is a file.
    */
-  isFile (path) {
+  async isFile(path) {
     const provider = this.fileProviderOf(path)
-    const result = provider.isFile(path)
-
+    const result = await provider.isFile(path)
     return result
   }
 
@@ -171,7 +169,7 @@ class FileManager extends Plugin {
    * @param {string} path path of the directory
    * @returns {boolean} true if path is a directory.
    */
-  async isDirectory (path) {
+  async isDirectory(path) {
     const provider = this.fileProviderOf(path)
     const result = await provider.isDirectory(path)
 
@@ -183,7 +181,7 @@ class FileManager extends Plugin {
    * @param {string} path path of the file
    * @returns {void}
    */
-  async open (path) {
+  async open(path) {
     path = this.normalize(path)
     path = this.limitPluginScope(path)
     path = this.getPathFromUrl(path).file
@@ -198,7 +196,7 @@ class FileManager extends Plugin {
    * @param {string} data content to write on the file
    * @returns {void}
    */
-  async writeFile (path, data) {
+  async writeFile(path, data) {
     try {
       path = this.normalize(path)
       path = this.limitPluginScope(path)
@@ -220,7 +218,7 @@ class FileManager extends Plugin {
    * @param {string} path path of the file
    * @returns {string} content of the file
    */
-  async readFile (path) {
+  async readFile(path) {
     try {
       path = this.normalize(path)
       path = this.limitPluginScope(path)
@@ -238,7 +236,7 @@ class FileManager extends Plugin {
    * @param {string} dest path of the destrination file
    * @returns {void}
    */
-  async copyFile (src, dest, customName) {
+  async copyFile(src, dest, customName) {
     try {
       src = this.normalize(src)
       dest = this.normalize(dest)
@@ -264,7 +262,7 @@ class FileManager extends Plugin {
    * @param {string} dest path of the destination dir
    * @returns {void}
    */
-  async copyDir (src, dest) {
+  async copyDir(src, dest) {
     try {
       src = this.normalize(src)
       dest = this.normalize(dest)
@@ -280,7 +278,7 @@ class FileManager extends Plugin {
     }
   }
 
-  async inDepthCopy (src, dest, count = 0) {
+  async inDepthCopy(src, dest, count = 0) {
     const content = await this.readdir(src)
     let copiedFolderPath = count === 0 ? dest + '/' + `Copy_${helper.extractNameFromKey(src)}` : dest + '/' + helper.extractNameFromKey(src)
     copiedFolderPath = await helper.createNonClashingDirNameAsync(copiedFolderPath, this)
@@ -302,7 +300,7 @@ class FileManager extends Plugin {
    * @param {string} newPath new path of the file/directory
    * @returns {void}
    */
-  async rename (oldPath, newPath) {
+  async rename(oldPath, newPath) {
     try {
       oldPath = this.normalize(oldPath)
       newPath = this.normalize(newPath)
@@ -342,7 +340,7 @@ class FileManager extends Plugin {
    * @param {string} path path of the new directory
    * @returns {void}
    */
-  async mkdir (path) {
+  async mkdir(path) {
     try {
       path = this.normalize(path)
       path = this.limitPluginScope(path)
@@ -350,8 +348,7 @@ class FileManager extends Plugin {
         throw createError({ code: 'EEXIST', message: `Cannot create directory ${path}` })
       }
       const provider = this.fileProviderOf(path)
-
-      return provider.createDir(path)
+      return await provider.createDir(path)
     } catch (e) {
       throw new Error(e)
     }
@@ -362,7 +359,7 @@ class FileManager extends Plugin {
    * @param {string} path path of the directory
    * @returns {string[]} list of the file/directory name in this directory
    */
-  async readdir (path) {
+  async readdir(path) {
     try {
       path = this.normalize(path)
       path = this.limitPluginScope(path)
@@ -387,7 +384,7 @@ class FileManager extends Plugin {
    * @param {string} path path of the directory/file to remove
    * @returns {void}
    */
-  async remove (path) {
+  async remove(path) {
     try {
       path = this.normalize(path)
       path = this.limitPluginScope(path)
@@ -399,7 +396,7 @@ class FileManager extends Plugin {
     }
   }
 
-  init () {
+  init() {
     this._deps = {
       config: this._components.registry.get('config').api,
       browserExplorer: this._components.registry.get('fileproviders/browser').api,
@@ -427,15 +424,15 @@ class FileManager extends Plugin {
     this.switchFile = this.open
   }
 
-  fileAddedEvent (path) {
+  fileAddedEvent(path) {
     this.emit('fileAdded', path)
   }
 
-  fileChangedEvent (path) {
+  fileChangedEvent(path) {
     this.emit('fileChanged', path)
   }
 
-  fileRenamedEvent (oldName, newName, isFolder) {
+  fileRenamedEvent(oldName, newName, isFolder) {
     if (!isFolder) {
       this._deps.config.set('currentFile', '')
       this.editor.discard(oldName)
@@ -445,9 +442,9 @@ class FileManager extends Plugin {
       }
       this.openFile(newName)
     } else {
-      for (var k in this.openedFiles) {
+      for (const k in this.openedFiles) {
         if (k.indexOf(oldName + '/') === 0) {
-          var newAbsolutePath = k.replace(oldName, newName)
+          const newAbsolutePath = k.replace(oldName, newName)
           this.openedFiles[newAbsolutePath] = newAbsolutePath
           delete this.openedFiles[k]
           if (this._deps.config.get('currentFile') === k) {
@@ -461,19 +458,19 @@ class FileManager extends Plugin {
     this.events.emit('fileRenamed', oldName, newName, isFolder)
   }
 
-  currentFileProvider () {
-    var path = this.currentPath()
+  currentFileProvider() {
+    const path = this.currentPath()
     if (path) {
       return this.fileProviderOf(path)
     }
     return null
   }
 
-  currentFile () {
+  currentFile() {
     return this.editor.current()
   }
 
-  async closeAllFiles () {
+  async closeAllFiles() {
     // TODO: Only keep `this.emit` (issue#2210)
     this.emit('filesAllClosed')
     this.events.emit('filesAllClosed')
@@ -482,7 +479,7 @@ class FileManager extends Plugin {
     }
   }
 
-  async closeFile (name) {
+  async closeFile(name) {
     delete this.openedFiles[name]
     if (!Object.keys(this.openedFiles).length) {
       this._deps.config.set('currentFile', '')
@@ -495,18 +492,18 @@ class FileManager extends Plugin {
     this.events.emit('fileClosed', name)
   }
 
-  currentPath () {
-    var currentFile = this._deps.config.get('currentFile')
+  currentPath() {
+    const currentFile = this._deps.config.get('currentFile')
     return this.extractPathOf(currentFile)
   }
 
-  extractPathOf (file) {
-    var reg = /(.*)(\/).*/
-    var path = reg.exec(file)
+  extractPathOf(file) {
+    const reg = /(.*)(\/).*/
+    const path = reg.exec(file)
     return path ? path[1] : '/'
   }
 
-  getFileContent (path) {
+  getFileContent(path) {
     const provider = this.fileProviderOf(path)
 
     if (!provider) throw createError({ code: 'ENOENT', message: `${path} not available` })
@@ -520,19 +517,19 @@ class FileManager extends Plugin {
     })
   }
 
-  async setFileContent (path, content) {
+  async setFileContent(path, content) {
     if (this.currentRequest) {
       const canCall = await this.askUserPermission('writeFile', '')
       const required = this.appManager.isRequired(this.currentRequest.from)
       if (canCall && !required) {
         // inform the user about modification after permission is granted and even if permission was saved before
-        this.call('notification','toast', fileChangedToastMsg(this.currentRequest.from, path))
+        this.call('notification', 'toast', fileChangedToastMsg(this.currentRequest.from, path))
       }
     }
     return await this._setFileInternal(path, content)
   }
 
-  _setFileInternal (path, content) {
+  _setFileInternal(path, content) {
     const provider = this.fileProviderOf(path)
     if (!provider) throw createError({ code: 'ENOENT', message: `${path} not available` })
     // TODO : Add permission
@@ -547,19 +544,6 @@ class FileManager extends Plugin {
     })
   }
 
-  _saveAsCopy (path, content) {
-    const fileProvider = this.fileProviderOf(path)
-    if (fileProvider) {
-      helper.createNonClashingNameWithPrefix(path, fileProvider, '', (error, copyName) => {
-        if (error) {
-          copyName = path + '.' + this.currentRequest.from
-        }
-        this._setFileInternal(copyName, content)
-        this.openFile(copyName)
-      })
-    }
-  }
-
   /**
    * Try to resolve the given file path (the actual path in the file system)
    * e.g if it's specified a github link, npm library, or any external content,
@@ -567,7 +551,7 @@ class FileManager extends Plugin {
    * @param {string} file url we are trying to resolve
    * @returns {{ string, provider }} file path resolved and its provider.
    */
-  getPathFromUrl (file) {
+  getPathFromUrl(file) {
     const provider = this.fileProviderOf(file)
     if (!provider) throw new Error(`no provider for ${file}`)
     return {
@@ -581,7 +565,7 @@ class FileManager extends Plugin {
    * @param {string} file path we are trying to resolve
    * @returns {{ string, provider }} file url resolved and its provider.
    */
-  getUrlFromPath (file) {
+  getUrlFromPath(file) {
     const provider = this.fileProviderOf(file)
     if (!provider) throw new Error(`no provider for ${file}`)
     return {
@@ -590,15 +574,15 @@ class FileManager extends Plugin {
     }
   }
 
-  removeTabsOf (provider) {
-    for (var tab in this.openedFiles) {
+  removeTabsOf(provider) {
+    for (const tab in this.openedFiles) {
       if (this.fileProviderOf(tab).type === provider.type) {
         this.fileRemovedEvent(tab)
       }
     }
   }
 
-  fileRemovedEvent (path) {
+  fileRemovedEvent(path) {
     if (path === this._deps.config.get('currentFile')) {
       this._deps.config.set('currentFile', '')
     }
@@ -610,32 +594,35 @@ class FileManager extends Plugin {
     this.openFile()
   }
 
-  unselectCurrentFile () {
-    this.saveCurrentFile()
+  async unselectCurrentFile() {
+    await this.saveCurrentFile()
     this._deps.config.set('currentFile', '')
     // TODO: Only keep `this.emit` (issue#2210)
     this.emit('noFileSelected')
     this.events.emit('noFileSelected')
   }
 
-  async openFile (file?: string) {
+  async openFile(file?: string) {
     if (!file) {
       this.emit('noFileSelected')
       this.events.emit('noFileSelected')
     } else {
       file = this.normalize(file)
-      this.saveCurrentFile()
+      await this.saveCurrentFile()
       const resolved = this.getPathFromUrl(file)
       file = resolved.file
       const provider = resolved.provider
       this._deps.config.set('currentFile', file)
       this.openedFiles[file] = file
-      await (() => {
-        return new Promise((resolve, reject) => {
-          provider.get(file, (error, content) => {
-            if (error) {
-              console.log(error)
-              reject(error)
+
+      return new Promise((resolve, reject) => {
+        provider.get(file, (error, content) => {
+          if (error) {
+            console.log(error)
+            reject(error)
+          } else {
+            if (provider.isReadOnly(file)) {
+              this.editor.openReadOnly(file, content)
             } else {
               if (provider.isReadOnly(file)) {
                 this.editor.openReadOnly(file, content)
@@ -647,9 +634,13 @@ class FileManager extends Plugin {
               this.events.emit('currentFileChanged', file)
               resolve(true)
             }
-          })
+            // TODO: Only keep `this.emit` (issue#2210)
+            this.emit('currentFileChanged', file)
+            this.events.emit('currentFileChanged', file)
+            resolve(true)
+          }
         })
-      })()
+      })
     }
   }
 
@@ -659,7 +650,7 @@ class FileManager extends Plugin {
   *
   */
 
-  async getProviderOf (file) {
+  async getProviderOf(file) {
     const cancall = await this.askUserPermission('getProviderByName')
     if (cancall) {
       return file ? this.fileProviderOf(file) : this.currentFileProvider()
@@ -672,18 +663,18 @@ class FileManager extends Plugin {
   *
   */
 
-  async getProviderByName (name) {
+  async getProviderByName(name) {
     const cancall = await this.askUserPermission('getProviderByName')
     if (cancall) {
       return this.getProvider(name)
     }
   }
 
-  getProvider (name) {
+  getProvider(name) {
     return this._deps.filesProviders[name]
   }
 
-  fileProviderOf (file) {
+  fileProviderOf(file) {
     if (file.startsWith('localhost') || this.mode === 'localhost') {
       return this._deps.filesProviders.localhost
     }
@@ -694,7 +685,7 @@ class FileManager extends Plugin {
   }
 
   // returns the list of directories inside path
-  dirList (path) {
+  dirList(path) {
     const dirPaths = []
     const collectList = (path) => {
       return new Promise((resolve, reject) => {
@@ -713,18 +704,18 @@ class FileManager extends Plugin {
     return collectList(path)
   }
 
-  isRemixDActive () {
+  isRemixDActive() {
     return this.appManager.isActive('remixd')
   }
 
-  saveCurrentFile () {
-    var currentFile = this._deps.config.get('currentFile')
+  async saveCurrentFile() {
+    const currentFile = this._deps.config.get('currentFile')
     if (currentFile && this.editor.current()) {
-      var input = this.editor.get(currentFile)
+      const input = this.editor.get(currentFile)
       if ((input !== null) && (input !== undefined)) {
-        var provider = this.fileProviderOf(currentFile)
+        const provider = this.fileProviderOf(currentFile)
         if (provider) {
-          provider.set(currentFile, input)
+          await provider.set(currentFile, input)
           this.emit('fileSaved', currentFile)
         } else {
           console.log('cannot save ' + currentFile + '. Does not belong to any explorer')
@@ -733,64 +724,64 @@ class FileManager extends Plugin {
     }
   }
 
-  syncEditor (path) {
-    var currentFile = this._deps.config.get('currentFile')
+  async syncEditor(path) {
+    const currentFile = this._deps.config.get('currentFile')
     if (path !== currentFile) return
-    var provider = this.fileProviderOf(currentFile)
+    const provider = this.fileProviderOf(currentFile)
     if (provider) {
-      provider.get(currentFile, (error, content) => {
-        if (error) console.log(error)
+      try{
+        const content = await provider.get(currentFile)
         this.editor.setText(content)
-      })
+      }catch(error){
+        console.log(error)
+      }
     } else {
       console.log('cannot save ' + currentFile + '. Does not belong to any explorer')
     }
   }
 
-  setBatchFiles (filesSet, fileProvider, override, callback) {
+  async setBatchFiles(filesSet, fileProvider, override, callback) {
     const self = this
-    if (!fileProvider) fileProvider = 'browser'
+    if (!fileProvider) fileProvider = 'workspace'
     if (override === undefined) override = false
-
-    async.each(Object.keys(filesSet), (file, callback) => {
+    for (const file of Object.keys(filesSet)) {
       if (override) {
         try {
-          self._deps.filesProviders[fileProvider].set(file, filesSet[file].content)
+          await self._deps.filesProviders[fileProvider].set(file, filesSet[file].content)
         } catch (e) {
-          return callback(e.message || e)
+          callback(e.message || e)
         }
-        self.syncEditor(fileProvider + file)
-        return callback()
-      }
-
-      helper.createNonClashingName(file, self._deps.filesProviders[fileProvider],
-        (error, name) => {
-          if (error) {
-            this.call('notification', 'alert', {
-              id: 'fileManagerAlert',
-              message: 'Unexpected error loading file ' + file + ': ' + error
-            })
-          } else if (helper.checkSpecialChars(name)) {
+        await self.syncEditor(fileProvider + file)
+      } else {
+        try{
+          const name = await helper.createNonClashingNameAsync(file, self._deps.filesProviders[fileProvider])
+          if (helper.checkSpecialChars(name)) {
             this.call('notification', 'alert', {
               id: 'fileManagerAlert',
               message: 'Special characters are not allowed in file names.'
             })
           } else {
             try {
-              self._deps.filesProviders[fileProvider].set(name, filesSet[file].content)
+              await self._deps.filesProviders[fileProvider].set(name, filesSet[file].content)
             } catch (e) {
               return callback(e.message || e)
             }
             self.syncEditor(fileProvider + name)
           }
-          callback()
-        })
-    }, (error) => {
-      if (callback) callback(error)
-    })
+        }catch(error){
+          if (error) {
+            this.call('notification', 'alert', {
+              id: 'fileManagerAlert',
+              message: 'Unexpected error loading file ' + file + ': ' + error
+            })
+          }
+        }
+      }
+    }
+    callback()
   }
 
-  currentWorkspace () {
+  currentWorkspace() {
     if (this.mode !== 'localhost') {
       const file = this.currentFile() || ''
       const provider = this.fileProviderOf(file)
diff --git a/apps/remix-ide/src/app/files/fileProvider.js b/apps/remix-ide/src/app/files/fileProvider.js
index 4ab50949b9..2176bc53b8 100644
--- a/apps/remix-ide/src/app/files/fileProvider.js
+++ b/apps/remix-ide/src/app/files/fileProvider.js
@@ -47,7 +47,7 @@ class FileProvider {
     return this.externalFolders.includes(path)
   }
 
-  discardChanges (path, toastCb, modalCb) {
+  async discardChanges (path, toastCb, modalCb) {
     this.remove(path)
     const compilerImport = new CompilerImports()
     this.providerExternalsStorage.keys().map(value => {
@@ -56,11 +56,11 @@ class FileProvider {
           this.getNormalizedName(value),
           true,
           (loadingMsg) => { toastCb(loadingMsg) },
-          (error, content, cleanUrl, type, url) => {
+          async (error, content, cleanUrl, type, url) => {
             if (error) {
               modalCb(error)
             } else {
-              this.addExternal(type + '/' + cleanUrl, content, url)
+              await this.addExternal(type + '/' + cleanUrl, content, url)
             }
           }
         )
@@ -71,48 +71,48 @@ class FileProvider {
   async exists (path) {
     // todo check the type (directory/file) as well #2386
     // currently it is not possible to have a file and folder with same path
-    const ret = this._exists(path)
+    const ret = await this._exists(path)
 
     return ret
   }
 
-  _exists (path) {
+  async _exists (path) {
     path = this.getPathFromUrl(path) || path // ensure we actually use the normalized path from here
     var unprefixedpath = this.removePrefix(path)
-    return path === this.type ? true : window.remixFileSystem.existsSync(unprefixedpath)
+    return path === this.type ? true : await window.remixFileSystem.exists(unprefixedpath)
   }
 
   init (cb) {
     cb()
   }
 
-  get (path, cb) {
+  async get (path, cb) {
     cb = cb || function () { /* do nothing. */ }
     path = this.getPathFromUrl(path) || path // ensure we actually use the normalized path from here
     var unprefixedpath = this.removePrefix(path)
-    var exists = window.remixFileSystem.existsSync(unprefixedpath)
-    if (!exists) return cb(null, null)
-    window.remixFileSystem.readFile(unprefixedpath, 'utf8', (err, content) => {
-      cb(err, content)
-    })
+    try {
+      const content = await window.remixFileSystem.readFile(unprefixedpath, 'utf8')
+      if (cb) cb(null, content)
+      return content
+    } catch (err) {
+      if (cb) cb(err, null)
+      throw new Error(err)
+    }
   }
 
-  set (path, content, cb) {
+  async set (path, content, cb) {
     cb = cb || function () { /* do nothing. */ }
     var unprefixedpath = this.removePrefix(path)
-    var exists = window.remixFileSystem.existsSync(unprefixedpath)
-    if (exists && window.remixFileSystem.readFileSync(unprefixedpath, 'utf8') === content) {
-      cb()
-      return true
-    }
-    if (!exists && unprefixedpath.indexOf('/') !== -1) {
-      // the last element is the filename and we should remove it
-      this.createDir(path.substr(0, path.lastIndexOf('/')))
+    const exists = await window.remixFileSystem.exists(unprefixedpath)
+    if (exists && await window.remixFileSystem.readFile(unprefixedpath, 'utf8') === content) {
+      if (cb) cb()
+      return null
     }
+    await this.createDir(path.substr(0, path.lastIndexOf('/')))
     try {
-      window.remixFileSystem.writeFileSync(unprefixedpath, content)
+      await window.remixFileSystem.writeFile(unprefixedpath, content, 'utf8')
     } catch (e) {
-      cb(e)
+      if (cb) cb(e)
       return false
     }
     if (!exists) {
@@ -120,84 +120,88 @@ class FileProvider {
     } else {
       this.event.emit('fileChanged', this._normalizePath(unprefixedpath))
     }
-    cb()
+    if (cb) cb()
     return true
   }
 
-  createDir (path, cb) {
+  async createDir (path, cb) {
     const unprefixedpath = this.removePrefix(path)
     const paths = unprefixedpath.split('/')
     if (paths.length && paths[0] === '') paths.shift()
     let currentCheck = ''
-    paths.forEach((value) => {
+    for (const value of paths) {
       currentCheck = currentCheck + '/' + value
-      if (!window.remixFileSystem.existsSync(currentCheck)) {
-        window.remixFileSystem.mkdirSync(currentCheck)
-        this.event.emit('folderAdded', this._normalizePath(currentCheck))
+      if (!await window.remixFileSystem.exists(currentCheck)) {
+        try {
+          await window.remixFileSystem.mkdir(currentCheck)
+        } catch (error) {
+          console.log(error)
+        }
       }
-    })
+    }
+    currentCheck = ''
+    for (const value of paths) {
+      currentCheck = currentCheck + '/' + value
+      this.event.emit('folderAdded', this._normalizePath(currentCheck))
+    }
     if (cb) cb()
   }
 
   // this will not add a folder as readonly but keep the original url to be able to restore it later
-  addExternal (path, content, url) {
+  async addExternal (path, content, url) {
     if (url) this.addNormalizedName(path, url)
-    return this.set(path, content)
+    return await this.set(path, content)
   }
 
   isReadOnly (path) {
     return false
   }
 
-  isDirectory (path) {
+  async isDirectory (path) {
     const unprefixedpath = this.removePrefix(path)
-
-    return path === this.type ? true : window.remixFileSystem.statSync(unprefixedpath).isDirectory()
+    return path === this.type ? true : (await window.remixFileSystem.stat(unprefixedpath)).isDirectory()
   }
 
-  isFile (path) {
+  async isFile (path) {
     path = this.getPathFromUrl(path) || path // ensure we actually use the normalized path from here
     path = this.removePrefix(path)
-    return window.remixFileSystem.statSync(path).isFile()
+    return (await window.remixFileSystem.stat(path)).isFile()
   }
 
   /**
    * Removes the folder recursively
    * @param {*} path is the folder to be removed
    */
-  remove (path) {
-    return new Promise((resolve, reject) => {
-      path = this.removePrefix(path)
-      if (window.remixFileSystem.existsSync(path)) {
-        const stat = window.remixFileSystem.statSync(path)
-        try {
-          if (!stat.isDirectory()) {
-            resolve(this.removeFile(path))
-          } else {
-            const items = window.remixFileSystem.readdirSync(path)
-            if (items.length !== 0) {
-              items.forEach((item, index) => {
-                const curPath = `${path}${path.endsWith('/') ? '' : '/'}${item}`
-                if (window.remixFileSystem.statSync(curPath).isDirectory()) { // delete folder
-                  this.remove(curPath)
-                } else { // delete file
-                  this.removeFile(curPath)
-                }
-              })
-              if (window.remixFileSystem.readdirSync(path).length === 0) window.remixFileSystem.rmdirSync(path, console.log)
-            } else {
-              // folder is empty
-              window.remixFileSystem.rmdirSync(path, console.log)
+  async remove (path) {
+    path = this.removePrefix(path)
+    if (await window.remixFileSystem.exists(path)) {
+      const stat = await window.remixFileSystem.stat(path)
+      try {
+        if (!stat.isDirectory()) {
+          return (this.removeFile(path))
+        } else {
+          const items = await window.remixFileSystem.readdir(path)
+          if (items.length !== 0) {
+            for (const item of items) {
+              const curPath = `${path}${path.endsWith('/') ? '' : '/'}${item}`
+              if ((await window.remixFileSystem.stat(curPath)).isDirectory()) { // delete folder
+                await this.remove(curPath)
+              } else { // delete file
+                await this.removeFile(curPath)
+              }
             }
-            this.event.emit('fileRemoved', this._normalizePath(path))
+            await window.remixFileSystem.rmdir(path)
+          } else {
+            // folder is empty
+            await window.remixFileSystem.rmdir(path)
           }
-        } catch (e) {
-          console.log(e)
-          return resolve(false)
+          this.event.emit('fileRemoved', this._normalizePath(path))
         }
+      } catch (e) {
+        console.log(e)
+        return false
       }
-      return resolve(true)
-    })
+    }
   }
 
   /**
@@ -206,36 +210,35 @@ class FileProvider {
    * @param {Function} visitFile is a function called for each visited files
    * @param {Function} visitFolder is a function called for each visited folders
    */
-  _copyFolderToJsonInternal (path, visitFile, visitFolder) {
+  async _copyFolderToJsonInternal (path, visitFile, visitFolder) {
     visitFile = visitFile || function () { /* do nothing. */ }
     visitFolder = visitFolder || function () { /* do nothing. */ }
-    return new Promise((resolve, reject) => {
-      const json = {}
-      path = this.removePrefix(path)
-      if (window.remixFileSystem.existsSync(path)) {
-        try {
-          const items = window.remixFileSystem.readdirSync(path)
-          visitFolder({ path })
-          if (items.length !== 0) {
-            items.forEach(async (item, index) => {
-              const file = {}
-              const curPath = `${path}${path.endsWith('/') ? '' : '/'}${item}`
-              if (window.remixFileSystem.statSync(curPath).isDirectory()) {
-                file.children = await this._copyFolderToJsonInternal(curPath, visitFile, visitFolder)
-              } else {
-                file.content = window.remixFileSystem.readFileSync(curPath, 'utf8')
-                visitFile({ path: curPath, content: file.content })
-              }
-              json[curPath] = file
-            })
+
+    const json = {}
+    path = this.removePrefix(path)
+    if (await window.remixFileSystem.exists(path)) {
+      try {
+        const items = await window.remixFileSystem.readdir(path)
+        visitFolder({ path })
+        if (items.length !== 0) {
+          for (const item of items) {
+            const file = {}
+            const curPath = `${path}${path.endsWith('/') ? '' : '/'}${item}`
+            if ((await window.remixFileSystem.stat(curPath)).isDirectory()) {
+              file.children = await this._copyFolderToJsonInternal(curPath, visitFile, visitFolder)
+            } else {
+              file.content = await window.remixFileSystem.readFile(curPath, 'utf8')
+              visitFile({ path: curPath, content: file.content })
+            }
+            json[curPath] = file
           }
-        } catch (e) {
-          console.log(e)
-          return reject(e)
         }
+      } catch (e) {
+        console.log(e)
+        throw new Error(e)
       }
-      return resolve(json)
-    })
+    }
+    return json
   }
 
   /**
@@ -244,26 +247,26 @@ class FileProvider {
    * @param {Function} visitFile is a function called for each visited files
    * @param {Function} visitFolder is a function called for each visited folders
    */
-  copyFolderToJson (path, visitFile, visitFolder) {
+  async copyFolderToJson (path, visitFile, visitFolder) {
     visitFile = visitFile || function () { /* do nothing. */ }
     visitFolder = visitFolder || function () { /* do nothing. */ }
-    return this._copyFolderToJsonInternal(path, visitFile, visitFolder)
+    return await this._copyFolderToJsonInternal(path, visitFile, visitFolder)
   }
 
-  removeFile (path) {
+  async removeFile (path) {
     path = this.removePrefix(path)
-    if (window.remixFileSystem.existsSync(path) && !window.remixFileSystem.statSync(path).isDirectory()) {
-      window.remixFileSystem.unlinkSync(path, console.log)
+    if (await window.remixFileSystem.exists(path) && !(await window.remixFileSystem.stat(path)).isDirectory()) {
+      await window.remixFileSystem.unlink(path)
       this.event.emit('fileRemoved', this._normalizePath(path))
       return true
     } else return false
   }
 
-  rename (oldPath, newPath, isFolder) {
+  async rename (oldPath, newPath, isFolder) {
     var unprefixedoldPath = this.removePrefix(oldPath)
     var unprefixednewPath = this.removePrefix(newPath)
-    if (this._exists(unprefixedoldPath)) {
-      window.remixFileSystem.renameSync(unprefixedoldPath, unprefixednewPath)
+    if (await this._exists(unprefixedoldPath)) {
+      await window.remixFileSystem.rename(unprefixedoldPath, unprefixednewPath)
       this.event.emit('fileRenamed',
         this._normalizePath(unprefixedoldPath),
         this._normalizePath(unprefixednewPath),
@@ -274,24 +277,26 @@ class FileProvider {
     return false
   }
 
-  resolveDirectory (path, callback) {
+  async resolveDirectory (path, cb) {
     path = this.removePrefix(path)
     if (path.indexOf('/') !== 0) path = '/' + path
-
-    window.remixFileSystem.readdir(path, (error, files) => {
-      var ret = {}
-
+    try {
+      const files = await window.remixFileSystem.readdir(path)
+      const ret = {}
       if (files) {
-        files.forEach(element => {
+        for (let element of files) {
           path = path.replace(/^\/|\/$/g, '') // remove first and last slash
           element = element.replace(/^\/|\/$/g, '') // remove first and last slash
           const absPath = (path === '/' ? '' : path) + '/' + element
-          ret[absPath.indexOf('/') === 0 ? absPath.substr(1, absPath.length) : absPath] = { isDirectory: window.remixFileSystem.statSync(absPath).isDirectory() }
+          ret[absPath.indexOf('/') === 0 ? absPath.substr(1, absPath.length) : absPath] = { isDirectory: (await window.remixFileSystem.stat(absPath)).isDirectory() }
           // ^ ret does not accept path starting with '/'
-        })
+        }
       }
-      callback(error, ret)
-    })
+      if (cb) cb(null, ret)
+      return ret
+    } catch (error) {
+      if (cb) cb(error, null)
+    }
   }
 
   removePrefix (path) {
diff --git a/apps/remix-ide/src/app/panels/tab-proxy.js b/apps/remix-ide/src/app/panels/tab-proxy.js
index aa33f4a5ca..1671648a36 100644
--- a/apps/remix-ide/src/app/panels/tab-proxy.js
+++ b/apps/remix-ide/src/app/panels/tab-proxy.js
@@ -1,9 +1,8 @@
 import React from 'react' // eslint-disable-line
 import { Plugin } from '@remixproject/engine'
 import { TabsUI } from '@remix-ui/tabs'
-import { PluginViewWrapper } from '@remix-ui/helper'
+import { PluginViewWrapper, getPathIcon } from '@remix-ui/helper'
 const EventEmitter = require('events')
-const helper = require('../../lib/helper')
 
 const profile = {
   name: 'tabs',
@@ -70,13 +69,13 @@ export class TabProxy extends Plugin {
           this.tabsApi.activateTab(workspacePath)
           return
         }
-        this.addTab(workspacePath, '', () => {
-          this.fileManager.open(file)
+        this.addTab(workspacePath, '', async () => {
+          await this.fileManager.open(file)
           this.event.emit('openFile', file)
           this.emit('openFile', file)
         },
-        () => {
-          this.fileManager.closeFile(file)
+        async () => {
+          await this.fileManager.closeFile(file)
           this.event.emit('closeFile', file)
           this.emit('closeFile', file)
         })
@@ -88,13 +87,13 @@ export class TabProxy extends Plugin {
           this.tabsApi.activateTab(path)
           return
         }
-        this.addTab(path, '', () => {
-          this.fileManager.open(file)
+        this.addTab(path, '', async () => {
+          await this.fileManager.open(file)
           this.event.emit('openFile', file)
           this.emit('openFile', file)
         },
-        () => {
-          this.fileManager.closeFile(file)
+        async () => {
+          await this.fileManager.closeFile(file)
           this.event.emit('closeFile', file)
           this.emit('closeFile', file)
         })
@@ -197,12 +196,12 @@ export class TabProxy extends Plugin {
   }
 
   renameTab (oldName, newName) {
-    this.addTab(newName, '', () => {
-      this.fileManager.open(newName)
+    this.addTab(newName, '', async () => {
+      await this.fileManager.open(newName)
       this.event.emit('openFile', newName)
     },
-    () => {
-      this.fileManager.closeFile(newName)
+    async () => {
+      await this.fileManager.closeFile(newName)
       this.event.emit('closeFile', newName)
       this.emit('closeFile', newName)
     })
@@ -231,7 +230,7 @@ export class TabProxy extends Plugin {
             title,
             icon,
             tooltip: name,
-            iconClass: helper.getPathIcon(name)
+            iconClass: getPathIcon(name)
           })
           formatPath.shift()
           if (formatPath.length > 0) {
@@ -247,7 +246,7 @@ export class TabProxy extends Plugin {
                 title: duplicateTabTitle,
                 icon,
                 tooltip: duplicateTabName,
-                iconClass: helper.getPathIcon(duplicateTabName)
+                iconClass: getPathIcon(duplicateTabName)
               }
             }
           }
@@ -261,7 +260,7 @@ export class TabProxy extends Plugin {
         title,
         icon,
         tooltip: name,
-        iconClass: helper.getPathIcon(name)
+        iconClass: getPathIcon(name)
       })
     }
 
diff --git a/apps/remix-ide/src/app/plugins/storage.ts b/apps/remix-ide/src/app/plugins/storage.ts
new file mode 100644
index 0000000000..2bf50fdb58
--- /dev/null
+++ b/apps/remix-ide/src/app/plugins/storage.ts
@@ -0,0 +1,22 @@
+import { Plugin } from '@remixproject/engine';
+
+const profile = {
+  name: 'storage',
+  displayName: 'Storage',
+  description: 'Storage',
+  methods: ['getStorage']
+};
+
+export class StoragePlugin extends Plugin {
+  constructor() {
+    super(profile);
+  }
+
+  async getStorage() {
+    if ('storage' in navigator && 'estimate' in navigator.storage) {
+        return  navigator.storage.estimate()
+    } else {
+        throw new Error("Can't get storage quota");
+    }
+  }
+}
diff --git a/apps/remix-ide/src/assets/js/init.js b/apps/remix-ide/src/assets/js/init.js
new file mode 100644
index 0000000000..f3cd64d79f
--- /dev/null
+++ b/apps/remix-ide/src/assets/js/init.js
@@ -0,0 +1,107 @@
+/* eslint-disable prefer-promise-reject-errors */
+function urlParams () {
+  var qs = window.location.hash.substr(1)
+
+  if (window.location.search.length > 0) {
+    // use legacy query params instead of hash
+    window.location.hash = window.location.search.substr(1)
+    window.location.search = ''
+  }
+
+  var params = {}
+  var parts = qs.split('&')
+  for (var x in parts) {
+    var keyValue = parts[x].split('=')
+    if (keyValue[0] !== '') {
+      params[keyValue[0]] = keyValue[1]
+    }
+  }
+  return params
+}
+const defaultVersion = '0.8.0'
+const versionToLoad = urlParams().appVersion ? urlParams().appVersion : defaultVersion
+
+const assets = {
+  '0.8.0': ['https://use.fontawesome.com/releases/v5.8.1/css/all.css', 'assets/css/pygment_trac.css'],
+  '0.7.7': ['assets/css/font-awesome.min.css', 'assets/css/pygment_trac.css']
+}
+const versions = {
+  '0.7.7': 'assets/js/0.7.7/app.js', // commit 7b5c7ae3de935e0ccc32eadfd83bf7349478491e
+  '0.8.0': 'main.js'
+}
+for (const k in assets[versionToLoad]) {
+  const app = document.createElement('link')
+  app.setAttribute('rel', 'stylesheet')
+  app.setAttribute('href', assets[versionToLoad][k])
+  if (assets[versionToLoad][k] === 'https://use.fontawesome.com/releases/v5.8.1/css/all.css') {
+    app.setAttribute('integrity', 'sha384-50oBUHEmvpQ+1lW4y57PTFmhCaXp0ML5d60M1M7uH2+nqUivzIebhndOJK28anvf')
+    app.setAttribute('crossorigin', 'anonymous')
+  }
+  document.head.appendChild(app)
+}
+
+window.onload = () => {
+  // eslint-disable-next-line no-undef
+  class RemixFileSystem extends LightningFS {
+    constructor (...t) {
+      super(...t)
+      this.addSlash = (file) => {
+        if (!file.startsWith('/')) file = '/' + file
+        return file
+      }
+      this.base = this.promises
+      this.promises = {
+        ...this.promises,
+
+        exists: async (path) => {
+          return new Promise((resolve, reject) => {
+            this.base.stat(this.addSlash(path)).then(() => resolve(true)).catch(() => resolve(false))
+          })
+        },
+        rmdir: async (path) => {
+          return this.base.rmdir(this.addSlash(path))
+        },
+        readdir: async (path) => {
+          return this.base.readdir(this.addSlash(path))
+        },
+        unlink: async (path) => {
+          return this.base.unlink(this.addSlash(path))
+        },
+        mkdir: async (path) => {
+          return this.base.mkdir(this.addSlash(path))
+        },
+        readFile: async (path, options) => {
+          return this.base.readFile(this.addSlash(path), options)
+        },
+        rename: async (from, to) => {
+          return this.base.rename(this.addSlash(from), this.addSlash(to))
+        },
+        writeFile: async (path, content, options) => {
+          return this.base.writeFile(this.addSlash(path), content, options)
+        },
+        stat: async (path) => {
+          return this.base.stat(this.addSlash(path))
+        }
+      }
+    }
+  }
+
+  function loadApp () {
+    const app = document.createElement('script')
+    app.setAttribute('src', versions[versionToLoad])
+    document.body.appendChild(app)
+  }
+
+  window.remixFileSystemCallback = new RemixFileSystem()
+  window.remixFileSystemCallback.init('RemixFileSystem').then(() => {
+    window.remixFileSystem = window.remixFileSystemCallback.promises
+    // check if .workspaces is present in indexeddb
+    window.remixFileSystem.stat('.workspaces').then((dir) => {
+      if (dir.isDirectory()) loadApp()
+    }).catch(() => {
+      // no indexeddb .workspaces -> run migration
+      // eslint-disable-next-line no-undef
+      migrateFilesFromLocalStorage(loadApp)
+    })
+  })
+}
diff --git a/apps/remix-ide/src/assets/js/lightning-fs.min.js b/apps/remix-ide/src/assets/js/lightning-fs.min.js
new file mode 100644
index 0000000000..a306197743
--- /dev/null
+++ b/apps/remix-ide/src/assets/js/lightning-fs.min.js
@@ -0,0 +1 @@
+!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define([],e):"object"==typeof exports?exports.LightningFS=e():t.LightningFS=e()}(self,function(){return function(t){var e={};function i(n){if(e[n])return e[n].exports;var s=e[n]={i:n,l:!1,exports:{}};return t[n].call(s.exports,s,s.exports,i),s.l=!0,s.exports}return i.m=t,i.c=e,i.d=function(t,e,n){i.o(t,e)||Object.defineProperty(t,e,{enumerable:!0,get:n})},i.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},i.t=function(t,e){if(1&e&&(t=i(t)),8&e)return t;if(4&e&&"object"==typeof t&&t&&t.__esModule)return t;var n=Object.create(null);if(i.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:t}),2&e&&"string"!=typeof t)for(var s in t)i.d(n,s,function(e){return t[e]}.bind(null,s));return n},i.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return i.d(e,"a",e),e},i.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},i.p="",i(i.s=3)}([function(t,e){function i(t){if(0===t.length)return".";let e=s(t);return e=e.reduce(r,[]),n(...e)}function n(...t){if(0===t.length)return"";let e=t.join("/");return e=e.replace(/\/{2,}/g,"/")}function s(t){if(0===t.length)return[];if("/"===t)return["/"];let e=t.split("/");return""===e[e.length-1]&&e.pop(),"/"===t[0]?e[0]="/":"."!==e[0]&&e.unshift("."),e}function r(t,e){if(0===t.length)return t.push(e),t;if("."===e)return t;if(".."===e){if(1===t.length){if("/"===t[0])throw new Error("Unable to normalize path - traverses above root directory");if("."===t[0])return t.push(e),t}return".."===t[t.length-1]?(t.push(".."),t):(t.pop(),t)}return t.push(e),t}t.exports={join:n,normalize:i,split:s,basename:function(t){if("/"===t)throw new Error(`Cannot get basename of "${t}"`);const e=t.lastIndexOf("/");return-1===e?t:t.slice(e+1)},dirname:function(t){const e=t.lastIndexOf("/");if(-1===e)throw new Error(`Cannot get dirname of "${t}"`);return 0===e?"/":t.slice(0,e)},resolve:function(...t){let e="";for(let s of t)e=s.startsWith("/")?s:i(n(e,s));return e}}},function(t,e){function i(t){return class extends Error{constructor(...e){super(...e),this.code=t,this.message?this.message=t+": "+this.message:this.message=t}}}const n=i("EEXIST"),s=i("ENOENT"),r=i("ENOTDIR"),o=i("ENOTEMPTY"),a=i("ETIMEDOUT");t.exports={EEXIST:n,ENOENT:s,ENOTDIR:r,ENOTEMPTY:o,ETIMEDOUT:a}},function(t,e,i){"use strict";i.r(e),i.d(e,"Store",function(){return n}),i.d(e,"get",function(){return o}),i.d(e,"set",function(){return a}),i.d(e,"update",function(){return h}),i.d(e,"del",function(){return c}),i.d(e,"clear",function(){return l}),i.d(e,"keys",function(){return u}),i.d(e,"close",function(){return d});class n{constructor(t="keyval-store",e="keyval"){this.storeName=e,this._dbName=t,this._storeName=e,this._init()}_init(){this._dbp||(this._dbp=new Promise((t,e)=>{const i=indexedDB.open(this._dbName);i.onerror=(()=>e(i.error)),i.onsuccess=(()=>t(i.result)),i.onupgradeneeded=(()=>{i.result.createObjectStore(this._storeName)})}))}_withIDBStore(t,e){return this._init(),this._dbp.then(i=>new Promise((n,s)=>{const r=i.transaction(this.storeName,t);r.oncomplete=(()=>n()),r.onabort=r.onerror=(()=>s(r.error)),e(r.objectStore(this.storeName))}))}_close(){return this._init(),this._dbp.then(t=>{t.close(),this._dbp=void 0})}}let s;function r(){return s||(s=new n),s}function o(t,e=r()){let i;return e._withIDBStore("readwrite",e=>{i=e.get(t)}).then(()=>i.result)}function a(t,e,i=r()){return i._withIDBStore("readwrite",i=>{i.put(e,t)})}function h(t,e,i=r()){return i._withIDBStore("readwrite",i=>{const n=i.get(t);n.onsuccess=(()=>{i.put(e(n.result),t)})})}function c(t,e=r()){return e._withIDBStore("readwrite",e=>{e.delete(t)})}function l(t=r()){return t._withIDBStore("readwrite",t=>{t.clear()})}function u(t=r()){const e=[];return t._withIDBStore("readwrite",t=>{(t.openKeyCursor||t.openCursor).call(t).onsuccess=function(){this.result&&(e.push(this.result.key),this.result.continue())}}).then(()=>e)}function d(t=r()){return t._close()}},function(t,e,i){const n=i(4),s=i(5);function r(t,e){"function"==typeof t&&(e=t);return[(...t)=>e(null,...t),e=n(e)]}t.exports=class{constructor(...t){this.promises=new s(...t),this.init=this.init.bind(this),this.readFile=this.readFile.bind(this),this.writeFile=this.writeFile.bind(this),this.unlink=this.unlink.bind(this),this.readdir=this.readdir.bind(this),this.mkdir=this.mkdir.bind(this),this.rmdir=this.rmdir.bind(this),this.rename=this.rename.bind(this),this.stat=this.stat.bind(this),this.lstat=this.lstat.bind(this),this.readlink=this.readlink.bind(this),this.symlink=this.symlink.bind(this),this.backFile=this.backFile.bind(this),this.du=this.du.bind(this)}init(t,e){return this.promises.init(t,e)}readFile(t,e,i){const[n,s]=r(e,i);this.promises.readFile(t,e).then(n).catch(s)}writeFile(t,e,i,n){const[s,o]=r(i,n);this.promises.writeFile(t,e,i).then(s).catch(o)}unlink(t,e,i){const[n,s]=r(e,i);this.promises.unlink(t,e).then(n).catch(s)}readdir(t,e,i){const[n,s]=r(e,i);this.promises.readdir(t,e).then(n).catch(s)}mkdir(t,e,i){const[n,s]=r(e,i);this.promises.mkdir(t,e).then(n).catch(s)}rmdir(t,e,i){const[n,s]=r(e,i);this.promises.rmdir(t,e).then(n).catch(s)}rename(t,e,i){const[n,s]=r(i);this.promises.rename(t,e).then(n).catch(s)}stat(t,e,i){const[n,s]=r(e,i);this.promises.stat(t).then(n).catch(s)}lstat(t,e,i){const[n,s]=r(e,i);this.promises.lstat(t).then(n).catch(s)}readlink(t,e,i){const[n,s]=r(e,i);this.promises.readlink(t).then(n).catch(s)}symlink(t,e,i){const[n,s]=r(i);this.promises.symlink(t,e).then(n).catch(s)}backFile(t,e,i){const[n,s]=r(e,i);this.promises.backFile(t,e).then(n).catch(s)}du(t,e){const[i,n]=r(e);this.promises.du(t).then(i).catch(n)}}},function(t,e){t.exports=function(t){var e,i;if("function"!=typeof t)throw new Error("expected a function but got "+t);return function(){return e?i:(e=!0,i=t.apply(this,arguments))}}},function(t,e,i){const n=i(6),s=i(16),r=i(0);function o(t,e,...i){return void 0!==e&&"function"!=typeof e||(e={}),"string"==typeof e&&(e={encoding:e}),[t=r.normalize(t),e,...i]}function a(t,e,i,...n){return void 0!==i&&"function"!=typeof i||(i={}),"string"==typeof i&&(i={encoding:i}),[t=r.normalize(t),e,i,...n]}function h(t,e,...i){return[r.normalize(t),r.normalize(e),...i]}t.exports=class{constructor(t,e={}){this.init=this.init.bind(this),this.readFile=this._wrap(this.readFile,o,!1),this.writeFile=this._wrap(this.writeFile,a,!0),this.unlink=this._wrap(this.unlink,o,!0),this.readdir=this._wrap(this.readdir,o,!1),this.mkdir=this._wrap(this.mkdir,o,!0),this.rmdir=this._wrap(this.rmdir,o,!0),this.rename=this._wrap(this.rename,h,!0),this.stat=this._wrap(this.stat,o,!1),this.lstat=this._wrap(this.lstat,o,!1),this.readlink=this._wrap(this.readlink,o,!1),this.symlink=this._wrap(this.symlink,h,!0),this.backFile=this._wrap(this.backFile,o,!0),this.du=this._wrap(this.du,o,!1),this._deactivationPromise=null,this._deactivationTimeout=null,this._activationPromise=null,this._operations=new Set,t&&this.init(t,e)}async init(...t){return this._initPromiseResolve&&await this._initPromise,this._initPromise=this._init(...t),this._initPromise}async _init(t,e={}){await this._gracefulShutdown(),this._activationPromise&&await this._deactivate(),this._backend&&this._backend.destroy&&await this._backend.destroy(),this._backend=e.backend||new n,this._backend.init&&await this._backend.init(t,e),this._initPromiseResolve&&(this._initPromiseResolve(),this._initPromiseResolve=null),e.defer||this.stat("/")}async _gracefulShutdown(){this._operations.size>0&&(this._isShuttingDown=!0,await new Promise(t=>this._gracefulShutdownResolve=t),this._isShuttingDown=!1,this._gracefulShutdownResolve=null)}_wrap(t,e,i){return async(...n)=>{n=e(...n);let s={name:t.name,args:n};this._operations.add(s);try{return await this._activate(),await t.apply(this,n)}finally{this._operations.delete(s),i&&this._backend.saveSuperblock(),0===this._operations.size&&(this._deactivationTimeout||clearTimeout(this._deactivationTimeout),this._deactivationTimeout=setTimeout(this._deactivate.bind(this),500))}}}async _activate(){this._initPromise||console.warn(new Error(`Attempted to use LightningFS ${this._name} before it was initialized.`)),await this._initPromise,this._deactivationTimeout&&(clearTimeout(this._deactivationTimeout),this._deactivationTimeout=null),this._deactivationPromise&&await this._deactivationPromise,this._deactivationPromise=null,this._activationPromise||(this._activationPromise=this._backend.activate?this._backend.activate():Promise.resolve()),await this._activationPromise}async _deactivate(){return this._activationPromise&&await this._activationPromise,this._deactivationPromise||(this._deactivationPromise=this._backend.deactivate?this._backend.deactivate():Promise.resolve()),this._activationPromise=null,this._gracefulShutdownResolve&&this._gracefulShutdownResolve(),this._deactivationPromise}async readFile(t,e){return this._backend.readFile(t,e)}async writeFile(t,e,i){return await this._backend.writeFile(t,e,i),null}async unlink(t,e){return await this._backend.unlink(t,e),null}async readdir(t,e){return this._backend.readdir(t,e)}async mkdir(t,e){return await this._backend.mkdir(t,e),null}async rmdir(t,e){return await this._backend.rmdir(t,e),null}async rename(t,e){return await this._backend.rename(t,e),null}async stat(t,e){const i=await this._backend.stat(t,e);return new s(i)}async lstat(t,e){const i=await this._backend.lstat(t,e);return new s(i)}async readlink(t,e){return this._backend.readlink(t,e)}async symlink(t,e){return await this._backend.symlink(t,e),null}async backFile(t,e){return await this._backend.backFile(t,e),null}async du(t){return this._backend.du(t)}}},function(t,e,i){const{encode:n,decode:s}=i(7),r=i(10),o=i(11),{ENOENT:a,ENOTEMPTY:h,ETIMEDOUT:c}=i(1),l=i(12),u=i(13),d=i(14),_=i(15),p=i(0);t.exports=class{constructor(){this.saveSuperblock=r(()=>{this._saveSuperblock()},500)}async init(t,{wipe:e,url:i,urlauto:n,fileDbName:s=t,fileStoreName:r=t+"_files",lockDbName:a=t+"_lock",lockStoreName:h=t+"_lock"}={}){this._name=t,this._idb=new l(s,r),this._mutex=navigator.locks?new _(t):new d(a,h),this._cache=new o(t),this._opts={wipe:e,url:i},this._needsWipe=!!e,i&&(this._http=new u(i),this._urlauto=!!n)}async activate(){if(this._cache.activated)return;this._needsWipe&&(this._needsWipe=!1,await this._idb.wipe(),await this._mutex.release({force:!0})),await this._mutex.has()||await this._mutex.wait();const t=await this._idb.loadSuperblock();if(t)this._cache.activate(t);else if(this._http){const t=await this._http.loadSuperblock();this._cache.activate(t),await this._saveSuperblock()}else this._cache.activate();if(!await this._mutex.has())throw new c}async deactivate(){await this._mutex.has()&&await this._saveSuperblock(),this._cache.deactivate();try{await this._mutex.release()}catch(t){console.log(t)}await this._idb.close()}async _saveSuperblock(){this._cache.activated&&(this._lastSavedAt=Date.now(),await this._idb.saveSuperblock(this._cache._root))}_writeStat(t,e,i){let n=p.split(p.dirname(t)),s=n.shift();for(let t of n){s=p.join(s,t);try{this._cache.mkdir(s,{mode:511})}catch(t){}}return this._cache.writeStat(t,e,i)}async readFile(t,e){const{encoding:i}=e;if(i&&"utf8"!==i)throw new Error('Only "utf8" encoding is supported in readFile');let n=null,r=null;try{r=this._cache.stat(t),n=await this._idb.readFile(r.ino)}catch(t){if(!this._urlauto)throw t}if(!n&&this._http){let e=this._cache.lstat(t);for(;"symlink"===e.type;)t=p.resolve(p.dirname(t),e.target),e=this._cache.lstat(t);n=await this._http.readFile(t)}if(n&&(r&&r.size==n.byteLength||(r=await this._writeStat(t,n.byteLength,{mode:r?r.mode:438}),this.saveSuperblock()),"utf8"===i&&(n=s(n))),!r)throw new a(t);return n}async writeFile(t,e,i){const{mode:s,encoding:r="utf8"}=i;if("string"==typeof e){if("utf8"!==r)throw new Error('Only "utf8" encoding is supported in writeFile');e=n(e)}const o=await this._cache.writeStat(t,e.byteLength,{mode:s});await this._idb.writeFile(o.ino,e)}async unlink(t,e){const i=this._cache.lstat(t);this._cache.unlink(t),"symlink"!==i.type&&await this._idb.unlink(i.ino)}readdir(t,e){return this._cache.readdir(t)}mkdir(t,e){const{mode:i=511}=e;this._cache.mkdir(t,{mode:i})}rmdir(t,e){if("/"===t)throw new h;this._cache.rmdir(t)}rename(t,e){this._cache.rename(t,e)}stat(t,e){return this._cache.stat(t)}lstat(t,e){return this._cache.lstat(t)}readlink(t,e){return this._cache.readlink(t)}symlink(t,e){this._cache.symlink(t,e)}async backFile(t,e){let i=await this._http.sizeFile(t);await this._writeStat(t,i,e)}du(t){return this._cache.du(t)}}},function(t,e,i){i(8),t.exports={encode:t=>(new TextEncoder).encode(t),decode:t=>(new TextDecoder).decode(t)}},function(t,e,i){(function(t){!function(t){function e(t){if("utf-8"!==(t=void 0===t?"utf-8":t))throw new RangeError("Failed to construct 'TextEncoder': The encoding label provided ('"+t+"') is invalid.")}function i(t,e){if(e=void 0===e?{fatal:!1}:e,"utf-8"!==(t=void 0===t?"utf-8":t))throw new RangeError("Failed to construct 'TextDecoder': The encoding label provided ('"+t+"') is invalid.");if(e.fatal)throw Error("Failed to construct 'TextDecoder': the 'fatal' option is unsupported.")}if(t.TextEncoder&&t.TextDecoder)return!1;Object.defineProperty(e.prototype,"encoding",{value:"utf-8"}),e.prototype.encode=function(t,e){if((e=void 0===e?{stream:!1}:e).stream)throw Error("Failed to encode: the 'stream' option is unsupported.");e=0;for(var i=t.length,n=0,s=Math.max(32,i+(i>>1)+7),r=new Uint8Array(s>>3<<3);e<i;){var o=t.charCodeAt(e++);if(55296<=o&&56319>=o){if(e<i){var a=t.charCodeAt(e);56320==(64512&a)&&(++e,o=((1023&o)<<10)+(1023&a)+65536)}if(55296<=o&&56319>=o)continue}if(n+4>r.length&&(s+=8,s=(s*=1+e/t.length*2)>>3<<3,(a=new Uint8Array(s)).set(r),r=a),0==(4294967168&o))r[n++]=o;else{if(0==(4294965248&o))r[n++]=o>>6&31|192;else if(0==(4294901760&o))r[n++]=o>>12&15|224,r[n++]=o>>6&63|128;else{if(0!=(4292870144&o))continue;r[n++]=o>>18&7|240,r[n++]=o>>12&63|128,r[n++]=o>>6&63|128}r[n++]=63&o|128}}return r.slice(0,n)},Object.defineProperty(i.prototype,"encoding",{value:"utf-8"}),Object.defineProperty(i.prototype,"fatal",{value:!1}),Object.defineProperty(i.prototype,"ignoreBOM",{value:!1}),i.prototype.decode=function(t,e){if((e=void 0===e?{stream:!1}:e).stream)throw Error("Failed to decode: the 'stream' option is unsupported.");e=0;for(var i=(t=new Uint8Array(t)).length,n=[];e<i;){var s=t[e++];if(0===s)break;if(0==(128&s))n.push(s);else if(192==(224&s)){var r=63&t[e++];n.push((31&s)<<6|r)}else if(224==(240&s)){r=63&t[e++];var o=63&t[e++];n.push((31&s)<<12|r<<6|o)}else if(240==(248&s)){65535<(s=(7&s)<<18|(r=63&t[e++])<<12|(o=63&t[e++])<<6|63&t[e++])&&(s-=65536,n.push(s>>>10&1023|55296),s=56320|1023&s),n.push(s)}}return String.fromCharCode.apply(null,n)},t.TextEncoder=e,t.TextDecoder=i}("undefined"!=typeof window?window:void 0!==t?t:this)}).call(this,i(9))},function(t,e){var i;i=function(){return this}();try{i=i||new Function("return this")()}catch(t){"object"==typeof window&&(i=window)}t.exports=i},function(t,e){t.exports=function(t,e,i){var n;return function(){if(!e)return t.apply(this,arguments);var s=this,r=arguments,o=i&&!n;return clearTimeout(n),n=setTimeout(function(){if(n=null,!o)return t.apply(s,r)},e),o?t.apply(this,arguments):void 0}}},function(t,e,i){const n=i(0),{EEXIST:s,ENOENT:r,ENOTDIR:o,ENOTEMPTY:a}=i(1),h=0;t.exports=class{constructor(){}_makeRoot(t=new Map){return t.set(h,{mode:511,type:"dir",size:0,ino:0,mtimeMs:Date.now()}),t}activate(t=null){this._root=null===t?new Map([["/",this._makeRoot()]]):"string"==typeof t?new Map([["/",this._makeRoot(this.parse(t))]]):t}get activated(){return!!this._root}deactivate(){this._root=void 0}size(){return this._countInodes(this._root.get("/"))-1}_countInodes(t){let e=1;for(let[i,n]of t)i!==h&&(e+=this._countInodes(n));return e}autoinc(){return this._maxInode(this._root.get("/"))+1}_maxInode(t){let e=t.get(h).ino;for(let[i,n]of t)i!==h&&(e=Math.max(e,this._maxInode(n)));return e}print(t=this._root.get("/")){let e="";const i=(t,n)=>{for(let[s,r]of t){if(0===s)continue;let t=r.get(h),o=t.mode.toString(8);e+=`${"\t".repeat(n)}${s}\t${o}`,"file"===t.type?e+=`\t${t.size}\t${t.mtimeMs}\n`:(e+="\n",i(r,n+1))}};return i(t,0),e}parse(t){let e=0;function i(t){const i=++e,n=1===t.length?"dir":"file";let[s,r,o]=t;return s=parseInt(s,8),r=r?parseInt(r):0,o=o?parseInt(o):Date.now(),new Map([[h,{mode:s,type:n,size:r,mtimeMs:o,ino:i}]])}let n=t.trim().split("\n"),s=this._makeRoot(),r=[{indent:-1,node:s},{indent:0,node:null}];for(let t of n){let e=t.match(/^\t*/)[0].length;t=t.slice(e);let[n,...s]=t.split("\t"),o=i(s);if(e<=r[r.length-1].indent)for(;e<=r[r.length-1].indent;)r.pop();r.push({indent:e,node:o}),r[r.length-2].node.set(n,o)}return s}_lookup(t,e=!0){let i=this._root,s="/",o=n.split(t);for(let a=0;a<o.length;++a){let c=o[a];if(!(i=i.get(c)))throw new r(t);if(e||a<o.length-1){const t=i.get(h);if("symlink"===t.type){let e=n.resolve(s,t.target);i=this._lookup(e)}s=s?n.join(s,c):c}}return i}mkdir(t,{mode:e}){if("/"===t)throw new s;let i=this._lookup(n.dirname(t)),r=n.basename(t);if(i.has(r))throw new s;let o=new Map,a={mode:e,type:"dir",size:0,mtimeMs:Date.now(),ino:this.autoinc()};o.set(h,a),i.set(r,o)}rmdir(t){let e=this._lookup(t);if("dir"!==e.get(h).type)throw new o;if(e.size>1)throw new a;let i=this._lookup(n.dirname(t)),s=n.basename(t);i.delete(s)}readdir(t){let e=this._lookup(t);if("dir"!==e.get(h).type)throw new o;return[...e.keys()].filter(t=>"string"==typeof t)}writeStat(t,e,{mode:i}){let s;try{let e=this.stat(t);null==i&&(i=e.mode),s=e.ino}catch(t){}null==i&&(i=438),null==s&&(s=this.autoinc());let r=this._lookup(n.dirname(t)),o=n.basename(t),a={mode:i,type:"file",size:e,mtimeMs:Date.now(),ino:s},c=new Map;return c.set(h,a),r.set(o,c),a}unlink(t){let e=this._lookup(n.dirname(t)),i=n.basename(t);e.delete(i)}rename(t,e){let i=n.basename(e),s=this._lookup(t);this._lookup(n.dirname(e)).set(i,s),this.unlink(t)}stat(t){return this._lookup(t).get(h)}lstat(t){return this._lookup(t,!1).get(h)}readlink(t){return this._lookup(t,!1).get(h).target}symlink(t,e){let i,s;try{let t=this.stat(e);null===s&&(s=t.mode),i=t.ino}catch(t){}null==s&&(s=40960),null==i&&(i=this.autoinc());let r=this._lookup(n.dirname(e)),o=n.basename(e),a={mode:s,type:"symlink",target:t,size:0,mtimeMs:Date.now(),ino:i},c=new Map;return c.set(h,a),r.set(o,c),a}_du(t){let e=0;for(const[i,n]of t.entries())e+=i===h?n.size:this._du(n);return e}du(t){let e=this._lookup(t);return this._du(e)}}},function(t,e,i){const n=i(2);t.exports=class{constructor(t,e){this._database=t,this._storename=e,this._store=new n.Store(this._database,this._storename)}saveSuperblock(t){return n.set("!root",t,this._store)}loadSuperblock(){return n.get("!root",this._store)}readFile(t){return n.get(t,this._store)}writeFile(t,e){return n.set(t,e,this._store)}unlink(t){return n.del(t,this._store)}wipe(){return n.clear(this._store)}close(){return n.close(this._store)}}},function(t,e){t.exports=class{constructor(t){this._url=t}loadSuperblock(){return fetch(this._url+"/.superblock.txt").then(t=>t.ok?t.text():null)}async readFile(t){const e=await fetch(this._url+t);if(200===e.status)return e.arrayBuffer();throw new Error("ENOENT")}async sizeFile(t){const e=await fetch(this._url+t,{method:"HEAD"});if(200===e.status)return e.headers.get("content-length");throw new Error("ENOENT")}}},function(t,e,i){const n=i(2),s=t=>new Promise(e=>setTimeout(e,t));t.exports=class{constructor(t,e){this._id=Math.random(),this._database=t,this._storename=e,this._store=new n.Store(this._database,this._storename),this._lock=null}async has({margin:t=2e3}={}){if(this._lock&&this._lock.holder===this._id){const e=Date.now();return this._lock.expires>e+t||await this.renew()}return!1}async renew({ttl:t=5e3}={}){let e;return await n.update("lock",i=>{const n=Date.now()+t;return e=i&&i.holder===this._id,this._lock=e?{holder:this._id,expires:n}:i,this._lock},this._store),e}async acquire({ttl:t=5e3}={}){let e,i,s;if(await n.update("lock",n=>{const r=Date.now(),o=r+t;return i=n&&n.expires<r,e=void 0===n||i,s=n&&n.holder===this._id,this._lock=e?{holder:this._id,expires:o}:n,this._lock},this._store),s)throw new Error("Mutex double-locked");return e}async wait({interval:t=100,limit:e=6e3,ttl:i}={}){for(;e--;){if(await this.acquire({ttl:i}))return!0;await s(t)}throw new Error("Mutex timeout")}async release({force:t=!1}={}){let e,i,s;if(await n.update("lock",n=>(e=t||n&&n.holder===this._id,i=void 0===n,s=n&&n.holder!==this._id,this._lock=e?void 0:n,this._lock),this._store),await n.close(this._store),!e&&!t){if(i)throw new Error("Mutex double-freed");if(s)throw new Error("Mutex lost ownership")}return e}}},function(t,e){t.exports=class{constructor(t){this._id=Math.random(),this._database=t,this._has=!1,this._release=null}async has(){return this._has}async acquire(){return new Promise(t=>{navigator.locks.request(this._database+"_lock",{ifAvailable:!0},e=>(this._has=!!e,t(!!e),new Promise(t=>{this._release=t})))})}async wait({timeout:t=6e5}={}){return new Promise((e,i)=>{const n=new AbortController;setTimeout(()=>{n.abort(),i(new Error("Mutex timeout"))},t),navigator.locks.request(this._database+"_lock",{signal:n.signal},t=>(this._has=!!t,e(!!t),new Promise(t=>{this._release=t})))})}async release({force:t=!1}={}){this._has=!1,this._release?this._release():t&&navigator.locks.request(this._database+"_lock",{steal:!0},t=>!0)}}},function(t,e){t.exports=class{constructor(t){this.type=t.type,this.mode=t.mode,this.size=t.size,this.ino=t.ino,this.mtimeMs=t.mtimeMs,this.ctimeMs=t.ctimeMs||t.mtimeMs,this.uid=1,this.gid=1,this.dev=1}isFile(){return"file"===this.type}isDirectory(){return"dir"===this.type}isSymbolicLink(){return"symlink"===this.type}}}])});
\ No newline at end of file
diff --git a/apps/remix-ide/src/assets/js/migrate.js b/apps/remix-ide/src/assets/js/migrate.js
new file mode 100644
index 0000000000..1de4cd0cb1
--- /dev/null
+++ b/apps/remix-ide/src/assets/js/migrate.js
@@ -0,0 +1,139 @@
+// eslint-disable-next-line no-unused-vars
+async function migrateFilesFromLocalStorage (cb) {
+  let testmigration = false // migration loads test data into localstorage with browserfs
+  // indexeddb will be empty by this point, so there is no danger but do a check for the origin to load test data so it runs only locally
+  testmigration = window.location.hash.includes('e2e_testmigration=true') && window.location.host === '127.0.0.1:8080' && window.location.protocol === 'http:'
+  // eslint-disable-next-line no-undef
+  BrowserFS.install(window)
+  // eslint-disable-next-line no-undef
+  BrowserFS.configure({
+    fs: 'LocalStorage'
+  }, async function (e) {
+    if (e) console.log(e)
+
+    const browserFS = window.require('fs')
+
+    /**
+      * copy the folder recursively (internal use)
+      * @param {string} path is the folder to be copied over
+      * @param {Function} visitFile is a function called for each visited files
+      * @param {Function} visitFolder is a function called for each visited folders
+      */
+    async function _copyFolderToJsonInternal (path, visitFile, visitFolder, fs) {
+      visitFile = visitFile || (() => { })
+      visitFolder = visitFolder || (() => { })
+      return new Promise((resolve, reject) => {
+        const json = {}
+        if (fs.existsSync(path)) {
+          try {
+            const items = fs.readdirSync(path)
+            visitFolder({ path })
+            if (items.length !== 0) {
+              items.forEach(async (item, index) => {
+                const file = {}
+                const curPath = `${path}${path.endsWith('/') ? '' : '/'}${item}`
+                if (fs.statSync(curPath).isDirectory()) {
+                  file.children = await _copyFolderToJsonInternal(curPath, visitFile, visitFolder, fs)
+                } else {
+                  file.content = fs.readFileSync(curPath, 'utf8')
+                  visitFile({ path: curPath, content: file.content })
+                }
+                json[curPath] = file
+              })
+            }
+          } catch (e) {
+            console.log(e)
+            return reject(e)
+          }
+        }
+        return resolve(json)
+      })
+    }
+
+    /**
+       * copy the folder recursively
+       * @param {string} path is the folder to be copied over
+       * @param {Function} visitFile is a function called for each visited files
+       * @param {Function} visitFolder is a function called for each visited folders
+       */
+    async function copyFolderToJson (path, visitFile, visitFolder, fs) {
+      visitFile = visitFile || (() => { })
+      visitFolder = visitFolder || (() => { })
+      return _copyFolderToJsonInternal(path, visitFile, visitFolder, fs)
+    }
+
+    const populateWorkspace = async (json, fs) => {
+      for (const item in json) {
+        const isFolder = json[item].content === undefined
+        if (isFolder) {
+          await createDir(item, fs)
+          await populateWorkspace(json[item].children, fs)
+        } else {
+          try {
+            await fs.writeFile(item, json[item].content, 'utf8')
+          } catch (error) {
+            console.log(error)
+          }
+        }
+      }
+    }
+
+    const createDir = async (path, fs) => {
+      const paths = path.split('/')
+      if (paths.length && paths[0] === '') paths.shift()
+      let currentCheck = ''
+      for (const value of paths) {
+        currentCheck = currentCheck + (currentCheck ? '/' : '') + value
+        if (!await fs.exists(currentCheck)) {
+          try {
+            await fs.mkdir(currentCheck)
+          } catch (error) {
+            console.log(error)
+          }
+        }
+      }
+    }
+    //
+    if (testmigration) await populateWorkspace(testData, browserFS)
+    const files = await copyFolderToJson('/', null, null, browserFS)
+    await populateWorkspace(files, window.remixFileSystem)
+    // eslint-disable-next-line no-undef
+    if (cb) cb()
+  })
+}
+
+/* eslint-disable no-template-curly-in-string */
+const testData = {
+  '.workspaces': {
+    children: {
+      '.workspaces/default_workspace': {
+        children: {
+          '.workspaces/default_workspace/README.txt': {
+            content: 'TEST README'
+          }
+        }
+      },
+      '.workspaces/workspace_test': {
+        children: {
+          '.workspaces/workspace_test/TEST_README.txt': {
+            content: 'TEST README'
+          },
+          '.workspaces/workspace_test/test_contracts': {
+            children: {
+              '.workspaces/workspace_test/test_contracts/1_Storage.sol': {
+                content: 'testing'
+              },
+              '.workspaces/workspace_test/test_contracts/artifacts': {
+                children: {
+                  '.workspaces/workspace_test/test_contracts/artifacts/Storage_metadata.json': {
+                    content: '{ "test": "data" }'
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/apps/remix-ide/src/index.html b/apps/remix-ide/src/index.html
index 94bb974028..3587ad1233 100644
--- a/apps/remix-ide/src/index.html
+++ b/apps/remix-ide/src/index.html
@@ -28,6 +28,8 @@
 		<link rel="icon" type="x-icon" href="assets/img/icon.png">
 		<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/intro.js/4.1.0/introjs.min.css"> 
 		<script src="assets/js/browserfs.min.js"></script>
+		<script src="assets/js/migrate.js"></script>
+		<script src="assets/js/lightning-fs.min.js"></script>
 		<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
 		<!-- Matomo -->
 		<script type="text/javascript">
@@ -57,60 +59,7 @@
 	</head>
 	<body>
 		<div id="root"></div>
-		<script>
-			function  urlParams () {
-				var qs = window.location.hash.substr(1)
-
-				if (window.location.search.length > 0) {
-					// use legacy query params instead of hash
-					window.location.hash = window.location.search.substr(1)
-					window.location.search = ''
-				}
-
-				var params = {}
-				var parts = qs.split('&')
-				for (var x in parts) {
-					var keyValue = parts[x].split('=')
-					if (keyValue[0] !== '') {
-						params[keyValue[0]] = keyValue[1]
-					}
-				}
-				return params
-			}
-			const defaultVersion = '0.8.0'
-			let versionToLoad = urlParams().appVersion ? urlParams().appVersion : defaultVersion
-                
-			let assets = {
-				'0.8.0': ['https://use.fontawesome.com/releases/v5.8.1/css/all.css', 'assets/css/pygment_trac.css'],
-				'0.7.7': ['assets/css/font-awesome.min.css', 'assets/css/pygment_trac.css']
-			}
-			let versions = {
-				'0.7.7': 'assets/js/0.7.7/app.js', // commit 7b5c7ae3de935e0ccc32eadfd83bf7349478491e
-				'0.8.0': 'main.js'
-			}
-			for (let k in assets[versionToLoad]) {
-				let app = document.createElement('link')
-				app.setAttribute('rel', 'stylesheet')
-				app.setAttribute('href', assets[versionToLoad][k])
-				if (assets[versionToLoad][k] === 'https://use.fontawesome.com/releases/v5.8.1/css/all.css') {
-					app.setAttribute('integrity', 'sha384-50oBUHEmvpQ+1lW4y57PTFmhCaXp0ML5d60M1M7uH2+nqUivzIebhndOJK28anvf')
-					app.setAttribute('crossorigin', 'anonymous')
-				}
-				document.head.appendChild(app)
-			}
-			window.onload = () => {
-				BrowserFS.install(window)
-				BrowserFS.configure({
-					fs: "LocalStorage"
-				}, function(e) {
-					if (e) console.log(e)
-					let app = document.createElement('script')
-					app.setAttribute('src', versions[versionToLoad])
-					document.body.appendChild(app)
-					window.remixFileSystem = require('fs')
-				})
-			}
-		</script>
+		<script type="text/javascript" src="assets/js/init.js"></script>
 		<script src="runtime.js" type="module"></script>
 		<script src="polyfills.js" type="module"></script>
 		<script src="vendor.js" type="module"></script>
diff --git a/apps/remix-ide/src/lib/helper.js b/apps/remix-ide/src/lib/helper.js
index 8f0640544c..84007aef11 100644
--- a/apps/remix-ide/src/lib/helper.js
+++ b/apps/remix-ide/src/lib/helper.js
@@ -64,7 +64,6 @@ module.exports = {
 
     do {
       const isDuplicate = await fileManager.exists(name + counter + prefix + '.' + ext)
-
       if (isDuplicate) counter = (counter | 0) + 1
       else exist = false
     } while (exist)
diff --git a/apps/remix-ide/src/production.index.html b/apps/remix-ide/src/production.index.html
index e5f1f7f146..49be2d6018 100644
--- a/apps/remix-ide/src/production.index.html
+++ b/apps/remix-ide/src/production.index.html
@@ -28,6 +28,8 @@
 		<link rel="icon" type="x-icon" href="assets/img/icon.png">
 		<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/intro.js/4.1.0/introjs.min.css"> 
 		<script src="assets/js/browserfs.min.js"></script>
+		<script src="assets/js/migrate.js"></script>
+		<script src="assets/js/lightning-fs.min.js"></script>
 		<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
 		<!-- Matomo -->
 		<script type="text/javascript">
@@ -57,60 +59,7 @@
 	</head>
 	<body>
 		<div id="root"></div>
-		<script>
-			function  urlParams () {
-				var qs = window.location.hash.substr(1)
-
-				if (window.location.search.length > 0) {
-					// use legacy query params instead of hash
-					window.location.hash = window.location.search.substr(1)
-					window.location.search = ''
-				}
-
-				var params = {}
-				var parts = qs.split('&')
-				for (var x in parts) {
-					var keyValue = parts[x].split('=')
-					if (keyValue[0] !== '') {
-						params[keyValue[0]] = keyValue[1]
-					}
-				}
-				return params
-			}
-			const defaultVersion = '0.8.0'
-			let versionToLoad = urlParams().appVersion ? urlParams().appVersion : defaultVersion
-                
-			let assets = {
-				'0.8.0': ['https://use.fontawesome.com/releases/v5.8.1/css/all.css', 'assets/css/pygment_trac.css'],
-				'0.7.7': ['assets/css/font-awesome.min.css', 'assets/css/pygment_trac.css']
-			}
-			let versions = {
-				'0.7.7': 'assets/js/0.7.7/app.js', // commit 7b5c7ae3de935e0ccc32eadfd83bf7349478491e
-				'0.8.0': 'main.js'
-			}
-			for (let k in assets[versionToLoad]) {
-				let app = document.createElement('link')
-				app.setAttribute('rel', 'stylesheet')
-				app.setAttribute('href', assets[versionToLoad][k])
-				if (assets[versionToLoad][k] === 'https://use.fontawesome.com/releases/v5.8.1/css/all.css') {
-					app.setAttribute('integrity', 'sha384-50oBUHEmvpQ+1lW4y57PTFmhCaXp0ML5d60M1M7uH2+nqUivzIebhndOJK28anvf')
-					app.setAttribute('crossorigin', 'anonymous')
-				}
-				document.head.appendChild(app)
-			}
-			window.onload = () => {
-				BrowserFS.install(window)
-				BrowserFS.configure({
-					fs: "LocalStorage"
-				}, function(e) {
-					if (e) console.log(e)
-					let app = document.createElement('script')
-					app.setAttribute('src', versions[versionToLoad])
-					document.body.appendChild(app)
-					window.remixFileSystem = require('fs')
-				})
-			}
-		</script>
+		<script type="text/javascript" src="assets/js/init.js"></script>
 		<script src="polyfills.js" type="module"></script>
 		<script src="https://kit.fontawesome.com/41dd021e94.js" crossorigin="anonymous"></script>
 		<script type="text/javascript" src="assets/js/intro.min.js"></script>
diff --git a/apps/remix-ide/src/remixAppManager.js b/apps/remix-ide/src/remixAppManager.js
index 39e1c3c413..ce7ea97b27 100644
--- a/apps/remix-ide/src/remixAppManager.js
+++ b/apps/remix-ide/src/remixAppManager.js
@@ -7,7 +7,7 @@ const _paq = window._paq = window._paq || []
 const requiredModules = [ // services + layout views + system views
   'manager', 'config', 'compilerArtefacts', 'compilerMetadata', 'contextualListener', 'editor', 'offsetToLineColumnConverter', 'network', 'theme',
   'fileManager', 'contentImport', 'blockchain', 'web3Provider', 'scriptRunner', 'fetchAndCompile', 'mainPanel', 'hiddenPanel', 'sidePanel', 'menuicons',
-  'filePanel', 'terminal', 'settings', 'pluginManager', 'tabs', 'udapp', 'dGitProvider', 'solidity-logic', 'gistHandler', 'layout', 'notification', 'permissionhandler', 'walkthrough']
+  'filePanel', 'terminal', 'settings', 'pluginManager', 'tabs', 'udapp', 'dGitProvider', 'solidity-logic', 'gistHandler', 'layout', 'notification', 'permissionhandler', 'walkthrough', 'storage']
 
 const dependentModules = ['git', 'hardhat', 'slither'] // module which shouldn't be manually activated (e.g git is activated by remixd)
 
diff --git a/libs/remix-core-plugin/src/lib/compiler-content-imports.ts b/libs/remix-core-plugin/src/lib/compiler-content-imports.ts
index 4620e2de73..2b88d26064 100644
--- a/libs/remix-core-plugin/src/lib/compiler-content-imports.ts
+++ b/libs/remix-core-plugin/src/lib/compiler-content-imports.ts
@@ -103,7 +103,7 @@ export class CompilerImports extends Plugin {
           try {
             const provider = await this.call('fileManager', 'getProviderOf', null)
             const path = targetPath || type + '/' + cleanUrl
-            if (provider) provider.addExternal('.deps/' + path, content, url)
+            if (provider) await provider.addExternal('.deps/' + path, content, url)
           } catch (err) {
             console.error(err)
           }
diff --git a/libs/remix-debug/src/debugger/stepManager.ts b/libs/remix-debug/src/debugger/stepManager.ts
index 8c7590857b..1a64977e97 100644
--- a/libs/remix-debug/src/debugger/stepManager.ts
+++ b/libs/remix-debug/src/debugger/stepManager.ts
@@ -82,7 +82,6 @@ export class DebuggerStepManager {
       }
 
       const jumpOutDisabled = (step === this.traceManager.findStepOut(step))
-
       this.event.trigger('stepChanged', [step, stepState, jumpOutDisabled])
     })
   }
diff --git a/libs/remix-ui/debugger-ui/src/lib/debugger-ui.tsx b/libs/remix-ui/debugger-ui/src/lib/debugger-ui.tsx
index 5bd2a9a2c9..a9a8200e9b 100644
--- a/libs/remix-ui/debugger-ui/src/lib/debugger-ui.tsx
+++ b/libs/remix-ui/debugger-ui/src/lib/debugger-ui.tsx
@@ -230,6 +230,7 @@ export const DebuggerUI = (props: DebuggerUIProps) => {
       debugWithGeneratedSources: state.opt.debugWithGeneratedSources
     })
 
+    setTimeout(async() => {
     try {
       await debuggerInstance.debug(blockNumber, txNumber, tx, () => {
         listenToEvents(debuggerInstance, currentReceipt)
@@ -257,6 +258,7 @@ export const DebuggerUI = (props: DebuggerUIProps) => {
         }
       })
     }
+  }, 300)
   }
 
   const debug = (txHash, web3?) => {
diff --git a/libs/remix-ui/run-tab/src/lib/actions/index.ts b/libs/remix-ui/run-tab/src/lib/actions/index.ts
index 95ef6f8a76..18635bb1d7 100644
--- a/libs/remix-ui/run-tab/src/lib/actions/index.ts
+++ b/libs/remix-ui/run-tab/src/lib/actions/index.ts
@@ -636,13 +636,13 @@ export const runTransactions = (
   )
 }
 
-const saveScenario = (newPath: string, provider, promptCb, cb) => {
+const saveScenario = async (newPath: string, provider, promptCb, cb) => {
   const txJSON = JSON.stringify(plugin.recorder.getAll(), null, 2)
 
-  promptCb(() => {
+  promptCb(async () => {
     try {
-      if (!provider.set(newPath, txJSON)) return cb('Failed to create file ' + newPath)
-      plugin.fileManager.open(newPath)
+      await provider.set(newPath, txJSON)
+      await plugin.fileManager.open(newPath)
     } catch (error) {
       if (error) return cb('Failed to create file. ' + newPath + ' ' + error)
     }
@@ -651,7 +651,7 @@ const saveScenario = (newPath: string, provider, promptCb, cb) => {
 
 export const storeScenario = async (prompt: (msg: string, defaultValue: string) => JSX.Element) => {
   const path = plugin.fileManager.currentPath()
-  const fileProvider = plugin.fileManager.fileProviderOf(path)
+  const fileProvider = await plugin.fileManager.fileProviderOf(path)
 
   if (!fileProvider) return displayNotification('Alert', 'Invalid File Provider', 'OK', null)
   const newPath = await createNonClashingNameAsync(path + '/' + plugin.REACT_API.recorder.pathToScenario, plugin.fileManager)
diff --git a/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx b/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx
index 434309e790..9555cd12cc 100644
--- a/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx
+++ b/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx
@@ -74,7 +74,7 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
           const params = api.getCompilerParameters()
           const optimize = params.optimize
           const runs = params.runs as string
-          const evmVersion = params.evmVersion
+          const evmVersion = compileTabLogic.evmVersions.includes(params.evmVersion) ? params.evmVersion : 'default'
           const language = getValidLanguage(params.language)
 
           return {
@@ -547,16 +547,7 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
           <div className="mb-2">
             <label className="remixui_compilerLabel form-check-label" htmlFor="evmVersionSelector">EVM Version</label>
             <select value={state.evmVersion} onChange={(e) => handleEvmVersionChange(e.target.value)} className="custom-select" id="evmVersionSelector">
-              <option data-id={state.evmVersion === 'default' ? 'selected' : ''} value="default">compiler default</option>
-              <option data-id={state.evmVersion === 'london' ? 'selected' : ''} value="london">london</option>
-              <option data-id={state.evmVersion === 'berlin' ? 'selected' : ''} value="berlin">berlin</option>
-              <option data-id={state.evmVersion === 'istanbul' ? 'selected' : ''} value="istanbul">istanbul</option>
-              <option data-id={state.evmVersion === 'petersburg' ? 'selected' : ''} value="petersburg">petersburg</option>
-              <option data-id={state.evmVersion === 'constantinople' ? 'selected' : ''} value="constantinople">constantinople</option>
-              <option data-id={state.evmVersion === 'byzantium' ? 'selected' : ''} value="byzantium">byzantium</option>
-              <option data-id={state.evmVersion === 'spuriousDragon' ? 'selected' : ''} value="spuriousDragon">spuriousDragon</option>
-              <option data-id={state.evmVersion === 'tangerineWhistle' ? 'selected' : ''} value="tangerineWhistle">tangerineWhistle</option>
-              <option data-id={state.evmVersion === 'homestead' ? 'selected' : ''} value="homestead">homestead</option>
+              {compileTabLogic.evmVersions.map((version) => (<option data-id={state.evmVersion === version ? 'selected' : ''} value={version}>{version}</option>))}
             </select>
           </div>
           <div className="mt-3">
diff --git a/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts b/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts
index 368a5e1875..631d4c7949 100644
--- a/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts
+++ b/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts
@@ -17,10 +17,12 @@ export class CompileTabLogic {
   public language: string
   public compilerImport
   public event
+  public evmVersions: Array<string>
 
   constructor (public api: ICompilerApi, public contentImport) {
     this.event = new EventEmitter()
     this.compiler = new Compiler((url, cb) => api.resolveContentAndSave(url).then((result) => cb(null, result)).catch((error) => cb(error.message)))
+    this.evmVersions = ['default', 'london', 'istanbul', 'petersburg', 'constantinople', 'byzantium', 'spuriousDragon', 'tangerineWhistle', 'homestead']
   }
 
   init () {
@@ -34,8 +36,12 @@ export class CompileTabLogic {
     this.compiler.set('runs', this.runs)
 
     this.evmVersion = this.api.getCompilerParameters().evmVersion
-    if (this.evmVersion === 'undefined' || this.evmVersion === 'null' || !this.evmVersion) {
-      this.evmVersion = null
+    if (
+      this.evmVersion === 'undefined' || 
+      this.evmVersion === 'null' || 
+      !this.evmVersion || 
+      !this.evmVersions.includes(this.evmVersion)) {
+        this.evmVersion = null
     }
     this.api.setCompilerParameters({ evmVersion: this.evmVersion })
     this.compiler.set('evmVersion', this.evmVersion)
diff --git a/libs/remix-ui/solidity-unit-testing/src/lib/logic/testTabLogic.ts b/libs/remix-ui/solidity-unit-testing/src/lib/logic/testTabLogic.ts
index 87a6f33d80..6179adb62c 100644
--- a/libs/remix-ui/solidity-unit-testing/src/lib/logic/testTabLogic.ts
+++ b/libs/remix-ui/solidity-unit-testing/src/lib/logic/testTabLogic.ts
@@ -38,20 +38,23 @@ export class TestTabLogic {
     }
 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    generateTestFile (errorCb:any) {
+    async generateTestFile (errorCb:any) {
         let fileName = this.fileManager.currentFile()
         const hasCurrent = !!fileName && this.fileManager.currentFile().split('.').pop().toLowerCase() === 'sol'
         if (!hasCurrent) fileName = this.currentPath + '/newFile.sol'
-        const fileProvider = this.fileManager.fileProviderOf(this.currentPath)
+        const fileProvider = await this.fileManager.fileProviderOf(this.currentPath)
         if (!fileProvider) return
         const splittedFileName = fileName.split('/')
         const fileNameToImport = (!hasCurrent) ? fileName : this.currentPath + '/' + splittedFileName[splittedFileName.length - 1]
-        this.helper.createNonClashingNameWithPrefix(fileNameToImport, fileProvider, '_test', (error: Error, newFile: string) => {
+        this.helper.createNonClashingNameWithPrefix(fileNameToImport, fileProvider, '_test', async (error: Error, newFile: string) => {
             if (error) return errorCb('Failed to create file. ' + newFile + ' ' + error)
-            const isFileCreated = fileProvider.set(newFile, this.generateTestContractSample(hasCurrent, fileName))
-            if (!isFileCreated) return errorCb('Failed to create test file ' + newFile)
-            this.fileManager.open(newFile)
-            this.fileManager.syncEditor(newFile)
+            try{
+                await fileProvider.set(newFile, this.generateTestContractSample(hasCurrent, fileName))
+                await this.fileManager.open(newFile)
+                await this.fileManager.syncEditor(newFile)
+            }catch(e){
+                return errorCb('Failed to create test file ' + newFile)
+            }
         })
     }
 
diff --git a/libs/remix-ui/solidity-unit-testing/src/lib/solidity-unit-testing.tsx b/libs/remix-ui/solidity-unit-testing/src/lib/solidity-unit-testing.tsx
index 36cd05b73c..30f1b2e0df 100644
--- a/libs/remix-ui/solidity-unit-testing/src/lib/solidity-unit-testing.tsx
+++ b/libs/remix-ui/solidity-unit-testing/src/lib/solidity-unit-testing.tsx
@@ -680,7 +680,7 @@ export const SolidityUnitTesting = (props: Record<string, any>) => { // eslint-d
             title="Generate sample test file."
             disabled={disableGenerateButton}
             onClick={async () => {
-              testTabLogic.generateTestFile((err:any) => { if (err) setToasterMsg(err)}) // eslint-disable-line @typescript-eslint/no-explicit-any
+              await testTabLogic.generateTestFile((err:any) => { if (err) setToasterMsg(err)}) // eslint-disable-line @typescript-eslint/no-explicit-any
               await updateForNewCurrent()
             }}
           >
diff --git a/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx b/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx
index 2af2d6de64..f5a2a8868a 100644
--- a/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx
+++ b/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx
@@ -142,7 +142,6 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
       if (cb) cb()
       return
     }
-
     provider.get(file, (error, content) => {
       console.log({ content })
       if (error) {
diff --git a/libs/remix-ui/workspace/src/lib/actions/events.ts b/libs/remix-ui/workspace/src/lib/actions/events.ts
index 7ea0b03053..ffd7c9e05a 100644
--- a/libs/remix-ui/workspace/src/lib/actions/events.ts
+++ b/libs/remix-ui/workspace/src/lib/actions/events.ts
@@ -154,7 +154,6 @@ const folderAdded = async (folderPath: string) => {
   const promise = new Promise((resolve) => {
     provider.resolveDirectory(path, (error, fileTree) => {
       if (error) console.error(error)
-
       resolve(fileTree)
     })
   })
diff --git a/libs/remix-ui/workspace/src/lib/actions/index.ts b/libs/remix-ui/workspace/src/lib/actions/index.ts
index 606c85fe6f..ae248d6fa8 100644
--- a/libs/remix-ui/workspace/src/lib/actions/index.ts
+++ b/libs/remix-ui/workspace/src/lib/actions/index.ts
@@ -42,7 +42,7 @@ export const initWorkspace = (filePanelPlugin) => async (reducerDispatch: React.
       plugin.setWorkspace({ name: 'code-sample', isLocalhost: false })
       dispatch(setCurrentWorkspace('code-sample'))
       const filePath = await loadWorkspacePreset('code-template')
-      plugin.on('editor', 'editorMounted', () => plugin.fileManager.openFile(filePath))
+      plugin.on('editor', 'editorMounted', async () => await plugin.fileManager.openFile(filePath))
     } else {
       if (workspaces.length === 0) {
         await createWorkspaceTemplate('default_workspace', 'default-template')
@@ -229,7 +229,7 @@ export const copyFile = async (src: string, dest: string) => {
   const fileManager = plugin.fileManager
 
   try {
-    fileManager.copyFile(src, dest)
+    await fileManager.copyFile(src, dest)
   } catch (error) {
     dispatch(displayPopUp('Oops! An error ocurred while performing copyFile operation.' + error))
   }
@@ -239,7 +239,7 @@ export const copyFolder = async (src: string, dest: string) => {
   const fileManager = plugin.fileManager
 
   try {
-    fileManager.copyDir(src, dest)
+    await fileManager.copyDir(src, dest)
   } catch (error) {
     dispatch(displayPopUp('Oops! An error ocurred while performing copyDir operation.' + error))
   }
@@ -257,11 +257,11 @@ export const runScript = async (path: string) => {
 }
 
 export const emitContextMenuEvent = async (cmd: customAction) => {
-  plugin.call(cmd.id, cmd.name, cmd)
+  await plugin.call(cmd.id, cmd.name, cmd)
 }
 
 export const handleClickFile = async (path: string, type: 'file' | 'folder' | 'gist') => {
-  plugin.fileManager.open(path)
+  await plugin.fileManager.open(path)
   dispatch(focusElement([{ key: path, type }]))
 }
 
@@ -269,10 +269,10 @@ export const handleExpandPath = (paths: string[]) => {
   dispatch(setExpandPath(paths))
 }
 
-const packageGistFiles = (directory) => {
+const packageGistFiles = async (directory) => {
+  const workspaceProvider = plugin.fileProviders.workspace
+  const isFile = await workspaceProvider.isFile(directory)
   return new Promise((resolve, reject) => {
-    const workspaceProvider = plugin.fileProviders.workspace
-    const isFile = workspaceProvider.isFile(directory)
     const ret = {}
 
     if (isFile) {
diff --git a/libs/remix-ui/workspace/src/lib/actions/workspace.ts b/libs/remix-ui/workspace/src/lib/actions/workspace.ts
index 630c72d573..0d6fce12ce 100644
--- a/libs/remix-ui/workspace/src/lib/actions/workspace.ts
+++ b/libs/remix-ui/workspace/src/lib/actions/workspace.ts
@@ -46,9 +46,9 @@ export const createWorkspace = async (workspaceName: string, isEmpty = false, cb
   dispatch(createWorkspaceRequest(promise))
   promise.then(async () => {
     dispatch(createWorkspaceSuccess(workspaceName))
-    plugin.setWorkspace({ name: workspaceName, isLocalhost: false })
-    plugin.setWorkspaces(await getWorkspaces())
-    plugin.workspaceCreated(workspaceName)
+    await plugin.setWorkspace({ name: workspaceName, isLocalhost: false })
+    await plugin.setWorkspaces(await getWorkspaces())
+    await plugin.workspaceCreated(workspaceName)
     if (!isEmpty) await loadWorkspacePreset('default-template')
     cb && cb(null, workspaceName)
   }).catch((error) => {
@@ -90,14 +90,14 @@ export const loadWorkspacePreset = async (template: 'gist-template' | 'code-temp
 
           path = 'contract-' + hash.replace('0x', '').substring(0, 10) + '.sol'
           content = atob(params.code)
-          workspaceProvider.set(path, content)
+          await workspaceProvider.set(path, content)
         }
         if (params.url) {
           const data = await plugin.call('contentImport', 'resolve', params.url)
 
           path = data.cleanUrl
           content = data.content
-          workspaceProvider.set(path, content)
+          await workspaceProvider.set(path, content)
         }
         return path
       } catch (e) {
@@ -152,7 +152,7 @@ export const workspaceExists = async (name: string) => {
   const browserProvider = plugin.fileProviders.browser
   const workspacePath = 'browser/' + workspaceProvider.workspacesPath + '/' + name
 
-  return browserProvider.exists(workspacePath)
+  return await browserProvider.exists(workspacePath)
 }
 
 export const fetchWorkspaceDirectory = async (path: string) => {
@@ -178,8 +178,8 @@ export const fetchWorkspaceDirectory = async (path: string) => {
 export const renameWorkspace = async (oldName: string, workspaceName: string, cb?: (err: Error, result?: string | number | boolean | Record<string, any>) => void) => {
   await renameWorkspaceFromProvider(oldName, workspaceName)
   await dispatch(setRenameWorkspace(oldName, workspaceName))
-  plugin.setWorkspace({ name: workspaceName, isLocalhost: false })
-  plugin.workspaceRenamed(oldName, workspaceName)
+  await plugin.setWorkspace({ name: workspaceName, isLocalhost: false })
+  await plugin.workspaceRenamed(oldName, workspaceName)
   cb && cb(null, workspaceName)
 }
 
@@ -190,9 +190,9 @@ export const renameWorkspaceFromProvider = async (oldName: string, workspaceName
   const browserProvider = plugin.fileProviders.browser
   const workspaceProvider = plugin.fileProviders.workspace
   const workspacesPath = workspaceProvider.workspacesPath
-  browserProvider.rename('browser/' + workspacesPath + '/' + oldName, 'browser/' + workspacesPath + '/' + workspaceName, true)
-  workspaceProvider.setWorkspace(workspaceName)
-  plugin.setWorkspaces(await getWorkspaces())
+  await browserProvider.rename('browser/' + workspacesPath + '/' + oldName, 'browser/' + workspacesPath + '/' + workspaceName, true)
+  await workspaceProvider.setWorkspace(workspaceName)
+  await plugin.setWorkspaces(await getWorkspaces())
 }
 
 export const deleteWorkspace = async (workspaceName: string, cb?: (err: Error, result?: string | number | boolean | Record<string, any>) => void) => {
@@ -206,8 +206,8 @@ const deleteWorkspaceFromProvider = async (workspaceName: string) => {
   const workspacesPath = plugin.fileProviders.workspace.workspacesPath
 
   await plugin.fileManager.closeAllFiles()
-  plugin.fileProviders.browser.remove(workspacesPath + '/' + workspaceName)
-  plugin.setWorkspaces(await getWorkspaces())
+  await plugin.fileProviders.browser.remove(workspacesPath + '/' + workspaceName)
+  await plugin.setWorkspaces(await getWorkspaces())
 }
 
 export const switchToWorkspace = async (name: string) => {
@@ -219,15 +219,15 @@ export const switchToWorkspace = async (name: string) => {
     dispatch(setMode('localhost'))
     plugin.emit('setWorkspace', { name: null, isLocalhost: true })
   } else if (name === NO_WORKSPACE) {
-    plugin.fileProviders.workspace.clearWorkspace()
-    plugin.setWorkspace({ name: null, isLocalhost: false })
+    await plugin.fileProviders.workspace.clearWorkspace()
+    await plugin.setWorkspace({ name: null, isLocalhost: false })
     dispatch(setCurrentWorkspace(null))
   } else {
     const isActive = await plugin.call('manager', 'isActive', 'remixd')
 
     if (isActive) await plugin.call('manager', 'deactivatePlugin', 'remixd')
     await plugin.fileProviders.workspace.setWorkspace(name)
-    plugin.setWorkspace({ name, isLocalhost: false })
+    await plugin.setWorkspace({ name, isLocalhost: false })
     dispatch(setMode('browser'))
     dispatch(setCurrentWorkspace(name))
     dispatch(setReadOnlyMode(false))
@@ -239,7 +239,7 @@ export const uploadFile = async (target, targetFolder: string, cb?: (err: Error,
   // the files module. Please ask the user here if they want to overwrite
   // a file and then just use `files.add`. The file explorer will
   // pick that up via the 'fileAdded' event from the files module.
-  [...target.files].forEach((file) => {
+  [...target.files].forEach(async (file) => {
     const workspaceProvider = plugin.fileProviders.workspace
     const loadFile = (name: string): void => {
       const fileReader = new FileReader()
@@ -248,11 +248,12 @@ export const uploadFile = async (target, targetFolder: string, cb?: (err: Error,
         if (checkSpecialChars(file.name)) {
           return dispatch(displayNotification('File Upload Failed', 'Special characters are not allowed', 'Close', null, async () => {}))
         }
-        const success = await workspaceProvider.set(name, event.target.result)
-
-        if (!success) {
+        try {
+          await workspaceProvider.set(name, event.target.result)
+        } catch (error) {
           return dispatch(displayNotification('File Upload Failed', 'Failed to create file ' + name, 'Close', null, async () => {}))
         }
+
         const config = plugin.registry.get('config').api
         const editor = plugin.registry.get('editor').api
 
@@ -265,18 +266,13 @@ export const uploadFile = async (target, targetFolder: string, cb?: (err: Error,
     }
     const name = targetFolder === '/' ? file.name : `${targetFolder}/${file.name}`
 
-    workspaceProvider.exists(name).then(exist => {
-      if (!exist) {
+    if (!await workspaceProvider.exists(name)) {
+      loadFile(name)
+    } else {
+      dispatch(displayNotification('Confirm overwrite', `The file ${name} already exists! Would you like to overwrite it?`, 'OK', null, () => {
         loadFile(name)
-      } else {
-        dispatch(displayNotification('Confirm overwrite', `The file ${name} already exists! Would you like to overwrite it?`, 'OK', null, () => {
-          loadFile(name)
-        }, () => {}))
-      }
-    }).catch(error => {
-      cb && cb(error)
-      if (error) console.log(error)
-    })
+      }, () => {}))
+    }
   })
 }
 
@@ -295,7 +291,7 @@ export const getWorkspaces = async (): Promise<string[]> | undefined => {
       })
     })
 
-    plugin.setWorkspaces(workspaces)
+    await plugin.setWorkspaces(workspaces)
     return workspaces
   } catch (e) {}
 }
diff --git a/libs/remix-ui/workspace/src/lib/reducers/workspace.ts b/libs/remix-ui/workspace/src/lib/reducers/workspace.ts
index cf3e3a1cbf..df80d46ee0 100644
--- a/libs/remix-ui/workspace/src/lib/reducers/workspace.ts
+++ b/libs/remix-ui/workspace/src/lib/reducers/workspace.ts
@@ -656,14 +656,22 @@ const fetchDirectoryContent = (state: BrowserState, payload: { fileTree, path: s
   if (state.mode === 'browser') {
     if (payload.path === state.browser.currentWorkspace) {
       let files = normalize(payload.fileTree, payload.path, payload.type)
-
       files = _.merge(files, state.browser.files[state.browser.currentWorkspace])
       if (deletePath) delete files[deletePath]
       return { [state.browser.currentWorkspace]: files }
     } else {
       let files = state.browser.files
       const _path = splitPath(state, payload.path)
-      const prevFiles = _.get(files, _path)
+      let prevFiles = _.get(files, _path)
+
+      if (!prevFiles) {
+        const object = {}; let o = object
+        for (const pa of _path) {
+          o = o[pa] = {}
+        }
+        files = _.defaultsDeep(files, object)
+        prevFiles = _.get(files, _path)
+      }
 
       if (prevFiles) {
         prevFiles.child = _.merge(normalize(payload.fileTree, payload.path, payload.type), prevFiles.child)
diff --git a/package-lock.json b/package-lock.json
index 00d5b6c9cd..18feb9d161 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3320,7 +3320,7 @@
     "@evocateur/libnpmaccess": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/@evocateur/libnpmaccess/-/libnpmaccess-3.1.2.tgz",
-      "integrity": "sha512-KSCAHwNWro0CF2ukxufCitT9K5LjL/KuMmNzSu8wuwN2rjyKHD8+cmOsiybK+W5hdnwc5M1SmRlVCaMHQo+3rg==",
+      "integrity": "sha1-7Pf2zmsATp+UKwmNkiAL5KSxyEU=",
       "dev": true,
       "requires": {
         "@evocateur/npm-registry-fetch": "^4.0.0",
@@ -3333,13 +3333,13 @@
         "aproba": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz",
-          "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==",
+          "integrity": "sha1-UlILiuW1aSFbNU78DKo/4eRaitw=",
           "dev": true
         },
         "npm-package-arg": {
           "version": "6.1.1",
           "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.1.tgz",
-          "integrity": "sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==",
+          "integrity": "sha1-AhaMsKSaK3W/mIooaY3ntSnfXLc=",
           "dev": true,
           "requires": {
             "hosted-git-info": "^2.7.1",
@@ -3351,7 +3351,7 @@
         "semver": {
           "version": "5.7.1",
           "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "integrity": "sha1-qVT5Ma66UI0we78Gnv8MAclhFvc=",
           "dev": true
         }
       }
@@ -3359,7 +3359,7 @@
     "@evocateur/libnpmpublish": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/@evocateur/libnpmpublish/-/libnpmpublish-1.2.2.tgz",
-      "integrity": "sha512-MJrrk9ct1FeY9zRlyeoyMieBjGDG9ihyyD9/Ft6MMrTxql9NyoEx2hw9casTIP4CdqEVu+3nQ2nXxoJ8RCXyFg==",
+      "integrity": "sha1-Vd8J0tyhNq+6nIjHWconIZjbnxo=",
       "dev": true,
       "requires": {
         "@evocateur/npm-registry-fetch": "^4.0.0",
@@ -3376,13 +3376,13 @@
         "aproba": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz",
-          "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==",
+          "integrity": "sha1-UlILiuW1aSFbNU78DKo/4eRaitw=",
           "dev": true
         },
         "npm-package-arg": {
           "version": "6.1.1",
           "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.1.tgz",
-          "integrity": "sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==",
+          "integrity": "sha1-AhaMsKSaK3W/mIooaY3ntSnfXLc=",
           "dev": true,
           "requires": {
             "hosted-git-info": "^2.7.1",
@@ -3394,7 +3394,7 @@
         "semver": {
           "version": "5.7.1",
           "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "integrity": "sha1-qVT5Ma66UI0we78Gnv8MAclhFvc=",
           "dev": true
         },
         "ssri": {
@@ -3411,7 +3411,7 @@
     "@evocateur/npm-registry-fetch": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/@evocateur/npm-registry-fetch/-/npm-registry-fetch-4.0.0.tgz",
-      "integrity": "sha512-k1WGfKRQyhJpIr+P17O5vLIo2ko1PFLKwoetatdduUSt/aQ4J2sJrJwwatdI5Z3SiYk/mRH9S3JpdmMFd/IK4g==",
+      "integrity": "sha1-jEw4dm2NMtMgD8sKg/BktXNl7WY=",
       "dev": true,
       "requires": {
         "JSONStream": "^1.3.4",
@@ -3435,7 +3435,7 @@
         "agentkeepalive": {
           "version": "3.5.2",
           "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.5.2.tgz",
-          "integrity": "sha512-e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ==",
+          "integrity": "sha1-oROSTdP6JKC8O3gQjEUMKr7gD2c=",
           "dev": true,
           "requires": {
             "humanize-ms": "^1.2.1"
@@ -3482,7 +3482,7 @@
         "http-cache-semantics": {
           "version": "3.8.1",
           "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz",
-          "integrity": "sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==",
+          "integrity": "sha1-ObDhat2bYFvwqe89nar0hDtMrNI=",
           "dev": true
         },
         "http-proxy-agent": {
@@ -3498,7 +3498,7 @@
         "https-proxy-agent": {
           "version": "2.2.4",
           "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz",
-          "integrity": "sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==",
+          "integrity": "sha1-TuenN6vZJniik9mzShr00NCMeHs=",
           "dev": true,
           "requires": {
             "agent-base": "^4.3.0",
@@ -3508,7 +3508,7 @@
         "make-fetch-happen": {
           "version": "5.0.2",
           "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-5.0.2.tgz",
-          "integrity": "sha512-07JHC0r1ykIoruKO8ifMXu+xEU8qOXDFETylktdug6vJDACnP+HKevOu3PXyNPzFyTSlz8vrBYlBO1JZRe8Cag==",
+          "integrity": "sha1-qoOHEE8mh+3KAchofuRQE9AtGb0=",
           "dev": true,
           "requires": {
             "agentkeepalive": "^3.4.1",
@@ -3533,7 +3533,7 @@
         "npm-package-arg": {
           "version": "6.1.1",
           "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.1.tgz",
-          "integrity": "sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==",
+          "integrity": "sha1-AhaMsKSaK3W/mIooaY3ntSnfXLc=",
           "dev": true,
           "requires": {
             "hosted-git-info": "^2.7.1",
@@ -3561,7 +3561,7 @@
         "semver": {
           "version": "5.7.1",
           "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "integrity": "sha1-qVT5Ma66UI0we78Gnv8MAclhFvc=",
           "dev": true
         },
         "socks": {
@@ -3609,7 +3609,7 @@
     "@evocateur/pacote": {
       "version": "9.6.5",
       "resolved": "https://registry.npmjs.org/@evocateur/pacote/-/pacote-9.6.5.tgz",
-      "integrity": "sha512-EI552lf0aG2nOV8NnZpTxNo2PcXKPmDbF9K8eCBFQdIZwHNGN/mi815fxtmUMa2wTa1yndotICIDt/V0vpEx2w==",
+      "integrity": "sha1-M94yuiELbxfCDrq01JfvxnVfSuU=",
       "dev": true,
       "requires": {
         "@evocateur/npm-registry-fetch": "^4.0.0",
@@ -3655,7 +3655,7 @@
         "agentkeepalive": {
           "version": "3.5.2",
           "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.5.2.tgz",
-          "integrity": "sha512-e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ==",
+          "integrity": "sha1-oROSTdP6JKC8O3gQjEUMKr7gD2c=",
           "dev": true,
           "requires": {
             "humanize-ms": "^1.2.1"
@@ -3702,7 +3702,7 @@
         "http-cache-semantics": {
           "version": "3.8.1",
           "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz",
-          "integrity": "sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==",
+          "integrity": "sha1-ObDhat2bYFvwqe89nar0hDtMrNI=",
           "dev": true
         },
         "http-proxy-agent": {
@@ -3718,7 +3718,7 @@
         "https-proxy-agent": {
           "version": "2.2.4",
           "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz",
-          "integrity": "sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==",
+          "integrity": "sha1-TuenN6vZJniik9mzShr00NCMeHs=",
           "dev": true,
           "requires": {
             "agent-base": "^4.3.0",
@@ -3728,7 +3728,7 @@
         "make-fetch-happen": {
           "version": "5.0.2",
           "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-5.0.2.tgz",
-          "integrity": "sha512-07JHC0r1ykIoruKO8ifMXu+xEU8qOXDFETylktdug6vJDACnP+HKevOu3PXyNPzFyTSlz8vrBYlBO1JZRe8Cag==",
+          "integrity": "sha1-qoOHEE8mh+3KAchofuRQE9AtGb0=",
           "dev": true,
           "requires": {
             "agentkeepalive": "^3.4.1",
@@ -3753,7 +3753,7 @@
         "npm-package-arg": {
           "version": "6.1.1",
           "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.1.tgz",
-          "integrity": "sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==",
+          "integrity": "sha1-AhaMsKSaK3W/mIooaY3ntSnfXLc=",
           "dev": true,
           "requires": {
             "hosted-git-info": "^2.7.1",
@@ -3765,7 +3765,7 @@
         "npm-packlist": {
           "version": "1.4.8",
           "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz",
-          "integrity": "sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==",
+          "integrity": "sha1-Vu5swTW5+YrT1Rwcldoiu7my7z4=",
           "dev": true,
           "requires": {
             "ignore-walk": "^3.0.1",
@@ -3776,7 +3776,7 @@
         "npm-pick-manifest": {
           "version": "3.0.2",
           "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-3.0.2.tgz",
-          "integrity": "sha512-wNprTNg+X5nf+tDi+hbjdHhM4bX+mKqv6XmPh7B5eG+QY9VARfQPfCEH013H5GqfNj6ee8Ij2fg8yk0mzps1Vw==",
+          "integrity": "sha1-9Nnl/UviFT5fTl+be+jcQZqZq7c=",
           "dev": true,
           "requires": {
             "figgy-pudding": "^3.5.1",
@@ -3803,7 +3803,7 @@
         "semver": {
           "version": "5.7.1",
           "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "integrity": "sha1-qVT5Ma66UI0we78Gnv8MAclhFvc=",
           "dev": true
         },
         "socks": {
@@ -5620,7 +5620,7 @@
     "@lerna/add": {
       "version": "3.21.0",
       "resolved": "https://registry.npmjs.org/@lerna/add/-/add-3.21.0.tgz",
-      "integrity": "sha512-vhUXXF6SpufBE1EkNEXwz1VLW03f177G9uMOFMQkp6OJ30/PWg4Ekifuz9/3YfgB2/GH8Tu4Lk3O51P2Hskg/A==",
+      "integrity": "sha1-JwB73nHMewopaas8LwrkFXi0V3s=",
       "dev": true,
       "requires": {
         "@evocateur/pacote": "^9.6.3",
@@ -5638,7 +5638,7 @@
         "npm-package-arg": {
           "version": "6.1.1",
           "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.1.tgz",
-          "integrity": "sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==",
+          "integrity": "sha1-AhaMsKSaK3W/mIooaY3ntSnfXLc=",
           "dev": true,
           "requires": {
             "hosted-git-info": "^2.7.1",
@@ -5650,7 +5650,7 @@
             "semver": {
               "version": "5.7.1",
               "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-              "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+              "integrity": "sha1-qVT5Ma66UI0we78Gnv8MAclhFvc=",
               "dev": true
             }
           }
@@ -5666,7 +5666,7 @@
     "@lerna/bootstrap": {
       "version": "3.21.0",
       "resolved": "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.21.0.tgz",
-      "integrity": "sha512-mtNHlXpmvJn6JTu0KcuTTPl2jLsDNud0QacV/h++qsaKbhAaJr/FElNZ5s7MwZFUM3XaDmvWzHKaszeBMHIbBw==",
+      "integrity": "sha1-vNG2Ub5bCXCyDY+uBMhkVIEjrtY=",
       "dev": true,
       "requires": {
         "@lerna/command": "3.21.0",
@@ -5697,7 +5697,7 @@
         "npm-package-arg": {
           "version": "6.1.1",
           "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.1.tgz",
-          "integrity": "sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==",
+          "integrity": "sha1-AhaMsKSaK3W/mIooaY3ntSnfXLc=",
           "dev": true,
           "requires": {
             "hosted-git-info": "^2.7.1",
@@ -5709,7 +5709,7 @@
             "semver": {
               "version": "5.7.1",
               "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-              "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+              "integrity": "sha1-qVT5Ma66UI0we78Gnv8MAclhFvc=",
               "dev": true
             }
           }
@@ -5725,7 +5725,7 @@
     "@lerna/changed": {
       "version": "3.21.0",
       "resolved": "https://registry.npmjs.org/@lerna/changed/-/changed-3.21.0.tgz",
-      "integrity": "sha512-hzqoyf8MSHVjZp0gfJ7G8jaz+++mgXYiNs9iViQGA8JlN/dnWLI5sWDptEH3/B30Izo+fdVz0S0s7ydVE3pWIw==",
+      "integrity": "sha1-EI4V9nm/4HevUA9YJIxjTxBE6gs=",
       "dev": true,
       "requires": {
         "@lerna/collect-updates": "3.20.0",
@@ -5737,7 +5737,7 @@
     "@lerna/check-working-tree": {
       "version": "3.16.5",
       "resolved": "https://registry.npmjs.org/@lerna/check-working-tree/-/check-working-tree-3.16.5.tgz",
-      "integrity": "sha512-xWjVBcuhvB8+UmCSb5tKVLB5OuzSpw96WEhS2uz6hkWVa/Euh1A0/HJwn2cemyK47wUrCQXtczBUiqnq9yX5VQ==",
+      "integrity": "sha1-tPiuYbtFI1Yd+5+PjYdN1Gu0S6o=",
       "dev": true,
       "requires": {
         "@lerna/collect-uncommitted": "3.16.5",
@@ -5748,7 +5748,7 @@
     "@lerna/child-process": {
       "version": "3.16.5",
       "resolved": "https://registry.npmjs.org/@lerna/child-process/-/child-process-3.16.5.tgz",
-      "integrity": "sha512-vdcI7mzei9ERRV4oO8Y1LHBZ3A5+ampRKg1wq5nutLsUA4mEBN6H7JqjWOMY9xZemv6+kATm2ofjJ3lW5TszQg==",
+      "integrity": "sha1-OPo8GAZKpKwHVK2AEUd2p7NqabI=",
       "dev": true,
       "requires": {
         "chalk": "^2.3.1",
@@ -5759,7 +5759,7 @@
     "@lerna/clean": {
       "version": "3.21.0",
       "resolved": "https://registry.npmjs.org/@lerna/clean/-/clean-3.21.0.tgz",
-      "integrity": "sha512-b/L9l+MDgE/7oGbrav6rG8RTQvRiZLO1zTcG17zgJAAuhlsPxJExMlh2DFwJEVi2les70vMhHfST3Ue1IMMjpg==",
+      "integrity": "sha1-wLRrUwDMPa4s2jvsFLgDCC2jhW0=",
       "dev": true,
       "requires": {
         "@lerna/command": "3.21.0",
@@ -5783,7 +5783,7 @@
     "@lerna/cli": {
       "version": "3.18.5",
       "resolved": "https://registry.npmjs.org/@lerna/cli/-/cli-3.18.5.tgz",
-      "integrity": "sha512-erkbxkj9jfc89vVs/jBLY/fM0I80oLmJkFUV3Q3wk9J3miYhP14zgVEBsPZY68IZlEjT6T3Xlq2xO1AVaatHsA==",
+      "integrity": "sha1-yQxGFUL801ttWwFaKQ+w2/tB0kI=",
       "dev": true,
       "requires": {
         "@lerna/global-options": "3.13.0",
@@ -5795,13 +5795,13 @@
         "ansi-regex": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "integrity": "sha1-i5+PCM8ay4Q3Vqg5yox+MWjFGZc=",
           "dev": true
         },
         "cliui": {
           "version": "5.0.0",
           "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-          "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+          "integrity": "sha1-3u/P2y6AB4SqNPRvoI4GhRx7u8U=",
           "dev": true,
           "requires": {
             "string-width": "^3.1.0",
@@ -5818,7 +5818,7 @@
         "find-up": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+          "integrity": "sha1-SRafHXmTQwZG2mHsxa41XCHJe3M=",
           "dev": true,
           "requires": {
             "locate-path": "^3.0.0"
@@ -5833,7 +5833,7 @@
         "locate-path": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+          "integrity": "sha1-2+w7OrdZdYBxtY/ln8QYca8hQA4=",
           "dev": true,
           "requires": {
             "p-locate": "^3.0.0",
@@ -5843,7 +5843,7 @@
         "p-limit": {
           "version": "2.3.0",
           "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+          "integrity": "sha1-PdM8ZHohT9//2DWTPrCG2g3CHbE=",
           "dev": true,
           "requires": {
             "p-try": "^2.0.0"
@@ -5852,7 +5852,7 @@
         "p-locate": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+          "integrity": "sha1-Mi1poFwCZLJZl9n0DNiokasAZKQ=",
           "dev": true,
           "requires": {
             "p-limit": "^2.0.0"
@@ -5861,13 +5861,13 @@
         "p-try": {
           "version": "2.2.0",
           "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+          "integrity": "sha1-yyhoVA4xPWHeWPr741zpAE1VQOY=",
           "dev": true
         },
         "string-width": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "integrity": "sha1-InZ74htirxCBV0MG9prFG2IgOWE=",
           "dev": true,
           "requires": {
             "emoji-regex": "^7.0.1",
@@ -5878,7 +5878,7 @@
         "strip-ansi": {
           "version": "5.2.0",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "integrity": "sha1-jJpTb+tq/JYr36WxBKUJHBrZwK4=",
           "dev": true,
           "requires": {
             "ansi-regex": "^4.1.0"
@@ -5887,7 +5887,7 @@
         "wrap-ansi": {
           "version": "5.1.0",
           "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
-          "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
+          "integrity": "sha1-H9H2cjXVttD+54EFYAG/tpTAOwk=",
           "dev": true,
           "requires": {
             "ansi-styles": "^3.2.0",
@@ -5898,7 +5898,7 @@
         "yargs": {
           "version": "14.2.3",
           "resolved": "https://registry.npmjs.org/yargs/-/yargs-14.2.3.tgz",
-          "integrity": "sha512-ZbotRWhF+lkjijC/VhmOT9wSgyBQ7+zr13+YLkhfsSiTriYsMzkTUFP18pFhWwBeMa5gUc1MzbhrO6/VB7c9Xg==",
+          "integrity": "sha1-Ghw+3O0a+yov6jNgS8bR2NaIpBQ=",
           "dev": true,
           "requires": {
             "cliui": "^5.0.0",
@@ -5929,7 +5929,7 @@
     "@lerna/collect-uncommitted": {
       "version": "3.16.5",
       "resolved": "https://registry.npmjs.org/@lerna/collect-uncommitted/-/collect-uncommitted-3.16.5.tgz",
-      "integrity": "sha512-ZgqnGwpDZiWyzIQVZtQaj9tRizsL4dUOhuOStWgTAw1EMe47cvAY2kL709DzxFhjr6JpJSjXV5rZEAeU3VE0Hg==",
+      "integrity": "sha1-pJTWGqwxzceuxLvlLJZVAnQTLmM=",
       "dev": true,
       "requires": {
         "@lerna/child-process": "3.16.5",
@@ -5941,7 +5941,7 @@
     "@lerna/collect-updates": {
       "version": "3.20.0",
       "resolved": "https://registry.npmjs.org/@lerna/collect-updates/-/collect-updates-3.20.0.tgz",
-      "integrity": "sha512-qBTVT5g4fupVhBFuY4nI/3FSJtQVcDh7/gEPOpRxoXB/yCSnT38MFHXWl+y4einLciCjt/+0x6/4AG80fjay2Q==",
+      "integrity": "sha1-YvnXa6IaJbfZ+/McAt6IdEpWS9E=",
       "dev": true,
       "requires": {
         "@lerna/child-process": "3.16.5",
@@ -5954,7 +5954,7 @@
         "slash": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
-          "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
+          "integrity": "sha1-3lUoUaF1nfOo8gZTVEL17E3eq0Q=",
           "dev": true
         }
       }
@@ -5962,7 +5962,7 @@
     "@lerna/command": {
       "version": "3.21.0",
       "resolved": "https://registry.npmjs.org/@lerna/command/-/command-3.21.0.tgz",
-      "integrity": "sha512-T2bu6R8R3KkH5YoCKdutKv123iUgUbW8efVjdGCDnCMthAQzoentOJfDeodBwn0P2OqCl3ohsiNVtSn9h78fyQ==",
+      "integrity": "sha1-miODdZ3HtwDaz6iiKy86bhkBIfc=",
       "dev": true,
       "requires": {
         "@lerna/child-process": "3.16.5",
@@ -5980,7 +5980,7 @@
     "@lerna/conventional-commits": {
       "version": "3.22.0",
       "resolved": "https://registry.npmjs.org/@lerna/conventional-commits/-/conventional-commits-3.22.0.tgz",
-      "integrity": "sha512-z4ZZk1e8Mhz7+IS8NxHr64wyklHctCJyWpJKEZZPJiLFJ8yKto/x38O80R10pIzC0rr8Sy/OsjSH4bl0TbbgqA==",
+      "integrity": "sha1-J5j0iB7i70V72uAnq30L8K9vHgk=",
       "dev": true,
       "requires": {
         "@lerna/validation-error": "3.13.0",
@@ -6019,7 +6019,7 @@
         "npm-package-arg": {
           "version": "6.1.1",
           "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.1.tgz",
-          "integrity": "sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==",
+          "integrity": "sha1-AhaMsKSaK3W/mIooaY3ntSnfXLc=",
           "dev": true,
           "requires": {
             "hosted-git-info": "^2.7.1",
@@ -6031,7 +6031,7 @@
             "semver": {
               "version": "5.7.1",
               "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-              "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+              "integrity": "sha1-qVT5Ma66UI0we78Gnv8MAclhFvc=",
               "dev": true
             }
           }
@@ -6041,7 +6041,7 @@
     "@lerna/create": {
       "version": "3.22.0",
       "resolved": "https://registry.npmjs.org/@lerna/create/-/create-3.22.0.tgz",
-      "integrity": "sha512-MdiQQzCcB4E9fBF1TyMOaAEz9lUjIHp1Ju9H7f3lXze5JK6Fl5NYkouAvsLgY6YSIhXMY8AHW2zzXeBDY4yWkw==",
+      "integrity": "sha1-1rvQN8PcW0Jf5fbRuBcFfCePdhk=",
       "dev": true,
       "requires": {
         "@evocateur/pacote": "^9.6.3",
@@ -6067,7 +6067,7 @@
         "@nodelib/fs.stat": {
           "version": "1.1.3",
           "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz",
-          "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==",
+          "integrity": "sha1-K1o6s/kYzKSKjHVMCBaOPwPrphs=",
           "dev": true
         },
         "array-union": {
@@ -6091,7 +6091,7 @@
         "fast-glob": {
           "version": "2.2.7",
           "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz",
-          "integrity": "sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==",
+          "integrity": "sha1-aVOFfDr6R1//ku5gFdUtpwpM050=",
           "dev": true,
           "requires": {
             "@mrmlnc/readdir-enhanced": "^2.2.1",
@@ -6116,7 +6116,7 @@
         "globby": {
           "version": "9.2.0",
           "resolved": "https://registry.npmjs.org/globby/-/globby-9.2.0.tgz",
-          "integrity": "sha512-ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg==",
+          "integrity": "sha1-/QKacGxwPSm90XD0tts6P3p8tj0=",
           "dev": true,
           "requires": {
             "@types/glob": "^7.1.1",
@@ -6132,7 +6132,7 @@
         "ignore": {
           "version": "4.0.6",
           "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-          "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+          "integrity": "sha1-dQ49tYYgh7RzfrrIIH/9HvJ7Jfw=",
           "dev": true
         },
         "jsonfile": {
@@ -6147,7 +6147,7 @@
         "npm-package-arg": {
           "version": "6.1.1",
           "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.1.tgz",
-          "integrity": "sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==",
+          "integrity": "sha1-AhaMsKSaK3W/mIooaY3ntSnfXLc=",
           "dev": true,
           "requires": {
             "hosted-git-info": "^2.7.1",
@@ -6159,7 +6159,7 @@
             "semver": {
               "version": "5.7.1",
               "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-              "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+              "integrity": "sha1-qVT5Ma66UI0we78Gnv8MAclhFvc=",
               "dev": true
             }
           }
@@ -6167,7 +6167,7 @@
         "slash": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
-          "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
+          "integrity": "sha1-3lUoUaF1nfOo8gZTVEL17E3eq0Q=",
           "dev": true
         },
         "tr46": {
@@ -6201,7 +6201,7 @@
     "@lerna/create-symlink": {
       "version": "3.16.2",
       "resolved": "https://registry.npmjs.org/@lerna/create-symlink/-/create-symlink-3.16.2.tgz",
-      "integrity": "sha512-pzXIJp6av15P325sgiIRpsPXLFmkisLhMBCy4764d+7yjf2bzrJ4gkWVMhsv4AdF0NN3OyZ5jjzzTtLNqfR+Jw==",
+      "integrity": "sha1-QSy45Zpy9afZRj5ORyGtIHAUmWc=",
       "dev": true,
       "requires": {
         "@zkochan/cmd-shim": "^3.1.0",
@@ -6234,7 +6234,7 @@
     "@lerna/describe-ref": {
       "version": "3.16.5",
       "resolved": "https://registry.npmjs.org/@lerna/describe-ref/-/describe-ref-3.16.5.tgz",
-      "integrity": "sha512-c01+4gUF0saOOtDBzbLMFOTJDHTKbDFNErEY6q6i9QaXuzy9LNN62z+Hw4acAAZuJQhrVWncVathcmkkjvSVGw==",
+      "integrity": "sha1-ozjCWq7YN9PccLinLER8XGY0asA=",
       "dev": true,
       "requires": {
         "@lerna/child-process": "3.16.5",
@@ -6244,7 +6244,7 @@
     "@lerna/diff": {
       "version": "3.21.0",
       "resolved": "https://registry.npmjs.org/@lerna/diff/-/diff-3.21.0.tgz",
-      "integrity": "sha512-5viTR33QV3S7O+bjruo1SaR40m7F2aUHJaDAC7fL9Ca6xji+aw1KFkpCtVlISS0G8vikUREGMJh+c/VMSc8Usw==",
+      "integrity": "sha1-5t8Ni5kWFn/1pJ/LAqwGQkKApo0=",
       "dev": true,
       "requires": {
         "@lerna/child-process": "3.16.5",
@@ -6256,7 +6256,7 @@
     "@lerna/exec": {
       "version": "3.21.0",
       "resolved": "https://registry.npmjs.org/@lerna/exec/-/exec-3.21.0.tgz",
-      "integrity": "sha512-iLvDBrIE6rpdd4GIKTY9mkXyhwsJ2RvQdB9ZU+/NhR3okXfqKc6py/24tV111jqpXTtZUW6HNydT4dMao2hi1Q==",
+      "integrity": "sha1-F/B1M4k8uRihe0G8xWbcQ3AW2yY=",
       "dev": true,
       "requires": {
         "@lerna/child-process": "3.16.5",
@@ -6279,7 +6279,7 @@
     "@lerna/filter-options": {
       "version": "3.20.0",
       "resolved": "https://registry.npmjs.org/@lerna/filter-options/-/filter-options-3.20.0.tgz",
-      "integrity": "sha512-bmcHtvxn7SIl/R9gpiNMVG7yjx7WyT0HSGw34YVZ9B+3xF/83N3r5Rgtjh4hheLZ+Q91Or0Jyu5O3Nr+AwZe2g==",
+      "integrity": "sha1-Dw9dWkeDhW7s5CBHCMyQLLyK9Zs=",
       "dev": true,
       "requires": {
         "@lerna/collect-updates": "3.20.0",
@@ -6292,7 +6292,7 @@
     "@lerna/filter-packages": {
       "version": "3.18.0",
       "resolved": "https://registry.npmjs.org/@lerna/filter-packages/-/filter-packages-3.18.0.tgz",
-      "integrity": "sha512-6/0pMM04bCHNATIOkouuYmPg6KH3VkPCIgTfQmdkPJTullERyEQfNUKikrefjxo1vHOoCACDpy65JYyKiAbdwQ==",
+      "integrity": "sha1-ano3bShSCNsDqClYz7gXLhebTnA=",
       "dev": true,
       "requires": {
         "@lerna/validation-error": "3.13.0",
@@ -6303,7 +6303,7 @@
     "@lerna/get-npm-exec-opts": {
       "version": "3.13.0",
       "resolved": "https://registry.npmjs.org/@lerna/get-npm-exec-opts/-/get-npm-exec-opts-3.13.0.tgz",
-      "integrity": "sha512-Y0xWL0rg3boVyJk6An/vurKzubyJKtrxYv2sj4bB8Mc5zZ3tqtv0ccbOkmkXKqbzvNNF7VeUt1OJ3DRgtC/QZw==",
+      "integrity": "sha1-0bVSywCIGZ/D5+Em+RTjmgjfnqU=",
       "dev": true,
       "requires": {
         "npmlog": "^4.1.2"
@@ -6312,7 +6312,7 @@
     "@lerna/get-packed": {
       "version": "3.16.0",
       "resolved": "https://registry.npmjs.org/@lerna/get-packed/-/get-packed-3.16.0.tgz",
-      "integrity": "sha512-AjsFiaJzo1GCPnJUJZiTW6J1EihrPkc2y3nMu6m3uWFxoleklsSCyImumzVZJssxMi3CPpztj8LmADLedl9kXw==",
+      "integrity": "sha1-GzFrcG3O6Gx7qlXlCwh5WUR4Uv8=",
       "dev": true,
       "requires": {
         "fs-extra": "^8.1.0",
@@ -6354,7 +6354,7 @@
     "@lerna/github-client": {
       "version": "3.22.0",
       "resolved": "https://registry.npmjs.org/@lerna/github-client/-/github-client-3.22.0.tgz",
-      "integrity": "sha512-O/GwPW+Gzr3Eb5bk+nTzTJ3uv+jh5jGho9BOqKlajXaOkMYGBELEAqV5+uARNGWZFvYAiF4PgqHb6aCUu7XdXg==",
+      "integrity": "sha1-XYFqpPdnR+1zauZP+WK48Vw1TZU=",
       "dev": true,
       "requires": {
         "@lerna/child-process": "3.16.5",
@@ -6367,7 +6367,7 @@
     "@lerna/gitlab-client": {
       "version": "3.15.0",
       "resolved": "https://registry.npmjs.org/@lerna/gitlab-client/-/gitlab-client-3.15.0.tgz",
-      "integrity": "sha512-OsBvRSejHXUBMgwWQqNoioB8sgzL/Pf1pOUhHKtkiMl6aAWjklaaq5HPMvTIsZPfS6DJ9L5OK2GGZuooP/5c8Q==",
+      "integrity": "sha1-kfTsjGl7WsV/fyW9UP5lnSSqlqY=",
       "dev": true,
       "requires": {
         "node-fetch": "^2.5.0",
@@ -6406,13 +6406,13 @@
     "@lerna/global-options": {
       "version": "3.13.0",
       "resolved": "https://registry.npmjs.org/@lerna/global-options/-/global-options-3.13.0.tgz",
-      "integrity": "sha512-SlZvh1gVRRzYLVluz9fryY1nJpZ0FHDGB66U9tFfvnnxmueckRQxLopn3tXj3NU1kc3QANT2I5BsQkOqZ4TEFQ==",
+      "integrity": "sha1-IXZiKQ2watnPLEnY4xAO4o6uuuE=",
       "dev": true
     },
     "@lerna/has-npm-version": {
       "version": "3.16.5",
       "resolved": "https://registry.npmjs.org/@lerna/has-npm-version/-/has-npm-version-3.16.5.tgz",
-      "integrity": "sha512-WL7LycR9bkftyqbYop5rEGJ9sRFIV55tSGmbN1HLrF9idwOCD7CLrT64t235t3t4O5gehDnwKI5h2U3oxTrF8Q==",
+      "integrity": "sha1-q4OVbyEdiSPqav6bl5s4zHOxUyY=",
       "dev": true,
       "requires": {
         "@lerna/child-process": "3.16.5",
@@ -6422,7 +6422,7 @@
     "@lerna/import": {
       "version": "3.22.0",
       "resolved": "https://registry.npmjs.org/@lerna/import/-/import-3.22.0.tgz",
-      "integrity": "sha512-uWOlexasM5XR6tXi4YehODtH9Y3OZrFht3mGUFFT3OIl2s+V85xIGFfqFGMTipMPAGb2oF1UBLL48kR43hRsOg==",
+      "integrity": "sha1-Gl8DlPOOI8T2QqEj5eFRfnDQaNI=",
       "dev": true,
       "requires": {
         "@lerna/child-process": "3.16.5",
@@ -6460,7 +6460,7 @@
     "@lerna/info": {
       "version": "3.21.0",
       "resolved": "https://registry.npmjs.org/@lerna/info/-/info-3.21.0.tgz",
-      "integrity": "sha512-0XDqGYVBgWxUquFaIptW2bYSIu6jOs1BtkvRTWDDhw4zyEdp6q4eaMvqdSap1CG+7wM5jeLCi6z94wS0AuiuwA==",
+      "integrity": "sha1-dmlrZ2/bDzXUjIPGPB4yu143gU8=",
       "dev": true,
       "requires": {
         "@lerna/command": "3.21.0",
@@ -6471,7 +6471,7 @@
     "@lerna/init": {
       "version": "3.21.0",
       "resolved": "https://registry.npmjs.org/@lerna/init/-/init-3.21.0.tgz",
-      "integrity": "sha512-6CM0z+EFUkFfurwdJCR+LQQF6MqHbYDCBPyhu/d086LRf58GtYZYj49J8mKG9ktayp/TOIxL/pKKjgLD8QBPOg==",
+      "integrity": "sha1-HoEJNNyL9OU4bAMQQYgdO0CWqlw=",
       "dev": true,
       "requires": {
         "@lerna/child-process": "3.16.5",
@@ -6512,7 +6512,7 @@
     "@lerna/link": {
       "version": "3.21.0",
       "resolved": "https://registry.npmjs.org/@lerna/link/-/link-3.21.0.tgz",
-      "integrity": "sha512-tGu9GxrX7Ivs+Wl3w1+jrLi1nQ36kNI32dcOssij6bg0oZ2M2MDEFI9UF2gmoypTaN9uO5TSsjCFS7aR79HbdQ==",
+      "integrity": "sha1-i+aP8MzuEEsXS1u9YGMCwvBunZs=",
       "dev": true,
       "requires": {
         "@lerna/command": "3.21.0",
@@ -6531,7 +6531,7 @@
         "slash": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
-          "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
+          "integrity": "sha1-3lUoUaF1nfOo8gZTVEL17E3eq0Q=",
           "dev": true
         }
       }
@@ -6539,7 +6539,7 @@
     "@lerna/list": {
       "version": "3.21.0",
       "resolved": "https://registry.npmjs.org/@lerna/list/-/list-3.21.0.tgz",
-      "integrity": "sha512-KehRjE83B1VaAbRRkRy6jLX1Cin8ltsrQ7FHf2bhwhRHK0S54YuA6LOoBnY/NtA8bHDX/Z+G5sMY78X30NS9tg==",
+      "integrity": "sha1-Qvdvr6Vt6hO2keyMqxODJpHWHaI=",
       "dev": true,
       "requires": {
         "@lerna/command": "3.21.0",
@@ -6551,7 +6551,7 @@
     "@lerna/listable": {
       "version": "3.18.5",
       "resolved": "https://registry.npmjs.org/@lerna/listable/-/listable-3.18.5.tgz",
-      "integrity": "sha512-Sdr3pVyaEv5A7ZkGGYR7zN+tTl2iDcinryBPvtuv20VJrXBE8wYcOks1edBTcOWsPjCE/rMP4bo1pseyk3UTsg==",
+      "integrity": "sha1-6CeYQFte2PxRhDyO8eeg5Jc4iho=",
       "dev": true,
       "requires": {
         "@lerna/query-graph": "3.18.5",
@@ -6562,7 +6562,7 @@
     "@lerna/log-packed": {
       "version": "3.16.0",
       "resolved": "https://registry.npmjs.org/@lerna/log-packed/-/log-packed-3.16.0.tgz",
-      "integrity": "sha512-Fp+McSNBV/P2mnLUYTaSlG8GSmpXM7krKWcllqElGxvAqv6chk2K3c2k80MeVB4WvJ9tRjUUf+i7HUTiQ9/ckQ==",
+      "integrity": "sha1-+DmRBB7neySVY04URwtCJZ/SvBY=",
       "dev": true,
       "requires": {
         "byte-size": "^5.0.1",
@@ -6574,7 +6574,7 @@
     "@lerna/npm-conf": {
       "version": "3.16.0",
       "resolved": "https://registry.npmjs.org/@lerna/npm-conf/-/npm-conf-3.16.0.tgz",
-      "integrity": "sha512-HbO3DUrTkCAn2iQ9+FF/eisDpWY5POQAOF1m7q//CZjdC2HSW3UYbKEGsSisFxSfaF9Z4jtrV+F/wX6qWs3CuA==",
+      "integrity": "sha1-HBComuL2wu6WliVXc4aFMA03aCc=",
       "dev": true,
       "requires": {
         "config-chain": "^1.1.11",
@@ -6584,7 +6584,7 @@
     "@lerna/npm-dist-tag": {
       "version": "3.18.5",
       "resolved": "https://registry.npmjs.org/@lerna/npm-dist-tag/-/npm-dist-tag-3.18.5.tgz",
-      "integrity": "sha512-xw0HDoIG6HreVsJND9/dGls1c+lf6vhu7yJoo56Sz5bvncTloYGLUppIfDHQr4ZvmPCK8rsh0euCVh2giPxzKQ==",
+      "integrity": "sha1-nvmrt8EEB3sx9vqyLMc7MU1UrFU=",
       "dev": true,
       "requires": {
         "@evocateur/npm-registry-fetch": "^4.0.0",
@@ -6597,7 +6597,7 @@
         "npm-package-arg": {
           "version": "6.1.1",
           "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.1.tgz",
-          "integrity": "sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==",
+          "integrity": "sha1-AhaMsKSaK3W/mIooaY3ntSnfXLc=",
           "dev": true,
           "requires": {
             "hosted-git-info": "^2.7.1",
@@ -6609,7 +6609,7 @@
         "semver": {
           "version": "5.7.1",
           "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "integrity": "sha1-qVT5Ma66UI0we78Gnv8MAclhFvc=",
           "dev": true
         }
       }
@@ -6617,7 +6617,7 @@
     "@lerna/npm-install": {
       "version": "3.16.5",
       "resolved": "https://registry.npmjs.org/@lerna/npm-install/-/npm-install-3.16.5.tgz",
-      "integrity": "sha512-hfiKk8Eku6rB9uApqsalHHTHY+mOrrHeWEs+gtg7+meQZMTS3kzv4oVp5cBZigndQr3knTLjwthT/FX4KvseFg==",
+      "integrity": "sha1-1r/cFvgShdpmUVrkeSTW4njWN9M=",
       "dev": true,
       "requires": {
         "@lerna/child-process": "3.16.5",
@@ -6652,7 +6652,7 @@
         "npm-package-arg": {
           "version": "6.1.1",
           "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.1.tgz",
-          "integrity": "sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==",
+          "integrity": "sha1-AhaMsKSaK3W/mIooaY3ntSnfXLc=",
           "dev": true,
           "requires": {
             "hosted-git-info": "^2.7.1",
@@ -6664,7 +6664,7 @@
         "semver": {
           "version": "5.7.1",
           "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "integrity": "sha1-qVT5Ma66UI0we78Gnv8MAclhFvc=",
           "dev": true
         }
       }
@@ -6672,7 +6672,7 @@
     "@lerna/npm-publish": {
       "version": "3.18.5",
       "resolved": "https://registry.npmjs.org/@lerna/npm-publish/-/npm-publish-3.18.5.tgz",
-      "integrity": "sha512-3etLT9+2L8JAx5F8uf7qp6iAtOLSMj+ZYWY6oUgozPi/uLqU0/gsMsEXh3F0+YVW33q0M61RpduBoAlOOZnaTg==",
+      "integrity": "sha1-JA5AOZWf2YFrScWwdCHhG1ywAK8=",
       "dev": true,
       "requires": {
         "@evocateur/libnpmpublish": "^1.2.2",
@@ -6709,7 +6709,7 @@
         "npm-package-arg": {
           "version": "6.1.1",
           "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.1.tgz",
-          "integrity": "sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==",
+          "integrity": "sha1-AhaMsKSaK3W/mIooaY3ntSnfXLc=",
           "dev": true,
           "requires": {
             "hosted-git-info": "^2.7.1",
@@ -6721,7 +6721,7 @@
         "semver": {
           "version": "5.7.1",
           "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "integrity": "sha1-qVT5Ma66UI0we78Gnv8MAclhFvc=",
           "dev": true
         }
       }
@@ -6729,7 +6729,7 @@
     "@lerna/npm-run-script": {
       "version": "3.16.5",
       "resolved": "https://registry.npmjs.org/@lerna/npm-run-script/-/npm-run-script-3.16.5.tgz",
-      "integrity": "sha512-1asRi+LjmVn3pMjEdpqKJZFT/3ZNpb+VVeJMwrJaV/3DivdNg7XlPK9LTrORuKU4PSvhdEZvJmSlxCKyDpiXsQ==",
+      "integrity": "sha1-nC7IJFOibAtG7cC7fBWBbIIfXBU=",
       "dev": true,
       "requires": {
         "@lerna/child-process": "3.16.5",
@@ -6740,7 +6740,7 @@
     "@lerna/otplease": {
       "version": "3.18.5",
       "resolved": "https://registry.npmjs.org/@lerna/otplease/-/otplease-3.18.5.tgz",
-      "integrity": "sha512-S+SldXAbcXTEDhzdxYLU0ZBKuYyURP/ND2/dK6IpKgLxQYh/z4ScljPDMyKymmEvgiEJmBsPZAAPfmNPEzxjog==",
+      "integrity": "sha1-t3uOdgtAq62fdljZiPPqd9T9AjE=",
       "dev": true,
       "requires": {
         "@lerna/prompt": "3.18.5",
@@ -6750,7 +6750,7 @@
     "@lerna/output": {
       "version": "3.13.0",
       "resolved": "https://registry.npmjs.org/@lerna/output/-/output-3.13.0.tgz",
-      "integrity": "sha512-7ZnQ9nvUDu/WD+bNsypmPG5MwZBwu86iRoiW6C1WBuXXDxM5cnIAC1m2WxHeFnjyMrYlRXM9PzOQ9VDD+C15Rg==",
+      "integrity": "sha1-Pe18yQiyephyIopjDZUK7a56SYk=",
       "dev": true,
       "requires": {
         "npmlog": "^4.1.2"
@@ -6759,7 +6759,7 @@
     "@lerna/pack-directory": {
       "version": "3.16.4",
       "resolved": "https://registry.npmjs.org/@lerna/pack-directory/-/pack-directory-3.16.4.tgz",
-      "integrity": "sha512-uxSF0HZeGyKaaVHz5FroDY9A5NDDiCibrbYR6+khmrhZtY0Bgn6hWq8Gswl9iIlymA+VzCbshWIMX4o2O8C8ng==",
+      "integrity": "sha1-Pq5fkb31rP4DhFEO1T+t3EwHRpM=",
       "dev": true,
       "requires": {
         "@lerna/get-packed": "3.16.0",
@@ -6775,7 +6775,7 @@
         "npm-packlist": {
           "version": "1.4.8",
           "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz",
-          "integrity": "sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==",
+          "integrity": "sha1-Vu5swTW5+YrT1Rwcldoiu7my7z4=",
           "dev": true,
           "requires": {
             "ignore-walk": "^3.0.1",
@@ -6788,7 +6788,7 @@
     "@lerna/package": {
       "version": "3.16.0",
       "resolved": "https://registry.npmjs.org/@lerna/package/-/package-3.16.0.tgz",
-      "integrity": "sha512-2lHBWpaxcBoiNVbtyLtPUuTYEaB/Z+eEqRS9duxpZs6D+mTTZMNy6/5vpEVSCBmzvdYpyqhqaYjjSLvjjr5Riw==",
+      "integrity": "sha1-fgpG5Gl+2LipwU1Zx/iQ4NOLoTw=",
       "dev": true,
       "requires": {
         "load-json-file": "^5.3.0",
@@ -6799,7 +6799,7 @@
         "load-json-file": {
           "version": "5.3.0",
           "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-5.3.0.tgz",
-          "integrity": "sha512-cJGP40Jc/VXUsp8/OrnyKyTZ1y6v/dphm3bioS+RrKXjK2BB6wHUd6JptZEFDGgGahMT+InnZO5i1Ei9mpC8Bw==",
+          "integrity": "sha1-TTweAfocA+p4pgrHr5MsnOU0A/M=",
           "dev": true,
           "requires": {
             "graceful-fs": "^4.1.15",
@@ -6812,7 +6812,7 @@
         "npm-package-arg": {
           "version": "6.1.1",
           "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.1.tgz",
-          "integrity": "sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==",
+          "integrity": "sha1-AhaMsKSaK3W/mIooaY3ntSnfXLc=",
           "dev": true,
           "requires": {
             "hosted-git-info": "^2.7.1",
@@ -6824,13 +6824,13 @@
         "semver": {
           "version": "5.7.1",
           "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "integrity": "sha1-qVT5Ma66UI0we78Gnv8MAclhFvc=",
           "dev": true
         },
         "type-fest": {
           "version": "0.3.1",
           "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz",
-          "integrity": "sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==",
+          "integrity": "sha1-Y9ANIE4FlHT+Xht8ARESu9HcKeE=",
           "dev": true
         }
       }
@@ -6838,7 +6838,7 @@
     "@lerna/package-graph": {
       "version": "3.18.5",
       "resolved": "https://registry.npmjs.org/@lerna/package-graph/-/package-graph-3.18.5.tgz",
-      "integrity": "sha512-8QDrR9T+dBegjeLr+n9WZTVxUYUhIUjUgZ0gvNxUBN8S1WB9r6H5Yk56/MVaB64tA3oGAN9IIxX6w0WvTfFudA==",
+      "integrity": "sha1-x0Di6jV40FnlUWM+lQaQgxuUH2s=",
       "dev": true,
       "requires": {
         "@lerna/prerelease-id-from-version": "3.16.0",
@@ -6851,7 +6851,7 @@
         "npm-package-arg": {
           "version": "6.1.1",
           "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.1.tgz",
-          "integrity": "sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==",
+          "integrity": "sha1-AhaMsKSaK3W/mIooaY3ntSnfXLc=",
           "dev": true,
           "requires": {
             "hosted-git-info": "^2.7.1",
@@ -6863,7 +6863,7 @@
             "semver": {
               "version": "5.7.1",
               "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-              "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+              "integrity": "sha1-qVT5Ma66UI0we78Gnv8MAclhFvc=",
               "dev": true
             }
           }
@@ -6873,7 +6873,7 @@
     "@lerna/prerelease-id-from-version": {
       "version": "3.16.0",
       "resolved": "https://registry.npmjs.org/@lerna/prerelease-id-from-version/-/prerelease-id-from-version-3.16.0.tgz",
-      "integrity": "sha512-qZyeUyrE59uOK8rKdGn7jQz+9uOpAaF/3hbslJVFL1NqF9ELDTqjCPXivuejMX/lN4OgD6BugTO4cR7UTq/sZA==",
+      "integrity": "sha1-skv6eJ9eG6q5FNewi6rpt719g6E=",
       "dev": true,
       "requires": {
         "semver": "^6.2.0"
@@ -6882,7 +6882,7 @@
     "@lerna/profiler": {
       "version": "3.20.0",
       "resolved": "https://registry.npmjs.org/@lerna/profiler/-/profiler-3.20.0.tgz",
-      "integrity": "sha512-bh8hKxAlm6yu8WEOvbLENm42i2v9SsR4WbrCWSbsmOElx3foRnMlYk7NkGECa+U5c3K4C6GeBbwgqs54PP7Ljg==",
+      "integrity": "sha1-D23CNvTqj56l81jGcDMFpPMq0FE=",
       "dev": true,
       "requires": {
         "figgy-pudding": "^3.5.1",
@@ -6916,7 +6916,7 @@
     "@lerna/project": {
       "version": "3.21.0",
       "resolved": "https://registry.npmjs.org/@lerna/project/-/project-3.21.0.tgz",
-      "integrity": "sha512-xT1mrpET2BF11CY32uypV2GPtPVm6Hgtha7D81GQP9iAitk9EccrdNjYGt5UBYASl4CIDXBRxwmTTVGfrCx82A==",
+      "integrity": "sha1-XXhNLRDFYaAPIDILzbBAmXwQUC0=",
       "dev": true,
       "requires": {
         "@lerna/package": "3.16.0",
@@ -6936,7 +6936,7 @@
         "@nodelib/fs.stat": {
           "version": "1.1.3",
           "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz",
-          "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==",
+          "integrity": "sha1-K1o6s/kYzKSKjHVMCBaOPwPrphs=",
           "dev": true
         },
         "array-union": {
@@ -6951,7 +6951,7 @@
         "cosmiconfig": {
           "version": "5.2.1",
           "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
-          "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
+          "integrity": "sha1-BA9yaAnFked6F8CjYmykW08Wixo=",
           "dev": true,
           "requires": {
             "import-fresh": "^2.0.0",
@@ -6972,7 +6972,7 @@
         "fast-glob": {
           "version": "2.2.7",
           "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz",
-          "integrity": "sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==",
+          "integrity": "sha1-aVOFfDr6R1//ku5gFdUtpwpM050=",
           "dev": true,
           "requires": {
             "@mrmlnc/readdir-enhanced": "^2.2.1",
@@ -7018,7 +7018,7 @@
         "globby": {
           "version": "9.2.0",
           "resolved": "https://registry.npmjs.org/globby/-/globby-9.2.0.tgz",
-          "integrity": "sha512-ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg==",
+          "integrity": "sha1-/QKacGxwPSm90XD0tts6P3p8tj0=",
           "dev": true,
           "requires": {
             "@types/glob": "^7.1.1",
@@ -7034,7 +7034,7 @@
         "ignore": {
           "version": "4.0.6",
           "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-          "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+          "integrity": "sha1-dQ49tYYgh7RzfrrIIH/9HvJ7Jfw=",
           "dev": true
         },
         "import-fresh": {
@@ -7058,7 +7058,7 @@
         "load-json-file": {
           "version": "5.3.0",
           "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-5.3.0.tgz",
-          "integrity": "sha512-cJGP40Jc/VXUsp8/OrnyKyTZ1y6v/dphm3bioS+RrKXjK2BB6wHUd6JptZEFDGgGahMT+InnZO5i1Ei9mpC8Bw==",
+          "integrity": "sha1-TTweAfocA+p4pgrHr5MsnOU0A/M=",
           "dev": true,
           "requires": {
             "graceful-fs": "^4.1.15",
@@ -7077,13 +7077,13 @@
         "slash": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
-          "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
+          "integrity": "sha1-3lUoUaF1nfOo8gZTVEL17E3eq0Q=",
           "dev": true
         },
         "type-fest": {
           "version": "0.3.1",
           "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz",
-          "integrity": "sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==",
+          "integrity": "sha1-Y9ANIE4FlHT+Xht8ARESu9HcKeE=",
           "dev": true
         }
       }
@@ -7091,7 +7091,7 @@
     "@lerna/prompt": {
       "version": "3.18.5",
       "resolved": "https://registry.npmjs.org/@lerna/prompt/-/prompt-3.18.5.tgz",
-      "integrity": "sha512-rkKj4nm1twSbBEb69+Em/2jAERK8htUuV8/xSjN0NPC+6UjzAwY52/x9n5cfmpa9lyKf/uItp7chCI7eDmNTKQ==",
+      "integrity": "sha1-YozVRfIliH0GBJGrld+JnPxSGKE=",
       "dev": true,
       "requires": {
         "inquirer": "^6.2.0",
@@ -7214,7 +7214,7 @@
     "@lerna/publish": {
       "version": "3.22.1",
       "resolved": "https://registry.npmjs.org/@lerna/publish/-/publish-3.22.1.tgz",
-      "integrity": "sha512-PG9CM9HUYDreb1FbJwFg90TCBQooGjj+n/pb3gw/eH5mEDq0p8wKdLFe0qkiqUkm/Ub5C8DbVFertIo0Vd0zcw==",
+      "integrity": "sha1-tPfOP7oemvsovkofPYgiImm6lRk=",
       "dev": true,
       "requires": {
         "@evocateur/libnpmaccess": "^3.1.2",
@@ -7272,7 +7272,7 @@
         "npm-package-arg": {
           "version": "6.1.1",
           "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.1.tgz",
-          "integrity": "sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==",
+          "integrity": "sha1-AhaMsKSaK3W/mIooaY3ntSnfXLc=",
           "dev": true,
           "requires": {
             "hosted-git-info": "^2.7.1",
@@ -7284,7 +7284,7 @@
             "semver": {
               "version": "5.7.1",
               "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-              "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+              "integrity": "sha1-qVT5Ma66UI0we78Gnv8MAclhFvc=",
               "dev": true
             }
           }
@@ -7300,7 +7300,7 @@
     "@lerna/pulse-till-done": {
       "version": "3.13.0",
       "resolved": "https://registry.npmjs.org/@lerna/pulse-till-done/-/pulse-till-done-3.13.0.tgz",
-      "integrity": "sha512-1SOHpy7ZNTPulzIbargrgaJX387csN7cF1cLOGZiJQA6VqnS5eWs2CIrG8i8wmaUavj2QlQ5oEbRMVVXSsGrzA==",
+      "integrity": "sha1-yOnOW6+vENkwpn1+0My12Vj+ARA=",
       "dev": true,
       "requires": {
         "npmlog": "^4.1.2"
@@ -7309,7 +7309,7 @@
     "@lerna/query-graph": {
       "version": "3.18.5",
       "resolved": "https://registry.npmjs.org/@lerna/query-graph/-/query-graph-3.18.5.tgz",
-      "integrity": "sha512-50Lf4uuMpMWvJ306be3oQDHrWV42nai9gbIVByPBYJuVW8dT8O8pA3EzitNYBUdLL9/qEVbrR0ry1HD7EXwtRA==",
+      "integrity": "sha1-30gwu1FVJzADvzXo3aHDLQknvYY=",
       "dev": true,
       "requires": {
         "@lerna/package-graph": "3.18.5",
@@ -7319,7 +7319,7 @@
     "@lerna/resolve-symlink": {
       "version": "3.16.0",
       "resolved": "https://registry.npmjs.org/@lerna/resolve-symlink/-/resolve-symlink-3.16.0.tgz",
-      "integrity": "sha512-Ibj5e7njVHNJ/NOqT4HlEgPFPtPLWsO7iu59AM5bJDcAJcR96mLZ7KGVIsS2tvaO7akMEJvt2P+ErwCdloG3jQ==",
+      "integrity": "sha1-N/xwlfq9vPMXwm63Tg0L3o79I4Y=",
       "dev": true,
       "requires": {
         "fs-extra": "^8.1.0",
@@ -7352,7 +7352,7 @@
     "@lerna/rimraf-dir": {
       "version": "3.16.5",
       "resolved": "https://registry.npmjs.org/@lerna/rimraf-dir/-/rimraf-dir-3.16.5.tgz",
-      "integrity": "sha512-bQlKmO0pXUsXoF8lOLknhyQjOZsCc0bosQDoX4lujBXSWxHVTg1VxURtWf2lUjz/ACsJVDfvHZbDm8kyBk5okA==",
+      "integrity": "sha1-BDFqtf/SkJZXqvOI6lAsuMLyCgk=",
       "dev": true,
       "requires": {
         "@lerna/child-process": "3.16.5",
@@ -7364,7 +7364,7 @@
     "@lerna/run": {
       "version": "3.21.0",
       "resolved": "https://registry.npmjs.org/@lerna/run/-/run-3.21.0.tgz",
-      "integrity": "sha512-fJF68rT3veh+hkToFsBmUJ9MHc9yGXA7LSDvhziAojzOb0AI/jBDp6cEcDQyJ7dbnplba2Lj02IH61QUf9oW0Q==",
+      "integrity": "sha1-KjXshJeeTW5CR0/hSNMuXeHKyJE=",
       "dev": true,
       "requires": {
         "@lerna/command": "3.21.0",
@@ -7389,7 +7389,7 @@
     "@lerna/run-lifecycle": {
       "version": "3.16.2",
       "resolved": "https://registry.npmjs.org/@lerna/run-lifecycle/-/run-lifecycle-3.16.2.tgz",
-      "integrity": "sha512-RqFoznE8rDpyyF0rOJy3+KjZCeTkO8y/OB9orPauR7G2xQ7PTdCpgo7EO6ZNdz3Al+k1BydClZz/j78gNCmL2A==",
+      "integrity": "sha1-Z7KI+OqWTbnqT7H7x3FdW7sLzgA=",
       "dev": true,
       "requires": {
         "@lerna/npm-conf": "3.16.0",
@@ -7401,7 +7401,7 @@
     "@lerna/run-topologically": {
       "version": "3.18.5",
       "resolved": "https://registry.npmjs.org/@lerna/run-topologically/-/run-topologically-3.18.5.tgz",
-      "integrity": "sha512-6N1I+6wf4hLOnPW+XDZqwufyIQ6gqoPfHZFkfWlvTQ+Ue7CuF8qIVQ1Eddw5HKQMkxqN10thKOFfq/9NQZ4NUg==",
+      "integrity": "sha1-PNY52iDpZ9dnLLiNsPdWuS8v38M=",
       "dev": true,
       "requires": {
         "@lerna/query-graph": "3.18.5",
@@ -7412,13 +7412,13 @@
         "eventemitter3": {
           "version": "3.1.2",
           "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.2.tgz",
-          "integrity": "sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q==",
+          "integrity": "sha1-LT1I+cNGaY/Og6hdfWZOmFNd9uc=",
           "dev": true
         },
         "p-queue": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-4.0.0.tgz",
-          "integrity": "sha512-3cRXXn3/O0o3+eVmUroJPSj/esxoEFIm0ZOno/T+NzG/VZgPOqQ8WKmlNqubSEpZmCIngEy34unkHGg83ZIBmg==",
+          "integrity": "sha1-7Q7uh5iSftbywvX1t3/bIGGl00Y=",
           "dev": true,
           "requires": {
             "eventemitter3": "^3.1.0"
@@ -7429,7 +7429,7 @@
     "@lerna/symlink-binary": {
       "version": "3.17.0",
       "resolved": "https://registry.npmjs.org/@lerna/symlink-binary/-/symlink-binary-3.17.0.tgz",
-      "integrity": "sha512-RLpy9UY6+3nT5J+5jkM5MZyMmjNHxZIZvXLV+Q3MXrf7Eaa1hNqyynyj4RO95fxbS+EZc4XVSk25DGFQbcRNSQ==",
+      "integrity": "sha1-j4AxswmGOBSIPT8AmHf4Ljiu9Fo=",
       "dev": true,
       "requires": {
         "@lerna/create-symlink": "3.16.2",
@@ -7469,7 +7469,7 @@
     "@lerna/symlink-dependencies": {
       "version": "3.17.0",
       "resolved": "https://registry.npmjs.org/@lerna/symlink-dependencies/-/symlink-dependencies-3.17.0.tgz",
-      "integrity": "sha512-KmjU5YT1bpt6coOmdFueTJ7DFJL4H1w5eF8yAQ2zsGNTtZ+i5SGFBWpb9AQaw168dydc3s4eu0W0Sirda+F59Q==",
+      "integrity": "sha1-SNY2DphYZaDlbNi1GzCKUmMIeEo=",
       "dev": true,
       "requires": {
         "@lerna/create-symlink": "3.16.2",
@@ -7512,13 +7512,13 @@
     "@lerna/timer": {
       "version": "3.13.0",
       "resolved": "https://registry.npmjs.org/@lerna/timer/-/timer-3.13.0.tgz",
-      "integrity": "sha512-RHWrDl8U4XNPqY5MQHkToWS9jHPnkLZEt5VD+uunCKTfzlxGnRCr3/zVr8VGy/uENMYpVP3wJa4RKGY6M0vkRw==",
+      "integrity": "sha1-vNCQRVHbFuCDZNbBjl4hYPyHB4E=",
       "dev": true
     },
     "@lerna/validation-error": {
       "version": "3.13.0",
       "resolved": "https://registry.npmjs.org/@lerna/validation-error/-/validation-error-3.13.0.tgz",
-      "integrity": "sha512-SiJP75nwB8GhgwLKQfdkSnDufAaCbkZWJqEDlKOUPUvVOplRGnfL+BPQZH5nvq2BYSRXsksXWZ4UHVnQZI/HYA==",
+      "integrity": "sha1-yGuPB8WrlTn3db2KVJdukm83WcM=",
       "dev": true,
       "requires": {
         "npmlog": "^4.1.2"
@@ -7527,7 +7527,7 @@
     "@lerna/version": {
       "version": "3.22.1",
       "resolved": "https://registry.npmjs.org/@lerna/version/-/version-3.22.1.tgz",
-      "integrity": "sha512-PSGt/K1hVqreAFoi3zjD0VEDupQ2WZVlVIwesrE5GbrL2BjXowjCsTDPqblahDUPy0hp6h7E2kG855yLTp62+g==",
+      "integrity": "sha1-mAWpJHpH7mLWuBvZ+l+3KLJLWeI=",
       "dev": true,
       "requires": {
         "@lerna/check-working-tree": "3.16.5",
@@ -7561,7 +7561,7 @@
         "load-json-file": {
           "version": "5.3.0",
           "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-5.3.0.tgz",
-          "integrity": "sha512-cJGP40Jc/VXUsp8/OrnyKyTZ1y6v/dphm3bioS+RrKXjK2BB6wHUd6JptZEFDGgGahMT+InnZO5i1Ei9mpC8Bw==",
+          "integrity": "sha1-TTweAfocA+p4pgrHr5MsnOU0A/M=",
           "dev": true,
           "requires": {
             "graceful-fs": "^4.1.15",
@@ -7580,13 +7580,13 @@
         "slash": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
-          "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
+          "integrity": "sha1-3lUoUaF1nfOo8gZTVEL17E3eq0Q=",
           "dev": true
         },
         "type-fest": {
           "version": "0.3.1",
           "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz",
-          "integrity": "sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==",
+          "integrity": "sha1-Y9ANIE4FlHT+Xht8ARESu9HcKeE=",
           "dev": true
         }
       }
@@ -7594,7 +7594,7 @@
     "@lerna/write-log-file": {
       "version": "3.13.0",
       "resolved": "https://registry.npmjs.org/@lerna/write-log-file/-/write-log-file-3.13.0.tgz",
-      "integrity": "sha512-RibeMnDPvlL8bFYW5C8cs4mbI3AHfQef73tnJCQ/SgrXZHehmHnsyWUiE7qDQCAo+B1RfTapvSyFF69iPj326A==",
+      "integrity": "sha1-t42eTPwTSai+ZNkTJMTIGZ6CKiY=",
       "dev": true,
       "requires": {
         "npmlog": "^4.1.2",
@@ -7604,7 +7604,7 @@
         "write-file-atomic": {
           "version": "2.4.3",
           "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz",
-          "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==",
+          "integrity": "sha1-H9Lprh3z51uNjDZ0Q8aS1MqB9IE=",
           "dev": true,
           "requires": {
             "graceful-fs": "^4.1.11",
@@ -7634,7 +7634,7 @@
     "@mrmlnc/readdir-enhanced": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz",
-      "integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==",
+      "integrity": "sha1-UkryQNGjYFJ7cwR17PoTRKpUDd4=",
       "dev": true,
       "requires": {
         "call-me-maybe": "^1.0.1",
@@ -9610,13 +9610,13 @@
     "@octokit/plugin-enterprise-rest": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/@octokit/plugin-enterprise-rest/-/plugin-enterprise-rest-6.0.1.tgz",
-      "integrity": "sha512-93uGjlhUD+iNg1iWhUENAtJata6w5nE+V4urXOAlIXdco6xNZtUSfYY8dzp3Udy74aqO/B5UZL80x/YMa5PKRw==",
+      "integrity": "sha1-4HiWc5YY2rjafUB3xlgAN3X5VDc=",
       "dev": true
     },
     "@octokit/plugin-paginate-rest": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-1.1.2.tgz",
-      "integrity": "sha512-jbsSoi5Q1pj63sC16XIUboklNw+8tL9VOnJsWycWYR78TKss5PVpIPb1TUUcMQ+bBh7cY579cVAWmf5qG+dw+Q==",
+      "integrity": "sha1-AEFwrPjCvlNauiZyeGfWkve0iPw=",
       "dev": true,
       "requires": {
         "@octokit/types": "^2.0.1"
@@ -9625,7 +9625,7 @@
         "@octokit/types": {
           "version": "2.16.2",
           "resolved": "https://registry.npmjs.org/@octokit/types/-/types-2.16.2.tgz",
-          "integrity": "sha512-O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q==",
+          "integrity": "sha1-TF+No8b+zz2hgRrvZ4/aA+2sNdI=",
           "dev": true,
           "requires": {
             "@types/node": ">= 8"
@@ -9642,7 +9642,7 @@
     "@octokit/plugin-rest-endpoint-methods": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-2.4.0.tgz",
-      "integrity": "sha512-EZi/AWhtkdfAYi01obpX0DF7U6b1VRr30QNQ5xSFPITMdLSfhcBqjamE3F+sKcxPbD7eZuMHu3Qkk2V+JGxBDQ==",
+      "integrity": "sha1-Mojs9UgfaMSU3QYC/BVAeln69h4=",
       "dev": true,
       "requires": {
         "@octokit/types": "^2.0.1",
@@ -9652,7 +9652,7 @@
         "@octokit/types": {
           "version": "2.16.2",
           "resolved": "https://registry.npmjs.org/@octokit/types/-/types-2.16.2.tgz",
-          "integrity": "sha512-O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q==",
+          "integrity": "sha1-TF+No8b+zz2hgRrvZ4/aA+2sNdI=",
           "dev": true,
           "requires": {
             "@types/node": ">= 8"
@@ -9702,7 +9702,7 @@
     "@octokit/request-error": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-1.2.1.tgz",
-      "integrity": "sha512-+6yDyk1EES6WK+l3viRDElw96MvwfJxCt45GvmjDUKWjYIb3PJZQkq3i46TwGwoPD4h8NmTrENmtyA1FwbmhRA==",
+      "integrity": "sha1-7eBxTHc/MjR1dsJWSdwBOuazGAE=",
       "dev": true,
       "requires": {
         "@octokit/types": "^2.0.0",
@@ -9713,7 +9713,7 @@
         "@octokit/types": {
           "version": "2.16.2",
           "resolved": "https://registry.npmjs.org/@octokit/types/-/types-2.16.2.tgz",
-          "integrity": "sha512-O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q==",
+          "integrity": "sha1-TF+No8b+zz2hgRrvZ4/aA+2sNdI=",
           "dev": true,
           "requires": {
             "@types/node": ">= 8"
@@ -9724,7 +9724,7 @@
     "@octokit/rest": {
       "version": "16.43.2",
       "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-16.43.2.tgz",
-      "integrity": "sha512-ngDBevLbBTFfrHZeiS7SAMAZ6ssuVmXuya+F/7RaVvlysgGa1JKJkKWY+jV6TCJYcW0OALfJ7nTIGXcBXzycfQ==",
+      "integrity": "sha1-xTQm8eHRBE3ulnAj4yecUJk92Rs=",
       "dev": true,
       "requires": {
         "@octokit/auth-token": "^2.4.0",
@@ -9867,7 +9867,7 @@
     "@restart/context": {
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/@restart/context/-/context-2.1.4.tgz",
-      "integrity": "sha512-INJYZQJP7g+IoDUh/475NlGiTeMfwTXUEr3tmRneckHIxNolGOW9CTq83S8cxq0CgJwwcMzMJFchxvlwe7Rk8Q=="
+      "integrity": "sha1-qZ2HwpmjTCi9hbtInLB7/SMUnAI="
     },
     "@restart/hooks": {
       "version": "0.3.27",
@@ -11321,7 +11321,7 @@
     "@zkochan/cmd-shim": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/@zkochan/cmd-shim/-/cmd-shim-3.1.0.tgz",
-      "integrity": "sha512-o8l0+x7C7sMZU3v9GuJIAU10qQLtwR1dtRQIOmlNMtyaqhmpXOzx1HWiYoWfmmf9HHZoAkXpc9TM9PQYF9d4Jg==",
+      "integrity": "sha1-KrjtgfW7VFKoXyV1jrm4aBmC/S4=",
       "dev": true,
       "requires": {
         "is-windows": "^1.0.0",
@@ -11775,7 +11775,7 @@
     "array-differ": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-2.1.0.tgz",
-      "integrity": "sha512-KbUpJgx909ZscOc/7CLATBFam7P1Z1QRQInvgT0UztM9Q72aGKCunKASAl7WNW0tnPmPyEMeMhdsfWhfmW037w==",
+      "integrity": "sha1-S5wcPxS5BnVwgpJXaeirkE9IAbE=",
       "dev": true
     },
     "array-each": {
@@ -12376,7 +12376,7 @@
     "babel-jest": {
       "version": "25.1.0",
       "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-25.1.0.tgz",
-      "integrity": "sha512-tz0VxUhhOE2y+g8R2oFrO/2VtVjA1lkJeavlhExuRBg3LdNJY9gwQ+Vcvqt9+cqy71MCTJhewvTB7Qtnnr9SWg==",
+      "integrity": "sha1-IGCTrDgKS3jEQEoFsydzkSePgPs=",
       "dev": true,
       "requires": {
         "@jest/transform": "^25.1.0",
@@ -12422,7 +12422,7 @@
         "chalk": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "integrity": "sha1-P3PCv1JlkfV0zEksUeJFY0n4ROQ=",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -12432,7 +12432,7 @@
         "color-convert": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
           "dev": true,
           "requires": {
             "color-name": "~1.1.4"
@@ -12441,19 +12441,19 @@
         "color-name": {
           "version": "1.1.4",
           "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
           "dev": true
         },
         "has-flag": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
           "dev": true
         },
         "supports-color": {
           "version": "7.2.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
           "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
@@ -14448,7 +14448,7 @@
     "byte-size": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/byte-size/-/byte-size-5.0.1.tgz",
-      "integrity": "sha512-/XuKeqWocKsYa/cBY1YbSJSWWqTi4cFgr9S6OyM7PBaPbr9zvNGwWP33vt0uqGhwDdN+y3yhbXVILEUpnwEWGw==",
+      "integrity": "sha1-S2UQOaXs2Wdn5xo9ftOA5IvtQZE=",
       "dev": true
     },
     "bytes": {
@@ -14683,7 +14683,7 @@
     "camelcase-keys": {
       "version": "6.2.2",
       "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
-      "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
+      "integrity": "sha1-XnVda6UaoiPsfT1S8ld4IQ+dw8A=",
       "dev": true,
       "requires": {
         "camelcase": "^5.3.1",
@@ -14963,6 +14963,15 @@
       "integrity": "sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==",
       "dev": true
     },
+    "cli-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
+      "dev": true,
+      "requires": {
+        "restore-cursor": "^3.1.0"
+      }
+    },
     "cli-spinners": {
       "version": "2.6.1",
       "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz",
@@ -15283,7 +15292,7 @@
     "command-exists": {
       "version": "1.2.9",
       "resolved": "https://registry.npmjs.org/command-exists/-/command-exists-1.2.9.tgz",
-      "integrity": "sha512-LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w==",
+      "integrity": "sha1-xQclrzgIyKsCYP1gsB+/oluVT2k=",
       "dev": true
     },
     "commander": {
@@ -15593,7 +15602,7 @@
     "conventional-changelog-core": {
       "version": "3.2.3",
       "resolved": "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-3.2.3.tgz",
-      "integrity": "sha512-LMMX1JlxPIq/Ez5aYAYS5CpuwbOk6QFp8O4HLAcZxe3vxoCtABkhfjetk8IYdRB9CDQGwJFLR3Dr55Za6XKgUQ==",
+      "integrity": "sha1-sxQQhW9DHIRwhqfctNLKGEp9iPs=",
       "dev": true,
       "requires": {
         "conventional-changelog-writer": "^4.0.6",
@@ -15635,7 +15644,7 @@
         "through2": {
           "version": "3.0.2",
           "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz",
-          "integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==",
+          "integrity": "sha1-mfiJMc/HYex2eLQdXXM2tbage/Q=",
           "dev": true,
           "requires": {
             "inherits": "^2.0.4",
@@ -15647,7 +15656,7 @@
     "conventional-changelog-preset-loader": {
       "version": "2.3.4",
       "resolved": "https://registry.npmjs.org/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.3.4.tgz",
-      "integrity": "sha512-GEKRWkrSAZeTq5+YjUZOYxdHq+ci4dNwHvpaBC3+ENalzFWuCWa9EZXSuZBpkr72sMdKB+1fyDV4takK1Lf58g==",
+      "integrity": "sha1-FKhVq7/9WQJ/1gJYHx802YYupEw=",
       "dev": true
     },
     "conventional-changelog-writer": {
@@ -15717,7 +15726,7 @@
     "conventional-recommended-bump": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-5.0.1.tgz",
-      "integrity": "sha512-RVdt0elRcCxL90IrNP0fYCpq1uGt2MALko0eyeQ+zQuDVWtMGAy9ng6yYn3kax42lCj9+XBxQ8ZN6S9bdKxDhQ==",
+      "integrity": "sha1-WvY5A5R7bgied3Z2ActZLKuxBro=",
       "dev": true,
       "requires": {
         "concat-stream": "^2.0.0",
@@ -15750,7 +15759,7 @@
         "concat-stream": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz",
-          "integrity": "sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==",
+          "integrity": "sha1-QUz1r3kKSMYKub5FJ9VtXkETPLE=",
           "dev": true,
           "requires": {
             "buffer-from": "^1.0.0",
@@ -15774,7 +15783,7 @@
         "meow": {
           "version": "4.0.1",
           "resolved": "https://registry.npmjs.org/meow/-/meow-4.0.1.tgz",
-          "integrity": "sha512-xcSBHD5Z86zaOc+781KrupuHAzeGXSLtiAOmBsiLDiPSaYSB6hdew2ng9EBAnZ62jagG9MHAOdxpDi/lWBFJ/A==",
+          "integrity": "sha1-1IWY9vSxRy81v2MXqVlFrONH+XU=",
           "dev": true,
           "requires": {
             "camelcase-keys": "^4.0.0",
@@ -15791,7 +15800,7 @@
         "minimist-options": {
           "version": "3.0.2",
           "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-3.0.2.tgz",
-          "integrity": "sha512-FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ==",
+          "integrity": "sha1-+6TIGRM54T7PTWG+sD8HAQPz2VQ=",
           "dev": true,
           "requires": {
             "arrify": "^1.0.1",
@@ -16566,7 +16575,7 @@
     "dateformat": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz",
-      "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==",
+      "integrity": "sha1-puN0maTZqc+F71hyBE1ikByYia4=",
       "dev": true
     },
     "deasync": {
@@ -16936,7 +16945,7 @@
     "deprecation": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz",
-      "integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==",
+      "integrity": "sha1-Y2jL20Cr8zc7UlrIfkomDDpwCRk=",
       "dev": true
     },
     "deps-sort": {
@@ -18842,7 +18851,7 @@
     "express-ws": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/express-ws/-/express-ws-4.0.0.tgz",
-      "integrity": "sha512-KEyUw8AwRET2iFjFsI1EJQrJ/fHeGiJtgpYgEWG3yDv4l/To/m3a2GaYfeGyB3lsWdvbesjF5XCMx+SVBgAAYw==",
+      "integrity": "sha1-2r2NyXRRZBiQKkH+bjDtlJtNNsQ=",
       "requires": {
         "ws": "^5.2.0"
       },
@@ -20818,7 +20827,7 @@
     "genfun": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/genfun/-/genfun-5.0.0.tgz",
-      "integrity": "sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA==",
+      "integrity": "sha1-ndlxCgaQClxKW/V6yl2k5S/nZTc=",
       "dev": true
     },
     "gensync": {
@@ -21045,7 +21054,7 @@
     "get-port": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/get-port/-/get-port-4.2.0.tgz",
-      "integrity": "sha512-/b3jarXkH8KJoOMQc3uVGHASwGLPq3gSFJ7tgJm2diza+bydJPTGOibin2steecKeOylE8oY2JERlVWkAJO6yw==",
+      "integrity": "sha1-43Nosehjt2KcQ8WjI2Jflc8ksRk=",
       "dev": true
     },
     "get-stdin": {
@@ -21138,7 +21147,7 @@
     "git-raw-commits": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-2.0.0.tgz",
-      "integrity": "sha512-w4jFEJFgKXMQJ0H0ikBk2S+4KP2VEjhCvLCNqbNRQC8BgGWgLKNCO7a9K9LI+TVT7Gfoloje502sEnctibffgg==",
+      "integrity": "sha1-2Srd90RAwUvMXIPszj+3+KeRGLU=",
       "dev": true,
       "requires": {
         "dargs": "^4.0.1",
@@ -21180,7 +21189,7 @@
         "meow": {
           "version": "4.0.1",
           "resolved": "https://registry.npmjs.org/meow/-/meow-4.0.1.tgz",
-          "integrity": "sha512-xcSBHD5Z86zaOc+781KrupuHAzeGXSLtiAOmBsiLDiPSaYSB6hdew2ng9EBAnZ62jagG9MHAOdxpDi/lWBFJ/A==",
+          "integrity": "sha1-1IWY9vSxRy81v2MXqVlFrONH+XU=",
           "dev": true,
           "requires": {
             "camelcase-keys": "^4.0.0",
@@ -21197,7 +21206,7 @@
         "minimist-options": {
           "version": "3.0.2",
           "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-3.0.2.tgz",
-          "integrity": "sha512-FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ==",
+          "integrity": "sha1-+6TIGRM54T7PTWG+sD8HAQPz2VQ=",
           "dev": true,
           "requires": {
             "arrify": "^1.0.1",
@@ -21285,7 +21294,7 @@
     "git-semver-tags": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-2.0.3.tgz",
-      "integrity": "sha512-tj4FD4ww2RX2ae//jSrXZzrocla9db5h0V7ikPl1P/WwoZar9epdUhwR7XHXSgc+ZkNq72BEEerqQuicoEQfzA==",
+      "integrity": "sha1-SJiKcYrPWTgA+ZYiqVKnfEBb+jQ=",
       "dev": true,
       "requires": {
         "meow": "^4.0.0",
@@ -21324,7 +21333,7 @@
         "meow": {
           "version": "4.0.1",
           "resolved": "https://registry.npmjs.org/meow/-/meow-4.0.1.tgz",
-          "integrity": "sha512-xcSBHD5Z86zaOc+781KrupuHAzeGXSLtiAOmBsiLDiPSaYSB6hdew2ng9EBAnZ62jagG9MHAOdxpDi/lWBFJ/A==",
+          "integrity": "sha1-1IWY9vSxRy81v2MXqVlFrONH+XU=",
           "dev": true,
           "requires": {
             "camelcase-keys": "^4.0.0",
@@ -21341,7 +21350,7 @@
         "minimist-options": {
           "version": "3.0.2",
           "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-3.0.2.tgz",
-          "integrity": "sha512-FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ==",
+          "integrity": "sha1-+6TIGRM54T7PTWG+sD8HAQPz2VQ=",
           "dev": true,
           "requires": {
             "arrify": "^1.0.1",
@@ -22077,7 +22086,7 @@
     "hard-rejection": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
-      "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==",
+      "integrity": "sha1-HG7aXBaFxjlCdm15u0Cudzzs2IM=",
       "dev": true
     },
     "harmony-reflect": {
@@ -22730,7 +22739,7 @@
     "init-package-json": {
       "version": "1.10.3",
       "resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-1.10.3.tgz",
-      "integrity": "sha512-zKSiXKhQveNteyhcj1CoOP8tqp1QuxPIPBl8Bid99DGLFqA1p87M6lNgfjJHSBoWJJlidGOv5rWjyYKEB3g2Jw==",
+      "integrity": "sha1-Rf/i9hCoyhNPK9HbVjeyNQcPbL4=",
       "dev": true,
       "requires": {
         "glob": "^7.1.1",
@@ -22746,7 +22755,7 @@
         "npm-package-arg": {
           "version": "6.1.1",
           "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.1.tgz",
-          "integrity": "sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==",
+          "integrity": "sha1-AhaMsKSaK3W/mIooaY3ntSnfXLc=",
           "dev": true,
           "requires": {
             "hosted-git-info": "^2.7.1",
@@ -22758,7 +22767,7 @@
         "semver": {
           "version": "5.7.1",
           "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "integrity": "sha1-qVT5Ma66UI0we78Gnv8MAclhFvc=",
           "dev": true
         }
       }
@@ -29199,7 +29208,7 @@
     "lerna": {
       "version": "3.22.1",
       "resolved": "https://registry.npmjs.org/lerna/-/lerna-3.22.1.tgz",
-      "integrity": "sha512-vk1lfVRFm+UuEFA7wkLKeSF7Iz13W+N/vFd48aW2yuS7Kv0RbNm2/qcDPV863056LMfkRlsEe+QYOw3palj5Lg==",
+      "integrity": "sha1-ggJ6w9qcYn/YvwLM/v+AapjmW2I=",
       "dev": true,
       "requires": {
         "@lerna/add": "3.21.0",
@@ -29662,7 +29671,7 @@
     "lodash.template": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz",
-      "integrity": "sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==",
+      "integrity": "sha1-+XYZXPPzR9DV9SSDVp/oAxzM6Ks=",
       "dev": true,
       "requires": {
         "lodash._reinterpolate": "^3.0.0",
@@ -29672,7 +29681,7 @@
     "lodash.templatesettings": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz",
-      "integrity": "sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==",
+      "integrity": "sha1-5IExDwSdPPbUfpEq0JMTsVTw+zM=",
       "dev": true,
       "requires": {
         "lodash._reinterpolate": "^3.0.0"
@@ -29685,12 +29694,12 @@
       "dev": true
     },
     "log-symbols": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz",
-      "integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
+      "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
       "dev": true,
       "requires": {
-        "chalk": "^2.4.2"
+        "chalk": "^2.0.1"
       }
     },
     "logform": {
@@ -30357,7 +30366,7 @@
     "min-indent": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
-      "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
+      "integrity": "sha1-pj9oFnOzBXH76LwlaGrnRu76mGk=",
       "dev": true
     },
     "mini-css-extract-plugin": {
@@ -30465,7 +30474,7 @@
     "minimist-options": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz",
-      "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
+      "integrity": "sha1-wGVXE8U6ii69d/+iR9NCxA8BBhk=",
       "dev": true,
       "requires": {
         "arrify": "^1.0.1",
@@ -31272,7 +31281,7 @@
     "modify-values": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/modify-values/-/modify-values-1.0.1.tgz",
-      "integrity": "sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==",
+      "integrity": "sha1-s5OfpgVUZHTj4+PGPWS9Q7TuYCI=",
       "dev": true
     },
     "module-deps": {
@@ -31619,7 +31628,7 @@
     "multimatch": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-3.0.0.tgz",
-      "integrity": "sha512-22foS/gqQfANZ3o+W7ST2x25ueHDVNWl/b9OlGcLpy/iKxjCpvcNCM51YCenUi7Mt/jAjjqv8JwZRs8YP5sRjA==",
+      "integrity": "sha1-DiU0zGvCONmrZ+G5zV/Nhabb9ws=",
       "dev": true,
       "requires": {
         "array-differ": "^2.0.3",
@@ -31666,7 +31675,7 @@
     "mz": {
       "version": "2.7.0",
       "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
-      "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
+      "integrity": "sha1-lQCAV6Vsr63CvGPd5/n/aVWUjjI=",
       "dev": true,
       "requires": {
         "any-promise": "^1.0.0",
@@ -32052,15 +32061,6 @@
             "path-exists": "^3.0.0"
           }
         },
-        "log-symbols": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
-          "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.0.1"
-          }
-        },
         "mkdirp": {
           "version": "0.5.4",
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.4.tgz",
@@ -32348,7 +32348,7 @@
     "node-fetch-npm": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.4.tgz",
-      "integrity": "sha512-iOuIQDWDyjhv9qSDrj9aq/klt6F9z1p2otB3AV7v3zBDcL/x+OfGsvGQZZCcMZbUf4Ujw1xGNQkjvGnVT22cKg==",
+      "integrity": "sha1-ZQfQ4XqewL477FFpWKSXzsVL9aQ=",
       "dev": true,
       "requires": {
         "encoding": "^0.1.11",
@@ -35386,7 +35386,7 @@
     "npm-lifecycle": {
       "version": "3.1.5",
       "resolved": "https://registry.npmjs.org/npm-lifecycle/-/npm-lifecycle-3.1.5.tgz",
-      "integrity": "sha512-lDLVkjfZmvmfvpvBzA4vzee9cn+Me4orq0QF8glbswJVEbIcSNWib7qGOffolysc3teCqbbPZZkzbr3GQZTL1g==",
+      "integrity": "sha1-mILTZCuMgsgVeCoS5qG/7tACYwk=",
       "dev": true,
       "requires": {
         "byline": "^5.0.0",
@@ -35402,7 +35402,7 @@
         "node-gyp": {
           "version": "5.1.1",
           "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-5.1.1.tgz",
-          "integrity": "sha512-WH0WKGi+a4i4DUt2mHnvocex/xPLp9pYt5R6M2JdFB7pJ7Z34hveZ4nDTGTiLXCkitA9T8HFZjhinBCiVHYcWw==",
+          "integrity": "sha1-65Ffe2Mck30oLjOu1Ey3oCX2Kj4=",
           "dev": true,
           "requires": {
             "env-paths": "^2.2.0",
@@ -35421,7 +35421,7 @@
         "nopt": {
           "version": "4.0.3",
           "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz",
-          "integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==",
+          "integrity": "sha1-o3XK2dAv2SEnjZVMIlTVqlfhXkg=",
           "dev": true,
           "requires": {
             "abbrev": "1",
@@ -35431,7 +35431,7 @@
         "semver": {
           "version": "5.7.1",
           "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "integrity": "sha1-qVT5Ma66UI0we78Gnv8MAclhFvc=",
           "dev": true
         }
       }
@@ -37523,7 +37523,7 @@
     "octokit-pagination-methods": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/octokit-pagination-methods/-/octokit-pagination-methods-1.1.0.tgz",
-      "integrity": "sha512-fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ==",
+      "integrity": "sha1-z0cu3J1VEFX573P25CtNu0yAvqQ=",
       "dev": true
     },
     "on-finished": {
@@ -37742,6 +37742,23 @@
         "fn.name": "1.x.x"
       }
     },
+    "onetime": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+      "dev": true,
+      "requires": {
+        "mimic-fn": "^2.1.0"
+      },
+      "dependencies": {
+        "mimic-fn": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+          "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+          "dev": true
+        }
+      }
+    },
     "open": {
       "version": "7.4.2",
       "resolved": "https://registry.npmjs.org/open/-/open-7.4.2.tgz",
@@ -37845,15 +37862,6 @@
             "supports-color": "^7.1.0"
           }
         },
-        "cli-cursor": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-          "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-          "dev": true,
-          "requires": {
-            "restore-cursor": "^3.1.0"
-          }
-        },
         "color-convert": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -37875,29 +37883,65 @@
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
-        "mimic-fn": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-          "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-          "dev": true
-        },
-        "onetime": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-          "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-          "dev": true,
-          "requires": {
-            "mimic-fn": "^2.1.0"
-          }
-        },
-        "restore-cursor": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-          "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+        "log-symbols": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz",
+          "integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==",
           "dev": true,
           "requires": {
-            "onetime": "^5.1.0",
-            "signal-exit": "^3.0.2"
+            "chalk": "^2.4.2"
+          },
+          "dependencies": {
+            "ansi-styles": {
+              "version": "3.2.1",
+              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+              "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+              "dev": true,
+              "requires": {
+                "color-convert": "^1.9.0"
+              }
+            },
+            "chalk": {
+              "version": "2.4.2",
+              "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+              "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+              "dev": true,
+              "requires": {
+                "ansi-styles": "^3.2.1",
+                "escape-string-regexp": "^1.0.5",
+                "supports-color": "^5.3.0"
+              }
+            },
+            "color-convert": {
+              "version": "1.9.3",
+              "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+              "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+              "dev": true,
+              "requires": {
+                "color-name": "1.1.3"
+              }
+            },
+            "color-name": {
+              "version": "1.1.3",
+              "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+              "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+              "dev": true
+            },
+            "has-flag": {
+              "version": "3.0.0",
+              "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+              "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+              "dev": true
+            },
+            "supports-color": {
+              "version": "5.5.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+              "dev": true,
+              "requires": {
+                "has-flag": "^3.0.0"
+              }
+            }
           }
         },
         "supports-color": {
@@ -37985,7 +38029,7 @@
     "os-name": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/os-name/-/os-name-3.1.0.tgz",
-      "integrity": "sha512-h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg==",
+      "integrity": "sha1-3sGdlmKW4c1i1wGlpm7h3ernCAE=",
       "dev": true,
       "requires": {
         "macos-release": "^2.2.0",
@@ -39626,7 +39670,7 @@
     "prop-types-extra": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/prop-types-extra/-/prop-types-extra-1.1.1.tgz",
-      "integrity": "sha512-59+AHNnHYCdiC+vMwY52WmvP5dM3QLeoumYuEyceQDi9aEhtwN9zIQ2ZNo25sMyXnbh32h+P1ezDsUpUH3JAew==",
+      "integrity": "sha1-WMO3TL+7ldMEYll1qi8ISDKaAQs=",
       "requires": {
         "react-is": "^16.3.2",
         "warning": "^4.0.0"
@@ -39653,7 +39697,7 @@
     "protoduck": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/protoduck/-/protoduck-5.0.1.tgz",
-      "integrity": "sha512-WxoCeDCoCBY55BMvj4cAEjdVUFGRWed9ZxPlqTKYyw1nDDTQ4pqmnIMAGfJlg7Dx35uB/M+PHJPTmGOvaCaPTg==",
+      "integrity": "sha1-A8NlnKGAB7aaUP2Cp+vMUWJhFR8=",
       "dev": true,
       "requires": {
         "genfun": "^5.0.0"
@@ -39865,7 +39909,7 @@
     "quick-lru": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
-      "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
+      "integrity": "sha1-W4h48ROlgheEjGSCAmxz4bpXcn8=",
       "dev": true
     },
     "raf-schd": {
@@ -40048,7 +40092,7 @@
     "react-lifecycles-compat": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
-      "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
+      "integrity": "sha1-TxonOv38jzSIqMUWv9p4+HI1I2I="
     },
     "react-overlays": {
       "version": "5.1.1",
@@ -40156,7 +40200,7 @@
     "read-cmd-shim": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-1.0.5.tgz",
-      "integrity": "sha512-v5yCqQ/7okKoZZkBQUAfTsQ3sVJtXdNfbPnI5cceppoxEVLYA3k+VtV2omkeo8MS94JCy4fSiUwlRBAwCVRPUA==",
+      "integrity": "sha1-h+Q+ulAJi6WjLQzrWDq45DuWHBY=",
       "dev": true,
       "requires": {
         "graceful-fs": "^4.1.2"
@@ -40228,7 +40272,7 @@
     "read-package-tree": {
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.3.1.tgz",
-      "integrity": "sha512-mLUDsD5JVtlZxjSlPPx1RETkNjjvQYuweKwNVt1Sn8kP5Jh44pvYuUHCp6xSVDZWbNxVxG5lyZJ921aJH61sTw==",
+      "integrity": "sha1-oyy2TH8x64pvMe8G+c7fdAaP5jY=",
       "dev": true,
       "requires": {
         "read-package-json": "^2.0.0",
@@ -40417,7 +40461,7 @@
     "redent": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
-      "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
+      "integrity": "sha1-5Ve3mYMWu1PJ8fVvpiY1LGljBZ8=",
       "dev": true,
       "requires": {
         "indent-string": "^4.0.0",
@@ -40788,6 +40832,16 @@
         "lowercase-keys": "^1.0.0"
       }
     },
+    "restore-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
+      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+      "dev": true,
+      "requires": {
+        "onetime": "^5.1.0",
+        "signal-exit": "^3.0.2"
+      }
+    },
     "resumer": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz",
@@ -41617,6 +41671,28 @@
             "path-key": "^3.1.0",
             "shebang-command": "^2.0.0",
             "which": "^2.0.1"
+          },
+          "dependencies": {
+            "readable-stream": {
+              "version": "2.3.7",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+              "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+              "requires": {
+                "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",
+                "util-deprecate": "~1.0.1"
+              },
+              "dependencies": {
+                "safe-buffer": {
+                  "version": "5.1.2",
+                  "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+                  "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+                }
+              }
+            }
           }
         },
         "decompress-response": {
@@ -41634,6 +41710,16 @@
           "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==",
           "dev": true
         },
+        "form-data": {
+          "version": "2.3.3",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+          "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+          "requires": {
+            "asynckit": "^0.4.0",
+            "combined-stream": "^1.0.6",
+            "mime-types": "^2.1.12"
+          }
+        },
         "fs-extra": {
           "version": "10.0.0",
           "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
@@ -41734,6 +41820,43 @@
           "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
           "dev": true
         },
+        "punycode": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
+        },
+        "qs": {
+          "version": "6.5.2",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+          "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
+        },
+        "request": {
+          "version": "2.88.0",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
+          "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
+          "requires": {
+            "aws-sign2": "~0.7.0",
+            "aws4": "^1.8.0",
+            "caseless": "~0.12.0",
+            "combined-stream": "~1.0.6",
+            "extend": "~3.0.2",
+            "forever-agent": "~0.6.1",
+            "form-data": "~2.3.2",
+            "har-validator": "~5.1.0",
+            "http-signature": "~1.2.0",
+            "is-typedarray": "~1.0.0",
+            "isstream": "~0.1.2",
+            "json-stringify-safe": "~5.0.1",
+            "mime-types": "~2.1.19",
+            "oauth-sign": "~0.9.0",
+            "performance-now": "^2.1.0",
+            "qs": "~6.5.2",
+            "safe-buffer": "^5.1.2",
+            "tough-cookie": "~2.4.3",
+            "tunnel-agent": "^0.6.0",
+            "uuid": "^3.3.2"
+          }
+        },
         "responselike": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.0.tgz",
@@ -41758,6 +41881,28 @@
           "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
           "dev": true
         },
+        "tar-stream": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
+          "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
+          "dev": true,
+          "requires": {
+            "bl": "^4.0.3",
+            "end-of-stream": "^1.4.1",
+            "fs-constants": "^1.0.0",
+            "inherits": "^2.0.3",
+            "readable-stream": "^3.1.1"
+          }
+        },
+        "tough-cookie": {
+          "version": "2.4.3",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
+          "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
+          "requires": {
+            "psl": "^1.1.24",
+            "punycode": "^1.4.1"
+          }
+        },
         "universalify": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
@@ -42357,7 +42502,7 @@
     "solc": {
       "version": "0.7.4",
       "resolved": "https://registry.npmjs.org/solc/-/solc-0.7.4.tgz",
-      "integrity": "sha512-IVLqAfUkJqgTS0JIgFPeC50ehUeBXu2eE+iU+rqb6UeOyf6w/BB/EsNcTSTpjtUti8BTG/sCd2qVhrWVYy7p0g==",
+      "integrity": "sha1-nF7YGuBpLj5hTkfNW1ALD5SFuY0=",
       "dev": true,
       "requires": {
         "command-exists": "^1.2.8",
@@ -42374,7 +42519,7 @@
         "commander": {
           "version": "3.0.2",
           "resolved": "https://registry.npmjs.org/commander/-/commander-3.0.2.tgz",
-          "integrity": "sha512-Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow==",
+          "integrity": "sha1-aDfD+2d62ZM9HPukLdFNURfWs54=",
           "dev": true
         },
         "fs-extra": {
@@ -42402,7 +42547,7 @@
         "semver": {
           "version": "5.7.1",
           "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "integrity": "sha1-qVT5Ma66UI0we78Gnv8MAclhFvc=",
           "dev": true
         },
         "tmp": {
@@ -42583,7 +42728,7 @@
     "split": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
-      "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
+      "integrity": "sha1-YFvZvjA6pZ+zX5Ip++oN3snqB9k=",
       "dev": true,
       "requires": {
         "through": "2"
@@ -43068,7 +43213,7 @@
     "strip-indent": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
-      "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
+      "integrity": "sha1-wy4c7pQLazQyx3G8LFS8znPNMAE=",
       "dev": true,
       "requires": {
         "min-indent": "^1.0.0"
@@ -43082,7 +43227,7 @@
     "strong-log-transformer": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz",
-      "integrity": "sha512-B3Hgul+z0L9a236FAUC9iZsL+nVHgoCJnqCbN588DjYxvGXaXaaFbfmQ/JhvKjZwsOukuR72XbHv71Qkug0HxA==",
+      "integrity": "sha1-D17XjTJeBCGsb5D38Q5pHWrjrhA=",
       "dev": true,
       "requires": {
         "duplexer": "^0.1.1",
@@ -43927,7 +44072,7 @@
         "make-dir": {
           "version": "1.3.0",
           "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
-          "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
+          "integrity": "sha1-ecEDO4BRW9bSTsmTPoYMp17ifww=",
           "dev": true,
           "requires": {
             "pify": "^3.0.0"
@@ -44179,7 +44324,7 @@
     "text-extensions": {
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-1.9.0.tgz",
-      "integrity": "sha512-wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ==",
+      "integrity": "sha1-GFPkX+45yUXOb2w2stZZtaq8KiY=",
       "dev": true
     },
     "text-hex": {
@@ -44196,7 +44341,7 @@
     "thenify": {
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
-      "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
+      "integrity": "sha1-iTLmhqQGYDigFt2eLKRq3Zg4qV8=",
       "dev": true,
       "requires": {
         "any-promise": "^1.0.0"
@@ -45276,7 +45421,7 @@
     "universal-user-agent": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-4.0.1.tgz",
-      "integrity": "sha512-LnST3ebHwVL2aNe4mejI9IQh2HfZ1RLo8Io2HugSif8ekzD1TlWpHpColOB/eh8JHMLkGH3Akqf040I+4ylNxg==",
+      "integrity": "sha1-/Y1st3OmeacJ6WfvgoijH8wD5Vc=",
       "dev": true,
       "requires": {
         "os-name": "^3.1.0"
@@ -45915,7 +46060,7 @@
     "warning": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
-      "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
+      "integrity": "sha1-Fungd+uKhtavfWSqHgX9hbRnjKM=",
       "requires": {
         "loose-envify": "^1.0.0"
       }
@@ -47413,7 +47558,7 @@
     "write-json-file": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/write-json-file/-/write-json-file-3.2.0.tgz",
-      "integrity": "sha512-3xZqT7Byc2uORAatYiP3DHUUAVEkNOswEWNs9H5KXiicRTvzYzYqKjYc4G7p+8pltvAw641lVByKVtMpf+4sYQ==",
+      "integrity": "sha1-Zbvcns2KFFjhWVJ3DMut/P9f5io=",
       "dev": true,
       "requires": {
         "detect-indent": "^5.0.0",
@@ -47436,7 +47581,7 @@
         "write-file-atomic": {
           "version": "2.4.3",
           "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz",
-          "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==",
+          "integrity": "sha1-H9Lprh3z51uNjDZ0Q8aS1MqB9IE=",
           "dev": true,
           "requires": {
             "graceful-fs": "^4.1.11",
@@ -47449,7 +47594,7 @@
     "write-pkg": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/write-pkg/-/write-pkg-3.2.0.tgz",
-      "integrity": "sha512-tX2ifZ0YqEFOF1wjRW2Pk93NLsj02+n1UP5RvO6rCs0K6R2g1padvf006cY74PQJKMGS2r42NK7FD0dG6Y6paw==",
+      "integrity": "sha1-DheP6Xgg04mokovHlTXb5ows/yE=",
       "dev": true,
       "requires": {
         "sort-keys": "^2.0.0",
@@ -47459,7 +47604,7 @@
         "make-dir": {
           "version": "1.3.0",
           "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
-          "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
+          "integrity": "sha1-ecEDO4BRW9bSTsmTPoYMp17ifww=",
           "dev": true,
           "requires": {
             "pify": "^3.0.0"
@@ -47483,7 +47628,7 @@
         "write-file-atomic": {
           "version": "2.4.3",
           "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz",
-          "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==",
+          "integrity": "sha1-H9Lprh3z51uNjDZ0Q8aS1MqB9IE=",
           "dev": true,
           "requires": {
             "graceful-fs": "^4.1.11",
diff --git a/package.json b/package.json
index 16e53e4066..99bd654545 100644
--- a/package.json
+++ b/package.json
@@ -95,6 +95,7 @@
     "nightwatch_local_url": "npm run build:e2e && nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js dist/apps/remix-ide-e2e/src/tests/url.test.js --env=chrome",
     "nightwatch_local_verticalIconscontextmenu": "npm run build:e2e && nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js dist/apps/remix-ide-e2e/src/tests/verticalIconsPanel.test.js --env=chrome",
     "nightwatch_local_pluginApi": "npm run build:e2e && nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js dist/apps/remix-ide-e2e/src/tests/plugin_api_*.js --env=chrome",
+    "nightwatch_local_migrate_filesystem": "npm run build:e2e && nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js dist/apps/remix-ide-e2e/src/tests/migrateFileSystem.test.js --env=chrome",
     "onchange": "onchange apps/remix-ide/build/app.js -- npm-run-all lint",
     "remixd": "nx build remixd && chmod +x dist/libs/remixd/src/bin/remixd.js && dist/libs/remixd/src/bin/remixd.js -s ./apps/remix-ide/contracts --remix-ide http://127.0.0.1:8080",
     "selenium": "selenium-standalone start",
diff --git a/workspace.json b/workspace.json
index 8e78b40751..dc00725dc8 100644
--- a/workspace.json
+++ b/workspace.json
@@ -1196,11 +1196,6 @@
         "linter": "eslint"
       }
     },
-    "@nrwl/cypress": {
-      "cypress-project": {
-        "linter": "eslint"
-      }
-    },
     "@nrwl/react": {
       "application": {
         "style": "css",