Removed a level of hierarchy as schema wasn't happy.

refs #8181
Merge branch 'feature/8181_new_vision_mapping' into develop