Reorganizing the High-School Curriculum