Re-added Calc.java