Group: some restructuring