Reworking packages to use hiera instead