reorganizing libs