Reorganized library objects.