Added some changes on the structure of the app.