diff --git a/civicfix/core/__pycache__/views.cpython-313.pyc b/civicfix/core/__pycache__/views.cpython-313.pyc
index 5e3d968..348638f 100644
Binary files a/civicfix/core/__pycache__/views.cpython-313.pyc and b/civicfix/core/__pycache__/views.cpython-313.pyc differ
diff --git a/civicfix/core/templates/core/citizen_dashboard.html b/civicfix/core/templates/dashboard/citizen_dashboard.html
similarity index 100%
rename from civicfix/core/templates/core/citizen_dashboard.html
rename to civicfix/core/templates/dashboard/citizen_dashboard.html
diff --git a/civicfix/core/templates/core/superadmin_dashboard.html b/civicfix/core/templates/dashboard/superadmin_dashboard.html
similarity index 100%
rename from civicfix/core/templates/core/superadmin_dashboard.html
rename to civicfix/core/templates/dashboard/superadmin_dashboard.html
diff --git a/civicfix/core/templates/core/department_detail.html b/civicfix/core/templates/department/department_detail.html
similarity index 100%
rename from civicfix/core/templates/core/department_detail.html
rename to civicfix/core/templates/department/department_detail.html
diff --git a/civicfix/core/templates/core/manage_departments.html b/civicfix/core/templates/department/manage_departments.html
similarity index 100%
rename from civicfix/core/templates/core/manage_departments.html
rename to civicfix/core/templates/department/manage_departments.html
diff --git a/civicfix/core/templates/core/issue_detail.html b/civicfix/core/templates/issues/issue_detail.html
similarity index 100%
rename from civicfix/core/templates/core/issue_detail.html
rename to civicfix/core/templates/issues/issue_detail.html
diff --git a/civicfix/core/templates/core/view_all_issues.html b/civicfix/core/templates/issues/view_all_issues.html
similarity index 100%
rename from civicfix/core/templates/core/view_all_issues.html
rename to civicfix/core/templates/issues/view_all_issues.html
diff --git a/civicfix/core/views.py b/civicfix/core/views.py
index f505441..86c0ad0 100644
--- a/civicfix/core/views.py
+++ b/civicfix/core/views.py
@@ -53,7 +53,7 @@ def citizen_dashboard(request):
         'categories': categories,
         'issue_form': IssueForm(),
     }
-    return render(request, 'core/citizen_dashboard.html', context)
+    return render(request, 'dashboard/citizen_dashboard.html', context)
 
 @login_required
 def report_issue(request):
@@ -101,7 +101,7 @@ def view_all_issues(request):
     if category_id:
         issues = issues.filter(category_id=category_id)
 
-    return render(request, 'core/view_all_issues.html', {
+    return render(request, 'issues/view_all_issues.html', {
         'issues': issues,
         'categories': categories,
         'selected_status': status,
@@ -183,7 +183,7 @@ def add_comment(request, pk, parent_id=None):
 def issue_detail(request, pk):
     issue = get_object_or_404(Issue, pk=pk)
     comments = issue.comments.filter(parent__isnull=True)  # top-level comments
-    return render(request, "core/issue_detail.html", {"issue": issue, "comments": comments})
+    return render(request, "issues/issue_detail.html", {"issue": issue, "comments": comments})
 
 def add_comment(request, pk, parent_id=None):
     if request.method == "POST" and request.user.is_authenticated:
@@ -202,7 +202,7 @@ def superadmin_check(user):
 @login_required
 @user_passes_test(superadmin_check)
 def superadmin_dashboard(request):
-    return render(request, "core/superadmin_dashboard.html")
+    return render(request, "dashboard/superadmin_dashboard.html")
 
 
 @login_required
@@ -217,7 +217,7 @@ def manage_departments(request):
             Department.objects.create(name=name, description=description)
             return redirect("manage_departments")
 
-    return render(request, "core/manage_departments.html", {
+    return render(request, "department/manage_departments.html", {
         "departments": departments
     })
 
@@ -242,7 +242,7 @@ def department_detail(request, pk):
             department.users.add(user)
             return redirect("department_detail", pk=department.id)
 
-    return render(request, "core/department_detail.html", {
+    return render(request, "department/department_detail.html", {
         "department": department,
         "users": users,
     })
\ No newline at end of file