diff --git a/src/main/scala/app/AccountController.scala b/src/main/scala/app/AccountController.scala
index ab77092b3..0574dc085 100644
--- a/src/main/scala/app/AccountController.scala
+++ b/src/main/scala/app/AccountController.scala
@@ -34,13 +34,13 @@ trait AccountControllerBase extends ControllerBase {
   get("/:userName") {
     val userName = params("userName")
     getAccountByUserName(userName).map {
-      account.html.userinfo(_, getVisibleRepositories(userName, baseUrl, context.loginAccount.map(_.userName)))
+      account.html.info(_, getVisibleRepositories(userName, baseUrl, context.loginAccount.map(_.userName)))
     } getOrElse NotFound
   }
 
   get("/:userName/_edit")(ownerOnly {
     val userName = params("userName")
-    getAccountByUserName(userName).map(x => account.html.useredit(Some(x))) getOrElse NotFound
+    getAccountByUserName(userName).map(x => account.html.edit(Some(x))) getOrElse NotFound
   })
 
   post("/:userName/_edit", editForm)(ownerOnly { form =>
@@ -56,7 +56,7 @@ trait AccountControllerBase extends ControllerBase {
 
   get("/register"){
     if(loadSystemSettings().allowAccountRegistration){
-      account.html.useredit(None)
+      account.html.edit(None)
     } else NotFound
   }
 
diff --git a/src/main/scala/app/LabelsController.scala b/src/main/scala/app/LabelsController.scala
index 8f79b169f..dbf43e52e 100644
--- a/src/main/scala/app/LabelsController.scala
+++ b/src/main/scala/app/LabelsController.scala
@@ -36,7 +36,7 @@ trait LabelsControllerBase extends ControllerBase {
     val repository = params("repository")
 
     getRepository(owner, repository, baseUrl)
-      .map(issues.html.labeleditlist(getLabels(owner, repository), _)) getOrElse NotFound()
+      .map(issues.labels.html.editlist(getLabels(owner, repository), _)) getOrElse NotFound()
   })
 
   ajaxGet("/:owner/:repository/issues/label/:labelId/edit")(writableRepository {
@@ -45,7 +45,7 @@ trait LabelsControllerBase extends ControllerBase {
     val labelId    = params("labelId").toInt
 
     getRepository(owner, repository, baseUrl).map { repositoryInfo =>
-      getLabel(owner, repository, labelId).map(label => issues.html.labeledit(Some(label), repositoryInfo)) getOrElse NotFound()
+      getLabel(owner, repository, labelId).map(label => issues.labels.html.edit(Some(label), repositoryInfo)) getOrElse NotFound()
     } getOrElse NotFound()
   })
 
@@ -56,7 +56,7 @@ trait LabelsControllerBase extends ControllerBase {
 
     getRepository(owner, repository, baseUrl).map{ repositoryInfo =>
       updateLabel(owner, repository, labelId, form.labelName, form.color.substring(1))
-      issues.html.labeleditlist(getLabels(owner, repository), repositoryInfo)
+      issues.labels.html.editlist(getLabels(owner, repository), repositoryInfo)
     } getOrElse NotFound()
   })
 
@@ -67,7 +67,7 @@ trait LabelsControllerBase extends ControllerBase {
 
     getRepository(owner, repository, baseUrl).map { repositoryInfo =>
       deleteLabel(owner, repository, labelId)
-      issues.html.labeleditlist(getLabels(owner, repository), repositoryInfo)
+      issues.labels.html.editlist(getLabels(owner, repository), repositoryInfo)
     } getOrElse NotFound()
   })
 
diff --git a/src/main/scala/app/MilestonesController.scala b/src/main/scala/app/MilestonesController.scala
index 9bbb093e2..08d3b06b6 100644
--- a/src/main/scala/app/MilestonesController.scala
+++ b/src/main/scala/app/MilestonesController.scala
@@ -27,7 +27,7 @@ trait MilestonesControllerBase extends ControllerBase {
     val state      = params.getOrElse("state", "open")
 
     getRepository(owner, repository, baseUrl).map { repositoryInfo =>
-      issues.html.milestones(state,
+      issues.milestones.html.list(state,
         getMilestonesWithIssueCount(owner, repository),
         repositoryInfo,
         isWritable(owner, repository, context.loginAccount))
@@ -38,7 +38,7 @@ trait MilestonesControllerBase extends ControllerBase {
     val owner      = params("owner")
     val repository = params("repository")
 
-    getRepository(owner, repository, baseUrl).map(issues.html.milestoneedit(None, _)) getOrElse NotFound
+    getRepository(owner, repository, baseUrl).map(issues.milestones.html.edit(None, _)) getOrElse NotFound
   })
 
   post("/:owner/:repository/issues/milestones/new", milestoneForm)(writableRepository { form =>
@@ -55,7 +55,7 @@ trait MilestonesControllerBase extends ControllerBase {
     val milestoneId = params("milestoneId").toInt
 
     getRepository(owner, repository, baseUrl).map(
-      issues.html.milestoneedit(getMilestone(owner, repository, milestoneId), _)) getOrElse NotFound
+      issues.milestones.html.edit(getMilestone(owner, repository, milestoneId), _)) getOrElse NotFound
   })
 
   post("/:owner/:repository/issues/milestones/:milestoneId/edit", milestoneForm)(writableRepository { form =>
diff --git a/src/main/scala/app/WikiController.scala b/src/main/scala/app/WikiController.scala
index d5035543b..6fe73af04 100644
--- a/src/main/scala/app/WikiController.scala
+++ b/src/main/scala/app/WikiController.scala
@@ -33,7 +33,7 @@ trait WikiControllerBase extends ControllerBase {
 
     getRepository(owner, repository, baseUrl).map { repositoryInfo =>
       getWikiPage(owner, repository, "Home").map { page =>
-        wiki.html.wiki("Home", page, repositoryInfo, isWritable(owner, repository, context.loginAccount))
+        wiki.html.page("Home", page, repositoryInfo, isWritable(owner, repository, context.loginAccount))
       } getOrElse redirect("/%s/%s/wiki/Home/_edit".format(owner, repository))
     } getOrElse NotFound
   })
@@ -45,7 +45,7 @@ trait WikiControllerBase extends ControllerBase {
 
     getRepository(owner, repository, baseUrl).map { repositoryInfo =>
       getWikiPage(owner, repository, pageName).map { page =>
-        wiki.html.wiki(pageName, page, repositoryInfo, isWritable(owner, repository, context.loginAccount))
+        wiki.html.page(pageName, page, repositoryInfo, isWritable(owner, repository, context.loginAccount))
       } getOrElse redirect("/%s/%s/wiki/%s/_edit".format(owner, repository, pageName)) // TODO URLEncode
     } getOrElse NotFound
   })
@@ -57,7 +57,7 @@ trait WikiControllerBase extends ControllerBase {
 
     getRepository(owner, repository, baseUrl).map { repositoryInfo =>
       JGitUtil.withGit(getWikiRepositoryDir(owner, repository)){ git =>
-        wiki.html.wikihistory(Some(page), JGitUtil.getCommitLog(git, "master", path = page + ".md")._1, repositoryInfo)
+        wiki.html.history(Some(page), JGitUtil.getCommitLog(git, "master", path = page + ".md")._1, repositoryInfo)
       }
     } getOrElse NotFound
   })
@@ -70,7 +70,7 @@ trait WikiControllerBase extends ControllerBase {
 
     getRepository(owner, repository, baseUrl).map { repositoryInfo =>
       JGitUtil.withGit(getWikiRepositoryDir(owner, repository)){ git =>
-        wiki.html.wikicompare(Some(page), getWikiDiffs(git, commitId(0), commitId(1)), repositoryInfo)
+        wiki.html.compare(Some(page), getWikiDiffs(git, commitId(0), commitId(1)), repositoryInfo)
       }
     } getOrElse NotFound
   })
@@ -82,7 +82,7 @@ trait WikiControllerBase extends ControllerBase {
 
     getRepository(owner, repository, baseUrl).map { repositoryInfo =>
       JGitUtil.withGit(getWikiRepositoryDir(owner, repository)){ git =>
-        wiki.html.wikicompare(None, getWikiDiffs(git, commitId(0), commitId(1)), repositoryInfo)
+        wiki.html.compare(None, getWikiDiffs(git, commitId(0), commitId(1)), repositoryInfo)
       }
     } getOrElse NotFound
   })
@@ -93,7 +93,7 @@ trait WikiControllerBase extends ControllerBase {
     val page       = params("page")
 
     getRepository(owner, repository, baseUrl).map(
-      wiki.html.wikiedit(page, getWikiPage(owner, repository, page), _)) getOrElse NotFound
+      wiki.html.edit(page, getWikiPage(owner, repository, page), _)) getOrElse NotFound
   })
   
   post("/:owner/:repository/wiki/_edit", editForm)(writableRepository { form =>
@@ -111,7 +111,7 @@ trait WikiControllerBase extends ControllerBase {
     val owner      = params("owner")
     val repository = params("repository")
 
-    getRepository(owner, repository, baseUrl).map(wiki.html.wikiedit("", None, _)) getOrElse NotFound
+    getRepository(owner, repository, baseUrl).map(wiki.html.edit("", None, _)) getOrElse NotFound
   })
   
   post("/:owner/:repository/wiki/_new", newForm)(writableRepository { form =>
@@ -140,7 +140,7 @@ trait WikiControllerBase extends ControllerBase {
     val repository = params("repository")
 
     getRepository(owner, repository, baseUrl).map {
-      wiki.html.wikipages(getWikiPageList(owner, repository), _, isWritable(owner, repository, context.loginAccount))
+      wiki.html.pages(getWikiPageList(owner, repository), _, isWritable(owner, repository, context.loginAccount))
     } getOrElse NotFound
   })
   
@@ -150,7 +150,7 @@ trait WikiControllerBase extends ControllerBase {
 
     getRepository(owner, repository, baseUrl).map { repositoryInfo =>
       JGitUtil.withGit(getWikiRepositoryDir(owner, repository)){ git =>
-        wiki.html.wikihistory(None, JGitUtil.getCommitLog(git, "master")._1, repositoryInfo)
+        wiki.html.history(None, JGitUtil.getCommitLog(git, "master")._1, repositoryInfo)
       }
     } getOrElse NotFound
   })
diff --git a/src/main/twirl/account/useredit.scala.html b/src/main/twirl/account/edit.scala.html
similarity index 100%
rename from src/main/twirl/account/useredit.scala.html
rename to src/main/twirl/account/edit.scala.html
diff --git a/src/main/twirl/account/userinfo.scala.html b/src/main/twirl/account/info.scala.html
similarity index 100%
rename from src/main/twirl/account/userinfo.scala.html
rename to src/main/twirl/account/info.scala.html
diff --git a/src/main/twirl/issues/issues.scala.html b/src/main/twirl/issues/issues.scala.html
index eaf9bae35..bafbce8ba 100644
--- a/src/main/twirl/issues/issues.scala.html
+++ b/src/main/twirl/issues/issues.scala.html
@@ -87,7 +87,7 @@
         <input type="button" class="btn btn-block" id="manageLabel" data-toggle="button" value="Manage Labels"/>
         <br/>
         <strong>New label</strong>
-        @labeledit(None, repository)
+        @_root_.issues.labels.html.edit(None, repository)
       }
     </div>
     <div class="span9">
