Moved calibration stuff to its own package