Switched motors, darn build team; Organized drive code