New navigation structure to make way for MU changes