Reworked directory structure for deployment to Heroku