diff --git a/app/components/AppHeader.jsx b/app/components/AppHeader/AppHeader.jsx
similarity index 100%
rename from app/components/AppHeader.jsx
rename to app/components/AppHeader/AppHeader.jsx
diff --git a/app/components/NavLink.jsx b/app/components/AppHeader/NavLink.jsx
similarity index 100%
rename from app/components/NavLink.jsx
rename to app/components/AppHeader/NavLink.jsx
diff --git a/app/components/appHeader.scss b/app/components/AppHeader/appHeader.scss
similarity index 100%
rename from app/components/appHeader.scss
rename to app/components/AppHeader/appHeader.scss
diff --git a/app/components/navLink.scss b/app/components/AppHeader/navLink.scss
similarity index 100%
rename from app/components/navLink.scss
rename to app/components/AppHeader/navLink.scss
diff --git a/app/components/DashboardSidebar.jsx b/app/components/Dashboard/DashboardSidebar/DashboardSidebar.jsx
similarity index 100%
rename from app/components/DashboardSidebar.jsx
rename to app/components/Dashboard/DashboardSidebar/DashboardSidebar.jsx
diff --git a/app/components/SessionFilter.jsx b/app/components/Dashboard/DashboardSidebar/SessionFilter.jsx
similarity index 100%
rename from app/components/SessionFilter.jsx
rename to app/components/Dashboard/DashboardSidebar/SessionFilter.jsx
diff --git a/app/components/SessionFilterCheckbox.jsx b/app/components/Dashboard/DashboardSidebar/SessionFilterCheckbox.jsx
similarity index 94%
rename from app/components/SessionFilterCheckbox.jsx
rename to app/components/Dashboard/DashboardSidebar/SessionFilterCheckbox.jsx
index c7c812f..e5cce96 100644
--- a/app/components/SessionFilterCheckbox.jsx
+++ b/app/components/Dashboard/DashboardSidebar/SessionFilterCheckbox.jsx
@@ -1,6 +1,6 @@
 import React, { Component, PropTypes } from 'react';
 import Checkbox from 'material-ui/lib/checkbox';
-import SessionStatusService from '../services/SessionStatusService';
+import SessionStatusService from '../../../services/SessionStatusService';
 
 import styles from './sessionFilterCheckbox.scss';
 
diff --git a/app/components/dashboardSidebar.scss b/app/components/Dashboard/DashboardSidebar/dashboardSidebar.scss
similarity index 100%
rename from app/components/dashboardSidebar.scss
rename to app/components/Dashboard/DashboardSidebar/dashboardSidebar.scss
diff --git a/app/components/sessionFilterCheckbox.scss b/app/components/Dashboard/DashboardSidebar/sessionFilterCheckbox.scss
similarity index 100%
rename from app/components/sessionFilterCheckbox.scss
rename to app/components/Dashboard/DashboardSidebar/sessionFilterCheckbox.scss
diff --git a/app/components/SessionCard.jsx b/app/components/Dashboard/SessionList/SessionCard.jsx
similarity index 97%
rename from app/components/SessionCard.jsx
rename to app/components/Dashboard/SessionList/SessionCard.jsx
index 0fb614e..b6f0a34 100644
--- a/app/components/SessionCard.jsx
+++ b/app/components/Dashboard/SessionList/SessionCard.jsx
@@ -1,6 +1,6 @@
 import React, { Component, PropTypes } from 'react';
 import StarRating from 'react-star-rating';
-import SessionStatusService from '../services/SessionStatusService';
+import SessionStatusService from '../../../services/SessionStatusService';
 import moment from 'moment';
 
 import styles from './sessionCard.scss';
