diff --git a/templates/category.tpl b/templates/category.tpl
index 3e157f1..bbf8fc3 100644
--- a/templates/category.tpl
+++ b/templates/category.tpl
@@ -12,7 +12,7 @@
 
 	<div class="subcategories row">
 		<!-- BEGIN children -->
-		<!-- IMPORT partials/category_child.tpl -->
+		<!-- IMPORT partials/category/subcategory.tpl -->
 		<!-- END children -->
 	</div>
 
@@ -37,8 +37,8 @@
 			</button>
 			<!-- ENDIF loggedIn -->
 
-			<!-- IMPORT partials/category_tools.tpl -->
-			<!-- IMPORT partials/category_sort.tpl -->
+			<!-- IMPORT partials/category/tools.tpl -->
+			<!-- IMPORT partials/category/sort.tpl -->
 		</span>
 
 	</div>
@@ -102,7 +102,7 @@
 						<!-- ENDIF topics.unreplied -->
 					</span>
 
-					<!-- IMPORT partials/category_tags.tpl -->
+					<!-- IMPORT partials/category/tags.tpl -->
 				</small>
 			</div>
 		</li>
diff --git a/templates/partials/category_sort.tpl b/templates/partials/category/sort.tpl
similarity index 100%
rename from templates/partials/category_sort.tpl
rename to templates/partials/category/sort.tpl
diff --git a/templates/partials/category_child.tpl b/templates/partials/category/subcategory.tpl
similarity index 100%
rename from templates/partials/category_child.tpl
rename to templates/partials/category/subcategory.tpl
diff --git a/templates/partials/category_tags.tpl b/templates/partials/category/tags.tpl
similarity index 100%
rename from templates/partials/category_tags.tpl
rename to templates/partials/category/tags.tpl
diff --git a/templates/partials/category_tools.tpl b/templates/partials/category/tools.tpl
similarity index 100%
rename from templates/partials/category_tools.tpl
rename to templates/partials/category/tools.tpl
diff --git a/templates/partials/topics_list.tpl b/templates/partials/topics_list.tpl
index 6c8770a..b925e97 100644
--- a/templates/partials/topics_list.tpl
+++ b/templates/partials/topics_list.tpl
@@ -50,7 +50,7 @@
 							</a>
 							<!-- ENDIF topics.unreplied -->
 						</span>
-						<!-- IMPORT partials/category_tags.tpl -->
+						<!-- IMPORT partials/category/tags.tpl -->
 					</small>
 				</div>
 			</li>