settings_override changes and breaking out structure for common_utils app