Cleaned up the file names and such for the sake of consistency.
Pushing consistency changes up to github.