Renamed ProductSample to Product
Misc clean up of product type and instances
Modified model for fine tunining