GM shuffles AV, EV executives