add ES, remove CM file manager

Change-Id: Ibbe8d1577641b9b3a57406f84ed1a82ca4f9a487