Some code refactoring in prep for repository rename