diff --git a/src/main/twirl/diff.scala.html b/src/main/twirl/diff.scala.html
index 70b50623c..64d01d5c9 100644
--- a/src/main/twirl/diff.scala.html
+++ b/src/main/twirl/diff.scala.html
@@ -1,4 +1,4 @@
-@(diffs: Seq[util.JGitUtil.DiffInfo], repository: service.ProjectService.RepositoryInfo, commitId: Option[String])(implicit context: app.Context)
+@(diffs: Seq[util.JGitUtil.DiffInfo], repository: service.RepositoryService.RepositoryInfo, commitId: Option[String])(implicit context: app.Context)
 @import context._
 @import org.eclipse.jgit.diff.DiffEntry.ChangeType
 @diffs.zipWithIndex.map { case (diff, i) =>
diff --git a/src/main/twirl/header.scala.html b/src/main/twirl/header.scala.html
index 0a75eb2d1..7f90f497e 100644
--- a/src/main/twirl/header.scala.html
+++ b/src/main/twirl/header.scala.html
@@ -1,4 +1,4 @@
-@(active: String, repository: service.ProjectService.RepositoryInfo)(implicit context: app.Context)
+@(active: String, repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
 @import context._
 <div class="head">
   <a href="@path/@repository.owner">@repository.owner</a> / <a href="@path/@repository.owner/@repository.name">@repository.name</a>
diff --git a/src/main/twirl/index.scala.html b/src/main/twirl/index.scala.html
index 75eb76dbe..59947846a 100644
--- a/src/main/twirl/index.scala.html
+++ b/src/main/twirl/index.scala.html
@@ -1,4 +1,4 @@
-@(repositories: List[service.ProjectService.RepositoryInfo])(implicit context: app.Context)
+@(repositories: List[service.RepositoryService.RepositoryInfo])(implicit context: app.Context)
 @import context._
 @main("GitBucket"){
   <h3>Recent updated repositories</h3>
diff --git a/src/main/twirl/repo/blob.scala.html b/src/main/twirl/repo/blob.scala.html
index 78fb9ec8f..f080e8b68 100644
--- a/src/main/twirl/repo/blob.scala.html
+++ b/src/main/twirl/repo/blob.scala.html
@@ -1,4 +1,4 @@
-@(branch: String, repository: service.ProjectService.RepositoryInfo, pathList: List[String], content: util.JGitUtil.ContentInfo, latestCommit: util.JGitUtil.CommitInfo)(implicit context: app.Context)
+@(branch: String, repository: service.RepositoryService.RepositoryInfo, pathList: List[String], content: util.JGitUtil.ContentInfo, latestCommit: util.JGitUtil.CommitInfo)(implicit context: app.Context)
 @import context._
 @import view.helpers
 @html.main(repository.owner+"/"+repository.name) {
diff --git a/src/main/twirl/repo/commit.scala.html b/src/main/twirl/repo/commit.scala.html
index 44d1143e2..a217b3925 100644
--- a/src/main/twirl/repo/commit.scala.html
+++ b/src/main/twirl/repo/commit.scala.html
@@ -1,4 +1,4 @@
-@(branch: String, commit: util.JGitUtil.CommitInfo, repository: service.ProjectService.RepositoryInfo, diffs: Seq[util.JGitUtil.DiffInfo])(implicit context: app.Context)
+@(branch: String, commit: util.JGitUtil.CommitInfo, repository: service.RepositoryService.RepositoryInfo, diffs: Seq[util.JGitUtil.DiffInfo])(implicit context: app.Context)
 @import context._
 @import view.helpers
 @import org.eclipse.jgit.diff.DiffEntry.ChangeType
diff --git a/src/main/twirl/repo/commits.scala.html b/src/main/twirl/repo/commits.scala.html
index 159a1424d..a53a9bb21 100644
--- a/src/main/twirl/repo/commits.scala.html
+++ b/src/main/twirl/repo/commits.scala.html
@@ -1,4 +1,4 @@
-@(pathList: List[String], branch: String, repository: service.ProjectService.RepositoryInfo, commits: Seq[Seq[util.JGitUtil.CommitInfo]], page: Int, hasNext: Boolean)(implicit context: app.Context)
+@(pathList: List[String], branch: String, repository: service.RepositoryService.RepositoryInfo, commits: Seq[Seq[util.JGitUtil.CommitInfo]], page: Int, hasNext: Boolean)(implicit context: app.Context)
 @import context._
 @import view.helpers
 @html.main(repository.owner+"/"+repository.name) {
diff --git a/src/main/twirl/repo/files.scala.html b/src/main/twirl/repo/files.scala.html
index 17e443a6e..d130172fd 100644
--- a/src/main/twirl/repo/files.scala.html
+++ b/src/main/twirl/repo/files.scala.html
@@ -1,4 +1,4 @@
-@(branch: String, repository: service.ProjectService.RepositoryInfo, pathList: List[String], latestCommit: util.JGitUtil.CommitInfo, files: List[util.JGitUtil.FileInfo], readme: Option[String])(implicit context: app.Context)
+@(branch: String, repository: service.RepositoryService.RepositoryInfo, pathList: List[String], latestCommit: util.JGitUtil.CommitInfo, files: List[util.JGitUtil.FileInfo], readme: Option[String])(implicit context: app.Context)
 @import context._
 @import view.helpers
 @html.main(repository.owner + "/" + repository.name) {
diff --git a/src/main/twirl/repo/navtab.scala.html b/src/main/twirl/repo/navtab.scala.html
index ca64e08ac..2fb7d6b10 100644
--- a/src/main/twirl/repo/navtab.scala.html
+++ b/src/main/twirl/repo/navtab.scala.html
@@ -1,4 +1,4 @@
-@(id: String, repository: service.ProjectService.RepositoryInfo, active: String)(implicit context: app.Context)
+@(id: String, repository: service.RepositoryService.RepositoryInfo, active: String)(implicit context: app.Context)
 @import context._
 <ul class="nav nav-tabs">
   <li>
diff --git a/src/main/twirl/repo/tags.scala.html b/src/main/twirl/repo/tags.scala.html
index 80fd1fc23..3233f3810 100644
--- a/src/main/twirl/repo/tags.scala.html
+++ b/src/main/twirl/repo/tags.scala.html
@@ -1,4 +1,4 @@
-@(repository: service.ProjectService.RepositoryInfo)(implicit context: app.Context)
+@(repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
 @import context._
 @import view.helpers
 @html.main(repository.owner + "/" + repository.name) {
diff --git a/src/main/twirl/settings/collaborators.scala.html b/src/main/twirl/settings/collaborators.scala.html
index ce753a6b8..5ab2b5e85 100644
--- a/src/main/twirl/settings/collaborators.scala.html
+++ b/src/main/twirl/settings/collaborators.scala.html
@@ -1,4 +1,4 @@
-@(repository: service.ProjectService.RepositoryInfo)(implicit context: app.Context)
+@(repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
 @import context._
 @html.main("Settings"){
   @html.header("settings", repository)
diff --git a/src/main/twirl/settings/menu.scala.html b/src/main/twirl/settings/menu.scala.html
index d0a47819c..e68d8fbb2 100644
--- a/src/main/twirl/settings/menu.scala.html
+++ b/src/main/twirl/settings/menu.scala.html
@@ -1,4 +1,4 @@
-@(active: String, repository: service.ProjectService.RepositoryInfo)(body: Html)(implicit context: app.Context)
+@(active: String, repository: service.RepositoryService.RepositoryInfo)(body: Html)(implicit context: app.Context)
 @import context._
 <div class="row-fluid">
   <div class="span3">
diff --git a/src/main/twirl/settings/options.scala.html b/src/main/twirl/settings/options.scala.html
index f25e7f26e..c02cda3e7 100644
--- a/src/main/twirl/settings/options.scala.html
+++ b/src/main/twirl/settings/options.scala.html
@@ -1,4 +1,4 @@
-@(repository: service.ProjectService.RepositoryInfo)(implicit context: app.Context)
+@(repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
 @import context._
 @html.main("Settings"){
   @html.header("settings", repository)
diff --git a/src/main/twirl/user.scala.html b/src/main/twirl/user.scala.html
index c89054938..aa5c89b94 100644
--- a/src/main/twirl/user.scala.html
+++ b/src/main/twirl/user.scala.html
@@ -1,4 +1,4 @@
-@(account: model.Account, repositories: List[service.ProjectService.RepositoryInfo])(implicit context: app.Context)
+@(account: model.Account, repositories: List[service.RepositoryService.RepositoryInfo])(implicit context: app.Context)
 @import context._
 @main(account.userName){
   <div class="container-fluid">
diff --git a/src/main/twirl/wiki/wiki.scala.html b/src/main/twirl/wiki/wiki.scala.html
index fc95d8181..476dc2b24 100644
--- a/src/main/twirl/wiki/wiki.scala.html
+++ b/src/main/twirl/wiki/wiki.scala.html
@@ -1,4 +1,4 @@
-@(pageName: String, page: service.WikiService.WikiPageInfo, repository: service.ProjectService.RepositoryInfo)(implicit context: app.Context)
+@(pageName: String, page: service.WikiService.WikiPageInfo, repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
 @import view.helpers
 @import context._
 @html.main(pageName + " - " + repository.owner + "/" + repository.name){
diff --git a/src/main/twirl/wiki/wikicompare.scala.html b/src/main/twirl/wiki/wikicompare.scala.html
index 0c8bbdd69..4c0699ed3 100644
--- a/src/main/twirl/wiki/wikicompare.scala.html
+++ b/src/main/twirl/wiki/wikicompare.scala.html
@@ -1,4 +1,4 @@
-@(pageName: Option[String], diffs: Seq[util.JGitUtil.DiffInfo], repository: service.ProjectService.RepositoryInfo)(implicit context: app.Context)
+@(pageName: Option[String], diffs: Seq[util.JGitUtil.DiffInfo], repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
 @import view.helpers
 @import context._
 @import org.eclipse.jgit.diff.DiffEntry.ChangeType
diff --git a/src/main/twirl/wiki/wikiedit.scala.html b/src/main/twirl/wiki/wikiedit.scala.html
index efa0311d1..231f96cb3 100644
--- a/src/main/twirl/wiki/wikiedit.scala.html
+++ b/src/main/twirl/wiki/wikiedit.scala.html
@@ -1,4 +1,4 @@
-@(pageName: String, page: Option[service.WikiService.WikiPageInfo], repository: service.ProjectService.RepositoryInfo)(implicit context: app.Context)
+@(pageName: String, page: Option[service.WikiService.WikiPageInfo], repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
 @import view.helpers
 @import context._
 @html.main((if(pageName == "") "New Page" else pageName) + " - " + repository.owner + "/" + repository.name){
diff --git a/src/main/twirl/wiki/wikihistory.scala.html b/src/main/twirl/wiki/wikihistory.scala.html
index 1f596d758..284b08b50 100644
--- a/src/main/twirl/wiki/wikihistory.scala.html
+++ b/src/main/twirl/wiki/wikihistory.scala.html
@@ -1,4 +1,4 @@
-@(pageName: Option[String], commits: List[util.JGitUtil.CommitInfo], repository: service.ProjectService.RepositoryInfo)(implicit context: app.Context)
+@(pageName: Option[String], commits: List[util.JGitUtil.CommitInfo], repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
 @import view.helpers
 @import context._
 @html.main("History - " + repository.owner + "/" + repository.name){
diff --git a/src/main/twirl/wiki/wikipages.scala.html b/src/main/twirl/wiki/wikipages.scala.html
index c545bb84f..df90bcb07 100644
--- a/src/main/twirl/wiki/wikipages.scala.html
+++ b/src/main/twirl/wiki/wikipages.scala.html
@@ -1,4 +1,4 @@
-@(pages: List[String], repository: service.ProjectService.RepositoryInfo)(implicit context: app.Context)
+@(pages: List[String], repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
 @import view.helpers
 @import context._
 @html.main("Pages - " + repository.owner + "/" + repository.name){
diff --git a/src/main/twirl/wiki/wikitab.scala.html b/src/main/twirl/wiki/wikitab.scala.html
index 15f66c8c6..3dddb0c1a 100644
--- a/src/main/twirl/wiki/wikitab.scala.html
+++ b/src/main/twirl/wiki/wikitab.scala.html
@@ -1,4 +1,4 @@
-@(active: String, repository: service.ProjectService.RepositoryInfo)(implicit context: app.Context)
+@(active: String, repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
 @import context._
 <ul class="nav nav-tabs">
   <li@if(active == "home"){ class="active"}><a href="@path/@repository.owner/@repository.name/wiki">Home</a></li>