Libraries refractoring.