diff --git a/include/Controller.php b/include/Controller.php
index b9defdfd..48e8cd7d 100644
--- a/include/Controller.php
+++ b/include/Controller.php
@@ -133,7 +133,7 @@ class Controller {
 			'content' => $content,
 		);
 		$this->_smarty->assign($vars);
-		return $this->_smarty->display('index.tpl');
+		return $this->_smarty->display('pages/index.tpl');
 	}
 
 	/* Render the HTML using the template and any set variables and returns it. */
diff --git a/templates/intro_header.tpl b/templates/components/intro_header.tpl
similarity index 100%
rename from templates/intro_header.tpl
rename to templates/components/intro_header.tpl
diff --git a/templates/list_items.tpl b/templates/components/list_items.tpl
similarity index 100%
rename from templates/list_items.tpl
rename to templates/components/list_items.tpl
diff --git a/templates/layout/menu.tpl b/templates/layout/menu.tpl
index b27187c3..b2a26f3e 100644
--- a/templates/layout/menu.tpl
+++ b/templates/layout/menu.tpl
@@ -1,12 +1,12 @@
 <nav>
   {foreach from=$menus item=menu}
-    {include file='menu_group.tpl' menu=$menu}
+    {include file='components/menu_group.tpl' menu=$menu}
   {/foreach}
 
-  {include file='lang_menu.tpl'}
+  {include file=components/'lang_menu.tpl'}
 </nav>
 
 <div class="monkey hide-small">
   <img src="/images/hangmonk.gif" alt="monkey" width="55" height="57" class="float_right">
-  {include file='banners.tpl'}
+  {include file='components/banners.tpl'}
 </div>
diff --git a/templates/pages/contact.tpl b/templates/pages/contact.tpl
index 4aad3d4f..680a206b 100644
--- a/templates/pages/contact.tpl
+++ b/templates/pages/contact.tpl
@@ -4,22 +4,22 @@
 	</div>
 
 	<div class="content">
