diff --git a/src/components/Audioplayer/index.js b/src/components/Audioplayer/index.js
index 4ded1c2c3..07ab98f19 100644
--- a/src/components/Audioplayer/index.js
+++ b/src/components/Audioplayer/index.js
@@ -3,7 +3,7 @@ import { connect } from 'react-redux';
 import { camelize } from 'humps';
 
 // Redux
-import * as AudioActions from '../../redux/actions/audioplayer';
+import * as AudioActions from 'redux/actions/audioplayer';
 
 // Components
 import Track from './Track';
@@ -12,8 +12,8 @@ import ScrollButton from './ScrollButton';
 import RepeatDropdown from './RepeatDropdown';
 
 // Helpers
-import debug from '../../helpers/debug';
-import scroller from '../../utils/scroller';
+import debug from 'helpers/debug';
+import scroller from 'utils/scroller';
 
 const style = require('./style.scss');
 
diff --git a/src/components/Ayah/index.js b/src/components/Ayah/index.js
index 3f467a3e3..44ab165b4 100644
--- a/src/components/Ayah/index.js
+++ b/src/components/Ayah/index.js
@@ -2,11 +2,11 @@ import React, { Component, PropTypes } from 'react';
 import Link from 'react-router/lib/Link';
 import { Element } from 'react-scroll';
 
-import Copy from '../Copy';
+import Copy from 'components/Copy';
 
-import debug from '../../helpers/debug';
+import debug from 'helpers/debug';
 
-import bindTooltip from '../../utils/bindTooltip';
+import bindTooltip from 'utils/bindTooltip';
 
 const styles = require('./style.scss');
 
diff --git a/src/components/FontStyles/index.js b/src/components/FontStyles/index.js
index b147dbe2e..79622e38b 100644
--- a/src/components/FontStyles/index.js
+++ b/src/components/FontStyles/index.js
@@ -1,6 +1,6 @@
 import React, { Component, PropTypes } from 'react';
 import { connect } from 'react-redux';
-import { fontFaceStyle, fontFaceStyleLoaded } from '../../helpers/buildFontFaces';
+import { fontFaceStyle, fontFaceStyleLoaded } from 'helpers/buildFontFaces';
 import { load } from 'redux/actions/fontFace.js';
 
 import debug from 'helpers/debug';
diff --git a/src/components/Footer/index.js b/src/components/Footer/index.js
index 89c95f8d4..6b7300302 100644
--- a/src/components/Footer/index.js
+++ b/src/components/Footer/index.js
@@ -1,4 +1,4 @@
-import React, { Component, PropTypes } from 'react';
+import React from 'react';
 import Link from 'react-router/lib/Link';
 
 import Grid from 'react-bootstrap/lib/Grid';
