Updated the geometry. refs #8181
Removed a level of hierarchy as schema wasn't happy.

refs #8181
Merge remote-tracking branch 'origin/feature/8181_new_vision_mapping'