diff --git a/package.json b/package.json
index c9990ff0..86f91e8b 100644
--- a/package.json
+++ b/package.json
@@ -54,8 +54,8 @@
     "postcss-scss": "^4.0.6",
     "postcss-sort-media-queries": "^5.2.0",
     "prettier": "^2.2.1",
-    "sass": "^1.80.6",
-    "sass-loader": "^16.0.3",
+    "sass": "^1.85.1",
+    "sass-loader": "^16.0.5",
     "sharp": "^0.32.1",
     "style-loader": "^2.0.0",
     "stylelint": "^14.13.0",
diff --git a/src/scss/01-abstract/_variables.scss b/src/scss/01-abstract/_variables.scss
index ad8d857f..c60d48ec 100644
--- a/src/scss/01-abstract/_variables.scss
+++ b/src/scss/01-abstract/_variables.scss
@@ -1,7 +1,7 @@
 @use "sass:map";
 @use "sass:math";
 
-$entry-file-name: "style";
+$entry-file-name: "undefined";
 
 /**
  * Variables
diff --git a/src/scss/01-abstract/abstract.scss b/src/scss/01-abstract/abstract.scss
deleted file mode 100644
index b78920fe..00000000
--- a/src/scss/01-abstract/abstract.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-@use "constants";
-@use "variables";
diff --git a/src/scss/02-tools/_f-get-svg-url.scss b/src/scss/02-tools/_f-get-svg-url.scss
index 5d996762..0fb4a41d 100644
--- a/src/scss/02-tools/_f-get-svg-url.scss
+++ b/src/scss/02-tools/_f-get-svg-url.scss
@@ -1,7 +1,6 @@
+@use "../01-abstract/variables";
 @use "sass:color";
 @use "sass:list";
-@use "../01-abstract/variables";
-
 @use "sass:map";
 
 /**
diff --git a/src/scss/02-tools/tools.scss b/src/scss/02-tools/tools.scss
deleted file mode 100644
index 20a3afcf..00000000
--- a/src/scss/02-tools/tools.scss
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * Abstract folder entry file
- */
-
-@use "f-assign-inputs";
-@use "f-column";
-@use "f-context-align";
-@use "f-context-selector";
-@use "f-easings";
-@use "f-em";
-@use "f-get-gutter-width";
-@use "f-get-svg-url";
-@use "f-strip-units";
-@use "f-fluid-size";
-@use "m-align";
-@use "m-autofill";
-@use "m-breakpoint";
-@use "m-btn";
-@use "m-checkbox-custom";
-@use "m-container";
-@use "m-container-query";
-@use "m-declare-font-face";
-@use "m-editor-only";
-@use "m-heading";
-@use "m-hover";
-@use "m-line-clamp";
-@use "m-placeholder-media";
-@use "m-radio-custom";
-@use "m-row-fullwidth";
-@use "m-scrollbar";
-@use "m-select-custom";
-@use "m-sr-only";
-@use "m-style-only";
-@use "m-reduced-motion";
-@use "m-bg-fullwidth";
-@use "m-block-vertical-spacing";
-@use "m-background-static";
-@use "m-not-acf";
-@use "m-rtl";
-@use "m-text";
-@use "m-text-icon";
diff --git a/src/scss/03-base/base.scss b/src/scss/03-base/base.scss
deleted file mode 100644
index bad2f584..00000000
--- a/src/scss/03-base/base.scss
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * Base folder entry file
- */
-
-@use "fonts";
-@use "variables-css";
-@use "normalize";
-@use "body";
-@use "svg-icons";
-@use "forms";
-@use "links";
-@use "media";
-@use "text";
-@use "print";
diff --git a/src/scss/04-utilities/utilities.scss b/src/scss/04-utilities/utilities.scss
deleted file mode 100644
index e17147b9..00000000
--- a/src/scss/04-utilities/utilities.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-@use "wp-admin-bar";
-@use "focus";
-@use "lazyload";
-@use "seo";
-@use "video-wrapper";
-@use "palette";
-@use "container";
-@use "sr-only";
-@use "js-animation";
-@use "aria";
diff --git a/src/scss/05-components/components.scss b/src/scss/05-components/components.scss
deleted file mode 100644
index 469c635e..00000000
--- a/src/scss/05-components/components.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * Elements folder entry file
- */
-
-@use "btn";
-@use "searchform";
-@use "skip-links";
diff --git a/src/scss/06-blocks/blocks.scss b/src/scss/06-blocks/blocks.scss
deleted file mode 100644
index 58eb15f7..00000000
--- a/src/scss/06-blocks/blocks.scss
+++ /dev/null
@@ -1,28 +0,0 @@
-// Blocks
-// - These styles replace key Gutenberg Block styles with font, color, and
-//   spacing with CSS-variables overrides
-// - In the future the Block styles may get compiled to individual .css
-//   files and conditionally loaded
-
-@use "core/audio";
-@use "core/buttons";
-@use "core/code";
-@use "core/columns";
-@use "core/cover";
-@use "core/file";
-@use "core/freeform";
-@use "core/gallery";
-@use "core/group";
-@use "core/heading";
-@use "core/image";
-@use "core/list";
-@use "core/media-text";
-@use "core/paragraph";
-@use "core/preformatted";
-@use "core/pullquote";
-@use "core/quote";
-@use "core/separator";
-@use "core/search";
-@use "core/spacer";
-@use "core/table";
-@use "core/video";
diff --git a/src/scss/07-patterns/.gitkeep b/src/scss/07-patterns/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/src/scss/07-patterns/patterns.scss b/src/scss/07-patterns/patterns.scss
deleted file mode 100644
index 9eafdfcb..00000000
--- a/src/scss/07-patterns/patterns.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-// @import "./my-pattern";
-
diff --git a/src/scss/08-template-parts/template-parts.scss b/src/scss/08-template-parts/template-parts.scss
deleted file mode 100644
index 46bf5015..00000000
--- a/src/scss/08-template-parts/template-parts.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-@use "header";
-@use "footer";
-@use "hero";
diff --git a/src/scss/09-templates/templates.scss b/src/scss/09-templates/templates.scss
deleted file mode 100644
index 175baf0e..00000000
--- a/src/scss/09-templates/templates.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-// @use "404";
-@use "home";
-@use "default";
diff --git a/src/scss/10-vendor/.gitkeep b/src/scss/10-vendor/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/src/scss/10-vendor/vendor.scss b/src/scss/10-vendor/vendor.scss
deleted file mode 100644
index 09080ae9..00000000
--- a/src/scss/10-vendor/vendor.scss
+++ /dev/null
@@ -1 +0,0 @@
-// @import vendor styles here
diff --git a/src/scss/editor.scss b/src/scss/editor.scss
index 7e631a66..9de3104e 100644
--- a/src/scss/editor.scss
+++ b/src/scss/editor.scss
@@ -1,18 +1,12 @@
-$entry-file-name: "editor";
-
 /**
  * Abstract
  * == Contain SCSS and CSS variables and webfonts declarations.
  */
 
