change echo to short tags, clean up refs to app directory