diff --git a/react/app.js b/react/app.js
new file mode 100644
index 00000000..6e7267c0
--- /dev/null
+++ b/react/app.js
@@ -0,0 +1,22 @@
+import React from 'react';
+import { Route, Switch } from 'react-router-dom';
+import PublishPage from 'components/PublishPage';
+import AboutPage from 'components/AboutPage';
+import LoginPage from 'containers/LoginPage';
+import ShowPage from 'containers/ShowPage';
+import FourOhFourPage from 'components/FourOhFourPage';
+
+const App = () => {
+  return (
+    <Switch>
+      <Route exact path="/" component={PublishPage} />
+      <Route exact path="/about" component={AboutPage} />
+      <Route exact path="/login" component={LoginPage} />
+      <Route exact path="/:identifier/:claim" component={ShowPage} />
+      <Route exact path="/:claim" component={ShowPage} />
+      <Route component={FourOhFourPage} />
+    </Switch>
+  );
+};
+
+export default App;
diff --git a/react/index.js b/react/index.js
index 239d0072..8ef02cf4 100644
--- a/react/index.js
+++ b/react/index.js
@@ -1,10 +1,14 @@
 import React from 'react';
 import { render } from 'react-dom';
+import { Provider } from 'react-redux';
 import { createStore, applyMiddleware, compose } from 'redux';
+import { BrowserRouter } from 'react-router-dom';
 import Reducer from 'reducers';
 import createSagaMiddleware from 'redux-saga';
 import rootSaga  from 'sagas';
-import Root from './root';
+
+import GAListener from 'components/GAListener';
+import App from './app';
 
 const sagaMiddleware = createSagaMiddleware();
 const middleware = applyMiddleware(sagaMiddleware);
@@ -19,6 +23,12 @@ let store = createStore(
 sagaMiddleware.run(rootSaga);
 
 render(
-  <Root store={store} />,
+  <Provider store={store}>
+    <BrowserRouter>
+      <GAListener>
+        <App />
+      </GAListener>
+    </BrowserRouter>
+  </Provider>,
   document.getElementById('react-app')
 );
diff --git a/react/root.js b/react/root.js
deleted file mode 100644
index c4350ea9..00000000
--- a/react/root.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { Provider } from 'react-redux';
-import { BrowserRouter, Route, Switch } from 'react-router-dom';
-
-import GAListener from 'components/GAListener';
-import PublishPage from 'components/PublishPage';
-import AboutPage from 'components/AboutPage';
-import LoginPage from 'containers/LoginPage';
-import ShowPage from 'containers/ShowPage';
-import FourOhFourPage from 'components/FourOhFourPage';
-
-const Root = ({ store }) => (
-  <Provider store={store}>
-    <BrowserRouter>
-      <GAListener>
-        <Switch>
-          <Route exact path="/" component={PublishPage} />
-          <Route exact path="/about" component={AboutPage} />
-          <Route exact path="/login" component={LoginPage} />
-          <Route exact path="/:identifier/:claim" component={ShowPage} />
-          <Route exact path="/:claim" component={ShowPage} />
-          <Route component={FourOhFourPage} />
-        </Switch>
-      </GAListener>
-    </BrowserRouter>
-  </Provider>
-);
-
-Root.propTypes = {
-  store: PropTypes.object.isRequired,
-};
-
-export default Root;