I think you should cvs remove the files. We don't want unused files there. Normally what I do before the copy is I do a diff -q just for me to know which one I should delete.
Don't think that its a forked package, its just one big upgrade :)
