remove hs files from config dir

yesod/scaffold.hs

@@ -144,6 +144,7 @@ scaffold = do
     mkDir "config"
     mkDir "Model"
     mkDir "deploy"
+    mkDir "Settings"
      
     writeFile' ("deploy/Procfile") $(codegen "deploy/Procfile")
 
@@ -165,8 +166,8 @@ scaffold = do
     writeFile' "Application.hs" $ ifTiny $(codegen "tiny/Application.hs") $(codegen "Application.hs")
     writeFile' "Handler/Root.hs" $ ifTiny $(codegen "tiny/Handler/Root.hs") $(codegen "Handler/Root.hs")
     unless isTiny $ writeFile' "Model.hs" $(codegen "Model.hs")
-    writeFile' "config/Settings.hs" $ ifTiny $(codegen "tiny/config/Settings.hs") $(codegen "config/Settings.hs")
-    writeFile' "config/StaticFiles.hs" $(codegen "config/StaticFiles.hs")
+    writeFile' "Settings.hs" $ ifTiny $(codegen "tiny/Settings.hs") $(codegen "Settings.hs")
+    writeFile' "Settings/StaticFiles.hs" $(codegen "Settings/StaticFiles.hs")
     writeFile' "cassius/default-layout.cassius"
         $(codegen "cassius/default-layout.cassius")
     writeFile' "hamlet/default-layout.hamlet"

yesod/scaffold/Foundation.hs.cg

@@ -17,7 +17,7 @@ module Foundation
 
 import Yesod
 import Yesod.Static
-import StaticFiles
+import Settings.StaticFiles
 import Yesod.Auth
 import Yesod.Auth.OpenId
 import Yesod.Auth.Email

yesod/scaffold/Settings/StaticFiles.hs.cg

@@ -1,5 +1,5 @@
 {-# LANGUAGE QuasiQuotes, TemplateHaskell, TypeFamilies #-}
-module StaticFiles where
+module Settings.StaticFiles where
 
 import Yesod.Static
 

yesod/scaffold/project.cabal.cg

@@ -26,11 +26,11 @@ library
     else
         Buildable: False
     exposed-modules: Application
-    hs-source-dirs: ., config
+    hs-source-dirs: .
     other-modules:   Foundation
                      Model
                      Settings
-                     StaticFiles
+                     Settings.StaticFiles
                      Handler.Root
 
 executable         ~project~
@@ -47,7 +47,7 @@ executable         ~project~
         cpp-options: -DWINDOWS
 
     main-is:       main.hs
-    hs-source-dirs: ., config
+    hs-source-dirs: .
 
     build-depends: base         >= 4       && < 5
                  , yesod        >= 0.9     && < 0.10

yesod/scaffold/tiny/Foundation.hs.cg

@@ -15,13 +15,12 @@ module Foundation
 
 import Yesod.Core
 import Yesod.Static
-import StaticFiles
+import Settings.StaticFiles
 import Yesod.Logger (Logger, logLazyText)
 import qualified Settings
 import System.Directory
 import qualified Data.ByteString.Lazy as L
 import Settings (hamletFile, cassiusFile, luciusFile, juliusFile, widgetFile)
-import StaticFiles
 import Control.Monad (unless)
 import Control.Monad.Trans.Class (lift)
 import Control.Monad.IO.Class (liftIO)

yesod/scaffold/tiny/project.cabal.cg

@@ -26,10 +26,10 @@ library
     else
         Buildable: False
     exposed-modules: Handler
-    hs-source-dirs: ., config
+    hs-source-dirs: .
     other-modules:   Foundation
                      Settings
-                     StaticFiles
+                     Settings.StaticFiles
                      Handler.Root
 
 executable         ~project~
@@ -43,7 +43,7 @@ executable         ~project~
         ghc-options:   -Wall -threaded
 
     main-is:       main.hs
-    hs-source-dirs: ., config
+    hs-source-dirs: .
 
     build-depends: base         >= 4       && < 5
                  , yesod-core   >= 0.9     && < 0.10

yesod/yesod.cabal

@@ -29,7 +29,7 @@ extra-source-files:
   scaffold/tiny/hamlet/homepage.hamlet.cg
   scaffold/tiny/Handler/Root.hs.cg
   scaffold/tiny/config/routes.cg
-  scaffold/tiny/config/Settings.hs.cg
+  scaffold/tiny/Settings.hs.cg
   scaffold/static/css/normalize.css.cg
   scaffold/postgresqlConnPool.cg
   scaffold/sqliteConnPool.cg
@@ -50,7 +50,7 @@ extra-source-files:
   scaffold/config/postgresql.yml.cg
   scaffold/config/mongoDB.yml.cg
   scaffold/config/routes.cg
-  scaffold/config/Settings.hs.cg
+  scaffold/Settings.hs.cg
   scaffold/config/StaticFiles.hs.cg