Package Rename

I'm doing some renaming after learning that go packages can't have hyphens in the name.  I thought that might come back to bite me, but decided to roll with it at first.  Bad idea.