Refactor product to package models