diff --git a/makefile b/makefile
index 6a1918c..27ef86c 100644
--- a/makefile
+++ b/makefile
@@ -1,32 +1,27 @@
 ASSETS = assets/javascripts/* assets/stylesheets/* assets/graphicarts/* assets/index.html
-
 CGO_ENABLED=1
 
-default: build
+default: bundle
 
 server/assets_bundle.go: $(ASSETS)
-	go run bundle.go >/dev/null
+	go run scripts/bundle_assets.go >/dev/null
 
 bundle: server/assets_bundle.go
 
-build: build_mac build_nix build_win
-
-build_mac: bundle
+build_macos: bundle
 	set GOOS=darwin
 	set GOARCH=amd64
-	mkdir -p build/mac
-	go build -tags "sqlite_foreign_keys release mac" -ldflags="-s -w" -o build/mac/yarr main.go
+	mkdir -p _output/mac
+	go build -tags "sqlite_foreign_keys release macos" -ldflags="-s -w" -o _output/mac/yarr main.go
 
-build_nix: bundle
+build_linux: bundle
 	set GOOS=linux
 	set GOARCH=386
-	mkdir -p build/nix
-	go build -tags "sqlite_foreign_keys release nix" -ldflags="-s -w" -o build/nix/yarr main.go
+	mkdir -p _output/nix
+	go build -tags "sqlite_foreign_keys release linux" -ldflags="-s -w" -o _output/nix/yarr main.go
 
-build_win: bundle
+build_windows: bundle
 	set GOOS=windows
 	set GOARCH=386
-	mkdir -p build/win
-	go build -tags "sqlite_foreign_keys release win" -ldflags="-s -w -H windowsgui" -o build/win/yarr.exe main.go
-
-.PHONY: default bundle build build_mac build_nix build_win
+	mkdir -p _output/win
+	go build -tags "sqlite_foreign_keys release windows" -ldflags="-s -w -H windowsgui" -o _output/win/yarr.exe main.go
diff --git a/bundle.go b/scripts/bundle_assets.go
similarity index 100%
rename from bundle.go
rename to scripts/bundle_assets.go
diff --git a/server/assets_icon.go b/server/assets_icon.go
index 9291527..8820e2a 100644
--- a/server/assets_icon.go
+++ b/server/assets_icon.go
@@ -1,3 +1,5 @@
+// +build !windows
+
 // File generated by 2goarray v0.1.0 (http://github.com/cratonica/2goarray)
 
 package server
diff --git a/server/assets_iconwin.go b/server/assets_iconwin.go
index 51733aa..f15c91a 100644
--- a/server/assets_iconwin.go
+++ b/server/assets_iconwin.go
@@ -1,4 +1,4 @@
-// +build win
+// +build windows
 
 // File generated by 2goarray v0.1.0 (http://github.com/cratonica/2goarray)