diff --git a/src/Vervis/Handler/Key.hs b/src/Vervis/Handler/Key.hs
index 45d0a20..3597384 100644
--- a/src/Vervis/Handler/Key.hs
+++ b/src/Vervis/Handler/Key.hs
@@ -52,7 +52,7 @@ getKeysR user = do
     defaultLayout $ do
         setTitle $ toHtml $
             intercalate " > " ["Vervis", "People", user, "Keys"]
-        $(widgetFile "keys")
+        $(widgetFile "key/keys")
 
 postKeysR :: Text -> Handler Html
 postKeysR user = do
@@ -68,10 +68,10 @@ postKeysR user = do
             redirectUltDest HomeR
         FormMissing -> do
             setMessage "Field(s) missing"
-            defaultLayout $(widgetFile "key-new")
+            defaultLayout $(widgetFile "key/key-new")
         FormFailure _l -> do
             setMessage "Invalid input, see below"
-            defaultLayout $(widgetFile "key-new")
+            defaultLayout $(widgetFile "key/key-new")
 
 getKeyNewR :: Text -> Handler Html
 getKeyNewR user = do
@@ -82,7 +82,7 @@ getKeyNewR user = do
     ((_result, widget), enctype) <- runFormPost $ newKeyForm pid
     defaultLayout $ do
         setTitle $ toHtml $ "Vervis > People > " <> user <> " > New Key"
-        $(widgetFile "key-new")
+        $(widgetFile "key/key-new")
 
 getKeyR :: Text -> Text -> Handler Html
 getKeyR user tag = do
@@ -95,4 +95,4 @@ getKeyR user tag = do
     defaultLayout $ do
         setTitle $ toHtml $
             intercalate " > " ["Vervis", "People", user, "Keys", tag]
-        $(widgetFile "key")
+        $(widgetFile "key/key")
diff --git a/templates/key-new.hamlet b/templates/key/key-new.hamlet
similarity index 100%
rename from templates/key-new.hamlet
rename to templates/key/key-new.hamlet
diff --git a/templates/key.hamlet b/templates/key/key.hamlet
similarity index 100%
rename from templates/key.hamlet
rename to templates/key/key.hamlet
diff --git a/templates/keys.hamlet b/templates/key/keys.hamlet
similarity index 100%
rename from templates/keys.hamlet
rename to templates/key/keys.hamlet