Introduce app menu
Major reorganization