rename and add .cpp files