Added Heroku support and changed file structure