diff --git a/src/Vervis/Handler/Repo.hs b/src/Vervis/Handler/Repo.hs
index ec28497..f2cc40b 100644
--- a/src/Vervis/Handler/Repo.hs
+++ b/src/Vervis/Handler/Repo.hs
@@ -72,7 +72,7 @@ getReposR user proj = do
     defaultLayout $ do
         setTitle $ toHtml $ mconcat
             ["Vervis > People > ", user, " > Projects > ", proj, " Repos"]
-        $(widgetFile "repos")
+        $(widgetFile "repo/repos")
 
 postReposR :: Text -> Text -> Handler Html
 postReposR user proj = do
@@ -91,10 +91,10 @@ postReposR user proj = do
             redirectUltDest HomeR
         FormMissing -> do
             setMessage "Field(s) missing"
-            defaultLayout $(widgetFile "repo-new")
+            defaultLayout $(widgetFile "repo/repo-new")
         FormFailure l -> do
             setMessage $ toHtml $ intercalate "; " l
-            defaultLayout $(widgetFile "repo-new")
+            defaultLayout $(widgetFile "repo/repo-new")
 
 getRepoNewR :: Text -> Text -> Handler Html
 getRepoNewR user proj = do
@@ -105,7 +105,7 @@ getRepoNewR user proj = do
     defaultLayout $ do
         setTitle $ toHtml $ mconcat
             ["Vervis > People > ", user, " > Projects > ", proj, " > New Repo"]
-        $(widgetFile "repo-new")
+        $(widgetFile "repo/repo-new")
 
 instance ResultList D.DList where
     emptyList = D.empty
@@ -139,4 +139,4 @@ getRepoR user proj repo = do
     defaultLayout $ do
         setTitle $ toHtml $ intercalate " > " $
             ["Vervis", "People", user, "Projects", proj, "Repos", repo]
-        $(widgetFile "repo")
+        $(widgetFile "repo/repo")
diff --git a/templates/repo-new.hamlet b/templates/repo/repo-new.hamlet
similarity index 100%
rename from templates/repo-new.hamlet
rename to templates/repo/repo-new.hamlet
diff --git a/templates/repo.hamlet b/templates/repo/repo.hamlet
similarity index 100%
rename from templates/repo.hamlet
rename to templates/repo/repo.hamlet
diff --git a/templates/repos.hamlet b/templates/repo/repos.hamlet
similarity index 100%
rename from templates/repos.hamlet
rename to templates/repo/repos.hamlet