diff --git a/src/main/scala/app/AccountController.scala b/src/main/scala/app/AccountController.scala
index 4cd9785..f89cb74 100644
--- a/src/main/scala/app/AccountController.scala
+++ b/src/main/scala/app/AccountController.scala
@@ -247,7 +247,7 @@
    * Show the new repository form.
    */
   get("/new")(usersOnly {
-    html.newrepo(getGroupsByUserName(context.loginAccount.get.userName))
+    account.html.newrepo(getGroupsByUserName(context.loginAccount.get.userName))
   })
 
   /**
diff --git a/src/main/twirl/account/newrepo.scala.html b/src/main/twirl/account/newrepo.scala.html
new file mode 100644
index 0000000..b5f6c6a
--- /dev/null
+++ b/src/main/twirl/account/newrepo.scala.html
@@ -0,0 +1,73 @@
+@(groupNames: List[String])(implicit context: app.Context)
+@import context._
+@import view.helpers._
+@html.main("Create a New Repository"){
+<div style="width: 600px; margin: 10px auto;">
+  <form id="form" method="post" action="@path/new" validate="true">
+    <fieldset>
+      <label for="name" class="strong">Repository name:</label>
+      <div class="btn-group" style="margin-bottom: 10px;" id="owner-dropdown">
+        <button class="btn dropdown-toggle" data-toggle="dropdown">
+          <span class="strong">@avatar(loginAccount.get.userName, 20) @loginAccount.get.userName</span>
+          <span class="caret"></span>
+        </button>
+        <ul class="dropdown-menu">
+          <li><a href="javascript:void(0);" data-name="@loginAccount.get.userName"><i class="icon-ok"></i> <span>@avatar(loginAccount.get.userName, 20) @loginAccount.get.userName</span></a></li>
+          @groupNames.map { groupName =>
+            <li><a href="javascript:void(0);" data-name="@groupName"><i class="icon-white"></i> <span>@avatar(groupName, 20) @groupName</span></a></li>
+          }
+        </ul>
+        <input type="hidden" name="owner" id="owner" value="@loginAccount.get.userName"/>
+      </div>
+      <span class="slash">/</span>
+      <input type="text" name="name" id="name" />
+      <span id="error-name" class="error"></span>
+    </fieldset>
+    <fieldset>
+      <label for="description" class="strong">Description (optional):</label>
+      <input type="text" name="description" id="description" style="width: 95%;"/>
+    </fieldset>
+    <fieldset class="margin">
+      <label class="radio">
+        <input type="radio" name="isPrivate" value="false" checked>
+        <span class="strong"><img src="@assets/common/images/repo_public.png"/>&nbsp;</i>&nbsp;Public</span><br>
+        <div>
+          <span>All users and guests can read this repository.</span>
+        </div>
+      </label>
+    </fieldset>
+    <fieldset>
+      <label class="radio">
+        <input type="radio" name="isPrivate" value="true">
+        <span class="strong"><img src="@assets/common/images/repo_private.png"/>&nbsp;</i>&nbsp;Private</span><br>
+        <div>
+          <span>Only collaborators can read this repository.</span>
+        </div>
+      </label>
+    </fieldset>
+    <fieldset class="margin">
+      <label for="createReadme" class="checkbox">
+        <input type="checkbox" name="createReadme" id="createReadme"/>
+        <span class="strong">Initialize this repository with a README</span>
+        <div>
+          <span>This will allow you to <code>git clone</code> the repository immediately.</span>
+        </div>
+      </label>
+    </fieldset>
+    <fieldset class="margin">
+      <input type="submit" class="btn btn-success" value="Create repository"/>
+    </fieldset>
+  </form>
+</div>
+}
+<script>
+$('#owner-dropdown a').click(function(){
+  var userName = $(this).data('name');
+  $('#owner').val(userName);
+
+  $('#owner-dropdown i').attr('class', 'icon-white');
+  $(this).find('i').attr('class', 'icon-ok');
+
+  $('#owner-dropdown span.strong').html($(this).find('span').html());
+});
+</script>
diff --git a/src/main/twirl/newrepo.scala.html b/src/main/twirl/newrepo.scala.html
deleted file mode 100644
index 05fefbc..0000000
--- a/src/main/twirl/newrepo.scala.html
+++ /dev/null
@@ -1,73 +0,0 @@
-@(groupNames: List[String])(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@main("Create a New Repository"){
-<div style="width: 600px; margin: 10px auto;">
-  <form id="form" method="post" action="@path/new" validate="true">
-    <fieldset>
-      <label for="name" class="strong">Repository name:</label>
-      <div class="btn-group" style="margin-bottom: 10px;" id="owner-dropdown">
-        <button class="btn dropdown-toggle" data-toggle="dropdown">
-          <span class="strong">@avatar(loginAccount.get.userName, 20) @loginAccount.get.userName</span>
-          <span class="caret"></span>
-        </button>
-        <ul class="dropdown-menu">
-          <li><a href="javascript:void(0);" data-name="@loginAccount.get.userName"><i class="icon-ok"></i> <span>@avatar(loginAccount.get.userName, 20) @loginAccount.get.userName</span></a></li>
-          @groupNames.map { groupName =>
-            <li><a href="javascript:void(0);" data-name="@groupName"><i class="icon-white"></i> <span>@avatar(groupName, 20) @groupName</span></a></li>
-          }
-        </ul>
-        <input type="hidden" name="owner" id="owner" value="@loginAccount.get.userName"/>
-      </div>
-      <span class="slash">/</span>
-      <input type="text" name="name" id="name" />
-      <span id="error-name" class="error"></span>
-    </fieldset>
-    <fieldset>
-      <label for="description" class="strong">Description (optional):</label>
-      <input type="text" name="description" id="description" style="width: 95%;"/>
-    </fieldset>
-    <fieldset class="margin">
-      <label class="radio">
-        <input type="radio" name="isPrivate" value="false" checked>
-        <span class="strong"><img src="@assets/common/images/repo_public.png"/>&nbsp;</i>&nbsp;Public</span><br>
-        <div>
-          <span>All users and guests can read this repository.</span>
-        </div>
-      </label>
-    </fieldset>
-    <fieldset>
-      <label class="radio">
-        <input type="radio" name="isPrivate" value="true">
-        <span class="strong"><img src="@assets/common/images/repo_private.png"/>&nbsp;</i>&nbsp;Private</span><br>
-        <div>
-          <span>Only collaborators can read this repository.</span>
-        </div>
-      </label>
-    </fieldset>
-    <fieldset class="margin">
-      <label for="createReadme" class="checkbox">
-        <input type="checkbox" name="createReadme" id="createReadme"/>
-        <span class="strong">Initialize this repository with a README</span>
-        <div>
-          <span>This will allow you to <code>git clone</code> the repository immediately.</span>
-        </div>
-      </label>
-    </fieldset>
-    <fieldset class="margin">
-      <input type="submit" class="btn btn-success" value="Create repository"/>
-    </fieldset>
-  </form>
-</div>
-}
-<script>
-$('#owner-dropdown a').click(function(){
-  var userName = $(this).data('name');
-  $('#owner').val(userName);
-
-  $('#owner-dropdown i').attr('class', 'icon-white');
-  $(this).find('i').attr('class', 'icon-ok');
-
-  $('#owner-dropdown span.strong').html($(this).find('span').html());
-});
-</script>