Attempt to re-organize code for easier hacking.

I'm not sure if "go get" will still work for this
(I'll test as soon as I push), but this is the method
we use at work, and it works well for us.