Things are getting moved around

This should be the last commit to the public git as i'm moving it off.

After all, we wouldn't want any secrets to be revealed, would we?