Moving things around...
And there's the last of my git newbieness