Re-Work a few files related to cm's TE

Change-Id: I57a9b0ffc8d1205d6b6913713ce0bfffc8343987