Rework the Audio package.