some more restructuring