diff --git a/src/components/modal/ConfirmAddress.js b/src/components/modals/ConfirmAddress.js
similarity index 100%
rename from src/components/modal/ConfirmAddress.js
rename to src/components/modals/ConfirmAddress.js
diff --git a/src/components/modal/ConfirmSignTx/index.js b/src/components/modals/ConfirmSignTx/index.js
similarity index 100%
rename from src/components/modal/ConfirmSignTx/index.js
rename to src/components/modals/ConfirmSignTx/index.js
diff --git a/src/components/modal/DuplicateDevice.js b/src/components/modals/DuplicateDevice.js
similarity index 100%
rename from src/components/modal/DuplicateDevice.js
rename to src/components/modals/DuplicateDevice.js
diff --git a/src/components/modal/ForgetDevice/index.js b/src/components/modals/ForgetDevice/index.js
similarity index 100%
rename from src/components/modal/ForgetDevice/index.js
rename to src/components/modals/ForgetDevice/index.js
diff --git a/src/components/modal/InvalidPin.js b/src/components/modals/InvalidPin.js
similarity index 100%
rename from src/components/modal/InvalidPin.js
rename to src/components/modals/InvalidPin.js
diff --git a/src/components/modal/Passphrase.js b/src/components/modals/Passphrase.js
similarity index 100%
rename from src/components/modal/Passphrase.js
rename to src/components/modals/Passphrase.js
diff --git a/src/components/modal/PassphraseType.js b/src/components/modals/PassphraseType.js
similarity index 100%
rename from src/components/modal/PassphraseType.js
rename to src/components/modals/PassphraseType.js
diff --git a/src/components/modal/Pin.js b/src/components/modals/Pin.js
similarity index 100%
rename from src/components/modal/Pin.js
rename to src/components/modals/Pin.js
diff --git a/src/components/modal/RememberDevice/index.js b/src/components/modals/RememberDevice/index.js
similarity index 98%
rename from src/components/modal/RememberDevice/index.js
rename to src/components/modals/RememberDevice/index.js
index cb661436..6d5589ec 100644
--- a/src/components/modal/RememberDevice/index.js
+++ b/src/components/modals/RememberDevice/index.js
@@ -138,7 +138,7 @@ export default class RememberDevice extends Component<Props, State> {
                     </StyledButton>
                     <StyledButton
                         isWhite
-                        onClick={event => onRememberDevice(device)}
+                        onClick={() => onRememberDevice(device)}
                     >Remember
                     </StyledButton>
                 </Column>
diff --git a/src/components/modal/index.js b/src/components/modals/index.js
similarity index 90%
rename from src/components/modal/index.js
rename to src/components/modals/index.js
index 0709617b..2838c9c1 100644
--- a/src/components/modal/index.js
+++ b/src/components/modals/index.js
@@ -19,16 +19,16 @@ import * as CONNECT from 'actions/constants/TrezorConnect';
 import type { MapStateToProps, MapDispatchToProps } from 'react-redux';
 import type { State, Dispatch } from 'flowtype';
 
-import ForgetDevice from 'components/modal/ForgetDevice';
-
-import Pin from 'components/modal/Pin';
-import InvalidPin from 'components/modal/InvalidPin';
-import Passphrase from 'components/modal/Passphrase';
-import PassphraseType from 'components/modal/PassphraseType';
-import ConfirmSignTx from 'components/modal/ConfirmSignTx';
-import ConfirmAddress, { ConfirmUnverifiedAddress } from 'components/modal/ConfirmAddress';
-import RememberDevice from 'components/modal/RememberDevice';
-import DuplicateDevice from 'components/modal/DuplicateDevice';
+import ForgetDevice from 'components/modals/ForgetDevice';
+
+import Pin from 'components/modals/Pin';
+import InvalidPin from 'components/modals/InvalidPin';
+import Passphrase from 'components/modals/Passphrase';
+import PassphraseType from 'components/modals/PassphraseType';
+import ConfirmSignTx from 'components/modals/ConfirmSignTx';
+import ConfirmAddress, { ConfirmUnverifiedAddress } from 'components/modals/ConfirmAddress';
+import RememberDevice from 'components/modals/RememberDevice';
+import DuplicateDevice from 'components/modals/DuplicateDevice';
 
 
 type OwnProps = { }
diff --git a/src/views/Wallet/index.js b/src/views/Wallet/index.js
index eb787da2..26d6caaa 100644
--- a/src/views/Wallet/index.js
+++ b/src/views/Wallet/index.js
@@ -11,7 +11,7 @@ import type { State, Dispatch } from 'flowtype';
 
 import Header from 'components/Header';
 import Footer from 'components/Footer';
-import ModalContainer from 'components/modal';
+import ModalContainer from 'components/modals';
 import Notifications from 'components/Notification';
 import Log from 'components/Log';