diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index bc06eba..39f02bc 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -2,6 +2,7 @@
 ==============
 
 * Add unique constraint to slug field
+* Relocated partial templates to 'includes' directories.
 * Search box on every page
 * Sorting
 
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 4b47b16..c4ee3dd 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -8,5 +8,8 @@ Contributors
 Andrii Kurinny
 James Punteney
 Jonas Obrist
-Taavi Taijala
+Nolan Bruabker
 Preston Holmes
+Taavi Taijala
+
+
diff --git a/templates/account/_account_bar.html b/templates/account/_account_bar.html
deleted file mode 100644
index e69de29..0000000
diff --git a/templates/account/_trouble_ticket.html b/templates/account/includes/_trouble_ticket.html
similarity index 100%
rename from templates/account/_trouble_ticket.html
rename to templates/account/includes/_trouble_ticket.html
diff --git a/templates/account/login.html b/templates/account/login.html
index 41d972d..ab3fbc3 100644
--- a/templates/account/login.html
+++ b/templates/account/login.html
@@ -41,11 +41,11 @@ <h1>{% trans "Log In" %}</h1>
         </fieldset>
     </form>
     
-    {% include "account/_trouble_ticket.html" %}
+    {% include "account/includes/_trouble_ticket.html" %}
 {% endblock %}
 
 {% block extra_body %}
 <script>
     $("#id_username").focus();
 </script>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/templates/account/password_reset.html b/templates/account/password_reset.html
index a279aeb..6bef3ff 100644
--- a/templates/account/password_reset.html
+++ b/templates/account/password_reset.html
@@ -25,11 +25,11 @@ <h1>{% trans "Password Reset" %}</h1>
         </fieldset>
     </form>
     
-    {% include "account/_trouble_ticket.html" %}
+    {% include "account/includes/_trouble_ticket.html" %}
 {% endblock %}
 
 {% block extra_body %}
     <script>
         $("#id_email").focus();
     </script>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/templates/account/signup.html b/templates/account/signup.html
index 9011af8..b38eb43 100644
--- a/templates/account/signup.html
+++ b/templates/account/signup.html
@@ -30,7 +30,7 @@ <h1>{% trans "Sign Up" %}</h1>
         {% url privacy as privacy_url %}
         <p>{% blocktrans %}By clicking "Sign Up", you are indicating that you have read and agree to the <a href="{{ terms_url }}">Terms of Use</a>.{% endblocktrans %}</p>
         
-        {% include "account/_trouble_ticket.html" %}
+        {% include "account/includes/_trouble_ticket.html" %}
         
     {% endif %}
 {% endblock %}
@@ -47,4 +47,4 @@ <h1>{% trans "Sign Up" %}</h1>
         });
     </script>
 {% endblock %}
-{% endcomment %}
\ No newline at end of file
+{% endcomment %}
diff --git a/templates/package/_package_row.html b/templates/package/_package_row.html
deleted file mode 100644
index 8d19ad8..0000000
--- a/templates/package/_package_row.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{% load cache %}
-{% load package_tags %}
-<tr  id="package-{{ package.id }}">
-    <td class="usage-count">{{ package.usage_count }}</td>
-    <td class="usage-button">{% if package.pk in used_packages_list %}
-        {% usage_button %}
-    </td>
-    <td>{{ package.pypi_downloads }}</td>
-    <td><a href="{% url package package.slug %}">{{ package.title }}</a></td>
-    {% cache 500 commitchart package %}                
-        <td><img id="package-githubcommits" src="http://chart.apis.google.com/chart?cht=bvg&chs=105x20&chd=t:{{package|commits_over_52}}&chco=666666&chbh=1,1,1&chds=0,20" /></td>
-    {% endcache %}                
-    <td>{{ package.pypi_version.number|default:"n/a"|slice:":12" }}</td>
-    <td>{{ package.repo_watchers|default:"n/a" }}</td>
-    <td>{{ package.repo_forks|default:"n/a" }}</td>
-    <td>{{ package.created|timesince }} ago</td>    
-</tr>
\ No newline at end of file
diff --git a/templates/package/ajax_package_list.html b/templates/package/ajax_package_list.html
index 8d8529c..a33540d 100644
--- a/templates/package/ajax_package_list.html
+++ b/templates/package/ajax_package_list.html
@@ -4,7 +4,7 @@ <h2>{% if packages.count %}Packages{% else %}No packages found{% endif %}</h2>
         <p class="editable-cell">Click a package to add it to the grid.</p>      
     {% endif %}
     {% for package in packages %}
