Added simulation. Renamed types to match calibration_common ones. Corrected bug that prevented the calibration to work.