refactoring: cleanup navigation apps hierarchy