Restructured package layout