diff --git a/.gitignore b/.gitignore
index 6f39f896..4eae9f53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,9 +32,9 @@ coverage.html
 # Project specific
 weaver/weaver
 weavedns/weavedns
-weaveproxy/weaveproxy
-sigproxy/sigproxy
-weavewait/weavewait
+prog/weaveproxy/weaveproxy
+prog/sigproxy/sigproxy
+prog/weavewait/weavewait
 tools/bin
 tools/build
 releases
diff --git a/Makefile b/Makefile
index b2df6efd..4a11117f 100644
--- a/Makefile
+++ b/Makefile
@@ -11,9 +11,9 @@ WEAVE_VERSION=git-$(shell git rev-parse --short=12 HEAD)
 
 WEAVER_EXE=weaver/weaver
 WEAVEDNS_EXE=weavedns/weavedns
-WEAVEPROXY_EXE=weaveproxy/weaveproxy
-SIGPROXY_EXE=sigproxy/sigproxy
-WEAVEWAIT_EXE=weavewait/weavewait
+WEAVEPROXY_EXE=prog/weaveproxy/weaveproxy
+SIGPROXY_EXE=prog/sigproxy/sigproxy
+WEAVEWAIT_EXE=prog/weavewait/weavewait
 
 EXES=$(WEAVER_EXE) $(WEAVEDNS_EXE) $(SIGPROXY_EXE) $(WEAVEPROXY_EXE) $(WEAVEWAIT_EXE)
 
@@ -54,12 +54,12 @@ $(WEAVER_EXE) $(WEAVEDNS_EXE) $(WEAVEPROXY_EXE) $(WEAVEWAIT_EXE): common/*.go co
 
 $(WEAVER_EXE): router/*.go ipam/*.go ipam/*/*.go weaver/main.go
 $(WEAVEDNS_EXE): nameserver/*.go weavedns/main.go
-$(WEAVEPROXY_EXE): proxy/*.go weaveproxy/main.go
-$(WEAVEWAIT_EXE): weavewait/*.go weavewait/main.go
+$(WEAVEPROXY_EXE): proxy/*.go prog/weaveproxy/main.go
+$(WEAVEWAIT_EXE): prog/weavewait/*.go
 
 # Sigproxy needs separate rule as it fails the netgo check in the main
 # build stanza due to not importing net package
-$(SIGPROXY_EXE): sigproxy/main.go
+$(SIGPROXY_EXE): prog/sigproxy/main.go
 	go build -o $@ ./$(@D)
 
 $(WEAVER_EXPORT): weaver/Dockerfile $(WEAVER_EXE)
diff --git a/sigproxy/main.go b/prog/sigproxy/main.go
similarity index 100%
rename from sigproxy/main.go
rename to prog/sigproxy/main.go
diff --git a/weaveproxy/main.go b/prog/weaveproxy/main.go
similarity index 100%
rename from weaveproxy/main.go
rename to prog/weaveproxy/main.go
diff --git a/weavewait/main.go b/prog/weavewait/main.go
similarity index 100%
rename from weavewait/main.go
rename to prog/weavewait/main.go