diff --git a/alchemy/templates/base.html b/alchemy/templates/base.html
index 6c35b66..938bcb9 100644
--- a/alchemy/templates/base.html
+++ b/alchemy/templates/base.html
@@ -24,13 +24,13 @@
     </head>
 
     <body>
-        {% include "header.html" %}
+        {% include "include/header.html" %}
 
         <div class="container">
             {% block content %}{% endblock %}
         </div>
 
-        {% include "footer.html" %}
+        {% include "include/footer.html" %}
 
         <script src="{{ SITEURL }}/theme/js/libs/jquery.min.js"></script>
         <script src="{{ SITEURL }}/theme/js/bootstrap.min.js"></script>
diff --git a/alchemy/templates/include/article_list.html b/alchemy/templates/include/article_list.html
deleted file mode 100644
index 823111a..0000000
--- a/alchemy/templates/include/article_list.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<div class="post mini-post">
-    <div class="row">
-        <div class="col-md-4">
-            <p class="post-date">
-                <a class="text-muted" href="/{{ article.url }}" title="{{ article.date.isoformat() }}">{{ article.locale_date }}</a>
-            </p>
-            <p class="post-category">
-                <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>
-            </p>
-            {% if article.author and SHOW_ARTICLE_AUTHOR %}
-                <address class="post-author">
-                    By <a href="{{ SITEURL }}/{{ article.author.url }}">{{ article.author }}</a>
-                </address>
-            {% endif %}
-        </div>
-        <div class="col-md-8">
-            <h2 class="post-title">
-                <a href="/{{ article.url }}" title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a>
-            </h2>
-            <div class="post-content">
-                {{ article.content|striptags|truncate(256) }}
-            </div>
-        </div>
-    </div>
-</div>
diff --git a/alchemy/templates/footer.html b/alchemy/templates/include/footer.html
similarity index 100%
rename from alchemy/templates/footer.html
rename to alchemy/templates/include/footer.html
diff --git a/alchemy/templates/header.html b/alchemy/templates/include/header.html
similarity index 100%
rename from alchemy/templates/header.html
rename to alchemy/templates/include/header.html
diff --git a/alchemy/templates/pagination.html b/alchemy/templates/include/pagination.html
similarity index 100%
rename from alchemy/templates/pagination.html
rename to alchemy/templates/include/pagination.html
diff --git a/alchemy/templates/index.html b/alchemy/templates/index.html
index b3ece5d..a32b11c 100644
--- a/alchemy/templates/index.html
+++ b/alchemy/templates/index.html
@@ -6,9 +6,33 @@
     {% endblock %}
     <div>
         {% for article in articles_page.object_list %}
-            {% include "include/article_list.html" %}
+            <div class="post mini-post">
+                <div class="row">
+                    <div class="col-md-4">
+                        <p class="post-date">
+                            <a class="text-muted" href="/{{ article.url }}" title="{{ article.date.isoformat() }}">{{ article.locale_date }}</a>
+                        </p>
+                        <p class="post-category">
+                            <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>
+                        </p>
+                        {% if article.author and SHOW_ARTICLE_AUTHOR %}
+                            <address class="post-author">
+                                By <a href="{{ SITEURL }}/{{ article.author.url }}">{{ article.author }}</a>
+                            </address>
+                        {% endif %}
+                    </div>
+                    <div class="col-md-8">
+                        <h2 class="post-title">
+                            <a href="/{{ article.url }}" title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a>
+                        </h2>
+                        <div class="post-content">
+                            {{ article.content|striptags|truncate(256) }}
+                        </div>
+                    </div>
+                </div>
+            </div>
         {% endfor %}
     </div>
-    {% include 'pagination.html' %}
+    {% include 'include/pagination.html' %}
 </div>
 {% endblock %}
