Moved files so that deploy to heroku is better