diff --git a/yesod-core/Yesod/Core.hs b/yesod-core/src/Yesod/Core.hs
similarity index 100%
rename from yesod-core/Yesod/Core.hs
rename to yesod-core/src/Yesod/Core.hs
diff --git a/yesod-core/Yesod/Core/Class/Breadcrumbs.hs b/yesod-core/src/Yesod/Core/Class/Breadcrumbs.hs
similarity index 100%
rename from yesod-core/Yesod/Core/Class/Breadcrumbs.hs
rename to yesod-core/src/Yesod/Core/Class/Breadcrumbs.hs
diff --git a/yesod-core/Yesod/Core/Class/Dispatch.hs b/yesod-core/src/Yesod/Core/Class/Dispatch.hs
similarity index 100%
rename from yesod-core/Yesod/Core/Class/Dispatch.hs
rename to yesod-core/src/Yesod/Core/Class/Dispatch.hs
diff --git a/yesod-core/Yesod/Core/Class/Handler.hs b/yesod-core/src/Yesod/Core/Class/Handler.hs
similarity index 100%
rename from yesod-core/Yesod/Core/Class/Handler.hs
rename to yesod-core/src/Yesod/Core/Class/Handler.hs
diff --git a/yesod-core/Yesod/Core/Class/Yesod.hs b/yesod-core/src/Yesod/Core/Class/Yesod.hs
similarity index 100%
rename from yesod-core/Yesod/Core/Class/Yesod.hs
rename to yesod-core/src/Yesod/Core/Class/Yesod.hs
diff --git a/yesod-core/Yesod/Core/Content.hs b/yesod-core/src/Yesod/Core/Content.hs
similarity index 100%
rename from yesod-core/Yesod/Core/Content.hs
rename to yesod-core/src/Yesod/Core/Content.hs
diff --git a/yesod-core/Yesod/Core/Dispatch.hs b/yesod-core/src/Yesod/Core/Dispatch.hs
similarity index 100%
rename from yesod-core/Yesod/Core/Dispatch.hs
rename to yesod-core/src/Yesod/Core/Dispatch.hs
diff --git a/yesod-core/Yesod/Core/Handler.hs b/yesod-core/src/Yesod/Core/Handler.hs
similarity index 100%
rename from yesod-core/Yesod/Core/Handler.hs
rename to yesod-core/src/Yesod/Core/Handler.hs
diff --git a/yesod-core/Yesod/Core/Internal.hs b/yesod-core/src/Yesod/Core/Internal.hs
similarity index 100%
rename from yesod-core/Yesod/Core/Internal.hs
rename to yesod-core/src/Yesod/Core/Internal.hs
diff --git a/yesod-core/Yesod/Core/Internal/LiteApp.hs b/yesod-core/src/Yesod/Core/Internal/LiteApp.hs
similarity index 100%
rename from yesod-core/Yesod/Core/Internal/LiteApp.hs
rename to yesod-core/src/Yesod/Core/Internal/LiteApp.hs
diff --git a/yesod-core/Yesod/Core/Internal/Request.hs b/yesod-core/src/Yesod/Core/Internal/Request.hs
similarity index 100%
rename from yesod-core/Yesod/Core/Internal/Request.hs
rename to yesod-core/src/Yesod/Core/Internal/Request.hs
diff --git a/yesod-core/Yesod/Core/Internal/Response.hs b/yesod-core/src/Yesod/Core/Internal/Response.hs
similarity index 100%
rename from yesod-core/Yesod/Core/Internal/Response.hs
rename to yesod-core/src/Yesod/Core/Internal/Response.hs
diff --git a/yesod-core/Yesod/Core/Internal/Run.hs b/yesod-core/src/Yesod/Core/Internal/Run.hs
similarity index 100%
rename from yesod-core/Yesod/Core/Internal/Run.hs
rename to yesod-core/src/Yesod/Core/Internal/Run.hs
diff --git a/yesod-core/Yesod/Core/Internal/Session.hs b/yesod-core/src/Yesod/Core/Internal/Session.hs
similarity index 100%
rename from yesod-core/Yesod/Core/Internal/Session.hs
rename to yesod-core/src/Yesod/Core/Internal/Session.hs
diff --git a/yesod-core/Yesod/Core/Internal/TH.hs b/yesod-core/src/Yesod/Core/Internal/TH.hs
similarity index 100%
rename from yesod-core/Yesod/Core/Internal/TH.hs
rename to yesod-core/src/Yesod/Core/Internal/TH.hs
diff --git a/yesod-core/Yesod/Core/Internal/Util.hs b/yesod-core/src/Yesod/Core/Internal/Util.hs
similarity index 100%
rename from yesod-core/Yesod/Core/Internal/Util.hs
rename to yesod-core/src/Yesod/Core/Internal/Util.hs
diff --git a/yesod-core/Yesod/Core/Json.hs b/yesod-core/src/Yesod/Core/Json.hs
similarity index 100%
rename from yesod-core/Yesod/Core/Json.hs
rename to yesod-core/src/Yesod/Core/Json.hs
diff --git a/yesod-core/Yesod/Core/TypeCache.hs b/yesod-core/src/Yesod/Core/TypeCache.hs
similarity index 100%
rename from yesod-core/Yesod/Core/TypeCache.hs
rename to yesod-core/src/Yesod/Core/TypeCache.hs
diff --git a/yesod-core/Yesod/Core/Types.hs b/yesod-core/src/Yesod/Core/Types.hs
similarity index 100%
rename from yesod-core/Yesod/Core/Types.hs
rename to yesod-core/src/Yesod/Core/Types.hs
diff --git a/yesod-core/Yesod/Core/Unsafe.hs b/yesod-core/src/Yesod/Core/Unsafe.hs
similarity index 100%
rename from yesod-core/Yesod/Core/Unsafe.hs
rename to yesod-core/src/Yesod/Core/Unsafe.hs
diff --git a/yesod-core/Yesod/Core/Widget.hs b/yesod-core/src/Yesod/Core/Widget.hs
similarity index 100%
rename from yesod-core/Yesod/Core/Widget.hs
rename to yesod-core/src/Yesod/Core/Widget.hs
diff --git a/yesod-core/Yesod/Routes/Class.hs b/yesod-core/src/Yesod/Routes/Class.hs
similarity index 100%
rename from yesod-core/Yesod/Routes/Class.hs
rename to yesod-core/src/Yesod/Routes/Class.hs
diff --git a/yesod-core/Yesod/Routes/Overlap.hs b/yesod-core/src/Yesod/Routes/Overlap.hs
similarity index 100%
rename from yesod-core/Yesod/Routes/Overlap.hs
rename to yesod-core/src/Yesod/Routes/Overlap.hs
diff --git a/yesod-core/Yesod/Routes/Parse.hs b/yesod-core/src/Yesod/Routes/Parse.hs
similarity index 100%
rename from yesod-core/Yesod/Routes/Parse.hs
rename to yesod-core/src/Yesod/Routes/Parse.hs
diff --git a/yesod-core/Yesod/Routes/TH.hs b/yesod-core/src/Yesod/Routes/TH.hs
similarity index 100%
rename from yesod-core/Yesod/Routes/TH.hs
rename to yesod-core/src/Yesod/Routes/TH.hs
diff --git a/yesod-core/Yesod/Routes/TH/Dispatch.hs b/yesod-core/src/Yesod/Routes/TH/Dispatch.hs
similarity index 100%
rename from yesod-core/Yesod/Routes/TH/Dispatch.hs
rename to yesod-core/src/Yesod/Routes/TH/Dispatch.hs
diff --git a/yesod-core/Yesod/Routes/TH/ParseRoute.hs b/yesod-core/src/Yesod/Routes/TH/ParseRoute.hs
similarity index 100%
rename from yesod-core/Yesod/Routes/TH/ParseRoute.hs
rename to yesod-core/src/Yesod/Routes/TH/ParseRoute.hs
diff --git a/yesod-core/Yesod/Routes/TH/RenderRoute.hs b/yesod-core/src/Yesod/Routes/TH/RenderRoute.hs
similarity index 100%
rename from yesod-core/Yesod/Routes/TH/RenderRoute.hs
rename to yesod-core/src/Yesod/Routes/TH/RenderRoute.hs
diff --git a/yesod-core/Yesod/Routes/TH/RouteAttrs.hs b/yesod-core/src/Yesod/Routes/TH/RouteAttrs.hs
similarity index 100%
rename from yesod-core/Yesod/Routes/TH/RouteAttrs.hs
rename to yesod-core/src/Yesod/Routes/TH/RouteAttrs.hs
diff --git a/yesod-core/Yesod/Routes/TH/Types.hs b/yesod-core/src/Yesod/Routes/TH/Types.hs
similarity index 100%
rename from yesod-core/Yesod/Routes/TH/Types.hs
rename to yesod-core/src/Yesod/Routes/TH/Types.hs
diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal
index 3bc92f64..404a35fd 100644
--- a/yesod-core/yesod-core.cabal
+++ b/yesod-core/yesod-core.cabal
@@ -22,6 +22,8 @@ extra-source-files:
   README.md
 
 library
+    hs-source-dirs: src
+
     build-depends:   base                  >= 4.9      && < 5
                    , aeson                 >= 1.0
                    , auto-update
@@ -106,7 +108,7 @@ library
 test-suite test-routes
     type: exitcode-stdio-1.0
     main-is: RouteSpec.hs
-    hs-source-dirs: test, .
+    hs-source-dirs: test, src
 
     other-modules: Hierarchy
                    Yesod.Routes.Class