diff --git a/src/main/twirl/issues/labeledit.scala.html b/src/main/twirl/issues/labels/edit.scala.html
similarity index 100%
rename from src/main/twirl/issues/labeledit.scala.html
rename to src/main/twirl/issues/labels/edit.scala.html
diff --git a/src/main/twirl/issues/labeleditlist.scala.html b/src/main/twirl/issues/labels/editlist.scala.html
similarity index 100%
rename from src/main/twirl/issues/labeleditlist.scala.html
rename to src/main/twirl/issues/labels/editlist.scala.html
diff --git a/src/main/twirl/issues/milestoneedit.scala.html b/src/main/twirl/issues/milestones/edit.scala.html
similarity index 97%
rename from src/main/twirl/issues/milestoneedit.scala.html
rename to src/main/twirl/issues/milestones/edit.scala.html
index 70bcae482..6c32f69a4 100644
--- a/src/main/twirl/issues/milestoneedit.scala.html
+++ b/src/main/twirl/issues/milestones/edit.scala.html
@@ -3,7 +3,7 @@
 @import view.helpers._
 @html.main("Milestones - " + repository.owner + "/" + repository.name){
   @html.header("milestones", repository)
-  @issuestab("milestones", repository)
+  @issues.html.issuestab("milestones", repository)
   <form method="POST" action="@url(repository)/issues/milestones/@if(milestone.isEmpty){new}else{@milestone.get.milestoneId/edit}" validate="true">
     <fieldset>
       <label for="title"><string>Title</string></label>
diff --git a/src/main/twirl/issues/milestones.scala.html b/src/main/twirl/issues/milestones/list.scala.html
similarity index 98%
rename from src/main/twirl/issues/milestones.scala.html
rename to src/main/twirl/issues/milestones/list.scala.html
index 2d69642b5..cce1f6017 100644
--- a/src/main/twirl/issues/milestones.scala.html
+++ b/src/main/twirl/issues/milestones/list.scala.html
@@ -3,7 +3,7 @@
 @import view.helpers._
 @html.main("Milestones - " + repository.owner + "/" + repository.name){
   @html.header("milestones", repository)
-  @issuestab("milestones", repository)
+  @issues.html.issuestab("milestones", repository)
   <div class="row-fluid">
     <div class="span3">
       <ul class="nav nav-pills nav-stacked">
diff --git a/src/main/twirl/wiki/wikicompare.scala.html b/src/main/twirl/wiki/compare.scala.html
similarity index 94%
rename from src/main/twirl/wiki/wikicompare.scala.html
rename to src/main/twirl/wiki/compare.scala.html
index f6b29fba0..7496e0fc9 100644
--- a/src/main/twirl/wiki/wikicompare.scala.html
+++ b/src/main/twirl/wiki/compare.scala.html
@@ -4,7 +4,7 @@
 @import org.eclipse.jgit.diff.DiffEntry.ChangeType
 @html.main("Compare Revisions - " + repository.owner + "/" + repository.name){
   @html.header("wiki", repository)
-  @wikitab("history", repository)
+  @tab("history", repository)
   <ul class="nav nav-tabs">
     <li>
       <h1 class="wiki-title"><span class="muted">Compare Revisions</span></h1>
diff --git a/src/main/twirl/wiki/wikiedit.scala.html b/src/main/twirl/wiki/edit.scala.html
similarity index 98%
rename from src/main/twirl/wiki/wikiedit.scala.html
rename to src/main/twirl/wiki/edit.scala.html
index d6b657a07..3d302becc 100644
--- a/src/main/twirl/wiki/wikiedit.scala.html
+++ b/src/main/twirl/wiki/edit.scala.html
@@ -3,7 +3,7 @@
 @import view.helpers._
 @html.main((if(pageName == "") "New Page" else pageName) + " - " + repository.owner + "/" + repository.name){
   @html.header("wiki", repository)
-  @wikitab("", repository)
+  @tab("", repository)
   <ul class="nav nav-tabs">
     <li>
       <h1 class="wiki-title"><span class="muted">Editing</span> @if(pageName == ""){New Page} else {@pageName}</h1>
diff --git a/src/main/twirl/wiki/wikihistory.scala.html b/src/main/twirl/wiki/history.scala.html
similarity index 97%
rename from src/main/twirl/wiki/wikihistory.scala.html
rename to src/main/twirl/wiki/history.scala.html
index 093f58d5a..c00a1c867 100644
--- a/src/main/twirl/wiki/wikihistory.scala.html
+++ b/src/main/twirl/wiki/history.scala.html
@@ -3,7 +3,7 @@
 @import view.helpers._
 @html.main("History - " + repository.owner + "/" + repository.name){
   @html.header("wiki", repository)
-  @wikitab(if(pageName.isEmpty) "history" else "", repository)
+  @tab(if(pageName.isEmpty) "history" else "", repository)
   <ul class="nav nav-tabs">
     <li>
       <h1 class="wiki-title">
diff --git a/src/main/twirl/wiki/wiki.scala.html b/src/main/twirl/wiki/page.scala.html
similarity index 94%
rename from src/main/twirl/wiki/wiki.scala.html
rename to src/main/twirl/wiki/page.scala.html
index 3c98b65fa..9dae44a4b 100644
--- a/src/main/twirl/wiki/wiki.scala.html
+++ b/src/main/twirl/wiki/page.scala.html
@@ -3,7 +3,7 @@
 @import view.helpers._
 @html.main(pageName + " - " + repository.owner + "/" + repository.name){
   @html.header("wiki", repository)
-  @wikitab((if(pageName == "Home") "home" else ""), repository)
+  @tab((if(pageName == "Home") "home" else ""), repository)
   <ul class="nav nav-tabs">
     <li>
       <h1 class="wiki-title">@pageName</h1>
diff --git a/src/main/twirl/wiki/wikipages.scala.html b/src/main/twirl/wiki/pages.scala.html
similarity index 95%
rename from src/main/twirl/wiki/wikipages.scala.html
rename to src/main/twirl/wiki/pages.scala.html
index c827eb905..09e6113a4 100644
--- a/src/main/twirl/wiki/wikipages.scala.html
+++ b/src/main/twirl/wiki/pages.scala.html
@@ -3,7 +3,7 @@
 @import view.helpers._
 @html.main("Pages - " + repository.owner + "/" + repository.name){
   @html.header("wiki", repository)
-  @wikitab("pages", repository)
+  @tab("pages", repository)
   <ul class="nav nav-tabs">
     <li>
       <h1 class="wiki-title"><span class="muted">Pages</span></h1>
diff --git a/src/main/twirl/wiki/wikitab.scala.html b/src/main/twirl/wiki/tab.scala.html
similarity index 100%
rename from src/main/twirl/wiki/wikitab.scala.html
rename to src/main/twirl/wiki/tab.scala.html