Reorganizing material for new course structure