package restructuring