diff --git a/boards/templates/base.html b/boards/templates/boards/base.html
rename from boards/templates/base.html
rename to boards/templates/boards/base.html
diff --git a/boards/templates/login.html b/boards/templates/boards/login.html
rename from boards/templates/login.html
rename to boards/templates/boards/login.html
diff --git a/boards/templates/posting_general.html b/boards/templates/boards/posting_general.html
rename from boards/templates/posting_general.html
rename to boards/templates/boards/posting_general.html
--- a/boards/templates/posting_general.html
+++ b/boards/templates/boards/posting_general.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "boards/base.html" %}
 
 {% load i18n %}
 {% load markup %}
diff --git a/boards/templates/settings.html b/boards/templates/boards/settings.html
rename from boards/templates/settings.html
rename to boards/templates/boards/settings.html
--- a/boards/templates/settings.html
+++ b/boards/templates/boards/settings.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "boards/base.html" %}
 
 {% load i18n %}
 
diff --git a/boards/templates/tags.html b/boards/templates/boards/tags.html
rename from boards/templates/tags.html
rename to boards/templates/boards/tags.html
--- a/boards/templates/tags.html
+++ b/boards/templates/boards/tags.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "boards/base.html" %}
 
 {% load i18n %}
 {% load markup %}
diff --git a/boards/templates/thread.html b/boards/templates/boards/thread.html
rename from boards/templates/thread.html
rename to boards/templates/boards/thread.html
--- a/boards/templates/thread.html
+++ b/boards/templates/boards/thread.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "boards/base.html" %}
 
 {% load i18n %}
 {% load markup %}
diff --git a/boards/views.py b/boards/views.py
--- a/boards/views.py
+++ b/boards/views.py
@@ -38,7 +38,7 @@ def index(request, page=0):
     context['theme'] = _get_theme(request)
     context['pages'] = range(Post.objects.get_thread_page_count())
 
-    return render(request, 'posting_general.html',
+    return render(request, 'boards/posting_general.html',
                   context)
 
 
@@ -112,7 +112,7 @@ def tag(request, tag_name, page=0):
 
     context['form'] = form
 
-    return render(request, 'posting_general.html',
+    return render(request, 'boards/posting_general.html',
                   context)
 
 
@@ -139,7 +139,7 @@ def thread(request, post_id):
     context['tags'] = Tag.objects.get_popular_tags()
     context['theme'] = _get_theme(request)
 
-    return render(request, 'thread.html', context)
+    return render(request, 'boards/thread.html', context)
 
 
 def login(request):
@@ -158,9 +158,9 @@ def login(request):
             response = HttpResponseRedirect('/')
 
         else:
-            response = render(request, 'login.html', {'error': 'Login error'})
+            response = render(request, 'boards/login.html', {'error': 'Login error'})
     else:
-        response = render(request, 'login.html', {})
+        response = render(request, 'boards/login.html', {})
 
     return response
 
@@ -187,7 +187,7 @@ def settings(request):
         context['tags'] = Tag.objects.get_popular_tags()
         context['theme'] = _get_theme(request)
 
-        return render(request, 'settings.html', context)
+        return render(request, 'boards/settings.html', context)
 
 
 def all_tags(request):
@@ -196,7 +196,7 @@ def all_tags(request):
     context['theme'] = _get_theme(request)
     context['all_tags'] = Tag.objects.get_not_empty_tags()
 
-    return render(request, 'tags.html', context)
+    return render(request, 'boards/tags.html', context)
 
 
 def _get_theme(request):