MT#7141 update package to 3.0 style

Change-Id: If833844480fa52d4ac131a434728bcf918b3c74f