diff --git a/css/backoffice/base/_all.scss b/css/backoffice/base/_all.scss
index b4c1152e4..f8b845434 100644
--- a/css/backoffice/base/_all.scss
+++ b/css/backoffice/base/_all.scss
@@ -17,6 +17,4 @@
  */
 
 @import "base";
-@import "typography";
-@import "components/all";
-@import "layout/all";
\ No newline at end of file
+@import "typography";
\ No newline at end of file
diff --git a/css/backoffice/base/components/_alert.scss b/css/backoffice/components/_alert.scss
similarity index 100%
rename from css/backoffice/base/components/_alert.scss
rename to css/backoffice/components/_alert.scss
diff --git a/css/backoffice/base/components/_all.scss b/css/backoffice/components/_all.scss
similarity index 100%
rename from css/backoffice/base/components/_all.scss
rename to css/backoffice/components/_all.scss
diff --git a/css/backoffice/base/components/_badge.scss b/css/backoffice/components/_badge.scss
similarity index 100%
rename from css/backoffice/base/components/_badge.scss
rename to css/backoffice/components/_badge.scss
diff --git a/css/backoffice/base/components/_breadcrumbs.scss b/css/backoffice/components/_breadcrumbs.scss
similarity index 100%
rename from css/backoffice/base/components/_breadcrumbs.scss
rename to css/backoffice/components/_breadcrumbs.scss
diff --git a/css/backoffice/base/components/_button.scss b/css/backoffice/components/_button.scss
similarity index 100%
rename from css/backoffice/base/components/_button.scss
rename to css/backoffice/components/_button.scss
diff --git a/css/backoffice/base/components/_datatable.scss b/css/backoffice/components/_datatable.scss
similarity index 100%
rename from css/backoffice/base/components/_datatable.scss
rename to css/backoffice/components/_datatable.scss
diff --git a/css/backoffice/base/components/_field.scss b/css/backoffice/components/_field.scss
similarity index 100%
rename from css/backoffice/base/components/_field.scss
rename to css/backoffice/components/_field.scss
diff --git a/css/backoffice/base/components/_fieldset.scss b/css/backoffice/components/_fieldset.scss
similarity index 100%
rename from css/backoffice/base/components/_fieldset.scss
rename to css/backoffice/components/_fieldset.scss
diff --git a/css/backoffice/base/components/_form.scss b/css/backoffice/components/_form.scss
similarity index 100%
rename from css/backoffice/base/components/_form.scss
rename to css/backoffice/components/_form.scss
diff --git a/css/backoffice/base/components/_formtable.scss b/css/backoffice/components/_formtable.scss
similarity index 100%
rename from css/backoffice/base/components/_formtable.scss
rename to css/backoffice/components/_formtable.scss
diff --git a/css/backoffice/base/components/_formtablerow.scss b/css/backoffice/components/_formtablerow.scss
similarity index 100%
rename from css/backoffice/base/components/_formtablerow.scss
rename to css/backoffice/components/_formtablerow.scss
diff --git a/css/backoffice/base/components/_global-search.scss b/css/backoffice/components/_global-search.scss
similarity index 100%
rename from css/backoffice/base/components/_global-search.scss
rename to css/backoffice/components/_global-search.scss
diff --git a/css/backoffice/base/components/_modal.scss b/css/backoffice/components/_modal.scss
similarity index 100%
rename from css/backoffice/base/components/_modal.scss
rename to css/backoffice/components/_modal.scss
diff --git a/css/backoffice/base/components/_newsroom-menu.scss b/css/backoffice/components/_newsroom-menu.scss
similarity index 100%
rename from css/backoffice/base/components/_newsroom-menu.scss
rename to css/backoffice/components/_newsroom-menu.scss
diff --git a/css/backoffice/base/components/_panel.scss b/css/backoffice/components/_panel.scss
similarity index 100%
rename from css/backoffice/base/components/_panel.scss
rename to css/backoffice/components/_panel.scss
diff --git a/css/backoffice/base/components/_quick-create.scss b/css/backoffice/components/_quick-create.scss
similarity index 100%
rename from css/backoffice/base/components/_quick-create.scss
rename to css/backoffice/components/_quick-create.scss
diff --git a/css/backoffice/base/components/_richtext.scss b/css/backoffice/components/_richtext.scss
similarity index 100%
rename from css/backoffice/base/components/_richtext.scss
rename to css/backoffice/components/_richtext.scss
diff --git a/css/backoffice/base/components/_search-form.scss b/css/backoffice/components/_search-form.scss
similarity index 100%
rename from css/backoffice/base/components/_search-form.scss
rename to css/backoffice/components/_search-form.scss
diff --git a/css/backoffice/base/components/_title.scss b/css/backoffice/components/_title.scss
similarity index 100%
rename from css/backoffice/base/components/_title.scss
rename to css/backoffice/components/_title.scss
diff --git a/css/backoffice/base/components/_toolbar.scss b/css/backoffice/components/_toolbar.scss
similarity index 100%
rename from css/backoffice/base/components/_toolbar.scss
rename to css/backoffice/components/_toolbar.scss
diff --git a/css/backoffice/base/components/dashlet/_all.scss b/css/backoffice/components/dashlet/_all.scss
similarity index 100%
rename from css/backoffice/base/components/dashlet/_all.scss
rename to css/backoffice/components/dashlet/_all.scss
diff --git a/css/backoffice/base/components/dashlet/_dashlet-badge.scss b/css/backoffice/components/dashlet/_dashlet-badge.scss
similarity index 100%
rename from css/backoffice/base/components/dashlet/_dashlet-badge.scss
rename to css/backoffice/components/dashlet/_dashlet-badge.scss
diff --git a/css/backoffice/base/components/dashlet/_dashlet-header-dynamic.scss b/css/backoffice/components/dashlet/_dashlet-header-dynamic.scss
similarity index 100%
rename from css/backoffice/base/components/dashlet/_dashlet-header-dynamic.scss
rename to css/backoffice/components/dashlet/_dashlet-header-dynamic.scss
diff --git a/css/backoffice/base/components/dashlet/_dashlet-header-static.scss b/css/backoffice/components/dashlet/_dashlet-header-static.scss
similarity index 100%
rename from css/backoffice/base/components/dashlet/_dashlet-header-static.scss
rename to css/backoffice/components/dashlet/_dashlet-header-static.scss
diff --git a/css/backoffice/base/components/dashlet/_dashlet.scss b/css/backoffice/components/dashlet/_dashlet.scss
similarity index 100%
rename from css/backoffice/base/components/dashlet/_dashlet.scss
rename to css/backoffice/components/dashlet/_dashlet.scss
diff --git a/css/backoffice/base/components/input/_all.scss b/css/backoffice/components/input/_all.scss
similarity index 100%
rename from css/backoffice/base/components/input/_all.scss
rename to css/backoffice/components/input/_all.scss
diff --git a/css/backoffice/base/components/input/_input-date.scss b/css/backoffice/components/input/_input-date.scss
similarity index 100%
rename from css/backoffice/base/components/input/_input-date.scss
rename to css/backoffice/components/input/_input-date.scss
diff --git a/css/backoffice/base/components/input/_input-datetime.scss b/css/backoffice/components/input/_input-datetime.scss
similarity index 100%
rename from css/backoffice/base/components/input/_input-datetime.scss
rename to css/backoffice/components/input/_input-datetime.scss
diff --git a/css/backoffice/base/components/input/_input-duration.scss b/css/backoffice/components/input/_input-duration.scss
similarity index 100%
rename from css/backoffice/base/components/input/_input-duration.scss
rename to css/backoffice/components/input/_input-duration.scss
diff --git a/css/backoffice/base/components/input/_input-select.scss b/css/backoffice/components/input/_input-select.scss
similarity index 100%
rename from css/backoffice/base/components/input/_input-select.scss
rename to css/backoffice/components/input/_input-select.scss
diff --git a/css/backoffice/base/components/input/_input-string.scss b/css/backoffice/components/input/_input-string.scss
similarity index 100%
rename from css/backoffice/base/components/input/_input-string.scss
rename to css/backoffice/components/input/_input-string.scss
diff --git a/css/backoffice/base/components/input/_input-tagset.scss b/css/backoffice/components/input/_input-tagset.scss
similarity index 100%
rename from css/backoffice/base/components/input/_input-tagset.scss
rename to css/backoffice/components/input/_input-tagset.scss
diff --git a/css/backoffice/base/components/input/_input.scss b/css/backoffice/components/input/_input.scss
similarity index 100%
rename from css/backoffice/base/components/input/_input.scss
rename to css/backoffice/components/input/_input.scss
diff --git a/css/backoffice/base/components/popover-menu/_popover-menu-item.scss b/css/backoffice/components/popover-menu/_popover-menu-item.scss
similarity index 100%
rename from css/backoffice/base/components/popover-menu/_popover-menu-item.scss
rename to css/backoffice/components/popover-menu/_popover-menu-item.scss
diff --git a/css/backoffice/base/components/popover-menu/_popover-menu.scss b/css/backoffice/components/popover-menu/_popover-menu.scss
similarity index 100%
rename from css/backoffice/base/components/popover-menu/_popover-menu.scss
rename to css/backoffice/components/popover-menu/_popover-menu.scss
diff --git a/css/backoffice/base/layout/_all.scss b/css/backoffice/layout/_all.scss
similarity index 100%
rename from css/backoffice/base/layout/_all.scss
rename to css/backoffice/layout/_all.scss
diff --git a/css/backoffice/base/layout/_content.scss b/css/backoffice/layout/_content.scss
similarity index 100%
rename from css/backoffice/base/layout/_content.scss
rename to css/backoffice/layout/_content.scss
diff --git a/css/backoffice/base/layout/_navigation-menu.scss b/css/backoffice/layout/_navigation-menu.scss
similarity index 100%
rename from css/backoffice/base/layout/_navigation-menu.scss
rename to css/backoffice/layout/_navigation-menu.scss
diff --git a/css/backoffice/base/layout/_object-details.scss b/css/backoffice/layout/_object-details.scss
similarity index 100%
rename from css/backoffice/base/layout/_object-details.scss
rename to css/backoffice/layout/_object-details.scss
diff --git a/css/backoffice/base/layout/_top-bar.scss b/css/backoffice/layout/_top-bar.scss
similarity index 100%
rename from css/backoffice/base/layout/_top-bar.scss
rename to css/backoffice/layout/_top-bar.scss
diff --git a/css/backoffice/base/layout/activity-panel/_activity-entry.scss b/css/backoffice/layout/activity-panel/_activity-entry.scss
similarity index 100%
rename from css/backoffice/base/layout/activity-panel/_activity-entry.scss
rename to css/backoffice/layout/activity-panel/_activity-entry.scss
diff --git a/css/backoffice/base/layout/activity-panel/_activity-panel.scss b/css/backoffice/layout/activity-panel/_activity-panel.scss
similarity index 100%
rename from css/backoffice/base/layout/activity-panel/_activity-panel.scss
rename to css/backoffice/layout/activity-panel/_activity-panel.scss
diff --git a/css/backoffice/base/layout/activity-panel/_caselog-entry-form.scss b/css/backoffice/layout/activity-panel/_caselog-entry-form.scss
similarity index 100%
rename from css/backoffice/base/layout/activity-panel/_caselog-entry-form.scss
rename to css/backoffice/layout/activity-panel/_caselog-entry-form.scss
diff --git a/css/backoffice/base/layout/activity-panel/_caselog-entry.scss b/css/backoffice/layout/activity-panel/_caselog-entry.scss
similarity index 100%
rename from css/backoffice/base/layout/activity-panel/_caselog-entry.scss
rename to css/backoffice/layout/activity-panel/_caselog-entry.scss
diff --git a/css/backoffice/base/layout/activity-panel/_edits-entry.scss b/css/backoffice/layout/activity-panel/_edits-entry.scss
similarity index 100%
rename from css/backoffice/base/layout/activity-panel/_edits-entry.scss
rename to css/backoffice/layout/activity-panel/_edits-entry.scss
diff --git a/css/backoffice/base/layout/activity-panel/_transition-entry.scss b/css/backoffice/layout/activity-panel/_transition-entry.scss
similarity index 100%
rename from css/backoffice/base/layout/activity-panel/_transition-entry.scss
rename to css/backoffice/layout/activity-panel/_transition-entry.scss
diff --git a/css/backoffice/base/layout/blocks-integrations/_panel-with-tab-container.scss b/css/backoffice/layout/blocks-integrations/_panel-with-tab-container.scss
similarity index 100%
rename from css/backoffice/base/layout/blocks-integrations/_panel-with-tab-container.scss
rename to css/backoffice/layout/blocks-integrations/_panel-with-tab-container.scss
diff --git a/css/backoffice/base/layout/dashboard/_dashboard.scss b/css/backoffice/layout/dashboard/_dashboard.scss
similarity index 100%
rename from css/backoffice/base/layout/dashboard/_dashboard.scss
rename to css/backoffice/layout/dashboard/_dashboard.scss
diff --git a/css/backoffice/base/layout/multi-column/_column.scss b/css/backoffice/layout/multi-column/_column.scss
similarity index 100%
rename from css/backoffice/base/layout/multi-column/_column.scss
rename to css/backoffice/layout/multi-column/_column.scss
diff --git a/css/backoffice/base/layout/multi-column/_multi-column.scss b/css/backoffice/layout/multi-column/_multi-column.scss
similarity index 100%
rename from css/backoffice/base/layout/multi-column/_multi-column.scss
rename to css/backoffice/layout/multi-column/_multi-column.scss
diff --git a/css/backoffice/base/layout/tab-container/_tab-container.scss b/css/backoffice/layout/tab-container/_tab-container.scss
similarity index 100%
rename from css/backoffice/base/layout/tab-container/_tab-container.scss
rename to css/backoffice/layout/tab-container/_tab-container.scss
diff --git a/css/backoffice/base/layout/tab-container/_tab.scss b/css/backoffice/layout/tab-container/_tab.scss
similarity index 100%
rename from css/backoffice/base/layout/tab-container/_tab.scss
rename to css/backoffice/layout/tab-container/_tab.scss
diff --git a/css/backoffice/main.scss b/css/backoffice/main.scss
index 51f544094..55664f9c8 100644
--- a/css/backoffice/main.scss
+++ b/css/backoffice/main.scss
@@ -19,6 +19,8 @@
 @import "utils/all";
 @import "vendors/all";
 @import "base/all";
-@import "pages/all";
+@import "components/all";
+@import "layout/all";
 @import "application/all";
+@import "pages/all";
 @import "themes/all";