Restructure quotes, add provider name