diff --git a/app/renderer/components/messageBox.js b/app/renderer/components/common/messageBox.js
similarity index 86%
rename from app/renderer/components/messageBox.js
rename to app/renderer/components/common/messageBox.js
index 155a72a1d63..30389810077 100644
--- a/app/renderer/components/messageBox.js
+++ b/app/renderer/components/common/messageBox.js
@@ -3,18 +3,18 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 const React = require('react')
-const ImmutableComponent = require('./immutableComponent')
-const Dialog = require('../../../js/components/dialog')
-const Button = require('../../../js/components/button')
-const SwitchControl = require('../../../js/components/switchControl')
-const appActions = require('../../../js/actions/appActions')
-const KeyCodes = require('../../common/constants/keyCodes')
-const config = require('../../../js/constants/config')
-const {makeImmutable} = require('../../common/state/immutableUtil')
+const ImmutableComponent = require('../immutableComponent')
+const Dialog = require('../../../../js/components/dialog')
+const Button = require('../../../../js/components/button')
+const SwitchControl = require('../../../../js/components/switchControl')
+const appActions = require('../../../../js/actions/appActions')
+const KeyCodes = require('../../../common/constants/keyCodes')
+const config = require('../../../../js/constants/config')
+const {makeImmutable} = require('../../../common/state/immutableUtil')
 
 const {StyleSheet, css} = require('aphrodite')
-const commonStyles = require('./styles/commonStyles')
-const globalStyles = require('./styles/global')
+const commonStyles = require('../styles/commonStyles')
+const globalStyles = require('../styles/global')
 
 class MessageBox extends ImmutableComponent {
   constructor () {
diff --git a/js/about/preferences.js b/js/about/preferences.js
index 4df60e2d23b..cead26e69e5 100644
--- a/js/about/preferences.js
+++ b/js/about/preferences.js
@@ -11,7 +11,7 @@ const UrlUtil = require('../lib/urlutil')
 // Components
 const PreferenceNavigation = require('../../app/renderer/components/preferences/preferenceNavigation')
 const {SettingsList, SettingItem, SettingCheckbox, SettingItemIcon} = require('../../app/renderer/components/settings')
-const {SettingTextbox} = require('../../app/renderer/components/textbox')
+const {SettingTextbox} = require('../../app/renderer/components/common/textbox')
 const {SettingDropdown} = require('../../app/renderer/components/common/dropdown')
 const {DefaultSectionTitle} = require('../../app/renderer/components/common/sectionTitle')
 const Button = require('../components/button')
diff --git a/js/components/frame.js b/js/components/frame.js
index 9c5556c5ba7..fefc271b8d1 100644
--- a/js/components/frame.js
+++ b/js/components/frame.js
@@ -31,7 +31,7 @@ const windowStore = require('../stores/windowStore')
 const appStoreRenderer = require('../stores/appStoreRenderer')
 const siteSettings = require('../state/siteSettings')
 const imageUtil = require('../lib/imageUtil')
-const MessageBox = require('../../app/renderer/components/messageBox')
+const MessageBox = require('../../app/renderer/components/common/messageBox')
 
 const WEBRTC_DEFAULT = 'default'
 const WEBRTC_DISABLE_NON_PROXY = 'disable_non_proxied_udp'
diff --git a/test/unit/app/renderer/components/messageBoxTest.js b/test/unit/app/renderer/components/messageBoxTest.js
index 2d071626755..22c0843b8f6 100644
--- a/test/unit/app/renderer/components/messageBoxTest.js
+++ b/test/unit/app/renderer/components/messageBoxTest.js
@@ -20,7 +20,7 @@ describe('MessageBox component unit tests', function () {
       useCleanCache: true
     })
     mockery.registerMock('electron', require('../../../lib/fakeElectron'))
-    MessageBox = require('../../../../../app/renderer/components/messageBox')
+    MessageBox = require('../../../../../app/renderer/components/common/messageBox')
     appActions = require('../../../../../js/actions/appActions')
   })
   after(function () {