@hundreds-father-404 haven't looked carefully at your proposal (and probably won't until tomorrow) but I think doing a reorg to separate v2 source files from v1 is a good idea