Re arrange how services are restarted