Some classes renamed and others deleted.