diff --git a/aleksis/core/templates/core/edit_additional_field.html b/aleksis/core/templates/core/additionalfield/edit.html
similarity index 100%
rename from aleksis/core/templates/core/edit_additional_field.html
rename to aleksis/core/templates/core/additionalfield/edit.html
diff --git a/aleksis/core/templates/core/additional_fields.html b/aleksis/core/templates/core/additionalfield/list.html
similarity index 100%
rename from aleksis/core/templates/core/additional_fields.html
rename to aleksis/core/templates/core/additionalfield/list.html
diff --git a/aleksis/core/views.py b/aleksis/core/views.py
index b662407d814e4a81087e585d3d8beb83131f0b85..f47fb59f168eab2d6d7c9a47bc6730c51c53d638 100644
--- a/aleksis/core/views.py
+++ b/aleksis/core/views.py
@@ -499,7 +499,7 @@ def edit_additional_field(request: HttpRequest, id_: Optional[int] = None) -> Ht
 
     context["edit_additional_field_form"] = edit_additional_field_form
 
-    return render(request, "core/edit_additional_field.html", context)
+    return render(request, "core/additionalfield/edit.html", context)
 
 
 @permission_required("core.view_additionalfield")
@@ -517,7 +517,7 @@ def additional_fields(request: HttpRequest) -> HttpResponse:
     RequestConfig(request).configure(additional_fields_table)
     context["additional_fields_table"] = additional_fields_table
 
-    return render(request, "core/additional_fields.html", context)
+    return render(request, "core/additionalfield/list.html", context)
 
 
 @permission_required(