Move files around to make heroku deployment a bit easier