Restructured package.