gofmt'd
Move stuff around and tweak the Makefile