Updated calibration pattern and tidied files