Changing structure for ease of heroku