Refactor UIContextFactory and move NavigationState to wizard package