Finally actually use proper packaging (hopefully).