diff --git a/src/scss/cdb-components/_avatars.scss b/src/components/_avatars.scss
similarity index 100%
rename from src/scss/cdb-components/_avatars.scss
rename to src/components/_avatars.scss
diff --git a/src/scss/cdb-components/_boxes.scss b/src/components/_boxes.scss
similarity index 100%
rename from src/scss/cdb-components/_boxes.scss
rename to src/components/_boxes.scss
diff --git a/src/scss/cdb-components/_buttons.scss b/src/components/_buttons.scss
similarity index 100%
rename from src/scss/cdb-components/_buttons.scss
rename to src/components/_buttons.scss
diff --git a/src/scss/cdb-components/_colors.scss b/src/components/_colors.scss
similarity index 100%
rename from src/scss/cdb-components/_colors.scss
rename to src/components/_colors.scss
diff --git a/src/scss/cdb-components/_headers.scss b/src/components/_headers.scss
similarity index 100%
rename from src/scss/cdb-components/_headers.scss
rename to src/components/_headers.scss
diff --git a/src/scss/cdb-components/_layer-selector.scss b/src/components/_layer-selector.scss
similarity index 100%
rename from src/scss/cdb-components/_layer-selector.scss
rename to src/components/_layer-selector.scss
diff --git a/src/scss/cdb-components/_lists.scss b/src/components/_lists.scss
similarity index 100%
rename from src/scss/cdb-components/_lists.scss
rename to src/components/_lists.scss
diff --git a/src/scss/cdb-components/_loader.scss b/src/components/_loader.scss
similarity index 100%
rename from src/scss/cdb-components/_loader.scss
rename to src/components/_loader.scss
diff --git a/src/scss/cdb-components/_menu.scss b/src/components/_menu.scss
similarity index 100%
rename from src/scss/cdb-components/_menu.scss
rename to src/components/_menu.scss
diff --git a/src/scss/cdb-components/_tags.scss b/src/components/_tags.scss
similarity index 100%
rename from src/scss/cdb-components/_tags.scss
rename to src/components/_tags.scss
diff --git a/src/scss/cdb-components/_tooltips.scss b/src/components/_tooltips.scss
similarity index 100%
rename from src/scss/cdb-components/_tooltips.scss
rename to src/components/_tooltips.scss
diff --git a/src/scss/cdb-components/_typography.scss b/src/components/_typography.scss
similarity index 100%
rename from src/scss/cdb-components/_typography.scss
rename to src/components/_typography.scss
diff --git a/src/scss/cdb-components/forms/_checkbox.scss b/src/components/forms/_checkbox.scss
similarity index 100%
rename from src/scss/cdb-components/forms/_checkbox.scss
rename to src/components/forms/_checkbox.scss
diff --git a/src/scss/cdb-components/forms/_dropdowns.scss b/src/components/forms/_dropdowns.scss
similarity index 100%
rename from src/scss/cdb-components/forms/_dropdowns.scss
rename to src/components/forms/_dropdowns.scss
diff --git a/src/scss/cdb-components/forms/_inputs.scss b/src/components/forms/_inputs.scss
similarity index 100%
rename from src/scss/cdb-components/forms/_inputs.scss
rename to src/components/forms/_inputs.scss
diff --git a/src/scss/cdb-components/forms/_legends.scss b/src/components/forms/_legends.scss
similarity index 100%
rename from src/scss/cdb-components/forms/_legends.scss
rename to src/components/forms/_legends.scss
diff --git a/src/scss/cdb-components/forms/_option-input.scss b/src/components/forms/_option-input.scss
similarity index 100%
rename from src/scss/cdb-components/forms/_option-input.scss
rename to src/components/forms/_option-input.scss
diff --git a/src/scss/cdb-components/forms/_radio.scss b/src/components/forms/_radio.scss
similarity index 100%
rename from src/scss/cdb-components/forms/_radio.scss
rename to src/components/forms/_radio.scss
diff --git a/src/scss/cdb-components/forms/_selects.scss b/src/components/forms/_selects.scss
similarity index 100%
rename from src/scss/cdb-components/forms/_selects.scss
rename to src/components/forms/_selects.scss
diff --git a/src/scss/cdb-components/forms/_tabsForms.scss b/src/components/forms/_tabsForms.scss
similarity index 100%
rename from src/scss/cdb-components/forms/_tabsForms.scss
rename to src/components/forms/_tabsForms.scss
diff --git a/src/scss/cdb-components/forms/_textarea.scss b/src/components/forms/_textarea.scss
similarity index 100%
rename from src/scss/cdb-components/forms/_textarea.scss
rename to src/components/forms/_textarea.scss
diff --git a/src/scss/cdb-components/forms/_toggle.scss b/src/components/forms/_toggle.scss
similarity index 100%
rename from src/scss/cdb-components/forms/_toggle.scss
rename to src/components/forms/_toggle.scss
diff --git a/src/scss/cdb-components/shapes/_add.scss b/src/components/shapes/_add.scss
similarity index 100%
rename from src/scss/cdb-components/shapes/_add.scss
rename to src/components/shapes/_add.scss
diff --git a/src/scss/cdb-components/shapes/_arrow.scss b/src/components/shapes/_arrow.scss
similarity index 100%
rename from src/scss/cdb-components/shapes/_arrow.scss
rename to src/components/shapes/_arrow.scss
diff --git a/src/scss/cdb-components/shapes/_check-circle.scss b/src/components/shapes/_check-circle.scss
similarity index 100%
rename from src/scss/cdb-components/shapes/_check-circle.scss
rename to src/components/shapes/_check-circle.scss
diff --git a/src/scss/cdb-components/shapes/_close.scss b/src/components/shapes/_close.scss
similarity index 100%
rename from src/scss/cdb-components/shapes/_close.scss
rename to src/components/shapes/_close.scss
diff --git a/src/scss/cdb-components/shapes/_dash.scss b/src/components/shapes/_dash.scss
similarity index 100%
rename from src/scss/cdb-components/shapes/_dash.scss
rename to src/components/shapes/_dash.scss
diff --git a/src/scss/cdb-components/shapes/_dataset.scss b/src/components/shapes/_dataset.scss
similarity index 100%
rename from src/scss/cdb-components/shapes/_dataset.scss
rename to src/components/shapes/_dataset.scss
diff --git a/src/scss/cdb-components/shapes/_dots.scss b/src/components/shapes/_dots.scss
similarity index 100%
rename from src/scss/cdb-components/shapes/_dots.scss
rename to src/components/shapes/_dots.scss
diff --git a/src/scss/cdb-components/shapes/_error-circle.scss b/src/components/shapes/_error-circle.scss
similarity index 100%
rename from src/scss/cdb-components/shapes/_error-circle.scss
rename to src/components/shapes/_error-circle.scss
diff --git a/src/scss/cdb-components/shapes/_hamburguer.scss b/src/components/shapes/_hamburguer.scss
similarity index 100%
rename from src/scss/cdb-components/shapes/_hamburguer.scss
rename to src/components/shapes/_hamburguer.scss
diff --git a/src/scss/cdb-components/shapes/_magnify.scss b/src/components/shapes/_magnify.scss
similarity index 100%
rename from src/scss/cdb-components/shapes/_magnify.scss
rename to src/components/shapes/_magnify.scss
diff --git a/src/scss/cdb-components/shapes/_move.scss b/src/components/shapes/_move.scss
similarity index 100%
rename from src/scss/cdb-components/shapes/_move.scss
rename to src/components/shapes/_move.scss
diff --git a/src/scss/cdb-components/shapes/_paragraph.scss b/src/components/shapes/_paragraph.scss
similarity index 100%
rename from src/scss/cdb-components/shapes/_paragraph.scss
rename to src/components/shapes/_paragraph.scss
diff --git a/src/scss/cdb-components/shapes/_threePoints.scss b/src/components/shapes/_threePoints.scss
similarity index 100%
rename from src/scss/cdb-components/shapes/_threePoints.scss
rename to src/components/shapes/_threePoints.scss
diff --git a/src/scss/cdb-components/shapes/_toogle-arrow.scss b/src/components/shapes/_toogle-arrow.scss
similarity index 100%
rename from src/scss/cdb-components/shapes/_toogle-arrow.scss
rename to src/components/shapes/_toogle-arrow.scss
diff --git a/src/scss/cdb-components/shapes/_type.scss b/src/components/shapes/_type.scss
similarity index 100%
rename from src/scss/cdb-components/shapes/_type.scss
rename to src/components/shapes/_type.scss
diff --git a/src/entry.css b/src/entry.css
new file mode 100644
index 0000000..4d16617
--- /dev/null
+++ b/src/entry.css
@@ -0,0 +1,51 @@
+@import 'variables/sizes';
+@import 'variables/colors';
+@import 'utilities/mixins';
+
+@import 'vendor/reset';
+@import 'vendor/normalize';
+@import 'utilities/defaults';
+@import 'utilities/fonts';
+@import 'utilities/helpers';
+
+@import 'vendor/perfect-scrollbar/main';
+
+@import 'components/forms/checkbox';
+@import 'components/forms/dropdowns';
+@import 'components/forms/inputs';
+@import 'components/forms/legends';
+@import 'components/forms/option-input';
+@import 'components/forms/radio';
+@import 'components/forms/selects';
+@import 'components/forms/tabsForms';
+@import 'components/forms/textarea';
+@import 'components/forms/toggle';
+
+@import 'components/shapes/add';
+@import 'components/shapes/arrow';
+@import 'components/shapes/check-circle';
+@import 'components/shapes/close';
+@import 'components/shapes/dash';
+@import 'components/shapes/dataset';
+@import 'components/shapes/dots';
+@import 'components/shapes/error-circle';
+@import 'components/shapes/hamburguer';
+@import 'components/shapes/magnify';
+@import 'components/shapes/move';
+@import 'components/shapes/paragraph';
+@import 'components/shapes/threePoints';
+@import 'components/shapes/toogle-arrow';
+@import 'components/shapes/type';
+
+@import 'components/avatars';
+@import 'components/boxes';
+@import 'components/buttons';
+@import 'components/colors';
+@import 'components/headers';
+@import 'components/lists';
+@import 'components/loader';
+@import 'components/menu';
+@import 'components/tags';
+@import 'components/tooltips';
+@import 'components/typography';
+@import 'components/layer-selector';
diff --git a/src/scss/entry.scss b/src/scss/entry.scss
deleted file mode 100644
index 5906598..0000000
--- a/src/scss/entry.scss
+++ /dev/null
@@ -1,55 +0,0 @@
-// Entry point for all CartoAssets
-// ----------------------------------------------
-
-// Variables and functions
-@import 'cdb-variables/sizes';
-@import 'cdb-variables/colors';
-@import 'cdb-utilities/mixins';
-
-@import 'cdb-utilities/vendor/reset';
-@import 'cdb-utilities/vendor/normalize';
-@import 'cdb-utilities/defaults';
-@import 'cdb-utilities/fonts';
-@import 'cdb-utilities/helpers';
-
-@import 'vendor/perfect-scrollbar/main';
-
-@import 'cdb-components/forms/checkbox';
-@import 'cdb-components/forms/dropdowns';
-@import 'cdb-components/forms/inputs';
-@import 'cdb-components/forms/legends';
-@import 'cdb-components/forms/option-input';
-@import 'cdb-components/forms/radio';
-@import 'cdb-components/forms/selects';
-@import 'cdb-components/forms/tabsForms';
-@import 'cdb-components/forms/textarea';
-@import 'cdb-components/forms/toggle';
-
-@import 'cdb-components/shapes/add';
-@import 'cdb-components/shapes/arrow';
-@import 'cdb-components/shapes/check-circle';
-@import 'cdb-components/shapes/close';
-@import 'cdb-components/shapes/dash';
-@import 'cdb-components/shapes/dataset';
-@import 'cdb-components/shapes/dots';
-@import 'cdb-components/shapes/error-circle';
-@import 'cdb-components/shapes/hamburguer';
-@import 'cdb-components/shapes/magnify';
-@import 'cdb-components/shapes/move';
-@import 'cdb-components/shapes/paragraph';
-@import 'cdb-components/shapes/threePoints';
-@import 'cdb-components/shapes/toogle-arrow';
-@import 'cdb-components/shapes/type';
-
-@import 'cdb-components/avatars';
-@import 'cdb-components/boxes';
-@import 'cdb-components/buttons';
-@import 'cdb-components/colors';
-@import 'cdb-components/headers';
-@import 'cdb-components/lists';
-@import 'cdb-components/loader';
-@import 'cdb-components/menu';
-@import 'cdb-components/tags';
-@import 'cdb-components/tooltips';
-@import 'cdb-components/typography';
-@import 'cdb-components/layer-selector';
diff --git a/src/scss/cdb-utilities/_defaults.scss b/src/utilities/_defaults.scss
similarity index 100%
rename from src/scss/cdb-utilities/_defaults.scss
rename to src/utilities/_defaults.scss
diff --git a/src/scss/cdb-utilities/_fonts.scss b/src/utilities/_fonts.scss
similarity index 99%
rename from src/scss/cdb-utilities/_fonts.scss
rename to src/utilities/_fonts.scss
index 8c8bf83..8013dc9 100644
--- a/src/scss/cdb-utilities/_fonts.scss
+++ b/src/utilities/_fonts.scss
@@ -10,6 +10,7 @@
   url('../fonts/OpenSans-Light.woff') format('woff'),
   url('../fonts/OpenSans-Light.ttf') format('truetype');
 }
