diff --git a/imports/ui/components/Loading.js b/imports/ui/components/Loading.js
new file mode 100644
index 0000000..e7c7e7e
--- /dev/null
+++ b/imports/ui/components/Loading.js
@@ -0,0 +1,30 @@
+import React from 'react';
+
+const Loading = () => (
+  <svg
+    version="1.1"
+    className="loading"
+    xmlns="http://www.w3.org/2000/svg"
+    x="0px"
+    y="0px"
+    width="40px"
+    height="40px"
+    viewBox="0 0 40 40"
+    enableBackground="new 0 0 40 40">
+      <path
+      opacity="1.0"
+      fill="#eee"
+      d="M20.201,5.169c-8.254,0-14.946,6.692-14.946,14.946c0,8.255,6.692,14.946,
+      14.946,14.946s14.946-6.691,14.946-14.946C35.146,11.861,28.455,5.169,20.201,
+      5.169z M20.201,31.749c-6.425,0-11.634-5.208-11.634-11.634c0-6.425,
+      5.209-11.634,11.634-11.634c6.425,0,11.633,5.209,11.633,11.634C31.834,
+      26.541,26.626,31.749,20.201,31.749z"/>
+      <path
+        fill="#da5347"
+        d="M26.013,10.047l1.654-2.866c-2.198-1.272-4.743-2.012-7.466-2.012h0v3.312h0
+      C22.32,8.481,24.301,9.057,26.013,10.047z">
+    </path>
+  </svg>
+);
+
+export default Loading;
diff --git a/imports/ui/components/document.js b/imports/ui/components/document.js
deleted file mode 100644
index 0cc1ee2..0000000
--- a/imports/ui/components/document.js
+++ /dev/null
@@ -1,66 +0,0 @@
-import React from 'react';
-import { Row, Col, ListGroupItem, FormControl, Button } from 'react-bootstrap';
-import { Bert } from 'meteor/themeteorchef:bert';
-import { updateDocument, removeDocument } from '../../api/documents/methods.js';
-
-const handleUpdateDocument = (documentId, event) => {
-  const title = event.target.value.trim();
-  if (title !== '' && event.keyCode === 13) {
-    updateDocument.call({
-      _id: documentId,
-      update: { title },
-    }, (error) => {
-      if (error) {
-        Bert.alert(error.reason, 'danger');
-      } else {
-        Bert.alert('Document updated!', 'success');
-      }
-    });
-  }
-};
-
-const handleRemoveDocument = (documentId, event) => {
-  event.preventDefault();
-  // this should be replaced with a styled solution so for now we will
-  // disable the eslint `no-alert`
-  // eslint-disable-next-line no-alert
-  if (confirm('Are you sure? This is permanent.')) {
-    removeDocument.call({
-      _id: documentId,
-    }, (error) => {
-      if (error) {
-        Bert.alert(error.reason, 'danger');
-      } else {
-        Bert.alert('Document removed!', 'success');
-      }
-    });
-  }
-};
-
-const Document = ({ document }) => (
-  <ListGroupItem key={ document._id }>
-    <Row>
-      <Col xs={ 8 } sm={ 10 }>
-        <FormControl
-          type="text"
-          defaultValue={ document.title }
-          onKeyUp={ handleUpdateDocument.bind(this, document._id) }
-        />
-      </Col>
-      <Col xs={ 4 } sm={ 2 }>
-        <Button
-          bsStyle="danger"
-          className="btn-block"
-          onClick={ handleRemoveDocument.bind(this, document._id) }>
-          Remove
-        </Button>
-      </Col>
-    </Row>
-  </ListGroupItem>
-);
-
-Document.propTypes = {
-  document: React.PropTypes.object,
-};
-
-export default Document;
diff --git a/imports/ui/components/loading.js b/imports/ui/components/loading.js
deleted file mode 100644
index e7c7e7e..0000000
--- a/imports/ui/components/loading.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import React from 'react';
-
-const Loading = () => (
-  <svg
-    version="1.1"
-    className="loading"
-    xmlns="http://www.w3.org/2000/svg"
-    x="0px"
-    y="0px"
-    width="40px"
-    height="40px"
-    viewBox="0 0 40 40"
-    enableBackground="new 0 0 40 40">
-      <path
-      opacity="1.0"
-      fill="#eee"
-      d="M20.201,5.169c-8.254,0-14.946,6.692-14.946,14.946c0,8.255,6.692,14.946,
-      14.946,14.946s14.946-6.691,14.946-14.946C35.146,11.861,28.455,5.169,20.201,
-      5.169z M20.201,31.749c-6.425,0-11.634-5.208-11.634-11.634c0-6.425,
-      5.209-11.634,11.634-11.634c6.425,0,11.633,5.209,11.633,11.634C31.834,
-      26.541,26.626,31.749,20.201,31.749z"/>
-      <path
-        fill="#da5347"
-        d="M26.013,10.047l1.654-2.866c-2.198-1.272-4.743-2.012-7.466-2.012h0v3.312h0
-      C22.32,8.481,24.301,9.057,26.013,10.047z">
-    </path>
-  </svg>
-);
-
-export default Loading;
diff --git a/imports/ui/layouts/App.js b/imports/ui/layouts/App.js
new file mode 100644
index 0000000..1a8c89c
--- /dev/null
+++ b/imports/ui/layouts/App.js
@@ -0,0 +1,18 @@
+import React from 'react';
+import { Grid } from 'react-bootstrap';
+import AppNavigation from '../containers/AppNavigation.js';
+
+const App = ({ children }) => (
+  <div>
+    <AppNavigation />
+    <Grid>
+      { children }
+    </Grid>
+  </div>
+);
+
+App.propTypes = {
+  children: React.PropTypes.node,
+};
+
+export default App;
diff --git a/imports/ui/layouts/app.js b/imports/ui/layouts/app.js
deleted file mode 100644
index 1a8c89c..0000000
--- a/imports/ui/layouts/app.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import React from 'react';
-import { Grid } from 'react-bootstrap';
-import AppNavigation from '../containers/AppNavigation.js';
-
-const App = ({ children }) => (
-  <div>
-    <AppNavigation />
-    <Grid>
-      { children }
-    </Grid>
-  </div>
-);
-
-App.propTypes = {
-  children: React.PropTypes.node,
-};
-
-export default App;
diff --git a/imports/ui/pages/Index.js b/imports/ui/pages/Index.js
new file mode 100644
index 0000000..02cb4a6
--- /dev/null
+++ b/imports/ui/pages/Index.js
@@ -0,0 +1,13 @@
+import React from 'react';
+import { Jumbotron } from 'react-bootstrap';
+
+const Index = () => (
+  <Jumbotron className="text-center">
+    <h2>Base</h2>
+    <p>A starting point for Meteor applications.</p>
+    <p><a className="btn btn-success" href="https://themeteorchef.com/base" role="button">Read the Documentation</a></p>
+    <p style={ { fontSize: '16px', color: '#aaa' } }>Currently at v4.8.0</p>
+  </Jumbotron>
+);
+
+export default Index;
diff --git a/imports/ui/pages/Login.js b/imports/ui/pages/Login.js
new file mode 100644
index 0000000..7a14d4f
--- /dev/null
+++ b/imports/ui/pages/Login.js
@@ -0,0 +1,46 @@
+import React from 'react';
+import { Link } from 'react-router';
+import { Row, Col, FormGroup, ControlLabel, FormControl, Button } from 'react-bootstrap';
+import handleLogin from '../../modules/login';
+
+export default class Login extends React.Component {
+  componentDidMount() {
+    handleLogin({ component: this });
+  }
+
+  handleSubmit(event) {
+    event.preventDefault();
+  }
+
+  render() {
+    return (<Row>
+      <Col xs={ 12 } sm={ 6 } md={ 4 }>
+        <h4 className="page-header">Login</h4>
+        <form ref="login" className="login" onSubmit={ this.handleSubmit }>
+          <FormGroup>
+            <ControlLabel>Email Address</ControlLabel>
+            <FormControl
+              type="email"
+              ref="emailAddress"
+              name="emailAddress"
+              placeholder="Email Address"
+            />
+          </FormGroup>
+          <FormGroup>
+            <ControlLabel>
+              <span className="pull-left">Password</span>
+              <Link className="pull-right" to="/recover-password">Forgot Password?</Link>
+            </ControlLabel>
+            <FormControl
+              type="password"
+              ref="password"
+              name="password"
+              placeholder="Password"
+            />
+          </FormGroup>
+          <Button type="submit" bsStyle="success">Login</Button>
+        </form>
+      </Col>
+    </Row>);
+  }
+}
diff --git a/imports/ui/pages/Signup.js b/imports/ui/pages/Signup.js
new file mode 100644
index 0000000..f32bdc6
--- /dev/null
+++ b/imports/ui/pages/Signup.js
@@ -0,0 +1,68 @@
+import React from 'react';
+import { Link } from 'react-router';
+import { Row, Col, FormGroup, ControlLabel, FormControl, Button } from 'react-bootstrap';
+import handleSignup from '../../modules/signup';
+
+export default class Signup extends React.Component {
+  componentDidMount() {
+    handleSignup({ component: this });
+  }
+
+  handleSubmit(event) {
+    event.preventDefault();
+  }
+
+  render() {
+    return (<Row>
+      <Col xs={ 12 } sm={ 6 } md={ 4 }>
+        <h4 className="page-header">Sign Up</h4>
+        <form ref="signup" className="signup" onSubmit={ this.handleSubmit }>
+          <Row>
+            <Col xs={ 6 } sm={ 6 }>
+              <FormGroup>
+                <ControlLabel>First Name</ControlLabel>
+                <FormControl
+                  type="text"
+                  ref="firstName"
+                  name="firstName"
+                  placeholder="First Name"
+                />
+              </FormGroup>
+            </Col>
+            <Col xs={ 6 } sm={ 6 }>
+              <FormGroup>
+                <ControlLabel>Last Name</ControlLabel>
+                <FormControl
+                  type="text"
+                  ref="lastName"
+                  name="lastName"
+                  placeholder="Last Name"
+                />
+              </FormGroup>
+            </Col>
+          </Row>
+          <FormGroup>
+            <ControlLabel>Email Address</ControlLabel>
+            <FormControl
+              type="text"
+              ref="emailAddress"
+              name="emailAddress"
+              placeholder="Email Address"
+            />
+          </FormGroup>
+          <FormGroup>
+            <ControlLabel>Password</ControlLabel>
+            <FormControl
+              type="password"
+              ref="password"
+              name="password"
+              placeholder="Password"
+            />
+          </FormGroup>
+          <Button type="submit" bsStyle="success">Sign Up</Button>
+        </form>
+        <p>Already have an account? <Link to="/login">Log In</Link>.</p>
+      </Col>
+    </Row>);
+  }
+}
diff --git a/imports/ui/pages/index.js b/imports/ui/pages/index.js
deleted file mode 100644
index 02cb4a6..0000000
--- a/imports/ui/pages/index.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import React from 'react';
-import { Jumbotron } from 'react-bootstrap';
-
-const Index = () => (
-  <Jumbotron className="text-center">
-    <h2>Base</h2>
-    <p>A starting point for Meteor applications.</p>
-    <p><a className="btn btn-success" href="https://themeteorchef.com/base" role="button">Read the Documentation</a></p>
-    <p style={ { fontSize: '16px', color: '#aaa' } }>Currently at v4.8.0</p>
-  </Jumbotron>
-);
-
-export default Index;
diff --git a/imports/ui/pages/login.js b/imports/ui/pages/login.js
deleted file mode 100644
index 7a14d4f..0000000
--- a/imports/ui/pages/login.js
+++ /dev/null
@@ -1,46 +0,0 @@
-import React from 'react';
-import { Link } from 'react-router';
-import { Row, Col, FormGroup, ControlLabel, FormControl, Button } from 'react-bootstrap';
-import handleLogin from '../../modules/login';
-
-export default class Login extends React.Component {
-  componentDidMount() {
-    handleLogin({ component: this });
-  }
-
-  handleSubmit(event) {
-    event.preventDefault();
-  }
-
-  render() {
-    return (<Row>
-      <Col xs={ 12 } sm={ 6 } md={ 4 }>
-        <h4 className="page-header">Login</h4>
-        <form ref="login" className="login" onSubmit={ this.handleSubmit }>
-          <FormGroup>
-            <ControlLabel>Email Address</ControlLabel>
-            <FormControl
-              type="email"
-              ref="emailAddress"
-              name="emailAddress"
-              placeholder="Email Address"
-            />
-          </FormGroup>
-          <FormGroup>
-            <ControlLabel>
-              <span className="pull-left">Password</span>
-              <Link className="pull-right" to="/recover-password">Forgot Password?</Link>
-            </ControlLabel>
-            <FormControl
-              type="password"
-              ref="password"
-              name="password"
-              placeholder="Password"
-            />
-          </FormGroup>
-          <Button type="submit" bsStyle="success">Login</Button>
-        </form>
-      </Col>
-    </Row>);
-  }
-}
diff --git a/imports/ui/pages/signup.js b/imports/ui/pages/signup.js
deleted file mode 100644
index f32bdc6..0000000
--- a/imports/ui/pages/signup.js
+++ /dev/null
@@ -1,68 +0,0 @@
-import React from 'react';
-import { Link } from 'react-router';
-import { Row, Col, FormGroup, ControlLabel, FormControl, Button } from 'react-bootstrap';
-import handleSignup from '../../modules/signup';
-
-export default class Signup extends React.Component {
-  componentDidMount() {
-    handleSignup({ component: this });
-  }
-
-  handleSubmit(event) {
-    event.preventDefault();
-  }
-
-  render() {
-    return (<Row>
-      <Col xs={ 12 } sm={ 6 } md={ 4 }>
-        <h4 className="page-header">Sign Up</h4>
-        <form ref="signup" className="signup" onSubmit={ this.handleSubmit }>
-          <Row>
-            <Col xs={ 6 } sm={ 6 }>
-              <FormGroup>
-                <ControlLabel>First Name</ControlLabel>
-                <FormControl
-                  type="text"
-                  ref="firstName"
-                  name="firstName"
-                  placeholder="First Name"
-                />
-              </FormGroup>
-            </Col>
-            <Col xs={ 6 } sm={ 6 }>
-              <FormGroup>
-                <ControlLabel>Last Name</ControlLabel>
-                <FormControl
-                  type="text"
-                  ref="lastName"
-                  name="lastName"
-                  placeholder="Last Name"
-                />
-              </FormGroup>
-            </Col>
-          </Row>
-          <FormGroup>
-            <ControlLabel>Email Address</ControlLabel>
-            <FormControl
-              type="text"
-              ref="emailAddress"
-              name="emailAddress"
-              placeholder="Email Address"
-            />
-          </FormGroup>
-          <FormGroup>
-            <ControlLabel>Password</ControlLabel>
-            <FormControl
-              type="password"
-              ref="password"
-              name="password"
-              placeholder="Password"
-            />
-          </FormGroup>
-          <Button type="submit" bsStyle="success">Sign Up</Button>
-        </form>
-        <p>Already have an account? <Link to="/login">Log In</Link>.</p>
-      </Col>
-    </Row>);
-  }
-}