diff --git a/Identity.sln b/Identity.sln
index 28c6a6ef28..97cd0565ac 100644
--- a/Identity.sln
+++ b/Identity.sln
@@ -9,19 +9,19 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{52D59F18-6
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Identity.InMemory", "src\Microsoft.AspNet.Identity.InMemory\Microsoft.AspNet.Identity.InMemory.kproj", "{01A9DA71-5C42-4ED5-AD0C-D6FAF11C0A74}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Identity", "src\Microsoft.AspNet.Identity\Microsoft.AspNet.Identity.kproj", "{1729302E-A58E-4652-B639-5B6B68DA2748}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Identity", "src\Microsoft.Framework.Identity\Microsoft.Framework.Identity.kproj", "{1729302E-A58E-4652-B639-5B6B68DA2748}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Identity.Entity", "src\Microsoft.AspNet.Identity.Entity\Microsoft.AspNet.Identity.Entity.kproj", "{AD42BAFB-1993-4FAF-A280-3711A9F33E2F}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Identity.EntityFramework", "src\Microsoft.Framework.Identity.EntityFramework\Microsoft.Framework.Identity.EntityFramework.kproj", "{AD42BAFB-1993-4FAF-A280-3711A9F33E2F}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Identity.Security", "src\Microsoft.AspNet.Identity.Security\Microsoft.AspNet.Identity.Security.kproj", "{7B4CFF5A-1948-45EC-B170-6EB7C039B2F9}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Identity.AspNet", "src\Microsoft.Framework.Identity.AspNet\Microsoft.Framework.Identity.AspNet.kproj", "{7B4CFF5A-1948-45EC-B170-6EB7C039B2F9}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Identity.Test", "test\Microsoft.AspNet.Identity.Test\Microsoft.AspNet.Identity.Test.kproj", "{2CF3927B-19E4-4866-9BAA-2C131580E7C3}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Identity.Test", "test\Microsoft.Framework.Identity.Test\Microsoft.Framework.Identity.Test.kproj", "{2CF3927B-19E4-4866-9BAA-2C131580E7C3}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Identity.Security.Test", "test\Microsoft.AspNet.Identity.Security.Test\Microsoft.AspNet.Identity.Security.Test.kproj", "{823453CC-5846-4D49-B343-15BC0074CA60}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Identity.AspNet.Test", "test\Microsoft.Framework.Identity.AspNet.Test\Microsoft.Framework.Identity.AspNet.Test.kproj", "{823453CC-5846-4D49-B343-15BC0074CA60}"
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Identity.InMemory.Test", "test\Microsoft.AspNet.Identity.InMemory.Test\Microsoft.AspNet.Identity.InMemory.Test.kproj", "{65161409-C4C4-4D63-A73B-231FCFF4D503}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Identity.Entity.Test", "test\Microsoft.AspNet.Identity.Entity.Test\Microsoft.AspNet.Identity.Entity.Test.kproj", "{B4C067C1-F934-493C-9DBC-19E8CA305613}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Identity.EntityFramework.Test", "test\Microsoft.Framework.Identity.EntityFramework.Test\Microsoft.Framework.Identity.EntityFramework.Test.kproj", "{B4C067C1-F934-493C-9DBC-19E8CA305613}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/src/Microsoft.AspNet.Identity.InMemory/project.json b/src/Microsoft.AspNet.Identity.InMemory/project.json
index 65986ca463..943bb0ec8e 100644
--- a/src/Microsoft.AspNet.Identity.InMemory/project.json
+++ b/src/Microsoft.AspNet.Identity.InMemory/project.json
@@ -1,9 +1,9 @@
 {
-  "version": "0.1-alpha-*",
+  "version": "3.0.0-*",
   "dependencies": {
-    "Microsoft.AspNet.Identity": "",
-    "Microsoft.Framework.DependencyInjection" : "0.1-alpha-*",
-    "System.Security.Claims": "0.1-alpha-*"
+    "Microsoft.Framework.Identity": "",
+    "Microsoft.Framework.DependencyInjection" : "1.0.0-*",
+    "System.Security.Claims": "1.0.0-*"
   },
   "configurations": {
     "net45": {},
diff --git a/src/Microsoft.AspNet.Identity.Security/HttpAuthenticationManager.cs b/src/Microsoft.Framework.Identity.AspNet/HttpAuthenticationManager.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity.Security/HttpAuthenticationManager.cs
rename to src/Microsoft.Framework.Identity.AspNet/HttpAuthenticationManager.cs
diff --git a/src/Microsoft.AspNet.Identity.Security/IdentityBuilderExtensions.cs b/src/Microsoft.Framework.Identity.AspNet/IdentityBuilderExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity.Security/IdentityBuilderExtensions.cs
rename to src/Microsoft.Framework.Identity.AspNet/IdentityBuilderExtensions.cs
diff --git a/src/Microsoft.AspNet.Identity.Security/IdentityExtensions.cs b/src/Microsoft.Framework.Identity.AspNet/IdentityExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity.Security/IdentityExtensions.cs
rename to src/Microsoft.Framework.Identity.AspNet/IdentityExtensions.cs
diff --git a/src/Microsoft.AspNet.Identity.Security/Microsoft.AspNet.Identity.Security.kproj b/src/Microsoft.Framework.Identity.AspNet/Microsoft.Framework.Identity.AspNet.kproj
similarity index 100%
rename from src/Microsoft.AspNet.Identity.Security/Microsoft.AspNet.Identity.Security.kproj
rename to src/Microsoft.Framework.Identity.AspNet/Microsoft.Framework.Identity.AspNet.kproj
diff --git a/src/Microsoft.AspNet.Identity.Security/project.json b/src/Microsoft.Framework.Identity.AspNet/project.json
similarity index 72%
rename from src/Microsoft.AspNet.Identity.Security/project.json
rename to src/Microsoft.Framework.Identity.AspNet/project.json
index ce73b22943..66475d41dd 100644
--- a/src/Microsoft.AspNet.Identity.Security/project.json
+++ b/src/Microsoft.Framework.Identity.AspNet/project.json
@@ -1,11 +1,11 @@
 {
-  "version": "0.1-alpha-*",
+  "version": "3.0.0-*",
   "dependencies": {
-    "Microsoft.AspNet.Http" : "0.1-alpha-*",
-    "Microsoft.AspNet.Identity" : "",
-    "Microsoft.AspNet.Security.DataProtection" : "0.1-alpha-*",
-    "Microsoft.Framework.DependencyInjection" : "0.1-alpha-*",
-    "System.Security.Claims" : "0.1-alpha-*"
+    "Microsoft.AspNet.Http" : "1.0.0-*",
+    "Microsoft.Framework.Identity" : "",
+    "Microsoft.AspNet.Security.DataProtection" : "1.0.0-*",
+    "Microsoft.Framework.DependencyInjection" : "1.0.0-*",
+    "System.Security.Claims" : "1.0.0-*"
   },
   "configurations": {
     "net45": {},
diff --git a/src/Microsoft.AspNet.Identity.Entity/EntityIdentityBuilderExtensions.cs b/src/Microsoft.Framework.Identity.EntityFramework/EntityIdentityBuilderExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity.Entity/EntityIdentityBuilderExtensions.cs
rename to src/Microsoft.Framework.Identity.EntityFramework/EntityIdentityBuilderExtensions.cs
diff --git a/src/Microsoft.AspNet.Identity.Entity/EntityRole.cs b/src/Microsoft.Framework.Identity.EntityFramework/EntityRole.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity.Entity/EntityRole.cs
rename to src/Microsoft.Framework.Identity.EntityFramework/EntityRole.cs
diff --git a/src/Microsoft.AspNet.Identity.Entity/EntityRoleStore.cs b/src/Microsoft.Framework.Identity.EntityFramework/EntityRoleStore.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity.Entity/EntityRoleStore.cs
rename to src/Microsoft.Framework.Identity.EntityFramework/EntityRoleStore.cs
diff --git a/src/Microsoft.AspNet.Identity.Entity/EntityUser.cs b/src/Microsoft.Framework.Identity.EntityFramework/EntityUser.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity.Entity/EntityUser.cs
rename to src/Microsoft.Framework.Identity.EntityFramework/EntityUser.cs
diff --git a/src/Microsoft.AspNet.Identity.Entity/IdentityContext.cs b/src/Microsoft.Framework.Identity.EntityFramework/IdentityContext.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity.Entity/IdentityContext.cs
rename to src/Microsoft.Framework.Identity.EntityFramework/IdentityContext.cs
diff --git a/src/Microsoft.AspNet.Identity.Entity/IdentitySqlContext.cs b/src/Microsoft.Framework.Identity.EntityFramework/IdentitySqlContext.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity.Entity/IdentitySqlContext.cs
rename to src/Microsoft.Framework.Identity.EntityFramework/IdentitySqlContext.cs
diff --git a/src/Microsoft.AspNet.Identity.Entity/InMemoryUserStore.cs b/src/Microsoft.Framework.Identity.EntityFramework/InMemoryUserStore.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity.Entity/InMemoryUserStore.cs
rename to src/Microsoft.Framework.Identity.EntityFramework/InMemoryUserStore.cs
diff --git a/src/Microsoft.AspNet.Identity.Entity/Microsoft.AspNet.Identity.Entity.kproj b/src/Microsoft.Framework.Identity.EntityFramework/Microsoft.Framework.Identity.EntityFramework.kproj
similarity index 100%
rename from src/Microsoft.AspNet.Identity.Entity/Microsoft.AspNet.Identity.Entity.kproj
rename to src/Microsoft.Framework.Identity.EntityFramework/Microsoft.Framework.Identity.EntityFramework.kproj
diff --git a/src/Microsoft.AspNet.Identity.Entity/RoleStore.cs b/src/Microsoft.Framework.Identity.EntityFramework/RoleStore.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity.Entity/RoleStore.cs
rename to src/Microsoft.Framework.Identity.EntityFramework/RoleStore.cs
diff --git a/src/Microsoft.AspNet.Identity.Entity/SqlUserStore.cs b/src/Microsoft.Framework.Identity.EntityFramework/SqlUserStore.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity.Entity/SqlUserStore.cs
rename to src/Microsoft.Framework.Identity.EntityFramework/SqlUserStore.cs
diff --git a/src/Microsoft.AspNet.Identity.Entity/User.cs b/src/Microsoft.Framework.Identity.EntityFramework/User.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity.Entity/User.cs
rename to src/Microsoft.Framework.Identity.EntityFramework/User.cs
diff --git a/src/Microsoft.AspNet.Identity.Entity/project.json b/src/Microsoft.Framework.Identity.EntityFramework/project.json
similarity index 65%
rename from src/Microsoft.AspNet.Identity.Entity/project.json
rename to src/Microsoft.Framework.Identity.EntityFramework/project.json
index 30de3815dc..ee72a7a343 100644
--- a/src/Microsoft.AspNet.Identity.Entity/project.json
+++ b/src/Microsoft.Framework.Identity.EntityFramework/project.json
@@ -1,20 +1,15 @@
 {
-  "version": "0.1-alpha-*",
+  "version": "3.0.0-*",
   "dependencies": {
-    "Microsoft.AspNet.Identity": "",
-    "Microsoft.Data.Entity": "0.1-alpha-*",
-    "Microsoft.Data.Entity.InMemory": "0.1-alpha-*",
-    "Microsoft.Data.Entity.Relational": "0.1-alpha-*",
-    "Microsoft.Data.Entity.SqlServer": "0.1-alpha-*",
-    "Microsoft.Framework.ConfigurationModel": "0.1-alpha-*",
-    "Microsoft.Framework.DependencyInjection": "0.1-alpha-*",
-    "System.Security.Claims" : "0.1-alpha-*"
+    "Microsoft.Framework.Identity": "",
+    "EntityFramework.InMemory": "7.0.0-*",
+    "EntityFramework.SqlServer": "7.0.0-*",
+    "System.Security.Claims" : "1.0.0-*"
   },
   "configurations": {
     "net451": {
       "dependencies": {
         "System.Collections": "",
-        "System.Data": "",
         "System.Runtime": ""
       }
     },
diff --git a/src/Microsoft.AspNet.Identity/ClaimTypeOptions.cs b/src/Microsoft.Framework.Identity/ClaimTypeOptions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity/ClaimTypeOptions.cs
rename to src/Microsoft.Framework.Identity/ClaimTypeOptions.cs
diff --git a/src/Microsoft.AspNet.Identity/ClaimsIdentityFactory.cs b/src/Microsoft.Framework.Identity/ClaimsIdentityFactory.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity/ClaimsIdentityFactory.cs
rename to src/Microsoft.Framework.Identity/ClaimsIdentityFactory.cs
diff --git a/src/Microsoft.AspNet.Identity/Crypto.cs b/src/Microsoft.Framework.Identity/Crypto.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity/Crypto.cs
rename to src/Microsoft.Framework.Identity/Crypto.cs
diff --git a/src/Microsoft.AspNet.Identity/DefaultAuthenticationTypes.cs b/src/Microsoft.Framework.Identity/DefaultAuthenticationTypes.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity/DefaultAuthenticationTypes.cs
rename to src/Microsoft.Framework.Identity/DefaultAuthenticationTypes.cs
diff --git a/src/Microsoft.AspNet.Identity/IAuthenticationManager.cs b/src/Microsoft.Framework.Identity/IAuthenticationManager.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity/IAuthenticationManager.cs
rename to src/Microsoft.Framework.Identity/IAuthenticationManager.cs
diff --git a/src/Microsoft.AspNet.Identity/IClaimsIdentityFactory.cs b/src/Microsoft.Framework.Identity/IClaimsIdentityFactory.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity/IClaimsIdentityFactory.cs
rename to src/Microsoft.Framework.Identity/IClaimsIdentityFactory.cs
diff --git a/src/Microsoft.AspNet.Identity/IIdentityMessageService.cs b/src/Microsoft.Framework.Identity/IIdentityMessageService.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity/IIdentityMessageService.cs
rename to src/Microsoft.Framework.Identity/IIdentityMessageService.cs
diff --git a/src/Microsoft.AspNet.Identity/IPasswordHasher.cs b/src/Microsoft.Framework.Identity/IPasswordHasher.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity/IPasswordHasher.cs
rename to src/Microsoft.Framework.Identity/IPasswordHasher.cs
diff --git a/src/Microsoft.AspNet.Identity/IPasswordValidator.cs b/src/Microsoft.Framework.Identity/IPasswordValidator.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity/IPasswordValidator.cs
rename to src/Microsoft.Framework.Identity/IPasswordValidator.cs
diff --git a/src/Microsoft.AspNet.Identity/IQueryableRoleStore.cs b/src/Microsoft.Framework.Identity/IQueryableRoleStore.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity/IQueryableRoleStore.cs
rename to src/Microsoft.Framework.Identity/IQueryableRoleStore.cs
diff --git a/src/Microsoft.AspNet.Identity/IQueryableUserStore.cs b/src/Microsoft.Framework.Identity/IQueryableUserStore.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity/IQueryableUserStore.cs
rename to src/Microsoft.Framework.Identity/IQueryableUserStore.cs
diff --git a/src/Microsoft.AspNet.Identity/IRoleStore.cs b/src/Microsoft.Framework.Identity/IRoleStore.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity/IRoleStore.cs
rename to src/Microsoft.Framework.Identity/IRoleStore.cs
diff --git a/src/Microsoft.AspNet.Identity/IRoleValidator.cs b/src/Microsoft.Framework.Identity/IRoleValidator.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity/IRoleValidator.cs
rename to src/Microsoft.Framework.Identity/IRoleValidator.cs
diff --git a/src/Microsoft.AspNet.Identity/IUserClaimStore.cs b/src/Microsoft.Framework.Identity/IUserClaimStore.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity/IUserClaimStore.cs
rename to src/Microsoft.Framework.Identity/IUserClaimStore.cs
diff --git a/src/Microsoft.AspNet.Identity/IUserEmailStore.cs b/src/Microsoft.Framework.Identity/IUserEmailStore.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity/IUserEmailStore.cs
rename to src/Microsoft.Framework.Identity/IUserEmailStore.cs
diff --git a/src/Microsoft.AspNet.Identity/IUserLockoutStore.cs b/src/Microsoft.Framework.Identity/IUserLockoutStore.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity/IUserLockoutStore.cs
rename to src/Microsoft.Framework.Identity/IUserLockoutStore.cs
diff --git a/src/Microsoft.AspNet.Identity/IUserLoginStore.cs b/src/Microsoft.Framework.Identity/IUserLoginStore.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity/IUserLoginStore.cs
rename to src/Microsoft.Framework.Identity/IUserLoginStore.cs
diff --git a/src/Microsoft.AspNet.Identity/IUserPasswordStore.cs b/src/Microsoft.Framework.Identity/IUserPasswordStore.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity/IUserPasswordStore.cs
rename to src/Microsoft.Framework.Identity/IUserPasswordStore.cs
diff --git a/src/Microsoft.AspNet.Identity/IUserPhoneNumberStore.cs b/src/Microsoft.Framework.Identity/IUserPhoneNumberStore.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity/IUserPhoneNumberStore.cs
rename to src/Microsoft.Framework.Identity/IUserPhoneNumberStore.cs
diff --git a/src/Microsoft.AspNet.Identity/IUserRoleStore.cs b/src/Microsoft.Framework.Identity/IUserRoleStore.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity/IUserRoleStore.cs
rename to src/Microsoft.Framework.Identity/IUserRoleStore.cs
diff --git a/src/Microsoft.AspNet.Identity/IUserSecurityStampStore.cs b/src/Microsoft.Framework.Identity/IUserSecurityStampStore.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity/IUserSecurityStampStore.cs
rename to src/Microsoft.Framework.Identity/IUserSecurityStampStore.cs
diff --git a/src/Microsoft.AspNet.Identity/IUserStore.cs b/src/Microsoft.Framework.Identity/IUserStore.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity/IUserStore.cs
rename to src/Microsoft.Framework.Identity/IUserStore.cs
diff --git a/src/Microsoft.AspNet.Identity/IUserTokenProvider.cs b/src/Microsoft.Framework.Identity/IUserTokenProvider.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity/IUserTokenProvider.cs
rename to src/Microsoft.Framework.Identity/IUserTokenProvider.cs
diff --git a/src/Microsoft.AspNet.Identity/IUserTwoFactorStore.cs b/src/Microsoft.Framework.Identity/IUserTwoFactorStore.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity/IUserTwoFactorStore.cs
rename to src/Microsoft.Framework.Identity/IUserTwoFactorStore.cs
diff --git a/src/Microsoft.AspNet.Identity/IUserValidator.cs b/src/Microsoft.Framework.Identity/IUserValidator.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity/IUserValidator.cs
rename to src/Microsoft.Framework.Identity/IUserValidator.cs
diff --git a/src/Microsoft.AspNet.Identity/IdentityBuilder.cs b/src/Microsoft.Framework.Identity/IdentityBuilder.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity/IdentityBuilder.cs
rename to src/Microsoft.Framework.Identity/IdentityBuilder.cs
diff --git a/src/Microsoft.AspNet.Identity/IdentityMessage.cs b/src/Microsoft.Framework.Identity/IdentityMessage.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity/IdentityMessage.cs
rename to src/Microsoft.Framework.Identity/IdentityMessage.cs
diff --git a/src/Microsoft.AspNet.Identity/IdentityOptions.cs b/src/Microsoft.Framework.Identity/IdentityOptions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity/IdentityOptions.cs
rename to src/Microsoft.Framework.Identity/IdentityOptions.cs
diff --git a/src/Microsoft.AspNet.Identity/IdentityResult.cs b/src/Microsoft.Framework.Identity/IdentityResult.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity/IdentityResult.cs
rename to src/Microsoft.Framework.Identity/IdentityResult.cs
diff --git a/src/Microsoft.AspNet.Identity/IdentityRole.cs b/src/Microsoft.Framework.Identity/IdentityRole.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity/IdentityRole.cs
rename to src/Microsoft.Framework.Identity/IdentityRole.cs
diff --git a/src/Microsoft.AspNet.Identity/IdentityServiceCollectionExtensions.cs b/src/Microsoft.Framework.Identity/IdentityServiceCollectionExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity/IdentityServiceCollectionExtensions.cs
rename to src/Microsoft.Framework.Identity/IdentityServiceCollectionExtensions.cs
diff --git a/src/Microsoft.AspNet.Identity/IdentityServices.cs b/src/Microsoft.Framework.Identity/IdentityServices.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity/IdentityServices.cs
rename to src/Microsoft.Framework.Identity/IdentityServices.cs
diff --git a/src/Microsoft.AspNet.Identity/IdentityUser.cs b/src/Microsoft.Framework.Identity/IdentityUser.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity/IdentityUser.cs
rename to src/Microsoft.Framework.Identity/IdentityUser.cs
diff --git a/src/Microsoft.AspNet.Identity/IdentityUserClaim.cs b/src/Microsoft.Framework.Identity/IdentityUserClaim.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity/IdentityUserClaim.cs
rename to src/Microsoft.Framework.Identity/IdentityUserClaim.cs
diff --git a/src/Microsoft.AspNet.Identity/IdentityUserLogin.cs b/src/Microsoft.Framework.Identity/IdentityUserLogin.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity/IdentityUserLogin.cs
rename to src/Microsoft.Framework.Identity/IdentityUserLogin.cs
diff --git a/src/Microsoft.AspNet.Identity/IdentityUserRole.cs b/src/Microsoft.Framework.Identity/IdentityUserRole.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity/IdentityUserRole.cs
rename to src/Microsoft.Framework.Identity/IdentityUserRole.cs
diff --git a/src/Microsoft.AspNet.Identity/LockoutOptions.cs b/src/Microsoft.Framework.Identity/LockoutOptions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity/LockoutOptions.cs
rename to src/Microsoft.Framework.Identity/LockoutOptions.cs
diff --git a/src/Microsoft.AspNet.Identity/Microsoft.AspNet.Identity.kproj b/src/Microsoft.Framework.Identity/Microsoft.Framework.Identity.kproj
similarity index 100%
rename from src/Microsoft.AspNet.Identity/Microsoft.AspNet.Identity.kproj
rename to src/Microsoft.Framework.Identity/Microsoft.Framework.Identity.kproj
diff --git a/src/Microsoft.AspNet.Identity/PasswordHasher.cs b/src/Microsoft.Framework.Identity/PasswordHasher.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity/PasswordHasher.cs
rename to src/Microsoft.Framework.Identity/PasswordHasher.cs
diff --git a/src/Microsoft.AspNet.Identity/PasswordOptions.cs b/src/Microsoft.Framework.Identity/PasswordOptions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity/PasswordOptions.cs
rename to src/Microsoft.Framework.Identity/PasswordOptions.cs
diff --git a/src/Microsoft.AspNet.Identity/PasswordValidator.cs b/src/Microsoft.Framework.Identity/PasswordValidator.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity/PasswordValidator.cs
rename to src/Microsoft.Framework.Identity/PasswordValidator.cs
diff --git a/src/Microsoft.AspNet.Identity/PasswordVerificationResult.cs b/src/Microsoft.Framework.Identity/PasswordVerificationResult.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity/PasswordVerificationResult.cs
rename to src/Microsoft.Framework.Identity/PasswordVerificationResult.cs
diff --git a/src/Microsoft.AspNet.Identity/Resources.Designer.cs b/src/Microsoft.Framework.Identity/Resources.Designer.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity/Resources.Designer.cs
rename to src/Microsoft.Framework.Identity/Resources.Designer.cs
diff --git a/src/Microsoft.AspNet.Identity/Resources.resx b/src/Microsoft.Framework.Identity/Resources.resx
similarity index 100%
rename from src/Microsoft.AspNet.Identity/Resources.resx
rename to src/Microsoft.Framework.Identity/Resources.resx
diff --git a/src/Microsoft.AspNet.Identity/Rfc6238AuthenticationService.cs b/src/Microsoft.Framework.Identity/Rfc6238AuthenticationService.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity/Rfc6238AuthenticationService.cs
rename to src/Microsoft.Framework.Identity/Rfc6238AuthenticationService.cs
diff --git a/src/Microsoft.AspNet.Identity/RoleManager.cs b/src/Microsoft.Framework.Identity/RoleManager.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity/RoleManager.cs
rename to src/Microsoft.Framework.Identity/RoleManager.cs
diff --git a/src/Microsoft.AspNet.Identity/RoleValidator.cs b/src/Microsoft.Framework.Identity/RoleValidator.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity/RoleValidator.cs
rename to src/Microsoft.Framework.Identity/RoleValidator.cs
diff --git a/src/Microsoft.AspNet.Identity/SignInManager.cs b/src/Microsoft.Framework.Identity/SignInManager.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity/SignInManager.cs
rename to src/Microsoft.Framework.Identity/SignInManager.cs
diff --git a/src/Microsoft.AspNet.Identity/SignInStatus.cs b/src/Microsoft.Framework.Identity/SignInStatus.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity/SignInStatus.cs
rename to src/Microsoft.Framework.Identity/SignInStatus.cs
diff --git a/src/Microsoft.AspNet.Identity/UserLoginInfo.cs b/src/Microsoft.Framework.Identity/UserLoginInfo.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity/UserLoginInfo.cs
rename to src/Microsoft.Framework.Identity/UserLoginInfo.cs
diff --git a/src/Microsoft.AspNet.Identity/UserManager.cs b/src/Microsoft.Framework.Identity/UserManager.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity/UserManager.cs
rename to src/Microsoft.Framework.Identity/UserManager.cs
diff --git a/src/Microsoft.AspNet.Identity/UserOptions.cs b/src/Microsoft.Framework.Identity/UserOptions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity/UserOptions.cs
rename to src/Microsoft.Framework.Identity/UserOptions.cs
diff --git a/src/Microsoft.AspNet.Identity/UserValidator.cs b/src/Microsoft.Framework.Identity/UserValidator.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity/UserValidator.cs
rename to src/Microsoft.Framework.Identity/UserValidator.cs
diff --git a/src/Microsoft.AspNet.Identity/project.json b/src/Microsoft.Framework.Identity/project.json
similarity index 78%
rename from src/Microsoft.AspNet.Identity/project.json
rename to src/Microsoft.Framework.Identity/project.json
index ba73fdea11..80c96a511c 100644
--- a/src/Microsoft.AspNet.Identity/project.json
+++ b/src/Microsoft.Framework.Identity/project.json
@@ -1,10 +1,10 @@
 {
-  "version": "0.1-alpha-*",
+  "version": "3.0.0-*",
   "dependencies": {
-    "Microsoft.Framework.ConfigurationModel": "0.1-alpha-*",
-    "Microsoft.Framework.DependencyInjection" : "0.1-alpha-*",
-    "Microsoft.Framework.OptionsModel": "0.1-alpha-*",
-    "System.Security.Claims" : "0.1-alpha-*"
+    "Microsoft.Framework.ConfigurationModel": "1.0.0-*",
+    "Microsoft.Framework.DependencyInjection" : "1.0.0-*",
+    "Microsoft.Framework.OptionsModel": "1.0.0-*",
+    "System.Security.Claims" : "1.0.0-*"
   },
   "configurations": {
     "net45": {},
diff --git a/test/Microsoft.AspNet.Identity.Entity.Test/project.json b/test/Microsoft.AspNet.Identity.Entity.Test/project.json
deleted file mode 100644
index 1829718cd6..0000000000
--- a/test/Microsoft.AspNet.Identity.Entity.Test/project.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "version": "0.1-alpha-*",
-  "dependencies": {
-    "Microsoft.AspNet.Http": "0.1-alpha-*",
-    "Microsoft.AspNet.Identity": "",
-    "Microsoft.AspNet.Identity.Entity": "",
-    "Microsoft.AspNet.PipelineCore": "0.1-alpha-*",
-    "Microsoft.AspNet.RequestContainer": "0.1-alpha-*",
-    "Microsoft.AspNet.Security.DataProtection": "0.1-alpha-*",
-    "Microsoft.AspNet.Testing": "0.1-alpha-*",
-    "Microsoft.Data.Entity": "0.1-alpha-*",
-    "Microsoft.Data.Entity.InMemory": "0.1-alpha-*",
-    "Microsoft.Data.Entity.Migrations": "0.1-alpha-*",
-    "Microsoft.Data.Entity.Relational": "0.1-alpha-*",
-    "Microsoft.Data.Entity.SqlServer": "0.1-alpha-*",
-    "Microsoft.Framework.ConfigurationModel": "0.1-alpha-*",
-    "Microsoft.Framework.DependencyInjection": "0.1-alpha-*",
-    "Microsoft.Framework.OptionsModel" : "0.1-alpha-*",
-    "Microsoft.Framework.Logging": "0.1-alpha-*",
-    "Remotion.Linq": "1.15.13.0",
-    "System.Security.Claims": "0.1-alpha-*",
-    "xunit.abstractions": "2.0.0-aspnet-*",
-    "xunit.assert": "2.0.0-aspnet-*",
-    "xunit.core": "2.0.0-aspnet-*",
-    "xunit.execution": "2.0.0-aspnet-*",
-    "Xunit.KRunner": "0.1-alpha-*"
-  },
-  "code": "**\\*.cs;..\\Shared\\*.cs",
-  "configurations": {
-    "net451": {
-      "dependencies": {
-        "Moq" : "4.2.1312.1622",
-        "System.Collections": "",
-        "System.Data": "",
-        "System.Runtime": ""
-      }
-    }
-  },
-  "code": "**\\*.cs;..\\Shared\\*.cs",
-  "commands": {
-    "test": "Xunit.KRunner"
-  }
-}
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.Identity.InMemory.Test/project.json b/test/Microsoft.AspNet.Identity.InMemory.Test/project.json
index ab2873f6a1..50e0c6d0da 100644
--- a/test/Microsoft.AspNet.Identity.InMemory.Test/project.json
+++ b/test/Microsoft.AspNet.Identity.InMemory.Test/project.json
@@ -1,20 +1,15 @@
 {
-  "version": "0.1-alpha-*",
   "dependencies": {
-    "Microsoft.AspNet.Http" : "0.1-alpha-*",
-    "Microsoft.AspNet.Identity" : "0.1-alpha-*",
-    "Microsoft.AspNet.Identity.InMemory" : "0.1-alpha-*",
-    "Microsoft.AspNet.PipelineCore" : "0.1-alpha-*",
-    "Microsoft.AspNet.RequestContainer" : "0.1-alpha-*",
-    "Microsoft.AspNet.Testing" : "0.1-alpha-*",
-    "Microsoft.Framework.ConfigurationModel": "0.1-alpha-*",
-    "Microsoft.Framework.DependencyInjection" : "0.1-alpha-*",
-    "Microsoft.Framework.OptionsModel" : "0.1-alpha-*",
-    "xunit.abstractions": "2.0.0-aspnet-*",
-    "xunit.assert": "2.0.0-aspnet-*",
-    "xunit.core": "2.0.0-aspnet-*",
-    "xunit.execution": "2.0.0-aspnet-*",
-    "Xunit.KRunner": "0.1-alpha-*"
+    "Microsoft.AspNet.Http" : "1.0.0-*",
+    "Microsoft.Framework.Identity" : "",
+    "Microsoft.AspNet.Identity.InMemory" : "",
+    "Microsoft.AspNet.PipelineCore" : "1.0.0-*",
+    "Microsoft.AspNet.RequestContainer" : "1.0.0-*",
+    "Microsoft.AspNet.Testing" : "1.0.0-*",
+    "Microsoft.Framework.ConfigurationModel": "1.0.0-*",
+    "Microsoft.Framework.DependencyInjection" : "1.0.0-*",
+    "Microsoft.Framework.OptionsModel" : "1.0.0-*",
+    "Xunit.KRunner": "1.0.0-*"
   },
   "code": "**\\*.cs;..\\Shared\\*.cs",
   "configurations": {
diff --git a/test/Microsoft.AspNet.Identity.Security.Test/project.json b/test/Microsoft.AspNet.Identity.Security.Test/project.json
deleted file mode 100644
index 9389776d00..0000000000
--- a/test/Microsoft.AspNet.Identity.Security.Test/project.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "version": "0.1-alpha-*",
-  "dependencies": {
-    "Microsoft.AspNet.FeatureModel" : "0.1-alpha-*",
-    "Microsoft.AspNet.Http" : "0.1-alpha-*",
-    "Microsoft.AspNet.HttpFeature" : "0.1-alpha-*",
-    "Microsoft.AspNet.Identity" : "0.1-alpha-*",
-    "Microsoft.AspNet.Identity.InMemory" : "0.1-alpha-*",
-    "Microsoft.AspNet.Identity.Security" : "0.1-alpha-*",
-    "Microsoft.AspNet.PipelineCore" : "0.1-alpha-*",
-    "Microsoft.AspNet.RequestContainer" : "0.1-alpha-*",
-    "Microsoft.AspNet.Security" : "0.1-alpha-*",
-    "Microsoft.AspNet.Security.Cookies" : "0.1-alpha-*",
-    "Microsoft.AspNet.Testing" : "0.1-alpha-*",
-    "Microsoft.Framework.ConfigurationModel": "0.1-alpha-*",
-    "Microsoft.Framework.DependencyInjection" : "0.1-alpha-*",
-    "Microsoft.Framework.OptionsModel" : "0.1-alpha-*",
-    "Microsoft.Framework.Logging" : "0.1-alpha-*",
-    "System.Security.Claims" : "0.1-alpha-*",
-    "xunit.abstractions": "2.0.0-aspnet-*",
-    "xunit.assert": "2.0.0-aspnet-*",
-    "xunit.core": "2.0.0-aspnet-*",
-    "xunit.execution": "2.0.0-aspnet-*",
-    "Xunit.KRunner": "0.1-alpha-*"
-  },
-  "code": "**\\*.cs;..\\Shared\\*.cs",
-  "configurations": {
-    "net45": {
-      "dependencies": {
-        "Moq" : "4.2.1312.1622",
-        "System.Runtime": "",
-        "System.Collections": ""
-      }
-    }
-  },
-  "commands": {
-    "test": "Xunit.KRunner"
-  }
-}
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.Identity.Test/project.json b/test/Microsoft.AspNet.Identity.Test/project.json
deleted file mode 100644
index a6731fa8f2..0000000000
--- a/test/Microsoft.AspNet.Identity.Test/project.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "version": "0.1-alpha-*",
-  "dependencies": {
-    "Microsoft.AspNet.Http" : "0.1-alpha-*",
-    "Microsoft.AspNet.Identity" : "0.1-alpha-*",
-    "Microsoft.AspNet.PipelineCore" : "0.1-alpha-*",
-    "Microsoft.AspNet.RequestContainer" : "0.1-alpha-*",
-    "Microsoft.AspNet.Testing" : "0.1-alpha-*",
-    "Microsoft.Framework.ConfigurationModel" : "0.1-alpha-*",
-    "Microsoft.Framework.DependencyInjection" : "0.1-alpha-*",
-    "Microsoft.Framework.OptionsModel" : "0.1-alpha-*",
-    "xunit.abstractions": "2.0.0-aspnet-*",
-    "xunit.assert": "2.0.0-aspnet-*",
-    "xunit.core": "2.0.0-aspnet-*",
-    "xunit.execution": "2.0.0-aspnet-*",
-    "Xunit.KRunner": "0.1-alpha-*"
-  },
-  "code": "**\\*.cs;..\\Shared\\*.cs",
-  "configurations": {
-    "net45": {
-      "dependencies": {
-        "Moq" : "4.2.1312.1622",
-        "System.Collections": "",
-        "System.Runtime": ""
-      }
-    }
-  },
-  "commands": {
-    "test": "Xunit.KRunner"
-  }
-}
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.Identity.Security.Test/HttpSignInTest.cs b/test/Microsoft.Framework.Identity.AspNet.Test/HttpSignInTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Identity.Security.Test/HttpSignInTest.cs
rename to test/Microsoft.Framework.Identity.AspNet.Test/HttpSignInTest.cs
diff --git a/test/Microsoft.AspNet.Identity.Security.Test/IdentityExtensionsTest.cs b/test/Microsoft.Framework.Identity.AspNet.Test/IdentityExtensionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Identity.Security.Test/IdentityExtensionsTest.cs
rename to test/Microsoft.Framework.Identity.AspNet.Test/IdentityExtensionsTest.cs
diff --git a/test/Microsoft.AspNet.Identity.Security.Test/Microsoft.AspNet.Identity.Security.Test.kproj b/test/Microsoft.Framework.Identity.AspNet.Test/Microsoft.Framework.Identity.AspNet.Test.kproj
similarity index 100%
rename from test/Microsoft.AspNet.Identity.Security.Test/Microsoft.AspNet.Identity.Security.Test.kproj
rename to test/Microsoft.Framework.Identity.AspNet.Test/Microsoft.Framework.Identity.AspNet.Test.kproj
diff --git a/test/Microsoft.Framework.Identity.AspNet.Test/project.json b/test/Microsoft.Framework.Identity.AspNet.Test/project.json
new file mode 100644
index 0000000000..2e470add7a
--- /dev/null
+++ b/test/Microsoft.Framework.Identity.AspNet.Test/project.json
@@ -0,0 +1,34 @@
+{
+  "dependencies": {
+    "Microsoft.AspNet.FeatureModel" : "1.0.0-*",
+    "Microsoft.AspNet.Http" : "1.0.0-*",
+    "Microsoft.AspNet.HttpFeature" : "1.0.0-*",
+    "Microsoft.Framework.Identity" : "",
+    "Microsoft.AspNet.Identity.InMemory" : "",
+    "Microsoft.Framework.Identity.AspNet" : "",
+    "Microsoft.AspNet.PipelineCore" : "1.0.0-*",
+    "Microsoft.AspNet.RequestContainer" : "1.0.0-*",
+    "Microsoft.AspNet.Security" : "1.0.0-*",
+    "Microsoft.AspNet.Security.Cookies" : "1.0.0-*",
+    "Microsoft.AspNet.Testing" : "1.0.0-*",
+    "Microsoft.Framework.ConfigurationModel": "1.0.0-*",
+    "Microsoft.Framework.DependencyInjection" : "1.0.0-*",
+    "Microsoft.Framework.OptionsModel" : "1.0.0-*",
+    "Microsoft.Framework.Logging" : "1.0.0-*",
+    "System.Security.Claims" : "1.0.0-*",
+    "Xunit.KRunner": "1.0.0-*"
+  },
+  "code": "**\\*.cs;..\\Shared\\*.cs",
+  "configurations": {
+    "net45": {
+      "dependencies": {
+        "Moq" : "4.2.1312.1622",
+        "System.Runtime": "",
+        "System.Collections": ""
+      }
+    }
+  },
+  "commands": {
+    "test": "Xunit.KRunner"
+  }
+}
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.Identity.Entity.Test/InMemoryUserStoreTest.cs b/test/Microsoft.Framework.Identity.EntityFramework.Test/InMemoryUserStoreTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Identity.Entity.Test/InMemoryUserStoreTest.cs
rename to test/Microsoft.Framework.Identity.EntityFramework.Test/InMemoryUserStoreTest.cs
diff --git a/test/Microsoft.AspNet.Identity.Entity.Test/Microsoft.AspNet.Identity.Entity.Test.kproj b/test/Microsoft.Framework.Identity.EntityFramework.Test/Microsoft.Framework.Identity.EntityFramework.Test.kproj
similarity index 100%
rename from test/Microsoft.AspNet.Identity.Entity.Test/Microsoft.AspNet.Identity.Entity.Test.kproj
rename to test/Microsoft.Framework.Identity.EntityFramework.Test/Microsoft.Framework.Identity.EntityFramework.Test.kproj
diff --git a/test/Microsoft.AspNet.Identity.Entity.Test/RoleStoreTest.cs b/test/Microsoft.Framework.Identity.EntityFramework.Test/RoleStoreTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Identity.Entity.Test/RoleStoreTest.cs
rename to test/Microsoft.Framework.Identity.EntityFramework.Test/RoleStoreTest.cs
diff --git a/test/Microsoft.AspNet.Identity.Entity.Test/SqlUserStoreTest.cs b/test/Microsoft.Framework.Identity.EntityFramework.Test/SqlUserStoreTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Identity.Entity.Test/SqlUserStoreTest.cs
rename to test/Microsoft.Framework.Identity.EntityFramework.Test/SqlUserStoreTest.cs
diff --git a/test/Microsoft.AspNet.Identity.Entity.Test/StartupTest.cs b/test/Microsoft.Framework.Identity.EntityFramework.Test/StartupTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Identity.Entity.Test/StartupTest.cs
rename to test/Microsoft.Framework.Identity.EntityFramework.Test/StartupTest.cs
diff --git a/test/Microsoft.AspNet.Identity.Entity.Test/TestIdentityFactory.cs b/test/Microsoft.Framework.Identity.EntityFramework.Test/TestIdentityFactory.cs
similarity index 100%
rename from test/Microsoft.AspNet.Identity.Entity.Test/TestIdentityFactory.cs
rename to test/Microsoft.Framework.Identity.EntityFramework.Test/TestIdentityFactory.cs
diff --git a/test/Microsoft.Framework.Identity.EntityFramework.Test/project.json b/test/Microsoft.Framework.Identity.EntityFramework.Test/project.json
new file mode 100644
index 0000000000..d4beb06231
--- /dev/null
+++ b/test/Microsoft.Framework.Identity.EntityFramework.Test/project.json
@@ -0,0 +1,30 @@
+{
+  "dependencies": {
+    "Microsoft.AspNet.Http": "1.0.0-*",
+    "Microsoft.Framework.Identity": "",
+    "Microsoft.Framework.Identity.EntityFramework": "",
+    "Microsoft.AspNet.PipelineCore": "1.0.0-*",
+    "Microsoft.AspNet.RequestContainer": "1.0.0-*",
+    "Microsoft.AspNet.Security.DataProtection": "1.0.0-*",
+    "Microsoft.AspNet.Testing": "1.0.0-*",
+    "EntityFramework.InMemory": "7.0.0-*",
+    "EntityFramework.SqlServer": "7.0.0-*",
+    "Microsoft.Framework.OptionsModel" : "1.0.0-*",
+    "System.Security.Claims": "1.0.0-*",
+    "Xunit.KRunner": "1.0.0-*"
+  },
+  "code": "**\\*.cs;..\\Shared\\*.cs",
+  "configurations": {
+    "net451": {
+      "dependencies": {
+        "Moq" : "4.2.1312.1622",
+        "System.Collections": "",
+        "System.Runtime": ""
+      }
+    }
+  },
+  "code": "**\\*.cs;..\\Shared\\*.cs",
+  "commands": {
+    "test": "Xunit.KRunner"
+  }
+}
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.Identity.Test/ClaimsIdentityFactoryTest.cs b/test/Microsoft.Framework.Identity.Test/ClaimsIdentityFactoryTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Identity.Test/ClaimsIdentityFactoryTest.cs
rename to test/Microsoft.Framework.Identity.Test/ClaimsIdentityFactoryTest.cs
diff --git a/test/Microsoft.AspNet.Identity.Test/IdentityBuilderTest.cs b/test/Microsoft.Framework.Identity.Test/IdentityBuilderTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Identity.Test/IdentityBuilderTest.cs
rename to test/Microsoft.Framework.Identity.Test/IdentityBuilderTest.cs
diff --git a/test/Microsoft.AspNet.Identity.Test/IdentityOptionsTest.cs b/test/Microsoft.Framework.Identity.Test/IdentityOptionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Identity.Test/IdentityOptionsTest.cs
rename to test/Microsoft.Framework.Identity.Test/IdentityOptionsTest.cs
diff --git a/test/Microsoft.AspNet.Identity.Test/IdentityResultTest.cs b/test/Microsoft.Framework.Identity.Test/IdentityResultTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Identity.Test/IdentityResultTest.cs
rename to test/Microsoft.Framework.Identity.Test/IdentityResultTest.cs
diff --git a/test/Microsoft.AspNet.Identity.Test/Microsoft.Aspnet.Identity.Test.csproj b/test/Microsoft.Framework.Identity.Test/Microsoft.Aspnet.Identity.Test.csproj
similarity index 100%
rename from test/Microsoft.AspNet.Identity.Test/Microsoft.Aspnet.Identity.Test.csproj
rename to test/Microsoft.Framework.Identity.Test/Microsoft.Aspnet.Identity.Test.csproj
diff --git a/test/Microsoft.AspNet.Identity.Test/Microsoft.AspNet.Identity.Test.kproj b/test/Microsoft.Framework.Identity.Test/Microsoft.Framework.Identity.Test.kproj
similarity index 100%
rename from test/Microsoft.AspNet.Identity.Test/Microsoft.AspNet.Identity.Test.kproj
rename to test/Microsoft.Framework.Identity.Test/Microsoft.Framework.Identity.Test.kproj
diff --git a/test/Microsoft.AspNet.Identity.Test/NoopRoleStore.cs b/test/Microsoft.Framework.Identity.Test/NoopRoleStore.cs
similarity index 100%
rename from test/Microsoft.AspNet.Identity.Test/NoopRoleStore.cs
rename to test/Microsoft.Framework.Identity.Test/NoopRoleStore.cs
diff --git a/test/Microsoft.AspNet.Identity.Test/NoopUserStore.cs b/test/Microsoft.Framework.Identity.Test/NoopUserStore.cs
similarity index 100%
rename from test/Microsoft.AspNet.Identity.Test/NoopUserStore.cs
rename to test/Microsoft.Framework.Identity.Test/NoopUserStore.cs
diff --git a/test/Microsoft.AspNet.Identity.Test/PasswordValidatorTest.cs b/test/Microsoft.Framework.Identity.Test/PasswordValidatorTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Identity.Test/PasswordValidatorTest.cs
rename to test/Microsoft.Framework.Identity.Test/PasswordValidatorTest.cs
diff --git a/test/Microsoft.AspNet.Identity.Test/RoleManagerTest.cs b/test/Microsoft.Framework.Identity.Test/RoleManagerTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Identity.Test/RoleManagerTest.cs
rename to test/Microsoft.Framework.Identity.Test/RoleManagerTest.cs
diff --git a/test/Microsoft.AspNet.Identity.Test/RoleValidatorTest.cs b/test/Microsoft.Framework.Identity.Test/RoleValidatorTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Identity.Test/RoleValidatorTest.cs
rename to test/Microsoft.Framework.Identity.Test/RoleValidatorTest.cs
diff --git a/test/Microsoft.AspNet.Identity.Test/UserManagerTest.cs b/test/Microsoft.Framework.Identity.Test/UserManagerTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Identity.Test/UserManagerTest.cs
rename to test/Microsoft.Framework.Identity.Test/UserManagerTest.cs
diff --git a/test/Microsoft.AspNet.Identity.Test/UserValidatorTest.cs b/test/Microsoft.Framework.Identity.Test/UserValidatorTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Identity.Test/UserValidatorTest.cs
rename to test/Microsoft.Framework.Identity.Test/UserValidatorTest.cs
diff --git a/test/Microsoft.Framework.Identity.Test/project.json b/test/Microsoft.Framework.Identity.Test/project.json
new file mode 100644
index 0000000000..3f96f0dd96
--- /dev/null
+++ b/test/Microsoft.Framework.Identity.Test/project.json
@@ -0,0 +1,26 @@
+{
+  "dependencies": {
+    "Microsoft.AspNet.Http" : "1.0.0-*",
+    "Microsoft.Framework.Identity" : "",
+    "Microsoft.AspNet.PipelineCore" : "1.0.0-*",
+    "Microsoft.AspNet.RequestContainer" : "1.0.0-*",
+    "Microsoft.AspNet.Testing" : "1.0.0-*",
+    "Microsoft.Framework.ConfigurationModel" : "1.0.0-*",
+    "Microsoft.Framework.DependencyInjection" : "1.0.0-*",
+    "Microsoft.Framework.OptionsModel" : "1.0.0-*",
+    "Xunit.KRunner": "1.0.0-*"
+  },
+  "code": "**\\*.cs;..\\Shared\\*.cs",
+  "configurations": {
+    "net45": {
+      "dependencies": {
+        "Moq" : "4.2.1312.1622",
+        "System.Collections": "",
+        "System.Runtime": ""
+      }
+    }
+  },
+  "commands": {
+    "test": "Xunit.KRunner"
+  }
+}
\ No newline at end of file