diff --git a/yesod/MultiFile.hs b/yesod/MultiFile.hs
index 303657e4..be382ef2 100644
--- a/yesod/MultiFile.hs
+++ b/yesod/MultiFile.hs
@@ -1,23 +1,27 @@
+-- FIXME: Depend on the not-yet-released project-template library.
 {-# LANGUAGE OverloadedStrings #-}
 module MultiFile where
 
-import Prelude hiding (FilePath)
-import Data.Conduit (yield, (=$), ($$), awaitForever, Conduit, leftover, await, Sink, MonadResource)
-import Data.Text (Text)
-import Control.Monad.IO.Class (MonadIO, liftIO)
-import Data.Functor.Identity (runIdentity)
-import qualified Data.ByteString.Base64 as B64
-import qualified Data.ByteString as S
-import Control.Monad (unless)
-import Data.Conduit.List (sinkNull)
-import qualified Data.Conduit.Text as CT
-import qualified Data.Conduit.List as CL
-import Filesystem.Path.CurrentOS (encode, directory, fromText, (</>), FilePath, encodeString)
-import Filesystem (createTree)
-import Control.Monad.Trans.Resource (runExceptionT)
-import Data.Conduit.Binary (sinkFile)
-import Data.Text.Encoding (encodeUtf8)
-import qualified Data.Text as T
+import           Control.Monad                (unless)
+import           Control.Monad.IO.Class       (MonadIO, liftIO)
+import           Control.Monad.Trans.Resource (runExceptionT)
+import qualified Data.ByteString              as S
+import qualified Data.ByteString.Base64       as B64
+import           Data.Conduit                 (Conduit, MonadResource, Sink,
+                                               await, awaitForever, leftover,
+                                               yield, ($$), (=$))
+import           Data.Conduit.Binary          (sinkFile)
+import           Data.Conduit.List            (sinkNull)
+import qualified Data.Conduit.List            as CL
+import qualified Data.Conduit.Text            as CT
+import           Data.Functor.Identity        (runIdentity)
+import           Data.Text                    (Text)
+import qualified Data.Text                    as T
+import           Data.Text.Encoding           (encodeUtf8)
+import           Filesystem                   (createTree)
+import           Filesystem.Path.CurrentOS    (FilePath, directory, encode,
+                                               encodeString, fromText, (</>))
+import           Prelude                      hiding (FilePath)
 
 unpackMultiFile
     :: MonadResource m
diff --git a/yesod/Scaffolding/Scaffolder.hs b/yesod/Scaffolding/Scaffolder.hs
index 58280720..95d505b2 100644
--- a/yesod/Scaffolding/Scaffolder.hs
+++ b/yesod/Scaffolding/Scaffolder.hs
@@ -1,18 +1,18 @@
-{-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE TemplateHaskell   #-}
 module Scaffolding.Scaffolder (scaffold) where
 
-import qualified Data.Text.Lazy as LT
+import           Control.Arrow         ((&&&))
 import qualified Data.ByteString.Char8 as S
-import System.IO
-import Text.Shakespeare.Text (textFile, renderTextUrl)
-import qualified Data.Text as T
-import qualified Data.Text.Lazy.IO as TLIO
-import Control.Arrow ((&&&))
-import Data.FileEmbed (embedFile)
-import Data.String (fromString)
-import MultiFile (unpackMultiFile)
-import Data.Conduit (yield, ($$), runResourceT)
+import           Data.Conduit          (runResourceT, yield, ($$))
+import           Data.FileEmbed        (embedFile)
+import           Data.String           (fromString)
+import qualified Data.Text             as T
+import qualified Data.Text.Lazy        as LT
+import qualified Data.Text.Lazy.IO     as TLIO
+import           MultiFile             (unpackMultiFile)
+import           System.IO
+import           Text.Shakespeare.Text (renderTextUrl, textFile)
 
 prompt :: (String -> Maybe a) -> IO a
 prompt f = do