reorganize fold on per lesson bases