Remove mcpc src and move universal src