Made changes to overall structure of the application and worked on rest api