diff --git a/scss/CrispyBoilerplate.scss b/scss/CrispyBoilerplate.scss
index e0f6283..7044c21 100644
--- a/scss/CrispyBoilerplate.scss
+++ b/scss/CrispyBoilerplate.scss
@@ -2,7 +2,7 @@
     '../../node_modules/normalize.css/normalize.css'
 
     'functions/units',
-    'functions/z-index',
+    'functions/zIndex',
 
     'mixins/clearfix',
     'mixins/fontSize',
diff --git a/scss/components/body.scss b/scss/components/_body.scss
similarity index 100%
rename from scss/components/body.scss
rename to scss/components/_body.scss
diff --git a/scss/components/button.scss b/scss/components/_button.scss
similarity index 100%
rename from scss/components/button.scss
rename to scss/components/_button.scss
diff --git a/scss/components/heading.scss b/scss/components/_heading.scss
similarity index 100%
rename from scss/components/heading.scss
rename to scss/components/_heading.scss
diff --git a/scss/components/icon.scss b/scss/components/_icon.scss
similarity index 100%
rename from scss/components/icon.scss
rename to scss/components/_icon.scss
diff --git a/scss/components/list.scss b/scss/components/_list.scss
similarity index 100%
rename from scss/components/list.scss
rename to scss/components/_list.scss
diff --git a/scss/components/normalize.scss b/scss/components/_normalize.scss
similarity index 100%
rename from scss/components/normalize.scss
rename to scss/components/_normalize.scss
diff --git a/scss/example.scss b/scss/example.scss
index 41c43e4..28217e4 100644
--- a/scss/example.scss
+++ b/scss/example.scss
@@ -3,6 +3,14 @@
 
 @include cripsy-boilerplate-normalize();
 @include cripsy-boilerplate-body();
-@include crispy-boilerplate-heading();
+
+@include crispy-boilerplate-heading() {
+    text-decoration: underline;
+};
+
 @include cripsy-boilerplate-icon();
 @include cripsy-boilerplate-list();
+
+.clearfix {
+    @include crispy-boilerplate-clearfix();
+}
diff --git a/scss/functions/units.scss b/scss/functions/_units.scss
similarity index 100%
rename from scss/functions/units.scss
rename to scss/functions/_units.scss
diff --git a/scss/functions/z-index.scss b/scss/functions/_zIndex.scss
similarity index 100%
rename from scss/functions/z-index.scss
rename to scss/functions/_zIndex.scss
diff --git a/scss/mixins/clearfix.scss b/scss/mixins/_clearfix.scss
similarity index 82%
rename from scss/mixins/clearfix.scss
rename to scss/mixins/_clearfix.scss
index bf1317e..27cb363 100644
--- a/scss/mixins/clearfix.scss
+++ b/scss/mixins/_clearfix.scss
@@ -6,7 +6,7 @@
  *
  */
 
-@mixin clearfix() {
+@mixin crispy-boilerplate-clearfix() {
     &::before,
     &::after {
         display: table;
diff --git a/scss/mixins/fontSize.scss b/scss/mixins/_fontSize.scss
similarity index 100%
rename from scss/mixins/fontSize.scss
rename to scss/mixins/_fontSize.scss