Package restructuring