-@use "01-abstract/abstract";
-
-/**
- * Tools
- * == Contains functions and mixins.
- */
+@use "01-abstract/constants";
+@use "01-abstract/variables";
 
-@use "02-tools/tools";
+variables.$entry-file-name: "editor";
 
 /**
  * Base
@@ -30,7 +24,16 @@ $entry-file-name: "editor";
  * == Utility classes that are not assigned to a specific component.
  */
 
-@use "04-utilities/utilities";
+@use "04-utilities/wp-admin-bar";
+@use "04-utilities/focus";
+@use "04-utilities/lazyload";
+@use "04-utilities/seo";
+@use "04-utilities/video-wrapper";
+@use "04-utilities/palette";
+@use "04-utilities/container";
+@use "04-utilities/sr-only";
+@use "04-utilities/js-animation";
+@use "04-utilities/aria";
 
 /**
  * Blocks
@@ -45,18 +48,39 @@ $entry-file-name: "editor";
  */
 
 @use "06-blocks/gutenberg";
-@use "06-blocks/blocks";
+@use "06-blocks/core/audio";
+@use "06-blocks/core/buttons";
+@use "06-blocks/core/code";
+@use "06-blocks/core/columns";
+@use "06-blocks/core/cover";
+@use "06-blocks/core/file";
+@use "06-blocks/core/freeform";
+@use "06-blocks/core/gallery";
+@use "06-blocks/core/group";
+@use "06-blocks/core/heading";
+@use "06-blocks/core/image";
+@use "06-blocks/core/list";
+@use "06-blocks/core/media-text";
+@use "06-blocks/core/paragraph";
+@use "06-blocks/core/preformatted";
+@use "06-blocks/core/pullquote";
+@use "06-blocks/core/quote";
+@use "06-blocks/core/separator";
+@use "06-blocks/core/search";
+@use "06-blocks/core/spacer";
+@use "06-blocks/core/table";
+@use "06-blocks/core/video";
 
 /**
  * Patterns
  * == Contains styles for gutenberg patterns.
  */
 
