Restructuring for heroku, dev-settings