diff --git a/Makefile b/Makefile
index 5d00fd280..629177db4 100644
--- a/Makefile
+++ b/Makefile
@@ -120,7 +120,7 @@ SOURCEFILES:= \
 CABALFILES:= \
 	hledger/hledger.cabal \
 	hledger-*/*.cabal \
-	site/hakyll-std.cabal
+	site/hakyll-std/hakyll-std.cabal
 
 HPACKFILES:= \
 	hledger/package.yaml \
@@ -860,25 +860,25 @@ $(call def-help-subsection,DOCUMENTATION:)
 # 	\
 # 	)
 
-site/hakyll-std: \
-	site/hakyll-std.hs \
-	site/TableOfContents.hs \
+hakyll-std site/hakyll-std/hakyll-std: \
+	site/hakyll-std/hakyll-std.hs \
+	site/hakyll-std/TableOfContents.hs \
 		$(call def-help,hakyll-std, build a generic hakyll site builder script )
-	cd site; ./hakyll-std.hs >/dev/null && stack ghc hakyll-std.hs
+	cd site/hakyll-std; ./hakyll-std.hs >/dev/null && stack ghc hakyll-std.hs
 
-site-build: site/hakyll-std \
+site-build: site/hakyll-std/hakyll-std \
 	$(call def-help,site-build, generate the hledger.org website with hakyll-std )
-	-cd site; ./hakyll-std build
+	-cd site; hakyll-std/hakyll-std build
 
-site-clean: site/hakyll-std \
+site-clean: site/hakyll-std/hakyll-std \
 	$(call def-help,site-clean, remove hakyll-generated files (& take down the website) ) #cleanolddocs
-	-cd site; ./hakyll-std clean
+	-cd site; hakyll-std/hakyll-std clean
 #	rm -rf site/_site/*
 
 # XXX hakyll watch & preview mostly don't live-update any more
-site-preview: site/hakyll-std \
+site-preview: site/hakyll-std/hakyll-std \
 	$(call def-help,site-preview, run a hakyll server to preview the website  ) #site/site
-	-cd site; ./hakyll-std watch # -h hledger.org
+	-cd site; hakyll-std/hakyll-std watch # -h hledger.org
 
 # site-view: site \
 # 	$(call def-help,site-view,\
@@ -1358,7 +1358,7 @@ $(call def-help-subsection,MISCELLANEOUS:)
 
 # XXX enable for all cabal files when hpack is a little better
 # gencabalfiles: $$(CABALFILES)
-gencabalfiles: site/hakyll-std.cabal \
+gencabalfiles: site/hakyll-std/hakyll-std.cabal \
 		$(call def-help,gencabalfiles, regenerate cabal files from their package.yaml definitions )
 
 %.cabal: $$(dir $$@)package.yaml \
diff --git a/site/README b/site/README
index f9cdfaf76..0c0f3305b 100644
--- a/site/README
+++ b/site/README
@@ -1,4 +1,5 @@
 Static bits of the hledger.org website.
 
-In some cases these are rendered to _site/* by hakyll (or hakyll-std),
-in others they are served directly from the git working copy.
+In some cases these are rendered to _site/* by hakyll (via the
+hakyll-std script), in others they are served directly from the git
+working copy.
diff --git a/site/LICENSE b/site/hakyll-std/LICENSE
similarity index 100%
rename from site/LICENSE
rename to site/hakyll-std/LICENSE
diff --git a/site/Setup.hs b/site/hakyll-std/Setup.hs
similarity index 100%
rename from site/Setup.hs
rename to site/hakyll-std/Setup.hs
diff --git a/site/TableOfContents.hs b/site/hakyll-std/TableOfContents.hs
similarity index 100%
rename from site/TableOfContents.hs
rename to site/hakyll-std/TableOfContents.hs
diff --git a/site/hakyll-std.cabal b/site/hakyll-std/hakyll-std.cabal
similarity index 100%
rename from site/hakyll-std.cabal
rename to site/hakyll-std/hakyll-std.cabal
diff --git a/site/hakyll-std.hs b/site/hakyll-std/hakyll-std.hs
similarity index 100%
rename from site/hakyll-std.hs
rename to site/hakyll-std/hakyll-std.hs
diff --git a/site/package.yaml b/site/hakyll-std/package.yaml
similarity index 100%
rename from site/package.yaml
rename to site/hakyll-std/package.yaml
diff --git a/site/stack.yaml b/site/stack.yaml
deleted file mode 100644
index ec6a5ca98..000000000
--- a/site/stack.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-# stack.yaml for hakyll-std.
-resolver: lts-3.0
-flags: {}
-extra-deps: