GM puts pieces in place to take on Uber as Cruise, Maven expand