Package restructuring.