Rework main and alcohol graphs

Alcohol graph groups into 3 main categories (beer, wine, liquor) now.