Reworking module organization.