Persist jcr/xml in hierarchy structure.

https://www.pivotaltracker.com/s/projects/684825/stories/75644184