restructure for package part 3