Moved calibration classes to separate subpackage