diff --git a/Handler/Haddock.hs b/Handler/Haddock.hs
index 5331e7a..3cc191b 100644
--- a/Handler/Haddock.hs
+++ b/Handler/Haddock.hs
@@ -103,7 +103,7 @@ createHaddockUnpacker root store = do
       where
         dir = mkDir ident
 
-    mkDir ident = root </> fpFromText (toPathPiece ident)
+    mkDir ident = root </> "idents" </> fpFromText (toPathPiece ident)
 
     -- Procedure is to:
     --
diff --git a/Import.hs b/Import.hs
index b2570d4..48cdd4c 100644
--- a/Import.hs
+++ b/Import.hs
@@ -15,7 +15,7 @@ import Data.Slug (mkSlug)
 getHaddockDir :: PackageSetIdent -> Handler FilePath
 getHaddockDir ident = do
     master <- getYesod
-    return $ haddockRootDir master </> fpFromText (toPathPiece ident)
+    return $ haddockRootDir master </> "idents" </> fpFromText (toPathPiece ident)
 
 requireAuthIdOrToken :: Handler UserId
 requireAuthIdOrToken = do