diff --git a/src/js/components/common/Button.js b/src/js/components/Button/index.js
similarity index 100%
rename from src/js/components/common/Button.js
rename to src/js/components/Button/index.js
diff --git a/src/js/components/common/Footer.js b/src/js/components/Footer/index.js
similarity index 100%
rename from src/js/components/common/Footer.js
rename to src/js/components/Footer/index.js
diff --git a/src/js/components/common/Header.js b/src/js/components/Header/index.js
similarity index 100%
rename from src/js/components/common/Header.js
rename to src/js/components/Header/index.js
diff --git a/src/js/components/common/Heading.js b/src/js/components/Heading/index.js
similarity index 100%
rename from src/js/components/common/Heading.js
rename to src/js/components/Heading/index.js
diff --git a/src/js/components/common/Icon.js b/src/js/components/Icon/index.js
similarity index 100%
rename from src/js/components/common/Icon.js
rename to src/js/components/Icon/index.js
diff --git a/src/js/components/common/LoaderCircle.js b/src/js/components/LoaderCircle/index.js
similarity index 100%
rename from src/js/components/common/LoaderCircle.js
rename to src/js/components/LoaderCircle/index.js
diff --git a/src/js/components/common/Log.js b/src/js/components/Log/index.js
similarity index 94%
rename from src/js/components/common/Log.js
rename to src/js/components/Log/index.js
index 910730d4..76705020 100644
--- a/src/js/components/common/Log.js
+++ b/src/js/components/Log/index.js
@@ -4,7 +4,7 @@
 import React from 'react';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
-import { H2 } from 'components/common/Heading';
+import { H2 } from 'components/Heading';
 
 import * as LogActions from 'actions/LogActions';
 import type { State, Dispatch } from 'flowtype';
diff --git a/src/js/components/common/Notification.js b/src/js/components/Notification/index.js
similarity index 96%
rename from src/js/components/common/Notification.js
rename to src/js/components/Notification/index.js
index 622d4e7d..e8cabff1 100644
--- a/src/js/components/common/Notification.js
+++ b/src/js/components/Notification/index.js
@@ -2,14 +2,14 @@
 
 
 import React from 'react';
-import { H2 } from 'components/common/Heading';
+import { H2 } from 'components/Heading';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 
 import * as NOTIFICATION from 'actions/constants/notification';
 import * as NotificationActions from 'actions/NotificationActions';
 import type { Action, State, Dispatch } from 'flowtype';