-@use "07-patterns/patterns";
+// @use "07-patterns/...";
 
 /**
  * Vendor
  * == Plugins or libraries custom styles.
  */
 
-@use "10-vendor/vendor";
+// @use "10-vendor/...";
diff --git a/src/scss/style.scss b/src/scss/style.scss
index b9d60030..4ee6e41e 100644
--- a/src/scss/style.scss
+++ b/src/scss/style.scss
@@ -3,35 +3,51 @@
  * == Contain SCSS and CSS variables and webfonts declarations.
  */
 
-@use "01-abstract/abstract";
+@use "01-abstract/constants";
+@use "01-abstract/variables";
 
-/**
- * Tools
- * == Contains functions and mixins.
- */
-
-@use "02-tools/tools";
+variables.$entry-file-name: "style";
 
 /**
  * Base
  * == Contain generic styles such as normalize or reset.
  */
 
-@use "03-base/base";
+@use "03-base/fonts";
+@use "03-base/variables-css";
+@use "03-base/normalize";
+@use "03-base/body";
+@use "03-base/svg-icons";
+@use "03-base/forms";
+@use "03-base/links";
+@use "03-base/media";
+@use "03-base/text";
+@use "03-base/print";
 
 /**
  * Utilities
  * == Utility classes that are not assigned to a specific component.
  */
 
-@use "04-utilities/utilities";
+@use "04-utilities/wp-admin-bar";
+@use "04-utilities/focus";
+@use "04-utilities/lazyload";
+@use "04-utilities/seo";
+@use "04-utilities/video-wrapper";
+@use "04-utilities/palette";
+@use "04-utilities/container";
+@use "04-utilities/sr-only";
+@use "04-utilities/js-animation";
+@use "04-utilities/aria";
 
 /**
  * Components
  * == Contain any default component. Just give the components some basic styles.
  */
 
-@use "05-components/components";
+@use "05-components/btn";
+@use "05-components/searchform";
+@use "05-components/skip-links";
 
 /**
  * Gutenberg
@@ -39,32 +55,56 @@
  */
 
 @use "06-blocks/gutenberg";
-@use "06-blocks/blocks";
+@use "06-blocks/core/audio";
+@use "06-blocks/core/buttons";
+@use "06-blocks/core/code";
+@use "06-blocks/core/columns";
+@use "06-blocks/core/cover";
+@use "06-blocks/core/file";
+@use "06-blocks/core/freeform";
+@use "06-blocks/core/gallery";
+@use "06-blocks/core/group";
+@use "06-blocks/core/heading";
+@use "06-blocks/core/image";
+@use "06-blocks/core/list";
+@use "06-blocks/core/media-text";
+@use "06-blocks/core/paragraph";
+@use "06-blocks/core/preformatted";
+@use "06-blocks/core/pullquote";
+@use "06-blocks/core/quote";
+@use "06-blocks/core/separator";
+@use "06-blocks/core/search";
+@use "06-blocks/core/spacer";
+@use "06-blocks/core/table";
+@use "06-blocks/core/video";
 
 /**
  * Patterns
  * == Contains styles for gutenberg patterns.
  */
 
