change structure of this package