diff --git a/packages/strapi-plugin-content-manager/public/app/app.js b/packages/strapi-plugin-content-manager/public/app/app.js
index eae78e33a8..f56d749665 100644
--- a/packages/strapi-plugin-content-manager/public/app/app.js
+++ b/packages/strapi-plugin-content-manager/public/app/app.js
@@ -15,6 +15,14 @@ import configureStore from './store';
 import { selectLocationState } from './containers/App/selectors';
 import { translationMessages } from './i18n';
 
+// Plugin identifier based on the package.json `name` value
+const pluginId = require('../package.json').name.replace(
+  /^strapi-plugin-/i,
+  ''
+);
+const apiUrl = window.Strapi && `${window.Strapi.apiUrl}/${pluginId}`;
+const router = window.Strapi.router;
+
 // Create redux store with history
 // this uses the singleton browserHistory provided by react-router
 // Optionally, this could be changed to leverage a created history
@@ -28,31 +36,17 @@ syncHistoryWithStore(window.Strapi.router, store, {
   selectLocationState: selectLocationState(),
 });
 
-// Plugin identifier based on the package.json `name` value
-const pluginId = require('../package.json').name.replace(
-  /^strapi-plugin-/i,
-  ''
-);
-
-// Define Strapi admin router
-let router; // eslint-disable-line import/no-mutable-exports
-
-class comp extends React.Component {
-  componentWillMount() {
-    // Expose Strapi admin router
-    router = this.context.router;
-  }
-
-  render() {
-    return (
-      <Provider store={store}>
-        <App {...this.props} />
-      </Provider>
-    );
-  }
+// Define the plugin root component
+function Comp(props) {
+  return (
+    <Provider store={store}>
+      <App {...props} />
+    </Provider>
+  );
 }
 
-comp.contextTypes = {
+// Add contextTypes to get access to the admin router
+Comp.contextTypes = {
   router: React.PropTypes.object.isRequired,
 };
 
@@ -63,30 +57,11 @@ if (window.Strapi) {
     icon: 'ion-document-text',
     id: pluginId,
     leftMenuLinks: [],
-    mainComponent: comp,
+    mainComponent: Comp,
     routes: createRoutes(store),
     translationMessages,
   });
 }
 
-// Hot reloadable translation json files
-if (module.hot) {
-  // modules.hot.accept does not accept dynamic dependencies,
-  // have to be constants at compile-time
-  module.hot.accept('./i18n', () => {
-    if (window.Strapi) {
-      System.import('./i18n').then(result => {
-        const translationMessagesUpdated = result.translationMessages;
-        window.Strapi
-          .refresh(pluginId)
-          .translationMessages(translationMessagesUpdated);
-      });
-    }
-  });
-}
-
-// API
-const apiUrl = window.Strapi && `${window.Strapi.apiUrl}/${pluginId}`;
-
 // Export store
 export { store, apiUrl, pluginId, router };
diff --git a/packages/strapi-plugin-content-manager/public/app/containers/HomePage/index.js b/packages/strapi-plugin-content-manager/public/app/containers/Home/index.js
similarity index 92%
rename from packages/strapi-plugin-content-manager/public/app/containers/HomePage/index.js
rename to packages/strapi-plugin-content-manager/public/app/containers/Home/index.js
index 1c99529365..88d1e2b141 100644
--- a/packages/strapi-plugin-content-manager/public/app/containers/HomePage/index.js
+++ b/packages/strapi-plugin-content-manager/public/app/containers/Home/index.js
@@ -1,5 +1,5 @@
 /*
- * HomePage
+ * Home
  */
 
 import React from 'react';
@@ -11,7 +11,7 @@ import Container from '../../components/Container';
 
 import styles from './styles.scss';
 
