diff --git a/nummi/account/templates/account/account_form.html b/nummi/account/templates/account/account_form.html
index 0e18fbb..91cd0af 100644
--- a/nummi/account/templates/account/account_form.html
+++ b/nummi/account/templates/account/account_form.html
@@ -10,13 +10,15 @@
 {% block h2 %}{{ form.instance.icon|remix }}{{ form.instance }}{% endblock %}
 {% block tables %}
     {% if not form.instance|adding %}
-        <h3>{% translate "Statements" %}</h3>
-        {% include "main/table/statement.html" %}
-    {% endif %}
-    {% if transactions %}
-        <h3>{% translate "Transactions" %}</h3>
-        {% include "main/table/transaction.html" %}
-        <h3>{% translate "History" %}</h3>
-        {% include "main/plot/history.html" %}
+        {% if statements %}
+            <h3>{% translate "Statements" %}</h3>
+            {% include "statement/statement_table.html" %}
+        {% endif %}
+        {% if transactions %}
+            <h3>{% translate "Transactions" %}</h3>
+            {% include "transaction/transaction_table.html" %}
+            <h3>{% translate "History" %}</h3>
+            {% include "transaction/history_plot.html" %}
+        {% endif %}
     {% endif %}
 {% endblock %}
diff --git a/nummi/category/templates/category/category_form.html b/nummi/category/templates/category/category_form.html
index 6223526..d995b04 100644
--- a/nummi/category/templates/category/category_form.html
+++ b/nummi/category/templates/category/category_form.html
@@ -11,10 +11,10 @@
 {% block tables %}
     {% if transactions %}
         <h3>{% translate "Transactions" %}</h3>
-        {% include "main/table/transaction.html" %}
+        {% include "transaction/transaction_table.html" %}
     {% endif %}
     {% if history.data %}
         <h3>{% translate "History" %}</h3>
-        {% include "main/plot/history.html" %}
+        {% include "transaction/history_plot.html" %}
     {% endif %}
 {% endblock %}
diff --git a/nummi/main/templates/main/plot/category.html b/nummi/category/templates/category/category_plot.html
similarity index 100%
rename from nummi/main/templates/main/plot/category.html
rename to nummi/category/templates/category/category_plot.html
diff --git a/nummi/main/templates/main/index.html b/nummi/main/templates/main/index.html
index b2dbbaa..9da7a05 100644
--- a/nummi/main/templates/main/index.html
+++ b/nummi/main/templates/main/index.html
@@ -24,7 +24,7 @@
     {% endif %}
     {% if transactions %}
         <h2>{% translate "Transactions" %}</h2>
-        {% include "main/table/transaction.html" %}
+        {% include "transaction/transaction_table.html" %}
     {% endif %}
     {% if categories %}
         <h2>{% translate "Categories" %}</h2>
@@ -38,10 +38,10 @@
     {% endif %}
     {% if statements %}
         <h2>{% translate "Statements" %}</h2>
-        {% include "main/table/statement.html" %}
+        {% include "statement/statement_table.html" %}
     {% endif %}
     {% if history.data %}
         <h2>{% translate "History" %}</h2>
-        {% include "main/plot/history.html" %}
+        {% include "transaction/history_plot.html" %}
     {% endif %}
 {% endblock %}
diff --git a/nummi/search/forms.py b/nummi/search/forms.py
index 70d6e60..0aba785 100644
--- a/nummi/search/forms.py
+++ b/nummi/search/forms.py
@@ -3,5 +3,5 @@ from django.utils.translation import gettext_lazy as _
 
 
 class SearchForm(forms.Form):
-    template_name = "main/form/search.html"
+    template_name = "search/search_form.html"
     search = forms.CharField(label=_("Search"), max_length=128)
