Time for a huge restructuring!