Rename ExpressionEvaluator2.java to ExpressionEvaluator.java