diff --git a/Makefile b/Makefile
index 60b62a3..9072141 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,9 @@
-all: irc.cgi irc
+all: wirc.cgi wirc
 
-%: %.go
-	go build $<
+export GOPATH = $(CURDIR)
 
-irc.cgi: irc.cgi.go
-	go build irc.cgi.go
-	chmod +s irc.cgi
+%:
+	go build $@
+
+wirc.cgi:
+	go build $@
diff --git a/wirc.cgi.go b/src/wirc.cgi/wirc.cgi.go
similarity index 100%
rename from wirc.cgi.go
rename to src/wirc.cgi/wirc.cgi.go
diff --git a/wirc.go b/src/wirc/wirc.go
similarity index 100%
rename from wirc.go
rename to src/wirc/wirc.go