Rename util.cpp to cpp/util.cpp