restructure for package