diff --git a/src/main/scala/app/WikiController.scala b/src/main/scala/app/WikiController.scala
index b237ac8a2..9c6162dae 100644
--- a/src/main/scala/app/WikiController.scala
+++ b/src/main/scala/app/WikiController.scala
@@ -19,7 +19,7 @@ class WikiController extends ControllerBase {
     val owner      = params("owner")
     val repository = params("repository")
     
-    html.wiki("Home", 
+    wiki.html.wiki("Home", 
         WikiUtil.getPage(owner, repository, "Home"), 
         JGitUtil.getRepositoryInfo(owner, repository, servletContext))
   }
@@ -29,7 +29,7 @@ class WikiController extends ControllerBase {
     val repository = params("repository")
     val page       = params("page")
     
-    html.wiki(page, 
+    wiki.html.wiki(page, 
         WikiUtil.getPage(owner, repository, page), 
         JGitUtil.getRepositoryInfo(owner, repository, servletContext))
   }
@@ -40,7 +40,7 @@ class WikiController extends ControllerBase {
     val page       = params("page")
     val git        = Git.open(WikiUtil.getWikiRepositoryDir(owner, repository))
     
-    html.wikihistory(Some(page),
+    wiki.html.wikihistory(Some(page),
       JGitUtil.getCommitLog(git, "master", path = page + ".md")._1,
       JGitUtil.getRepositoryInfo(owner, repository, servletContext))
   }
@@ -54,7 +54,7 @@ class WikiController extends ControllerBase {
     println(commitId(0))
     println(commitId(1))
     
-    html.wikicompare(Some(page),
+    wiki.html.wikicompare(Some(page),
       WikiUtil.getDiffs(Git.open(WikiUtil.getWikiRepositoryDir(owner, repository)), commitId(0), commitId(1)),
       JGitUtil.getRepositoryInfo(owner, repository, servletContext))
   }
@@ -67,7 +67,7 @@ class WikiController extends ControllerBase {
     println(commitId(0))
     println(commitId(1))
     
-    html.wikicompare(None,
+    wiki.html.wikicompare(None,
       WikiUtil.getDiffs(Git.open(WikiUtil.getWikiRepositoryDir(owner, repository)), commitId(0), commitId(1)),
       JGitUtil.getRepositoryInfo(owner, repository, servletContext))
   }
@@ -77,7 +77,7 @@ class WikiController extends ControllerBase {
     val repository = params("repository")
     val page       = params("page")
     
-    html.wikiedit(page, 
+    wiki.html.wikiedit(page, 
         WikiUtil.getPage(owner, repository, page), 
         JGitUtil.getRepositoryInfo(owner, repository, servletContext))
   }
@@ -96,7 +96,7 @@ class WikiController extends ControllerBase {
     val owner      = params("owner")
     val repository = params("repository")
     
-    html.wikiedit("", None, 
+    wiki.html.wikiedit("", None, 
         JGitUtil.getRepositoryInfo(owner, repository, servletContext))
   }
   
@@ -104,7 +104,7 @@ class WikiController extends ControllerBase {
     val owner      = params("owner")
     val repository = params("repository")
     
-    html.wikipages(WikiUtil.getPageList(owner, repository), 
+    wiki.html.wikipages(WikiUtil.getPageList(owner, repository), 
         JGitUtil.getRepositoryInfo(owner, repository, servletContext))
   }
   
@@ -112,7 +112,7 @@ class WikiController extends ControllerBase {
     val owner      = params("owner")
     val repository = params("repository")
     
-    html.wikihistory(None,
+    wiki.html.wikihistory(None,
         JGitUtil.getCommitLog(Git.open(WikiUtil.getWikiRepositoryDir(owner, repository)), "master")._1, 
         JGitUtil.getRepositoryInfo(owner, repository, servletContext))
   }
diff --git a/src/main/twirl/wiki.scala.html b/src/main/twirl/wiki/wiki.scala.html
similarity index 90%
rename from src/main/twirl/wiki.scala.html
rename to src/main/twirl/wiki/wiki.scala.html
index 6f0583ed6..7c12a7deb 100644
--- a/src/main/twirl/wiki.scala.html
+++ b/src/main/twirl/wiki/wiki.scala.html
@@ -1,8 +1,8 @@
 @(pageName: String, page: Option[util.WikiUtil.WikiPageInfo], repository: app.RepositoryInfo)(implicit context: app.Context)
 @import view.helpers
 @import context._
-@main(pageName + " - " + repository.owner + "/" + repository.name){
-  @header("wiki", repository)
+@html.main(pageName + " - " + repository.owner + "/" + repository.name){
+  @html.header("wiki", repository)
   @wikitab((if(pageName == "Home") "home" else ""), repository)
   @page.map { page =>
     <ul class="nav nav-tabs">
diff --git a/src/main/twirl/wikicompare.scala.html b/src/main/twirl/wiki/wikicompare.scala.html
similarity index 82%
rename from src/main/twirl/wikicompare.scala.html
rename to src/main/twirl/wiki/wikicompare.scala.html
index ca5deeab6..a606d5d05 100644
--- a/src/main/twirl/wikicompare.scala.html
+++ b/src/main/twirl/wiki/wikicompare.scala.html
@@ -2,8 +2,8 @@
 @import view.helpers
 @import context._
 @import org.eclipse.jgit.diff.DiffEntry.ChangeType
-@main("Compare Revisions - " + repository.owner + "/" + repository.name){
-  @header("wiki", repository)
+@html.main("Compare Revisions - " + repository.owner + "/" + repository.name){
+  @html.header("wiki", repository)
   @wikitab("history", repository)
   <ul class="nav nav-tabs">
     <li>
@@ -20,5 +20,5 @@
       </div>
     </li>
   </ul>
-  @diff(diffs, repository, None)
+  @html.diff(diffs, repository, None)
 }
diff --git a/src/main/twirl/wikiedit.scala.html b/src/main/twirl/wiki/wikiedit.scala.html
similarity index 91%
rename from src/main/twirl/wikiedit.scala.html
rename to src/main/twirl/wiki/wikiedit.scala.html
index 1fd19755d..7f9732068 100644
--- a/src/main/twirl/wikiedit.scala.html
+++ b/src/main/twirl/wiki/wikiedit.scala.html
@@ -1,8 +1,8 @@
 @(pageName: String, page: Option[util.WikiUtil.WikiPageInfo], repository: app.RepositoryInfo)(implicit context: app.Context)
 @import view.helpers
 @import context._
-@main((if(pageName == "") "New Page" else pageName) + " - " + repository.owner + "/" + repository.name){
-  @header("wiki", repository)
+@html.main((if(pageName == "") "New Page" else pageName) + " - " + repository.owner + "/" + repository.name){
+  @html.header("wiki", repository)
   @wikitab("", repository)
   <ul class="nav nav-tabs">
     <li>
diff --git a/src/main/twirl/wikihistory.scala.html b/src/main/twirl/wiki/wikihistory.scala.html
similarity index 95%
rename from src/main/twirl/wikihistory.scala.html
rename to src/main/twirl/wiki/wikihistory.scala.html
index 66bd80ea9..fa1cbd311 100644
--- a/src/main/twirl/wikihistory.scala.html
+++ b/src/main/twirl/wiki/wikihistory.scala.html
@@ -1,8 +1,8 @@
 @(pageName: Option[String], commits: List[app.CommitInfo], repository: app.RepositoryInfo)(implicit context: app.Context)
 @import view.helpers
 @import context._
-@main("History - " + repository.owner + "/" + repository.name){
-  @header("wiki", repository)
+@html.main("History - " + repository.owner + "/" + repository.name){
+  @html.header("wiki", repository)
   @wikitab(if(pageName.isEmpty) "history" else "", repository)
   <ul class="nav nav-tabs">
     <li>
diff --git a/src/main/twirl/wikipages.scala.html b/src/main/twirl/wiki/wikipages.scala.html
similarity index 85%
rename from src/main/twirl/wikipages.scala.html
rename to src/main/twirl/wiki/wikipages.scala.html
index 2c59e5e5f..59e591e6c 100644
--- a/src/main/twirl/wikipages.scala.html
+++ b/src/main/twirl/wiki/wikipages.scala.html
@@ -1,8 +1,8 @@
 @(pages: List[String], repository: app.RepositoryInfo)(implicit context: app.Context)
 @import view.helpers
 @import context._
-@main("Pages - " + repository.owner + "/" + repository.name){
-  @header("wiki", repository)
+@html.main("Pages - " + repository.owner + "/" + repository.name){
+  @html.header("wiki", repository)
   @wikitab("pages", repository)
   <ul class="nav nav-tabs">
     <li>
diff --git a/src/main/twirl/wikitab.scala.html b/src/main/twirl/wiki/wikitab.scala.html
similarity index 100%
rename from src/main/twirl/wikitab.scala.html
rename to src/main/twirl/wiki/wikitab.scala.html