Menu app is under Navigation app now
Merge branch 'code-organize'