Organizing data  and controllers

moved data to products.json and deleted extra info in controller.
Merge origin/master