Updated project structure to work with Heroku