reorganizing library calls