Package structure changed and SimpleCalculator and its test added.