Fix bundle config issue, update data model, organize courses