rename DataCalculatorNew to MerkleTree