piggy: fixing package imports