Move CInv to protocol.[ch]pp