Extracted non-trad surveys into modules.