Package structure changes.