Codechange: split yield C++ files from 2 to 5 files