Rearranging the lib...