Refactored app -> server and app -> navApp for clarity