Move calibration settings in own structure