diff --git a/Parse.nuspec b/Parse.nuspec
index 0e866906..f94220df 100644
--- a/Parse.nuspec
+++ b/Parse.nuspec
@@ -40,15 +40,15 @@
     <file src="Parse\bin\Release\Parse.xml" target="lib\wpa81" />
 	
 	<!-- Xamarin Android -->
-    <file src="Parse\bin\Release\Parse.Android\Parse.Android.dll" target="lib\MonoAndroid" />
-    <file src="Parse\bin\Release\Parse.Android\Parse.Android.xml" target="lib\MonoAndroid" />
+    <file src="Parse\bin\Release\Android\Parse.Android.dll" target="lib\MonoAndroid" />
+    <file src="Parse\bin\Release\Android\Parse.Android.xml" target="lib\MonoAndroid" />
 	
 	<!-- Xamarin iOS -->
-    <file src="Parse\bin\Release\Parse.iOS\Parse.iOS.dll" target="lib\MonoTouch10" />
-    <file src="Parse\bin\Release\Parse.iOS\Parse.iOS.xml" target="lib\MonoTouch10" />
+    <file src="Parse\bin\Release\iOS\Parse.iOS.dll" target="lib\MonoTouch10" />
+    <file src="Parse\bin\Release\iOS\Parse.iOS.xml" target="lib\MonoTouch10" />
 	
 	<!-- Xamarin iOS Unified -->
-    <file src="Parse\bin\Release\Parse.iOS\Parse.iOS.dll" target="lib\Xamarin.iOS10" />
-    <file src="Parse\bin\Release\Parse.iOS\Parse.iOS.xml" target="lib\Xamarin.iOS10" />
+    <file src="Parse\bin\Release\iOS\Parse.iOS.dll" target="lib\Xamarin.iOS10" />
+    <file src="Parse\bin\Release\iOS\Parse.iOS.xml" target="lib\Xamarin.iOS10" />
   </files>
 </package>
\ No newline at end of file
diff --git a/Parse/Parse.Android.csproj b/Parse/Parse.Android.csproj
index 571324e9..abdf89fd 100644
--- a/Parse/Parse.Android.csproj
+++ b/Parse/Parse.Android.csproj
@@ -32,13 +32,13 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\Parse.Android\</OutputPath>
+    <OutputPath>bin\Release\Android\</OutputPath>
     <DefineConstants>TRACE;MONO;ANDROID</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AndroidLinkMode>SdkOnly</AndroidLinkMode>
     <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
-    <DocumentationFile>bin\Release\Parse.Android\Parse.Android.xml</DocumentationFile>
+    <DocumentationFile>bin\Release\Android\Parse.Android.xml</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
@@ -49,10 +49,9 @@
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Xml" />
   </ItemGroup>
-
   <!-- Used for setting excluded files -->
   <PropertyGroup>
-      <ExcludedPlatformSpecificSourceFilesString>
+    <ExcludedPlatformSpecificSourceFilesString>
           **\iOS\**;
           **\NetFx45\**;
           **\Phone\**;
@@ -62,13 +61,11 @@
       </ExcludedPlatformSpecificSourceFilesString>
   </PropertyGroup>
   <ItemGroup>
-      <!-- Assembly info, etc. -->
-      <Compile Include="Properties\*.cs" Exclude="Properties\Settings.Designer.cs" />
-
-      <Compile Include="Internal\**\*.cs" Exclude="$(ExcludedPlatformSpecificSourceFilesString)" />
-      <Compile Include="Public\**\*.cs" Exclude="$(ExcludedPlatformSpecificSourceFilesString)" />
+    <!-- Assembly info, etc. -->
+    <Compile Include="Properties\*.cs" Exclude="Properties\Settings.Designer.cs" />
+    <Compile Include="Internal\**\*.cs" Exclude="$(ExcludedPlatformSpecificSourceFilesString)" />
+    <Compile Include="Public\**\*.cs" Exclude="$(ExcludedPlatformSpecificSourceFilesString)" />
   </ItemGroup>
-
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" Condition="Exists('$(SolutionDir)\.nuget\nuget.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
@@ -79,4 +76,4 @@
   </Target>
   -->
   <ItemGroup />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Parse/Parse.iOS.csproj b/Parse/Parse.iOS.csproj
index b86ea1be..e2c40773 100644
--- a/Parse/Parse.iOS.csproj
+++ b/Parse/Parse.iOS.csproj
@@ -54,14 +54,14 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
     <DebugType>none</DebugType>
     <Optimize>True</Optimize>
-    <OutputPath>bin\Release\Parse.iOS\</OutputPath>
+    <OutputPath>bin\Release\iOS\</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>False</ConsolePause>
     <CodesignKey>iPhone Developer</CodesignKey>
     <AssemblyName>Parse.iOS</AssemblyName>
     <DefineConstants>MONO;IOS</DefineConstants>
-    <DocumentationFile>bin\Release\Parse.iOS\Parse.iOS.xml</DocumentationFile>
+    <DocumentationFile>bin\Release\iOS\Parse.iOS.xml</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Ad-Hoc|iPhone' ">
     <DebugType>none</DebugType>
@@ -102,9 +102,8 @@
     <WarningLevel>4</WarningLevel>
     <Optimize>false</Optimize>
   </PropertyGroup>
-
-  <!-- Used for setting excluded files -->
-  <PropertyGroup>
+  <!-- Used for setting excluded files -->
+  <PropertyGroup>
     <ExcludedPlatformSpecificSourceFilesString>
       **\Android\**;
       **\NetFx45\**;
@@ -112,16 +111,14 @@
       **\Unity\**;
       **\WinRT\**;
       **\SettingsStorage\**;
-    </ExcludedPlatformSpecificSourceFilesString>
-  </PropertyGroup>
+    </ExcludedPlatformSpecificSourceFilesString>
+  </PropertyGroup>
   <ItemGroup>
-   <!-- Assembly info, etc. -->
-   <Compile Include="Properties\*.cs" Exclude="Properties\Settings.Designer.cs" />
-
-   <Compile Include="Internal\**\*.cs" Exclude="$(ExcludedPlatformSpecificSourceFilesString)" />
-   <Compile Include="Public\**\*.cs" Exclude="$(ExcludedPlatformSpecificSourceFilesString)" />
+    <!-- Assembly info, etc. -->
+    <Compile Include="Properties\*.cs" Exclude="Properties\Settings.Designer.cs" />
+    <Compile Include="Internal\**\*.cs" Exclude="$(ExcludedPlatformSpecificSourceFilesString)" />
+    <Compile Include="Public\**\*.cs" Exclude="$(ExcludedPlatformSpecificSourceFilesString)" />
   </ItemGroup>
-
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Xml" />
@@ -132,4 +129,4 @@
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" Condition="Exists('$(SolutionDir)\.nuget\nuget.targets')" />
   <ItemGroup />
-</Project>
+</Project>
\ No newline at end of file