moving package changes to common file