reorganizing into a package