diff --git a/src/components/auth/BaseAuthBody.jsx b/src/components/auth/BaseAuthBody.jsx
index 13dc089..e0253f9 100644
--- a/src/components/auth/BaseAuthBody.jsx
+++ b/src/components/auth/BaseAuthBody.jsx
@@ -3,7 +3,7 @@
  */
 import React, { Component, PropTypes } from 'react';
 
-import AuthError from './AuthError';
+import AuthError from 'components/auth/authError/AuthError';
 import { userShape } from 'components/user/User';
 
 export default class BaseAuthBody extends Component {
diff --git a/src/components/auth/Activation.jsx b/src/components/auth/activation/Activation.jsx
similarity index 97%
rename from src/components/auth/Activation.jsx
rename to src/components/auth/activation/Activation.jsx
index 23da91f..1c20d53 100644
--- a/src/components/auth/Activation.jsx
+++ b/src/components/auth/activation/Activation.jsx
@@ -6,7 +6,7 @@ import Helmet from 'react-helmet';
 import buttons from 'components/ui/buttons.scss';
 import { Input } from 'components/ui/Form';
 
-import BaseAuthBody from './BaseAuthBody';
+import BaseAuthBody from 'components/auth/BaseAuthBody';
 import styles from './activation.scss';
 import messages from './Activation.messages';
 
diff --git a/src/components/auth/Activation.messages.js b/src/components/auth/activation/Activation.messages.js
similarity index 100%
rename from src/components/auth/Activation.messages.js
rename to src/components/auth/activation/Activation.messages.js
diff --git a/src/components/auth/activation.scss b/src/components/auth/activation/activation.scss
similarity index 100%
rename from src/components/auth/activation.scss
rename to src/components/auth/activation/activation.scss
diff --git a/src/components/auth/AppInfo.jsx b/src/components/auth/appInfo/AppInfo.jsx
similarity index 100%
rename from src/components/auth/AppInfo.jsx
rename to src/components/auth/appInfo/AppInfo.jsx
diff --git a/src/components/auth/AppInfo.messages.js b/src/components/auth/appInfo/AppInfo.messages.js
similarity index 100%
rename from src/components/auth/AppInfo.messages.js
rename to src/components/auth/appInfo/AppInfo.messages.js
diff --git a/src/components/auth/appInfo.scss b/src/components/auth/appInfo/appInfo.scss
similarity index 100%
rename from src/components/auth/appInfo.scss
rename to src/components/auth/appInfo/appInfo.scss
diff --git a/src/components/auth/AuthError.jsx b/src/components/auth/authError/AuthError.jsx
similarity index 100%
rename from src/components/auth/AuthError.jsx
rename to src/components/auth/authError/AuthError.jsx
diff --git a/src/components/auth/AuthError.messages.js b/src/components/auth/authError/AuthError.messages.js
similarity index 100%
rename from src/components/auth/AuthError.messages.js
rename to src/components/auth/authError/AuthError.messages.js
diff --git a/src/components/auth/ForgotPassword.jsx b/src/components/auth/forgotPassword/ForgotPassword.jsx
similarity index 97%
rename from src/components/auth/ForgotPassword.jsx
rename to src/components/auth/forgotPassword/ForgotPassword.jsx
index dbb78c1..b6f33ba 100644
--- a/src/components/auth/ForgotPassword.jsx
+++ b/src/components/auth/forgotPassword/ForgotPassword.jsx
@@ -6,7 +6,7 @@ import Helmet from 'react-helmet';
 import buttons from 'components/ui/buttons.scss';
 import { Input } from 'components/ui/Form';
 
-import BaseAuthBody from './BaseAuthBody';
+import BaseAuthBody from 'components/auth/BaseAuthBody';
 import messages from './ForgotPassword.messages';
 
 import styles from './forgotPassword.scss';
diff --git a/src/components/auth/ForgotPassword.messages.js b/src/components/auth/forgotPassword/ForgotPassword.messages.js
similarity index 100%
rename from src/components/auth/ForgotPassword.messages.js
rename to src/components/auth/forgotPassword/ForgotPassword.messages.js
diff --git a/src/components/auth/forgotPassword.scss b/src/components/auth/forgotPassword/forgotPassword.scss
similarity index 100%
rename from src/components/auth/forgotPassword.scss
rename to src/components/auth/forgotPassword/forgotPassword.scss
diff --git a/src/components/auth/Login.jsx b/src/components/auth/login/Login.jsx
similarity index 91%
rename from src/components/auth/Login.jsx
rename to src/components/auth/login/Login.jsx
index d35da39..db0e611 100644
--- a/src/components/auth/Login.jsx
+++ b/src/components/auth/login/Login.jsx
@@ -7,9 +7,9 @@ import { Link } from 'react-router';
 import buttons from 'components/ui/buttons.scss';
 import { Input } from 'components/ui/Form';
 
-import BaseAuthBody from './BaseAuthBody';
+import BaseAuthBody from 'components/auth/BaseAuthBody';
+import passwordMessages from 'components/auth/password/Password.messages';
 import messages from './Login.messages';
-import passwordMessages from './Password.messages';
 
 class Body extends BaseAuthBody {
     static displayName = 'LoginBody';
diff --git a/src/components/auth/Login.messages.js b/src/components/auth/login/Login.messages.js
similarity index 100%
rename from src/components/auth/Login.messages.js
rename to src/components/auth/login/Login.messages.js
diff --git a/src/components/auth/Password.jsx b/src/components/auth/password/Password.jsx
similarity index 97%
rename from src/components/auth/Password.jsx
rename to src/components/auth/password/Password.jsx
index ddad4ae..0297a76 100644
--- a/src/components/auth/Password.jsx
+++ b/src/components/auth/password/Password.jsx
@@ -8,7 +8,7 @@ import buttons from 'components/ui/buttons.scss';
 import icons from 'components/ui/icons.scss';
 import { Input, Checkbox } from 'components/ui/Form';
 
-import BaseAuthBody from './BaseAuthBody';
+import BaseAuthBody from 'components/auth/BaseAuthBody';
 import styles from './password.scss';
 import messages from './Password.messages';
 
diff --git a/src/components/auth/Password.messages.js b/src/components/auth/password/Password.messages.js
similarity index 100%
rename from src/components/auth/Password.messages.js
rename to src/components/auth/password/Password.messages.js
diff --git a/src/components/auth/password.scss b/src/components/auth/password/password.scss
similarity index 100%
rename from src/components/auth/password.scss
rename to src/components/auth/password/password.scss
diff --git a/src/components/auth/PasswordChange.jsx b/src/components/auth/passwordChange/PasswordChange.jsx
similarity index 97%
rename from src/components/auth/PasswordChange.jsx
rename to src/components/auth/passwordChange/PasswordChange.jsx
index bf22477..ec043f1 100644
--- a/src/components/auth/PasswordChange.jsx
+++ b/src/components/auth/passwordChange/PasswordChange.jsx
@@ -6,7 +6,7 @@ import Helmet from 'react-helmet';
 import buttons from 'components/ui/buttons.scss';
 import { Input } from 'components/ui/Form';
 
-import BaseAuthBody from './BaseAuthBody';
+import BaseAuthBody from 'components/auth/BaseAuthBody';
 import passwordChangedMessages from './PasswordChange.messages';
 
 import icons from 'components/ui/icons.scss';
diff --git a/src/components/auth/PasswordChange.messages.js b/src/components/auth/passwordChange/PasswordChange.messages.js
similarity index 100%
rename from src/components/auth/PasswordChange.messages.js
rename to src/components/auth/passwordChange/PasswordChange.messages.js
diff --git a/src/components/auth/passwordChange.scss b/src/components/auth/passwordChange/passwordChange.scss
similarity index 100%
rename from src/components/auth/passwordChange.scss
rename to src/components/auth/passwordChange/passwordChange.scss
diff --git a/src/components/auth/Permissions.jsx b/src/components/auth/permissions/Permissions.jsx
similarity index 98%
rename from src/components/auth/Permissions.jsx
rename to src/components/auth/permissions/Permissions.jsx
index 2ab2f8d..1ef715e 100644
--- a/src/components/auth/Permissions.jsx
+++ b/src/components/auth/permissions/Permissions.jsx
@@ -7,7 +7,7 @@ import buttons from 'components/ui/buttons.scss';
 import icons from 'components/ui/icons.scss';
 import { PanelBodyHeader } from 'components/ui/Panel';
 
-import BaseAuthBody from './BaseAuthBody';
+import BaseAuthBody from 'components/auth/BaseAuthBody';
 import styles from './permissions.scss';
 import messages from './Permissions.messages';
 
diff --git a/src/components/auth/Permissions.messages.js b/src/components/auth/permissions/Permissions.messages.js
similarity index 100%
rename from src/components/auth/Permissions.messages.js
rename to src/components/auth/permissions/Permissions.messages.js
diff --git a/src/components/auth/permissions.scss b/src/components/auth/permissions/permissions.scss
similarity index 100%
rename from src/components/auth/permissions.scss
rename to src/components/auth/permissions/permissions.scss
diff --git a/src/components/auth/Register.jsx b/src/components/auth/register/Register.jsx
similarity index 95%
rename from src/components/auth/Register.jsx
rename to src/components/auth/register/Register.jsx
index 48643e3..e4ed0a1 100644
--- a/src/components/auth/Register.jsx
+++ b/src/components/auth/register/Register.jsx
@@ -6,9 +6,9 @@ import Helmet from 'react-helmet';
 import buttons from 'components/ui/buttons.scss';
 import { Input, Checkbox } from 'components/ui/Form';
 
-import BaseAuthBody from './BaseAuthBody';
+import BaseAuthBody from 'components/auth/BaseAuthBody';
+import activationMessages from 'components/auth/activation/Activation.messages';
 import messages from './Register.messages';
-import activationMessages from './Activation.messages';
 
 // TODO: password and username can be validate for length and sameness
 
diff --git a/src/components/auth/Register.messages.js b/src/components/auth/register/Register.messages.js
similarity index 100%
rename from src/components/auth/Register.messages.js
rename to src/components/auth/register/Register.messages.js
diff --git a/src/pages/auth/AuthPage.jsx b/src/pages/auth/AuthPage.jsx
index d31bcc2..4ee6fbd 100644
--- a/src/pages/auth/AuthPage.jsx
+++ b/src/pages/auth/AuthPage.jsx
@@ -2,7 +2,7 @@ import React, { Component, PropTypes } from 'react';
 
 import { connect } from 'react-redux';
 
-import AppInfo from 'components/auth/AppInfo';
+import AppInfo from 'components/auth/appInfo/AppInfo';
 import PanelTransition from 'components/auth/PanelTransition';
 
 import styles from './auth.scss';
diff --git a/src/routes.js b/src/routes.js
index 679c4e1..69d5c90 100644
--- a/src/routes.js
+++ b/src/routes.js
@@ -8,14 +8,14 @@ import AuthPage from 'pages/auth/AuthPage';
 import { authenticate } from 'components/user/actions';
 
 import OAuthInit from 'components/auth/OAuthInit';
-import Register from 'components/auth/Register';
-import Login from 'components/auth/Login';
-import Permissions from 'components/auth/Permissions';
-import Activation from 'components/auth/Activation';
-import Password from 'components/auth/Password';
+import Register from 'components/auth/register/Register';
+import Login from 'components/auth/login/Login';
+import Permissions from 'components/auth/permissions/Permissions';
+import Activation from 'components/auth/activation/Activation';
+import Password from 'components/auth/password/Password';
 import Logout from 'components/auth/Logout';
-import PasswordChange from 'components/auth/PasswordChange';
-import ForgotPassword from 'components/auth/ForgotPassword';
+import PasswordChange from 'components/auth/passwordChange/PasswordChange';
+import ForgotPassword from 'components/auth/forgotPassword/ForgotPassword';
 
 import authFlow from 'services/authFlow';