Restructured package list