Reorganize package lists