Committing the first round of refactoring changes.