diff --git a/src/public/js/app.js b/src/public/js/app.js
index e913bd0..6a1f39c 100644
--- a/src/public/js/app.js
+++ b/src/public/js/app.js
@@ -17,10 +17,10 @@ import * as actionCreators from './actions/actionCreators'
 import store, { history } from './store'
 
 // Components
-import NavBar from './components/navbar.jsx'
-import MovieList from './components/movie-list.jsx'
-import UserLoginForm from './components/user-login.jsx'
-import Error from './components/errors.jsx'
+import NavBar from './components/navbar'
+import Error from './components/errors'
+import MovieList from './components/movies/list'
+import UserLoginForm from './components/users/login'
 import UserEdit from './components/users/edit'
 import UserSignUp from './components/users/signup'
 
diff --git a/src/public/js/components/errors.jsx b/src/public/js/components/errors.js
similarity index 100%
rename from src/public/js/components/errors.jsx
rename to src/public/js/components/errors.js
diff --git a/src/public/js/components/movie-list.jsx b/src/public/js/components/movies/list.js
similarity index 100%
rename from src/public/js/components/movie-list.jsx
rename to src/public/js/components/movies/list.js
diff --git a/src/public/js/components/navbar.jsx b/src/public/js/components/navbar.js
similarity index 100%
rename from src/public/js/components/navbar.jsx
rename to src/public/js/components/navbar.js
diff --git a/src/public/js/components/user-login.jsx b/src/public/js/components/users/login.js
similarity index 100%
rename from src/public/js/components/user-login.jsx
rename to src/public/js/components/users/login.js
diff --git a/src/public/js/reducers/index.js b/src/public/js/reducers/index.js
index 15d6dd4..8fb7d7c 100644
--- a/src/public/js/reducers/index.js
+++ b/src/public/js/reducers/index.js
@@ -1,7 +1,7 @@
 import { combineReducers } from 'redux';
 import { routerReducer } from 'react-router-redux'
 
-import movieStore from './movie-store'
+import movieStore from './movies'
 import userStore from './users'
 import errors from './errors'
 
diff --git a/src/public/js/reducers/movie-store.js b/src/public/js/reducers/movies.js
similarity index 100%
rename from src/public/js/reducers/movie-store.js
rename to src/public/js/reducers/movies.js