reorganizing calculator
bug fix
updating package calculator