diff --git a/build.sh b/build.sh
index 22eeb10c8..a2213445b 100755
--- a/build.sh
+++ b/build.sh
@@ -26,7 +26,7 @@ build() {
 
 assets() {
 	check
-	godep go run cmd/assets/assets.go gui > auto/gui.files.go
+	godep go run cmd/genassets/main.go gui > auto/gui.files.go
 }
 
 test-cov() {
@@ -97,7 +97,7 @@ setup() {
 
 xdr() {
 	for f in discover/packets files/leveldb protocol/message ; do
-		go run xdr/cmd/genxdr/main.go -- "${f}.go" > "${f}_xdr.go"
+		go run cmd/genxdr/main.go -- "${f}.go" > "${f}_xdr.go"
 	done
 }
 
@@ -141,7 +141,7 @@ case "$1" in
 		test || exit 1
 		assets
 
-		godep go build ./discover/cmd/discosrv
+		godep go build ./cmd/discosrv
 
 		for os in darwin-amd64 linux-386 linux-amd64 freebsd-amd64 windows-amd64 windows-386 ; do
 			export GOOS=${os%-*}
diff --git a/discover/cmd/discosrv/.gitignore b/cmd/discosrv/.gitignore
similarity index 100%
rename from discover/cmd/discosrv/.gitignore
rename to cmd/discosrv/.gitignore
diff --git a/discover/cmd/discosrv/main.go b/cmd/discosrv/main.go
similarity index 100%
rename from discover/cmd/discosrv/main.go
rename to cmd/discosrv/main.go
diff --git a/cmd/assets/assets.go b/cmd/genassets/main.go
similarity index 100%
rename from cmd/assets/assets.go
rename to cmd/genassets/main.go
diff --git a/xdr/cmd/genxdr/main.go b/cmd/genxdr/main.go
similarity index 100%
rename from xdr/cmd/genxdr/main.go
rename to cmd/genxdr/main.go
diff --git a/files/cmd/pidx/main.go b/cmd/pidx/main.go
similarity index 100%
rename from files/cmd/pidx/main.go
rename to cmd/pidx/main.go