Renaming of various classes after creating README