Index: Src/GoogleApis/GoogleApis.csproj
===================================================================
--- a/Src/GoogleApis/GoogleApis.csproj
+++ b/Src/GoogleApis/GoogleApis.csproj
@@ -41,6 +41,7 @@
     <!-- A reference to the entire .NET Framework is automatically included -->
     <None Include="Apis\Http\ClassDiagram.cd" />
     <None Include="Apis\ServiceRequests.cd" />
+    <None Include="Apis\[Media]\ClassDiagram.cd" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
@@ -55,6 +56,7 @@
     <Compile Include="Apis\Http\ConfigurableHttpClient.cs" />
     <Compile Include="Apis\Http\ConfigurableMessageHandler.cs" />
     <Compile Include="Apis\Http\BackOffHandler.cs" />
+    <Compile Include="Apis\Http\ExponentialBackOffInitializer.cs" />
     <Compile Include="Apis\Http\HttpClientFactory.cs" />
     <Compile Include="Apis\Http\HttpConsts.cs" />
     <Compile Include="Apis\Http\HttpExtenstions.cs" />
@@ -76,13 +78,16 @@
     <Compile Include="Apis\Requests\ETagAction.cs" />
     <Compile Include="Apis\Requests\IClientServiceRequest.cs" />
     <Compile Include="Apis\Requests\IDirectResponseSchema.cs" />
-    <Compile Include="Apis\Requests\ParameterCollection.cs" />
-    <Compile Include="Apis\Requests\ParameterValidator.cs" />
+    <Compile Include="Apis\Requests\Parameters\ParameterCollection.cs" />
+    <Compile Include="Apis\Requests\Parameters\ParameterUtils.cs" />
+    <Compile Include="Apis\Requests\Parameters\ParameterValidator.cs" />
     <Compile Include="Apis\Requests\RequestBuilder.cs" />
     <Compile Include="Apis\Requests\RequestError.cs" />
     <Compile Include="Apis\Requests\SingleError.cs" />
     <Compile Include="Apis\Services\BaseClientService.cs" />
     <Compile Include="Apis\Services\IClientService.cs" />
+    <Compile Include="Apis\Util\IClock.cs" />
+    <Compile Include="Apis\Util\Store\IDataStore.cs" />
     <Compile Include="Apis\Testing\VisibleForTestOnly.cs" />
     <Compile Include="Apis\[Media]\Download\IDownloadProgress.cs" />
     <Compile Include="Apis\[Media]\Download\IMediaDownloader.cs" />
@@ -130,9 +135,14 @@
       <HintPath>..\..\packages\Zlib.Portable.1.9.2\lib\portable-net4+sl4+wp71+win8\Zlib.Portable.dll</HintPath>
     </Reference>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.8\tools\Microsoft.Bcl.Build.targets" />
+  <Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets')" />
+  <Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
+    <Error Condition="!Exists('..\..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
+    <Error Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">