Index: GoogleApisClient.sln
===================================================================
--- a/GoogleApisClient.sln
+++ b/GoogleApisClient.sln
@@ -14,9 +14,9 @@
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MVC4", "MVC4", "{AB6FBFCC-03C1-44C0-B88D-D1D897EB2E36}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WP", "WP", "{ECD96861-5839-42AC-BF92-E876F3A64FAF}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WP80", "WP80", "{ECD96861-5839-42AC-BF92-E876F3A64FAF}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WinRT", "WinRT", "{B958FC48-7F21-4C26-BABB-7C5D2D6A0AAC}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Windows", "Windows", "{B958FC48-7F21-4C26-BABB-7C5D2D6A0AAC}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GoogleApis.Tests", "Src\GoogleApis.Tests\GoogleApis.Tests.csproj", "{9A8AA9EF-6904-43D8-8A26-0AB62069C2DC}"
 EndProject
@@ -32,16 +32,16 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GoogleApis.Auth.Mvc4", "Src\GoogleApis.Auth.Mvc4\GoogleApis.Auth.Mvc4.csproj", "{B700243A-2FAC-454B-8858-47635BFA71C6}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GoogleApis.Auth.WinRT", "Src\GoogleApis.Auth.WinRT\GoogleApis.Auth.WinRT.csproj", "{B1D5B962-3E98-46D4-992E-C6491E4E8A02}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GoogleApis.WinRT", "Src\GoogleApis.WinRT\GoogleApis.WinRT.csproj", "{9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GoogleApis.WP", "Src\GoogleApis.WP\GoogleApis.WP.csproj", "{39E1EC7C-3C05-44E4-A19F-A61BF6EA9B11}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GoogleApis.Auth.WP", "Src\GoogleApis.Auth.WP\GoogleApis.Auth.WP.csproj", "{430E4403-12E3-4CF0-8E2A-CE83D0948497}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GoogleApis.Core", "Src\GoogleApis.Core\GoogleApis.Core.csproj", "{DB18F3A6-B16A-477B-A7B1-C2B116D1BFB0}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GoogleApis.Auth.Windows", "Src\GoogleApis.Auth.Windows\GoogleApis.Auth.Windows.csproj", "{B1D5B962-3E98-46D4-992E-C6491E4E8A02}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GoogleApis.Windows", "Src\GoogleApis.Windows\GoogleApis.Windows.csproj", "{9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -170,54 +170,6 @@
 		{B700243A-2FAC-454B-8858-47635BFA71C6}.Release|Win32.ActiveCfg = Release|Any CPU
 		{B700243A-2FAC-454B-8858-47635BFA71C6}.Release|x64.ActiveCfg = Release|Any CPU
 		{B700243A-2FAC-454B-8858-47635BFA71C6}.Release|x86.ActiveCfg = Release|Any CPU
-		{B1D5B962-3E98-46D4-992E-C6491E4E8A02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B1D5B962-3E98-46D4-992E-C6491E4E8A02}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B1D5B962-3E98-46D4-992E-C6491E4E8A02}.Debug|ARM.ActiveCfg = Debug|ARM
-		{B1D5B962-3E98-46D4-992E-C6491E4E8A02}.Debug|ARM.Build.0 = Debug|ARM
-		{B1D5B962-3E98-46D4-992E-C6491E4E8A02}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{B1D5B962-3E98-46D4-992E-C6491E4E8A02}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{B1D5B962-3E98-46D4-992E-C6491E4E8A02}.Debug|Win32.ActiveCfg = Debug|x86
-		{B1D5B962-3E98-46D4-992E-C6491E4E8A02}.Debug|Win32.Build.0 = Debug|x86
-		{B1D5B962-3E98-46D4-992E-C6491E4E8A02}.Debug|x64.ActiveCfg = Debug|x64
-		{B1D5B962-3E98-46D4-992E-C6491E4E8A02}.Debug|x64.Build.0 = Debug|x64
-		{B1D5B962-3E98-46D4-992E-C6491E4E8A02}.Debug|x86.ActiveCfg = Debug|x86
-		{B1D5B962-3E98-46D4-992E-C6491E4E8A02}.Debug|x86.Build.0 = Debug|x86
-		{B1D5B962-3E98-46D4-992E-C6491E4E8A02}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B1D5B962-3E98-46D4-992E-C6491E4E8A02}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B1D5B962-3E98-46D4-992E-C6491E4E8A02}.Release|ARM.ActiveCfg = Release|ARM
-		{B1D5B962-3E98-46D4-992E-C6491E4E8A02}.Release|ARM.Build.0 = Release|ARM
-		{B1D5B962-3E98-46D4-992E-C6491E4E8A02}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{B1D5B962-3E98-46D4-992E-C6491E4E8A02}.Release|Mixed Platforms.Build.0 = Release|x86
-		{B1D5B962-3E98-46D4-992E-C6491E4E8A02}.Release|Win32.ActiveCfg = Release|x86
-		{B1D5B962-3E98-46D4-992E-C6491E4E8A02}.Release|Win32.Build.0 = Release|x86
-		{B1D5B962-3E98-46D4-992E-C6491E4E8A02}.Release|x64.ActiveCfg = Release|x64
-		{B1D5B962-3E98-46D4-992E-C6491E4E8A02}.Release|x64.Build.0 = Release|x64
-		{B1D5B962-3E98-46D4-992E-C6491E4E8A02}.Release|x86.ActiveCfg = Release|x86
-		{B1D5B962-3E98-46D4-992E-C6491E4E8A02}.Release|x86.Build.0 = Release|x86
-		{9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}.Debug|ARM.ActiveCfg = Debug|ARM
-		{9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}.Debug|ARM.Build.0 = Debug|ARM
-		{9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}.Debug|Win32.ActiveCfg = Debug|x86
-		{9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}.Debug|Win32.Build.0 = Debug|x86
-		{9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}.Debug|x64.ActiveCfg = Debug|x64
-		{9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}.Debug|x64.Build.0 = Debug|x64
-		{9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}.Debug|x86.ActiveCfg = Debug|x86
-		{9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}.Debug|x86.Build.0 = Debug|x86
-		{9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}.Release|ARM.ActiveCfg = Release|ARM
-		{9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}.Release|ARM.Build.0 = Release|ARM
-		{9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}.Release|Mixed Platforms.Build.0 = Release|x86
-		{9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}.Release|Win32.ActiveCfg = Release|x86
-		{9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}.Release|Win32.Build.0 = Release|x86
-		{9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}.Release|x64.ActiveCfg = Release|x64
-		{9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}.Release|x64.Build.0 = Release|x64
-		{9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}.Release|x86.ActiveCfg = Release|x86
-		{9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}.Release|x86.Build.0 = Release|x86
 		{39E1EC7C-3C05-44E4-A19F-A61BF6EA9B11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{39E1EC7C-3C05-44E4-A19F-A61BF6EA9B11}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{39E1EC7C-3C05-44E4-A19F-A61BF6EA9B11}.Debug|ARM.ActiveCfg = Debug|ARM
@@ -278,6 +230,54 @@
 		{DB18F3A6-B16A-477B-A7B1-C2B116D1BFB0}.Release|Win32.ActiveCfg = Release|Any CPU
 		{DB18F3A6-B16A-477B-A7B1-C2B116D1BFB0}.Release|x64.ActiveCfg = Release|Any CPU
 		{DB18F3A6-B16A-477B-A7B1-C2B116D1BFB0}.Release|x86.ActiveCfg = Release|Any CPU
+		{B1D5B962-3E98-46D4-992E-C6491E4E8A02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B1D5B962-3E98-46D4-992E-C6491E4E8A02}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B1D5B962-3E98-46D4-992E-C6491E4E8A02}.Debug|ARM.ActiveCfg = Debug|ARM
+		{B1D5B962-3E98-46D4-992E-C6491E4E8A02}.Debug|ARM.Build.0 = Debug|ARM
+		{B1D5B962-3E98-46D4-992E-C6491E4E8A02}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{B1D5B962-3E98-46D4-992E-C6491E4E8A02}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{B1D5B962-3E98-46D4-992E-C6491E4E8A02}.Debug|Win32.ActiveCfg = Debug|x86
+		{B1D5B962-3E98-46D4-992E-C6491E4E8A02}.Debug|Win32.Build.0 = Debug|x86
+		{B1D5B962-3E98-46D4-992E-C6491E4E8A02}.Debug|x64.ActiveCfg = Debug|x64
+		{B1D5B962-3E98-46D4-992E-C6491E4E8A02}.Debug|x64.Build.0 = Debug|x64
+		{B1D5B962-3E98-46D4-992E-C6491E4E8A02}.Debug|x86.ActiveCfg = Debug|x86
+		{B1D5B962-3E98-46D4-992E-C6491E4E8A02}.Debug|x86.Build.0 = Debug|x86
+		{B1D5B962-3E98-46D4-992E-C6491E4E8A02}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B1D5B962-3E98-46D4-992E-C6491E4E8A02}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B1D5B962-3E98-46D4-992E-C6491E4E8A02}.Release|ARM.ActiveCfg = Release|ARM
+		{B1D5B962-3E98-46D4-992E-C6491E4E8A02}.Release|ARM.Build.0 = Release|ARM
+		{B1D5B962-3E98-46D4-992E-C6491E4E8A02}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{B1D5B962-3E98-46D4-992E-C6491E4E8A02}.Release|Mixed Platforms.Build.0 = Release|x86
+		{B1D5B962-3E98-46D4-992E-C6491E4E8A02}.Release|Win32.ActiveCfg = Release|x86
+		{B1D5B962-3E98-46D4-992E-C6491E4E8A02}.Release|Win32.Build.0 = Release|x86
+		{B1D5B962-3E98-46D4-992E-C6491E4E8A02}.Release|x64.ActiveCfg = Release|x64
+		{B1D5B962-3E98-46D4-992E-C6491E4E8A02}.Release|x64.Build.0 = Release|x64
+		{B1D5B962-3E98-46D4-992E-C6491E4E8A02}.Release|x86.ActiveCfg = Release|x86
+		{B1D5B962-3E98-46D4-992E-C6491E4E8A02}.Release|x86.Build.0 = Release|x86
+		{9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}.Debug|ARM.ActiveCfg = Debug|ARM
+		{9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}.Debug|ARM.Build.0 = Debug|ARM
+		{9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}.Debug|Win32.ActiveCfg = Debug|x86
+		{9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}.Debug|Win32.Build.0 = Debug|x86
+		{9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}.Debug|x64.ActiveCfg = Debug|x64
+		{9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}.Debug|x64.Build.0 = Debug|x64
+		{9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}.Debug|x86.ActiveCfg = Debug|x86
+		{9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}.Debug|x86.Build.0 = Debug|x86
+		{9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}.Release|ARM.ActiveCfg = Release|ARM
+		{9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}.Release|ARM.Build.0 = Release|ARM
+		{9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}.Release|Mixed Platforms.Build.0 = Release|x86
+		{9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}.Release|Win32.ActiveCfg = Release|x86
+		{9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}.Release|Win32.Build.0 = Release|x86
+		{9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}.Release|x64.ActiveCfg = Release|x64
+		{9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}.Release|x64.Build.0 = Release|x64
+		{9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}.Release|x86.ActiveCfg = Release|x86
+		{9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -286,10 +286,10 @@
 		{C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD} = {00A1D580-DF06-4C96-A4DA-EDDEF8584971}
 		{8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7} = {00A1D580-DF06-4C96-A4DA-EDDEF8584971}
 		{B700243A-2FAC-454B-8858-47635BFA71C6} = {AB6FBFCC-03C1-44C0-B88D-D1D897EB2E36}
+		{39E1EC7C-3C05-44E4-A19F-A61BF6EA9B11} = {ECD96861-5839-42AC-BF92-E876F3A64FAF}
+		{430E4403-12E3-4CF0-8E2A-CE83D0948497} = {ECD96861-5839-42AC-BF92-E876F3A64FAF}
 		{B1D5B962-3E98-46D4-992E-C6491E4E8A02} = {B958FC48-7F21-4C26-BABB-7C5D2D6A0AAC}
 		{9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6} = {B958FC48-7F21-4C26-BABB-7C5D2D6A0AAC}
-		{39E1EC7C-3C05-44E4-A19F-A61BF6EA9B11} = {ECD96861-5839-42AC-BF92-E876F3A64FAF}
-		{430E4403-12E3-4CF0-8E2A-CE83D0948497} = {ECD96861-5839-42AC-BF92-E876F3A64FAF}
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
 		StartupItem = Src\GoogleApis\GoogleApis.csproj