Renamed and Reorganized classes