Diageo is to group marketing for its global spirits brands into two new categories as it looks to adapt faster to demand from customers and consumers.