Update baseline to reflect package restructuring for images and objects.