diff --git a/src/index.js b/src/index.js
index 75887d63..393e7357 100644
--- a/src/index.js
+++ b/src/index.js
@@ -2,47 +2,33 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { AppContainer } from 'react-hot-loader';
+import { Provider } from "react-redux";
 import Redbox from 'redbox-react';
 
-import Routes from './routes';
-import './index.css';
+/* our code */
+import App from "./components/app";
+import store from "./reducers";
 
-if (process.env.NODE_ENV !== 'development') {
-  if ('serviceWorker' in navigator) {
-    navigator.serviceWorker.register('/service-worker.js');
-  }
+ReactDOM.render(
+  <AppContainer errorReporter={Redbox}>
+    <Provider store={store}>
+      <App/>
+    </Provider>
+  </AppContainer>,
+  document.getElementById('root')
+);
 
-  ReactDOM.render(<Routes />, document.getElementById('root'));
-} else {
-  ReactDOM.render(
-    <AppContainer errorReporter={Redbox}>
-      <Routes />
-    </AppContainer>,
-    document.getElementById('root')
-  );
-
-  if (module.hot) {
-    module.hot.accept('./routes', () => {
-      // TODO: Remove console override when
-      // https://github.com/reactjs/react-router/issues/2704 is fixed
-      const orgError = console.error;
-      console.error = message => {
-        if (
-          message &&
-            message.indexOf('You cannot change <Router routes>;') === -1
-        ) {
-          orgError.apply(console, [ message ]);
-        }
-      };
-
-      const RoutesUpdate = require('./routes').default;
-
-      ReactDOM.render(
-        <AppContainer errorReporter={Redbox}>
-          <RoutesUpdate />
-        </AppContainer>,
-        document.getElementById('root')
-      );
-    });
-  }
+// Hot Module Replacement API
+if (module.hot) {
+  module.hot.accept('./components/app', () => {
+    const NextApp = require('./components/app').default;
+    ReactDOM.render(
+      <AppContainer>
+        <Provider store={store}>
+          <NextApp/>
+        </Provider>
+      </AppContainer>,
+      document.getElementById('root')
+    );
+  });
 }