Moved stuff around to remove overlap in variable names.

This brings it into line with golang projects which build many
commands within the one project.

Lastly I added a `Makefile` with some handy targets, also illustrates
handy ./... syntax used in golang tools.