restructured extra package support