Formatting edits to cpp files
Changed file names