renaming all class names for the new folder structure