diff --git a/Gulpfile.js b/Gulpfile.js
index 5fc6b5d..1af492a 100644
--- a/Gulpfile.js
+++ b/Gulpfile.js
@@ -15,7 +15,7 @@ gulp.task('default', function(){
   .pipe(iconfontCss({
     fontName: 'cartoIcon',
     path: './icon-font/template.jst.ejs',
-    targetPath: '../scss/cdb-icon-font.scss',
+    targetPath: '../scss/_cdb-icon-font.scss',
     fontPath: '../../fonts/'
   }))
 
diff --git a/src/fonts/cartoIcon.eot b/src/fonts/cartoIcon.eot
index 23f6877..a11e456 100644
Binary files a/src/fonts/cartoIcon.eot and b/src/fonts/cartoIcon.eot differ
diff --git a/src/fonts/cartoIcon.ttf b/src/fonts/cartoIcon.ttf
index 178f160..ac15ce5 100644
Binary files a/src/fonts/cartoIcon.ttf and b/src/fonts/cartoIcon.ttf differ
diff --git a/src/fonts/cartoIcon.woff b/src/fonts/cartoIcon.woff
index 1e22f26..26924bc 100644
Binary files a/src/fonts/cartoIcon.woff and b/src/fonts/cartoIcon.woff differ
diff --git a/src/scss/cdb-icon-font.scss b/src/scss/_cdb-icon-font.scss
similarity index 100%
rename from src/scss/cdb-icon-font.scss
rename to src/scss/_cdb-icon-font.scss
diff --git a/src/scss/cdb-components/avatars.scss b/src/scss/cdb-components/_avatars.scss
similarity index 100%
rename from src/scss/cdb-components/avatars.scss
rename to src/scss/cdb-components/_avatars.scss
diff --git a/src/scss/cdb-components/boxes.scss b/src/scss/cdb-components/_boxes.scss
similarity index 100%
rename from src/scss/cdb-components/boxes.scss
rename to src/scss/cdb-components/_boxes.scss
diff --git a/src/scss/cdb-components/buttons.scss b/src/scss/cdb-components/_buttons.scss
similarity index 100%
rename from src/scss/cdb-components/buttons.scss
rename to src/scss/cdb-components/_buttons.scss
diff --git a/src/scss/cdb-components/colors.scss b/src/scss/cdb-components/_colors.scss
similarity index 100%
rename from src/scss/cdb-components/colors.scss
rename to src/scss/cdb-components/_colors.scss
diff --git a/src/scss/cdb-components/headers.scss b/src/scss/cdb-components/_headers.scss
similarity index 100%
rename from src/scss/cdb-components/headers.scss
rename to src/scss/cdb-components/_headers.scss
diff --git a/src/scss/cdb-components/lists.scss b/src/scss/cdb-components/_lists.scss
similarity index 100%
rename from src/scss/cdb-components/lists.scss
rename to src/scss/cdb-components/_lists.scss
diff --git a/src/scss/cdb-components/loader.scss b/src/scss/cdb-components/_loader.scss
similarity index 100%
rename from src/scss/cdb-components/loader.scss
rename to src/scss/cdb-components/_loader.scss
diff --git a/src/scss/cdb-components/menu.scss b/src/scss/cdb-components/_menu.scss
similarity index 100%
rename from src/scss/cdb-components/menu.scss
rename to src/scss/cdb-components/_menu.scss
diff --git a/src/scss/cdb-components/tags.scss b/src/scss/cdb-components/_tags.scss
similarity index 100%
rename from src/scss/cdb-components/tags.scss
rename to src/scss/cdb-components/_tags.scss
diff --git a/src/scss/cdb-components/tooltips.scss b/src/scss/cdb-components/_tooltips.scss
similarity index 100%
rename from src/scss/cdb-components/tooltips.scss
rename to src/scss/cdb-components/_tooltips.scss
diff --git a/src/scss/cdb-components/typography.scss b/src/scss/cdb-components/_typography.scss
similarity index 100%
rename from src/scss/cdb-components/typography.scss
rename to src/scss/cdb-components/_typography.scss
diff --git a/src/scss/cdb-components/forms/checkbox.scss b/src/scss/cdb-components/forms/_checkbox.scss
similarity index 100%
rename from src/scss/cdb-components/forms/checkbox.scss
rename to src/scss/cdb-components/forms/_checkbox.scss
diff --git a/src/scss/cdb-components/forms/dropdowns.scss b/src/scss/cdb-components/forms/_dropdowns.scss
similarity index 100%
rename from src/scss/cdb-components/forms/dropdowns.scss
rename to src/scss/cdb-components/forms/_dropdowns.scss
diff --git a/src/scss/cdb-components/forms/inputs.scss b/src/scss/cdb-components/forms/_inputs.scss
similarity index 100%
rename from src/scss/cdb-components/forms/inputs.scss
rename to src/scss/cdb-components/forms/_inputs.scss
diff --git a/src/scss/cdb-components/forms/legends.scss b/src/scss/cdb-components/forms/_legends.scss
similarity index 100%
rename from src/scss/cdb-components/forms/legends.scss
rename to src/scss/cdb-components/forms/_legends.scss
diff --git a/src/scss/cdb-components/forms/option-input.scss b/src/scss/cdb-components/forms/_option-input.scss
similarity index 100%
rename from src/scss/cdb-components/forms/option-input.scss
rename to src/scss/cdb-components/forms/_option-input.scss
diff --git a/src/scss/cdb-components/forms/radio.scss b/src/scss/cdb-components/forms/_radio.scss
similarity index 100%
rename from src/scss/cdb-components/forms/radio.scss
rename to src/scss/cdb-components/forms/_radio.scss
diff --git a/src/scss/cdb-components/forms/selects.scss b/src/scss/cdb-components/forms/_selects.scss
similarity index 100%
rename from src/scss/cdb-components/forms/selects.scss
rename to src/scss/cdb-components/forms/_selects.scss
diff --git a/src/scss/cdb-components/forms/tabsForms.scss b/src/scss/cdb-components/forms/_tabsForms.scss
similarity index 100%
rename from src/scss/cdb-components/forms/tabsForms.scss
rename to src/scss/cdb-components/forms/_tabsForms.scss
diff --git a/src/scss/cdb-components/forms/textarea.scss b/src/scss/cdb-components/forms/_textarea.scss
similarity index 100%
rename from src/scss/cdb-components/forms/textarea.scss
rename to src/scss/cdb-components/forms/_textarea.scss
diff --git a/src/scss/cdb-components/forms/toggle.scss b/src/scss/cdb-components/forms/_toggle.scss
similarity index 100%
rename from src/scss/cdb-components/forms/toggle.scss
rename to src/scss/cdb-components/forms/_toggle.scss
diff --git a/src/scss/cdb-components/shapes/add.scss b/src/scss/cdb-components/shapes/_add.scss
similarity index 100%
rename from src/scss/cdb-components/shapes/add.scss
rename to src/scss/cdb-components/shapes/_add.scss
diff --git a/src/scss/cdb-components/shapes/arrow.scss b/src/scss/cdb-components/shapes/_arrow.scss
similarity index 100%
rename from src/scss/cdb-components/shapes/arrow.scss
rename to src/scss/cdb-components/shapes/_arrow.scss
diff --git a/src/scss/cdb-components/shapes/check-circle.scss b/src/scss/cdb-components/shapes/_check-circle.scss
similarity index 100%
rename from src/scss/cdb-components/shapes/check-circle.scss
rename to src/scss/cdb-components/shapes/_check-circle.scss
diff --git a/src/scss/cdb-components/shapes/close.scss b/src/scss/cdb-components/shapes/_close.scss
similarity index 100%
rename from src/scss/cdb-components/shapes/close.scss
rename to src/scss/cdb-components/shapes/_close.scss
diff --git a/src/scss/cdb-components/shapes/dash.scss b/src/scss/cdb-components/shapes/_dash.scss
similarity index 100%
rename from src/scss/cdb-components/shapes/dash.scss
rename to src/scss/cdb-components/shapes/_dash.scss
diff --git a/src/scss/cdb-components/shapes/dataset.scss b/src/scss/cdb-components/shapes/_dataset.scss
similarity index 100%
rename from src/scss/cdb-components/shapes/dataset.scss
rename to src/scss/cdb-components/shapes/_dataset.scss
diff --git a/src/scss/cdb-components/shapes/dots.scss b/src/scss/cdb-components/shapes/_dots.scss
similarity index 100%
rename from src/scss/cdb-components/shapes/dots.scss
rename to src/scss/cdb-components/shapes/_dots.scss
diff --git a/src/scss/cdb-components/shapes/error-circle.scss b/src/scss/cdb-components/shapes/_error-circle.scss
similarity index 100%
rename from src/scss/cdb-components/shapes/error-circle.scss
rename to src/scss/cdb-components/shapes/_error-circle.scss
diff --git a/src/scss/cdb-components/shapes/hamburguer.scss b/src/scss/cdb-components/shapes/_hamburguer.scss
similarity index 100%
rename from src/scss/cdb-components/shapes/hamburguer.scss
rename to src/scss/cdb-components/shapes/_hamburguer.scss
diff --git a/src/scss/cdb-components/shapes/magnify.scss b/src/scss/cdb-components/shapes/_magnify.scss
similarity index 100%
rename from src/scss/cdb-components/shapes/magnify.scss
rename to src/scss/cdb-components/shapes/_magnify.scss
diff --git a/src/scss/cdb-components/shapes/move.scss b/src/scss/cdb-components/shapes/_move.scss
similarity index 100%
rename from src/scss/cdb-components/shapes/move.scss
rename to src/scss/cdb-components/shapes/_move.scss
diff --git a/src/scss/cdb-components/shapes/paragraph.scss b/src/scss/cdb-components/shapes/_paragraph.scss
similarity index 100%
rename from src/scss/cdb-components/shapes/paragraph.scss
rename to src/scss/cdb-components/shapes/_paragraph.scss
diff --git a/src/scss/cdb-components/shapes/threePoints.scss b/src/scss/cdb-components/shapes/_threePoints.scss
similarity index 100%
rename from src/scss/cdb-components/shapes/threePoints.scss
rename to src/scss/cdb-components/shapes/_threePoints.scss
diff --git a/src/scss/cdb-components/shapes/toogle-arrow.scss b/src/scss/cdb-components/shapes/_toogle-arrow.scss
similarity index 100%
rename from src/scss/cdb-components/shapes/toogle-arrow.scss
rename to src/scss/cdb-components/shapes/_toogle-arrow.scss
diff --git a/src/scss/cdb-components/shapes/type.scss b/src/scss/cdb-components/shapes/_type.scss
similarity index 100%
rename from src/scss/cdb-components/shapes/type.scss
rename to src/scss/cdb-components/shapes/_type.scss
diff --git a/src/scss/cdb-utilities/defaults.scss b/src/scss/cdb-utilities/_defaults.scss
similarity index 100%
rename from src/scss/cdb-utilities/defaults.scss
rename to src/scss/cdb-utilities/_defaults.scss
diff --git a/src/scss/cdb-utilities/fonts.scss b/src/scss/cdb-utilities/_fonts.scss
similarity index 100%
rename from src/scss/cdb-utilities/fonts.scss
rename to src/scss/cdb-utilities/_fonts.scss
diff --git a/src/scss/cdb-utilities/helpers.scss b/src/scss/cdb-utilities/_helpers.scss
similarity index 100%
rename from src/scss/cdb-utilities/helpers.scss
rename to src/scss/cdb-utilities/_helpers.scss
diff --git a/src/scss/cdb-utilities/vendor/normalize.scss b/src/scss/cdb-utilities/vendor/_normalize.scss
similarity index 100%
rename from src/scss/cdb-utilities/vendor/normalize.scss
rename to src/scss/cdb-utilities/vendor/_normalize.scss
diff --git a/src/scss/cdb-utilities/vendor/reset.scss b/src/scss/cdb-utilities/vendor/_reset.scss
similarity index 100%
rename from src/scss/cdb-utilities/vendor/reset.scss
rename to src/scss/cdb-utilities/vendor/_reset.scss