Solution restructuring part 1