added some wrappers, product and picture model
merged