Moving delegations to module