Move navigation to modules