diff --git a/includes/SkinCitizen.php b/includes/SkinCitizen.php
index 74decf6b..f75e9577 100644
--- a/includes/SkinCitizen.php
+++ b/includes/SkinCitizen.php
@@ -143,7 +143,7 @@ class SkinCitizen extends SkinMustache {
 			);
 		}
 
-		$options['templateDirectory'] = __DIR__ . '/templates';
+		$options['templateDirectory'] = dirname(__DIR__, 1) . '/templates';
 		parent::__construct( $options );
 	}
 
diff --git a/includes/templates/Drawer.mustache b/templates/Drawer.mustache
similarity index 100%
rename from includes/templates/Drawer.mustache
rename to templates/Drawer.mustache
diff --git a/includes/templates/Footer.mustache b/templates/Footer.mustache
similarity index 100%
rename from includes/templates/Footer.mustache
rename to templates/Footer.mustache
diff --git a/includes/templates/Header.mustache b/templates/Header.mustache
similarity index 100%
rename from includes/templates/Header.mustache
rename to templates/Header.mustache
diff --git a/includes/templates/Indicators.mustache b/templates/Indicators.mustache
similarity index 100%
rename from includes/templates/Indicators.mustache
rename to templates/Indicators.mustache
diff --git a/includes/templates/Logo.mustache b/templates/Logo.mustache
similarity index 100%
rename from includes/templates/Logo.mustache
rename to templates/Logo.mustache
diff --git a/includes/templates/Menu.mustache b/templates/Menu.mustache
similarity index 100%
rename from includes/templates/Menu.mustache
rename to templates/Menu.mustache
diff --git a/includes/templates/PageTools.mustache b/templates/PageTools.mustache
similarity index 100%
rename from includes/templates/PageTools.mustache
rename to templates/PageTools.mustache
diff --git a/includes/templates/PersonalMenu.mustache b/templates/PersonalMenu.mustache
similarity index 100%
rename from includes/templates/PersonalMenu.mustache
rename to templates/PersonalMenu.mustache
diff --git a/includes/templates/SearchBox.mustache b/templates/SearchBox.mustache
similarity index 100%
rename from includes/templates/SearchBox.mustache
rename to templates/SearchBox.mustache
diff --git a/includes/templates/SiteStats.mustache b/templates/SiteStats.mustache
similarity index 100%
rename from includes/templates/SiteStats.mustache
rename to templates/SiteStats.mustache
diff --git a/includes/templates/ThemeToggle.mustache b/templates/ThemeToggle.mustache
similarity index 100%
rename from includes/templates/ThemeToggle.mustache
rename to templates/ThemeToggle.mustache
diff --git a/includes/templates/Wordmark.mustache b/templates/Wordmark.mustache
similarity index 100%
rename from includes/templates/Wordmark.mustache
rename to templates/Wordmark.mustache
diff --git a/includes/templates/skin.mustache b/templates/skin.mustache
similarity index 100%
rename from includes/templates/skin.mustache
rename to templates/skin.mustache