more directory reorg, setting up heroku