> If it's entirely new code, I think the top option is better because it allows > separation later. We have some files where all the [code 1] gets deleted, but > the copyright remains, somewhat dubious.
Sounds like shoulders of giants stuff. It is exceedingly rare for us to remove a name or copyright. Only happens when it is a totally fresh rewrite.