Reconfigured package

Change-Id: I6603361c7a4b66996414855958632cce7aabe40a