More restructuring to work with Heroku