Reorganizing module structure