Move common c++ files to src/util