245 files changed, 9 insertions, 75 deletions

diff --git a/app/scripts/popup-core.js b/app/scripts/popup-core.js
index 156be795a..f1eb394d7 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/classic')
+const launchMetamaskUi = require('../../ui')
 const StreamProvider = require('web3-stream-provider')
 const setupMultiplex = require('./lib/stream-utils.js').setupMultiplex
 
diff --git a/app/scripts/popup.js b/app/scripts/popup.js
index 13b98d1f6..5f17f0651 100644
--- a/app/scripts/popup.js
+++ b/app/scripts/popup.js
@@ -1,5 +1,5 @@
 const injectCss = require('inject-css')
-const MetaMaskUiCss = require('../../ui/classic/css')
+const MetaMaskUiCss = require('../../ui/css')
 const startPopup = require('./popup-core')
 const PortStream = require('./lib/port-stream.js')
 const isPopupOrNotification = require('./lib/is-popup-or-notification')
diff --git a/app/scripts/responsive-core.js b/app/scripts/responsive-core.js
index 3760facfa..c3fa6700d 100644
--- a/app/scripts/responsive-core.js
+++ b/app/scripts/responsive-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/responsive')
+const launchMetamaskUi = require('../../responsive-ui')
 const StreamProvider = require('web3-stream-provider')
 const setupMultiplex = require('./lib/stream-utils.js').setupMultiplex
 
diff --git a/app/scripts/responsive.js b/app/scripts/responsive.js
index 0ff42a4cb..6525b833b 100644
--- a/app/scripts/responsive.js
+++ b/app/scripts/responsive.js
@@ -1,6 +1,6 @@
 const injectCss = require('inject-css')
 const startPopup = require('./responsive-core')
-const MetaMaskUiCss = require('../../ui/responsive/css')
+const MetaMaskUiCss = require('../../responsive-ui/css')
 const PortStream = require('./lib/port-stream.js')
 const ExtensionPlatform = require('./platforms/extension')
 const extension = require('extensionizer')
