Added models for CommodityPackage, and some pep8 changes