diff --git a/exampleSite/.hugo/version b/.hugo/version
similarity index 100%
rename from exampleSite/.hugo/version
rename to .hugo/version
diff --git a/Makefile b/Makefile
index 80e854786..20a9ab6e7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,18 @@
 .PHONY: release build demo clean
 
-build: clean
-	mkdir -p demo/themes/hugo-coder
-	rsync -av exampleSite/ demo
-	rsync -av --exclude='demo' --exclude='exampleSite' --exclude='.git' . demo/themes/hugo-coder
-
-demo: build
+build: prepare
+	./hugow --source demo
 
-	cd demo && ./hugow serve -D
+demo: prepare
+	./hugow server --buildDrafts --source demo
 
 release: build
-	cd ./demo && ./hugow
 	rm -rf ./resources && cp -r ./demo/resources ./resources
 
+prepare: clean
+	mkdir -p demo/themes/hugo-coder
+	rsync -av exampleSite/ demo
+	rsync -av --exclude='demo' --exclude='exampleSite' --exclude='.git' --exclude='.hugo' --exclude='hugow' . demo/themes/hugo-coder
+
 clean:
 	rm -rf demo
diff --git a/exampleSite/hugow b/hugow
similarity index 100%
rename from exampleSite/hugow
rename to hugow
diff --git a/netlify.toml b/netlify.toml
new file mode 100644
index 000000000..4a3367c88
--- /dev/null
+++ b/netlify.toml
@@ -0,0 +1,6 @@
+[build]
+  publish = "demo/public"
+  command = "make build"
+
+[context.deploy-preview]
+  command = "make prepare && hugo --source demo --buildFuture --buildDrafts --baseURL $DEPLOY_PRIME_URL"