Having it split out made testing it separately a lot easier. I can stick the BottleCollector constant within the Bottle namespace though.