Fair enough. Well, unless a bunch of people think it should be moved
   to dist/nvi, I suppose this is a workable solution.
   

nvi comes already made for integration.  there is no benefit
to moving the sources away...