re-structuring the package