Moved files into gen-cpp