Renamed files to be clearer and removed irrelevant file.