Fix up apis for new module structure.