-export class HomePage extends React.Component {
+export class Home extends React.Component {
   render() {
     const PluginHeader = this.props.exposedComponents.PluginHeader;
 
@@ -40,7 +40,7 @@ export class HomePage extends React.Component {
   }
 }
 
-HomePage.propTypes = {
+Home.propTypes = {
   exposedComponents: React.PropTypes.object.isRequired,
 };
 
@@ -52,5 +52,5 @@ const mapStateToProps = createStructuredSelector({});
 
 // Wrap the component to inject dispatch and state into it
 export default connect(mapStateToProps, mapDispatchToProps)(
-  injectIntl(HomePage)
+  injectIntl(Home)
 );
diff --git a/packages/strapi-plugin-content-manager/public/app/containers/HomePage/styles.scss b/packages/strapi-plugin-content-manager/public/app/containers/Home/styles.scss
similarity index 97%
rename from packages/strapi-plugin-content-manager/public/app/containers/HomePage/styles.scss
rename to packages/strapi-plugin-content-manager/public/app/containers/Home/styles.scss
index 9cf8524981..2d735b82f3 100644
--- a/packages/strapi-plugin-content-manager/public/app/containers/HomePage/styles.scss
+++ b/packages/strapi-plugin-content-manager/public/app/containers/Home/styles.scss
@@ -10,7 +10,7 @@
     border: 0;
   }
 
-  p{
+  p {
     display: block;
     margin: 0;
     padding-bottom: 14px;
diff --git a/packages/strapi-plugin-content-manager/public/app/containers/HomePage/actions.js b/packages/strapi-plugin-content-manager/public/app/containers/HomePage/actions.js
deleted file mode 100644
index 28b1279f31..0000000000
--- a/packages/strapi-plugin-content-manager/public/app/containers/HomePage/actions.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*
- * Actions
- */
diff --git a/packages/strapi-plugin-content-manager/public/app/containers/HomePage/constants.js b/packages/strapi-plugin-content-manager/public/app/containers/HomePage/constants.js
deleted file mode 100644
index f022a3bdbf..0000000000
--- a/packages/strapi-plugin-content-manager/public/app/containers/HomePage/constants.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Constants
- * Each action has a corresponding type, which the reducer knows and picks up on.
- * To avoid weird typos between the reducer and the actions, we save them as
- * constants here. We prefix them with 'yourplugin/YourComponent' so we avoid
- * reducers accidentally picking up actions they shouldn't.
- *
- * Follow this format:
- * export const YOUR_ACTION_CONSTANT = 'your-plugin/YourContainer/YOUR_ACTION_CONSTANT';
- */
diff --git a/packages/strapi-plugin-content-manager/public/app/containers/HomePage/reducer.js b/packages/strapi-plugin-content-manager/public/app/containers/HomePage/reducer.js
deleted file mode 100644
index eade591c4a..0000000000
--- a/packages/strapi-plugin-content-manager/public/app/containers/HomePage/reducer.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Reducer
- *
- * The reducer takes care of our data. Using actions, we can change our
- * application state.
- * To add a new action, add it to the switch statement in the reducer function
- *
- * Example:
- * case YOUR_ACTION_CONSTANT:
- *   return state.set('yourStateVariable', true);
- */
-
-import { fromJS } from 'immutable';
-
-// The initial state of the App
-const initialState = fromJS({});
-
-function appReducer(state = initialState, action) {
-  switch (action.type) {
-    default:
-      return state;
-  }
-}
-
-export default appReducer;
diff --git a/packages/strapi-plugin-content-manager/public/app/containers/HomePage/selectors.js b/packages/strapi-plugin-content-manager/public/app/containers/HomePage/selectors.js
deleted file mode 100644
index 2370117293..0000000000
--- a/packages/strapi-plugin-content-manager/public/app/containers/HomePage/selectors.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * The home state selectors
- */
-
-const selectHome = state => state.get('home');
-
-export { selectHome };
diff --git a/packages/strapi-plugin-content-manager/public/app/i18n.js b/packages/strapi-plugin-content-manager/public/app/i18n.js
index d74e385ba6..01573a5f67 100644
--- a/packages/strapi-plugin-content-manager/public/app/i18n.js
+++ b/packages/strapi-plugin-content-manager/public/app/i18n.js
@@ -19,4 +19,20 @@ const define = messages => {
   defineMessages(messages);
 };
 
+// Hot reloadable translation json files
+if (module.hot) {
+  // modules.hot.accept does not accept dynamic dependencies,
+  // have to be constants at compile-time
+  module.hot.accept('./i18n', () => {
+    if (window.Strapi) {
+      System.import('./i18n').then(result => {
+        const translationMessagesUpdated = result.translationMessages;
+        window.Strapi
+          .refresh(pluginId)
+          .translationMessages(translationMessagesUpdated);
+      });
+    }
+  });
+}
+
 export { translationMessages, define };
diff --git a/packages/strapi-plugin-content-manager/public/app/routes.js b/packages/strapi-plugin-content-manager/public/app/routes.js
index 054a924701..4ca5936330 100644
--- a/packages/strapi-plugin-content-manager/public/app/routes.js
+++ b/packages/strapi-plugin-content-manager/public/app/routes.js
@@ -21,13 +21,11 @@ export default function createRoutes(store) {
       path: '',
       name: 'home',
       getComponent(nextState, cb) {
-        const reducer = require('./containers/HomePage/reducer'); // eslint-disable-line global-require
-        const component = require('./containers/HomePage'); // eslint-disable-line global-require
+        const component = require('./containers/Home'); // eslint-disable-line global-require
 
         const renderRoute = loadModule(cb);
 
         process.nextTick(() => {
-          injectReducer('home', reducer.default);
           renderRoute(component);
         });
       },