diff --git a/src/scss/_core.scss b/src/scss/_core.scss
index 71c5336..decf627 100644
--- a/src/scss/_core.scss
+++ b/src/scss/_core.scss
@@ -1,14 +1,7 @@
-*,
-*::before,
-*::after {
-  box-sizing: inherit;
-}
+/* 0. CORE
+** All the basic functions from the stylesheet
+*/
 
-html {
-  box-sizing: border-box;
-}
-
-body {
-  overflow-x: hidden;
-  text-rendering: optimizeLegibility;
-}
+@import 'core/normalize';
+@import 'core/box-sizing';
+@import 'core/typography';
diff --git a/src/scss/core/_box-sizing.scss b/src/scss/core/_box-sizing.scss
new file mode 100644
index 0000000..dbe61eb
--- /dev/null
+++ b/src/scss/core/_box-sizing.scss
@@ -0,0 +1,18 @@
+/* 0.2 - Box-sizing
+ * Make sure that everything have its box-sizing to border-box
+**/
+
+*,
+*::before,
+*::after {
+ box-sizing: inherit;
+}
+
+html {
+ box-sizing: border-box;
+}
+
+body {
+ overflow-x: hidden;
+ text-rendering: optimizeLegibility;
+}
diff --git a/src/scss/_normalize.scss b/src/scss/core/_normalize.scss
similarity index 100%
rename from src/scss/_normalize.scss
rename to src/scss/core/_normalize.scss
diff --git a/src/scss/_typography.scss b/src/scss/core/_typography.scss
similarity index 96%
rename from src/scss/_typography.scss
rename to src/scss/core/_typography.scss
index f31bdea..0d1dbaa 100644
--- a/src/scss/_typography.scss
+++ b/src/scss/core/_typography.scss
@@ -1,10 +1,7 @@
-/*
- *  2 - Typography ( _typography.scss )
- *
- *  This part of the (s)css handle everything related to the typography
- *  like paragraphs, blockquote, etc.
- *
-*/
+/* 0.3 - Typography
+ * This part of the (s)css handle everything related to the typography
+ * like paragraphs, blockquote, etc.
+**/
 
 @import 'font-face';
 
diff --git a/src/scss/style.scss b/src/scss/style.scss
index e76eb42..be3b297 100644
--- a/src/scss/style.scss
+++ b/src/scss/style.scss
@@ -19,12 +19,8 @@
 
 @import 'angled-edges';
 
-@import 'normalize';
-
 @import 'core';
 
-@import 'typography';
-
 @import 'global';
 
 @import 'drawing';