adjust package structs