modified code heirarchy to suit heroku