Restructure for package form.