tidied in folders and should be ready to deploy to heroku