diff --git a/app/renderer/components/clipboardButton.js b/app/renderer/components/common/clipboardButton.js
similarity index 100%
rename from app/renderer/components/clipboardButton.js
rename to app/renderer/components/common/clipboardButton.js
diff --git a/app/renderer/components/settings.js b/app/renderer/components/common/settings.js
similarity index 92%
rename from app/renderer/components/settings.js
rename to app/renderer/components/common/settings.js
index cad6cb063f2..83c5b96a695 100644
--- a/app/renderer/components/settings.js
+++ b/app/renderer/components/common/settings.js
@@ -3,14 +3,14 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 const React = require('react')
-const ImmutableComponent = require('./immutableComponent')
+const ImmutableComponent = require('../immutableComponent')
 const {StyleSheet, css} = require('aphrodite')
-const aboutActions = require('../../../js/about/aboutActions')
-const getSetting = require('../../../js/settings').getSetting
-const {changeSetting} = require('../lib/settingsUtil')
-const SwitchControl = require('../../../js/components/switchControl')
-const cx = require('../../../js/lib/classSet')
-const settings = require('../../../js/constants/settings')
+const aboutActions = require('../../../../js/about/aboutActions')
+const getSetting = require('../../../../js/settings').getSetting
+const {changeSetting} = require('../../lib/settingsUtil')
+const SwitchControl = require('../../../../js/components/switchControl')
+const cx = require('../../../../js/lib/classSet')
+const settings = require('../../../../js/constants/settings')
 
 class SettingsList extends ImmutableComponent {
   render () {
diff --git a/app/renderer/components/downloadItem.js b/app/renderer/components/download/downloadItem.js
similarity index 91%
rename from app/renderer/components/downloadItem.js
rename to app/renderer/components/download/downloadItem.js
index 229af25829a..4e5aa19319d 100644
--- a/app/renderer/components/downloadItem.js
+++ b/app/renderer/components/download/downloadItem.js
@@ -3,15 +3,23 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 const React = require('react')
-const ImmutableComponent = require('./immutableComponent')
-const Button = require('../../../js/components/button')
-const contextMenus = require('../../../js/contextMenus')
-const downloadStates = require('../../../js/constants/downloadStates')
-const {PAUSE, RESUME, CANCEL} = require('../../common/constants/electronDownloadItemActions')
-const appActions = require('../../../js/actions/appActions')
-const downloadUtil = require('../../../js/state/downloadUtil')
-const {getOrigin} = require('../../../js/state/siteUtil')
-const cx = require('../../../js/lib/classSet')
+
+// Components
+const ImmutableComponent = require('../immutableComponent')
+const Button = require('../../../../js/components/button')
+
+// Constants
+const downloadStates = require('../../../../js/constants/downloadStates')
+const {PAUSE, RESUME, CANCEL} = require('../../../common/constants/electronDownloadItemActions')
+
+// Actions
+const appActions = require('../../../../js/actions/appActions')
+
+// Utils
+const contextMenus = require('../../../../js/contextMenus')
+const downloadUtil = require('../../../../js/state/downloadUtil')
+const {getOrigin} = require('../../../../js/state/siteUtil')
+const cx = require('../../../../js/lib/classSet')
 
 class DownloadItem extends ImmutableComponent {
   constructor () {
diff --git a/app/renderer/components/downloadsBar.js b/app/renderer/components/download/downloadsBar.js
similarity index 82%
rename from app/renderer/components/downloadsBar.js
rename to app/renderer/components/download/downloadsBar.js
index f740e6c41ad..d5977c76a3c 100644
--- a/app/renderer/components/downloadsBar.js
+++ b/app/renderer/components/download/downloadsBar.js
@@ -3,13 +3,19 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 const React = require('react')
-const ImmutableComponent = require('./immutableComponent')
-const Button = require('../../../js/components/button')
-const contextMenus = require('../../../js/contextMenus')
-const windowActions = require('../../../js/actions/windowActions')
-const webviewActions = require('../../../js/actions/webviewActions')
+
+// Components
+const ImmutableComponent = require('../immutableComponent')
+const Button = require('../../../../js/components/button')
 const DownloadItem = require('./downloadItem')
 
+// Actions
+const windowActions = require('../../../../js/actions/windowActions')
+const webviewActions = require('../../../../js/actions/webviewActions')
+
+// Utils
+const contextMenus = require('../../../../js/contextMenus')
+
 class DownloadsBar extends ImmutableComponent {
   constructor () {
     super()
@@ -20,7 +26,7 @@ class DownloadsBar extends ImmutableComponent {
     webviewActions.setWebviewFocused()
   }
   render () {
-    const getComputedStyle = require('../getComputedStyle')
+    const getComputedStyle = require('../../getComputedStyle')
     const downloadItemWidth = Number.parseInt(getComputedStyle('--download-item-width'), 10)
     const downloadItemMargin = Number.parseInt(getComputedStyle('--download-item-margin'), 10)
     const downloadBarPadding = Number.parseInt(getComputedStyle('--download-bar-padding'), 10)
diff --git a/app/renderer/components/navigation/navigationBar.js b/app/renderer/components/navigation/navigationBar.js
index 538f0147d6f..4ed735b2e6d 100644
--- a/app/renderer/components/navigation/navigationBar.js
+++ b/app/renderer/components/navigation/navigationBar.js
@@ -4,32 +4,41 @@
 
 const React = require('react')
 const Immutable = require('immutable')
-const ReduxComponent = require('../reduxComponent')
+const ipc = require('electron').ipcRenderer
 
-const cx = require('../../../../js/lib/classSet')
+// Components
+const ReduxComponent = require('../reduxComponent')
 const UrlBar = require('./urlBar')
+const AddEditBookmarkHanger = require('../bookmarks/addEditBookmarkHanger')
+const PublisherToggle = require('./publisherToggle')
+const LongPressButton = require('./../../../../js/components/longPressButton')
+
+// Actions
 const windowActions = require('../../../../js/actions/windowActions')
 const appActions = require('../../../../js/actions/appActions')
+
+// Constants
 const siteTags = require('../../../../js/constants/siteTags')
 const messages = require('../../../../js/constants/messages')
 const settings = require('../../../../js/constants/settings')
-const ipc = require('electron').ipcRenderer
-const {isSourceAboutUrl} = require('../../../../js/lib/appUrlUtil')
-const AddEditBookmarkHanger = require('../bookmarks/addEditBookmarkHanger')
-const siteUtil = require('../../../../js/state/siteUtil')
-const eventUtil = require('../../../../js/lib/eventUtil')
-const UrlUtil = require('../../../../js/lib/urlutil')
-const getSetting = require('../../../../js/settings').getSetting
-const windowStore = require('../../../../js/stores/windowStore')
-const contextMenus = require('../../../../js/contextMenus')
-const LongPressButton = require('./../../../../js/components/longPressButton')
-const PublisherToggle = require('../publisherToggle')
 
 // State
 const tabState = require('../../../common/state/tabState')
 const frameStateUtil = require('../../../../js/state/frameStateUtil')
 const menuBarState = require('../../../common/state/menuBarState')
 
+// Store
+const windowStore = require('../../../../js/stores/windowStore')
+
+// Utils
+const cx = require('../../../../js/lib/classSet')
+const {isSourceAboutUrl} = require('../../../../js/lib/appUrlUtil')
+const siteUtil = require('../../../../js/state/siteUtil')
+const eventUtil = require('../../../../js/lib/eventUtil')
+const UrlUtil = require('../../../../js/lib/urlutil')
+const {getSetting} = require('../../../../js/settings')
+const contextMenus = require('../../../../js/contextMenus')
+
 class NavigationBar extends React.Component {
   constructor (props) {
     super(props)
diff --git a/app/renderer/components/navigation/navigator.js b/app/renderer/components/navigation/navigator.js
index 137d7a21272..5301cf77191 100644
--- a/app/renderer/components/navigation/navigator.js
+++ b/app/renderer/components/navigation/navigator.js
@@ -17,7 +17,7 @@ const ReduxComponent = require('../reduxComponent')
 const NavigationBar = require('./navigationBar')
 const LongPressButton = require('../../../../js/components/longPressButton')
 const MenuBar = require('./menuBar')
-const WindowCaptionButtons = require('../windowCaptionButtons')
+const WindowCaptionButtons = require('./windowCaptionButtons')
 const Button = require('../../../../js/components/button')
 const BrowserAction = require('./browserAction')
 
diff --git a/app/renderer/components/publisherToggle.js b/app/renderer/components/navigation/publisherToggle.js
similarity index 83%
rename from app/renderer/components/publisherToggle.js
rename to app/renderer/components/navigation/publisherToggle.js
index 10a9309da33..c98ff9a2b47 100644
--- a/app/renderer/components/publisherToggle.js
+++ b/app/renderer/components/navigation/publisherToggle.js
@@ -3,20 +3,29 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 const React = require('react')
-const ImmutableComponent = require('./immutableComponent')
-const appActions = require('../../../js/actions/appActions')
-const settings = require('../../../js/constants/settings')
-const getSetting = require('../../../js/settings').getSetting
 const {StyleSheet, css} = require('aphrodite')
-const globalStyles = require('./styles/global')
-const {getHostPattern, isHttpOrHttps} = require('../../../js/lib/urlutil')
-const {getBaseUrl} = require('../../../js/lib/appUrlUtil')
-const BrowserButton = require('./common/browserButton')
-
-const noFundVerifiedPublisherImage = require('../../extensions/brave/img/urlbar/browser_URL_fund_no_verified.svg')
-const fundVerifiedPublisherImage = require('../../extensions/brave/img/urlbar/browser_URL_fund_yes_verified.svg')
-const noFundUnverifiedPublisherImage = require('../../extensions/brave/img/urlbar/browser_URL_fund_no.svg')
-const fundUnverifiedPublisherImage = require('../../extensions/brave/img/urlbar/browser_URL_fund_yes.svg')
+
+// Components
+const ImmutableComponent = require('../immutableComponent')
+const BrowserButton = require('../common/browserButton')
+
+// Actions
+const appActions = require('../../../../js/actions/appActions')
+
+// Constants
+const settings = require('../../../../js/constants/settings')
+
+// Utils
+const {getSetting} = require('../../../../js/settings')
+const {getHostPattern, isHttpOrHttps} = require('../../../../js/lib/urlutil')
+const {getBaseUrl} = require('../../../../js/lib/appUrlUtil')
+
+// Style
+const globalStyles = require('../styles/global')
+const noFundVerifiedPublisherImage = require('../../../extensions/brave/img/urlbar/browser_URL_fund_no_verified.svg')
+const fundVerifiedPublisherImage = require('../../../extensions/brave/img/urlbar/browser_URL_fund_yes_verified.svg')
+const noFundUnverifiedPublisherImage = require('../../../extensions/brave/img/urlbar/browser_URL_fund_no.svg')
+const fundUnverifiedPublisherImage = require('../../../extensions/brave/img/urlbar/browser_URL_fund_yes.svg')
 
 class PublisherToggle extends ImmutableComponent {
   constructor () {
diff --git a/app/renderer/components/windowCaptionButtons.js b/app/renderer/components/navigation/windowCaptionButtons.js
similarity index 89%
rename from app/renderer/components/windowCaptionButtons.js
rename to app/renderer/components/navigation/windowCaptionButtons.js
index 36fcb94c4dd..8ea4abbeffe 100644
--- a/app/renderer/components/windowCaptionButtons.js
+++ b/app/renderer/components/navigation/windowCaptionButtons.js
@@ -3,12 +3,18 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 const React = require('react')
-const ImmutableComponent = require('./immutableComponent')
-const appActions = require('../../../js/actions/appActions')
-const windowActions = require('../../../js/actions/windowActions')
-const locale = require('../../../js/l10n')
-const {getCurrentWindowId, isMaximized, isFullScreen} = require('../currentWindow')
-const cx = require('../../../js/lib/classSet')
+
+// Components
+const ImmutableComponent = require('../immutableComponent')
+
+// Actions
+const appActions = require('../../../../js/actions/appActions')
+const windowActions = require('../../../../js/actions/windowActions')
+
+// Utils
+const locale = require('../../../../js/l10n')
+const {getCurrentWindowId, isMaximized, isFullScreen} = require('../../currentWindow')
+const cx = require('../../../../js/lib/classSet')
 
 class WindowCaptionButtons extends ImmutableComponent {
   constructor () {
diff --git a/app/renderer/components/preferences/advancedTab.js b/app/renderer/components/preferences/advancedTab.js
index b732b5b7684..cdf2fcd1591 100644
--- a/app/renderer/components/preferences/advancedTab.js
+++ b/app/renderer/components/preferences/advancedTab.js
@@ -11,7 +11,7 @@ const commonStyles = require('../styles/commonStyles')
 const {getSetting} = require('../../../../js/settings')
 
 // Components
-const {SettingsList, SettingItem, SettingCheckbox} = require('../settings')
+const {SettingsList, SettingItem, SettingCheckbox} = require('../common/settings')
 const {SettingDropdown} = require('../common/dropdown')
 const {DefaultSectionTitle} = require('../common/sectionTitle')
 
diff --git a/app/renderer/components/preferences/extensionsTab.js b/app/renderer/components/preferences/extensionsTab.js
index a2a34789723..39e4f45598b 100644
--- a/app/renderer/components/preferences/extensionsTab.js
+++ b/app/renderer/components/preferences/extensionsTab.js
@@ -12,7 +12,7 @@ const aboutActions = require('../../../../js/about/aboutActions')
 const settings = require('../../../../js/constants/settings')
 const config = require('../../../../js/constants/config')
 const {getSetting} = require('../../../../js/settings')
-const {SettingCheckbox} = require('../settings')
+const {SettingCheckbox} = require('../common/settings')
 const {isPasswordManager, getExtensionKey, isBuiltInExtension, bravifyText} = require('../../lib/extensionsUtil')
 
 const {DefaultSectionTitle} = require('../common/sectionTitle')
diff --git a/app/renderer/components/preferences/payment/advancedSettings.js b/app/renderer/components/preferences/payment/advancedSettings.js
index c3537d2ad9e..d5236dd6ba6 100644
--- a/app/renderer/components/preferences/payment/advancedSettings.js
+++ b/app/renderer/components/preferences/payment/advancedSettings.js
@@ -11,7 +11,7 @@ const appConfig = require('../../../../../js/constants/appConfig')
 
 // components
 const BrowserButton = require('../../common/browserButton')
-const {SettingsList, SettingItem, SettingCheckbox} = require('../../settings')
+const {SettingsList, SettingItem, SettingCheckbox} = require('../../common/settings')
 const {SettingDropdown} = require('../../common/dropdown')
 const ImmutableComponent = require('../../immutableComponent')
 
diff --git a/app/renderer/components/preferences/payment/enabledContent.js b/app/renderer/components/preferences/payment/enabledContent.js
index 813fb976866..73adb90a869 100644
--- a/app/renderer/components/preferences/payment/enabledContent.js
+++ b/app/renderer/components/preferences/payment/enabledContent.js
@@ -16,7 +16,7 @@ const ImmutableComponent = require('../../immutableComponent')
 const BrowserButton = require('../../common/browserButton')
 const {FormTextbox} = require('../../common/textbox')
 const {FormDropdown} = require('../../common/dropdown')
-const {SettingsList, SettingItem} = require('../../settings')
+const {SettingsList, SettingItem} = require('../../common/settings')
 const LedgerTable = require('./ledgerTable')
 
 // style
diff --git a/app/renderer/components/preferences/payment/ledgerRecovery.js b/app/renderer/components/preferences/payment/ledgerRecovery.js
index 8ae214cbf44..f8f8559a949 100644
--- a/app/renderer/components/preferences/payment/ledgerRecovery.js
+++ b/app/renderer/components/preferences/payment/ledgerRecovery.js
@@ -12,7 +12,7 @@ const {btcToCurrencyString} = require('../../../../common/lib/ledgerUtil')
 const ImmutableComponent = require('../../immutableComponent')
 const BrowserButton = require('../../common/browserButton')
 const {RecoveryKeyTextbox} = require('../../common/textbox')
-const {SettingsList, SettingItem} = require('../../settings')
+const {SettingsList, SettingItem} = require('../../common/settings')
 
 // style
 const globalStyles = require('../../styles/global')
diff --git a/app/renderer/components/preferences/payment/ledgerTable.js b/app/renderer/components/preferences/payment/ledgerTable.js
index 7c6d0172452..0cb0abb2716 100644
--- a/app/renderer/components/preferences/payment/ledgerTable.js
+++ b/app/renderer/components/preferences/payment/ledgerTable.js
@@ -24,7 +24,7 @@ const pinIcon = require('../../../../extensions/brave/img/ledger/icon_pin.svg')
 const settings = require('../../../../../js/constants/settings')
 const getSetting = require('../../../../../js/settings').getSetting
 const aboutActions = require('../../../../../js/about/aboutActions')
-const {SettingCheckbox, SiteSettingCheckbox} = require('../../settings')
+const {SettingCheckbox, SiteSettingCheckbox} = require('../../common/settings')
 
 class LedgerTable extends ImmutableComponent {
   get synopsis () {
diff --git a/app/renderer/components/preferences/paymentsTab.js b/app/renderer/components/preferences/paymentsTab.js
index 1446f64aeea..6049bbdc53b 100644
--- a/app/renderer/components/preferences/paymentsTab.js
+++ b/app/renderer/components/preferences/paymentsTab.js
@@ -11,7 +11,7 @@ const cx = require('../../../../js/lib/classSet')
 const ImmutableComponent = require('../immutableComponent')
 const ModalOverlay = require('../../../../js/components/modalOverlay')
 
-const {SettingCheckbox} = require('../settings')
+const {SettingCheckbox} = require('../common/settings')
 const {
   sectionTitleStyles,
   SectionTitleWrapper,
diff --git a/app/renderer/components/preferences/pluginsTab.js b/app/renderer/components/preferences/pluginsTab.js
index c27ef29964d..ddf6e8c45ce 100644
--- a/app/renderer/components/preferences/pluginsTab.js
+++ b/app/renderer/components/preferences/pluginsTab.js
@@ -14,7 +14,7 @@ const WidevineInfo = require('../../components/widevineInfo')
 const flash = appConfig.resourceNames.FLASH
 const widevine = appConfig.resourceNames.WIDEVINE
 
-const {SettingsList, SettingCheckbox} = require('../../components/settings')
+const {SettingsList, SettingCheckbox} = require('../common/settings')
 const {DefaultSectionTitle} = require('../common/sectionTitle')
 
 class PluginsTab extends ImmutableComponent {
diff --git a/app/renderer/components/preferences/syncTab.js b/app/renderer/components/preferences/syncTab.js
index d59a8c57203..d2bc6970896 100644
--- a/app/renderer/components/preferences/syncTab.js
+++ b/app/renderer/components/preferences/syncTab.js
@@ -11,7 +11,7 @@ const niceware = require('niceware')
 // Components
 const ModalOverlay = require('../../../../js/components/modalOverlay')
 const BrowserButton = require('../common/browserButton')
-const {SettingsList, SettingItem, SettingCheckbox} = require('../settings')
+const {SettingsList, SettingItem, SettingCheckbox} = require('../common/settings')
 const SortableTable = require('../../../../js/components/sortableTable')
 
 const {
diff --git a/app/renderer/components/widevinePanel.js b/app/renderer/components/widevinePanel.js
index e643ba9c2da..83369d2d080 100644
--- a/app/renderer/components/widevinePanel.js
+++ b/app/renderer/components/widevinePanel.js
@@ -3,16 +3,14 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 const React = require('react')
+const {StyleSheet, css} = require('aphrodite/no-important')
+
+// Components
 const ImmutableComponent = require('./immutableComponent')
 const Dialog = require('../../../js/components/dialog')
 const Button = require('../../../js/components/button')
-const appConfig = require('../../../js/constants/appConfig')
 const WidevineInfo = require('./widevineInfo')
 const SwitchControl = require('../../../js/components/switchControl')
-const windowActions = require('../../../js/actions/windowActions')
-const appActions = require('../../../js/actions/appActions')
-const siteUtil = require('../../../js/state/siteUtil')
-
 const {
   CommonFormLarge,
   CommonFormTitle,
@@ -21,10 +19,20 @@ const {
   CommonFormBottomWrapper
 } = require('./common/commonForm')
 
-const {StyleSheet, css} = require('aphrodite/no-important')
+// Constants
+const appConfig = require('../../../js/constants/appConfig')
+
+// Actions
+const windowActions = require('../../../js/actions/windowActions')
+const appActions = require('../../../js/actions/appActions')
+
+// Utils
+const siteUtil = require('../../../js/state/siteUtil')
+
+// Styles
 const commonStyles = require('./styles/commonStyles')
 
-class ImportBrowserDataPanel extends ImmutableComponent {
+class WidevinePanel extends ImmutableComponent {
   constructor () {
     super()
     this.onInstallAndAllow = this.onInstallAndAllow.bind(this)
@@ -96,4 +104,4 @@ const styles = StyleSheet.create({
   }
 })
 
-module.exports = ImportBrowserDataPanel
+module.exports = WidevinePanel
diff --git a/js/about/brave.js b/js/about/brave.js
index 88b557aaefa..4ae2f9d9a52 100644
--- a/js/about/brave.js
+++ b/js/about/brave.js
@@ -6,7 +6,7 @@ const React = require('react')
 const Immutable = require('immutable')
 const messages = require('../constants/messages')
 const SortableTable = require('../components/sortableTable')
-const ClipboardButton = require('../../app/renderer/components/clipboardButton')
+const ClipboardButton = require('../../app/renderer/components/common/clipboardButton')
 const aboutActions = require('./aboutActions')
 
 const ipc = window.chrome.ipcRenderer
diff --git a/js/about/preferences.js b/js/about/preferences.js
index 16df1b08b60..e2c9eb52212 100644
--- a/js/about/preferences.js
+++ b/js/about/preferences.js
@@ -12,7 +12,7 @@ const commonStyles = require('../../app/renderer/components/styles/commonStyles'
 
 // Components
 const PreferenceNavigation = require('../../app/renderer/components/preferences/preferenceNavigation')
-const {SettingsList, SettingItem, SettingCheckbox, SettingItemIcon} = require('../../app/renderer/components/settings')
+const {SettingsList, SettingItem, SettingCheckbox, SettingItemIcon} = require('../../app/renderer/components/common/settings')
 const {SettingTextbox} = require('../../app/renderer/components/common/textbox')
 const {SettingDropdown} = require('../../app/renderer/components/common/dropdown')
 const {DefaultSectionTitle} = require('../../app/renderer/components/common/sectionTitle')
diff --git a/js/components/main.js b/js/components/main.js
index 865cbf1ce43..648706cab85 100644
--- a/js/components/main.js
+++ b/js/components/main.js
@@ -23,7 +23,7 @@ const TabsToolbar = require('../../app/renderer/components/tabs/tabsToolbar')
 const FindBar = require('./findbar')
 const UpdateBar = require('./updateBar')
 const {NotificationBar} = require('./notificationBar')
-const DownloadsBar = require('../../app/renderer/components/downloadsBar')
+const DownloadsBar = require('../../app/renderer/components/download/downloadsBar')
 const SiteInfo = require('./siteInfo')
 const BraveryPanel = require('./braveryPanel')
 const ClearBrowsingDataPanel = require('../../app/renderer/components/clearBrowsingDataPanel')
diff --git a/test/unit/about/preferencesTest.js b/test/unit/about/preferencesTest.js
index 213c99cce46..1ab4a73a6e6 100644
--- a/test/unit/about/preferencesTest.js
+++ b/test/unit/about/preferencesTest.js
@@ -56,7 +56,7 @@ describe('Preferences component', function () {
     window.CustomEvent = {}
 
     Preferences = require('../../../js/about/preferences').AboutPreferences
-    SettingItemIcon = require('../../../app/renderer/components/settings').SettingItemIcon
+    SettingItemIcon = require('../../../app/renderer/components/common/settings').SettingItemIcon
     appActions = require('../../../js/actions/appActions')
   })
   after(function () {
diff --git a/test/unit/app/renderer/downloadItemTest.js b/test/unit/app/renderer/downloadItemTest.js
index 5bc489a59ee..c2ce1b3fe7f 100644
--- a/test/unit/app/renderer/downloadItemTest.js
+++ b/test/unit/app/renderer/downloadItemTest.js
@@ -48,7 +48,7 @@ describe('downloadItem component', function () {
       useCleanCache: true
     })
     mockery.registerMock('electron', fakeElectron)
-    DownloadItem = require('../../../../app/renderer/components/downloadItem')
+    DownloadItem = require('../../../../app/renderer/components/download/downloadItem')
     appActions = require('../../../../js/actions/appActions')
   })
 
diff --git a/test/unit/app/renderer/downloadsToolbarTest.js b/test/unit/app/renderer/downloadsToolbarTest.js
index f23c038f921..258e5edd23a 100644
--- a/test/unit/app/renderer/downloadsToolbarTest.js
+++ b/test/unit/app/renderer/downloadsToolbarTest.js
@@ -53,8 +53,8 @@ describe('downloadsBar component', function () {
       useCleanCache: true
     })
     mockery.registerMock('electron', fakeElectron)
-    DownloadItem = require('../../../../app/renderer/components/downloadItem')
-    DownloadsBar = require('../../../../app/renderer/components/downloadsBar')
+    DownloadItem = require('../../../../app/renderer/components/download/downloadItem')
+    DownloadsBar = require('../../../../app/renderer/components/download/downloadsBar')
   })
   after(function () {
     mockery.disable()
@@ -95,7 +95,7 @@ describe('downloadsBar component', function () {
   describe('very narrow downloads bar with items', function () {
     before(function () {
       // TODO: We can remove this once we're on Khan/aphrodite
-      mockery.registerMock('../getComputedStyle', () => 10)
+      mockery.registerMock('../../getComputedStyle', () => 10)
       this.result = mount(<DownloadsBar windowWidth={0} downloads={newDownloads()} />)
     })
     it('renders no downloads', function () {
diff --git a/test/unit/app/renderer/publisherToggleTest.js b/test/unit/app/renderer/publisherToggleTest.js
index 0345c4a4e80..8085b0d6c58 100644
--- a/test/unit/app/renderer/publisherToggleTest.js
+++ b/test/unit/app/renderer/publisherToggleTest.js
@@ -43,11 +43,11 @@ describe('PublisherToggle component', function () {
       warnOnUnregistered: false,
       useCleanCache: true
     })
-    mockery.registerMock('../../extensions/brave/img/urlbar/browser_URL_fund_no_verified.svg')
-    mockery.registerMock('../../extensions/brave/img/urlbar/browser_URL_fund_yes_verified.svg')
-    mockery.registerMock('../../extensions/brave/img/urlbar/browser_URL_fund_no.svg')
-    mockery.registerMock('../../extensions/brave/img/urlbar/browser_URL_fund_yes.svg')
-    mockery.registerMock('../../../js/settings', { getSetting: (settingKey, settingsCollection, value) => {
+    mockery.registerMock('../../../extensions/brave/img/urlbar/browser_URL_fund_no_verified.svg')
+    mockery.registerMock('../../../extensions/brave/img/urlbar/browser_URL_fund_yes_verified.svg')
+    mockery.registerMock('../../../extensions/brave/img/urlbar/browser_URL_fund_no.svg')
+    mockery.registerMock('../../../extensions/brave/img/urlbar/browser_URL_fund_yes.svg')
+    mockery.registerMock('../../../../js/settings', { getSetting: (settingKey, settingsCollection, value) => {
       if (settingKey === paymentsEnabled || settingKey === autoSuggestSites) {
         return true
       }
@@ -55,7 +55,7 @@ describe('PublisherToggle component', function () {
     }})
     mockery.registerMock('electron', fakeElectron)
     window.chrome = fakeElectron
-    PublisherToggle = require('../../../../app/renderer/components/publisherToggle')
+    PublisherToggle = require('../../../../app/renderer/components/navigation/publisherToggle')
   })
   after(function () {
     mockery.disable()