diff --git a/src/main/scala/app/UserManagementController.scala b/src/main/scala/app/UserManagementController.scala
index af98c5a..3b6d00f 100644
--- a/src/main/scala/app/UserManagementController.scala
+++ b/src/main/scala/app/UserManagementController.scala
@@ -29,11 +29,11 @@
   )(UserEditForm.apply)
   
   get("/admin/users")(adminOnly {
-    admin.html.userlist(getAllUsers())
+    admin.users.html.list(getAllUsers())
   })
   
   get("/admin/users/_new")(adminOnly {
-    admin.html.useredit(None)
+    admin.users.html.edit(None)
   })
   
   post("/admin/users/_new", newForm)(adminOnly { form =>
@@ -43,7 +43,7 @@
   
   get("/admin/users/:userName/_edit")(adminOnly {
     val userName = params("userName")
-    admin.html.useredit(getAccountByUserName(userName))
+    admin.users.html.edit(getAccountByUserName(userName))
   })
   
   post("/admin/users/:name/_edit", editForm)(adminOnly { form =>
diff --git a/src/main/twirl/admin/useredit.scala.html b/src/main/twirl/admin/useredit.scala.html
deleted file mode 100644
index 4e55fea..0000000
--- a/src/main/twirl/admin/useredit.scala.html
+++ /dev/null
@@ -1,45 +0,0 @@
-@(account: Option[model.Account])(implicit context: app.Context)
-@import context._
-@html.main(if(account.isEmpty) "New User" else "Update User"){
-  @menu("users"){
-    <form method="POST" action="@if(account.isEmpty){@path/admin/users/_new} else {@path/admin/users/@account.get.userName/_edit}" validate="true">
-      <fieldset>
-        <label for="userName"><strong>Username</strong></label>
-        <input type="text" name="userName" id="userName" value="@account.map(_.userName)"@if(account.isDefined){ readonly}/>
-        <span id="error-userName" class="error"></span>
-      </fieldset>
-      <fieldset>
-        <label for="password"><strong>Password</strong>
-          @if(account.isDefined){
-            (Input to change password)
-          }
-        </label>
-        <input type="password" name="password" id="password" value="" autocomplete="off"/>
-        <span id="error-password" class="error"></span>
-      </fieldset>
-      <fieldset>
-        <label for="mailAddress"><strong>Mail Address</strong></label>
-        <input type="text" name="mailAddress" id="mailAddress" value="@account.map(_.mailAddress)"/>
-        <span id="error-mailAddress" class="error"></span>
-      </fieldset>
-      <fieldset>
-        <label><strong>User Type</strong></label>
-        <label for="userType_Normal">
-          <input type="radio" name="isAdmin" id="userType_Normal" value="false"@if(account.isEmpty || !account.get.isAdmin){ checked}/> Normal
-        </label>
-        <label for="userType_Admin">
-          <input type="radio" name="isAdmin" id="userType_Admin" value="true"@if(account.isDefined && account.get.isAdmin){ checked}/> Administrator
-        </label>
-      </fieldset>
-      <fieldset>
-        <label><strong>URL (Optional)</strong></label>
-        <input type="text" name="url" id="url" style="width: 400px;" value="@account.map(_.url)"/>
-        <span id="error-url" class="error"></span>
-      </fieldset>
-      <fieldset>
-        <input type="submit" class="btn btn-success" value="@if(account.isEmpty){Create User} else {Update User}"/>
-        <a href="@path/admin/users" class="btn">Cancel</a>
-      </fieldset>
-    </form>
-  }
-}
\ No newline at end of file
diff --git a/src/main/twirl/admin/userlist.scala.html b/src/main/twirl/admin/userlist.scala.html
deleted file mode 100644
index 28a7700..0000000
--- a/src/main/twirl/admin/userlist.scala.html
+++ /dev/null
@@ -1,41 +0,0 @@
-@(users: List[model.Account])(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@html.main("Manage Users"){
-  @menu("users"){
-    <div style="text-align: right; margin-bottom: 4px;">
-      <a href="@path/admin/users/_new" class="btn">New User</a>
-    </div>
-    <table class="table table-bordered table-hover">
-      @users.map { account =>
-        <tr>
-          <td>
-            <div class="pull-right">
-              <a href="@path/admin/users/@account.userName/_edit">Edit</a>
-            </div>
-            <div class="strong">
-              <a href="@url(account.userName)">@account.userName</a>
-              @if(account.isAdmin){
-                (Administrator)
-              } else {
-                (Normal)
-              }
-            </div>
-            <div>
-              <hr>
-              <i class="icon-envelope"></i> @account.mailAddress
-              @account.url.map { url =>
-                <i class="icon-home"></i> @url
-              }
-            </div>
-            <div>
-              <span class="muted">Registered:</span> @datetime(account.registeredDate)
-              <span class="muted">Updated:</span> @datetime(account.updatedDate)
-              <span class="muted">Last Login:</span> @account.lastLoginDate.map(datetime)
-            </div>
-          </td>
-        </tr>
-      }
-    </table>
-  }
-}
\ No newline at end of file
diff --git a/src/main/twirl/admin/users/edit.scala.html b/src/main/twirl/admin/users/edit.scala.html
new file mode 100644
index 0000000..a048880
--- /dev/null
+++ b/src/main/twirl/admin/users/edit.scala.html
@@ -0,0 +1,45 @@
+@(account: Option[model.Account])(implicit context: app.Context)
+@import context._
+@html.main(if(account.isEmpty) "New User" else "Update User"){
+  @admin.html.menu("users"){
+    <form method="POST" action="@if(account.isEmpty){@path/admin/users/_new} else {@path/admin/users/@account.get.userName/_edit}" validate="true">
+      <fieldset>
+        <label for="userName"><strong>Username</strong></label>
+        <input type="text" name="userName" id="userName" value="@account.map(_.userName)"@if(account.isDefined){ readonly}/>
+        <span id="error-userName" class="error"></span>
+      </fieldset>
+      <fieldset>
+        <label for="password"><strong>Password</strong>
+          @if(account.isDefined){
+            (Input to change password)
+          }
+        </label>
+        <input type="password" name="password" id="password" value="" autocomplete="off"/>
+        <span id="error-password" class="error"></span>
+      </fieldset>
+      <fieldset>
+        <label for="mailAddress"><strong>Mail Address</strong></label>
+        <input type="text" name="mailAddress" id="mailAddress" value="@account.map(_.mailAddress)"/>
+        <span id="error-mailAddress" class="error"></span>
+      </fieldset>
+      <fieldset>
+        <label><strong>User Type</strong></label>
+        <label for="userType_Normal">
+          <input type="radio" name="isAdmin" id="userType_Normal" value="false"@if(account.isEmpty || !account.get.isAdmin){ checked}/> Normal
+        </label>
+        <label for="userType_Admin">
+          <input type="radio" name="isAdmin" id="userType_Admin" value="true"@if(account.isDefined && account.get.isAdmin){ checked}/> Administrator
+        </label>
+      </fieldset>
+      <fieldset>
+        <label><strong>URL (Optional)</strong></label>
+        <input type="text" name="url" id="url" style="width: 400px;" value="@account.map(_.url)"/>
+        <span id="error-url" class="error"></span>
+      </fieldset>
+      <fieldset>
+        <input type="submit" class="btn btn-success" value="@if(account.isEmpty){Create User} else {Update User}"/>
+        <a href="@path/admin/users" class="btn">Cancel</a>
+      </fieldset>
+    </form>
+  }
+}
\ No newline at end of file
diff --git a/src/main/twirl/admin/users/list.scala.html b/src/main/twirl/admin/users/list.scala.html
new file mode 100644
index 0000000..bffa161
--- /dev/null
+++ b/src/main/twirl/admin/users/list.scala.html
@@ -0,0 +1,41 @@
+@(users: List[model.Account])(implicit context: app.Context)
+@import context._
+@import view.helpers._
+@html.main("Manage Users"){
+  @admin.html.menu("users"){
+    <div style="text-align: right; margin-bottom: 4px;">
+      <a href="@path/admin/users/_new" class="btn">New User</a>
+    </div>
+    <table class="table table-bordered table-hover">
+      @users.map { account =>
+        <tr>
+          <td>
+            <div class="pull-right">
+              <a href="@path/admin/users/@account.userName/_edit">Edit</a>
+            </div>
+            <div class="strong">
+              <a href="@url(account.userName)">@account.userName</a>
+              @if(account.isAdmin){
+                (Administrator)
+              } else {
+                (Normal)
+              }
+            </div>
+            <div>
+              <hr>
+              <i class="icon-envelope"></i> @account.mailAddress
+              @account.url.map { url =>
+                <i class="icon-home"></i> @url
+              }
+            </div>
+            <div>
+              <span class="muted">Registered:</span> @datetime(account.registeredDate)
+              <span class="muted">Updated:</span> @datetime(account.updatedDate)
+              <span class="muted">Last Login:</span> @account.lastLoginDate.map(datetime)
+            </div>
+          </td>
+        </tr>
+      }
+    </table>
+  }
+}
\ No newline at end of file