diff --git a/forum/templates/forum/forum_form.html b/forum/templates/forum/forum_form.html
new file mode 100644
index 0000000..06a4b8d
--- /dev/null
+++ b/forum/templates/forum/forum_form.html
@@ -0,0 +1,30 @@
+{% load static i18n %}
+{% load widget_tweaks %}
+
+<form method="post" action="" enctype="multipart/form-data">
+	{% csrf_token %}
+	{% for field in form %}
+		<div class="form-group {% if form.has_error %} has-error {% endif %} is-fileinput">
+			<label for="{{ field.auto_id }}">{{ field.label }}</label>
+			{% render_field field class='form-control' %}
+			<span class="help-block">{{ field.help_text }}</span>
+			{% if field.errors %}
+				<div class="row">
+					<br />
+					<div class="alert alert-danger alert-dismissible" role="alert">
+	  					<button type="button" class="close" data-dismiss="alert" aria-label="Close">
+	  						<span aria-hidden="true">&times;</span>
+  						</button>
+						<ul>
+							{% for error in field.errors %}
+								<li>{{ error }}</li>
+							{% endfor %}
+						</ul>
+					</div>
+				</div>
+			{% endif %}
+		</div>
+	{% endfor %}
+
+	<input type="submit" value="{% trans 'Create' %}" class="btn btn-primary" />
+</form>
\ No newline at end of file
diff --git a/forum/templates/forum/forum_list.html b/forum/templates/forum/forum_list.html
new file mode 100644
index 0000000..6845d7f
--- /dev/null
+++ b/forum/templates/forum/forum_list.html
@@ -0,0 +1,36 @@
+{% load i18n permission_tags %}
+
+{% if foruns|length > 0 %}
+    {% for forum in foruns %}
+        <a class="forum_collapse" role="button" href="javascript: showPosts('{% url 'forum:posts' %}', '{{ forum.slug }}')" aria-expanded="true">
+            <div class="page-header">
+                <!-- {% if user|has_role:'system_admin' or user|has_role:'professor' and user == forum.topic.owner %}
+                    <div class="pull-right">
+                        <div class="btn-group icon-more-horiz">
+                            <button class="btn btn-default btn-xs dropdown-toggle" type="button" onclick="$('#dropdown{{ forum.slug }}').dropdown('toggle');" data-toggle="dropdown">
+                                <i class="material-icons">more_horiz</i>
+                            </button>
+                            <ul class="dropdown-menu" id="dropdown{{ forum.slug }}">
+                                <li><a href="javascript:void(0)"><i class="material-icons">create</i> Edit</a></li>
+                                <li><a href="javascript:void(0)"><i class="material-icons">delete_sweep</i> Remove</a></li>
+                            </ul>
+                        </div>
+                    </div>
+                {% endif %} -->
+                <h1 id="timeline">
+                    {{ forum }}
+                </h1>
+                <b>{% trans 'Description' %}: </b>{{ forum.description }}<p>
+                <b>{% trans 'Created in' %}: </b>{{ forum.create_date }}
+            </div>
+        </a>
+        <div class="collapse" id="collapse{{ forum.slug }}">
+            <div class="well">
+            </div>
+        </div>
+    {% endfor %}
+{% else %}
+    <div class="page-header">
+        <p>{% trans 'No forum created yet.' %}</p>
+    </div>
+{% endif %}
diff --git a/forum/templates/forum_form.html b/forum/templates/forum_form.html
deleted file mode 100644
index 06a4b8d..0000000
--- a/forum/templates/forum_form.html
+++ /dev/null
@@ -1,30 +0,0 @@
-{% load static i18n %}
-{% load widget_tweaks %}
-
-<form method="post" action="" enctype="multipart/form-data">
-	{% csrf_token %}
-	{% for field in form %}
-		<div class="form-group {% if form.has_error %} has-error {% endif %} is-fileinput">
-			<label for="{{ field.auto_id }}">{{ field.label }}</label>
-			{% render_field field class='form-control' %}
-			<span class="help-block">{{ field.help_text }}</span>
-			{% if field.errors %}
-				<div class="row">
-					<br />
-					<div class="alert alert-danger alert-dismissible" role="alert">
-	  					<button type="button" class="close" data-dismiss="alert" aria-label="Close">
-	  						<span aria-hidden="true">&times;</span>
-  						</button>
-						<ul>
-							{% for error in field.errors %}
-								<li>{{ error }}</li>
-							{% endfor %}
-						</ul>
-					</div>
-				</div>
-			{% endif %}
-		</div>
-	{% endfor %}
-
-	<input type="submit" value="{% trans 'Create' %}" class="btn btn-primary" />
-</form>
\ No newline at end of file
diff --git a/forum/templates/forum_list.html b/forum/templates/forum_list.html
deleted file mode 100644
index 6845d7f..0000000
--- a/forum/templates/forum_list.html
+++ /dev/null
@@ -1,36 +0,0 @@
-{% load i18n permission_tags %}
-
-{% if foruns|length > 0 %}
-    {% for forum in foruns %}
-        <a class="forum_collapse" role="button" href="javascript: showPosts('{% url 'forum:posts' %}', '{{ forum.slug }}')" aria-expanded="true">
-            <div class="page-header">
-                <!-- {% if user|has_role:'system_admin' or user|has_role:'professor' and user == forum.topic.owner %}
-                    <div class="pull-right">
-                        <div class="btn-group icon-more-horiz">
-                            <button class="btn btn-default btn-xs dropdown-toggle" type="button" onclick="$('#dropdown{{ forum.slug }}').dropdown('toggle');" data-toggle="dropdown">
-                                <i class="material-icons">more_horiz</i>
-                            </button>
-                            <ul class="dropdown-menu" id="dropdown{{ forum.slug }}">
-                                <li><a href="javascript:void(0)"><i class="material-icons">create</i> Edit</a></li>
-                                <li><a href="javascript:void(0)"><i class="material-icons">delete_sweep</i> Remove</a></li>
-                            </ul>
-                        </div>
-                    </div>
-                {% endif %} -->
-                <h1 id="timeline">
-                    {{ forum }}
-                </h1>
-                <b>{% trans 'Description' %}: </b>{{ forum.description }}<p>
-                <b>{% trans 'Created in' %}: </b>{{ forum.create_date }}
-            </div>
-        </a>
-        <div class="collapse" id="collapse{{ forum.slug }}">
-            <div class="well">
-            </div>
-        </div>
-    {% endfor %}
-{% else %}
-    <div class="page-header">
-        <p>{% trans 'No forum created yet.' %}</p>
-    </div>
-{% endif %}
diff --git a/forum/templates/post/post_list.html b/forum/templates/post/post_list.html
new file mode 100644
index 0000000..ac6e36b
--- /dev/null
+++ b/forum/templates/post/post_list.html
@@ -0,0 +1,40 @@
+{% load i18n permission_tags %}
+
+{% if posts|length > 0 %}
+    <ul class="timeline post">
+        {% for post in posts %}
+            <li>
+                <a class="post_collapse" role="button" href="javascript: showPostsAnswers('{% url 'forum:post_answers' %}', '{{ post.id }}')" aria-expanded="false">
+                    <div class="timeline-panel">
+                        <div class="row">
+                            <div class="col-xs-2 col-sm-2 col-md-2">
+                                <img class="img-responsive img-rounded" src="{{ post.user.image_url }}" />
+                            </div>
+                            <div class="col-xs-10 col-sm-10 col-md-10">
+                                <div class="timeline-heading">
+                                    <h3> {{ post.user }}</h3>
+                                </div>
+                                <div class="timeline-body">
+                                    <p><em>{{ post.message|linebreaks }}</em></p>
+                                </div>
+                                <hr>
+                                <small class="text-muted">
+                                    <span class="pull-right">
+                                        <i class="glyphicon glyphicon-time"></i> {{ post.post_date|timesince }} 
+                                        {% trans ' ago' %}
+                                    </span>
+                                </small>
+                            </div>
+                        </div>
+                    </div>
+                </a>
+                <div class="collapse" id="collapse{{ post.id }}" style="margin-top:10px;">
+                    <div class="well">
+                    </div>
+                </div>
+            </li>
+        {% endfor %}
+    </ul>
+{% else %}
+    <p>{% trans 'No posts were made yet.' %}</p>
+{% endif %}
\ No newline at end of file
diff --git a/forum/templates/post_answer_list.html b/forum/templates/post_answer_list.html
deleted file mode 100644
index e24b012..0000000
--- a/forum/templates/post_answer_list.html
+++ /dev/null
@@ -1,47 +0,0 @@
-{% load i18n permission_tags %}
-
-{% if answers|length > 0 %}
-    <ul class="timeline post">
-        {% for answer in answers %}
-            <li>
-                <div class="timeline-panel">
-                    <div class="row">
-                        <div class="col-xs-2 col-sm-2 col-md-2">
-                            <img class="img-responsive img-rounded" src="{{ answer.user.image_url }}" />
-                        </div>
-                        <div class="col-xs-10 col-sm-10 col-md-10">
-                            {% if user|has_role:'system_admin' or user|has_role:'professor' and user == forum.topic.owner %}
-                                <div class="pull-right">
-                                    <div class="btn-group icon-more-horiz">
-                                        <a class="btn btn-default btn-xs dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                            <i class="material-icons">more_horiz</i>
-                                        </a>
-                                        <ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
-                                            <li><a href="javascript:void(0)"><i class="material-icons">create</i> Edit</a></li>
-                                            <li><a href="javascript:void(0)"><i class="material-icons">delete_sweep</i> Remove</a></li>
-                                        </ul>
-                                    </div>
-                                </div>
-                            {% endif %}
-                            <div class="timeline-heading">
-                                <h3> {{ answer.user }}</h3>
-                            </div>
-                            <div class="timeline-body">
-                                <p><em>{{ answer.message|linebreaks }}</em></p>
-                            </div>
-                            <hr>
-                            <small class="text-muted">
-                                <span class="pull-right">
-                                    <i class="glyphicon glyphicon-time"></i> {{ answer.answer_date|timesince }} 
-                                    {% trans ' ago' %}
-                                </span>
-                            </small>
-                        </div>
-                    </div>
-                </div>
-            </li>
-        {% endfor %}
-    </ul>
-{% else %}
-    <p>{% trans 'Nobody answered this post yet.' %}</p>
-{% endif %}
\ No newline at end of file
diff --git a/forum/templates/post_answers/post_answer_list.html b/forum/templates/post_answers/post_answer_list.html
new file mode 100644
index 0000000..e24b012
--- /dev/null
+++ b/forum/templates/post_answers/post_answer_list.html
@@ -0,0 +1,47 @@
+{% load i18n permission_tags %}
+
+{% if answers|length > 0 %}
+    <ul class="timeline post">
+        {% for answer in answers %}
+            <li>
+                <div class="timeline-panel">
+                    <div class="row">
+                        <div class="col-xs-2 col-sm-2 col-md-2">
+                            <img class="img-responsive img-rounded" src="{{ answer.user.image_url }}" />
+                        </div>
+                        <div class="col-xs-10 col-sm-10 col-md-10">
+                            {% if user|has_role:'system_admin' or user|has_role:'professor' and user == forum.topic.owner %}
+                                <div class="pull-right">
+                                    <div class="btn-group icon-more-horiz">
+                                        <a class="btn btn-default btn-xs dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                            <i class="material-icons">more_horiz</i>
+                                        </a>
+                                        <ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
+                                            <li><a href="javascript:void(0)"><i class="material-icons">create</i> Edit</a></li>
+                                            <li><a href="javascript:void(0)"><i class="material-icons">delete_sweep</i> Remove</a></li>
+                                        </ul>
+                                    </div>
+                                </div>
+                            {% endif %}
+                            <div class="timeline-heading">
+                                <h3> {{ answer.user }}</h3>
+                            </div>
+                            <div class="timeline-body">
+                                <p><em>{{ answer.message|linebreaks }}</em></p>
+                            </div>
+                            <hr>
+                            <small class="text-muted">
+                                <span class="pull-right">
+                                    <i class="glyphicon glyphicon-time"></i> {{ answer.answer_date|timesince }} 
+                                    {% trans ' ago' %}
+                                </span>
+                            </small>
+                        </div>
+                    </div>
+                </div>
+            </li>
+        {% endfor %}
+    </ul>
+{% else %}
+    <p>{% trans 'Nobody answered this post yet.' %}</p>
+{% endif %}
\ No newline at end of file
diff --git a/forum/templates/post_list.html b/forum/templates/post_list.html
deleted file mode 100644
index ac6e36b..0000000
--- a/forum/templates/post_list.html
+++ /dev/null
@@ -1,40 +0,0 @@
-{% load i18n permission_tags %}
-
-{% if posts|length > 0 %}
-    <ul class="timeline post">
-        {% for post in posts %}
-            <li>
-                <a class="post_collapse" role="button" href="javascript: showPostsAnswers('{% url 'forum:post_answers' %}', '{{ post.id }}')" aria-expanded="false">
-                    <div class="timeline-panel">
-                        <div class="row">
-                            <div class="col-xs-2 col-sm-2 col-md-2">
-                                <img class="img-responsive img-rounded" src="{{ post.user.image_url }}" />
-                            </div>
-                            <div class="col-xs-10 col-sm-10 col-md-10">
-                                <div class="timeline-heading">
-                                    <h3> {{ post.user }}</h3>
-                                </div>
-                                <div class="timeline-body">
-                                    <p><em>{{ post.message|linebreaks }}</em></p>
-                                </div>
-                                <hr>
-                                <small class="text-muted">
-                                    <span class="pull-right">
-                                        <i class="glyphicon glyphicon-time"></i> {{ post.post_date|timesince }} 
-                                        {% trans ' ago' %}
-                                    </span>
-                                </small>
-                            </div>
-                        </div>
-                    </div>
-                </a>
-                <div class="collapse" id="collapse{{ post.id }}" style="margin-top:10px;">
-                    <div class="well">
-                    </div>
-                </div>
-            </li>
-        {% endfor %}
-    </ul>
-{% else %}
-    <p>{% trans 'No posts were made yet.' %}</p>
-{% endif %}
\ No newline at end of file
diff --git a/forum/views.py b/forum/views.py
index 93bdc4f..77a6f1a 100644
--- a/forum/views.py
+++ b/forum/views.py
@@ -13,7 +13,7 @@ class ForumIndex(LoginRequiredMixin, generic.ListView):
 	login_url = reverse_lazy("core:home")	
 	redirect_field_name = 'next'
 
-	template_name = "forum_list.html"
+	template_name = "forum/forum_list.html"
 	context_object_name = 'foruns'
 
 	def get_queryset(self):
@@ -25,7 +25,7 @@ class ForumIndex(LoginRequiredMixin, generic.ListView):
 
 class CreateForumView(LoginRequiredMixin, generic.edit.CreateView):
 
-	template_name = 'forum_form.html'
+	template_name = 'forum/forum_form.html'
 	form_class = ForumForm
 	success_url = reverse_lazy('forum:index')
 
@@ -33,7 +33,7 @@ class PostIndex(LoginRequiredMixin, generic.ListView):
 	login_url = reverse_lazy("core:home")	
 	redirect_field_name = 'next'
 
-	template_name = "post_list.html"
+	template_name = "post/post_list.html"
 	context_object_name = 'posts'
 
 	def get_queryset(self):
@@ -47,7 +47,7 @@ class PostAnswerIndex(LoginRequiredMixin, generic.ListView):
 	login_url = reverse_lazy("core:home")	
 	redirect_field_name = 'next'
 
-	template_name = "post_answer_list.html"
+	template_name = "post_answers/post_answer_list.html"
 	context_object_name = 'answers'
 
 	def get_queryset(self):
--
libgit2 0.21.2