Massive package restructuring