Calibration/raw data and moved stuff around.