+
 @font-face {
   font-family: 'Open Sans';
   font-style: normal;
@@ -19,6 +20,7 @@
   url('../fonts/OpenSans-Regular.woff') format('woff'),
   url('../fonts/OpenSans-Regular.ttf') format('truetype');
 }
+
 @font-face {
   font-family: 'Open Sans';
   font-style: normal;
diff --git a/src/scss/cdb-utilities/_helpers.scss b/src/utilities/_helpers.scss
similarity index 100%
rename from src/scss/cdb-utilities/_helpers.scss
rename to src/utilities/_helpers.scss
diff --git a/src/scss/cdb-utilities/_mixins.scss b/src/utilities/_mixins.scss
similarity index 100%
rename from src/scss/cdb-utilities/_mixins.scss
rename to src/utilities/_mixins.scss
diff --git a/src/scss/cdb-variables/_colors.scss b/src/variables/_colors.scss
similarity index 100%
rename from src/scss/cdb-variables/_colors.scss
rename to src/variables/_colors.scss
diff --git a/src/scss/cdb-variables/_sizes.scss b/src/variables/_sizes.scss
similarity index 100%
rename from src/scss/cdb-variables/_sizes.scss
rename to src/variables/_sizes.scss
diff --git a/src/scss/cdb-utilities/vendor/_normalize.scss b/src/vendor/_normalize.scss
similarity index 100%
rename from src/scss/cdb-utilities/vendor/_normalize.scss
rename to src/vendor/_normalize.scss
diff --git a/src/scss/cdb-utilities/vendor/_reset.scss b/src/vendor/_reset.scss
similarity index 100%
rename from src/scss/cdb-utilities/vendor/_reset.scss
rename to src/vendor/_reset.scss
diff --git a/src/scss/vendor/perfect-scrollbar/_main.scss b/src/vendor/perfect-scrollbar/_main.scss
similarity index 100%
rename from src/scss/vendor/perfect-scrollbar/_main.scss
rename to src/vendor/perfect-scrollbar/_main.scss
diff --git a/src/scss/vendor/perfect-scrollbar/_mixins.scss b/src/vendor/perfect-scrollbar/_mixins.scss
similarity index 100%
rename from src/scss/vendor/perfect-scrollbar/_mixins.scss
rename to src/vendor/perfect-scrollbar/_mixins.scss
diff --git a/src/scss/vendor/perfect-scrollbar/_themes.scss b/src/vendor/perfect-scrollbar/_themes.scss
similarity index 100%
rename from src/scss/vendor/perfect-scrollbar/_themes.scss
rename to src/vendor/perfect-scrollbar/_themes.scss
diff --git a/src/scss/vendor/perfect-scrollbar/_variables.scss b/src/vendor/perfect-scrollbar/_variables.scss
similarity index 100%
rename from src/scss/vendor/perfect-scrollbar/_variables.scss
rename to src/vendor/perfect-scrollbar/_variables.scss