diff --git a/Application.hs b/src/Application.hs
similarity index 100%
rename from Application.hs
rename to src/Application.hs
diff --git a/Control/SingleRun.hs b/src/Control/SingleRun.hs
similarity index 100%
rename from Control/SingleRun.hs
rename to src/Control/SingleRun.hs
diff --git a/Data/GhcLinks.hs b/src/Data/GhcLinks.hs
similarity index 100%
rename from Data/GhcLinks.hs
rename to src/Data/GhcLinks.hs
diff --git a/Data/WebsiteContent.hs b/src/Data/WebsiteContent.hs
similarity index 100%
rename from Data/WebsiteContent.hs
rename to src/Data/WebsiteContent.hs
diff --git a/Distribution/Package/ModuleForest.hs b/src/Distribution/Package/ModuleForest.hs
similarity index 100%
rename from Distribution/Package/ModuleForest.hs
rename to src/Distribution/Package/ModuleForest.hs
diff --git a/Foundation.hs b/src/Foundation.hs
similarity index 100%
rename from Foundation.hs
rename to src/Foundation.hs
diff --git a/Handler/BuildPlan.hs b/src/Handler/BuildPlan.hs
similarity index 100%
rename from Handler/BuildPlan.hs
rename to src/Handler/BuildPlan.hs
diff --git a/Handler/BuildVersion.hs b/src/Handler/BuildVersion.hs
similarity index 100%
rename from Handler/BuildVersion.hs
rename to src/Handler/BuildVersion.hs
diff --git a/Handler/Download.hs b/src/Handler/Download.hs
similarity index 100%
rename from Handler/Download.hs
rename to src/Handler/Download.hs
diff --git a/Handler/DownloadStack.hs b/src/Handler/DownloadStack.hs
similarity index 100%
rename from Handler/DownloadStack.hs
rename to src/Handler/DownloadStack.hs
diff --git a/Handler/Feed.hs b/src/Handler/Feed.hs
similarity index 100%
rename from Handler/Feed.hs
rename to src/Handler/Feed.hs
diff --git a/Handler/Haddock.hs b/src/Handler/Haddock.hs
similarity index 100%
rename from Handler/Haddock.hs
rename to src/Handler/Haddock.hs
diff --git a/Handler/Home.hs b/src/Handler/Home.hs
similarity index 100%
rename from Handler/Home.hs
rename to src/Handler/Home.hs
diff --git a/Handler/Hoogle.hs b/src/Handler/Hoogle.hs
similarity index 100%
rename from Handler/Hoogle.hs
rename to src/Handler/Hoogle.hs
diff --git a/Handler/MirrorStatus.hs b/src/Handler/MirrorStatus.hs
similarity index 100%
rename from Handler/MirrorStatus.hs
rename to src/Handler/MirrorStatus.hs
diff --git a/Handler/OldLinks.hs b/src/Handler/OldLinks.hs
similarity index 100%
rename from Handler/OldLinks.hs
rename to src/Handler/OldLinks.hs
diff --git a/Handler/Package.hs b/src/Handler/Package.hs
similarity index 100%
rename from Handler/Package.hs
rename to src/Handler/Package.hs
diff --git a/Handler/PackageList.hs b/src/Handler/PackageList.hs
similarity index 100%
rename from Handler/PackageList.hs
rename to src/Handler/PackageList.hs
diff --git a/Handler/Sitemap.hs b/src/Handler/Sitemap.hs
similarity index 100%
rename from Handler/Sitemap.hs
rename to src/Handler/Sitemap.hs
diff --git a/Handler/Snapshots.hs b/src/Handler/Snapshots.hs
similarity index 100%
rename from Handler/Snapshots.hs
rename to src/Handler/Snapshots.hs
diff --git a/Handler/StackageHome.hs b/src/Handler/StackageHome.hs
similarity index 100%
rename from Handler/StackageHome.hs
rename to src/Handler/StackageHome.hs
diff --git a/Handler/StackageIndex.hs b/src/Handler/StackageIndex.hs
similarity index 100%
rename from Handler/StackageIndex.hs
rename to src/Handler/StackageIndex.hs
diff --git a/Handler/StackageSdist.hs b/src/Handler/StackageSdist.hs
similarity index 100%
rename from Handler/StackageSdist.hs
rename to src/Handler/StackageSdist.hs
diff --git a/Handler/System.hs b/src/Handler/System.hs
similarity index 100%
rename from Handler/System.hs
rename to src/Handler/System.hs
diff --git a/Import.hs b/src/Import.hs
similarity index 100%
rename from Import.hs
rename to src/Import.hs
diff --git a/Settings.hs b/src/Settings.hs
similarity index 100%
rename from Settings.hs
rename to src/Settings.hs
diff --git a/Settings/StaticFiles.hs b/src/Settings/StaticFiles.hs
similarity index 100%
rename from Settings/StaticFiles.hs
rename to src/Settings/StaticFiles.hs
diff --git a/Stackage/Database.hs b/src/Stackage/Database.hs
similarity index 100%
rename from Stackage/Database.hs
rename to src/Stackage/Database.hs
diff --git a/Stackage/Database/Cron.hs b/src/Stackage/Database/Cron.hs
similarity index 100%
rename from Stackage/Database/Cron.hs
rename to src/Stackage/Database/Cron.hs
diff --git a/Stackage/Database/Haddock.hs b/src/Stackage/Database/Haddock.hs
similarity index 100%
rename from Stackage/Database/Haddock.hs
rename to src/Stackage/Database/Haddock.hs
diff --git a/Stackage/Database/Types.hs b/src/Stackage/Database/Types.hs
similarity index 100%
rename from Stackage/Database/Types.hs
rename to src/Stackage/Database/Types.hs
diff --git a/Stackage/Snapshot/Diff.hs b/src/Stackage/Snapshot/Diff.hs
similarity index 100%
rename from Stackage/Snapshot/Diff.hs
rename to src/Stackage/Snapshot/Diff.hs
diff --git a/Types.hs b/src/Types.hs
similarity index 100%
rename from Types.hs
rename to src/Types.hs
diff --git a/stackage-server.cabal b/stackage-server.cabal
index 6772b3a..6fd3ec3 100644
--- a/stackage-server.cabal
+++ b/stackage-server.cabal
@@ -49,6 +49,8 @@ library
                      Handler.MirrorStatus
                      Control.SingleRun
 
+    hs-source-dirs: src
+
     if flag(dev) || flag(library-only)
         cpp-options:   -DDEVELOPMENT
         ghc-options:   -Wall -O0