Adam/calc refactor

fixes issues we've had with sandboxing on prod and edge by restructuring the calc package.

See https://github.com/edx/edx-platform/pull/832