Reworking module structure.