#296 Cleaning files up, renaming things.