Refactored calculator to modules instead.