Added bottle support (and did reorg).