Removing 'package' property.  Now everything is derived from name.