Moar restructuring