Changed the structure for heroku