Directory restructured again for heroku