Reorganizing libs