Refactor product to match new customer pattern
Clean up imports