Moved all navigation-related code to contrib/navigation. Refactored navigation to...