diff --git a/src/fonts/cartoIcon.eot b/src/fonts/cartoIcon.eot
index 3e1ec5a..c199ab9 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 3c43b13..a894c41 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 96e544f..b6857c0 100644
Binary files a/src/fonts/cartoIcon.woff and b/src/fonts/cartoIcon.woff differ
diff --git a/src/scss/components/colors.scss b/src/scss/cdb-components/colors.scss
similarity index 98%
rename from src/scss/components/colors.scss
rename to src/scss/cdb-components/colors.scss
index 53cdbda..1fac96d 100644
--- a/src/scss/components/colors.scss
+++ b/src/scss/cdb-components/colors.scss
@@ -15,7 +15,7 @@
 ``` 
 */
 
-@import '../variables/colors';
+@import '../cdb-variables/colors';
 
 .box {
   width: 120px;
diff --git a/src/scss/components/loader.scss b/src/scss/cdb-components/loader.scss
similarity index 95%
rename from src/scss/components/loader.scss
rename to src/scss/cdb-components/loader.scss
index 7f0aeba..e812aff 100644
--- a/src/scss/components/loader.scss
+++ b/src/scss/cdb-components/loader.scss
@@ -12,7 +12,7 @@ There is only one state 'is-visible', in order to make it visible.
 ```
 */
 
-@import '../utilities/mixins';
+@import '../cdb-utilities/mixins';
 
 .CDB-Loader {
   @include css3-prefix(animation, loader-progress 1000ms linear 1);
diff --git a/src/scss/components/shapes.scss b/src/scss/cdb-components/shapes.scss
similarity index 99%
rename from src/scss/components/shapes.scss
rename to src/scss/cdb-components/shapes.scss
index dd89e0d..2e3fc51 100644
--- a/src/scss/components/shapes.scss
+++ b/src/scss/cdb-components/shapes.scss
@@ -12,7 +12,7 @@ You may resize and change the colors of the icons with the `glyph-`-classes. Ava
 ```
 */
 
-@import '../utilities/mixins';
+@import '../cdb-utilities/mixins';
 
 .CDB-Shape-dot {
   display: inline-block;
diff --git a/src/scss/components/typography.scss b/src/scss/cdb-components/typography.scss
similarity index 96%
rename from src/scss/components/typography.scss
rename to src/scss/cdb-components/typography.scss
index c44facf..3d65171 100644
--- a/src/scss/components/typography.scss
+++ b/src/scss/cdb-components/typography.scss
@@ -14,7 +14,7 @@
 ```
 */
 
-@import '../variables/sizes';
+@import '../cdb-variables/sizes';
 
 .Text {
   font-family: 'Open Sans';
diff --git a/src/scss/utilities/_mixins.scss b/src/scss/cdb-utilities/_mixins.scss
similarity index 100%
rename from src/scss/utilities/_mixins.scss
rename to src/scss/cdb-utilities/_mixins.scss
diff --git a/src/scss/utilities/fonts.scss b/src/scss/cdb-utilities/fonts.scss
similarity index 100%
rename from src/scss/utilities/fonts.scss
rename to src/scss/cdb-utilities/fonts.scss
diff --git a/src/scss/utilities/helpers.scss b/src/scss/cdb-utilities/helpers.scss
similarity index 100%
rename from src/scss/utilities/helpers.scss
rename to src/scss/cdb-utilities/helpers.scss
diff --git a/src/scss/utilities/normalize.scss b/src/scss/cdb-utilities/normalize.scss
similarity index 100%
rename from src/scss/utilities/normalize.scss
rename to src/scss/cdb-utilities/normalize.scss
diff --git a/src/scss/variables/_colors.scss b/src/scss/cdb-variables/_colors.scss
similarity index 100%
rename from src/scss/variables/_colors.scss
rename to src/scss/cdb-variables/_colors.scss
diff --git a/src/scss/variables/_sizes.scss b/src/scss/cdb-variables/_sizes.scss
similarity index 100%
rename from src/scss/variables/_sizes.scss
rename to src/scss/cdb-variables/_sizes.scss