ACV-0: Added CalibrationData class + refactoring