Yet more restructuring