UHM-1322: Refactor Awaiting Admission App into Core Apps and EMR Ap
some follow-on commits based on code review