restructuring of lesson classes