reorg for heroku deployment