Improved directory structure.

src/App.js

@@ -3,8 +3,8 @@ import { Link } from 'react-router'
 import { HiddenOnlyAuth, VisibleOnlyAuth } from './util/wrappers.js'
 
 // UI Components
-import LoginButtonContainer from './login/LoginButtonContainer'
-import LogoutButtonContainer from './logoutbutton/LogoutButtonContainer'
+import LoginButtonContainer from './user/ui/loginbutton/LoginButtonContainer'
+import LogoutButtonContainer from './user/ui/logoutbutton/LogoutButtonContainer'
 
 // Styles
 import './css/oswald.css'

src/index.js

@@ -5,13 +5,14 @@ import { Provider } from 'react-redux'
 import { syncHistoryWithStore } from 'react-router-redux'
 import { UserIsAuthenticated, UserIsNotAuthenticated } from './util/wrappers.js'
 
-// Components
+// Layouts
 import App from './App';
-import Home from './home/Home';
-import Dashboard from './dashboard/Dashboard';
-import SignUp from './signup/SignUp';
-import Profile from './profile/Profile';
+import Home from './layouts/home/Home';
+import Dashboard from './layouts/dashboard/Dashboard';
+import SignUp from './user/layouts/signup/SignUp';
+import Profile from './user/layouts/profile/Profile';
 
+// Redux Store
 import store from './store';
 
 // Config

src/reducer.js

@@ -1,10 +1,10 @@
 import { combineReducers } from 'redux'
 import { routerReducer } from 'react-router-redux'
-import loginReducer from './login/loginReducer'
+import userReducer from './user/userReducer'
 
 const reducer = combineReducers({
   routing: routerReducer,
-  user: loginReducer
+  user: userReducer
 })
 
 export default reducer

src/profile/Profile.js → src/user/layouts/profile/Profile.js

@@ -1,5 +1,5 @@
 import React, { Component } from 'react'
-import ProfileFormContainer from '../profileform/ProfileFormContainer'
+import ProfileFormContainer from '../../ui/profileform/ProfileFormContainer'
 
 class Profile extends Component {
   render() {

src/signup/SignUp.js → src/user/layouts/signup/SignUp.js

@@ -1,5 +1,5 @@
 import React, { Component } from 'react'
-import SignUpFormContainer from '../signupform/SignUpFormContainer'
+import SignUpFormContainer from '../../ui/signupform/SignUpFormContainer'
 
 class SignUp extends Component {
   render() {

src/login/LoginActions.js → src/user/ui/loginbutton/LoginButtonActions.js

@@ -1,5 +1,5 @@
 import Web3 from 'web3'
-import AuthenticationContract from '../../build/contracts/Authentication.json'
+import AuthenticationContract from '../../../../build/contracts/Authentication.json'
 import { browserHistory } from 'react-router'
 
 const provider = new Web3.providers.HttpProvider('http://localhost:8545')

src/login/LoginButtonContainer.js → src/user/ui/loginbutton/LoginButtonContainer.js

@@ -1,6 +1,6 @@
 import { connect } from 'react-redux'
 import LoginButton from './LoginButton'
-import { loginUser } from './LoginActions'
+import { loginUser } from './LoginButtonActions'
 
 const mapStateToProps = (state, ownProps) => {
   return {}

src/logoutbutton/LogoutButtonContainer.js → src/user/ui/logoutbutton/LogoutButtonContainer.js

@@ -1,6 +1,6 @@
 import { connect } from 'react-redux'
 import LogoutButton from './LogoutButton'
-import { logoutUser } from './LogoutActions'
+import { logoutUser } from './LogoutButtonActions'
 
 const mapStateToProps = (state, ownProps) => {
   return {}

src/profileform/ProfileFormActions.js → src/user/ui/profileform/ProfileFormActions.js

@@ -1,5 +1,5 @@
 import Web3 from 'web3'
-import AuthenticationContract from '../../build/contracts/Authentication.json'
+import AuthenticationContract from '../../../../build/contracts/Authentication.json'
 import { browserHistory } from 'react-router'
 
 const provider = new Web3.providers.HttpProvider('http://localhost:8545')

src/signupform/SignUpFormActions.js → src/user/ui/signupform/SignUpFormActions.js

@@ -1,6 +1,6 @@
 import Web3 from 'web3'
-import AuthenticationContract from '../../build/contracts/Authentication.json'
-import { loginUser } from '../login/LoginActions'
+import AuthenticationContract from '../../../../build/contracts/Authentication.json'
+import { loginUser } from '../loginbutton/LoginButtonActions'
 import { browserHistory } from 'react-router'
 
 const provider = new Web3.providers.HttpProvider('http://localhost:8545')

src/login/loginReducer.js → src/user/userReducer.js

@@ -2,7 +2,7 @@ const initialState = {
   data: null
 }
 
-const loginReducer = (state = initialState, action) => {
+const userReducer = (state = initialState, action) => {
   if (action.type === 'USER_LOGGED_IN' || action.type === 'USER_UPDATED')
   {
     return Object.assign({}, state, {
@@ -20,4 +20,4 @@ const loginReducer = (state = initialState, action) => {
   return state
 }
 
-export default loginReducer
+export default userReducer