Better Package setup