diff --git a/assets/controllers/common/markdown_controller.js b/assets/controllers/common/markdown_controller.js
index 0a482724..08c013ca 100644
--- a/assets/controllers/common/markdown_controller.js
+++ b/assets/controllers/common/markdown_controller.js
@@ -23,7 +23,7 @@ import { Controller } from '@hotwired/stimulus';
 import { marked } from "marked";
 import DOMPurify from 'dompurify';
 
-import "../../css/markdown.css";
+import "../../css/app/markdown.css";
 
 export default class extends Controller {
 
diff --git a/assets/controllers/elements/attachment_autocomplete_controller.js b/assets/controllers/elements/attachment_autocomplete_controller.js
index 3cc09d4b..1276d2ce 100644
--- a/assets/controllers/elements/attachment_autocomplete_controller.js
+++ b/assets/controllers/elements/attachment_autocomplete_controller.js
@@ -20,7 +20,7 @@
 import {Controller} from "@hotwired/stimulus";
 
 import "tom-select/dist/css/tom-select.bootstrap5.css";
-import '../../css/tom-select_extensions.css';
+import '../../css/components/tom-select_extensions.css';
 import TomSelect from "tom-select";
 
 export default class extends Controller {
diff --git a/assets/controllers/elements/ckeditor_controller.js b/assets/controllers/elements/ckeditor_controller.js
index b972e2ed..4de536fe 100644
--- a/assets/controllers/elements/ckeditor_controller.js
+++ b/assets/controllers/elements/ckeditor_controller.js
@@ -25,7 +25,7 @@ import { default as HTMLLabelEditor } from "../../ckeditor/html_label";
 
 import EditorWatchdog from '@ckeditor/ckeditor5-watchdog/src/editorwatchdog';
 
-import "../../css/ckeditor.css";
+import "../../css/components/ckeditor.css";
 
 /* stimulusFetch: 'lazy' */
 export default class extends Controller {
diff --git a/assets/controllers/elements/collection_type_controller.js b/assets/controllers/elements/collection_type_controller.js
index 6d895245..2a110f8d 100644
--- a/assets/controllers/elements/collection_type_controller.js
+++ b/assets/controllers/elements/collection_type_controller.js
@@ -20,7 +20,7 @@
 import {Controller} from "@hotwired/stimulus";
 
 import * as bootbox from "bootbox";
-import "../../css/bootbox_extensions.css";
+import "../../css/components/bootbox_extensions.css";
 
 export default class extends Controller {
     static values = {
diff --git a/assets/controllers/elements/delete_btn_controller.js b/assets/controllers/elements/delete_btn_controller.js
index ace3105a..21a25328 100644
--- a/assets/controllers/elements/delete_btn_controller.js
+++ b/assets/controllers/elements/delete_btn_controller.js
@@ -20,7 +20,7 @@
 import {Controller} from "@hotwired/stimulus";
 
 import * as bootbox from "bootbox";
-import "../../css/bootbox_extensions.css";
+import "../../css/components/bootbox_extensions.css";
 
 export default class extends Controller
 {
diff --git a/assets/controllers/elements/selectpicker_controller.js b/assets/controllers/elements/selectpicker_controller.js
index b021371c..df9c2cdd 100644
--- a/assets/controllers/elements/selectpicker_controller.js
+++ b/assets/controllers/elements/selectpicker_controller.js
@@ -22,7 +22,7 @@ require('bootstrap-select/js/bootstrap-select'); // we have to manually require
 
 import {Controller} from "@hotwired/stimulus";
 import "../../css/lib/boostrap-select.css";
-import "../../css/selectpicker_extensions.css";
+import "../../css/components/selectpicker_extensions.css";
 
 export default class extends Controller {
     connect() {
diff --git a/assets/controllers/elements/tagsinput_controller.js b/assets/controllers/elements/tagsinput_controller.js
index faa2f8a3..725cac5c 100644
--- a/assets/controllers/elements/tagsinput_controller.js
+++ b/assets/controllers/elements/tagsinput_controller.js
@@ -20,7 +20,7 @@
 import {Controller} from "@hotwired/stimulus";
 
 import "tom-select/dist/css/tom-select.bootstrap5.css";
-import '../../css/tom-select_extensions.css';
+import '../../css/components/tom-select_extensions.css';
 import TomSelect from "tom-select";
 
 export default class extends Controller {
diff --git a/assets/css/markdown.css b/assets/css/app/markdown.css
similarity index 100%
rename from assets/css/markdown.css
rename to assets/css/app/markdown.css
diff --git a/assets/css/bootbox_extensions.css b/assets/css/components/bootbox_extensions.css
similarity index 100%
rename from assets/css/bootbox_extensions.css
rename to assets/css/components/bootbox_extensions.css
diff --git a/assets/css/ckeditor.css b/assets/css/components/ckeditor.css
similarity index 100%
rename from assets/css/ckeditor.css
rename to assets/css/components/ckeditor.css
diff --git a/assets/css/selectpicker_extensions.css b/assets/css/components/selectpicker_extensions.css
similarity index 100%
rename from assets/css/selectpicker_extensions.css
rename to assets/css/components/selectpicker_extensions.css
diff --git a/assets/css/tom-select_extensions.css b/assets/css/components/tom-select_extensions.css
similarity index 100%
rename from assets/css/tom-select_extensions.css
rename to assets/css/components/tom-select_extensions.css