move "modules" state out of Context