Cleanups; add Beverage models; deprecate old fields.
v0.1.14