Reorganizing the network handling structure