diff --git a/compensation/tables.py b/compensation/tables.py
index 81043045..5f9f6e7c 100644
--- a/compensation/tables.py
+++ b/compensation/tables.py
@@ -240,7 +240,7 @@ class EcoAccountTable(BaseTable):
 
         """
         value_total, value_relative = record.get_available_rest()
-        html = render_to_string("konova/custom_widgets/progressbar.html", {"value": value_relative})
+        html = render_to_string("konova/widgets/progressbar.html", {"value": value_relative})
         return format_html(html)
 
     def render_r(self, value, record: EcoAccount):
diff --git a/compensation/templates/compensation/detail/eco_account/view.html b/compensation/templates/compensation/detail/eco_account/view.html
index 6e8cd4e1..efe44bb1 100644
--- a/compensation/templates/compensation/detail/eco_account/view.html
+++ b/compensation/templates/compensation/detail/eco_account/view.html
@@ -35,7 +35,7 @@
                         <td class="align-middle">
                             {{available_total|floatformat:2}} / {{obj.deductable_surface|default_if_none:0.00|floatformat:2}} m²
                             {% with available as value %}
-                                {% include 'konova/custom_widgets/progressbar.html' %}
+                                {% include 'konova/widgets/progressbar.html' %}
                             {% endwith %}
                         </td>
                     </tr>
diff --git a/compensation/templates/compensation/form/view.html b/compensation/templates/compensation/form/view.html
index eb37e6b7..fcc25695 100644
--- a/compensation/templates/compensation/form/view.html
+++ b/compensation/templates/compensation/form/view.html
@@ -2,5 +2,5 @@
 {% load i18n l10n %}
 
 {% block body %}
-    {% include 'form/main_data_collapse_form.html' %}
+    {% include 'form/collapsable/form.html' %}
 {% endblock %}
\ No newline at end of file
diff --git a/ema/templates/ema/form/view.html b/ema/templates/ema/form/view.html
index eb37e6b7..fcc25695 100644
--- a/ema/templates/ema/form/view.html
+++ b/ema/templates/ema/form/view.html
@@ -2,5 +2,5 @@
 {% load i18n l10n %}
 
 {% block body %}
-    {% include 'form/main_data_collapse_form.html' %}
+    {% include 'form/collapsable/form.html' %}
 {% endblock %}
\ No newline at end of file
diff --git a/intervention/inputs.py b/intervention/inputs.py
index 90d2a754..2e84edc5 100644
--- a/intervention/inputs.py
+++ b/intervention/inputs.py
@@ -8,11 +8,11 @@ class DummyFilterInput(forms.HiddenInput):
     filter widget being rendered to the template.
 
     """
-    template_name = "konova/custom_widgets/dummy-filter-input.html"
+    template_name = "konova/widgets/empty-dummy-input.html"
 
 
 class TextToClipboardInput(forms.TextInput):
-    template_name = "konova/custom_widgets/text-to-clipboard-input.html"
+    template_name = "konova/widgets/text-to-clipboard-input.html"
 
 
 class GenerateInput(forms.TextInput):
