Re-org files so they work with GOPATH

- previously I misunderstood how GOPATH worked and completely mishandled
  how to organize the files on github. This checkin should correct that
  and allow things to work correctly under a single GOPATH.