Moved hiera hierachy file, and made
minor changes to the hiera examples.