MT#7141 upgrade package to 3.0 style

Change-Id: I897e54b7f04fcaf1b805d78c429acdce6f0e39f3