-@use "07-patterns/patterns";
+// @use "07-patterns/...";
 
 /**
  * Template parts
  * == If you want to add custom styles for specific page templates parts.
  */
 
-@use "08-template-parts/template-parts";
+@use "08-template-parts/header";
+@use "08-template-parts/footer";
+@use "08-template-parts/hero";
 
 /**
  * Pages
  * == If you want to add custom styles for specific page templates.
  */
 
-@use "09-templates/templates";
+@use "09-templates/home";
+@use "09-templates/default";
 
 /**
  * Vendor
  * == Plugins or libraries custom styles.
  */
 
-@use "10-vendor/vendor";
+// @use "10-vendor/...";
diff --git a/yarn.lock b/yarn.lock
index 2adb8257..62a7d7a3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2150,8 +2150,8 @@ __metadata:
     postcss-scss: ^4.0.6
     postcss-sort-media-queries: ^5.2.0
     prettier: ^2.2.1
-    sass: ^1.80.6
-    sass-loader: ^16.0.3
+    sass: ^1.85.1
+    sass-loader: ^16.0.5
     sharp: ^0.32.1
     style-loader: ^2.0.0
     stylelint: ^14.13.0
@@ -5874,10 +5874,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"immutable@npm:^4.0.0":
-  version: 4.3.6
-  resolution: "immutable@npm:4.3.6"
-  checksum: 3afd020be988ec9ba42c1e585b88858970beba91332ac04ac11446722c7e5da03d5956f5049806573d29dfee25f69262297cb7f3bd6b16fc83a175a0176c6c2a
+"immutable@npm:^5.0.2":
+  version: 5.0.3
+  resolution: "immutable@npm:5.0.3"
+  checksum: b2fcfc75aff29634babfcf6afb102111d7bc3858bfc55c17c5ad5eedf11085fe8b72d59fac883c6cfe9b2ec6e72cc184dec88782d5375ab17dc4eb25e3a665ed
   languageName: node
   linkType: hard
 
@@ -9863,9 +9863,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sass-loader@npm:^16.0.3":
-  version: 16.0.3
-  resolution: "sass-loader@npm:16.0.3"
+"sass-loader@npm:^16.0.5":
+  version: 16.0.5
+  resolution: "sass-loader@npm:16.0.5"
   dependencies:
     neo-async: ^2.6.2
   peerDependencies:
@@ -9885,24 +9885,24 @@ __metadata:
       optional: true
     webpack:
       optional: true
-  checksum: 888b2fbe4e1455778ecb9fde77d9803fc5b7c01137740512f701acb1716830a9d8290cf664734f8472455353fa09a919c693a6d2c42c4d21c1fdc77a2a06db52
+  checksum: ede9659200011e4dea51de16446a45f11e570bbca66be6cd94dc0b2b73ab17dcdc88dde3247a1869d94a5793c2d1bc07650bada15103e3351eef13a70f2b1f07
   languageName: node
   linkType: hard
 
-"sass@npm:^1.80.6":
-  version: 1.80.6
-  resolution: "sass@npm:1.80.6"
+"sass@npm:^1.85.1":
+  version: 1.85.1
+  resolution: "sass@npm:1.85.1"
   dependencies:
     "@parcel/watcher": ^2.4.1
     chokidar: ^4.0.0
-    immutable: ^4.0.0
+    immutable: ^5.0.2
     source-map-js: ">=0.6.2 <2.0.0"
   dependenciesMeta:
     "@parcel/watcher":
       optional: true
   bin:
     sass: sass.js
-  checksum: 1a81e0fe093ff9109228b5dc1ea2ad64d3fb0e266d968e664a52aca059dd448fbe9a90d9a5a7518e5f31fd1087149ea349bf6fe1271ab15075b7a145c1bea0c9
+  checksum: e38fa3992c99aa0270cc7577c9b38f576907a11ea01571d8e4ff2cb11b00606b33f650344d21082aba1c9ef6588ca088a5b84f82a8f8c32f9865c3159161ab89
   languageName: node
   linkType: hard