Repository Cleanup

Cleaning up the repository in preparation for the large refactor.