Merge "Slight realignment of CI files"