Package structure cleanup.