diff --git a/src/newsreader/accounts/templates/accounts/login.html b/src/newsreader/accounts/templates/accounts/views/login.html
similarity index 100%
rename from src/newsreader/accounts/templates/accounts/login.html
rename to src/newsreader/accounts/templates/accounts/views/login.html
diff --git a/src/newsreader/accounts/templates/accounts/password_change.html b/src/newsreader/accounts/templates/accounts/views/password_change.html
similarity index 100%
rename from src/newsreader/accounts/templates/accounts/password_change.html
rename to src/newsreader/accounts/templates/accounts/views/password_change.html
diff --git a/src/newsreader/accounts/templates/accounts/settings.html b/src/newsreader/accounts/templates/accounts/views/settings.html
similarity index 100%
rename from src/newsreader/accounts/templates/accounts/settings.html
rename to src/newsreader/accounts/templates/accounts/views/settings.html
diff --git a/src/newsreader/accounts/views.py b/src/newsreader/accounts/views.py
index c0342b2..d24d29a 100644
--- a/src/newsreader/accounts/views.py
+++ b/src/newsreader/accounts/views.py
@@ -11,7 +11,7 @@ from newsreader.accounts.models import User
 
 
 class LoginView(django_views.LoginView):
-    template_name = "accounts/login.html"
+    template_name = "accounts/views/login.html"
     success_url = reverse_lazy("index")
 
 
@@ -94,12 +94,12 @@ class PasswordResetCompleteView(django_views.PasswordResetCompleteView):
 
 
 class PasswordChangeView(django_views.PasswordChangeView):
-    template_name = "accounts/password_change.html"
+    template_name = "accounts/views/password_change.html"
     success_url = reverse_lazy("accounts:settings")
 
 
 class SettingsView(ModelFormMixin, FormView):
-    template_name = "accounts/settings.html"
+    template_name = "accounts/views/settings.html"
     success_url = reverse_lazy("accounts:settings")
     form_class = UserSettingsForm
     model = User
diff --git a/src/newsreader/news/core/templates/news/core/views/category-update.html b/src/newsreader/news/core/templates/news/core/views/category-update.html
index 3e50df9..f8c56fd 100644
--- a/src/newsreader/news/core/templates/news/core/views/category-update.html
+++ b/src/newsreader/news/core/templates/news/core/views/category-update.html
@@ -1,4 +1,4 @@
-{% extends "core/category.html" %}
+{% extends "news/core/views/category.html" %}
 
 {% block form-header %}
   <h1 class="h1 form__title">Update category</h1>
diff --git a/src/newsreader/news/core/templates/news/core/widgets/rules.html b/src/newsreader/news/core/templates/news/core/widgets/rules.html
index d554ece..60c6a5c 100644
--- a/src/newsreader/news/core/templates/news/core/widgets/rules.html
+++ b/src/newsreader/news/core/templates/news/core/widgets/rules.html
@@ -1,7 +1,7 @@
 <ul class="list checkbox-list">
   {% for rule in rules %}
     <li class="list__item checkbox-list__item">
-      {% include "collection/widgets/rule.html" %}
+      {% include "news/core/widgets/rule.html" %}
     </li>
   {% endfor %}
 </ul>