Moved calc.y and calc.rb to be calculator.