diff --git a/src/newsreader/accounts/templates/accounts/components/login-form.html b/src/newsreader/accounts/templates/accounts/components/login-form.html
index 6f920c0..3a5e14b 100644
--- a/src/newsreader/accounts/templates/accounts/components/login-form.html
+++ b/src/newsreader/accounts/templates/accounts/components/login-form.html
@@ -1,4 +1,4 @@
-{% extends "form/form.html" %}
+{% extends "components/form/form.html" %}
 
 {% load i18n %}
 
diff --git a/src/newsreader/news/collection/templates/news/collection/views/import.html b/src/newsreader/news/collection/templates/news/collection/views/import.html
index 6b719bd..df19887 100644
--- a/src/newsreader/news/collection/templates/news/collection/views/import.html
+++ b/src/newsreader/news/collection/templates/news/collection/views/import.html
@@ -4,6 +4,6 @@
 {% block content %}
   <main id="import--page" class="main">
     {% url "news:collection:rules" as cancel_url %}
-    {% include "form.html" with form=form title="Import an OPML file" cancel_url=cancel_url confirm_text="Import rules" %}
+    {% include "components/form/form.html" with form=form title="Import an OPML file" cancel_url=cancel_url confirm_text="Import rules" %}
   </main>
 {% endblock %}
diff --git a/src/newsreader/news/collection/templates/news/collection/views/rule-create.html b/src/newsreader/news/collection/templates/news/collection/views/rule-create.html
index 621c1f2..82ed6c5 100644
--- a/src/newsreader/news/collection/templates/news/collection/views/rule-create.html
+++ b/src/newsreader/news/collection/templates/news/collection/views/rule-create.html
@@ -4,6 +4,6 @@
 {% block content %}
   <main id="rule--page" class="main">
     {% url "news:collection:rules" as cancel_url %}
-    {% include "form/form.html" with form=form title="Create rule" cancel_url=cancel_url confirm_text="Create rule" %}
+    {% include "components/form/form.html" with form=form title="Create rule" cancel_url=cancel_url confirm_text="Create rule" %}
   </main>
 {% endblock %}
diff --git a/src/newsreader/news/collection/templates/news/collection/views/rule-update.html b/src/newsreader/news/collection/templates/news/collection/views/rule-update.html
index c20c9d3..3f0a8fe 100644
--- a/src/newsreader/news/collection/templates/news/collection/views/rule-update.html
+++ b/src/newsreader/news/collection/templates/news/collection/views/rule-update.html
@@ -4,6 +4,6 @@
 {% block content %}
   <main id="rule--page" class="main">
     {% url "news:collection:rules" as cancel_url %}
-    {% include "form/form.html" with form=form title="Update rule" cancel_url=cancel_url confirm_text="Save rule" %}
+    {% include "components/form/form.html" with form=form title="Update rule" cancel_url=cancel_url confirm_text="Save rule" %}
   </main>
 {% endblock %}
diff --git a/src/newsreader/news/core/templates/news/core/views/category-create.html b/src/newsreader/news/core/templates/news/core/views/category-create.html
index ea5557d..6da166f 100644
--- a/src/newsreader/news/core/templates/news/core/views/category-create.html
+++ b/src/newsreader/news/core/templates/news/core/views/category-create.html
@@ -4,6 +4,6 @@
 {% block content %}
   <main id="category--page" class="main">
     {% url "news:core:categories" as cancel_url %}
-    {% include "form/form.html" with form=form title="Create category" cancel_url=cancel_url confirm_text="Create category" %}
+    {% include "components/form/form.html" with form=form title="Create category" cancel_url=cancel_url confirm_text="Create category" %}
   </main>
 {% endblock %}
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 5f520a7..1ec1487 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
@@ -4,6 +4,6 @@
 {% block content %}
   <main id="category--page" class="main">
     {% url "news:core:categories" as cancel_url %}
-    {% include "form/form.html" with form=form title="Update category" cancel_url=cancel_url confirm_text="Save category" %}
+    {% include "components/form/form.html" with form=form title="Update category" cancel_url=cancel_url confirm_text="Save category" %}
   </main>
 {% endblock %}
diff --git a/src/newsreader/templates/form/errors.html b/src/newsreader/templates/components/form/errors.html
similarity index 100%
rename from src/newsreader/templates/form/errors.html
rename to src/newsreader/templates/components/form/errors.html
diff --git a/src/newsreader/templates/form/form.html b/src/newsreader/templates/components/form/form.html
similarity index 89%
rename from src/newsreader/templates/form/form.html
rename to src/newsreader/templates/components/form/form.html
index 17e1528..6e15956 100644
--- a/src/newsreader/templates/form/form.html
+++ b/src/newsreader/templates/components/form/form.html
@@ -4,14 +4,14 @@
   {% csrf_token %}
 
   {% if title %}
-    {% include "form/title.html" with title=title only %}
+    {% include "components/form/title.html" with title=title only %}
   {% endif %}
 
   {% block intro %}
   {% endblock intro %}
 
   {% if form.non_field_errors %}
-    {% include "form/errors.html" with errors=form.non_field_errors only %}
+    {% include "components/form/errors.html" with errors=form.non_field_errors only %}
   {% endif %}
 
   {% block fields %}
diff --git a/src/newsreader/templates/form/title.html b/src/newsreader/templates/components/form/title.html
similarity index 100%
rename from src/newsreader/templates/form/title.html
rename to src/newsreader/templates/components/form/title.html
diff --git a/src/newsreader/templates/password-reset/password-reset-form.html b/src/newsreader/templates/password-reset/password-reset-form.html
index e662cad..91c9d99 100644
--- a/src/newsreader/templates/password-reset/password-reset-form.html
+++ b/src/newsreader/templates/password-reset/password-reset-form.html
@@ -1,4 +1,4 @@
-{% extends "form/form.html" %}
+{% extends "components/form/form.html" %}
 {% load i18n %}
 
 {% block intro %}
diff --git a/src/newsreader/templates/registration/activation_resend_form.html b/src/newsreader/templates/registration/activation_resend_form.html
index f630b7f..5f0dd82 100644
--- a/src/newsreader/templates/registration/activation_resend_form.html
+++ b/src/newsreader/templates/registration/activation_resend_form.html
@@ -4,6 +4,6 @@
 {% block content %}
   <main class="main">
     {% url "accounts:login" as cancel_url %}
-    {% include "form/form.html" with form=form title="Resend activation code" cancel_url=cancel_url confirm_text="Resend code" %}
+    {% include "components/form/form.html" with form=form title="Resend activation code" cancel_url=cancel_url confirm_text="Resend code" %}
   </main>
 {% endblock %}
diff --git a/src/newsreader/templates/registration/registration_form.html b/src/newsreader/templates/registration/registration_form.html
index 181c20f..ccc07c9 100644
--- a/src/newsreader/templates/registration/registration_form.html
+++ b/src/newsreader/templates/registration/registration_form.html
@@ -4,6 +4,6 @@
 {% block content %}
   <main class="main">
     {% url "accounts:login" as cancel_url %}
-    {% include "form/form.html" with form=form title="Register" cancel_url=cancel_url confirm_text="Register" %}
+    {% include "components/form/form.html" with form=form title="Register" cancel_url=cancel_url confirm_text="Register" %}
   </main>
 {% endblock %}