Added mock data so as to run on browser. Cleanup of MVC & service