Restructure for packaging.