-		{include file='subhead.tpl' subhead=#contactIRCHeader#}
+		{include file='components/subhead.tpl' subhead=#contactIRCHeader#}
 		<div class="subhead-content">
 			{#contactIRC#}
 		</div>
 
-		{include file='subhead.tpl' subhead=#contactForumsHeader#}
+		{include file='components/subhead.tpl' subhead=#contactForumsHeader#}
 		<div class="subhead-content">
 			{#contactForums#}
 		</div>
 
-		{include file='subhead.tpl' subhead=#contactTrackersHeader#}
+		{include file='components/subhead.tpl' subhead=#contactTrackersHeader#}
 		<div class="subhead-content">
 			{#contactTrackers#}
 		</div>
 
-		{include file='subhead.tpl' subhead=#contactListsHeader#}
+		{include file='components/subhead.tpl' subhead=#contactListsHeader#}
 		<div class="subhead-content">
 			{#contactLists#}
 		</div>
diff --git a/templates/pages/credits.tpl b/templates/pages/credits.tpl
index 184694ef..08708c1b 100644
--- a/templates/pages/credits.tpl
+++ b/templates/pages/credits.tpl
@@ -7,7 +7,7 @@
 				<div class="subhead">{$subcsection->getTitle()}</div>
 				<div class="subhead-content">
 					{include
-						file='credits_entry.tpl'
+						file='components/credits_entry.tpl'
 						groups=$subcsection->getGroups()
 						paragraphs=$subcsection->getParagraphs()
 					}
@@ -15,12 +15,12 @@
 			{/foreach}
 			{* If the section itself has paragraphs, we must process them here. *}
 			{include
-				file='credits_entry.tpl'
+				file='components/credits_entry.tpl'
 				paragraphs=$csection->getParagraphs()
 			}
 		{else}
 			{include
-				file='credits_entry.tpl'
+				file='components/credits_entry.tpl'
 				groups=$csection->getGroups()
 				paragraphs=$csection->getParagraphs()
 			}
diff --git a/templates/pages/downloads.tpl b/templates/pages/downloads.tpl
index 396638b3..3a8d1e42 100644
--- a/templates/pages/downloads.tpl
+++ b/templates/pages/downloads.tpl
@@ -53,7 +53,7 @@
 	{/if}
 
 		<div class="subhead-content">
-			{if $dsubsection->getNotes() != ''} {eval var=$dsubsection->getNotes()} {/if} {include file='list_items.tpl' list=$dsubsection->getItems() type='platforms'}
+			{if $dsubsection->getNotes() != ''} {eval var=$dsubsection->getNotes()} {/if} {include file='components/list_items.tpl' list=$dsubsection->getItems() type='platforms'}
 			{if !is_null($dsubsection->getFooter())}
 			<p>{$dsubsection->getFooter()}</p>
 			{/if}
diff --git a/templates/pages/games.tpl b/templates/pages/games.tpl
index 95a5d3ca..75a95de8 100644
--- a/templates/pages/games.tpl
+++ b/templates/pages/games.tpl
@@ -34,7 +34,7 @@
 					{eval var=$dsubsection->getNotes()}
 				{/if}
 
-				{include file='list_items.tpl' list=$dsubsection->getItems() type='games'}
+				{include file='components/list_items.tpl' list=$dsubsection->getItems() type='games'}
 				{if !is_null($dsubsection->getFooter())}
 					<p>{$dsubsection->getFooter()}</p>
 				{/if}
diff --git a/templates/index.tpl b/templates/pages/index.tpl
similarity index 98%
rename from templates/index.tpl
rename to templates/pages/index.tpl
index 76357350..dfaa60f4 100644
--- a/templates/index.tpl
+++ b/templates/pages/index.tpl
@@ -43,7 +43,7 @@
                 <div class="content">
 					{* Introduction text and screenshot viewer. *}
 					{if isset($show_intro) && $show_intro}
-						{include file='intro_header.tpl'}
+						{include file='components/intro_header.tpl'}
 					{/if}
 
 					{* The actual content. *}
diff --git a/templates/pages/links.tpl b/templates/pages/links.tpl
index 119c3345..ee7663c5 100644
--- a/templates/pages/links.tpl
+++ b/templates/pages/links.tpl
@@ -8,7 +8,7 @@
 	</div>
 	<div class="content">
 		{foreach from=$links item=group}
-		{include file='subhead.tpl' subhead=$group.name}
+		{include file='components/subhead.tpl' subhead=$group.name}
 		<div class="subhead-content">
 			<p>{$group.description}</p>
 			<div class="linklist">
diff --git a/templates/pages/screenshots.tpl b/templates/pages/screenshots.tpl
index 34ddd92e..c4184811 100644
--- a/templates/pages/screenshots.tpl
+++ b/templates/pages/screenshots.tpl
@@ -33,7 +33,7 @@
 			<a href="/screenshots/{$arr.category}/">{$arr.title}</a>
 		</div>
 		<div class="scr-content scr-content-{$arr.category}">
-      {include file='list_items.tpl' list=$arr.games type='games'}
+      {include file='components/list_items.tpl' list=$arr.games type='games'}
 		</div>
 		{/foreach}
 	</div>
diff --git a/templates/pages/subprojects.tpl b/templates/pages/subprojects.tpl
index 3c2a9871..c0623f10 100644
--- a/templates/pages/subprojects.tpl
+++ b/templates/pages/subprojects.tpl
@@ -10,10 +10,10 @@
 
 	<div class="content">
 		{foreach from=$subprojects item=project}
-		{include file='subhead.tpl' subhead=$project->getName()}
+		{include file='components/subhead.tpl' subhead=$project->getName()}
 		<div class="subhead-content">
 			{$project->getInfo()}
-			{include file='list_items.tpl' list=$project->getDownloads() type='platforms'}
+			{include file='components/list_items.tpl' list=$project->getDownloads() type='platforms'}
 		</div>
 		{/foreach}
 	</div>