diff --git a/src/pages/Dashboard/index.tsx b/src/pages/Dashboard/index.tsx
index b593b65..175edb8 100644
--- a/src/pages/Dashboard/index.tsx
+++ b/src/pages/Dashboard/index.tsx
@@ -12,7 +12,6 @@ import Header from '../../components/Header';
 import Dev from '../../models/Dev';
 import User from '../../models/User';
 import Experience from '../../types/Experience';
-import {getTimePeriod} from '../../types/TimePeriod';
 import Education from '../../types/Education';
 import DashboardExperienceSection from './ExperienceSection';
 import DashboardEducationSection from './EducationSection';
diff --git a/src/components/DevProfile.tsx b/src/pages/Developers/Profile.tsx
similarity index 90%
rename from src/components/DevProfile.tsx
rename to src/pages/Developers/Profile.tsx
index 7006c06..bb82693 100644
--- a/src/components/DevProfile.tsx
+++ b/src/pages/Developers/Profile.tsx
@@ -5,8 +5,8 @@ import {Link} from 'react-router-dom';
 import {FontAwesomeIcon} from '@fortawesome/react-fontawesome';
 import {faCheck} from '@fortawesome/free-solid-svg-icons';
 // Typing
-import {DevSummary, getDescription} from '../models/Dev';
-import Routes from '../constants/routes';
+import {DevSummary, getDescription} from '../../models/Dev';
+import Routes from '../../constants/routes';
 
 /**
  * Present a dev profile succintly. Redirect to dev profile on click.
diff --git a/src/pages/Developers.tsx b/src/pages/Developers/index.tsx
similarity index 69%
rename from src/pages/Developers.tsx
rename to src/pages/Developers/index.tsx
index 2706821..b967d01 100644
--- a/src/pages/Developers.tsx
+++ b/src/pages/Developers/index.tsx
@@ -3,15 +3,19 @@ import React, {FC} from 'react';
 import {compose} from 'redux';
 import {connect} from 'react-redux';
 import {firestoreConnect} from 'react-redux-firebase';
-import {RootState} from '../store';
+import {RootState} from '../../store';
 // Style
-import Header from '../components/Header';
-import DevProfile from '../components/DevProfile';
-import {DevSummary} from '../models/Dev';
+import DevProfile from './Profile';
+import Header from '../../components/Header';
+
+import {DevSummary} from '../../models/Dev';
+
+import Collections from '../../constants/collections';
 
 interface IProps {
   developers: DevSummary[];
 }
+
 /**
  * Developers list page
  */
@@ -31,8 +35,8 @@ const Developers: FC<IProps> = ({developers}) => (
 );
 
 export default compose<FC>(
-  firestoreConnect(() => ['users']), // or { collection: 'users' }
-  connect((state: RootState, props) => ({
+  firestoreConnect(() => [Collections.USERS]),
+  connect((state: RootState) => ({
     developers: state.firestore.ordered.users,
   })),
 )(Developers);