diff --git a/src/js/components/wallet/pages/Acquire.js b/src/js/views/Wallet/views/Acquire/index.js
similarity index 100%
rename from src/js/components/wallet/pages/Acquire.js
rename to src/js/views/Wallet/views/Acquire/index.js
diff --git a/src/js/components/wallet/pages/Bootloader.js b/src/js/views/Wallet/views/Bootloader/index.js
similarity index 100%
rename from src/js/components/wallet/pages/Bootloader.js
rename to src/js/views/Wallet/views/Bootloader/index.js
diff --git a/src/js/components/wallet/pages/Dashboard.js b/src/js/views/Wallet/views/Dashboard/index.js
similarity index 100%
rename from src/js/components/wallet/pages/Dashboard.js
rename to src/js/views/Wallet/views/Dashboard/index.js
diff --git a/src/js/components/wallet/pages/DeviceSettings.js b/src/js/views/Wallet/views/DeviceSettings/index.js
similarity index 96%
rename from src/js/components/wallet/pages/DeviceSettings.js
rename to src/js/views/Wallet/views/DeviceSettings/index.js
index 81f3ca3c..b51a505e 100644
--- a/src/js/components/wallet/pages/DeviceSettings.js
+++ b/src/js/views/Wallet/views/DeviceSettings/index.js
@@ -29,7 +29,7 @@ const Row = styled.div`
     padding-bottom: 98px;
 `;
 
-export const DeviceSettings = () => (
+const DeviceSettings = () => (
     <Section>
         <Row>
             <Icon
diff --git a/src/js/components/wallet/pages/DeviceSettingsTabs.js b/src/js/views/Wallet/views/DeviceSettingsTabs/index.js
similarity index 100%
rename from src/js/components/wallet/pages/DeviceSettingsTabs.js
rename to src/js/views/Wallet/views/DeviceSettingsTabs/index.js
diff --git a/src/js/components/wallet/pages/Initialize.js b/src/js/views/Wallet/views/Initialize/index.js
similarity index 100%
rename from src/js/components/wallet/pages/Initialize.js
rename to src/js/views/Wallet/views/Initialize/index.js
diff --git a/src/js/components/wallet/pages/UnreadableDevice.js b/src/js/views/Wallet/views/UnreadableDevice/index.js
similarity index 100%
rename from src/js/components/wallet/pages/UnreadableDevice.js
rename to src/js/views/Wallet/views/UnreadableDevice/index.js
diff --git a/src/js/components/wallet/pages/WalletSettings.js b/src/js/views/Wallet/views/WalletSettings/index.js
similarity index 87%
rename from src/js/components/wallet/pages/WalletSettings.js
rename to src/js/views/Wallet/views/WalletSettings/index.js
index ee400dcc..aeda12a9 100644
--- a/src/js/components/wallet/pages/WalletSettings.js
+++ b/src/js/views/Wallet/views/WalletSettings/index.js
@@ -5,7 +5,7 @@ import React from 'react';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 
-export const WalletSettings = () => (
+const WalletSettings = () => (
     <section className="settings">
             Wallet settings
     </section>
diff --git a/src/js/views/index.js b/src/js/views/index.js
index 087754bc..279e2f65 100644
--- a/src/js/views/index.js
+++ b/src/js/views/index.js
@@ -5,19 +5,18 @@ import { Provider } from 'react-redux';
 import { ConnectedRouter } from 'react-router-redux';
 
 import ErrorBoundary from 'support/ErrorBoundary';
-
-import WalletContainer from 'views/Wallet';
-import BootloaderContainer from 'components/wallet/pages/Bootloader';
-import InitializeContainer from 'components/wallet/pages/Initialize';
-import AcquireContainer from 'components/wallet/pages/Acquire';
-import UnreadableDeviceContainer from 'components/wallet/pages/UnreadableDevice';
-
-import DashboardContainer from 'components/wallet/pages/Dashboard';
-
-import DeviceSettingsContainer from 'components/wallet/pages/DeviceSettings';
-import WalletSettingsContainer from 'components/wallet/pages/WalletSettings';
 import LandingContainer from 'views/Landing/Container';
 
+// wallet views
+import WalletContainer from 'views/Wallet';
+import WalletDashboard from 'views/Wallet/views/Dashboard';
+import WalletDeviceSettings from 'views/Wallet/views/DeviceSettings';
+import WalletSettings from 'views/Wallet/views/WalletSettings';
+import WalletBootloader from 'views/Wallet/views/Bootloader';
+import WalletInitialize from 'views/Wallet/views/Initialize';
+import WalletAcquire from 'views/Wallet/views/Acquire';
+import WalletUnreadableDevice from 'views/Wallet/views/UnreadableDevice';
+
 import SignVerifyContainer from './Wallet/components/Sign';
 import ReceiveContainer from './Wallet/components/Receive/Container';
 import SendFormContainer from './Wallet/components/Send/Container';
@@ -35,14 +34,14 @@ const App = () => (
                 <Route>
                     <ErrorBoundary>
                         <WalletContainer>
-                            <Route exact path="/settings" component={WalletSettingsContainer} />
-                            <Route exact path="/device/:device/" component={DashboardContainer} />
-                            <Route exact path="/device/:device/network/:network" component={DashboardContainer} />
-                            <Route exact path="/device/:device/acquire" component={AcquireContainer} />
-                            <Route exact path="/device/:device/unreadable" component={UnreadableDeviceContainer} />
-                            <Route exact path="/device/:device/bootloader" component={BootloaderContainer} />
-                            <Route exact path="/device/:device/initialize" component={InitializeContainer} />
-                            <Route exact path="/device/:device/settings" component={DeviceSettingsContainer} />
+                            <Route exact path="/settings" component={WalletSettings} />
+                            <Route exact path="/device/:device/" component={WalletDashboard} />
+                            <Route exact path="/device/:device/network/:network" component={WalletDashboard} />
+                            <Route exact path="/device/:device/acquire" component={WalletAcquire} />
+                            <Route exact path="/device/:device/unreadable" component={WalletUnreadableDevice} />
+                            <Route exact path="/device/:device/bootloader" component={WalletBootloader} />
+                            <Route exact path="/device/:device/initialize" component={WalletInitialize} />
+                            <Route exact path="/device/:device/settings" component={WalletDeviceSettings} />
                             <Route exact path="/device/:device/network/:network/account/:account" component={SummaryContainer} />
                             <Route path="/device/:device/network/:network/account/:account/send" component={SendFormContainer} />
                             <Route path="/device/:device/network/:network/account/:account/send/override" component={SendFormContainer} />