Code cleanup
Changed location hierarchy, added admins to ILS and EWS