diff --git a/ui/classic/.gitignore b/responsive-ui/.gitignore
index c6b1254b5..c6b1254b5 100644
--- a/ui/classic/.gitignore
+++ b/responsive-ui/.gitignore
diff --git a/ui/responsive/app/account-detail.js b/responsive-ui/app/account-detail.js
index da1ddf98b..da1ddf98b 100644
--- a/ui/responsive/app/account-detail.js
+++ b/responsive-ui/app/account-detail.js
diff --git a/ui/classic/app/accounts/import/index.js b/responsive-ui/app/accounts/import/index.js
index 97b387229..97b387229 100644
--- a/ui/classic/app/accounts/import/index.js
+++ b/responsive-ui/app/accounts/import/index.js
diff --git a/ui/classic/app/accounts/import/json.js b/responsive-ui/app/accounts/import/json.js
index 158a3c923..158a3c923 100644
--- a/ui/classic/app/accounts/import/json.js
+++ b/responsive-ui/app/accounts/import/json.js
diff --git a/ui/classic/app/accounts/import/private-key.js b/responsive-ui/app/accounts/import/private-key.js
index 68ccee58e..68ccee58e 100644
--- a/ui/classic/app/accounts/import/private-key.js
+++ b/responsive-ui/app/accounts/import/private-key.js
diff --git a/ui/classic/app/accounts/import/seed.js b/responsive-ui/app/accounts/import/seed.js
index b4a7c0afa..b4a7c0afa 100644
--- a/ui/classic/app/accounts/import/seed.js
+++ b/responsive-ui/app/accounts/import/seed.js
diff --git a/ui/classic/app/actions.js b/responsive-ui/app/actions.js
index 2c60448dd..2c60448dd 100644
--- a/ui/classic/app/actions.js
+++ b/responsive-ui/app/actions.js
diff --git a/ui/classic/app/add-token.js b/responsive-ui/app/add-token.js
index b303b5c0d..b303b5c0d 100644
--- a/ui/classic/app/add-token.js
+++ b/responsive-ui/app/add-token.js
diff --git a/ui/responsive/app/app.js b/responsive-ui/app/app.js
index 1cfa2d7a9..1cfa2d7a9 100644
--- a/ui/responsive/app/app.js
+++ b/responsive-ui/app/app.js
diff --git a/ui/responsive/app/components/account-dropdowns.js b/responsive-ui/app/components/account-dropdowns.js
index d1d319477..d1d319477 100644
--- a/ui/responsive/app/components/account-dropdowns.js
+++ b/responsive-ui/app/components/account-dropdowns.js
diff --git a/ui/classic/app/components/account-export.js b/responsive-ui/app/components/account-export.js
index 394d878f7..394d878f7 100644
--- a/ui/classic/app/components/account-export.js
+++ b/responsive-ui/app/components/account-export.js
diff --git a/ui/classic/app/components/account-panel.js b/responsive-ui/app/components/account-panel.js
index abaaf8163..abaaf8163 100644
--- a/ui/classic/app/components/account-panel.js
+++ b/responsive-ui/app/components/account-panel.js
diff --git a/ui/classic/app/components/balance.js b/responsive-ui/app/components/balance.js
index 57ca84564..57ca84564 100644
--- a/ui/classic/app/components/balance.js
+++ b/responsive-ui/app/components/balance.js
diff --git a/ui/classic/app/components/binary-renderer.js b/responsive-ui/app/components/binary-renderer.js
index 0b6a1f5c2..0b6a1f5c2 100644
--- a/ui/classic/app/components/binary-renderer.js
+++ b/responsive-ui/app/components/binary-renderer.js
diff --git a/ui/classic/app/components/bn-as-decimal-input.js b/responsive-ui/app/components/bn-as-decimal-input.js
index f3ace4720..f3ace4720 100644
--- a/ui/classic/app/components/bn-as-decimal-input.js
+++ b/responsive-ui/app/components/bn-as-decimal-input.js
diff --git a/ui/classic/app/components/buy-button-subview.js b/responsive-ui/app/components/buy-button-subview.js
index 87084f92d..87084f92d 100644
--- a/ui/classic/app/components/buy-button-subview.js
+++ b/responsive-ui/app/components/buy-button-subview.js
diff --git a/ui/classic/app/components/coinbase-form.js b/responsive-ui/app/components/coinbase-form.js
index f44d86045..f44d86045 100644
--- a/ui/classic/app/components/coinbase-form.js
+++ b/responsive-ui/app/components/coinbase-form.js
diff --git a/ui/classic/app/components/copyButton.js b/responsive-ui/app/components/copyButton.js
index a25d0719c..a25d0719c 100644
--- a/ui/classic/app/components/copyButton.js
+++ b/responsive-ui/app/components/copyButton.js
diff --git a/ui/classic/app/components/copyable.js b/responsive-ui/app/components/copyable.js
index a4f6f4bc6..a4f6f4bc6 100644
--- a/ui/classic/app/components/copyable.js
+++ b/responsive-ui/app/components/copyable.js
diff --git a/ui/classic/app/components/custom-radio-list.js b/responsive-ui/app/components/custom-radio-list.js
index a4c525396..a4c525396 100644
--- a/ui/classic/app/components/custom-radio-list.js
+++ b/responsive-ui/app/components/custom-radio-list.js
diff --git a/ui/responsive/app/components/dropdown.js b/responsive-ui/app/components/dropdown.js
index e77b4c40c..e77b4c40c 100644
--- a/ui/responsive/app/components/dropdown.js
+++ b/responsive-ui/app/components/dropdown.js
diff --git a/ui/responsive/app/components/editable-label.js b/responsive-ui/app/components/editable-label.js
index 167be7eaf..167be7eaf 100644
--- a/ui/responsive/app/components/editable-label.js
+++ b/responsive-ui/app/components/editable-label.js
diff --git a/ui/classic/app/components/ens-input.js b/responsive-ui/app/components/ens-input.js
index 3a33ebf74..3a33ebf74 100644
--- a/ui/classic/app/components/ens-input.js
+++ b/responsive-ui/app/components/ens-input.js
diff --git a/ui/classic/app/components/eth-balance.js b/responsive-ui/app/components/eth-balance.js
index 4f538fd31..4f538fd31 100644
--- a/ui/classic/app/components/eth-balance.js
+++ b/responsive-ui/app/components/eth-balance.js
diff --git a/ui/classic/app/components/fiat-value.js b/responsive-ui/app/components/fiat-value.js
index 8a64a1cfc..8a64a1cfc 100644
--- a/ui/classic/app/components/fiat-value.js
+++ b/responsive-ui/app/components/fiat-value.js
diff --git a/ui/classic/app/components/hex-as-decimal-input.js b/responsive-ui/app/components/hex-as-decimal-input.js
index 4a71e9585..4a71e9585 100644
--- a/ui/classic/app/components/hex-as-decimal-input.js
+++ b/responsive-ui/app/components/hex-as-decimal-input.js
diff --git a/ui/classic/app/components/identicon.js b/responsive-ui/app/components/identicon.js
index c754bc6ba..c754bc6ba 100644
--- a/ui/classic/app/components/identicon.js
+++ b/responsive-ui/app/components/identicon.js
diff --git a/ui/classic/app/components/loading.js b/responsive-ui/app/components/loading.js
index 87d6f5d20..87d6f5d20 100644
--- a/ui/classic/app/components/loading.js
+++ b/responsive-ui/app/components/loading.js
diff --git a/ui/classic/app/components/mascot.js b/responsive-ui/app/components/mascot.js
index 973ec2cad..973ec2cad 100644
--- a/ui/classic/app/components/mascot.js
+++ b/responsive-ui/app/components/mascot.js
diff --git a/ui/classic/app/components/mini-account-panel.js b/responsive-ui/app/components/mini-account-panel.js
index c09cf5b7a..c09cf5b7a 100644
--- a/ui/classic/app/components/mini-account-panel.js
+++ b/responsive-ui/app/components/mini-account-panel.js
diff --git a/ui/classic/app/components/network.js b/responsive-ui/app/components/network.js
index 698a0bbb9..698a0bbb9 100644
--- a/ui/classic/app/components/network.js
+++ b/responsive-ui/app/components/network.js
diff --git a/ui/classic/app/components/notice.js b/responsive-ui/app/components/notice.js
index d9f0067cd..d9f0067cd 100644
--- a/ui/classic/app/components/notice.js
+++ b/responsive-ui/app/components/notice.js
diff --git a/ui/classic/app/components/pending-msg-details.js b/responsive-ui/app/components/pending-msg-details.js
index 16308d121..16308d121 100644
--- a/ui/classic/app/components/pending-msg-details.js
+++ b/responsive-ui/app/components/pending-msg-details.js
diff --git a/ui/classic/app/components/pending-msg.js b/responsive-ui/app/components/pending-msg.js
index b2cac164a..b2cac164a 100644
--- a/ui/classic/app/components/pending-msg.js
+++ b/responsive-ui/app/components/pending-msg.js
diff --git a/ui/classic/app/components/pending-personal-msg-details.js b/responsive-ui/app/components/pending-personal-msg-details.js
index 1050513f2..1050513f2 100644
--- a/ui/classic/app/components/pending-personal-msg-details.js
+++ b/responsive-ui/app/components/pending-personal-msg-details.js
diff --git a/ui/classic/app/components/pending-personal-msg.js b/responsive-ui/app/components/pending-personal-msg.js
index 4542adb28..4542adb28 100644
--- a/ui/classic/app/components/pending-personal-msg.js
+++ b/responsive-ui/app/components/pending-personal-msg.js
diff --git a/ui/classic/app/components/pending-tx.js b/responsive-ui/app/components/pending-tx.js
index 962680d30..962680d30 100644
--- a/ui/classic/app/components/pending-tx.js
+++ b/responsive-ui/app/components/pending-tx.js
diff --git a/ui/classic/app/components/qr-code.js b/responsive-ui/app/components/qr-code.js
index 06b9aed9b..06b9aed9b 100644
--- a/ui/classic/app/components/qr-code.js
+++ b/responsive-ui/app/components/qr-code.js
diff --git a/ui/classic/app/components/range-slider.js b/responsive-ui/app/components/range-slider.js
index 823f5eb01..823f5eb01 100644
--- a/ui/classic/app/components/range-slider.js
+++ b/responsive-ui/app/components/range-slider.js
diff --git a/ui/classic/app/components/shapeshift-form.js b/responsive-ui/app/components/shapeshift-form.js
index e0a720426..e0a720426 100644
--- a/ui/classic/app/components/shapeshift-form.js
+++ b/responsive-ui/app/components/shapeshift-form.js
diff --git a/ui/classic/app/components/shift-list-item.js b/responsive-ui/app/components/shift-list-item.js
index 32bfbeda4..32bfbeda4 100644
--- a/ui/classic/app/components/shift-list-item.js
+++ b/responsive-ui/app/components/shift-list-item.js
diff --git a/ui/classic/app/components/tab-bar.js b/responsive-ui/app/components/tab-bar.js
index 6295e7dd9..6295e7dd9 100644
--- a/ui/classic/app/components/tab-bar.js
+++ b/responsive-ui/app/components/tab-bar.js
diff --git a/ui/classic/app/components/template.js b/responsive-ui/app/components/template.js
index b6ed8eaa0..b6ed8eaa0 100644
--- a/ui/classic/app/components/template.js
+++ b/responsive-ui/app/components/template.js
diff --git a/ui/classic/app/components/token-cell.js b/responsive-ui/app/components/token-cell.js
index 19d7139bb..19d7139bb 100644
--- a/ui/classic/app/components/token-cell.js
+++ b/responsive-ui/app/components/token-cell.js
diff --git a/ui/classic/app/components/token-list.js b/responsive-ui/app/components/token-list.js
index 20cfa897e..20cfa897e 100644
--- a/ui/classic/app/components/token-list.js
+++ b/responsive-ui/app/components/token-list.js
diff --git a/ui/classic/app/components/tooltip.js b/responsive-ui/app/components/tooltip.js
index edbc074bb..edbc074bb 100644
--- a/ui/classic/app/components/tooltip.js
+++ b/responsive-ui/app/components/tooltip.js
diff --git a/ui/classic/app/components/transaction-list-item-icon.js b/responsive-ui/app/components/transaction-list-item-icon.js
index 431054340..431054340 100644
--- a/ui/classic/app/components/transaction-list-item-icon.js
+++ b/responsive-ui/app/components/transaction-list-item-icon.js
diff --git a/ui/classic/app/components/transaction-list-item.js b/responsive-ui/app/components/transaction-list-item.js
index dbda66a31..dbda66a31 100644
--- a/ui/classic/app/components/transaction-list-item.js
+++ b/responsive-ui/app/components/transaction-list-item.js
diff --git a/ui/classic/app/components/transaction-list.js b/responsive-ui/app/components/transaction-list.js
index 3b4ba741e..3b4ba741e 100644
--- a/ui/classic/app/components/transaction-list.js
+++ b/responsive-ui/app/components/transaction-list.js
diff --git a/ui/classic/app/conf-tx.js b/responsive-ui/app/conf-tx.js
index 63b77ef7f..63b77ef7f 100644
--- a/ui/classic/app/conf-tx.js
+++ b/responsive-ui/app/conf-tx.js
diff --git a/ui/classic/app/config.js b/responsive-ui/app/config.js
index 62785c49b..62785c49b 100644
--- a/ui/classic/app/config.js
+++ b/responsive-ui/app/config.js
diff --git a/ui/classic/app/conversion.json b/responsive-ui/app/conversion.json
index 155ffc4fc..155ffc4fc 100644
--- a/ui/classic/app/conversion.json
+++ b/responsive-ui/app/conversion.json
diff --git a/ui/classic/app/css/debug.css b/responsive-ui/app/css/debug.css
index 3e125bcd4..3e125bcd4 100644
--- a/ui/classic/app/css/debug.css
+++ b/responsive-ui/app/css/debug.css
diff --git a/ui/classic/app/css/fonts.css b/responsive-ui/app/css/fonts.css
index 3b9f581b9..3b9f581b9 100644
--- a/ui/classic/app/css/fonts.css
+++ b/responsive-ui/app/css/fonts.css
diff --git a/ui/responsive/app/css/index.css b/responsive-ui/app/css/index.css
index c82c1b21b..c82c1b21b 100644
--- a/ui/responsive/app/css/index.css
+++ b/responsive-ui/app/css/index.css
diff --git a/ui/classic/app/css/lib.css b/responsive-ui/app/css/lib.css
index 910a24ee2..910a24ee2 100644
--- a/ui/classic/app/css/lib.css
+++ b/responsive-ui/app/css/lib.css
diff --git a/ui/classic/app/css/reset.css b/responsive-ui/app/css/reset.css
index 9ce89e8bc..9ce89e8bc 100644
--- a/ui/classic/app/css/reset.css
+++ b/responsive-ui/app/css/reset.css
diff --git a/ui/classic/app/css/transitions.css b/responsive-ui/app/css/transitions.css
index 393a944f9..393a944f9 100644
--- a/ui/classic/app/css/transitions.css
+++ b/responsive-ui/app/css/transitions.css
diff --git a/ui/classic/app/first-time/init-menu.js b/responsive-ui/app/first-time/init-menu.js
index cc7c51bd3..cc7c51bd3 100644
--- a/ui/classic/app/first-time/init-menu.js
+++ b/responsive-ui/app/first-time/init-menu.js
diff --git a/ui/classic/app/img/identicon-tardigrade.png b/responsive-ui/app/img/identicon-tardigrade.png
index 1742a32b8..1742a32b8 100644
--- a/ui/classic/app/img/identicon-tardigrade.png
+++ b/responsive-ui/app/img/identicon-tardigrade.png
diff --git a/ui/classic/app/img/identicon-walrus.png b/responsive-ui/app/img/identicon-walrus.png
index d58fae912..d58fae912 100644
--- a/ui/classic/app/img/identicon-walrus.png
+++ b/responsive-ui/app/img/identicon-walrus.png
diff --git a/ui/classic/app/info.js b/responsive-ui/app/info.js
index e8470de97..e8470de97 100644
--- a/ui/classic/app/info.js
+++ b/responsive-ui/app/info.js
diff --git a/ui/responsive/app/keychains/hd/create-vault-complete.js b/responsive-ui/app/keychains/hd/create-vault-complete.js
index c32751fff..c32751fff 100644
--- a/ui/responsive/app/keychains/hd/create-vault-complete.js
+++ b/responsive-ui/app/keychains/hd/create-vault-complete.js
diff --git a/ui/classic/app/keychains/hd/recover-seed/confirmation.js b/responsive-ui/app/keychains/hd/recover-seed/confirmation.js
index 4ccbec9fc..4ccbec9fc 100644
--- a/ui/classic/app/keychains/hd/recover-seed/confirmation.js
+++ b/responsive-ui/app/keychains/hd/recover-seed/confirmation.js
diff --git a/ui/classic/app/keychains/hd/restore-vault.js b/responsive-ui/app/keychains/hd/restore-vault.js
index 06e51d9b3..06e51d9b3 100644
--- a/ui/classic/app/keychains/hd/restore-vault.js
+++ b/responsive-ui/app/keychains/hd/restore-vault.js
diff --git a/ui/classic/app/new-keychain.js b/responsive-ui/app/new-keychain.js
index cc9633166..cc9633166 100644
--- a/ui/classic/app/new-keychain.js
+++ b/responsive-ui/app/new-keychain.js
diff --git a/ui/classic/app/reducers.js b/responsive-ui/app/reducers.js
index 11efca529..11efca529 100644
--- a/ui/classic/app/reducers.js
+++ b/responsive-ui/app/reducers.js
diff --git a/ui/classic/app/reducers/app.js b/responsive-ui/app/reducers/app.js
index 2fcc9bfe0..2fcc9bfe0 100644
--- a/ui/classic/app/reducers/app.js
+++ b/responsive-ui/app/reducers/app.js
diff --git a/ui/classic/app/reducers/identities.js b/responsive-ui/app/reducers/identities.js
index 341a404e7..341a404e7 100644
--- a/ui/classic/app/reducers/identities.js
+++ b/responsive-ui/app/reducers/identities.js
diff --git a/ui/classic/app/reducers/metamask.js b/responsive-ui/app/reducers/metamask.js
index e0c416c2d..e0c416c2d 100644
--- a/ui/classic/app/reducers/metamask.js
+++ b/responsive-ui/app/reducers/metamask.js
diff --git a/ui/classic/app/root.js b/responsive-ui/app/root.js
index 9e7314b20..9e7314b20 100644
--- a/ui/classic/app/root.js
+++ b/responsive-ui/app/root.js
diff --git a/ui/classic/app/send.js b/responsive-ui/app/send.js
index a21a219eb..a21a219eb 100644
--- a/ui/classic/app/send.js
+++ b/responsive-ui/app/send.js
diff --git a/ui/classic/app/settings.js b/responsive-ui/app/settings.js
index 454cc95e0..454cc95e0 100644
--- a/ui/classic/app/settings.js
+++ b/responsive-ui/app/settings.js
diff --git a/ui/classic/app/store.js b/responsive-ui/app/store.js
index ba9e58b49..ba9e58b49 100644
--- a/ui/classic/app/store.js
+++ b/responsive-ui/app/store.js
diff --git a/ui/classic/app/template.js b/responsive-ui/app/template.js
index d15b30fd2..d15b30fd2 100644
--- a/ui/classic/app/template.js
+++ b/responsive-ui/app/template.js
diff --git a/ui/classic/app/unlock.js b/responsive-ui/app/unlock.js
index 1aee3c5d0..1aee3c5d0 100644
--- a/ui/classic/app/unlock.js
+++ b/responsive-ui/app/unlock.js
diff --git a/ui/classic/app/util.js b/responsive-ui/app/util.js
index ac3f42c6b..ac3f42c6b 100644
--- a/ui/classic/app/util.js
+++ b/responsive-ui/app/util.js
diff --git a/ui/classic/css.js b/responsive-ui/css.js
index 7c394a87b..7c394a87b 100644
--- a/ui/classic/css.js
+++ b/responsive-ui/css.js
diff --git a/ui/classic/design/00-metamask-SignIn.jpg b/responsive-ui/design/00-metamask-SignIn.jpg
index 2becdb032..2becdb032 100644
--- a/ui/classic/design/00-metamask-SignIn.jpg
+++ b/responsive-ui/design/00-metamask-SignIn.jpg
diff --git a/ui/classic/design/01-metamask-SelectAcc.jpg b/responsive-ui/design/01-metamask-SelectAcc.jpg
index 239091a98..239091a98 100644
--- a/ui/classic/design/01-metamask-SelectAcc.jpg
+++ b/responsive-ui/design/01-metamask-SelectAcc.jpg
diff --git a/ui/classic/design/02-metamask-AccDetails.jpg b/responsive-ui/design/02-metamask-AccDetails.jpg
index d7d408ffc..d7d408ffc 100644
--- a/ui/classic/design/02-metamask-AccDetails.jpg
+++ b/responsive-ui/design/02-metamask-AccDetails.jpg
diff --git a/ui/classic/design/02a-metamask-AccDetails-OverToken.jpg b/responsive-ui/design/02a-metamask-AccDetails-OverToken.jpg
index f26ff31e8..f26ff31e8 100644
--- a/ui/classic/design/02a-metamask-AccDetails-OverToken.jpg
+++ b/responsive-ui/design/02a-metamask-AccDetails-OverToken.jpg
diff --git a/ui/classic/design/02a-metamask-AccDetails-OverTransaction.jpg b/responsive-ui/design/02a-metamask-AccDetails-OverTransaction.jpg
index 8a06be6b9..8a06be6b9 100644
--- a/ui/classic/design/02a-metamask-AccDetails-OverTransaction.jpg
+++ b/responsive-ui/design/02a-metamask-AccDetails-OverTransaction.jpg
diff --git a/ui/classic/design/02a-metamask-AccDetails.jpg b/responsive-ui/design/02a-metamask-AccDetails.jpg
index c37e0f539..c37e0f539 100644
--- a/ui/classic/design/02a-metamask-AccDetails.jpg
+++ b/responsive-ui/design/02a-metamask-AccDetails.jpg
diff --git a/ui/classic/design/02b-metamask-AccDetails-Send.jpg b/responsive-ui/design/02b-metamask-AccDetails-Send.jpg
index 10f2d27fd..10f2d27fd 100644
--- a/ui/classic/design/02b-metamask-AccDetails-Send.jpg
+++ b/responsive-ui/design/02b-metamask-AccDetails-Send.jpg
diff --git a/ui/classic/design/03-metamask-Qr.jpg b/responsive-ui/design/03-metamask-Qr.jpg
index 9c09de42f..9c09de42f 100644
--- a/ui/classic/design/03-metamask-Qr.jpg
+++ b/responsive-ui/design/03-metamask-Qr.jpg
diff --git a/ui/classic/design/05-metamask-Menu.jpg b/responsive-ui/design/05-metamask-Menu.jpg
index 0a43d7b2a..0a43d7b2a 100644
--- a/ui/classic/design/05-metamask-Menu.jpg
+++ b/responsive-ui/design/05-metamask-Menu.jpg
diff --git a/ui/classic/design/chromeStorePics/final_screen_dao_accounts.png b/responsive-ui/design/chromeStorePics/final_screen_dao_accounts.png
index 805cc96b6..805cc96b6 100644
--- a/ui/classic/design/chromeStorePics/final_screen_dao_accounts.png
+++ b/responsive-ui/design/chromeStorePics/final_screen_dao_accounts.png
diff --git a/ui/classic/design/chromeStorePics/final_screen_dao_locked.png b/responsive-ui/design/chromeStorePics/final_screen_dao_locked.png
index 9d9e33930..9d9e33930 100644
--- a/ui/classic/design/chromeStorePics/final_screen_dao_locked.png
+++ b/responsive-ui/design/chromeStorePics/final_screen_dao_locked.png
diff --git a/ui/classic/design/chromeStorePics/final_screen_dao_notification.png b/responsive-ui/design/chromeStorePics/final_screen_dao_notification.png
index d56a5ce62..d56a5ce62 100644
--- a/ui/classic/design/chromeStorePics/final_screen_dao_notification.png
+++ b/responsive-ui/design/chromeStorePics/final_screen_dao_notification.png
diff --git a/ui/classic/design/chromeStorePics/final_screen_wei_account.png b/responsive-ui/design/chromeStorePics/final_screen_wei_account.png
index d503ff301..d503ff301 100644
--- a/ui/classic/design/chromeStorePics/final_screen_wei_account.png
+++ b/responsive-ui/design/chromeStorePics/final_screen_wei_account.png
diff --git a/ui/classic/design/chromeStorePics/final_screen_wei_notification.png b/responsive-ui/design/chromeStorePics/final_screen_wei_notification.png
index 3560c51ff..3560c51ff 100644
--- a/ui/classic/design/chromeStorePics/final_screen_wei_notification.png
+++ b/responsive-ui/design/chromeStorePics/final_screen_wei_notification.png
diff --git a/ui/classic/design/chromeStorePics/icon-128.png b/responsive-ui/design/chromeStorePics/icon-128.png
index ae687147d..ae687147d 100644
--- a/ui/classic/design/chromeStorePics/icon-128.png
+++ b/responsive-ui/design/chromeStorePics/icon-128.png
diff --git a/ui/classic/design/chromeStorePics/icon-64.png b/responsive-ui/design/chromeStorePics/icon-64.png
index 7062cf4f1..7062cf4f1 100644
--- a/ui/classic/design/chromeStorePics/icon-64.png
+++ b/responsive-ui/design/chromeStorePics/icon-64.png
diff --git a/ui/classic/design/chromeStorePics/metamask_icon.ai b/responsive-ui/design/chromeStorePics/metamask_icon.ai
index 27400c5a4..27400c5a4 100644
--- a/ui/classic/design/chromeStorePics/metamask_icon.ai
+++ b/responsive-ui/design/chromeStorePics/metamask_icon.ai
diff --git a/ui/classic/design/chromeStorePics/promo1400560.png b/responsive-ui/design/chromeStorePics/promo1400560.png
index d3637ecc8..d3637ecc8 100644
--- a/ui/classic/design/chromeStorePics/promo1400560.png
+++ b/responsive-ui/design/chromeStorePics/promo1400560.png
diff --git a/ui/classic/design/chromeStorePics/promo440280.png b/responsive-ui/design/chromeStorePics/promo440280.png
index c1f92b1c0..c1f92b1c0 100644
--- a/ui/classic/design/chromeStorePics/promo440280.png
+++ b/responsive-ui/design/chromeStorePics/promo440280.png
diff --git a/ui/classic/design/chromeStorePics/promo920680.png b/responsive-ui/design/chromeStorePics/promo920680.png
index 726bd810a..726bd810a 100644
--- a/ui/classic/design/chromeStorePics/promo920680.png
+++ b/responsive-ui/design/chromeStorePics/promo920680.png
diff --git a/ui/classic/design/chromeStorePics/screen_dao_accounts.png b/responsive-ui/design/chromeStorePics/screen_dao_accounts.png
index 1a2e8052c..1a2e8052c 100644
--- a/ui/classic/design/chromeStorePics/screen_dao_accounts.png
+++ b/responsive-ui/design/chromeStorePics/screen_dao_accounts.png
diff --git a/ui/classic/design/chromeStorePics/screen_dao_locked.png b/responsive-ui/design/chromeStorePics/screen_dao_locked.png
index 6592c17e4..6592c17e4 100644
--- a/ui/classic/design/chromeStorePics/screen_dao_locked.png
+++ b/responsive-ui/design/chromeStorePics/screen_dao_locked.png
diff --git a/ui/classic/design/chromeStorePics/screen_dao_notification.png b/responsive-ui/design/chromeStorePics/screen_dao_notification.png
index baeb2ec39..baeb2ec39 100644
--- a/ui/classic/design/chromeStorePics/screen_dao_notification.png
+++ b/responsive-ui/design/chromeStorePics/screen_dao_notification.png
diff --git a/ui/classic/design/chromeStorePics/screen_wei_account.png b/responsive-ui/design/chromeStorePics/screen_wei_account.png
index 23301e4bf..23301e4bf 100644
--- a/ui/classic/design/chromeStorePics/screen_wei_account.png
+++ b/responsive-ui/design/chromeStorePics/screen_wei_account.png
diff --git a/ui/classic/design/chromeStorePics/screen_wei_notification.png b/responsive-ui/design/chromeStorePics/screen_wei_notification.png
index 7a763e5df..7a763e5df 100644
--- a/ui/classic/design/chromeStorePics/screen_wei_notification.png
+++ b/responsive-ui/design/chromeStorePics/screen_wei_notification.png
diff --git a/ui/classic/design/metamask-logo-eyes.png b/responsive-ui/design/metamask-logo-eyes.png
index c29331b28..c29331b28 100644
--- a/ui/classic/design/metamask-logo-eyes.png
+++ b/responsive-ui/design/metamask-logo-eyes.png
diff --git a/ui/classic/design/wireframes/1st_time_use.png b/responsive-ui/design/wireframes/1st_time_use.png
index c18ced5e2..c18ced5e2 100644
--- a/ui/classic/design/wireframes/1st_time_use.png
+++ b/responsive-ui/design/wireframes/1st_time_use.png
diff --git a/ui/classic/design/wireframes/metamask_wfs_jan_13.pdf b/responsive-ui/design/wireframes/metamask_wfs_jan_13.pdf
index c77c9274a..c77c9274a 100644
--- a/ui/classic/design/wireframes/metamask_wfs_jan_13.pdf
+++ b/responsive-ui/design/wireframes/metamask_wfs_jan_13.pdf
diff --git a/ui/classic/design/wireframes/metamask_wfs_jan_13.png b/responsive-ui/design/wireframes/metamask_wfs_jan_13.png
index d71d7bdb4..d71d7bdb4 100644
--- a/ui/classic/design/wireframes/metamask_wfs_jan_13.png
+++ b/responsive-ui/design/wireframes/metamask_wfs_jan_13.png
diff --git a/ui/classic/design/wireframes/metamask_wfs_jan_18.pdf b/responsive-ui/design/wireframes/metamask_wfs_jan_18.pdf
index 592ba8532..592ba8532 100644
--- a/ui/classic/design/wireframes/metamask_wfs_jan_18.pdf
+++ b/responsive-ui/design/wireframes/metamask_wfs_jan_18.pdf
diff --git a/ui/classic/example.js b/responsive-ui/example.js
index 4627c0e9c..4627c0e9c 100644
--- a/ui/classic/example.js
+++ b/responsive-ui/example.js
diff --git a/ui/classic/index.html b/responsive-ui/index.html
index 9dfaefbb3..9dfaefbb3 100644
--- a/ui/classic/index.html
+++ b/responsive-ui/index.html
diff --git a/ui/classic/index.js b/responsive-ui/index.js
index a729138d3..a729138d3 100644
--- a/ui/classic/index.js
+++ b/responsive-ui/index.js
diff --git a/ui/classic/lib/account-link.js b/responsive-ui/lib/account-link.js
index d061d0ad1..d061d0ad1 100644
--- a/ui/classic/lib/account-link.js
+++ b/responsive-ui/lib/account-link.js
diff --git a/ui/classic/lib/contract-namer.js b/responsive-ui/lib/contract-namer.js
index f05e770cc..f05e770cc 100644
--- a/ui/classic/lib/contract-namer.js
+++ b/responsive-ui/lib/contract-namer.js
diff --git a/ui/classic/lib/etherscan-prefix-for-network.js b/responsive-ui/lib/etherscan-prefix-for-network.js
index 2c1904f1c..2c1904f1c 100644
--- a/ui/classic/lib/etherscan-prefix-for-network.js
+++ b/responsive-ui/lib/etherscan-prefix-for-network.js
diff --git a/ui/classic/lib/explorer-link.js b/responsive-ui/lib/explorer-link.js
index 3b82ecd5f..3b82ecd5f 100644
--- a/ui/classic/lib/explorer-link.js
+++ b/responsive-ui/lib/explorer-link.js
diff --git a/ui/classic/lib/icon-factory.js b/responsive-ui/lib/icon-factory.js
index 27a74de66..27a74de66 100644
--- a/ui/classic/lib/icon-factory.js
+++ b/responsive-ui/lib/icon-factory.js
diff --git a/ui/classic/lib/lost-accounts-notice.js b/responsive-ui/lib/lost-accounts-notice.js
index 948b13db6..948b13db6 100644
--- a/ui/classic/lib/lost-accounts-notice.js
+++ b/responsive-ui/lib/lost-accounts-notice.js
diff --git a/ui/classic/lib/persistent-form.js b/responsive-ui/lib/persistent-form.js
index d4dc20b03..d4dc20b03 100644
--- a/ui/classic/lib/persistent-form.js
+++ b/responsive-ui/lib/persistent-form.js
diff --git a/ui/classic/lib/tx-helper.js b/responsive-ui/lib/tx-helper.js
index ec19daf64..ec19daf64 100644
--- a/ui/classic/lib/tx-helper.js
+++ b/responsive-ui/lib/tx-helper.js
diff --git a/test/unit/responsive/components/dropdown-test.js b/test/unit/responsive/components/dropdown-test.js
index 4d417d394..0472c541b 100644
--- a/test/unit/responsive/components/dropdown-test.js
+++ b/test/unit/responsive/components/dropdown-test.js
@@ -5,8 +5,8 @@ const h = require('react-hyperscript');
 const ReactTestUtils = require('react-addons-test-utils');
 const sinon = require('sinon');
 const path = require('path');
