Restructure to prepare for multiple courses.