If you want to keep CVP, don't overwrite its files.

You won't miss anything, since fixes I made in those files are also done in latest version of CVP.