added navigation-objects to new hierarchy