Added calculator class and renamed existing classes.