more reorganizing of settings for easy local development