Better hierarchy1 example.

Better naming of things.
Cleanup.