diff --git a/src/components/_code.scss b/src/content/_code.scss
similarity index 100%
rename from src/components/_code.scss
rename to src/content/_code.scss
diff --git a/src/components/_fonts.scss b/src/content/_fonts.scss
similarity index 100%
rename from src/components/_fonts.scss
rename to src/content/_fonts.scss
diff --git a/src/components/_images.scss b/src/content/_images.scss
similarity index 100%
rename from src/components/_images.scss
rename to src/content/_images.scss
diff --git a/src/components/_lists.scss b/src/content/_lists.scss
similarity index 100%
rename from src/components/_lists.scss
rename to src/content/_lists.scss
diff --git a/src/components/_tables.scss b/src/content/_tables.scss
similarity index 100%
rename from src/components/_tables.scss
rename to src/content/_tables.scss
diff --git a/src/components/_config.scss b/src/core/_config.scss
similarity index 100%
rename from src/components/_config.scss
rename to src/core/_config.scss
diff --git a/src/components/_reset.scss b/src/core/_reset.scss
similarity index 100%
rename from src/components/_reset.scss
rename to src/core/_reset.scss
diff --git a/src/components/_container.scss b/src/layout/_container.scss
similarity index 100%
rename from src/components/_container.scss
rename to src/layout/_container.scss
diff --git a/src/components/_flexbox.scss b/src/layout/_flexbox.scss
similarity index 100%
rename from src/components/_flexbox.scss
rename to src/layout/_flexbox.scss
diff --git a/src/styles.scss b/src/styles.scss
index 686dc5c..8724749 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -1,32 +1,36 @@
 @charset 'UTF-8';
 
-/* Variables & Mixins */
-@import 'components/config';
+/* PaperCSS core */
+@import 'core/config';
+@import 'core/reset';
 
-/* normalize.css v7.0.0 & box reset */
-@import 'components/reset';
+/* Layout styling */
+@import 'layout/container';
+@import 'layout/flexbox';
+
+/* Content styling */
+@import 'content/code';
+@import 'content/fonts';
+@import 'content/images';
+@import 'content/lists';
+@import 'content/tables';
+
+/* Utilities */
+@import 'utilities/borders';
+@import 'utilities/shadows';
 
 /* Components */
-@import 'components/flexbox';
-@import 'components/borders';
-@import 'components/fonts';
-@import 'components/shadows';
-@import 'components/forms';
-@import 'components/container';
-@import 'components/buttons';
-@import 'components/lists';
-@import 'components/code';
-@import 'components/tables';
-@import 'components/images';
-@import 'components/utilities';
-@import 'components/popovers';
-@import 'components/cards';
-@import 'components/badges';
 @import 'components/alerts';
-@import 'components/tabs';
 @import 'components/article';
+@import 'components/badges';
+@import 'components/buttons';
+@import 'components/cards';
+@import 'components/forms';
 @import 'components/modals';
+@import 'components/popovers';
+@import 'components/tabs';
+@import 'components/utilities';
 
 // @media print {
-//  @import 'components/print';
+//  @import 'layout/print';
 // }
diff --git a/src/components/_borders.scss b/src/utilities/_borders.scss
similarity index 100%
rename from src/components/_borders.scss
rename to src/utilities/_borders.scss
diff --git a/src/components/_shadows.scss b/src/utilities/_shadows.scss
similarity index 100%
rename from src/components/_shadows.scss
rename to src/utilities/_shadows.scss