Renamed and removed classes.