diff --git a/assets/css/src/components/form-editor/components/_block-editor.scss b/assets/css/src/components-form-editor/_block-editor.scss
similarity index 100%
rename from assets/css/src/components/form-editor/components/_block-editor.scss
rename to assets/css/src/components-form-editor/_block-editor.scss
diff --git a/assets/css/src/components/form-editor/components/_custom-field.scss b/assets/css/src/components-form-editor/_custom-field.scss
similarity index 99%
rename from assets/css/src/components/form-editor/components/_custom-field.scss
rename to assets/css/src/components-form-editor/_custom-field.scss
index 1e0761369f..53e441974f 100644
--- a/assets/css/src/components/form-editor/components/_custom-field.scss
+++ b/assets/css/src/components-form-editor/_custom-field.scss
@@ -1,4 +1,3 @@
-
 .mailpoet_custom_select {
   .mailpoet_select {
     padding: 0 24px 0 8px;
diff --git a/assets/css/src/components/form-editor/components/_form-title.scss b/assets/css/src/components-form-editor/_form-title.scss
similarity index 100%
rename from assets/css/src/components/form-editor/components/_form-title.scss
rename to assets/css/src/components-form-editor/_form-title.scss
diff --git a/assets/css/src/components/form-editor/components/_header.scss b/assets/css/src/components-form-editor/_header.scss
similarity index 100%
rename from assets/css/src/components/form-editor/components/_header.scss
rename to assets/css/src/components-form-editor/_header.scss
diff --git a/assets/css/src/components/form-editor/components/_preview.scss b/assets/css/src/components-form-editor/_preview.scss
similarity index 100%
rename from assets/css/src/components/form-editor/components/_preview.scss
rename to assets/css/src/components-form-editor/_preview.scss
diff --git a/assets/css/src/components/form-editor/components/_sidebar.scss b/assets/css/src/components-form-editor/_sidebar.scss
similarity index 100%
rename from assets/css/src/components/form-editor/components/_sidebar.scss
rename to assets/css/src/components-form-editor/_sidebar.scss
diff --git a/assets/css/src/mailpoet-form-editor.scss b/assets/css/src/mailpoet-form-editor.scss
index df67e97894..5c68da1fc8 100644
--- a/assets/css/src/mailpoet-form-editor.scss
+++ b/assets/css/src/mailpoet-form-editor.scss
@@ -1,7 +1,9 @@
-// 1. Settings
+// Settings
 // Global variables, config switches. Not producing any CSS.
 @import 'settings/form-editor';
 
+// Generic
+// 3rd-party styles, can be overwritten.
 @import '../../../node_modules/@wordpress/edit-post/build-style/style';
 @import '../../../node_modules/@wordpress/editor/build-style/style';
 @import '../../../node_modules/@wordpress/components/build-style/style';
@@ -11,9 +13,12 @@
 @import '../../../node_modules/@wordpress/block-library/build-style/editor';
 @import '../../../node_modules/codemirror/lib/codemirror';
 @import '../../../node_modules/codemirror/theme/neo';
-@import './components/form-editor/components/form-title';
-@import './components/form-editor/components/header';
-@import './components/form-editor/components/sidebar';
-@import './components/form-editor/components/preview';
-@import './components/form-editor/components/block-editor';
-@import './components/form-editor/components/custom-field';
+
+// Components
+// Actual UI components.
+@import './components-form-editor/form-title';
+@import './components-form-editor/header';
+@import './components-form-editor/sidebar';
+@import './components-form-editor/preview';
+@import './components-form-editor/block-editor';
+@import './components-form-editor/custom-field';