Improved package structure and refactored code in Calculator.java