diff --git a/src/js/index.js b/src/js/index.js
index e73e7ad0..e971bc5b 100755
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -2,10 +2,9 @@
 import React from 'react';;
 import ReactDOM from 'react-dom';;
 import { Provider } from 'react-redux';
-import { createStore } from 'redux';
 import { BrowserRouter, Route, IndexRoute } from "react-router-dom";
 
-import store from './store';
+import store from './store/index';
 import App from './App';
 
 require('../scss/app.scss');
diff --git a/src/js/store.js b/src/js/store/index.js
similarity index 70%
rename from src/js/store.js
rename to src/js/store/index.js
index 2d0ab236..f0e8df23 100755
--- a/src/js/store.js
+++ b/src/js/store/index.js
@@ -1,31 +1,31 @@
 
 import { createStore, applyMiddleware, combineReducers } from 'redux';
 
-import * as helpers from './helpers';
+import * as helpers from '../helpers';
 
-import core from './services/core/reducer';
-import ui from './services/ui/reducer';
-import pusher from './services/pusher/reducer';
-import mopidy from './services/mopidy/reducer';
-import lastfm from './services/lastfm/reducer';
-import spotify from './services/spotify/reducer';
-import snapcast from './services/snapcast/reducer';
-import google from './services/google/reducer';
-import genius from './services/genius/reducer';
+import core from '../services/core/reducer';
+import ui from '../services/ui/reducer';
+import pusher from '../services/pusher/reducer';
+import mopidy from '../services/mopidy/reducer';
+import lastfm from '../services/lastfm/reducer';
+import spotify from '../services/spotify/reducer';
+import snapcast from '../services/snapcast/reducer';
+import google from '../services/google/reducer';
+import genius from '../services/genius/reducer';
 
-import storeMigration from './storeMigration';
+import migration from './migration';
 
 import thunk from 'redux-thunk';
-import coreMiddleware from './services/core/middleware';
-import uiMiddleware from './services/ui/middleware';
-import pusherMiddleware from './services/pusher/middleware';
-import mopidyMiddleware from './services/mopidy/middleware';
-import lastfmMiddleware from './services/lastfm/middleware';
-import geniusMiddleware from './services/genius/middleware';
-import spotifyMiddleware from './services/spotify/middleware';
-import googleMiddleware from './services/google/middleware';
-import snapcastMiddleware from './services/snapcast/middleware';
-import localstorageMiddleware from './services/localstorage/middleware';
+import coreMiddleware from '../services/core/middleware';
+import uiMiddleware from '../services/ui/middleware';
+import pusherMiddleware from '../services/pusher/middleware';
+import mopidyMiddleware from '../services/mopidy/middleware';
+import lastfmMiddleware from '../services/lastfm/middleware';
+import geniusMiddleware from '../services/genius/middleware';
+import spotifyMiddleware from '../services/spotify/middleware';
+import googleMiddleware from '../services/google/middleware';
+import snapcastMiddleware from '../services/snapcast/middleware';
+import localstorageMiddleware from '../services/localstorage/middleware';
 
 let state = {
 	core: {
@@ -112,7 +112,7 @@ state.google = Object.assign({}, state.google, helpers.getStorage('google'));
 state.snapcast = Object.assign({}, state.snapcast, helpers.getStorage('snapcast'));
 
 // Run any migrations
-state = storeMigration(state);
+state = migration(state);
 
 const reducers = combineReducers({
     core,
diff --git a/src/js/storeMigration.js b/src/js/store/migration.js
similarity index 87%
rename from src/js/storeMigration.js
rename to src/js/store/migration.js
index c30975f6..a7570e4c 100644
--- a/src/js/storeMigration.js
+++ b/src/js/store/migration.js
@@ -1,7 +1,5 @@
 
 export default state => {
-
-    // Changed at 3.36
     if (state.ui.shortkeys_enabled !== undefined){
         state.ui.hotkeys_enabled = state.ui.shortkeys_enabled;
     }