Reorganizing the libs.