@@ -15,8 +15,8 @@ const Footer = () => (
           <Col md={2} sm={4} xs={12} className={styles.about}>
             <p>Navigate</p>
             <ul className={`source-sans ${styles.list}`}>
-              <li><a href="/about">About</a></li>
-              <li><a href="/contact">Contact</a></li>
+              <li><Link to="/about">About</Link></li>
+              <li><Link to="/contact">Contact</Link></li>
               <li>
                 <a href="https://quran.zendesk.com/hc/en-us/articles/210090626-Development-help" target="_blank" data-metrics-event-name="Footer:Link:Developer">
                   Developers
diff --git a/src/components/Home/LastVisit/index.js b/src/components/Home/LastVisit/index.js
index 5dd7839d5..d66b57bcb 100644
--- a/src/components/Home/LastVisit/index.js
+++ b/src/components/Home/LastVisit/index.js
@@ -1,5 +1,5 @@
 import React, { PropTypes } from 'react';
-import debug from '../../../helpers/debug';
+import debug from 'helpers/debug';
 const styles = require('./style.scss');
 
 const LastVisit = (props) => {
diff --git a/src/components/Home/QuickSurahs/index.js b/src/components/Home/QuickSurahs/index.js
index a23a30c80..8def0c064 100644
--- a/src/components/Home/QuickSurahs/index.js
+++ b/src/components/Home/QuickSurahs/index.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import debug from '../../../helpers/debug';
+import debug from 'helpers/debug';
 import Link from 'react-router/lib/Link';
 
 const styles = require('containers/Home/style.scss');
diff --git a/src/components/Home/SurahsList/index.js b/src/components/Home/SurahsList/index.js
index 89ec7a2bf..577f3a1c8 100644
--- a/src/components/Home/SurahsList/index.js
+++ b/src/components/Home/SurahsList/index.js
@@ -1,5 +1,5 @@
 import React, { PropTypes } from 'react';
-import debug from '../../../helpers/debug';
+import debug from 'helpers/debug';
 import Link from 'react-router/lib/Link';
 const styles = require('./style.scss');
 
diff --git a/src/components/IndexHeader/index.js b/src/components/IndexHeader/index.js
index e2baaecdb..7c317b97a 100644
--- a/src/components/IndexHeader/index.js
+++ b/src/components/IndexHeader/index.js
@@ -1,10 +1,10 @@
 import React, { Component, PropTypes } from 'react';
 import Link from 'react-router/lib/Link';
 
-import SearchInput from '../SearchInput';
+import SearchInput from 'components/SearchInput';
 import Nav from './Nav';
 
-import debug from '../../helpers/debug';
+import debug from 'helpers/debug';
 
 const logo = require('../../../static/images/logo-lg-w.png');
 
diff --git a/src/components/LazyLoad/index.js b/src/components/LazyLoad/index.js
index 7d2731fd6..ddbabb188 100644
--- a/src/components/LazyLoad/index.js
+++ b/src/components/LazyLoad/index.js
@@ -1,7 +1,7 @@
 import { Component, PropTypes } from 'react';
 import ReactDOM from 'react-dom';
 
-import debug from '../../helpers/debug';
+import debug from 'helpers/debug';
 
 export default class LazyLoad extends Component {
   static propTypes = {
diff --git a/src/components/Line/index.js b/src/components/Line/index.js
index 802a6a8ae..6215d2e9b 100644
--- a/src/components/Line/index.js
+++ b/src/components/Line/index.js
@@ -1,5 +1,5 @@
 import React, { PropTypes } from 'react';
-import debug from '../../helpers/debug';
+import debug from 'helpers/debug';
 
 const styles = require('../Ayah/style.scss');
 
diff --git a/src/components/ReadingModeToggle/index.js b/src/components/ReadingModeToggle/index.js
index 042ce5d2f..dcf91f146 100644
--- a/src/components/ReadingModeToggle/index.js
+++ b/src/components/ReadingModeToggle/index.js
@@ -1,6 +1,6 @@
 import React, { PropTypes } from 'react';
 
-import SwitchToggle from '../SwitchToggle';
+import SwitchToggle from 'components/SwitchToggle';
 
 const ReadingModeToggle = ({ onReadingModeToggle, isToggled }) => (
   <div>
diff --git a/src/components/SearchAutocomplete/index.js b/src/components/SearchAutocomplete/index.js
index 2ddba47b3..6c7dfe3dd 100644
--- a/src/components/SearchAutocomplete/index.js
+++ b/src/components/SearchAutocomplete/index.js
@@ -1,5 +1,5 @@
 import React, { Component, PropTypes } from 'react';
-import ApiClient from '../../helpers/ApiClient';
+import ApiClient from 'helpers/ApiClient';
 import { connect } from 'react-redux';
 import { push } from 'react-router-redux';
 
diff --git a/src/components/SearchInput/index.js b/src/components/SearchInput/index.js
index 90b67d402..4340f2040 100644
--- a/src/components/SearchInput/index.js
+++ b/src/components/SearchInput/index.js
@@ -4,9 +4,9 @@ import { PropTypes as MetricsPropTypes } from 'react-metrics';
 import { push } from 'react-router-redux';
 import { connect } from 'react-redux';
 
-import SearchAutocomplete from '../SearchAutocomplete';
+import SearchAutocomplete from 'components/SearchAutocomplete';
 
-import debug from '../../helpers/debug';
+import debug from 'helpers/debug';
 
 
 class SearchInput extends Component {
diff --git a/src/components/TooltipDropdown/index.js b/src/components/TooltipDropdown/index.js
index 2cf49ac47..db1b762a3 100644
--- a/src/components/TooltipDropdown/index.js
+++ b/src/components/TooltipDropdown/index.js
@@ -5,7 +5,7 @@ import Popover from 'react-bootstrap/lib/Popover';
 import Row from 'react-bootstrap/lib/Row';
 import Col from 'react-bootstrap/lib/Col';
 
-import SwitchToggle from '../SwitchToggle';
+import SwitchToggle from 'components/SwitchToggle';
 
 const style = require('./style.scss');
 
diff --git a/src/containers/About/index.js b/src/containers/About/index.js
index 2e79bdff9..faaf1e6e4 100644
--- a/src/containers/About/index.js
+++ b/src/containers/About/index.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import IndexHeader from '../../components/IndexHeader';
+import IndexHeader from 'components/IndexHeader';
 import Helmet from 'react-helmet';
 
 import Grid from 'react-bootstrap/lib/Grid';
diff --git a/src/containers/App/index.js b/src/containers/App/index.js
index 4a91b337b..39c5bb204 100644
--- a/src/containers/App/index.js
+++ b/src/containers/App/index.js
@@ -9,9 +9,9 @@ const ModalHeader = Modal.Header;
 const ModalTitle = Modal.Title;
 const ModalBody = Modal.Body;
 
-import debug from '../../helpers/debug';
-import config from '../../config';
-import metricsConfig from '../../helpers/metrics';
+import debug from 'helpers/debug';
+import config from 'config';
+import metricsConfig from 'helpers/metrics';
 import { authConnect } from './connect';
 import Footer from 'components/Footer';
 
@@ -64,6 +64,7 @@ class App extends Component {
     );
   }
 }
+console.log(metricsConfig);
 
 const metricsApp = metrics(metricsConfig)(App);
 const AsyncApp = asyncConnect([{ promise: authConnect }])(metricsApp);
diff --git a/src/containers/Contact/index.js b/src/containers/Contact/index.js
index dcdc4a77c..d09136cef 100644
--- a/src/containers/Contact/index.js
+++ b/src/containers/Contact/index.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import ReactDOM from 'react-dom';
 import superagent from 'superagent';
 
-import IndexHeader from '../../components/IndexHeader';
+import IndexHeader from 'components/IndexHeader';
 
 export default class Contact extends Component {
   state = {
diff --git a/src/containers/Donations/index.js b/src/containers/Donations/index.js
index 6560e7b47..842d25832 100644
--- a/src/containers/Donations/index.js
+++ b/src/containers/Donations/index.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import IndexHeader from '../../components/IndexHeader';
+import IndexHeader from 'components/IndexHeader';
 
 import Grid from 'react-bootstrap/lib/Grid';
 import Row from 'react-bootstrap/lib/Row';
diff --git a/src/containers/Error/index.js b/src/containers/Error/index.js
index 6c15cd412..25ad45b46 100644
--- a/src/containers/Error/index.js
+++ b/src/containers/Error/index.js
@@ -1,5 +1,5 @@
 import React, { PropTypes } from 'react';
-import IndexHeader from '../../components/IndexHeader';
+import IndexHeader from 'components/IndexHeader';
 import Helmet from 'react-helmet';
 
 const error = {
diff --git a/src/containers/Home/index.js b/src/containers/Home/index.js
index 1b0832c97..26b9f330f 100644
--- a/src/containers/Home/index.js
+++ b/src/containers/Home/index.js
@@ -3,8 +3,8 @@ import Helmet from 'react-helmet';
 import IndexHeader from 'components/IndexHeader';
 import { asyncConnect } from 'redux-connect';
 import { connect } from 'react-redux';
-import debug from '../../helpers/debug';
-import { isAllLoaded, loadAll } from '../../redux/actions/surahs.js';
+import debug from 'helpers/debug';
+import { isAllLoaded, loadAll } from 'redux/actions/surahs.js';
 
 import SurahsList from 'components/Home/SurahsList';
 import QuickSurahs from 'components/Home/QuickSurahs';
diff --git a/src/containers/Search/Header/index.js b/src/containers/Search/Header/index.js
index 148b68687..d59d7fcce 100644
--- a/src/containers/Search/Header/index.js
+++ b/src/containers/Search/Header/index.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import SearchInput from '../../../components/SearchInput';
+import SearchInput from 'components/SearchInput';
 import Link from 'react-router/lib/Link';
 
 const logo = require('../../../../static/images/logo-lg-w.png');
diff --git a/src/containers/Search/index.js b/src/containers/Search/index.js
index 7208f74c3..40e5de0ea 100644
--- a/src/containers/Search/index.js
+++ b/src/containers/Search/index.js
@@ -13,10 +13,10 @@ import Row from 'react-bootstrap/lib/Row';
 import Col from 'react-bootstrap/lib/Col';
 
 import Header from './Header';
-import Ayah from '../../components/Ayah';
-import CoreLoader from '../../components/Loader';
+import Ayah from 'components/Ayah';
+import CoreLoader from 'components/Loader';
 
-import { search } from '../../redux/actions/search.js';
+import { search } from 'redux/actions/search.js';
 
 const style = require('./style.scss');
 
diff --git a/src/containers/Surah/Header/index.js b/src/containers/Surah/Header/index.js
index a6cc412c5..dd45b5c2e 100644
--- a/src/containers/Surah/Header/index.js
+++ b/src/containers/Surah/Header/index.js
@@ -5,7 +5,7 @@ import Col from 'react-bootstrap/lib/Col';
 import Navbar from 'react-bootstrap/lib/Navbar';
 const Header = Navbar.Header;
 
-import debug from '../../../helpers/debug';
+import debug from 'helpers/debug';
 
 // const ornamentLeft = require('../../../../static/images/ornament-left.png');
 // const ornamentRight = require('../../../../static/images/ornament-right.png');
diff --git a/src/containers/Surah/connect.js b/src/containers/Surah/connect.js
index 197910c57..3e43e5cca 100644
--- a/src/containers/Surah/connect.js
+++ b/src/containers/Surah/connect.js
@@ -2,12 +2,12 @@ import {
   isAllLoaded,
   loadAll,
   setCurrent as setCurrentSurah
-  } from '../../redux/actions/surahs.js';
+  } from 'redux/actions/surahs.js';
 
 import {
   clearCurrent,
   load as loadAyahs
-  } from '../../redux/actions/ayahs.js';
+  } from 'redux/actions/ayahs.js';
 
 import {debug, isLoaded} from 'helpers';
 
diff --git a/src/containers/Surah/index.js b/src/containers/Surah/index.js
index ffea8ba64..84a959748 100644
--- a/src/containers/Surah/index.js
+++ b/src/containers/Surah/index.js
@@ -39,15 +39,14 @@ import makeHeadTags from 'helpers/makeHeadTags';
 import debug from 'helpers/debug';
 
 import descriptions from './descriptions';
-import Title from './Title';
 
 import { surahsConnect, ayahsConnect } from './connect';
 
-import * as AudioActions from '../../redux/actions/audioplayer.js';
-import * as AyahActions from '../../redux/actions/ayahs.js';
-import * as BookmarkActions from '../../redux/actions/bookmarks.js';
-import * as OptionsActions from '../../redux/actions/options.js';
-import * as MediaActions from '../../redux/actions/media.js';
+import * as AudioActions from 'redux/actions/audioplayer.js';
+import * as AyahActions from 'redux/actions/ayahs.js';
+import * as BookmarkActions from 'redux/actions/bookmarks.js';
+import * as OptionsActions from 'redux/actions/options.js';
+import * as MediaActions from 'redux/actions/media.js';
 
 const style = require('./style.scss');
 
diff --git a/src/helpers/ApiClient.js b/src/helpers/ApiClient.js
index e8ea84bf7..d86d9a629 100644
--- a/src/helpers/ApiClient.js
+++ b/src/helpers/ApiClient.js
@@ -3,7 +3,7 @@ import qs from 'qs';
 import { decamelizeKeys } from 'humps';
 import cookie from 'react-cookie';
 
-import config from '../config';
+import config from 'config';
 
 const methods = ['get', 'post', 'put', 'patch', 'del'];
 
diff --git a/src/redux/actions/audioplayer.js b/src/redux/actions/audioplayer.js
index 9b8205f9d..10b46383e 100644
--- a/src/redux/actions/audioplayer.js
+++ b/src/redux/actions/audioplayer.js
@@ -10,7 +10,7 @@ import {
   SET_REPEAT,
   TOGGLE_SCROLL,
   BUILD_ON_CLIENT,
-  UPDATE } from '../constants/audioplayer.js';
+  UPDATE } from 'redux/constants/audioplayer.js';
 
 export function setUserAgent(userAgent) {
   return {
diff --git a/src/redux/actions/auth.js b/src/redux/actions/auth.js
index 5ced5b33a..2bfd1d53c 100644
--- a/src/redux/actions/auth.js
+++ b/src/redux/actions/auth.js
@@ -8,7 +8,7 @@ import {
   LOAD,
   LOAD_SUCCESS,
   LOAD_FAILURE
-} from '../constants/auth';
+} from 'redux/constants/auth';
 
 export function isLoaded(globalState) {
   return globalState.auth && globalState.auth.user;
diff --git a/src/redux/actions/ayahs.js b/src/redux/actions/ayahs.js
index 6140559a1..0898b9c9b 100644
--- a/src/redux/actions/ayahs.js
+++ b/src/redux/actions/ayahs.js
@@ -1,4 +1,4 @@
-import { ayahsSchema } from '../schemas';
+import { ayahsSchema } from 'redux/schemas';
 
 import { arrayOf } from 'normalizr';
 
@@ -10,7 +10,7 @@ import {
   SET_CURRENT_AYAH,
   SET_CURRENT_WORD,
   CLEAR_CURRENT_WORD
-  } from '../constants/ayahs.js';
+  } from 'redux/constants/ayahs.js';
 
 // For safe measure
 const defaultOptions = {
diff --git a/src/redux/actions/bookmarks.js b/src/redux/actions/bookmarks.js
index 1dcb234c9..beaf7d08b 100644
--- a/src/redux/actions/bookmarks.js
+++ b/src/redux/actions/bookmarks.js
@@ -1,4 +1,4 @@
-import { bookmarksSchema } from '../schemas';
+import { bookmarksSchema } from 'redux/schemas';
 import { arrayOf } from 'normalizr';
 import {
   LOAD,
@@ -10,7 +10,7 @@ import {
   REMOVE_BOOKMARK,
   REMOVE_BOOKMARK_SUCCESS,
   REMOVE_BOOKMARK_FAILURE
-} from '../constants/bookmarks';
+} from 'redux/constants/bookmarks';
 
 export function isLoaded(globalState) {
   return globalState.auth && globalState.auth.user;
diff --git a/src/redux/actions/fontFace.js b/src/redux/actions/fontFace.js
index 0fb13f699..2d52cc17b 100644
--- a/src/redux/actions/fontFace.js
+++ b/src/redux/actions/fontFace.js
@@ -1,4 +1,4 @@
-import { LOAD } from '../constants/fontFace.js';
+import { LOAD } from 'redux/constants/fontFace.js';
 
 export function load(className) {
   return {
diff --git a/src/redux/actions/media.js b/src/redux/actions/media.js
index 27c77ff06..feaf69c6c 100644
--- a/src/redux/actions/media.js
+++ b/src/redux/actions/media.js
@@ -1,7 +1,7 @@
 import {
   SET_MEDIA,
   REMOVE_MEDIA
-} from '../constants/media';
+} from 'redux/constants/media';
 
 export function setMedia(content) {
   return {
diff --git a/src/redux/actions/options.js b/src/redux/actions/options.js
index a2006d479..57afdc4a4 100644
--- a/src/redux/actions/options.js
+++ b/src/redux/actions/options.js
@@ -1,5 +1,5 @@
 import cookie from 'react-cookie';
-import { TOGGLE_READING_MODE, SET_OPTION } from '../constants/options.js';
+import { TOGGLE_READING_MODE, SET_OPTION } from 'redux/constants/options.js';
 
 export function isReadingMode(globalState) {
   return globalState.options.isReadingMode;
diff --git a/src/redux/actions/search.js b/src/redux/actions/search.js
index eecac3587..343795384 100644
--- a/src/redux/actions/search.js
+++ b/src/redux/actions/search.js
@@ -1,11 +1,11 @@
-import { ayahsSchema } from '../schemas';
+import { ayahsSchema } from 'redux/schemas';
 import { arrayOf } from 'normalizr';
 
 import {
   SEARCH,
   SEARCH_SUCCESS,
   SEARCH_FAIL
-  } from '../constants/search.js';
+  } from 'redux/constants/search.js';
 
 export function search(params) {
   return {
diff --git a/src/redux/actions/spec.js b/src/redux/actions/spec.js
index 9d84cc5c3..40c915b55 100644
--- a/src/redux/actions/spec.js
+++ b/src/redux/actions/spec.js
@@ -1,9 +1,9 @@
 import * as audioplayerActions from './audioplayer.js';
 import * as ayahsActions from './ayahs.js';
 import * as surahsActions from './surahs.js';
-import * as audioplayerConstant from '../constants/audioplayer.js';
-import * as ayahsConstants from '../constants/ayahs.js';
-import * as surahsConstants from '../constants/surahs.js';
+import * as audioplayerConstant from 'redux/constants/audioplayer.js';
+import * as ayahsConstants from 'redux/constants/ayahs.js';
+import * as surahsConstants from 'redux/constants/surahs.js';
 
 
 describe("action tests", () => {
diff --git a/src/redux/actions/surahs.js b/src/redux/actions/surahs.js
index 7ee52ae12..e1c617e16 100644
--- a/src/redux/actions/surahs.js
+++ b/src/redux/actions/surahs.js
@@ -1,4 +1,4 @@
-import { surahsSchema } from '../schemas';
+import { surahsSchema } from 'redux/schemas';
 import { arrayOf } from 'normalizr';
 import {
   LOAD,
@@ -7,7 +7,7 @@ import {
   LOAD_INFO,
   LOAD_INFO_SUCCESS,
   LOAD_INFO_FAIL,
-  SET_CURRENT } from '../constants/surahs.js';
+  SET_CURRENT } from 'redux/constants/surahs.js';
 
 export function loadAll() {
   return {
diff --git a/src/redux/modules/audioplayer.js b/src/redux/modules/audioplayer.js
index e9635c321..3534020a5 100644
--- a/src/redux/modules/audioplayer.js
+++ b/src/redux/modules/audioplayer.js
@@ -1,6 +1,6 @@
 /* eslint-disable no-case-declarations */
-import { buildAudioFromHash } from '../../helpers/buildAudio';
-import { buildSegments, extractSegments } from '../../helpers/buildSegments';
+import { buildAudioFromHash } from 'helpers/buildAudio';
+import { buildSegments, extractSegments } from 'helpers/buildSegments';
 import debug from 'helpers/debug';
 
 import {
@@ -23,7 +23,7 @@ import {
   TOGGLE_SCROLL,
   BUILD_ON_CLIENT,
   UPDATE
-  } from '../constants/audioplayer.js';
+  } from 'redux/constants/audioplayer.js';
 
 export { NEXT, SET_AYAH };
 
diff --git a/src/redux/modules/auth.js b/src/redux/modules/auth.js
index 4fa4629b3..ab786e860 100644
--- a/src/redux/modules/auth.js
+++ b/src/redux/modules/auth.js
@@ -6,7 +6,7 @@ import {
   LOGOUT_SUCCESS,
   LOAD_SUCCESS,
   LOAD_FAILURE
-} from '../constants/auth';
+} from 'redux/constants/auth';
 
 const initialState = {
   loaded: false
diff --git a/src/redux/modules/ayahs.js b/src/redux/modules/ayahs.js
index 1e9f543c0..88f0f057a 100644
--- a/src/redux/modules/ayahs.js
+++ b/src/redux/modules/ayahs.js
@@ -6,7 +6,7 @@ import {
   SET_CURRENT_AYAH,
   SET_CURRENT_WORD,
   CLEAR_CURRENT_WORD
-  } from '../constants/ayahs.js';
+  } from 'redux/constants/ayahs.js';
 
 export {
   LOAD,
diff --git a/src/redux/modules/bookmarks.js b/src/redux/modules/bookmarks.js
index 8ee48f840..4bc32df10 100644
--- a/src/redux/modules/bookmarks.js
+++ b/src/redux/modules/bookmarks.js
@@ -8,7 +8,7 @@ import {
   REMOVE_BOOKMARK,
   REMOVE_BOOKMARK_SUCCESS,
   REMOVE_BOOKMARK_FAILURE
-} from '../constants/bookmarks';
+} from 'redux/constants/bookmarks';
 
 const initialState = {
   loaded: false,
diff --git a/src/redux/modules/fontFaces.js b/src/redux/modules/fontFaces.js
index 6c573f848..7bfc531ca 100644
--- a/src/redux/modules/fontFaces.js
+++ b/src/redux/modules/fontFaces.js
@@ -1,6 +1,6 @@
-import { LOAD_SUCCESS } from '../constants/ayahs.js';
-import { SEARCH_SUCCESS } from '../constants/search.js';
-import { LOAD } from '../constants/fontFace.js';
+import { LOAD_SUCCESS } from 'redux/constants/ayahs.js';
+import { SEARCH_SUCCESS } from 'redux/constants/search.js';
+import { LOAD } from 'redux/constants/fontFace.js';
 
 export default function reducer(state = {}, action = {}) {
   switch (action.type) {
diff --git a/src/redux/modules/lines.js b/src/redux/modules/lines.js
index 644915648..5ddf48469 100644
--- a/src/redux/modules/lines.js
+++ b/src/redux/modules/lines.js
@@ -3,9 +3,9 @@ import {
   LOAD as AYAHS_LOAD,
   LOAD_SUCCESS as AYAHS_LOAD_SUCCESS,
   LOAD_FAIL as AYAHS_LOAD_FAIL,
-  } from '../constants/ayahs.js';
+  } from 'redux/constants/ayahs.js';
 
-import { SET_CURRENT as SURAHS_SET_CURRENT } from '../constants/surahs.js';
+import { SET_CURRENT as SURAHS_SET_CURRENT } from 'redux/constants/surahs.js';
 
 const initialState = {
   lines: {}
diff --git a/src/redux/modules/media.js b/src/redux/modules/media.js
index c7519fb32..e1a3285a5 100644
--- a/src/redux/modules/media.js
+++ b/src/redux/modules/media.js
@@ -1,7 +1,7 @@
 import {
   SET_MEDIA,
   REMOVE_MEDIA
-} from '../constants/media';
+} from 'redux/constants/media';
 
 const initialState = {
   content: null
diff --git a/src/redux/modules/options.js b/src/redux/modules/options.js
index 2851fa49e..5ad635a28 100644
--- a/src/redux/modules/options.js
+++ b/src/redux/modules/options.js
@@ -1,5 +1,5 @@
 
-import { TOGGLE_READING_MODE, SET_OPTION } from '../constants/options.js';
+import { TOGGLE_READING_MODE, SET_OPTION } from 'redux/constants/options.js';
 
 const initialState = {
   isReadingMode: false,
diff --git a/src/redux/modules/searchResults.js b/src/redux/modules/searchResults.js
index 67a15b041..8f487c552 100644
--- a/src/redux/modules/searchResults.js
+++ b/src/redux/modules/searchResults.js
@@ -2,7 +2,7 @@ import {
   SEARCH,
   SEARCH_SUCCESS,
   SEARCH_FAIL
-  } from '../constants/search.js';
+} from 'redux/constants/search.js';
 
 const initialState = {
   errored: false,
diff --git a/src/redux/modules/surahs.js b/src/redux/modules/surahs.js
index dd7ddffec..c15b48b35 100644
--- a/src/redux/modules/surahs.js
+++ b/src/redux/modules/surahs.js
@@ -2,7 +2,7 @@ import {
   LOAD_SUCCESS,
   LOAD_FAIL,
   SET_CURRENT
-  } from '../constants/surahs.js';
+} from 'redux/constants/surahs.js';
 
 const initialState = {
   errored: false,
diff --git a/src/redux/schemas.js b/src/redux/schemas.js
index f46e00cca..0a97ba015 100644
--- a/src/redux/schemas.js
+++ b/src/redux/schemas.js
@@ -1,8 +1,8 @@
 import { Schema } from 'normalizr';
 
-const surahsSchema = new Schema('surahs');
-const ayahsSchema = new Schema('ayahs', { idAttribute: 'ayahKey' });
-const bookmarksSchema = new Schema('bookmarks', { idAttribute: 'ayahKey' });
+export const surahsSchema = new Schema('surahs');
+export const ayahsSchema = new Schema('ayahs', { idAttribute: 'ayahKey' });
+export const bookmarksSchema = new Schema('bookmarks', { idAttribute: 'ayahKey' });
 
 const schemas = {
   surahsSchema,
diff --git a/src/routes.js b/src/routes.js
index 7bafef83d..e26ba9f6c 100644
--- a/src/routes.js
+++ b/src/routes.js
@@ -8,6 +8,7 @@ import { isLoaded as isAuthLoaded, load as loadAuth, hasAccessToken } from 'redu
 
 import checkValidSurah from './utils/checkValidSurah';
 import App from './containers/App';
+import Home from './containers/Home';
 
 export default (store) => {
   const requireLogin = (nextState, replace, cb) => {
@@ -37,8 +38,7 @@ export default (store) => {
 
   return (
     <Route path="/" component={App} onEnter={shouldAuth}>
-      <IndexRoute getComponent={(nextState, cb) => System.import('./containers/Home').then(module => cb(null, module))} />
-
+      <IndexRoute component={Home} />
       <Route path="/donations" getComponent={(nextState, cb) => System.import('./containers/Donations').then(module => cb(null, module))} />
       <Route path="/contributions" getComponent={(nextState, cb) => System.import('./containers/Donations').then(module => cb(null, module))} />
 
diff --git a/src/server/config/sitemap.js b/src/server/config/sitemap.js
index e94f4d7eb..4a120a32d 100644
--- a/src/server/config/sitemap.js
+++ b/src/server/config/sitemap.js
@@ -1,6 +1,6 @@
 import sitemap from 'sitemap';
 
-import ApiClient from '../../helpers/ApiClient';
+import ApiClient from 'helpers/ApiClient';
 
 
 export default (server) => {
diff --git a/webpack/dev.config.js b/webpack/dev.config.js
index 333553f8f..a1f10b2b1 100644
--- a/webpack/dev.config.js
+++ b/webpack/dev.config.js
@@ -41,6 +41,7 @@ module.exports = {
           {
             loader: 'babel',
             query: {
+              babelrc: false,
               plugins: [
                 'transform-runtime',
                 'add-module-exports',
@@ -48,7 +49,7 @@ module.exports = {
                 'transform-react-display-name',
                 'typecheck',
               ],
-              presets: ['react', ['es2015', {modules: false}], 'stage-0', 'react-hmre'],
+              presets: ['react', 'es2015', 'stage-0', 'react-hmre'],
               cacheDirectory: true
             }
           }
diff --git a/webpack/prod.config.js b/webpack/prod.config.js
index 4bd33e2c3..1c2833341 100644
--- a/webpack/prod.config.js
+++ b/webpack/prod.config.js
@@ -50,7 +50,8 @@ module.exports = {
           {
             loader: 'babel',
             query: {
-              presets: ['react', ['es2015', {modules: false}], 'stage-0'],
+              babelrc: false,
+              presets: ['react', 'es2015', 'stage-0'],
               plugins: [
                 'transform-runtime',
                 'add-module-exports',