Changed File names

changed file names to make more sense, fixed issue with soryBy.equals()