Massive restructuring to better harmonise the function of th