reorganizing classes