Some classes renamed and relocated