@@ -29,4 +29,4 @@ class GenerateInput(forms.TextInput):
     )
 
     """
-    template_name = "konova/custom_widgets/generate-content-input.html"
+    template_name = "konova/widgets/generate-content-input.html"
diff --git a/intervention/templates/intervention/form/view.html b/intervention/templates/intervention/form/view.html
index eb37e6b7..fcc25695 100644
--- a/intervention/templates/intervention/form/view.html
+++ b/intervention/templates/intervention/form/view.html
@@ -2,5 +2,5 @@
 {% load i18n l10n %}
 
 {% block body %}
-    {% include 'form/main_data_collapse_form.html' %}
+    {% include 'form/collapsable/form.html' %}
 {% endblock %}
\ No newline at end of file
diff --git a/konova/templates/konova/choiceColumnForm.html b/konova/templates/konova/choiceColumnForm.html
deleted file mode 100644
index 1e62cf41..00000000
--- a/konova/templates/konova/choiceColumnForm.html
+++ /dev/null
@@ -1,5 +0,0 @@
-
-<form action="{{ form.action_url }}" method="post">
-    {% csrf_token %}
-    {{ form.as_p }}
-</form>
\ No newline at end of file
diff --git a/konova/templates/konova/form.html b/konova/templates/konova/form.html
index 3efd152f..1bdf539e 100644
--- a/konova/templates/konova/form.html
+++ b/konova/templates/konova/form.html
@@ -3,6 +3,6 @@
 
 {% block body %}
 <div class="column">
-    {% include 'form/generic_table_form.html' %}
+    {% include 'form/table/generic_table_form.html' %}
 </div>
 {% endblock %}
\ No newline at end of file
diff --git a/konova/templates/konova/custom_widgets/dummy-filter-input.html b/konova/templates/konova/widgets/empty-dummy-input.html
similarity index 100%
rename from konova/templates/konova/custom_widgets/dummy-filter-input.html
rename to konova/templates/konova/widgets/empty-dummy-input.html
diff --git a/konova/templates/konova/custom_widgets/generate-content-input.html b/konova/templates/konova/widgets/generate-content-input.html
similarity index 100%
rename from konova/templates/konova/custom_widgets/generate-content-input.html
rename to konova/templates/konova/widgets/generate-content-input.html
diff --git a/konova/templates/konova/custom_widgets/progressbar.html b/konova/templates/konova/widgets/progressbar.html
similarity index 100%
rename from konova/templates/konova/custom_widgets/progressbar.html
rename to konova/templates/konova/widgets/progressbar.html
diff --git a/konova/templates/konova/custom_widgets/text-to-clipboard-input.html b/konova/templates/konova/widgets/text-to-clipboard-input.html
similarity index 100%
rename from konova/templates/konova/custom_widgets/text-to-clipboard-input.html
rename to konova/templates/konova/widgets/text-to-clipboard-input.html
diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po
index e8cf0800..444d60ef 100644
--- a/locale/de/LC_MESSAGES/django.po
+++ b/locale/de/LC_MESSAGES/django.po
@@ -465,7 +465,7 @@ msgstr "Nicht freigegeben - Datensatz nur lesbar"
 
 #: compensation/tables.py:177
 #: compensation/templates/compensation/detail/eco_account/view.html:35
-#: konova/templates/konova/custom_widgets/progressbar.html:3
+#: konova/templates/konova/widgets/progressbar.html:3
 msgid "Available"
 msgstr "Verfügbar"
 
@@ -1231,7 +1231,7 @@ msgstr "Löschen"
 msgid "You are about to remove {} {}"
 msgstr "Sie sind dabei {} {} zu löschen"
 
-#: konova/forms.py:243 templates/form/main_data_collapse_form.html:45
+#: konova/forms.py:243 templates/form/collapsable/form.html:45
 msgid "Geometry"
 msgstr "Geometrie"
 
@@ -1317,15 +1317,15 @@ msgstr "Kontrolle am"
 msgid "Other"
 msgstr "Sonstige"
 
-#: konova/templates/konova/custom_widgets/generate-content-input.html:6
+#: konova/templates/konova/widgets/generate-content-input.html:6
 msgid "Generate new"
 msgstr "Neu generieren"
 
-#: konova/templates/konova/custom_widgets/text-to-clipboard-input.html:6
+#: konova/templates/konova/widgets/text-to-clipboard-input.html:6
 msgid "Copy to clipboard"
 msgstr "In Zwischenablage kopieren"
 
-#: konova/templates/konova/custom_widgets/text-to-clipboard-input.html:16
+#: konova/templates/konova/widgets/text-to-clipboard-input.html:16
 msgid "Copied to clipboard"
 msgstr "In Zwischenablage kopiert"
 
@@ -1437,21 +1437,21 @@ msgstr ""
 msgid "Contact"
 msgstr "Kontakt"
 
-#: templates/form/generic_table_form.html:23
-#: templates/form/main_data_collapse_form.html:58
+#: templates/form/table/generic_table_form.html:23
+#: templates/form/collapsable/form.html:58
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: templates/form/generic_table_form.html:27
-#: templates/form/main_data_collapse_form.html:62
+#: templates/form/table/generic_table_form.html:27
+#: templates/form/collapsable/form.html:62
 msgid "Save"
 msgstr "Speichern"
 
-#: templates/form/generic_table_form_body.html:24
+#: templates/form/table/generic_table_form_body.html:24
 msgid "Fields with * are required."
 msgstr "* sind Pflichtfelder."
 
-#: templates/form/main_data_collapse_form.html:14
+#: templates/form/collapsable/form.html:14
 msgid ""
 "\n"
 "                    First enter the most basic data. Of course you can "
@@ -1468,11 +1468,11 @@ msgstr ""
 "Speichern des neuen Eintrags hinzugefügt werden.\n"
 " "
 
-#: templates/form/main_data_collapse_form.html:20
+#: templates/form/collapsable/form.html:20
 msgid "Open the input topic with a simple click."
 msgstr "Mit einem Linksklick öffnen Sie den jeweiligen Formularbereich."
 
-#: templates/form/main_data_collapse_form.html:30
+#: templates/form/collapsable/form.html:30
 msgid "General data"
 msgstr "Allgemeine Daten"
 
diff --git a/templates/form/main_data_collapse_form.html b/templates/form/collapsable/form.html
similarity index 97%
rename from templates/form/main_data_collapse_form.html
rename to templates/form/collapsable/form.html
index e219fb88..61adeb43 100644
--- a/templates/form/main_data_collapse_form.html
+++ b/templates/form/collapsable/form.html
@@ -32,7 +32,7 @@
             </div>
             <div id="dataCard" class="collapse" aria-labelledby="dataCardHeader">
                 <div class="card-body">
-                    {% include 'form/generic_table_form_body.html' %}
+                    {% include 'form/table/generic_table_form_body.html' %}
                 </div>
             </div>
         </div>
diff --git a/templates/form/generic_table_form.html b/templates/form/table/generic_table_form.html
similarity index 94%
rename from templates/form/generic_table_form.html
rename to templates/form/table/generic_table_form.html
index 165f5290..7d321436 100644
--- a/templates/form/generic_table_form.html
+++ b/templates/form/table/generic_table_form.html
@@ -16,7 +16,7 @@
     {% endif %}
     <form method="post" action="{{ form.action_url }}" {% for attr_key, attr_val in form.form_attrs.items %} {{attr_key}}="{{attr_val}}"{% endfor %}>
         {% csrf_token %}
-        {% include 'form/generic_table_form_body.html' %}
+        {% include 'form/table/generic_table_form_body.html' %}
         <div class="row">
             <div class="col-6">
                 <a href="{{ form.cancel_redirect }}">
diff --git a/templates/form/generic_table_form_body.html b/templates/form/table/generic_table_form_body.html
similarity index 100%
rename from templates/form/generic_table_form_body.html
rename to templates/form/table/generic_table_form_body.html
diff --git a/templates/modal/modal_form.html b/templates/modal/modal_form.html
index 46e109f1..eda17303 100644
--- a/templates/modal/modal_form.html
+++ b/templates/modal/modal_form.html
@@ -18,7 +18,7 @@
         <article>
             {{ form.form_caption }}
         </article>
-        {% include 'form/generic_table_form_body.html' %}
+        {% include 'form/table/generic_table_form_body.html' %}
     </div>
     {% if form.render_submit %}
     <div class="modal-footer">
diff --git a/user/templates/user/notifications.html b/user/templates/user/notifications.html
index e20f81a4..2442d9af 100644
--- a/user/templates/user/notifications.html
+++ b/user/templates/user/notifications.html
@@ -1,5 +1,5 @@
 {% extends 'base.html' %}
 
 {% block body %}
-    {% include 'form/generic_table_form.html' %}
+    {% include 'form/table/generic_table_form.html' %}
 {% endblock %}
\ No newline at end of file