Moved stuff up a layer for Heroku