Diageo is to combine its US and Canadian spirits divisions as part of a North American shake-up at the company.