Calculator refactor
Refactored calculator to modules instead.
Further refactoring of origin_calculator
Merge pull request #39 from motion-kit/refactor/calculator

Refactor/calculator