Convert to new Layout format.