Moving Crypto.Merkle to Block.Merkle