Blackberry: Improve packaging.