Package restructoring