Flattened modules with quizzes

[#82409808 #83678224]