Adding proper unpackage support

Change-Id: Ie09ddb32a6e14f80a35317608d488bbdaa4ee523