Modifying structure/code some more to get Heroku to run.