Updated hierarchy.
Updated hieradata files.