Renamed files for clarity & deleted obsolete files