Add calibration skunkworks. Rename Srivats scratch folder.