Set things up for heroku more smoothly, moving incrementally towards a
heroku-compatible project structure