Track correct Mms-caf branch and reorganize