Cleaned up directory structure to work with Heroku