diff --git a/nummi/main/templates/main/form/search.html b/nummi/search/templates/search/search_form.html
similarity index 100%
rename from nummi/main/templates/main/form/search.html
rename to nummi/search/templates/search/search_form.html
diff --git a/nummi/statement/templates/statement/statement_form.html b/nummi/statement/templates/statement/statement_form.html
index feaf251..06fe238 100644
--- a/nummi/statement/templates/statement/statement_form.html
+++ b/nummi/statement/templates/statement/statement_form.html
@@ -21,10 +21,10 @@
 {% block tables %}
     {% if categories %}
         <h3>{% translate "Categories" %}</h3>
-        {% include "main/plot/category.html" %}
+        {% include "category/category_plot.html" %}
     {% endif %}
     {% if not form.instance|adding %}
         <h3>{% translate "Transactions" %} ({{ form.instance.sum|pmvalue }} / {{ form.instance.diff|pmvalue }})</h3>
-        {% include "main/table/transaction.html" %}
+        {% include "transaction/transaction_table.html" %}
     {% endif %}
 {% endblock %}
diff --git a/nummi/statement/templates/statement/statement_list.html b/nummi/statement/templates/statement/statement_list.html
index f6b31a9..9522c3e 100644
--- a/nummi/statement/templates/statement/statement_list.html
+++ b/nummi/statement/templates/statement/statement_list.html
@@ -31,7 +31,7 @@
     {% endif %}
     {% if statements %}
         {% include "main/list/pagination.html" %}
-        {% include "main/table/statement.html" %}
+        {% include "statement/statement_table.html" %}
         {% include "main/list/pagination.html" %}
     {% else %}
         <p>{% translate "No statements to show" %}</p>
diff --git a/nummi/main/templates/main/table/statement.html b/nummi/statement/templates/statement/statement_table.html
similarity index 100%
rename from nummi/main/templates/main/table/statement.html
rename to nummi/statement/templates/statement/statement_table.html
diff --git a/nummi/main/templates/main/plot/history.html b/nummi/transaction/templates/transaction/history_plot.html
similarity index 100%
rename from nummi/main/templates/main/plot/history.html
rename to nummi/transaction/templates/transaction/history_plot.html
diff --git a/nummi/main/templates/main/table/invoice.html b/nummi/transaction/templates/transaction/invoice_table.html
similarity index 100%
rename from nummi/main/templates/main/table/invoice.html
rename to nummi/transaction/templates/transaction/invoice_table.html
diff --git a/nummi/transaction/templates/transaction/transaction_form.html b/nummi/transaction/templates/transaction/transaction_form.html
index 39e10fb..75eb0d4 100644
--- a/nummi/transaction/templates/transaction/transaction_form.html
+++ b/nummi/transaction/templates/transaction/transaction_form.html
@@ -17,6 +17,6 @@
 {% block tables %}
     {% if not form.instance|adding %}
         <h3>{% translate "Invoices" %}</h3>
-        {% include "main/table/invoice.html" %}
+        {% include "transaction/invoice_table.html" %}
     {% endif %}
 {% endblock %}
diff --git a/nummi/transaction/templates/transaction/transaction_list.html b/nummi/transaction/templates/transaction/transaction_list.html
index ee087e7..cc44397 100644
--- a/nummi/transaction/templates/transaction/transaction_list.html
+++ b/nummi/transaction/templates/transaction/transaction_list.html
@@ -43,7 +43,7 @@
     {% endif %}
     {% if transactions %}
         {% include "main/list/pagination.html" %}
-        {% include "main/table/transaction.html" %}
+        {% include "transaction/transaction_table.html" %}
         {% include "main/list/pagination.html" %}
     {% else %}
         <p>{% translate "No transactions to show" %}</p>
diff --git a/nummi/main/templates/main/table/transaction.html b/nummi/transaction/templates/transaction/transaction_table.html
similarity index 100%
rename from nummi/main/templates/main/table/transaction.html
rename to nummi/transaction/templates/transaction/transaction_table.html