Rearrange source checkout