Added app.yml for heroku
Refactoring different elements before merging branch