diff --git a/src/Microsoft.AspNet.Identity.Entity/Microsoft.AspNet.Identity.Entity.kproj b/src/Microsoft.AspNet.Identity.Entity/Microsoft.AspNet.Identity.Entity.kproj
index 1a4cd762eb..f692fd3f3b 100644
--- a/src/Microsoft.AspNet.Identity.Entity/Microsoft.AspNet.Identity.Entity.kproj
+++ b/src/Microsoft.AspNet.Identity.Entity/Microsoft.AspNet.Identity.Entity.kproj
@@ -22,12 +22,10 @@
   <ItemGroup>
     <Compile Include="EntityRole.cs" />
     <Compile Include="EntityUser.cs" />
+    <Compile Include="IdentityBuilderExtensions.cs" />
     <Compile Include="IdentityContext.cs" />
     <Compile Include="RoleStore.cs" />
     <Compile Include="UserStore.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
   <Import Project="$(VSToolsPath)\ProjectK\Microsoft.Web.ProjectK.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file
diff --git a/src/Microsoft.AspNet.Identity.InMemory/Microsoft.AspNet.Identity.InMemory.kproj b/src/Microsoft.AspNet.Identity.InMemory/Microsoft.AspNet.Identity.InMemory.kproj
index 1792939c5f..4ec244d955 100644
--- a/src/Microsoft.AspNet.Identity.InMemory/Microsoft.AspNet.Identity.InMemory.kproj
+++ b/src/Microsoft.AspNet.Identity.InMemory/Microsoft.AspNet.Identity.InMemory.kproj
@@ -20,11 +20,9 @@
     <Content Include="Project.json" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="IdentityBuilderExtensions.cs" />
     <Compile Include="InMemoryRoleStore.cs" />
     <Compile Include="InMemoryUserStore.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
   <Import Project="$(VSToolsPath)\ProjectK\Microsoft.Web.ProjectK.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file
diff --git a/src/Microsoft.AspNet.Identity.Security/Microsoft.AspNet.Identity.Security.kproj b/src/Microsoft.AspNet.Identity.Security/Microsoft.AspNet.Identity.Security.kproj
index 44e592c920..009b7dcdca 100644
--- a/src/Microsoft.AspNet.Identity.Security/Microsoft.AspNet.Identity.Security.kproj
+++ b/src/Microsoft.AspNet.Identity.Security/Microsoft.AspNet.Identity.Security.kproj
@@ -25,8 +25,5 @@
     <Compile Include="SignInManager.cs" />
     <Compile Include="SignInStatus.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
   <Import Project="$(VSToolsPath)\ProjectK\Microsoft.Web.ProjectK.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file
diff --git a/src/Microsoft.AspNet.Identity/Microsoft.AspNet.Identity.kproj b/src/Microsoft.AspNet.Identity/Microsoft.AspNet.Identity.kproj
index a161751b0f..acdf22e5e6 100644
--- a/src/Microsoft.AspNet.Identity/Microsoft.AspNet.Identity.kproj
+++ b/src/Microsoft.AspNet.Identity/Microsoft.AspNet.Identity.kproj
@@ -22,6 +22,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ClaimsIdentityFactory.cs" />
+    <Compile Include="ClaimTypeOptions.cs" />
     <Compile Include="Crypto.cs" />
     <Compile Include="IClaimsIdentityFactory.cs" />
     <Compile Include="IdentityBuilder.cs" />
@@ -31,7 +32,6 @@
     <Compile Include="IdentityRole.cs" />
     <Compile Include="IdentityServiceCollectionExtensions.cs" />
     <Compile Include="IdentityServices.cs" />
-    <Compile Include="IdentitySetup.cs" />
     <Compile Include="IdentityUser.cs" />
     <Compile Include="IdentityUserClaim.cs" />
     <Compile Include="IdentityUserLogin.cs" />
@@ -55,7 +55,10 @@
     <Compile Include="IUserTokenProvider.cs" />
     <Compile Include="IUserTwoFactorStore.cs" />
     <Compile Include="IUserValidator.cs" />
+    <Compile Include="LockoutOptions.cs" />
+    <Compile Include="LockoutPolicy.cs" />
     <Compile Include="PasswordHasher.cs" />
+    <Compile Include="PasswordOptions.cs" />
     <Compile Include="PasswordValidator.cs" />
     <Compile Include="PasswordVerificationResult.cs" />
     <Compile Include="Resources.Designer.cs" />
@@ -64,10 +67,8 @@
     <Compile Include="RoleValidator.cs" />
     <Compile Include="UserLoginInfo.cs" />
     <Compile Include="UserManager.cs" />
+    <Compile Include="UserOptions.cs" />
     <Compile Include="UserValidator.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
   <Import Project="$(VSToolsPath)\ProjectK\Microsoft.Web.ProjectK.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.Identity.Entity.Test/Microsoft.AspNet.Identity.Entity.Test.kproj b/test/Microsoft.AspNet.Identity.Entity.Test/Microsoft.AspNet.Identity.Entity.Test.kproj
index 17600b2a61..8c85b4f124 100644
--- a/test/Microsoft.AspNet.Identity.Entity.Test/Microsoft.AspNet.Identity.Entity.Test.kproj
+++ b/test/Microsoft.AspNet.Identity.Entity.Test/Microsoft.AspNet.Identity.Entity.Test.kproj
@@ -23,11 +23,9 @@
   <ItemGroup>
     <Compile Include="IdentityResultAssert.cs" />
     <Compile Include="RoleStoreTest.cs" />
+    <Compile Include="StartupTest.cs" />
     <Compile Include="TestIdentityFactory.cs" />
     <Compile Include="UserStoreTest.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
   <Import Project="$(VSToolsPath)\ProjectK\Microsoft.Web.ProjectK.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.Identity.InMemory.Test/StartupTest.cs b/test/Microsoft.AspNet.Identity.InMemory.Test/StartupTest.cs
index 9bcd6bab1c..f12bde2fce 100644
--- a/test/Microsoft.AspNet.Identity.InMemory.Test/StartupTest.cs
+++ b/test/Microsoft.AspNet.Identity.InMemory.Test/StartupTest.cs
@@ -15,9 +15,9 @@
 // See the Apache 2 License for the specific language governing
 // permissions and limitations under the License.
 
-using Microsoft.AspNet.Abstractions;
 using Microsoft.AspNet.DependencyInjection;
 using Microsoft.AspNet.DependencyInjection.Fallback;
+using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Identity.Test;
 using Microsoft.AspNet.PipelineCore;
 using System;