moving + renaming classes