diff --git a/assets/sass/pages/_blog-post.sass b/assets/sass/components/_about-author.sass
similarity index 57%
rename from assets/sass/pages/_blog-post.sass
rename to assets/sass/components/_about-author.sass
index c196d2cc..1c6eeeef 100644
--- a/assets/sass/pages/_blog-post.sass
+++ b/assets/sass/components/_about-author.sass
@@ -5,10 +5,3 @@
         float: left
         margin: 0 1em 1em 0
         width: 50px
-
-.post-pager
-    clear: both
-    margin-top: 2em
-
-.post-pager div
-    flex: 1
diff --git a/assets/sass/pages/_blog-list.sass b/assets/sass/components/_blog-list.sass
similarity index 100%
rename from assets/sass/pages/_blog-list.sass
rename to assets/sass/components/_blog-list.sass
diff --git a/assets/sass/pages/_about.sass b/assets/sass/components/_page-about.sass
similarity index 100%
rename from assets/sass/pages/_about.sass
rename to assets/sass/components/_page-about.sass
diff --git a/assets/sass/pages/_experience.sass b/assets/sass/components/_page-experience.sass
similarity index 100%
rename from assets/sass/pages/_experience.sass
rename to assets/sass/components/_page-experience.sass
diff --git a/assets/sass/components/_page-post.sass b/assets/sass/components/_page-post.sass
new file mode 100644
index 00000000..02aed99e
--- /dev/null
+++ b/assets/sass/components/_page-post.sass
@@ -0,0 +1,10 @@
+.post-pager
+    clear: both
+    margin-top: 2em
+
+.post-pager div
+    flex: 1
+
+code[data-gist-id]
+    background: transparent
+    padding: 0
diff --git a/assets/sass/components/content-types/_talk.sass b/assets/sass/components/_page-talk.sass
similarity index 100%
rename from assets/sass/components/content-types/_talk.sass
rename to assets/sass/components/_page-talk.sass
diff --git a/assets/sass/pages/_projects.sass b/assets/sass/components/_project-company.sass
similarity index 100%
rename from assets/sass/pages/_projects.sass
rename to assets/sass/components/_project-company.sass
diff --git a/assets/sass/components/content-types/_blog-post.sass b/assets/sass/components/content-types/_blog-post.sass
deleted file mode 100644
index 01f5586b..00000000
--- a/assets/sass/components/content-types/_blog-post.sass
+++ /dev/null
@@ -1,3 +0,0 @@
-code[data-gist-id]
-    background: transparent
-    padding: 0
diff --git a/assets/sass/pages/_talk.sass b/assets/sass/pages/_talk.sass
deleted file mode 100644
index 49f0fd44..00000000
--- a/assets/sass/pages/_talk.sass
+++ /dev/null
@@ -1,20 +0,0 @@
-.talk-location,
-.talk-slides,
-.talk-video,
-.talk-description
-    margin-bottom: 2em
-
-.talk-pager
-    clear: both
-    margin: 2em 0 .5em
-
-.talk-pager div
-    flex: 1
-
-.talk-logo
-    float: right
-    margin: 0 0 2em 2em
-
-.talk-logo img
-    max-height: 100px
-    max-width: 200px
diff --git a/assets/sass/site.sass b/assets/sass/site.sass
index 52b8c5fb..ad5f732d 100644
--- a/assets/sass/site.sass
+++ b/assets/sass/site.sass
@@ -7,17 +7,15 @@
 @import 'base/typography'
 @import 'base/code'
 
+@import 'components/about-author'
 @import 'components/availability'
 @import 'components/badges'
-@import 'components/content-types/blog-post'
-@import 'components/content-types/talk'
+@import 'components/blog-list'
 @import 'components/footer'
 @import 'components/meetups'
+@import 'components/page-about'
+@import 'components/page-post'
+@import 'components/page-experience'
+@import 'components/page-talk'
+@import 'components/project-company'
 @import 'components/testimonials'
-
-@import 'pages/about'
-@import 'pages/blog-list'
-@import 'pages/blog-post'
-@import 'pages/experience'
-@import 'pages/projects'
-@import 'pages/talk'