Update and rename Calc.java to UPCalc.java