NOREF: Hierarchy changes to hiera.yaml and structural changes to puppet.conf