diff --git a/gulpfile.js b/gulpfile.js
index fb31258..de89165 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -27,7 +27,7 @@ gulp.task('css', function () {
 });
 
 gulp.task('grillade', function() {
-  return gulp.src('./sass/components/grillade.scss')
+  return gulp.src('./sass/components/_grillade.scss')
     .pipe(gulp.dest('./css/'))
     .pipe(sass())
     .pipe(autoprefixer({ grid: true }))
@@ -36,7 +36,7 @@ gulp.task('grillade', function() {
 });
 
 gulp.task('grillade-v6', function() {
-  return gulp.src('./sass/components/grillade-v6.scss')
+  return gulp.src('./sass/components/_grillade-v6.scss')
     .pipe(gulp.dest('./css/'))
     .pipe(sass())
     .pipe(autoprefixer())
diff --git a/sass/components/alerts.scss b/sass/components/_alerts.scss
similarity index 100%
rename from sass/components/alerts.scss
rename to sass/components/_alerts.scss
diff --git a/sass/components/arrows.scss b/sass/components/_arrows.scss
similarity index 100%
rename from sass/components/arrows.scss
rename to sass/components/_arrows.scss
diff --git a/sass/components/autogrid.scss b/sass/components/_autogrid.scss
similarity index 100%
rename from sass/components/autogrid.scss
rename to sass/components/_autogrid.scss
diff --git a/sass/components/badges.scss b/sass/components/_badges.scss
similarity index 100%
rename from sass/components/badges.scss
rename to sass/components/_badges.scss
diff --git a/sass/components/buttons.scss b/sass/components/_buttons.scss
similarity index 100%
rename from sass/components/buttons.scss
rename to sass/components/_buttons.scss
diff --git a/sass/components/checkbox.scss b/sass/components/_checkbox.scss
similarity index 100%
rename from sass/components/checkbox.scss
rename to sass/components/_checkbox.scss
diff --git a/sass/components/forms.scss b/sass/components/_forms.scss
similarity index 100%
rename from sass/components/forms.scss
rename to sass/components/_forms.scss
diff --git a/sass/components/grillade-v6.scss b/sass/components/_grillade-v6.scss
similarity index 100%
rename from sass/components/grillade-v6.scss
rename to sass/components/_grillade-v6.scss
diff --git a/sass/components/grillade.scss b/sass/components/_grillade.scss
similarity index 100%
rename from sass/components/grillade.scss
rename to sass/components/_grillade.scss
diff --git a/sass/components/media.scss b/sass/components/_media.scss
similarity index 100%
rename from sass/components/media.scss
rename to sass/components/_media.scss
diff --git a/sass/components/radio.scss b/sass/components/_radio.scss
similarity index 100%
rename from sass/components/radio.scss
rename to sass/components/_radio.scss
diff --git a/sass/components/skip-links.scss b/sass/components/_skip-links.scss
similarity index 100%
rename from sass/components/skip-links.scss
rename to sass/components/_skip-links.scss
diff --git a/sass/components/tables.scss b/sass/components/_tables.scss
similarity index 100%
rename from sass/components/tables.scss
rename to sass/components/_tables.scss
diff --git a/sass/components/tabs.scss b/sass/components/_tabs.scss
similarity index 100%
rename from sass/components/tabs.scss
rename to sass/components/_tabs.scss
diff --git a/sass/knacss.scss b/sass/knacss.scss
index 85c893e..d31b7f5 100644
--- a/sass/knacss.scss
+++ b/sass/knacss.scss
@@ -50,21 +50,21 @@
 // @import "_library/_wordpress.scss"; // WordPress reset and basic styles
 
 // Components
-@import "components/media.scss"; // media object
-@import "components/autogrid.scss"; // media autogrid
-@import "components/skip-links.scss"; // skip links
-@import "components/tables.scss"; // data tables consistency
-@import "components/forms.scss"; // forms consistency and styles
-@import "components/buttons.scss"; // buttons styles
-@import "components/checkbox.scss"; // checkbox styles
-@import "components/radio.scss"; // radio styles
-@import "components/tabs.scss"; // tabs styles
-@import "components/arrows.scss"; // arrows styles
-@import "components/badges.scss"; // badges styles
-@import "components/alerts.scss"; // alerts styles
+@import "components/_media.scss"; // media object
+@import "components/_autogrid.scss"; // media autogrid
+@import "components/_skip-links.scss"; // skip links
+@import "components/_tables.scss"; // data tables consistency
+@import "components/_forms.scss"; // forms consistency and styles
+@import "components/_buttons.scss"; // buttons styles
+@import "components/_checkbox.scss"; // checkbox styles
+@import "components/_radio.scss"; // radio styles
+@import "components/_tabs.scss"; // tabs styles
+@import "components/_arrows.scss"; // arrows styles
+@import "components/_badges.scss"; // badges styles
+@import "components/_alerts.scss"; // alerts styles
 
-// New Grid System by default (Grid Layout). If you prefer old "Flexbox" Grid System, replace file with "components/grillade-v6.scss"
-@import "components/grillade.scss"; // grid system
+// New Grid System by default (Grid Layout). If you prefer old "Flexbox" Grid System, replace file with "components/_grillade-v6.scss"
+@import "components/_grillade.scss"; // grid system