Pakage restructuring