Restructuring for Heroku