profiles/package.mask: reorganize and clean.