Changed name for API  and add more for structure of app.