-const Dropdown = require(path.join(__dirname, '..', '..', '..', '..', 'ui', 'responsive', 'app', 'components', 'dropdown.js')).Dropdown;
-const DropdownMenuItem = require(path.join(__dirname, '..', '..', '..', '..', 'ui', 'responsive', 'app', 'components', 'dropdown.js')).DropdownMenuItem;
+const Dropdown = require(path.join(__dirname, '..', '..', '..', '..', 'responsive-ui', 'app', 'components', 'dropdown.js')).Dropdown;
+const DropdownMenuItem = require(path.join(__dirname, '..', '..', '..', '..', 'responsive-ui', 'app', 'components', 'dropdown.js')).DropdownMenuItem;
 
 describe('Dropdown components', function () {
   let onClickOutside;
@@ -112,4 +112,4 @@ describe('Dropdown components', function () {
     ReactTestUtils.Simulate.click(node);
     assert.equal(onClick.calledOnce, true);
   });
-});
\ No newline at end of file
+});
diff --git a/ui/classic/app/account-detail.js b/ui/app/account-detail.js
index bed05a7fb..bed05a7fb 100644
--- a/ui/classic/app/account-detail.js
+++ b/ui/app/account-detail.js
diff --git a/ui/classic/app/accounts/account-list-item.js b/ui/app/accounts/account-list-item.js
index 10a0b6cc7..10a0b6cc7 100644
--- a/ui/classic/app/accounts/account-list-item.js
+++ b/ui/app/accounts/account-list-item.js
diff --git a/ui/responsive/app/accounts/import/index.js b/ui/app/accounts/import/index.js
index 97b387229..97b387229 100644
--- a/ui/responsive/app/accounts/import/index.js
+++ b/ui/app/accounts/import/index.js
diff --git a/ui/responsive/app/accounts/import/json.js b/ui/app/accounts/import/json.js
index 158a3c923..158a3c923 100644
--- a/ui/responsive/app/accounts/import/json.js
+++ b/ui/app/accounts/import/json.js
diff --git a/ui/responsive/app/accounts/import/private-key.js b/ui/app/accounts/import/private-key.js
index 68ccee58e..68ccee58e 100644
--- a/ui/responsive/app/accounts/import/private-key.js
+++ b/ui/app/accounts/import/private-key.js
diff --git a/ui/responsive/app/accounts/import/seed.js b/ui/app/accounts/import/seed.js
index b4a7c0afa..b4a7c0afa 100644
--- a/ui/responsive/app/accounts/import/seed.js
+++ b/ui/app/accounts/import/seed.js
diff --git a/ui/classic/app/accounts/index.js b/ui/app/accounts/index.js
index ac2615cd7..ac2615cd7 100644
--- a/ui/classic/app/accounts/index.js
+++ b/ui/app/accounts/index.js
diff --git a/ui/responsive/app/actions.js b/ui/app/actions.js
index 2c60448dd..d99291e46 100644
--- a/ui/responsive/app/actions.js
+++ b/ui/app/actions.js
@@ -1,4 +1,4 @@
-const getBuyEthUrl = require('../../../app/scripts/lib/buy-eth-url')
+const getBuyEthUrl = require('../../app/scripts/lib/buy-eth-url')
 
 var actions = {
   _setBackgroundConnection: _setBackgroundConnection,
diff --git a/ui/responsive/app/add-token.js b/ui/app/add-token.js
index b303b5c0d..b303b5c0d 100644
--- a/ui/responsive/app/add-token.js
+++ b/ui/app/add-token.js
diff --git a/ui/classic/app/app.js b/ui/app/app.js
index 1a63002e1..1a63002e1 100644
--- a/ui/classic/app/app.js
+++ b/ui/app/app.js
diff --git a/ui/responsive/app/components/account-export.js b/ui/app/components/account-export.js
index 394d878f7..394d878f7 100644
--- a/ui/responsive/app/components/account-export.js
+++ b/ui/app/components/account-export.js
diff --git a/ui/classic/app/components/account-info-link.js b/ui/app/components/account-info-link.js
index 6526ab502..6526ab502 100644
--- a/ui/classic/app/components/account-info-link.js
+++ b/ui/app/components/account-info-link.js
diff --git a/ui/responsive/app/components/account-panel.js b/ui/app/components/account-panel.js
index abaaf8163..abaaf8163 100644
--- a/ui/responsive/app/components/account-panel.js
+++ b/ui/app/components/account-panel.js
diff --git a/ui/responsive/app/components/balance.js b/ui/app/components/balance.js
index 57ca84564..57ca84564 100644
--- a/ui/responsive/app/components/balance.js
+++ b/ui/app/components/balance.js
diff --git a/ui/responsive/app/components/binary-renderer.js b/ui/app/components/binary-renderer.js
index 0b6a1f5c2..0b6a1f5c2 100644
--- a/ui/responsive/app/components/binary-renderer.js
+++ b/ui/app/components/binary-renderer.js
diff --git a/ui/responsive/app/components/bn-as-decimal-input.js b/ui/app/components/bn-as-decimal-input.js
index f3ace4720..f3ace4720 100644
--- a/ui/responsive/app/components/bn-as-decimal-input.js
+++ b/ui/app/components/bn-as-decimal-input.js
diff --git a/ui/responsive/app/components/buy-button-subview.js b/ui/app/components/buy-button-subview.js
index 87084f92d..87084f92d 100644
--- a/ui/responsive/app/components/buy-button-subview.js
+++ b/ui/app/components/buy-button-subview.js
diff --git a/ui/responsive/app/components/coinbase-form.js b/ui/app/components/coinbase-form.js
index f44d86045..f44d86045 100644
--- a/ui/responsive/app/components/coinbase-form.js
+++ b/ui/app/components/coinbase-form.js
diff --git a/ui/responsive/app/components/copyButton.js b/ui/app/components/copyButton.js
index a25d0719c..a25d0719c 100644
--- a/ui/responsive/app/components/copyButton.js
+++ b/ui/app/components/copyButton.js
diff --git a/ui/responsive/app/components/copyable.js b/ui/app/components/copyable.js
index a4f6f4bc6..a4f6f4bc6 100644
--- a/ui/responsive/app/components/copyable.js
+++ b/ui/app/components/copyable.js
diff --git a/ui/responsive/app/components/custom-radio-list.js b/ui/app/components/custom-radio-list.js
index a4c525396..a4c525396 100644
--- a/ui/responsive/app/components/custom-radio-list.js
+++ b/ui/app/components/custom-radio-list.js
diff --git a/ui/classic/app/components/drop-menu-item.js b/ui/app/components/drop-menu-item.js
index e42948209..e42948209 100644
--- a/ui/classic/app/components/drop-menu-item.js
+++ b/ui/app/components/drop-menu-item.js
diff --git a/ui/classic/app/components/editable-label.js b/ui/app/components/editable-label.js
index 41936f5e0..41936f5e0 100644
--- a/ui/classic/app/components/editable-label.js
+++ b/ui/app/components/editable-label.js
diff --git a/ui/responsive/app/components/ens-input.js b/ui/app/components/ens-input.js
index 3a33ebf74..3a33ebf74 100644
--- a/ui/responsive/app/components/ens-input.js
+++ b/ui/app/components/ens-input.js
diff --git a/ui/responsive/app/components/eth-balance.js b/ui/app/components/eth-balance.js
index 4f538fd31..4f538fd31 100644
--- a/ui/responsive/app/components/eth-balance.js
+++ b/ui/app/components/eth-balance.js
diff --git a/ui/responsive/app/components/fiat-value.js b/ui/app/components/fiat-value.js
index 8a64a1cfc..8a64a1cfc 100644
--- a/ui/responsive/app/components/fiat-value.js
+++ b/ui/app/components/fiat-value.js
diff --git a/ui/responsive/app/components/hex-as-decimal-input.js b/ui/app/components/hex-as-decimal-input.js
index 4a71e9585..4a71e9585 100644
--- a/ui/responsive/app/components/hex-as-decimal-input.js
+++ b/ui/app/components/hex-as-decimal-input.js
diff --git a/ui/responsive/app/components/identicon.js b/ui/app/components/identicon.js
index c754bc6ba..c754bc6ba 100644
--- a/ui/responsive/app/components/identicon.js
+++ b/ui/app/components/identicon.js
diff --git a/ui/responsive/app/components/loading.js b/ui/app/components/loading.js
index 87d6f5d20..87d6f5d20 100644
--- a/ui/responsive/app/components/loading.js
+++ b/ui/app/components/loading.js
diff --git a/ui/responsive/app/components/mascot.js b/ui/app/components/mascot.js
index 973ec2cad..973ec2cad 100644
--- a/ui/responsive/app/components/mascot.js
+++ b/ui/app/components/mascot.js
diff --git a/ui/responsive/app/components/mini-account-panel.js b/ui/app/components/mini-account-panel.js
index c09cf5b7a..c09cf5b7a 100644
--- a/ui/responsive/app/components/mini-account-panel.js
+++ b/ui/app/components/mini-account-panel.js
diff --git a/ui/responsive/app/components/network.js b/ui/app/components/network.js
index 698a0bbb9..698a0bbb9 100644
--- a/ui/responsive/app/components/network.js
+++ b/ui/app/components/network.js
diff --git a/ui/responsive/app/components/notice.js b/ui/app/components/notice.js
index d9f0067cd..d9f0067cd 100644
--- a/ui/responsive/app/components/notice.js
+++ b/ui/app/components/notice.js
diff --git a/ui/responsive/app/components/pending-msg-details.js b/ui/app/components/pending-msg-details.js
index 16308d121..16308d121 100644
--- a/ui/responsive/app/components/pending-msg-details.js
+++ b/ui/app/components/pending-msg-details.js
diff --git a/ui/responsive/app/components/pending-msg.js b/ui/app/components/pending-msg.js
index b2cac164a..b2cac164a 100644
--- a/ui/responsive/app/components/pending-msg.js
+++ b/ui/app/components/pending-msg.js
diff --git a/ui/responsive/app/components/pending-personal-msg-details.js b/ui/app/components/pending-personal-msg-details.js
index 1050513f2..1050513f2 100644
--- a/ui/responsive/app/components/pending-personal-msg-details.js
+++ b/ui/app/components/pending-personal-msg-details.js
diff --git a/ui/responsive/app/components/pending-personal-msg.js b/ui/app/components/pending-personal-msg.js
index 4542adb28..4542adb28 100644
--- a/ui/responsive/app/components/pending-personal-msg.js
+++ b/ui/app/components/pending-personal-msg.js
diff --git a/ui/responsive/app/components/pending-tx.js b/ui/app/components/pending-tx.js
index 962680d30..d7d602f31 100644
--- a/ui/responsive/app/components/pending-tx.js
+++ b/ui/app/components/pending-tx.js
@@ -6,7 +6,7 @@ const clone = require('clone')
 
 const ethUtil = require('ethereumjs-util')
 const BN = ethUtil.BN
-const hexToBn = require('../../../../app/scripts/lib/hex-to-bn')
+const hexToBn = require('../../../app/scripts/lib/hex-to-bn')
 const util = require('../util')
 const MiniAccountPanel = require('./mini-account-panel')
 const Copyable = require('./copyable')
diff --git a/ui/responsive/app/components/qr-code.js b/ui/app/components/qr-code.js
index 06b9aed9b..06b9aed9b 100644
--- a/ui/responsive/app/components/qr-code.js
+++ b/ui/app/components/qr-code.js
diff --git a/ui/responsive/app/components/range-slider.js b/ui/app/components/range-slider.js
index 823f5eb01..823f5eb01 100644
--- a/ui/responsive/app/components/range-slider.js
+++ b/ui/app/components/range-slider.js
diff --git a/ui/responsive/app/components/shapeshift-form.js b/ui/app/components/shapeshift-form.js
index e0a720426..e0a720426 100644
--- a/ui/responsive/app/components/shapeshift-form.js
+++ b/ui/app/components/shapeshift-form.js
diff --git a/ui/responsive/app/components/shift-list-item.js b/ui/app/components/shift-list-item.js
index 32bfbeda4..32bfbeda4 100644
--- a/ui/responsive/app/components/shift-list-item.js
+++ b/ui/app/components/shift-list-item.js
diff --git a/ui/responsive/app/components/tab-bar.js b/ui/app/components/tab-bar.js
index 6295e7dd9..6295e7dd9 100644
--- a/ui/responsive/app/components/tab-bar.js
+++ b/ui/app/components/tab-bar.js
diff --git a/ui/responsive/app/components/template.js b/ui/app/components/template.js
index b6ed8eaa0..b6ed8eaa0 100644
--- a/ui/responsive/app/components/template.js
+++ b/ui/app/components/template.js
diff --git a/ui/responsive/app/components/token-cell.js b/ui/app/components/token-cell.js
index 19d7139bb..19d7139bb 100644
--- a/ui/responsive/app/components/token-cell.js
+++ b/ui/app/components/token-cell.js
diff --git a/ui/responsive/app/components/token-list.js b/ui/app/components/token-list.js
index 20cfa897e..20cfa897e 100644
--- a/ui/responsive/app/components/token-list.js
+++ b/ui/app/components/token-list.js
diff --git a/ui/responsive/app/components/tooltip.js b/ui/app/components/tooltip.js
index edbc074bb..edbc074bb 100644
--- a/ui/responsive/app/components/tooltip.js
+++ b/ui/app/components/tooltip.js
diff --git a/ui/responsive/app/components/transaction-list-item-icon.js b/ui/app/components/transaction-list-item-icon.js
index 431054340..431054340 100644
--- a/ui/responsive/app/components/transaction-list-item-icon.js
+++ b/ui/app/components/transaction-list-item-icon.js
diff --git a/ui/responsive/app/components/transaction-list-item.js b/ui/app/components/transaction-list-item.js
index dbda66a31..dbda66a31 100644
--- a/ui/responsive/app/components/transaction-list-item.js
+++ b/ui/app/components/transaction-list-item.js
diff --git a/ui/responsive/app/components/transaction-list.js b/ui/app/components/transaction-list.js
index 3b4ba741e..3b4ba741e 100644
--- a/ui/responsive/app/components/transaction-list.js
+++ b/ui/app/components/transaction-list.js
diff --git a/ui/responsive/app/conf-tx.js b/ui/app/conf-tx.js
index 63b77ef7f..63b77ef7f 100644
--- a/ui/responsive/app/conf-tx.js
+++ b/ui/app/conf-tx.js
diff --git a/ui/responsive/app/config.js b/ui/app/config.js
index 62785c49b..62785c49b 100644
--- a/ui/responsive/app/config.js
+++ b/ui/app/config.js
diff --git a/ui/responsive/app/conversion.json b/ui/app/conversion.json
index 155ffc4fc..155ffc4fc 100644
--- a/ui/responsive/app/conversion.json
+++ b/ui/app/conversion.json
diff --git a/ui/responsive/app/css/debug.css b/ui/app/css/debug.css
index 3e125bcd4..3e125bcd4 100644
--- a/ui/responsive/app/css/debug.css
+++ b/ui/app/css/debug.css
diff --git a/ui/responsive/app/css/fonts.css b/ui/app/css/fonts.css
index 3b9f581b9..3b9f581b9 100644
--- a/ui/responsive/app/css/fonts.css
+++ b/ui/app/css/fonts.css
diff --git a/ui/classic/app/css/index.css b/ui/app/css/index.css
index 808aafb4c..808aafb4c 100644
--- a/ui/classic/app/css/index.css
+++ b/ui/app/css/index.css
diff --git a/ui/responsive/app/css/lib.css b/ui/app/css/lib.css
index 910a24ee2..910a24ee2 100644
--- a/ui/responsive/app/css/lib.css
+++ b/ui/app/css/lib.css
diff --git a/ui/responsive/app/css/reset.css b/ui/app/css/reset.css
index 9ce89e8bc..9ce89e8bc 100644
--- a/ui/responsive/app/css/reset.css
+++ b/ui/app/css/reset.css
diff --git a/ui/responsive/app/css/transitions.css b/ui/app/css/transitions.css
index 393a944f9..393a944f9 100644
--- a/ui/responsive/app/css/transitions.css
+++ b/ui/app/css/transitions.css
diff --git a/ui/responsive/app/first-time/init-menu.js b/ui/app/first-time/init-menu.js
index cc7c51bd3..cc7c51bd3 100644
--- a/ui/responsive/app/first-time/init-menu.js
+++ b/ui/app/first-time/init-menu.js
diff --git a/ui/responsive/app/img/identicon-tardigrade.png b/ui/app/img/identicon-tardigrade.png
index 1742a32b8..1742a32b8 100644
--- a/ui/responsive/app/img/identicon-tardigrade.png
+++ b/ui/app/img/identicon-tardigrade.png
diff --git a/ui/responsive/app/img/identicon-walrus.png b/ui/app/img/identicon-walrus.png
index d58fae912..d58fae912 100644
--- a/ui/responsive/app/img/identicon-walrus.png
+++ b/ui/app/img/identicon-walrus.png
diff --git a/ui/responsive/app/info.js b/ui/app/info.js
index e8470de97..e8470de97 100644
--- a/ui/responsive/app/info.js
+++ b/ui/app/info.js
diff --git a/ui/classic/app/keychains/hd/create-vault-complete.js b/ui/app/keychains/hd/create-vault-complete.js
index a318a9b50..a318a9b50 100644
--- a/ui/classic/app/keychains/hd/create-vault-complete.js
+++ b/ui/app/keychains/hd/create-vault-complete.js
diff --git a/ui/responsive/app/keychains/hd/recover-seed/confirmation.js b/ui/app/keychains/hd/recover-seed/confirmation.js
index 4ccbec9fc..4ccbec9fc 100644
--- a/ui/responsive/app/keychains/hd/recover-seed/confirmation.js
+++ b/ui/app/keychains/hd/recover-seed/confirmation.js
diff --git a/ui/responsive/app/keychains/hd/restore-vault.js b/ui/app/keychains/hd/restore-vault.js
index 06e51d9b3..06e51d9b3 100644
--- a/ui/responsive/app/keychains/hd/restore-vault.js
+++ b/ui/app/keychains/hd/restore-vault.js
diff --git a/ui/responsive/app/new-keychain.js b/ui/app/new-keychain.js
index cc9633166..cc9633166 100644
--- a/ui/responsive/app/new-keychain.js
+++ b/ui/app/new-keychain.js
diff --git a/ui/responsive/app/reducers.js b/ui/app/reducers.js
index 11efca529..11efca529 100644
--- a/ui/responsive/app/reducers.js
+++ b/ui/app/reducers.js
diff --git a/ui/responsive/app/reducers/app.js b/ui/app/reducers/app.js
index 2fcc9bfe0..2fcc9bfe0 100644
--- a/ui/responsive/app/reducers/app.js
+++ b/ui/app/reducers/app.js
diff --git a/ui/responsive/app/reducers/identities.js b/ui/app/reducers/identities.js
index 341a404e7..341a404e7 100644
--- a/ui/responsive/app/reducers/identities.js
+++ b/ui/app/reducers/identities.js
diff --git a/ui/responsive/app/reducers/metamask.js b/ui/app/reducers/metamask.js
index e0c416c2d..e0c416c2d 100644
--- a/ui/responsive/app/reducers/metamask.js
+++ b/ui/app/reducers/metamask.js
diff --git a/ui/responsive/app/root.js b/ui/app/root.js
index 9e7314b20..9e7314b20 100644
--- a/ui/responsive/app/root.js
+++ b/ui/app/root.js
diff --git a/ui/responsive/app/send.js b/ui/app/send.js
index a21a219eb..a21a219eb 100644
--- a/ui/responsive/app/send.js
+++ b/ui/app/send.js
diff --git a/ui/responsive/app/settings.js b/ui/app/settings.js
index 454cc95e0..454cc95e0 100644
--- a/ui/responsive/app/settings.js
+++ b/ui/app/settings.js
diff --git a/ui/responsive/app/store.js b/ui/app/store.js
index ba9e58b49..ba9e58b49 100644
--- a/ui/responsive/app/store.js
+++ b/ui/app/store.js
diff --git a/ui/responsive/app/template.js b/ui/app/template.js
index d15b30fd2..d15b30fd2 100644
--- a/ui/responsive/app/template.js
+++ b/ui/app/template.js
diff --git a/ui/responsive/app/unlock.js b/ui/app/unlock.js
index 1aee3c5d0..1aee3c5d0 100644
--- a/ui/responsive/app/unlock.js
+++ b/ui/app/unlock.js
diff --git a/ui/responsive/app/util.js b/ui/app/util.js
index ac3f42c6b..ac3f42c6b 100644
--- a/ui/responsive/app/util.js
+++ b/ui/app/util.js
diff --git a/ui/responsive/css.js b/ui/css.js
index 7c394a87b..7c394a87b 100644
--- a/ui/responsive/css.js
+++ b/ui/css.js
diff --git a/ui/responsive/design/00-metamask-SignIn.jpg b/ui/design/00-metamask-SignIn.jpg
index 2becdb032..2becdb032 100644
--- a/ui/responsive/design/00-metamask-SignIn.jpg
+++ b/ui/design/00-metamask-SignIn.jpg
diff --git a/ui/responsive/design/01-metamask-SelectAcc.jpg b/ui/design/01-metamask-SelectAcc.jpg
index 239091a98..239091a98 100644
--- a/ui/responsive/design/01-metamask-SelectAcc.jpg
+++ b/ui/design/01-metamask-SelectAcc.jpg
diff --git a/ui/responsive/design/02-metamask-AccDetails.jpg b/ui/design/02-metamask-AccDetails.jpg
index d7d408ffc..d7d408ffc 100644
--- a/ui/responsive/design/02-metamask-AccDetails.jpg
+++ b/ui/design/02-metamask-AccDetails.jpg
diff --git a/ui/responsive/design/02a-metamask-AccDetails-OverToken.jpg b/ui/design/02a-metamask-AccDetails-OverToken.jpg
index f26ff31e8..f26ff31e8 100644
--- a/ui/responsive/design/02a-metamask-AccDetails-OverToken.jpg
+++ b/ui/design/02a-metamask-AccDetails-OverToken.jpg
diff --git a/ui/responsive/design/02a-metamask-AccDetails-OverTransaction.jpg b/ui/design/02a-metamask-AccDetails-OverTransaction.jpg
index 8a06be6b9..8a06be6b9 100644
--- a/ui/responsive/design/02a-metamask-AccDetails-OverTransaction.jpg
+++ b/ui/design/02a-metamask-AccDetails-OverTransaction.jpg
diff --git a/ui/responsive/design/02a-metamask-AccDetails.jpg b/ui/design/02a-metamask-AccDetails.jpg
index c37e0f539..c37e0f539 100644
--- a/ui/responsive/design/02a-metamask-AccDetails.jpg
+++ b/ui/design/02a-metamask-AccDetails.jpg
diff --git a/ui/responsive/design/02b-metamask-AccDetails-Send.jpg b/ui/design/02b-metamask-AccDetails-Send.jpg
index 10f2d27fd..10f2d27fd 100644
--- a/ui/responsive/design/02b-metamask-AccDetails-Send.jpg
+++ b/ui/design/02b-metamask-AccDetails-Send.jpg
diff --git a/ui/responsive/design/03-metamask-Qr.jpg b/ui/design/03-metamask-Qr.jpg
index 9c09de42f..9c09de42f 100644
--- a/ui/responsive/design/03-metamask-Qr.jpg
+++ b/ui/design/03-metamask-Qr.jpg
diff --git a/ui/responsive/design/05-metamask-Menu.jpg b/ui/design/05-metamask-Menu.jpg
index 0a43d7b2a..0a43d7b2a 100644
--- a/ui/responsive/design/05-metamask-Menu.jpg
+++ b/ui/design/05-metamask-Menu.jpg
diff --git a/ui/responsive/design/chromeStorePics/final_screen_dao_accounts.png b/ui/design/chromeStorePics/final_screen_dao_accounts.png
index 805cc96b6..805cc96b6 100644
--- a/ui/responsive/design/chromeStorePics/final_screen_dao_accounts.png
+++ b/ui/design/chromeStorePics/final_screen_dao_accounts.png
diff --git a/ui/responsive/design/chromeStorePics/final_screen_dao_locked.png b/ui/design/chromeStorePics/final_screen_dao_locked.png
index 9d9e33930..9d9e33930 100644
--- a/ui/responsive/design/chromeStorePics/final_screen_dao_locked.png
+++ b/ui/design/chromeStorePics/final_screen_dao_locked.png
diff --git a/ui/responsive/design/chromeStorePics/final_screen_dao_notification.png b/ui/design/chromeStorePics/final_screen_dao_notification.png
index d56a5ce62..d56a5ce62 100644
--- a/ui/responsive/design/chromeStorePics/final_screen_dao_notification.png
+++ b/ui/design/chromeStorePics/final_screen_dao_notification.png
diff --git a/ui/responsive/design/chromeStorePics/final_screen_wei_account.png b/ui/design/chromeStorePics/final_screen_wei_account.png
index d503ff301..d503ff301 100644
--- a/ui/responsive/design/chromeStorePics/final_screen_wei_account.png
+++ b/ui/design/chromeStorePics/final_screen_wei_account.png
diff --git a/ui/responsive/design/chromeStorePics/final_screen_wei_notification.png b/ui/design/chromeStorePics/final_screen_wei_notification.png
index 3560c51ff..3560c51ff 100644
--- a/ui/responsive/design/chromeStorePics/final_screen_wei_notification.png
+++ b/ui/design/chromeStorePics/final_screen_wei_notification.png
diff --git a/ui/responsive/design/chromeStorePics/icon-128.png b/ui/design/chromeStorePics/icon-128.png
index ae687147d..ae687147d 100644
--- a/ui/responsive/design/chromeStorePics/icon-128.png
+++ b/ui/design/chromeStorePics/icon-128.png
diff --git a/ui/responsive/design/chromeStorePics/icon-64.png b/ui/design/chromeStorePics/icon-64.png
index 7062cf4f1..7062cf4f1 100644
--- a/ui/responsive/design/chromeStorePics/icon-64.png
+++ b/ui/design/chromeStorePics/icon-64.png
diff --git a/ui/responsive/design/chromeStorePics/metamask_icon.ai b/ui/design/chromeStorePics/metamask_icon.ai
index 27400c5a4..27400c5a4 100644
--- a/ui/responsive/design/chromeStorePics/metamask_icon.ai
+++ b/ui/design/chromeStorePics/metamask_icon.ai
diff --git a/ui/responsive/design/chromeStorePics/promo1400560.png b/ui/design/chromeStorePics/promo1400560.png
index d3637ecc8..d3637ecc8 100644
--- a/ui/responsive/design/chromeStorePics/promo1400560.png
+++ b/ui/design/chromeStorePics/promo1400560.png
diff --git a/ui/responsive/design/chromeStorePics/promo440280.png b/ui/design/chromeStorePics/promo440280.png
index c1f92b1c0..c1f92b1c0 100644
--- a/ui/responsive/design/chromeStorePics/promo440280.png
+++ b/ui/design/chromeStorePics/promo440280.png
diff --git a/ui/responsive/design/chromeStorePics/promo920680.png b/ui/design/chromeStorePics/promo920680.png
index 726bd810a..726bd810a 100644
--- a/ui/responsive/design/chromeStorePics/promo920680.png
+++ b/ui/design/chromeStorePics/promo920680.png
diff --git a/ui/responsive/design/chromeStorePics/screen_dao_accounts.png b/ui/design/chromeStorePics/screen_dao_accounts.png
index 1a2e8052c..1a2e8052c 100644
--- a/ui/responsive/design/chromeStorePics/screen_dao_accounts.png
+++ b/ui/design/chromeStorePics/screen_dao_accounts.png
diff --git a/ui/responsive/design/chromeStorePics/screen_dao_locked.png b/ui/design/chromeStorePics/screen_dao_locked.png
index 6592c17e4..6592c17e4 100644
--- a/ui/responsive/design/chromeStorePics/screen_dao_locked.png
+++ b/ui/design/chromeStorePics/screen_dao_locked.png
diff --git a/ui/responsive/design/chromeStorePics/screen_dao_notification.png b/ui/design/chromeStorePics/screen_dao_notification.png
index baeb2ec39..baeb2ec39 100644
--- a/ui/responsive/design/chromeStorePics/screen_dao_notification.png
+++ b/ui/design/chromeStorePics/screen_dao_notification.png
diff --git a/ui/responsive/design/chromeStorePics/screen_wei_account.png b/ui/design/chromeStorePics/screen_wei_account.png
index 23301e4bf..23301e4bf 100644
--- a/ui/responsive/design/chromeStorePics/screen_wei_account.png
+++ b/ui/design/chromeStorePics/screen_wei_account.png
diff --git a/ui/responsive/design/chromeStorePics/screen_wei_notification.png b/ui/design/chromeStorePics/screen_wei_notification.png
index 7a763e5df..7a763e5df 100644
--- a/ui/responsive/design/chromeStorePics/screen_wei_notification.png
+++ b/ui/design/chromeStorePics/screen_wei_notification.png
diff --git a/ui/responsive/design/metamask-logo-eyes.png b/ui/design/metamask-logo-eyes.png
index c29331b28..c29331b28 100644
--- a/ui/responsive/design/metamask-logo-eyes.png
+++ b/ui/design/metamask-logo-eyes.png
diff --git a/ui/responsive/design/wireframes/1st_time_use.png b/ui/design/wireframes/1st_time_use.png
index c18ced5e2..c18ced5e2 100644
--- a/ui/responsive/design/wireframes/1st_time_use.png
+++ b/ui/design/wireframes/1st_time_use.png
diff --git a/ui/responsive/design/wireframes/metamask_wfs_jan_13.pdf b/ui/design/wireframes/metamask_wfs_jan_13.pdf
index c77c9274a..c77c9274a 100644
--- a/ui/responsive/design/wireframes/metamask_wfs_jan_13.pdf
+++ b/ui/design/wireframes/metamask_wfs_jan_13.pdf
diff --git a/ui/responsive/design/wireframes/metamask_wfs_jan_13.png b/ui/design/wireframes/metamask_wfs_jan_13.png
index d71d7bdb4..d71d7bdb4 100644
--- a/ui/responsive/design/wireframes/metamask_wfs_jan_13.png
+++ b/ui/design/wireframes/metamask_wfs_jan_13.png
diff --git a/ui/responsive/design/wireframes/metamask_wfs_jan_18.pdf b/ui/design/wireframes/metamask_wfs_jan_18.pdf
index 592ba8532..592ba8532 100644
--- a/ui/responsive/design/wireframes/metamask_wfs_jan_18.pdf
+++ b/ui/design/wireframes/metamask_wfs_jan_18.pdf
diff --git a/ui/responsive/example.js b/ui/example.js
index 4627c0e9c..4627c0e9c 100644
--- a/ui/responsive/example.js
+++ b/ui/example.js
diff --git a/ui/responsive/index.html b/ui/index.html
index 9dfaefbb3..9dfaefbb3 100644
--- a/ui/responsive/index.html
+++ b/ui/index.html
diff --git a/ui/responsive/index.js b/ui/index.js
index a729138d3..a729138d3 100644
--- a/ui/responsive/index.js
+++ b/ui/index.js
diff --git a/ui/responsive/lib/account-link.js b/ui/lib/account-link.js
index d061d0ad1..d061d0ad1 100644
--- a/ui/responsive/lib/account-link.js
+++ b/ui/lib/account-link.js
diff --git a/ui/responsive/lib/contract-namer.js b/ui/lib/contract-namer.js
index f05e770cc..f05e770cc 100644
--- a/ui/responsive/lib/contract-namer.js
+++ b/ui/lib/contract-namer.js
diff --git a/ui/responsive/lib/etherscan-prefix-for-network.js b/ui/lib/etherscan-prefix-for-network.js
index 2c1904f1c..2c1904f1c 100644
--- a/ui/responsive/lib/etherscan-prefix-for-network.js
+++ b/ui/lib/etherscan-prefix-for-network.js
diff --git a/ui/responsive/lib/explorer-link.js b/ui/lib/explorer-link.js
index 3b82ecd5f..3b82ecd5f 100644
--- a/ui/responsive/lib/explorer-link.js
+++ b/ui/lib/explorer-link.js
diff --git a/ui/responsive/lib/icon-factory.js b/ui/lib/icon-factory.js
index 27a74de66..27a74de66 100644
--- a/ui/responsive/lib/icon-factory.js
+++ b/ui/lib/icon-factory.js
diff --git a/ui/responsive/lib/lost-accounts-notice.js b/ui/lib/lost-accounts-notice.js
index 948b13db6..948b13db6 100644
--- a/ui/responsive/lib/lost-accounts-notice.js
+++ b/ui/lib/lost-accounts-notice.js
diff --git a/ui/responsive/lib/persistent-form.js b/ui/lib/persistent-form.js
index d4dc20b03..d4dc20b03 100644
--- a/ui/responsive/lib/persistent-form.js
+++ b/ui/lib/persistent-form.js
diff --git a/ui/responsive/lib/tx-helper.js b/ui/lib/tx-helper.js
index ec19daf64..ec19daf64 100644
--- a/ui/responsive/lib/tx-helper.js
+++ b/ui/lib/tx-helper.js
diff --git a/ui/responsive/.gitignore b/ui/responsive/.gitignore
deleted file mode 100644
index c6b1254b5..000000000
--- a/ui/responsive/.gitignore
+++ /dev/null
@@ -1,66 +0,0 @@
-
-# Created by https://www.gitignore.io/api/osx,node
-
-### OSX ###
-.DS_Store
-.AppleDouble
-.LSOverride
-
-# Icon must end with two \r
-Icon


-
-# Thumbnails
-._*
-
-# Files that might appear in the root of a volume
-.DocumentRevisions-V100
-.fseventsd
-.Spotlight-V100
-.TemporaryItems
-.Trashes
-.VolumeIcon.icns
-
-# Directories potentially created on remote AFP share
-.AppleDB
-.AppleDesktop
-Network Trash Folder
-Temporary Items
-.apdisk
-
-
-### Node ###
-# Logs
-logs
-*.log
-npm-debug.log*
-
-# Runtime data
-pids
-*.pid
-*.seed
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-
-# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (http://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directory
-# https://docs.npmjs.com/misc/faq#should-i-check-my-node-modules-folder-into-git
-node_modules
-
-# Optional npm cache directory
-.npm
-
-# Optional REPL history
-.node_repl_history
-