diff --git a/.travis.yml b/.travis.yml
index 20d1c9f4ac73b9906c4e1f532c9d5edc942e0316..5fc0205a8453eddaaa24e3a97e25defb6b3a5aa4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,7 @@
 language: go
 go:
  - 1.7
+ - 1.8
  - tip
 script: make test
 notifications:
diff --git a/Makefile b/Makefile
index a8a4d7f77b3ecf708f8b7d2dad9f8b3b21ca47ea..6b265dd55369aff73fafaad3906305c4694d4e4a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 build: dist/go-httpbin
 
-dist/go-httpbin: assets *.go httpbin/*.go
+dist/go-httpbin: assets cmd/go-httpbin/*.go httpbin/*.go
 	mkdir -p dist
-	go build -o dist/go-httpbin
+	go build -o dist/go-httpbin ./cmd/go-httpbin
 
 assets: httpbin/assets/*
 	go-bindata -o httpbin/assets.go -pkg=httpbin -prefix=httpbin/assets httpbin/assets
@@ -18,11 +18,6 @@ testcover: assets
 run: build
 	./dist/go-httpbin
 
-watch:
-	# brew install entr
-	# https://bitbucket.org/eradman/entr/
-	ls */*.go | entr -r -s "go build -o dist/go-httpbin && dist/go-httpbin"
-
 clean:
 	rm -r dist
 
diff --git a/main.go b/cmd/go-httpbin/main.go
similarity index 100%
rename from main.go
rename to cmd/go-httpbin/main.go