diff --git a/app/send-token.html b/app/home.html similarity index 74% rename from app/send-token.html rename to app/home.html index 5f98e1072..b7b8adbeb 100644 --- a/app/send-token.html +++ b/app/home.html @@ -6,6 +6,6 @@
- + diff --git a/app/scripts/popup-core.js b/app/scripts/popup-core.js index f1eb394d7..156be795a 100644 --- a/app/scripts/popup-core.js +++ b/app/scripts/popup-core.js @@ -2,7 +2,7 @@ const EventEmitter = require('events').EventEmitter const async = require('async') const Dnode = require('dnode') const EthQuery = require('eth-query') -const launchMetamaskUi = require('../../ui') +const launchMetamaskUi = require('../../ui/classic') const StreamProvider = require('web3-stream-provider') const setupMultiplex = require('./lib/stream-utils.js').setupMultiplex diff --git a/app/scripts/responsive-core.js b/app/scripts/responsive-core.js new file mode 100644 index 000000000..3760facfa --- /dev/null +++ b/app/scripts/responsive-core.js @@ -0,0 +1,54 @@ +const EventEmitter = require('events').EventEmitter +const async = require('async') +const Dnode = require('dnode') +const EthQuery = require('eth-query') +const launchMetamaskUi = require('../../ui/responsive') +const StreamProvider = require('web3-stream-provider') +const setupMultiplex = require('./lib/stream-utils.js').setupMultiplex + + +module.exports = initializePopup + + +function initializePopup ({ container, connectionStream }, cb) { + // setup app + async.waterfall([ + (cb) => connectToAccountManager(connectionStream, cb), + (accountManager, cb) => launchMetamaskUi({ container, accountManager }, cb), + ], cb) +} + +function connectToAccountManager (connectionStream, cb) { + // setup communication with background + // setup multiplexing + var mx = setupMultiplex(connectionStream) + // connect features + setupControllerConnection(mx.createStream('controller'), cb) + setupWeb3Connection(mx.createStream('provider')) +} + +function setupWeb3Connection (connectionStream) { + var providerStream = new StreamProvider() + providerStream.pipe(connectionStream).pipe(providerStream) + connectionStream.on('error', console.error.bind(console)) + providerStream.on('error', console.error.bind(console)) + global.ethereumProvider = providerStream + global.ethQuery = new EthQuery(providerStream) +} + +function setupControllerConnection (connectionStream, cb) { + // this is a really sneaky way of adding EventEmitter api + // to a bi-directional dnode instance + var eventEmitter = new EventEmitter() + var accountManagerDnode = Dnode({ + sendUpdate: function (state) { + eventEmitter.emit('update', state) + }, + }) + connectionStream.pipe(accountManagerDnode).pipe(connectionStream) + accountManagerDnode.once('remote', function (accountManager) { + // setup push events + accountManager.on = eventEmitter.on.bind(eventEmitter) + cb(null, accountManager) + }) +} diff --git a/app/scripts/send-token.js b/app/scripts/responsive.js similarity index 95% rename from app/scripts/send-token.js rename to app/scripts/responsive.js index 9e6868884..512065309 100644 --- a/app/scripts/send-token.js +++ b/app/scripts/responsive.js @@ -1,4 +1,4 @@ -const startPopup = require('./popup-core') +const startPopup = require('./responsive-core') const PortStream = require('./lib/port-stream.js') const ExtensionPlatform = require('./platforms/extension') const extension = require('extensionizer') diff --git a/ui/.gitignore b/ui/classic/.gitignore similarity index 100% rename from ui/.gitignore rename to ui/classic/.gitignore diff --git a/ui/app/account-detail.js b/ui/classic/app/account-detail.js similarity index 100% rename from ui/app/account-detail.js rename to ui/classic/app/account-detail.js diff --git a/ui/app/accounts/account-list-item.js b/ui/classic/app/accounts/account-list-item.js similarity index 100% rename from ui/app/accounts/account-list-item.js rename to ui/classic/app/accounts/account-list-item.js diff --git a/ui/app/accounts/import/index.js b/ui/classic/app/accounts/import/index.js similarity index 100% rename from ui/app/accounts/import/index.js rename to ui/classic/app/accounts/import/index.js diff --git a/ui/app/accounts/import/json.js b/ui/classic/app/accounts/import/json.js similarity index 100% rename from ui/app/accounts/import/json.js rename to ui/classic/app/accounts/import/json.js diff --git a/ui/app/accounts/import/private-key.js b/ui/classic/app/accounts/import/private-key.js similarity index 100% rename from ui/app/accounts/import/private-key.js rename to ui/classic/app/accounts/import/private-key.js diff --git a/ui/app/accounts/import/seed.js b/ui/classic/app/accounts/import/seed.js similarity index 100% rename from ui/app/accounts/import/seed.js rename to ui/classic/app/accounts/import/seed.js diff --git a/ui/app/accounts/index.js b/ui/classic/app/accounts/index.js similarity index 100% rename from ui/app/accounts/index.js rename to ui/classic/app/accounts/index.js diff --git a/ui/app/actions.js b/ui/classic/app/actions.js similarity index 100% rename from ui/app/actions.js rename to ui/classic/app/actions.js diff --git a/ui/app/add-token.js b/ui/classic/app/add-token.js similarity index 100% rename from ui/app/add-token.js rename to ui/classic/app/add-token.js diff --git a/ui/app/app.js b/ui/classic/app/app.js similarity index 100% rename from ui/app/app.js rename to ui/classic/app/app.js diff --git a/ui/app/components/account-export.js b/ui/classic/app/components/account-export.js similarity index 100% rename from ui/app/components/account-export.js rename to ui/classic/app/components/account-export.js diff --git a/ui/app/components/account-info-link.js b/ui/classic/app/components/account-info-link.js similarity index 100% rename from ui/app/components/account-info-link.js rename to ui/classic/app/components/account-info-link.js diff --git a/ui/app/components/account-panel.js b/ui/classic/app/components/account-panel.js similarity index 100% rename from ui/app/components/account-panel.js rename to ui/classic/app/components/account-panel.js diff --git a/ui/app/components/balance.js b/ui/classic/app/components/balance.js similarity index 100% rename from ui/app/components/balance.js rename to ui/classic/app/components/balance.js diff --git a/ui/app/components/binary-renderer.js b/ui/classic/app/components/binary-renderer.js similarity index 100% rename from ui/app/components/binary-renderer.js rename to ui/classic/app/components/binary-renderer.js diff --git a/ui/app/components/bn-as-decimal-input.js b/ui/classic/app/components/bn-as-decimal-input.js similarity index 100% rename from ui/app/components/bn-as-decimal-input.js rename to ui/classic/app/components/bn-as-decimal-input.js diff --git a/ui/app/components/buy-button-subview.js b/ui/classic/app/components/buy-button-subview.js similarity index 100% rename from ui/app/components/buy-button-subview.js rename to ui/classic/app/components/buy-button-subview.js diff --git a/ui/app/components/coinbase-form.js b/ui/classic/app/components/coinbase-form.js similarity index 100% rename from ui/app/components/coinbase-form.js rename to ui/classic/app/components/coinbase-form.js diff --git a/ui/app/components/copyButton.js b/ui/classic/app/components/copyButton.js similarity index 100% rename from ui/app/components/copyButton.js rename to ui/classic/app/components/copyButton.js diff --git a/ui/app/components/copyable.js b/ui/classic/app/components/copyable.js similarity index 100% rename from ui/app/components/copyable.js rename to ui/classic/app/components/copyable.js diff --git a/ui/app/components/custom-radio-list.js b/ui/classic/app/components/custom-radio-list.js similarity index 100% rename from ui/app/components/custom-radio-list.js rename to ui/classic/app/components/custom-radio-list.js diff --git a/ui/app/components/drop-menu-item.js b/ui/classic/app/components/drop-menu-item.js similarity index 100% rename from ui/app/components/drop-menu-item.js rename to ui/classic/app/components/drop-menu-item.js diff --git a/ui/app/components/editable-label.js b/ui/classic/app/components/editable-label.js similarity index 100% rename from ui/app/components/editable-label.js rename to ui/classic/app/components/editable-label.js diff --git a/ui/app/components/ens-input.js b/ui/classic/app/components/ens-input.js similarity index 100% rename from ui/app/components/ens-input.js rename to ui/classic/app/components/ens-input.js diff --git a/ui/app/components/eth-balance.js b/ui/classic/app/components/eth-balance.js similarity index 100% rename from ui/app/components/eth-balance.js rename to ui/classic/app/components/eth-balance.js diff --git a/ui/app/components/fiat-value.js b/ui/classic/app/components/fiat-value.js similarity index 100% rename from ui/app/components/fiat-value.js rename to ui/classic/app/components/fiat-value.js diff --git a/ui/app/components/hex-as-decimal-input.js b/ui/classic/app/components/hex-as-decimal-input.js similarity index 100% rename from ui/app/components/hex-as-decimal-input.js rename to ui/classic/app/components/hex-as-decimal-input.js diff --git a/ui/app/components/identicon.js b/ui/classic/app/components/identicon.js similarity index 100% rename from ui/app/components/identicon.js rename to ui/classic/app/components/identicon.js diff --git a/ui/app/components/loading.js b/ui/classic/app/components/loading.js similarity index 100% rename from ui/app/components/loading.js rename to ui/classic/app/components/loading.js diff --git a/ui/app/components/mascot.js b/ui/classic/app/components/mascot.js similarity index 100% rename from ui/app/components/mascot.js rename to ui/classic/app/components/mascot.js diff --git a/ui/app/components/mini-account-panel.js b/ui/classic/app/components/mini-account-panel.js similarity index 100% rename from ui/app/components/mini-account-panel.js rename to ui/classic/app/components/mini-account-panel.js diff --git a/ui/app/components/network.js b/ui/classic/app/components/network.js similarity index 100% rename from ui/app/components/network.js rename to ui/classic/app/components/network.js diff --git a/ui/app/components/notice.js b/ui/classic/app/components/notice.js similarity index 100% rename from ui/app/components/notice.js rename to ui/classic/app/components/notice.js diff --git a/ui/app/components/pending-msg-details.js b/ui/classic/app/components/pending-msg-details.js similarity index 100% rename from ui/app/components/pending-msg-details.js rename to ui/classic/app/components/pending-msg-details.js diff --git a/ui/app/components/pending-msg.js b/ui/classic/app/components/pending-msg.js similarity index 100% rename from ui/app/components/pending-msg.js rename to ui/classic/app/components/pending-msg.js diff --git a/ui/app/components/pending-personal-msg-details.js b/ui/classic/app/components/pending-personal-msg-details.js similarity index 100% rename from ui/app/components/pending-personal-msg-details.js rename to ui/classic/app/components/pending-personal-msg-details.js diff --git a/ui/app/components/pending-personal-msg.js b/ui/classic/app/components/pending-personal-msg.js similarity index 100% rename from ui/app/components/pending-personal-msg.js rename to ui/classic/app/components/pending-personal-msg.js diff --git a/ui/app/components/pending-tx.js b/ui/classic/app/components/pending-tx.js similarity index 100% rename from ui/app/components/pending-tx.js rename to ui/classic/app/components/pending-tx.js diff --git a/ui/app/components/qr-code.js b/ui/classic/app/components/qr-code.js similarity index 100% rename from ui/app/components/qr-code.js rename to ui/classic/app/components/qr-code.js diff --git a/ui/app/components/range-slider.js b/ui/classic/app/components/range-slider.js similarity index 100% rename from ui/app/components/range-slider.js rename to ui/classic/app/components/range-slider.js diff --git a/ui/app/components/shapeshift-form.js b/ui/classic/app/components/shapeshift-form.js similarity index 100% rename from ui/app/components/shapeshift-form.js rename to ui/classic/app/components/shapeshift-form.js diff --git a/ui/app/components/shift-list-item.js b/ui/classic/app/components/shift-list-item.js similarity index 100% rename from ui/app/components/shift-list-item.js rename to ui/classic/app/components/shift-list-item.js diff --git a/ui/app/components/tab-bar.js b/ui/classic/app/components/tab-bar.js similarity index 100% rename from ui/app/components/tab-bar.js rename to ui/classic/app/components/tab-bar.js diff --git a/ui/app/components/template.js b/ui/classic/app/components/template.js similarity index 100% rename from ui/app/components/template.js rename to ui/classic/app/components/template.js diff --git a/ui/app/components/token-cell.js b/ui/classic/app/components/token-cell.js similarity index 100% rename from ui/app/components/token-cell.js rename to ui/classic/app/components/token-cell.js diff --git a/ui/app/components/token-list.js b/ui/classic/app/components/token-list.js similarity index 100% rename from ui/app/components/token-list.js rename to ui/classic/app/components/token-list.js diff --git a/ui/app/components/tooltip.js b/ui/classic/app/components/tooltip.js similarity index 100% rename from ui/app/components/tooltip.js rename to ui/classic/app/components/tooltip.js diff --git a/ui/app/components/transaction-list-item-icon.js b/ui/classic/app/components/transaction-list-item-icon.js similarity index 100% rename from ui/app/components/transaction-list-item-icon.js rename to ui/classic/app/components/transaction-list-item-icon.js diff --git a/ui/app/components/transaction-list-item.js b/ui/classic/app/components/transaction-list-item.js similarity index 100% rename from ui/app/components/transaction-list-item.js rename to ui/classic/app/components/transaction-list-item.js diff --git a/ui/app/components/transaction-list.js b/ui/classic/app/components/transaction-list.js similarity index 100% rename from ui/app/components/transaction-list.js rename to ui/classic/app/components/transaction-list.js diff --git a/ui/app/conf-tx.js b/ui/classic/app/conf-tx.js similarity index 100% rename from ui/app/conf-tx.js rename to ui/classic/app/conf-tx.js diff --git a/ui/app/config.js b/ui/classic/app/config.js similarity index 100% rename from ui/app/config.js rename to ui/classic/app/config.js diff --git a/ui/app/conversion.json b/ui/classic/app/conversion.json similarity index 100% rename from ui/app/conversion.json rename to ui/classic/app/conversion.json diff --git a/ui/app/css/debug.css b/ui/classic/app/css/debug.css similarity index 100% rename from ui/app/css/debug.css rename to ui/classic/app/css/debug.css diff --git a/ui/app/css/fonts.css b/ui/classic/app/css/fonts.css similarity index 100% rename from ui/app/css/fonts.css rename to ui/classic/app/css/fonts.css diff --git a/ui/app/css/index.css b/ui/classic/app/css/index.css similarity index 100% rename from ui/app/css/index.css rename to ui/classic/app/css/index.css diff --git a/ui/app/css/lib.css b/ui/classic/app/css/lib.css similarity index 100% rename from ui/app/css/lib.css rename to ui/classic/app/css/lib.css diff --git a/ui/app/css/reset.css b/ui/classic/app/css/reset.css similarity index 100% rename from ui/app/css/reset.css rename to ui/classic/app/css/reset.css diff --git a/ui/app/css/transitions.css b/ui/classic/app/css/transitions.css similarity index 100% rename from ui/app/css/transitions.css rename to ui/classic/app/css/transitions.css diff --git a/ui/app/first-time/init-menu.js b/ui/classic/app/first-time/init-menu.js similarity index 100% rename from ui/app/first-time/init-menu.js rename to ui/classic/app/first-time/init-menu.js diff --git a/ui/app/img/identicon-tardigrade.png b/ui/classic/app/img/identicon-tardigrade.png similarity index 100% rename from ui/app/img/identicon-tardigrade.png rename to ui/classic/app/img/identicon-tardigrade.png diff --git a/ui/app/img/identicon-walrus.png b/ui/classic/app/img/identicon-walrus.png similarity index 100% rename from ui/app/img/identicon-walrus.png rename to ui/classic/app/img/identicon-walrus.png diff --git a/ui/app/info.js b/ui/classic/app/info.js similarity index 100% rename from ui/app/info.js rename to ui/classic/app/info.js diff --git a/ui/app/keychains/hd/create-vault-complete.js b/ui/classic/app/keychains/hd/create-vault-complete.js similarity index 100% rename from ui/app/keychains/hd/create-vault-complete.js rename to ui/classic/app/keychains/hd/create-vault-complete.js diff --git a/ui/app/keychains/hd/recover-seed/confirmation.js b/ui/classic/app/keychains/hd/recover-seed/confirmation.js similarity index 100% rename from ui/app/keychains/hd/recover-seed/confirmation.js rename to ui/classic/app/keychains/hd/recover-seed/confirmation.js diff --git a/ui/app/keychains/hd/restore-vault.js b/ui/classic/app/keychains/hd/restore-vault.js similarity index 100% rename from ui/app/keychains/hd/restore-vault.js rename to ui/classic/app/keychains/hd/restore-vault.js diff --git a/ui/app/new-keychain.js b/ui/classic/app/new-keychain.js similarity index 100% rename from ui/app/new-keychain.js rename to ui/classic/app/new-keychain.js diff --git a/ui/app/reducers.js b/ui/classic/app/reducers.js similarity index 100% rename from ui/app/reducers.js rename to ui/classic/app/reducers.js diff --git a/ui/app/reducers/app.js b/ui/classic/app/reducers/app.js similarity index 100% rename from ui/app/reducers/app.js rename to ui/classic/app/reducers/app.js diff --git a/ui/app/reducers/identities.js b/ui/classic/app/reducers/identities.js similarity index 100% rename from ui/app/reducers/identities.js rename to ui/classic/app/reducers/identities.js diff --git a/ui/app/reducers/metamask.js b/ui/classic/app/reducers/metamask.js similarity index 100% rename from ui/app/reducers/metamask.js rename to ui/classic/app/reducers/metamask.js diff --git a/ui/app/root.js b/ui/classic/app/root.js similarity index 100% rename from ui/app/root.js rename to ui/classic/app/root.js diff --git a/ui/app/send.js b/ui/classic/app/send.js similarity index 100% rename from ui/app/send.js rename to ui/classic/app/send.js diff --git a/ui/app/settings.js b/ui/classic/app/settings.js similarity index 100% rename from ui/app/settings.js rename to ui/classic/app/settings.js diff --git a/ui/app/store.js b/ui/classic/app/store.js similarity index 100% rename from ui/app/store.js rename to ui/classic/app/store.js diff --git a/ui/app/template.js b/ui/classic/app/template.js similarity index 100% rename from ui/app/template.js rename to ui/classic/app/template.js diff --git a/ui/app/unlock.js b/ui/classic/app/unlock.js similarity index 100% rename from ui/app/unlock.js rename to ui/classic/app/unlock.js diff --git a/ui/app/util.js b/ui/classic/app/util.js similarity index 100% rename from ui/app/util.js rename to ui/classic/app/util.js diff --git a/ui/css.js b/ui/classic/css.js similarity index 100% rename from ui/css.js rename to ui/classic/css.js diff --git a/ui/design/00-metamask-SignIn.jpg b/ui/classic/design/00-metamask-SignIn.jpg similarity index 100% rename from ui/design/00-metamask-SignIn.jpg rename to ui/classic/design/00-metamask-SignIn.jpg diff --git a/ui/design/01-metamask-SelectAcc.jpg b/ui/classic/design/01-metamask-SelectAcc.jpg similarity index 100% rename from ui/design/01-metamask-SelectAcc.jpg rename to ui/classic/design/01-metamask-SelectAcc.jpg diff --git a/ui/design/02-metamask-AccDetails.jpg b/ui/classic/design/02-metamask-AccDetails.jpg similarity index 100% rename from ui/design/02-metamask-AccDetails.jpg rename to ui/classic/design/02-metamask-AccDetails.jpg diff --git a/ui/design/02a-metamask-AccDetails-OverToken.jpg b/ui/classic/design/02a-metamask-AccDetails-OverToken.jpg similarity index 100% rename from ui/design/02a-metamask-AccDetails-OverToken.jpg rename to ui/classic/design/02a-metamask-AccDetails-OverToken.jpg diff --git a/ui/design/02a-metamask-AccDetails-OverTransaction.jpg b/ui/classic/design/02a-metamask-AccDetails-OverTransaction.jpg similarity index 100% rename from ui/design/02a-metamask-AccDetails-OverTransaction.jpg rename to ui/classic/design/02a-metamask-AccDetails-OverTransaction.jpg diff --git a/ui/design/02a-metamask-AccDetails.jpg b/ui/classic/design/02a-metamask-AccDetails.jpg similarity index 100% rename from ui/design/02a-metamask-AccDetails.jpg rename to ui/classic/design/02a-metamask-AccDetails.jpg diff --git a/ui/design/02b-metamask-AccDetails-Send.jpg b/ui/classic/design/02b-metamask-AccDetails-Send.jpg similarity index 100% rename from ui/design/02b-metamask-AccDetails-Send.jpg rename to ui/classic/design/02b-metamask-AccDetails-Send.jpg diff --git a/ui/design/03-metamask-Qr.jpg b/ui/classic/design/03-metamask-Qr.jpg similarity index 100% rename from ui/design/03-metamask-Qr.jpg rename to ui/classic/design/03-metamask-Qr.jpg diff --git a/ui/design/05-metamask-Menu.jpg b/ui/classic/design/05-metamask-Menu.jpg similarity index 100% rename from ui/design/05-metamask-Menu.jpg rename to ui/classic/design/05-metamask-Menu.jpg diff --git a/ui/design/chromeStorePics/final_screen_dao_accounts.png b/ui/classic/design/chromeStorePics/final_screen_dao_accounts.png similarity index 100% rename from ui/design/chromeStorePics/final_screen_dao_accounts.png rename to ui/classic/design/chromeStorePics/final_screen_dao_accounts.png diff --git a/ui/design/chromeStorePics/final_screen_dao_locked.png b/ui/classic/design/chromeStorePics/final_screen_dao_locked.png similarity index 100% rename from ui/design/chromeStorePics/final_screen_dao_locked.png rename to ui/classic/design/chromeStorePics/final_screen_dao_locked.png diff --git a/ui/design/chromeStorePics/final_screen_dao_notification.png b/ui/classic/design/chromeStorePics/final_screen_dao_notification.png similarity index 100% rename from ui/design/chromeStorePics/final_screen_dao_notification.png rename to ui/classic/design/chromeStorePics/final_screen_dao_notification.png diff --git a/ui/design/chromeStorePics/final_screen_wei_account.png b/ui/classic/design/chromeStorePics/final_screen_wei_account.png similarity index 100% rename from ui/design/chromeStorePics/final_screen_wei_account.png rename to ui/classic/design/chromeStorePics/final_screen_wei_account.png diff --git a/ui/design/chromeStorePics/final_screen_wei_notification.png b/ui/classic/design/chromeStorePics/final_screen_wei_notification.png similarity index 100% rename from ui/design/chromeStorePics/final_screen_wei_notification.png rename to ui/classic/design/chromeStorePics/final_screen_wei_notification.png diff --git a/ui/design/chromeStorePics/icon-128.png b/ui/classic/design/chromeStorePics/icon-128.png similarity index 100% rename from ui/design/chromeStorePics/icon-128.png rename to ui/classic/design/chromeStorePics/icon-128.png diff --git a/ui/design/chromeStorePics/icon-64.png b/ui/classic/design/chromeStorePics/icon-64.png similarity index 100% rename from ui/design/chromeStorePics/icon-64.png rename to ui/classic/design/chromeStorePics/icon-64.png diff --git a/ui/design/chromeStorePics/metamask_icon.ai b/ui/classic/design/chromeStorePics/metamask_icon.ai similarity index 100% rename from ui/design/chromeStorePics/metamask_icon.ai rename to ui/classic/design/chromeStorePics/metamask_icon.ai diff --git a/ui/design/chromeStorePics/promo1400560.png b/ui/classic/design/chromeStorePics/promo1400560.png similarity index 100% rename from ui/design/chromeStorePics/promo1400560.png rename to ui/classic/design/chromeStorePics/promo1400560.png diff --git a/ui/design/chromeStorePics/promo440280.png b/ui/classic/design/chromeStorePics/promo440280.png similarity index 100% rename from ui/design/chromeStorePics/promo440280.png rename to ui/classic/design/chromeStorePics/promo440280.png diff --git a/ui/design/chromeStorePics/promo920680.png b/ui/classic/design/chromeStorePics/promo920680.png similarity index 100% rename from ui/design/chromeStorePics/promo920680.png rename to ui/classic/design/chromeStorePics/promo920680.png diff --git a/ui/design/chromeStorePics/screen_dao_accounts.png b/ui/classic/design/chromeStorePics/screen_dao_accounts.png similarity index 100% rename from ui/design/chromeStorePics/screen_dao_accounts.png rename to ui/classic/design/chromeStorePics/screen_dao_accounts.png diff --git a/ui/design/chromeStorePics/screen_dao_locked.png b/ui/classic/design/chromeStorePics/screen_dao_locked.png similarity index 100% rename from ui/design/chromeStorePics/screen_dao_locked.png rename to ui/classic/design/chromeStorePics/screen_dao_locked.png diff --git a/ui/design/chromeStorePics/screen_dao_notification.png b/ui/classic/design/chromeStorePics/screen_dao_notification.png similarity index 100% rename from ui/design/chromeStorePics/screen_dao_notification.png rename to ui/classic/design/chromeStorePics/screen_dao_notification.png diff --git a/ui/design/chromeStorePics/screen_wei_account.png b/ui/classic/design/chromeStorePics/screen_wei_account.png similarity index 100% rename from ui/design/chromeStorePics/screen_wei_account.png rename to ui/classic/design/chromeStorePics/screen_wei_account.png diff --git a/ui/design/chromeStorePics/screen_wei_notification.png b/ui/classic/design/chromeStorePics/screen_wei_notification.png similarity index 100% rename from ui/design/chromeStorePics/screen_wei_notification.png rename to ui/classic/design/chromeStorePics/screen_wei_notification.png diff --git a/ui/design/metamask-logo-eyes.png b/ui/classic/design/metamask-logo-eyes.png similarity index 100% rename from ui/design/metamask-logo-eyes.png rename to ui/classic/design/metamask-logo-eyes.png diff --git a/ui/design/wireframes/1st_time_use.png b/ui/classic/design/wireframes/1st_time_use.png similarity index 100% rename from ui/design/wireframes/1st_time_use.png rename to ui/classic/design/wireframes/1st_time_use.png diff --git a/ui/design/wireframes/metamask_wfs_jan_13.pdf b/ui/classic/design/wireframes/metamask_wfs_jan_13.pdf similarity index 100% rename from ui/design/wireframes/metamask_wfs_jan_13.pdf rename to ui/classic/design/wireframes/metamask_wfs_jan_13.pdf diff --git a/ui/design/wireframes/metamask_wfs_jan_13.png b/ui/classic/design/wireframes/metamask_wfs_jan_13.png similarity index 100% rename from ui/design/wireframes/metamask_wfs_jan_13.png rename to ui/classic/design/wireframes/metamask_wfs_jan_13.png diff --git a/ui/design/wireframes/metamask_wfs_jan_18.pdf b/ui/classic/design/wireframes/metamask_wfs_jan_18.pdf similarity index 100% rename from ui/design/wireframes/metamask_wfs_jan_18.pdf rename to ui/classic/design/wireframes/metamask_wfs_jan_18.pdf diff --git a/ui/example.js b/ui/classic/example.js similarity index 100% rename from ui/example.js rename to ui/classic/example.js diff --git a/ui/index.html b/ui/classic/index.html similarity index 100% rename from ui/index.html rename to ui/classic/index.html diff --git a/ui/index.js b/ui/classic/index.js similarity index 100% rename from ui/index.js rename to ui/classic/index.js diff --git a/ui/lib/account-link.js b/ui/classic/lib/account-link.js similarity index 100% rename from ui/lib/account-link.js rename to ui/classic/lib/account-link.js diff --git a/ui/lib/contract-namer.js b/ui/classic/lib/contract-namer.js similarity index 100% rename from ui/lib/contract-namer.js rename to ui/classic/lib/contract-namer.js diff --git a/ui/lib/etherscan-prefix-for-network.js b/ui/classic/lib/etherscan-prefix-for-network.js similarity index 100% rename from ui/lib/etherscan-prefix-for-network.js rename to ui/classic/lib/etherscan-prefix-for-network.js diff --git a/ui/lib/explorer-link.js b/ui/classic/lib/explorer-link.js similarity index 100% rename from ui/lib/explorer-link.js rename to ui/classic/lib/explorer-link.js diff --git a/ui/lib/icon-factory.js b/ui/classic/lib/icon-factory.js similarity index 100% rename from ui/lib/icon-factory.js rename to ui/classic/lib/icon-factory.js diff --git a/ui/lib/lost-accounts-notice.js b/ui/classic/lib/lost-accounts-notice.js similarity index 100% rename from ui/lib/lost-accounts-notice.js rename to ui/classic/lib/lost-accounts-notice.js diff --git a/ui/lib/persistent-form.js b/ui/classic/lib/persistent-form.js similarity index 100% rename from ui/lib/persistent-form.js rename to ui/classic/lib/persistent-form.js diff --git a/ui/lib/tx-helper.js b/ui/classic/lib/tx-helper.js similarity index 100% rename from ui/lib/tx-helper.js rename to ui/classic/lib/tx-helper.js