-        {% include "package/_package.html" %}
+        {% include "package/includes/_package.html" %}
     {% endfor %}
     <script type="text/javascript">
        
@@ -23,4 +23,4 @@ <h2>{% if packages.count %}Packages{% else %}No packages found{% endif %}</h2>
         {% endfor %}
 
     </script>    
-</div>
\ No newline at end of file
+</div>
diff --git a/templates/package/_attach_grid.html b/templates/package/includes/_attach_grid.html
similarity index 100%
rename from templates/package/_attach_grid.html
rename to templates/package/includes/_attach_grid.html
diff --git a/templates/package/_package.html b/templates/package/includes/_package.html
similarity index 100%
rename from templates/package/_package.html
rename to templates/package/includes/_package.html
diff --git a/templates/package/_package_form.js b/templates/package/includes/_package_form.js
similarity index 100%
rename from templates/package/_package_form.js
rename to templates/package/includes/_package_form.js
diff --git a/templates/package/package.html b/templates/package/package.html
index b4f4025..ddf61de 100644
--- a/templates/package/package.html
+++ b/templates/package/package.html
@@ -108,14 +108,14 @@ <h2>Comparison Grids</h2>
             {% if forloop.last %}
                 <div id="package-gridname">
                     <a class="awesome forestgreen" id="find-a-grid" href="#">Find another grid to join!</a>
-                    {% include "package/_attach_grid.html" %}
+                    {% include "package/includes/_attach_grid.html" %}
                 </div>    
         
             {% endif %}
         {% empty %}
             <div id="package-gridname">
                 <a class="awesome forestgreen" id="find-a-grid" href="#">Find a grid to join!</a>
-                {% include "package/_attach_grid.html" %}
+                {% include "package/includes/_attach_grid.html" %}
             </div>
         {% endfor %}
     
diff --git a/templates/package/package_archive.html b/templates/package/package_archive.html
index f62d0da..364edb2 100644
--- a/templates/package/package_archive.html
+++ b/templates/package/package_archive.html
@@ -12,7 +12,7 @@ <h1>Latest 15 packages added</h1>
 
     <div id="packages">
         {% for package in latest %}
-            {% include "package/_package.html"%}
+            {% include "package/includes/_package.html"%}
         {% endfor %}
     </div>
 
diff --git a/templates/package/package_form.html b/templates/package/package_form.html
index 8345c0e..c6b0912 100644
--- a/templates/package/package_form.html
+++ b/templates/package/package_form.html
@@ -30,7 +30,7 @@ <h1><a href="{% url home %}">home</a> / <a href="{% url packages %}">packages</a
 <script src="{{ STATIC_URL }}js/urlify.js" type="text/javascript"></script>
 <script type="text/javascript">
     $(function() {
-        {% include "package/_package_form.js" %}
+        {% include "package/includes/_package_form.js" %}
     });
 </script>
 
diff --git a/templates/searchv1/search.html b/templates/searchv1/search.html
index 10c64eb..8ffca41 100644
--- a/templates/searchv1/search.html
+++ b/templates/searchv1/search.html
@@ -36,7 +36,7 @@ <h2>{% if packages.count %}Packages{% else %}No packages found{% endif %}</h2>
                 <a href="{% url latest_packages %}">latest</a> <a href="{% url packages %}">all</a>
             </p>
             {% for package in packages %}
-                {% include "package/_package.html"%}
+                {% include "package/includes/_package.html"%}
             {% endfor %}
         </div>    
     </div>