Reorganizing files inside lib.