53 files changed, 21 insertions, 1 deletions
diff --git a/hakyll.cabal b/hakyll.cabal
index bc86b84..28d8020 100644
--- a/hakyll.cabal
+++ b/hakyll.cabal
@@ -96,7 +96,7 @@ Flag checkExternal
 
 Library
   Ghc-Options:    -Wall
-  Hs-Source-Dirs: src
+  Hs-Source-Dirs: lib
 
   Exposed-Modules:
     Hakyll
@@ -222,6 +222,25 @@ Test-suite hakyll-tests
   Main-is:        TestSuite.hs
   Ghc-options:    -Wall
 
+  Other-modules:
+    Hakyll.Core.Dependencies.Tests
+    Hakyll.Core.Identifier.Tests
+    Hakyll.Core.Provider.Metadata.Tests
+    Hakyll.Core.Provider.Tests
+    Hakyll.Core.Routes.Tests
+    Hakyll.Core.Rules.Tests
+    Hakyll.Core.Runtime.Tests
+    Hakyll.Core.Store.Tests
+    Hakyll.Core.UnixFilter.Tests
+    Hakyll.Core.Util.String.Tests
+    Hakyll.Web.CompressCss.Tests
+    Hakyll.Web.Html.RelativizeUrls.Tests
+    Hakyll.Web.Html.Tests
+    Hakyll.Web.Pandoc.FileType.Tests
+    Hakyll.Web.Template.Context.Tests
+    Hakyll.Web.Template.Tests
+    TestSuite.Util
+
   Build-Depends:
     hakyll,
     QuickCheck                 >= 2.8  && < 2.11,
@@ -289,6 +308,7 @@ Test-suite hakyll-tests
 
 Executable hakyll-init
   Ghc-options:    -Wall
+  Hs-source-dirs: src
   Main-is:        Init.hs
 
   Build-depends:
diff --git a/src/Data/List/Extended.hs b/lib/Data/List/Extended.hs
index 485cba8..485cba8 100644
--- a/src/Data/List/Extended.hs
+++ b/lib/Data/List/Extended.hs
diff --git a/src/Data/Yaml/Extended.hs b/lib/Data/Yaml/Extended.hs
index c940ff7..c940ff7 100644
--- a/src/Data/Yaml/Extended.hs
+++ b/lib/Data/Yaml/Extended.hs
diff --git a/src/Hakyll.hs b/lib/Hakyll.hs
index 7b64bcb..7b64bcb 100644
--- a/src/Hakyll.hs
+++ b/lib/Hakyll.hs
diff --git a/src/Hakyll/Check.hs b/lib/Hakyll/Check.hs
index da77bac..da77bac 100644
--- a/src/Hakyll/Check.hs
+++ b/lib/Hakyll/Check.hs
diff --git a/src/Hakyll/Commands.hs b/lib/Hakyll/Commands.hs
index 6763fe7..6763fe7 100644
--- a/src/Hakyll/Commands.hs
+++ b/lib/Hakyll/Commands.hs
diff --git a/src/Hakyll/Core/Compiler.hs b/lib/Hakyll/Core/Compiler.hs
index 42b24d6..42b24d6 100644
--- a/src/Hakyll/Core/Compiler.hs
+++ b/lib/Hakyll/Core/Compiler.hs
diff --git a/src/Hakyll/Core/Compiler/Internal.hs b/lib/Hakyll/Core/Compiler/Internal.hs
index 7b1df83..7b1df83 100644
--- a/src/Hakyll/Core/Compiler/Internal.hs
+++ b/lib/Hakyll/Core/Compiler/Internal.hs
diff --git a/src/Hakyll/Core/Compiler/Require.hs b/lib/Hakyll/Core/Compiler/Require.hs
index c9373bf..c9373bf 100644
--- a/src/Hakyll/Core/Compiler/Require.hs
+++ b/lib/Hakyll/Core/Compiler/Require.hs
diff --git a/src/Hakyll/Core/Configuration.hs b/lib/Hakyll/Core/Configuration.hs
index 52b23ec..52b23ec 100644
--- a/src/Hakyll/Core/Configuration.hs
+++ b/lib/Hakyll/Core/Configuration.hs
diff --git a/src/Hakyll/Core/Dependencies.hs b/lib/Hakyll/Core/Dependencies.hs
index 4a51b9c..4a51b9c 100644
--- a/src/Hakyll/Core/Dependencies.hs
+++ b/lib/Hakyll/Core/Dependencies.hs
diff --git a/src/Hakyll/Core/File.hs b/lib/Hakyll/Core/File.hs
index 49af659..49af659 100644
--- a/src/Hakyll/Core/File.hs
+++ b/lib/Hakyll/Core/File.hs
diff --git a/src/Hakyll/Core/Identifier.hs b/lib/Hakyll/Core/Identifier.hs
index 777811c..777811c 100644
--- a/src/Hakyll/Core/Identifier.hs
+++ b/lib/Hakyll/Core/Identifier.hs
diff --git a/src/Hakyll/Core/Identifier/Pattern.hs b/lib/Hakyll/Core/Identifier/Pattern.hs
index 47ad21b..47ad21b 100644
--- a/src/Hakyll/Core/Identifier/Pattern.hs
+++ b/lib/Hakyll/Core/Identifier/Pattern.hs
diff --git a/src/Hakyll/Core/Item.hs b/lib/Hakyll/Core/Item.hs
index e05df42..e05df42 100644
--- a/src/Hakyll/Core/Item.hs
+++ b/lib/Hakyll/Core/Item.hs
diff --git a/src/Hakyll/Core/Item/SomeItem.hs b/lib/Hakyll/Core/Item/SomeItem.hs
index c5ba0df..c5ba0df 100644
--- a/src/Hakyll/Core/Item/SomeItem.hs
+++ b/lib/Hakyll/Core/Item/SomeItem.hs
diff --git a/src/Hakyll/Core/Logger.hs b/lib/Hakyll/Core/Logger.hs
index 6f950a6..6f950a6 100644
--- a/src/Hakyll/Core/Logger.hs
+++ b/lib/Hakyll/Core/Logger.hs
diff --git a/src/Hakyll/Core/Metadata.hs b/lib/Hakyll/Core/Metadata.hs
index 1cf536e..1cf536e 100644
--- a/src/Hakyll/Core/Metadata.hs
+++ b/lib/Hakyll/Core/Metadata.hs
diff --git a/src/Hakyll/Core/Provider.hs b/lib/Hakyll/Core/Provider.hs
index 384f5b1..384f5b1 100644
--- a/src/Hakyll/Core/Provider.hs
+++ b/lib/Hakyll/Core/Provider.hs
diff --git a/src/Hakyll/Core/Provider/Internal.hs b/lib/Hakyll/Core/Provider/Internal.hs
index c298653..c298653 100644
--- a/src/Hakyll/Core/Provider/Internal.hs
+++ b/lib/Hakyll/Core/Provider/Internal.hs
diff --git a/src/Hakyll/Core/Provider/Metadata.hs b/lib/Hakyll/Core/Provider/Metadata.hs
index 6285ce1..6285ce1 100644
--- a/src/Hakyll/Core/Provider/Metadata.hs
+++ b/lib/Hakyll/Core/Provider/Metadata.hs
diff --git a/src/Hakyll/Core/Provider/MetadataCache.hs b/lib/Hakyll/Core/Provider/MetadataCache.hs
index 46dbf3e..46dbf3e 100644
--- a/src/Hakyll/Core/Provider/MetadataCache.hs
+++ b/lib/Hakyll/Core/Provider/MetadataCache.hs
diff --git a/src/Hakyll/Core/Routes.hs b/lib/Hakyll/Core/Routes.hs
index 513725f..513725f 100644
--- a/src/Hakyll/Core/Routes.hs
+++ b/lib/Hakyll/Core/Routes.hs
diff --git a/src/Hakyll/Core/Rules.hs b/lib/Hakyll/Core/Rules.hs
index 41b9a73..41b9a73 100644
--- a/src/Hakyll/Core/Rules.hs
+++ b/lib/Hakyll/Core/Rules.hs
diff --git a/src/Hakyll/Core/Rules/Internal.hs b/lib/Hakyll/Core/Rules/Internal.hs
index 0641dcf..0641dcf 100644
--- a/src/Hakyll/Core/Rules/Internal.hs
+++ b/lib/Hakyll/Core/Rules/Internal.hs
diff --git a/src/Hakyll/Core/Runtime.hs b/lib/Hakyll/Core/Runtime.hs
index 16a5d9e..16a5d9e 100644
--- a/src/Hakyll/Core/Runtime.hs
+++ b/lib/Hakyll/Core/Runtime.hs
diff --git a/src/Hakyll/Core/Store.hs b/lib/Hakyll/Core/Store.hs
index fdbcf11..fdbcf11 100644
--- a/src/Hakyll/Core/Store.hs
+++ b/lib/Hakyll/Core/Store.hs
diff --git a/src/Hakyll/Core/UnixFilter.hs b/lib/Hakyll/Core/UnixFilter.hs
index 734d8d8..734d8d8 100644
--- a/src/Hakyll/Core/UnixFilter.hs
+++ b/lib/Hakyll/Core/UnixFilter.hs
diff --git a/src/Hakyll/Core/Util/File.hs b/lib/Hakyll/Core/Util/File.hs
index 9db6b11..9db6b11 100644
--- a/src/Hakyll/Core/Util/File.hs
+++ b/lib/Hakyll/Core/Util/File.hs
diff --git a/src/Hakyll/Core/Util/Parser.hs b/lib/Hakyll/Core/Util/Parser.hs
index c4b2f8d..c4b2f8d 100644
--- a/src/Hakyll/Core/Util/Parser.hs
+++ b/lib/Hakyll/Core/Util/Parser.hs
diff --git a/src/Hakyll/Core/Util/String.hs b/lib/Hakyll/Core/Util/String.hs
index 23bdd39..23bdd39 100644
--- a/src/Hakyll/Core/Util/String.hs
+++ b/lib/Hakyll/Core/Util/String.hs
diff --git a/src/Hakyll/Core/Writable.hs b/lib/Hakyll/Core/Writable.hs
index cad6cf1..cad6cf1 100644
--- a/src/Hakyll/Core/Writable.hs
+++ b/lib/Hakyll/Core/Writable.hs
diff --git a/src/Hakyll/Main.hs b/lib/Hakyll/Main.hs
index b5c645f..b5c645f 100644
--- a/src/Hakyll/Main.hs
+++ b/lib/Hakyll/Main.hs
diff --git a/src/Hakyll/Preview/Poll.hs b/lib/Hakyll/Preview/Poll.hs
index e197d3f..e197d3f 100644
--- a/src/Hakyll/Preview/Poll.hs
+++ b/lib/Hakyll/Preview/Poll.hs
diff --git a/src/Hakyll/Preview/Server.hs b/lib/Hakyll/Preview/Server.hs
index a84016a..a84016a 100644
--- a/src/Hakyll/Preview/Server.hs
+++ b/lib/Hakyll/Preview/Server.hs
diff --git a/src/Hakyll/Web/CompressCss.hs b/lib/Hakyll/Web/CompressCss.hs
index 9f61534..9f61534 100644
--- a/src/Hakyll/Web/CompressCss.hs
+++ b/lib/Hakyll/Web/CompressCss.hs
diff --git a/src/Hakyll/Web/Feed.hs b/lib/Hakyll/Web/Feed.hs
index 6c6fa76..6c6fa76 100644
--- a/src/Hakyll/Web/Feed.hs
+++ b/lib/Hakyll/Web/Feed.hs
diff --git a/src/Hakyll/Web/Html.hs b/lib/Hakyll/Web/Html.hs
index 6b7ec88..6b7ec88 100644
--- a/src/Hakyll/Web/Html.hs
+++ b/lib/Hakyll/Web/Html.hs
diff --git a/src/Hakyll/Web/Html/RelativizeUrls.hs b/lib/Hakyll/Web/Html/RelativizeUrls.hs
index 33b0c2c..33b0c2c 100644
--- a/src/Hakyll/Web/Html/RelativizeUrls.hs
+++ b/lib/Hakyll/Web/Html/RelativizeUrls.hs
diff --git a/src/Hakyll/Web/Paginate.hs b/lib/Hakyll/Web/Paginate.hs
index dd058f6..dd058f6 100644
--- a/src/Hakyll/Web/Paginate.hs
+++ b/lib/Hakyll/Web/Paginate.hs
diff --git a/src/Hakyll/Web/Pandoc.hs b/lib/Hakyll/Web/Pandoc.hs
index eec0a8a..eec0a8a 100644
--- a/src/Hakyll/Web/Pandoc.hs
+++ b/lib/Hakyll/Web/Pandoc.hs
diff --git a/src/Hakyll/Web/Pandoc/Biblio.hs b/lib/Hakyll/Web/Pandoc/Biblio.hs
index dfe6d93..dfe6d93 100644
--- a/src/Hakyll/Web/Pandoc/Biblio.hs
+++ b/lib/Hakyll/Web/Pandoc/Biblio.hs
diff --git a/src/Hakyll/Web/Pandoc/Binary.hs b/lib/Hakyll/Web/Pandoc/Binary.hs
index 3c5b5a3..3c5b5a3 100644
--- a/src/Hakyll/Web/Pandoc/Binary.hs
+++ b/lib/Hakyll/Web/Pandoc/Binary.hs
diff --git a/src/Hakyll/Web/Pandoc/FileType.hs b/lib/Hakyll/Web/Pandoc/FileType.hs
index 3636e41..3636e41 100644
--- a/src/Hakyll/Web/Pandoc/FileType.hs
+++ b/lib/Hakyll/Web/Pandoc/FileType.hs
diff --git a/src/Hakyll/Web/Redirect.hs b/lib/Hakyll/Web/Redirect.hs
index 4760cff..4760cff 100644
--- a/src/Hakyll/Web/Redirect.hs
+++ b/lib/Hakyll/Web/Redirect.hs
diff --git a/src/Hakyll/Web/Tags.hs b/lib/Hakyll/Web/Tags.hs
index 88119c2..88119c2 100644
--- a/src/Hakyll/Web/Tags.hs
+++ b/lib/Hakyll/Web/Tags.hs
diff --git a/src/Hakyll/Web/Template.hs b/lib/Hakyll/Web/Template.hs
index 2a9684b..2a9684b 100644
--- a/src/Hakyll/Web/Template.hs
+++ b/lib/Hakyll/Web/Template.hs
diff --git a/src/Hakyll/Web/Template/Context.hs b/lib/Hakyll/Web/Template/Context.hs
index b6c7994..b6c7994 100644
--- a/src/Hakyll/Web/Template/Context.hs
+++ b/lib/Hakyll/Web/Template/Context.hs
diff --git a/src/Hakyll/Web/Template/Internal.hs b/lib/Hakyll/Web/Template/Internal.hs
index d0e4d47..d0e4d47 100644
--- a/src/Hakyll/Web/Template/Internal.hs
+++ b/lib/Hakyll/Web/Template/Internal.hs
diff --git a/src/Hakyll/Web/Template/Internal/Element.hs b/lib/Hakyll/Web/Template/Internal/Element.hs
index f564355..f564355 100644
--- a/src/Hakyll/Web/Template/Internal/Element.hs
+++ b/lib/Hakyll/Web/Template/Internal/Element.hs
diff --git a/src/Hakyll/Web/Template/Internal/Trim.hs b/lib/Hakyll/Web/Template/Internal/Trim.hs
index e416ff2..e416ff2 100644
--- a/src/Hakyll/Web/Template/Internal/Trim.hs
+++ b/lib/Hakyll/Web/Template/Internal/Trim.hs
diff --git a/src/Hakyll/Web/Template/List.hs b/lib/Hakyll/Web/Template/List.hs
index 4d769fc..4d769fc 100644
--- a/src/Hakyll/Web/Template/List.hs
+++ b/lib/Hakyll/Web/Template/List.hs
diff --git a/Init.hs b/src/Init.hs
index 71055f0..71055f0 100644
--- a/Init.hs
+++ b/src/Init.hs