diff --git a/sylvilagus/go/Makefile b/sylvilagus/go/Makefile
index a70fdeb..8d5b0a8 100644
--- a/sylvilagus/go/Makefile
+++ b/sylvilagus/go/Makefile
@@ -1,32 +1,16 @@
-CLEAN_GOPATH := $(shell echo $(GOPATH) | tr ":" "\n" | grep -v '^$$' | grep -v $(PWD) | tr "\n" ":")
-GOPATH := $(PWD):$(CLEAN_GOPATH)
+REPO_BASE := github.com/meatballhat/box-o-sand/sylvilagus/go
 PACKAGES := \
-	meatballhat.com/sylvilagus-conntest \
-	meatballhat.com/sylvilagus-chapter02-hello-world-consumer \
-	meatballhat.com/sylvilagus-chapter02-hello-world-producer
-
-export GOPATH
-
+	$(REPO_BASE)/sylvilagus-conntest \
+	$(REPO_BASE)/sylvilagus-chapter02-hello-world-consumer \
+	$(REPO_BASE)/sylvilagus-chapter02-hello-world-producer
 
 test: build
-	go test $(PACKAGES)
+	go test -x -v $(PACKAGES)
 
 build: deps
-	go install $(PACKAGES)
+	go install -x $(PACKAGES)
 
 deps:
-	go get $(PACKAGES)
+	go get -x $(PACKAGES)
 
-fmt:
-	go fmt $(PACKAGES)
-
-clean:
-	go clean $(PACKAGES)
-	rm -v bin/*
-	find pkg -name '*.a' -exec rm -v {} \;
-
-env:
-	@echo GOPATH=$(GOPATH)
-	@echo PACKAGES=$(PACKAGES)
-
-.PHONY: all clean env fmt
+.PHONY: test build deps
diff --git a/sylvilagus/go/src/meatballhat.com/sylvilagus-chapter02-hello-world-consumer/main.go b/sylvilagus/go/sylvilagus-chapter02-hello-world-consumer/main.go
similarity index 100%
rename from sylvilagus/go/src/meatballhat.com/sylvilagus-chapter02-hello-world-consumer/main.go
rename to sylvilagus/go/sylvilagus-chapter02-hello-world-consumer/main.go
diff --git a/sylvilagus/go/src/meatballhat.com/sylvilagus-chapter02-hello-world-producer/main.go b/sylvilagus/go/sylvilagus-chapter02-hello-world-producer/main.go
similarity index 100%
rename from sylvilagus/go/src/meatballhat.com/sylvilagus-chapter02-hello-world-producer/main.go
rename to sylvilagus/go/sylvilagus-chapter02-hello-world-producer/main.go
diff --git a/sylvilagus/go/src/meatballhat.com/sylvilagus-conntest/main.go b/sylvilagus/go/sylvilagus-conntest/main.go
similarity index 100%
rename from sylvilagus/go/src/meatballhat.com/sylvilagus-conntest/main.go
rename to sylvilagus/go/sylvilagus-conntest/main.go
diff --git a/sylvilagus/go/sylvilagus.go b/sylvilagus/go/sylvilagus.go
new file mode 100644
index 0000000..1269d85
--- /dev/null
+++ b/sylvilagus/go/sylvilagus.go
@@ -0,0 +1 @@
+package sylvilagus
diff --git a/sylvilagus/go/src/meatballhat.com/sylvilagus/hello.go b/sylvilagus/go/sylvilagus/hello.go
similarity index 100%
rename from sylvilagus/go/src/meatballhat.com/sylvilagus/hello.go
rename to sylvilagus/go/sylvilagus/hello.go