Refactor c++ runtime c++ files