huge changes cm repos and cleanup

Change-Id: I41bdd7cf537fd8411f044880e5f4cbfb59d8ee9d