diff --git a/src/components/Icon/Icon.js b/src/components/Icon.js
similarity index 100%
rename from src/components/Icon/Icon.js
rename to src/components/Icon.js
diff --git a/src/components/Icon/index.js b/src/components/Icon/index.js
deleted file mode 100644
index dd4586c..0000000
--- a/src/components/Icon/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import Icon from "./Icon"
-export default Icon
diff --git a/src/components/Layout/Layout.js b/src/components/Layout.js
similarity index 100%
rename from src/components/Layout/Layout.js
rename to src/components/Layout.js
diff --git a/src/components/Layout/index.js b/src/components/Layout/index.js
deleted file mode 100644
index f62de70..0000000
--- a/src/components/Layout/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import Layout from "./Layout"
-export default Layout
diff --git a/src/components/Logo/index.js b/src/components/Logo.js
similarity index 100%
rename from src/components/Logo/index.js
rename to src/components/Logo.js
diff --git a/src/components/Navbar/Navbar.js b/src/components/Navbar.js
similarity index 96%
rename from src/components/Navbar/Navbar.js
rename to src/components/Navbar.js
index b471670..c4692e5 100644
--- a/src/components/Navbar/Navbar.js
+++ b/src/components/Navbar.js
@@ -10,9 +10,9 @@ import { withTheme } from "emotion-theming"
 import { SIZES } from "styles/constants"
 import { todayUrl, yearUrl } from "utils/date"
 
-import Logo from "../Logo"
-import Icon from "../Icon"
-import { withAuthentication } from "../session"
+import Logo from "components/Logo"
+import Icon from "components/Icon"
+import { withAuthentication } from "components/session"
 
 const Header = styled.div`
   background-color: ${props => props.theme.colors.headerBackground};
diff --git a/src/components/Navbar/index.js b/src/components/Navbar/index.js
deleted file mode 100644
index ed07819..0000000
--- a/src/components/Navbar/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Navbar, { SimpleNavbar } from "./Navbar"
-export default Navbar
-export { SimpleNavbar }
diff --git a/src/components/PrivateRoute/PrivateRoute.js b/src/components/PrivateRoute.js
similarity index 100%
rename from src/components/PrivateRoute/PrivateRoute.js
rename to src/components/PrivateRoute.js
diff --git a/src/components/PrivateRoute/index.js b/src/components/PrivateRoute/index.js
deleted file mode 100644
index 345d794..0000000
--- a/src/components/PrivateRoute/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import PrivateRoute from "./PrivateRoute"
-export default PrivateRoute
diff --git a/src/components/Seek/Seek.js b/src/components/Seek.js
similarity index 90%
rename from src/components/Seek/Seek.js
rename to src/components/Seek.js
index f24ccb5..4575b52 100644
--- a/src/components/Seek/Seek.js
+++ b/src/components/Seek.js
@@ -2,9 +2,9 @@ import React from "react"
 import styled from "@emotion/styled"
 import { withTheme } from "emotion-theming"
 
-import Icon from "../Icon"
-import { H1 } from "../elements"
-import { StyledLink as Link } from "../elements"
+import Icon from "components/Icon"
+import { H1 } from "components/elements"
+import { StyledLink as Link } from "components/elements"
 
 const SeekHeader = styled.header`
   display: flex;
diff --git a/src/components/Seek/index.js b/src/components/Seek/index.js
deleted file mode 100644
index 232bb19..0000000
--- a/src/components/Seek/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import Seek from "./Seek"
-export default Seek
diff --git a/src/components/SignOut/SignOut.js b/src/components/SignOut.js
similarity index 100%
rename from src/components/SignOut/SignOut.js
rename to src/components/SignOut.js
diff --git a/src/components/SignOut/index.js b/src/components/SignOut/index.js
deleted file mode 100644
index 2a2e47b..0000000
--- a/src/components/SignOut/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import SignOut from "./SignOut"
-export default SignOut
diff --git a/src/components/elements/elements.js b/src/components/elements.js
similarity index 100%
rename from src/components/elements/elements.js
rename to src/components/elements.js
diff --git a/src/components/elements/index.js b/src/components/elements/index.js
deleted file mode 100644
index 9fb7d02..0000000
--- a/src/components/elements/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./elements"