It's not easy to try to fit new code in old code, I empathize completely with that.
This is where I was at an advantage, I was writing new code to fit with new code. There are ideas though that were keys to performance breakthrough which they certainly could borrow.