yet more restructuring