Classes moving and renaming.