diff --git a/app/components/SessionList.jsx b/app/components/Dashboard/SessionList/SessionList.jsx
similarity index 100%
rename from app/components/SessionList.jsx
rename to app/components/Dashboard/SessionList/SessionList.jsx
diff --git a/app/components/sessionCard.scss b/app/components/Dashboard/SessionList/sessionCard.scss
similarity index 100%
rename from app/components/sessionCard.scss
rename to app/components/Dashboard/SessionList/sessionCard.scss
diff --git a/app/components/sessionList.scss b/app/components/Dashboard/SessionList/sessionList.scss
similarity index 100%
rename from app/components/sessionList.scss
rename to app/components/Dashboard/SessionList/sessionList.scss
diff --git a/app/components/CorrespondenceItem.jsx b/app/components/Session/CorrespondenceItem.jsx
similarity index 100%
rename from app/components/CorrespondenceItem.jsx
rename to app/components/Session/CorrespondenceItem.jsx
diff --git a/app/components/SessionCorrespondence.jsx b/app/components/Session/SessionCorrespondence.jsx
similarity index 100%
rename from app/components/SessionCorrespondence.jsx
rename to app/components/Session/SessionCorrespondence.jsx
diff --git a/app/components/SessionSidebar.jsx b/app/components/Session/SessionSidebar.jsx
similarity index 98%
rename from app/components/SessionSidebar.jsx
rename to app/components/Session/SessionSidebar.jsx
index f095098..ec6aee7 100644
--- a/app/components/SessionSidebar.jsx
+++ b/app/components/Session/SessionSidebar.jsx
@@ -1,5 +1,5 @@
 import React, { Component, PropTypes } from 'react';
-import SessionStatusService from '../services/SessionStatusService';
+import SessionStatusService from '../../services/SessionStatusService';
 import StarRating from 'react-star-rating';
 
 import styles from './sessionSidebar.scss';
diff --git a/app/components/correspondenceItem.scss b/app/components/Session/correspondenceItem.scss
similarity index 100%
rename from app/components/correspondenceItem.scss
rename to app/components/Session/correspondenceItem.scss
diff --git a/app/components/sessionCorrespondence.scss b/app/components/Session/sessionCorrespondence.scss
similarity index 100%
rename from app/components/sessionCorrespondence.scss
rename to app/components/Session/sessionCorrespondence.scss
diff --git a/app/components/sessionSidebar.scss b/app/components/Session/sessionSidebar.scss
similarity index 100%
rename from app/components/sessionSidebar.scss
rename to app/components/Session/sessionSidebar.scss
diff --git a/app/containers/App.jsx b/app/containers/App.jsx
index f3fa1e8..993a063 100644
--- a/app/containers/App.jsx
+++ b/app/containers/App.jsx
@@ -1,5 +1,5 @@
 import React, { Component, PropTypes } from 'react';
-import AppHeader from '../components/AppHeader.jsx';
+import AppHeader from '../components/AppHeader/AppHeader.jsx';
 import styles from './app.scss';
 
 class App extends Component {
diff --git a/app/containers/Dashboard.jsx b/app/containers/Dashboard.jsx
index 5da9abd..d58c30a 100644
--- a/app/containers/Dashboard.jsx
+++ b/app/containers/Dashboard.jsx
@@ -3,8 +3,8 @@ import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import SessionsApi from '../services/SessionsApi';
 
-import SessionList from '../components/SessionList.jsx';
-import DashboardSidebar from '../components/DashboardSidebar.jsx';
+import SessionList from '../components/Dashboard/SessionList/SessionList.jsx';
+import DashboardSidebar from '../components/Dashboard/DashboardSidebar/DashboardSidebar.jsx';
 import { getAllSessions, changeViewSettings } from '../actions';
 import styles from './dashboard.scss';
 import immutable from 'immutable';
diff --git a/app/containers/Session.jsx b/app/containers/Session.jsx
index 294d4c9..2a2c797 100644
--- a/app/containers/Session.jsx
+++ b/app/containers/Session.jsx
@@ -1,7 +1,7 @@
 import React, { Component, PropTypes } from 'react';
 import { connect } from 'react-redux';
-import SessionSidebar from '../components/SessionSidebar.jsx';
-import SessionCorrespondence from '../components/SessionCorrespondence.jsx';
+import SessionSidebar from '../components/Session/SessionSidebar.jsx';
+import SessionCorrespondence from '../components/Session/SessionCorrespondence.jsx';
 import { getSession } from '../actions';
 import styles from './session.scss';