Reworked modules.