Restructured to make Heroku friendly
Restructured to make Heroku friendly