Reorganized the object lists.