Made the packages more Django-esque.