diff --git a/aleksis/apps/alsijil/templates/alsijil/register_absence.html b/aleksis/apps/alsijil/templates/alsijil/absences/register.html
similarity index 100%
rename from aleksis/apps/alsijil/templates/alsijil/register_absence.html
rename to aleksis/apps/alsijil/templates/alsijil/absences/register.html
diff --git a/aleksis/apps/alsijil/templates/alsijil/lesson.html b/aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html
similarity index 100%
rename from aleksis/apps/alsijil/templates/alsijil/lesson.html
rename to aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html
diff --git a/aleksis/apps/alsijil/templates/alsijil/week_view.html b/aleksis/apps/alsijil/templates/alsijil/class_register/week_view.html
similarity index 100%
rename from aleksis/apps/alsijil/templates/alsijil/week_view.html
rename to aleksis/apps/alsijil/templates/alsijil/class_register/week_view.html
diff --git a/aleksis/apps/alsijil/templates/alsijil/personal_note_filters.html b/aleksis/apps/alsijil/templates/alsijil/personal_note_filter/list.html
similarity index 100%
rename from aleksis/apps/alsijil/templates/alsijil/personal_note_filters.html
rename to aleksis/apps/alsijil/templates/alsijil/personal_note_filter/list.html
diff --git a/aleksis/apps/alsijil/templates/alsijil/manage_personal_note_filter.html b/aleksis/apps/alsijil/templates/alsijil/personal_note_filter/manage.html
similarity index 100%
rename from aleksis/apps/alsijil/templates/alsijil/manage_personal_note_filter.html
rename to aleksis/apps/alsijil/templates/alsijil/personal_note_filter/manage.html
diff --git a/aleksis/apps/alsijil/views.py b/aleksis/apps/alsijil/views.py
index 77f69af3c8ebf297e8c5e1326e3829ae108ebe86..0378d727ef323684db44621f5ef2ee338315d2fd 100644
--- a/aleksis/apps/alsijil/views.py
+++ b/aleksis/apps/alsijil/views.py
@@ -106,7 +106,7 @@ def lesson(
     context["lesson_documentation_form"] = lesson_documentation_form
     context["personal_note_formset"] = personal_note_formset
 
-    return render(request, "alsijil/lesson.html", context)
+    return render(request, "alsijil/class_register/lesson.html", context)
 
 
 @login_required
@@ -208,7 +208,7 @@ def week_view(
         request.GET.urlencode(),
     )
 
-    return render(request, "alsijil/week_view.html", context)
+    return render(request, "alsijil/class_register/week_view.html", context)
 
 
 @login_required
@@ -308,7 +308,7 @@ def register_absence(request: HttpRequest) -> HttpResponse:
 
     context["register_absence_form"] = register_absence_form
 
-    return render(request, "alsijil/register_absence.html", context)
+    return render(request, "alsijil/absences/register.html", context)
 
 
 def list_personal_note_filters(request: HttpRequest) -> HttpResponse:
@@ -322,7 +322,7 @@ def list_personal_note_filters(request: HttpRequest) -> HttpResponse:
 
     context["personal_note_filters_table"] = personal_note_filters_table
 
-    return render(request, "alsijil/personal_note_filters.html", context)
+    return render(request, "alsijil/personal_note_filter/list.html", context)
 
 
 def edit_personal_note_filter(request: HttpRequest, id: Optional["int"] = None) -> HttpResponse:
@@ -346,7 +346,7 @@ def edit_personal_note_filter(request: HttpRequest, id: Optional["int"] = None)
 
     context["personal_note_filter_form"] = personal_note_filter_form
 
-    return render(request, "alsijil/manage_personal_note_filter.html", context)
+    return render(request, "alsijil/personal_note_filter/manage.html", context)
 
 
 @admin_required