-import Loader from './LoaderCircle';
+import Loader from 'components/LoaderCircle';
 
 type Props = {
     notifications: $ElementType<State, 'notifications'>,
diff --git a/src/js/components/modal/RememberDevice.js b/src/js/components/modal/RememberDevice.js
index cc889720..e53ae213 100644
--- a/src/js/components/modal/RememberDevice.js
+++ b/src/js/components/modal/RememberDevice.js
@@ -2,7 +2,7 @@
 
 
 import React, { Component } from 'react';
-import Loader from '../common/LoaderCircle';
+import Loader from 'components/LoaderCircle';
 
 import type { Props } from './index';
 
diff --git a/src/js/components/wallet/pages/Acquire.js b/src/js/components/wallet/pages/Acquire.js
index dd0a28ae..bd5f8a90 100644
--- a/src/js/components/wallet/pages/Acquire.js
+++ b/src/js/components/wallet/pages/Acquire.js
@@ -2,7 +2,7 @@
 import React from 'react';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
-import { Notification } from 'components/common/Notification';
+import { Notification } from 'components/Notification';
 import * as TrezorConnectActions from 'actions/TrezorConnectActions';
 
 import type { State, Dispatch } from 'flowtype';
diff --git a/src/js/components/wallet/pages/Bootloader.js b/src/js/components/wallet/pages/Bootloader.js
index 77457187..e7a0f1f1 100644
--- a/src/js/components/wallet/pages/Bootloader.js
+++ b/src/js/components/wallet/pages/Bootloader.js
@@ -1,7 +1,7 @@
 /* @flow */
 
 import React from 'react';
-import { H2 } from 'components/common/Heading';
+import { H2 } from 'components/Heading';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 
diff --git a/src/js/components/wallet/pages/Dashboard.js b/src/js/components/wallet/pages/Dashboard.js
index d526dbaf..1c59f343 100644
--- a/src/js/components/wallet/pages/Dashboard.js
+++ b/src/js/components/wallet/pages/Dashboard.js
@@ -2,7 +2,7 @@ import React from 'react';
 import styled from 'styled-components';
 import { connect } from 'react-redux';
 
-import { H2 } from 'components/common/Heading';
+import { H2 } from 'components/Heading';
 import DashboardImg from 'images/dashboard.png';
 
 const Wrapper = styled.div`
diff --git a/src/js/components/wallet/pages/DeviceSettings.js b/src/js/components/wallet/pages/DeviceSettings.js
index 2a9817e3..81f3ca3c 100644
--- a/src/js/components/wallet/pages/DeviceSettings.js
+++ b/src/js/components/wallet/pages/DeviceSettings.js
@@ -1,9 +1,9 @@
 import React from 'react';
 import styled from 'styled-components';
-import { H2 } from 'components/common/Heading';
-import Icon from 'components/common/Icon';
+import { H2 } from 'components/Heading';
+import Icon from 'components/Icon';
 import colors from 'config/colors';
-import Button from 'components/common/Button';
+import Button from 'components/Button';
 import ICONS from 'config/icons';
 import { connect } from 'react-redux';
 
diff --git a/src/js/components/wallet/pages/Initialize.js b/src/js/components/wallet/pages/Initialize.js
index 3bca865c..47ec5d8b 100644
--- a/src/js/components/wallet/pages/Initialize.js
+++ b/src/js/components/wallet/pages/Initialize.js
@@ -1,5 +1,5 @@
 /* @flow */
-import { H2 } from 'components/common/Heading';
+import { H2 } from 'components/Heading';
 import React from 'react';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
diff --git a/src/js/components/wallet/pages/UnreadableDevice.js b/src/js/components/wallet/pages/UnreadableDevice.js
index a76279f4..26f03952 100644
--- a/src/js/components/wallet/pages/UnreadableDevice.js
+++ b/src/js/components/wallet/pages/UnreadableDevice.js
@@ -4,7 +4,7 @@
 import React from 'react';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
-import { Notification } from 'components/common/Notification';
+import { Notification } from 'components/Notification';
 import * as TrezorConnectActions from 'actions/TrezorConnectActions';
 
 import type { State, Dispatch } from 'flowtype';
diff --git a/src/js/views/Landing/components/ConnectDevice.js b/src/js/views/Landing/components/ConnectDevice.js
index 71d22c2e..fc007576 100644
--- a/src/js/views/Landing/components/ConnectDevice.js
+++ b/src/js/views/Landing/components/ConnectDevice.js
@@ -2,7 +2,7 @@
 
 import React, { Component } from 'react';
 import TrezorConnect from 'trezor-connect';
-import { H2 } from 'components/common/Heading';
+import { H2 } from 'components/Heading';
 
 import type { State, TrezorDevice } from 'flowtype';
 
diff --git a/src/js/views/Landing/components/Preloader.js b/src/js/views/Landing/components/Preloader.js
index f7d41e7f..3eee746d 100644
--- a/src/js/views/Landing/components/Preloader.js
+++ b/src/js/views/Landing/components/Preloader.js
@@ -2,7 +2,7 @@
 
 
 import React from 'react';
-import Loader from 'components/common/LoaderCircle';
+import Loader from 'components/LoaderCircle';
 
 export default (props: {}): React$Element<string> => (
     <section className="landing">
diff --git a/src/js/views/Landing/index.js b/src/js/views/Landing/index.js
index 6366419e..2b09328d 100644
--- a/src/js/views/Landing/index.js
+++ b/src/js/views/Landing/index.js
@@ -1,11 +1,11 @@
 /* @flow */
 
 import React from 'react';
-import { H2 } from 'components/common/Heading';
-import Header from 'components/common/Header';
-import Footer from 'components/common/Footer';
-import Log from 'components/common/Log';
-import Notifications, { Notification } from 'components/common/Notification';
+import { H2 } from 'components/Heading';
+import Header from 'components/Header';
+import Footer from 'components/Footer';
+import Log from 'components/Log';
+import Notifications, { Notification } from 'components/Notification';
 
 import Preloader from './components/Preloader';
 import ConnectDevice from './components/ConnectDevice';
diff --git a/src/js/views/Wallet/components/LeftNavigation/Selection/AccountSelection.js b/src/js/views/Wallet/components/LeftNavigation/Selection/AccountSelection.js
index c43ee67a..a90eb436 100644
--- a/src/js/views/Wallet/components/LeftNavigation/Selection/AccountSelection.js
+++ b/src/js/views/Wallet/components/LeftNavigation/Selection/AccountSelection.js
@@ -7,7 +7,7 @@ import BigNumber from 'bignumber.js';
 
 import { findDeviceAccounts } from 'reducers/AccountsReducer';
 import * as stateUtils from 'reducers/utils';
-import Loader from 'components/common/LoaderCircle';
+import Loader from 'components/LoaderCircle';
 import Tooltip from 'rc-tooltip';
 
 import colors from 'config/colors';
diff --git a/src/js/views/Wallet/components/LeftNavigation/Selection/CoinSelection.js b/src/js/views/Wallet/components/LeftNavigation/Selection/CoinSelection.js
index c3cafddb..d98f72e5 100644
--- a/src/js/views/Wallet/components/LeftNavigation/Selection/CoinSelection.js
+++ b/src/js/views/Wallet/components/LeftNavigation/Selection/CoinSelection.js
@@ -1,15 +1,13 @@
 /* @flow */
 import coins from 'constants/coins';
 import colors from 'config/colors';
-import { FONT_SIZE } from 'config/variables';
-import Icon from 'components/common/Icon';
+import { FONT_SIZE, ICON_SIZE } from 'config/variables';
+import Icon from 'components/Icon';
 import ICONS from 'config/icons';
 import { NavLink } from 'react-router-dom';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import styled from 'styled-components';
-
-import { ICON_SIZE } from 'config/variables';
 import { coinProp } from '../common';
 import Divider from '../Divider';
 import Row from '../Row';
diff --git a/src/js/views/Wallet/components/Receive/index.js b/src/js/views/Wallet/components/Receive/index.js
index 4873496c..13a8a9e8 100644
--- a/src/js/views/Wallet/components/Receive/index.js
+++ b/src/js/views/Wallet/components/Receive/index.js
@@ -1,12 +1,12 @@
 /* @flow */
 import React, { Component } from 'react';
 import styled from 'styled-components';
-import { H2 } from 'components/common/Heading';
+import { H2 } from 'components/Heading';
 
 import Tooltip from 'rc-tooltip';
 import { QRCode } from 'react-qr-svg';
 
-import { Notification } from 'components/common/Notification';
+import { Notification } from 'components/Notification';
 import SelectedAccount from '../SelectedAccount';
 
 import type { Props } from './index';
diff --git a/src/js/views/Wallet/components/SelectedAccount/index.js b/src/js/views/Wallet/components/SelectedAccount/index.js
index 1fdd6c92..49ff21c2 100644
--- a/src/js/views/Wallet/components/SelectedAccount/index.js
+++ b/src/js/views/Wallet/components/SelectedAccount/index.js
@@ -2,7 +2,7 @@
 
 
 import * as React from 'react';
-import { Notification } from 'components/common/Notification';
+import { Notification } from 'components/Notification';
 
 import type {
     State, TrezorDevice, Action, ThunkAction,
diff --git a/src/js/views/Wallet/components/Send/components/PendingTransactions.js b/src/js/views/Wallet/components/Send/components/PendingTransactions.js
index e7783bdd..6f23da7e 100644
--- a/src/js/views/Wallet/components/Send/components/PendingTransactions.js
+++ b/src/js/views/Wallet/components/Send/components/PendingTransactions.js
@@ -3,7 +3,7 @@
 
 import React from 'react';
 import ColorHash from 'color-hash';
-import { H2 } from 'components/common/Heading';
+import { H2 } from 'components/Heading';
 import ScaleText from 'react-scale-text';
 
 import { findAccountTokens } from 'reducers/TokensReducer';
diff --git a/src/js/views/Wallet/components/Send/index.js b/src/js/views/Wallet/components/Send/index.js
index f2f028a4..f9caeefe 100644
--- a/src/js/views/Wallet/components/Send/index.js
+++ b/src/js/views/Wallet/components/Send/index.js
@@ -3,7 +3,7 @@
 import React, { Component } from 'react';
 import styled from 'styled-components';
 import Select from 'react-select';
-import { H2 } from 'components/common/Heading';
+import { H2 } from 'components/Heading';
 import { calculate, validation } from 'actions/SendFormActions';
 import type { Token } from 'flowtype';
 import AdvancedForm from './components/AdvancedForm';
diff --git a/src/js/views/Wallet/components/Sign/index.js b/src/js/views/Wallet/components/Sign/index.js
index 566cfa69..53a8fe78 100644
--- a/src/js/views/Wallet/components/Sign/index.js
+++ b/src/js/views/Wallet/components/Sign/index.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import styled from 'styled-components';
 
-import { H2 } from 'components/common/Heading';
+import { H2 } from 'components/Heading';
 import colors from 'config/colors';
 
 const Wrapper = styled.div`
diff --git a/src/js/views/Wallet/components/Summary/index.js b/src/js/views/Wallet/components/Summary/index.js
index 4ce20314..c64dc3c0 100644
--- a/src/js/views/Wallet/components/Summary/index.js
+++ b/src/js/views/Wallet/components/Summary/index.js
@@ -1,13 +1,13 @@
 /* @flow */
 import styled from 'styled-components';
 import React, { Component } from 'react';
-import { H2 } from 'components/common/Heading';
+import { H2 } from 'components/Heading';
 import BigNumber from 'bignumber.js';
 import { Async as AsyncSelect } from 'react-select';
 import Tooltip from 'rc-tooltip';
 
 import { resolveAfter } from 'utils/promiseUtils';
-import { Notification } from 'components/common/Notification';
+import { Notification } from 'components/Notification';
 import * as stateUtils from 'reducers/utils';
 import type { NetworkToken } from 'reducers/LocalStorageReducer';
 import SelectedAccount from '../SelectedAccount';
diff --git a/src/js/views/Wallet/index.js b/src/js/views/Wallet/index.js
index c5712842..e4417966 100644
--- a/src/js/views/Wallet/index.js
+++ b/src/js/views/Wallet/index.js
@@ -7,12 +7,12 @@ import { Route, withRouter } from 'react-router-dom';
 import type { MapStateToProps, MapDispatchToProps } from 'react-redux';
 import type { State, Dispatch } from 'flowtype';
 
-import Header from 'components/common/Header';
-import Footer from 'components/common/Footer';
+import Header from 'components/Header';
+import Footer from 'components/Footer';
 import DeviceSettingsTabs from 'components/wallet/pages/DeviceSettingsTabs';
 import ModalContainer from 'components/modal';
-import Notifications from 'components/common/Notification';
-import Log from 'components/common/Log';
+import Notifications from 'components/Notification';
+import Log from 'components/Log';
 
 import LeftNavigation from './components/LeftNavigation/Container';
 import AccountTabs from './components/Tabs';