diff --git a/source/_layouts/default.html.twig b/source/_layouts/default.html.twig
index bba1d775..37dbc915 100644
--- a/source/_layouts/default.html.twig
+++ b/source/_layouts/default.html.twig
@@ -68,8 +68,8 @@
                 {% block sidebar_wrapper %}
                     <div class="col-md-3">
                         {% block sidebar %}
-                            <div class="panel panel--badges">
-                                <a class="panel--badges--badge__da-member" href="https://assoc.drupal.org/membership" title="I’m a Drupal Association member.">
+                            <div class="panel badges">
+                                <a class="badges__badge--da-member" href="https://assoc.drupal.org/membership" title="I’m a Drupal Association member.">
                                     <img src="{{ site.images_url }}/assets/images/da-individual-member.png" alt="Drupal Association Individual Member">
                                 </a>
 
diff --git a/source/experience.html.twig b/source/experience.html.twig
index 47000e18..c2de38e3 100644
--- a/source/experience.html.twig
+++ b/source/experience.html.twig
@@ -91,7 +91,7 @@ experiences:
                 {% endif %}
 
                 {% if company.logo %}
-                    <img class="experience--logo" src="{{ site.images_url }}/assets/images/experience/{{ company.logo }}" alt="{{ company.title }} logo">
+                    <img class="experience__logo" src="{{ site.images_url }}/assets/images/experience/{{ company.logo }}" alt="{{ company.title }} logo">
                 {% endif %}
 
                 <div class="role-wrapper">
diff --git a/styles/_badges.scss b/styles/components/_badges.scss
similarity index 93%
rename from styles/_badges.scss
rename to styles/components/_badges.scss
index 0e0b6d1e..02bbad54 100644
--- a/styles/_badges.scss
+++ b/styles/components/_badges.scss
@@ -1,4 +1,4 @@
-.panel--badges {
+.badges {
     > a {
         display: block;
         margin: 0 0 10px;
diff --git a/styles/_footer.scss b/styles/components/_footer.scss
similarity index 100%
rename from styles/_footer.scss
rename to styles/components/_footer.scss
diff --git a/styles/_meetups.scss b/styles/components/_meetups.scss
similarity index 100%
rename from styles/_meetups.scss
rename to styles/components/_meetups.scss
diff --git a/styles/_testimonials.scss b/styles/components/_testimonials.scss
similarity index 90%
rename from styles/_testimonials.scss
rename to styles/components/_testimonials.scss
index 1b06ba99..aa9aa08e 100644
--- a/styles/_testimonials.scss
+++ b/styles/components/_testimonials.scss
@@ -1,4 +1,4 @@
-.page--testimonials .testimonial {
+.testimonial {
     @include clearfix;
     margin-bottom: 10px;
 
diff --git a/styles/_blog-list.scss b/styles/pages/_blog-list.scss
similarity index 100%
rename from styles/_blog-list.scss
rename to styles/pages/_blog-list.scss
diff --git a/styles/_blog-post.scss b/styles/pages/_blog-post.scss
similarity index 100%
rename from styles/_blog-post.scss
rename to styles/pages/_blog-post.scss
diff --git a/styles/_experience.scss b/styles/pages/_experience.scss
similarity index 89%
rename from styles/_experience.scss
rename to styles/pages/_experience.scss
index 2294d681..837f2a94 100644
--- a/styles/_experience.scss
+++ b/styles/pages/_experience.scss
@@ -1,7 +1,7 @@
 .experience {
     @include clearfix;
 
-    .experience--logo {
+    .experience__logo {
         @extend .pull-right;
         margin: 0 0 10px 10px;
         max-width: 25%;
diff --git a/styles/_portfolio.scss b/styles/pages/_portfolio.scss
similarity index 100%
rename from styles/_portfolio.scss
rename to styles/pages/_portfolio.scss
diff --git a/styles/site.scss b/styles/site.scss
index bc5b7824..18a3bc3b 100644
--- a/styles/site.scss
+++ b/styles/site.scss
@@ -10,11 +10,11 @@
 @import '../vendor/bower/compass-breakpoint/stylesheets/breakpoint';
 
 @import 'base';
-@import 'badges';
-@import 'experience';
-@import 'meetups';
-@import 'footer';
-@import 'testimonials';
-@import 'blog-list';
-@import 'blog-post';
-@import 'portfolio';
+@import 'components/badges';
+@import 'components/footer';
+@import 'components/meetups';
+@import 'components/testimonials';
+@import 'pages/blog-list';
+@import 'pages/blog-post';
+@import 'pages/experience';
+@import 'pages/portfolio';