Cleaning up pre-merge. Renamed to proper case for filename, removed extraneous files.