reorg for heroku
Merge pull request #17 from catherinev/reorg_for_heroku

reorg for heroku