files rearranged in preparation for push to heroku