Moving code out of Sub directory to work with Heroku build process