diff --git a/app/components/Dashboard.js b/app/components/Dashboard.js
deleted file mode 100644
index 7cc0a77055d6233190d9f781e1bbd510f719fba7..0000000000000000000000000000000000000000
--- a/app/components/Dashboard.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import React from 'react'
-
-const Dashboard = () => <div>Dashboard Dummy Page</div>
-
-export default Dashboard
diff --git a/app/components/Submit.js b/app/components/Submit.js
deleted file mode 100644
index 45b65228a545e720fd80dd95a4fa98fae16ae35b..0000000000000000000000000000000000000000
--- a/app/components/Submit.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import React from 'react'
-
-const Submit = () => <div>Submit Dummy Page</div>
-
-export default Submit
diff --git a/app/components/Submit.md b/app/components/Submit.md
deleted file mode 100644
index 5ca689a428df47ff205ecd0fd9d69035f03bc51a..0000000000000000000000000000000000000000
--- a/app/components/Submit.md
+++ /dev/null
@@ -1,5 +0,0 @@
-## Submit/Submission component
-
-TODO this needs to be implemented/imports need to be fixed if it will be in own directory
-
-This should provide a submission form for manuscripts.
diff --git a/app/components/App.js b/app/components/app/App.js
similarity index 100%
rename from app/components/App.js
rename to app/components/app/App.js
diff --git a/app/components/App.md b/app/components/app/App.md
similarity index 100%
rename from app/components/App.md
rename to app/components/app/App.md
diff --git a/app/components/dashboard/Dashboard.js b/app/components/dashboard/Dashboard.js
new file mode 100644
index 0000000000000000000000000000000000000000..95cf998782c218987bdcbf5c1620b4aad803de58
--- /dev/null
+++ b/app/components/dashboard/Dashboard.js
@@ -0,0 +1,11 @@
+import React from 'react'
+import { Link } from 'react-router-dom'
+
+const Dashboard = () => (
+  <div>
+    <h1>Dashboard Dummy Page</h1>
+    <Link to="/submit">Submit a manuscript</Link>
+  </div>
+)
+
+export default Dashboard
diff --git a/app/components/Dashboard.md b/app/components/dashboard/Dashboard.md
similarity index 100%
rename from app/components/Dashboard.md
rename to app/components/dashboard/Dashboard.md
diff --git a/app/components/index.js b/app/components/index.js
index da3076d79e0fbdd6e749cbc27adf3023a3921b41..5f010fcf8ae0d73eb36c76b5a61e5b847c7b23b2 100644
--- a/app/components/index.js
+++ b/app/components/index.js
@@ -1,4 +1,4 @@
-export { default as App } from './App'
-export { default as Dashboard } from './Dashboard'
-export { default as Login } from './Login'
-export { default as Submit } from './Submit'
+export { default as App } from './app/App'
+export { default as Dashboard } from './dashboard/Dashboard'
+export { default as Login } from './login/Login'
+export { default as Submission } from './submission/Submission'
diff --git a/app/components/Login.js b/app/components/login/Login.js
similarity index 100%
rename from app/components/Login.js
rename to app/components/login/Login.js
diff --git a/app/components/Login.md b/app/components/login/Login.md
similarity index 100%
rename from app/components/Login.md
rename to app/components/login/Login.md
diff --git a/app/components/submission/Submission.js b/app/components/submission/Submission.js
new file mode 100644
index 0000000000000000000000000000000000000000..9c86c2a897ca456e364aba3224b0d5eaa45ccfe9
--- /dev/null
+++ b/app/components/submission/Submission.js
@@ -0,0 +1,5 @@
+import React from 'react'
+
+const Submission = () => <div>Submission Dummy Page</div>
+
+export default Submission
diff --git a/app/components/submission/Submission.md b/app/components/submission/Submission.md
new file mode 100644
index 0000000000000000000000000000000000000000..5cc7db5dacacaa246fa2a84e3372d545d7350f40
--- /dev/null
+++ b/app/components/submission/Submission.md
@@ -0,0 +1,3 @@
+## Submission component
+
+This should provide a submission form for manuscripts.
diff --git a/app/routes.js b/app/routes.js
index d76a4a109800280d61bbfecd019dd6b569c1cdad..e4d49842feb3475324a90fe9e24e16382155dca9 100644
--- a/app/routes.js
+++ b/app/routes.js
@@ -1,7 +1,7 @@
 import React from 'react'
 import { Route, Switch } from 'react-router-dom'
 
-import { App, Dashboard, Submit, Login } from './components'
+import { App, Dashboard, Submission, Login } from './components'
 
 /*
  * TODO: implement login/signup and wrap Component in AuthenticatedComponent:
@@ -17,7 +17,7 @@ const Routes = () => (
   <App>
     <Switch>
       <Route component={Login} exact path="/login" />
-      <PrivateRoute component={Submit} exact path="/submit" />
+      <PrivateRoute component={Submission} exact path="/submit" />
       <PrivateRoute component={Dashboard} path="/" />
     </Switch>
   </App>