diff --git a/Yavsc.Abstract/Identity/ClientProviderInfo.cs b/Yavsc.Abstract/Identity/ClientProviderInfo.cs
index 2b7df14a..e2bf7568 100644
--- a/Yavsc.Abstract/Identity/ClientProviderInfo.cs
+++ b/Yavsc.Abstract/Identity/ClientProviderInfo.cs
@@ -1,6 +1,6 @@
 
 using System.ComponentModel.DataAnnotations;
-namespace Yavsc.Models.Messaging
+namespace Yavsc.Abstract.Identity
 {
     public class ClientProviderInfo
     {
diff --git a/Yavsc.Abstract/Identity/IApplicationUser.cs b/Yavsc.Abstract/Identity/IApplicationUser.cs
index 4caafa64..6a72d8b9 100644
--- a/Yavsc.Abstract/Identity/IApplicationUser.cs
+++ b/Yavsc.Abstract/Identity/IApplicationUser.cs
@@ -1,4 +1,4 @@
-namespace Yavsc
+namespace Yavsc.Abstract.Identity
 {
     public interface IApplicationUser
     {
diff --git a/Yavsc.Abstract/Identity/Security/ICircleAuthorization.cs b/Yavsc.Abstract/Identity/Security/ICircleAuthorization.cs
index 38b40d86..9c16bd3b 100644
--- a/Yavsc.Abstract/Identity/Security/ICircleAuthorization.cs
+++ b/Yavsc.Abstract/Identity/Security/ICircleAuthorization.cs
@@ -1,4 +1,4 @@
-namespace Yavsc
+namespace Yavsc.Abstract.Identity.Security
 {
 
     public interface ICircleAuthorization
diff --git a/Yavsc.Abstract/Identity/Security/ICircleAuthorized.cs b/Yavsc.Abstract/Identity/Security/ICircleAuthorized.cs
index 04f1d1fc..7efd00ef 100644
--- a/Yavsc.Abstract/Identity/Security/ICircleAuthorized.cs
+++ b/Yavsc.Abstract/Identity/Security/ICircleAuthorized.cs
@@ -1,4 +1,4 @@
-namespace Yavsc
+namespace Yavsc.Abstract.Identity.Security
 {
     public interface ICircleAuthorized
     {
diff --git a/Yavsc.Abstract/Identity/TokenInfo.cs b/Yavsc.Abstract/Identity/TokenInfo.cs
index 632d3fe1..1847f3a2 100644
--- a/Yavsc.Abstract/Identity/TokenInfo.cs
+++ b/Yavsc.Abstract/Identity/TokenInfo.cs
@@ -1,6 +1,7 @@
+using System;
+
 namespace Yavsc.Abstract.Identity
 {
-    using System;
     public class TokenInfo
     {
         public string AccessToken { get; set; }
diff --git a/Yavsc.Abstract/Identity/UserInfo.cs b/Yavsc.Abstract/Identity/UserInfo.cs
index 604516d1..f4d8c078 100644
--- a/Yavsc.Abstract/Identity/UserInfo.cs
+++ b/Yavsc.Abstract/Identity/UserInfo.cs
@@ -1,4 +1,4 @@
-namespace  Yavsc.Models.Auth
+namespace  Yavsc.Abstract.Identity
 {
     public class UserInfo {
 
diff --git a/Yavsc.Abstract/Interfaces/Models/ICircleMember.cs b/Yavsc.Abstract/Interfaces/Models/ICircleMember.cs
index 49ff920a..c5add41b 100644
--- a/Yavsc.Abstract/Interfaces/Models/ICircleMember.cs
+++ b/Yavsc.Abstract/Interfaces/Models/ICircleMember.cs
@@ -1,4 +1,6 @@
-namespace Yavsc.Interfaces
+using Yavsc.Abstract.Identity;
+
+namespace Yavsc.Interfaces
 {
     public interface ICircleMember: IIdentified<long>
     {
diff --git a/Yavsc.Abstract/Interfaces/Models/IGoogleCloudMobileDeclaration.cs b/Yavsc.Abstract/Interfaces/Models/IGoogleCloudMobileDeclaration.cs
index 4318a234..22b652bc 100644
--- a/Yavsc.Abstract/Interfaces/Models/IGoogleCloudMobileDeclaration.cs
+++ b/Yavsc.Abstract/Interfaces/Models/IGoogleCloudMobileDeclaration.cs
@@ -1,4 +1,6 @@
 
+using Yavsc.Abstract.Identity;
+
 namespace Yavsc.Interfaces
 {
     public interface IGCMDeclaration
diff --git a/Yavsc.Abstract/Interfaces/Workflow/IBookQueryData.cs b/Yavsc.Abstract/Interfaces/Workflow/IBookQueryData.cs
index b4cfef29..6934f3a9 100644
--- a/Yavsc.Abstract/Interfaces/Workflow/IBookQueryData.cs
+++ b/Yavsc.Abstract/Interfaces/Workflow/IBookQueryData.cs
@@ -1,5 +1,5 @@
 using System;
-using Yavsc.Models.Messaging;
+using Yavsc.Abstract.Identity;
 
 namespace Yavsc.Interfaces
 {
diff --git a/Yavsc.Abstract/Messaging/RdvQueryProviderInfo.cs b/Yavsc.Abstract/Messaging/RdvQueryProviderInfo.cs
index 3e25c991..6cab0764 100644
--- a/Yavsc.Abstract/Messaging/RdvQueryProviderInfo.cs
+++ b/Yavsc.Abstract/Messaging/RdvQueryProviderInfo.cs
@@ -1,4 +1,5 @@
 using System;
+using Yavsc.Abstract.Identity;
 
 namespace Yavsc.Models
 {
diff --git a/Yavsc.Abstract/Workflow/IContact.cs b/Yavsc.Abstract/Workflow/IContact.cs
index 68fda053..8b031410 100644
--- a/Yavsc.Abstract/Workflow/IContact.cs
+++ b/Yavsc.Abstract/Workflow/IContact.cs
@@ -1,5 +1,6 @@
 namespace Yavsc
 {
+    using Abstract.Identity;
     public interface IContact
     {
         IApplicationUser Owner { get; set; }
diff --git a/Yavsc.Abstract/Workflow/IGoogleCloudMobileDeclaration.cs b/Yavsc.Abstract/Workflow/IGoogleCloudMobileDeclaration.cs
index a5e2d2a8..77d0675a 100644
--- a/Yavsc.Abstract/Workflow/IGoogleCloudMobileDeclaration.cs
+++ b/Yavsc.Abstract/Workflow/IGoogleCloudMobileDeclaration.cs
@@ -17,6 +17,7 @@
 //
 
 using System;
+using Yavsc.Abstract.Identity;
 
 namespace Yavsc
 {
diff --git a/Yavsc.Server/Models/Access/CircleAuthorizationToBlogPost.cs b/Yavsc.Server/Models/Access/CircleAuthorizationToBlogPost.cs
index 06dfdad8..8762810a 100644
--- a/Yavsc.Server/Models/Access/CircleAuthorizationToBlogPost.cs
+++ b/Yavsc.Server/Models/Access/CircleAuthorizationToBlogPost.cs
@@ -5,6 +5,7 @@ namespace Yavsc.Models.Access
     using Newtonsoft.Json;
     using Yavsc;
     using Blog;
+    using Yavsc.Abstract.Identity.Security;
 
     public class CircleAuthorizationToBlogPost : ICircleAuthorization
     {
diff --git a/Yavsc.Server/Models/Blog/BlogPost.cs b/Yavsc.Server/Models/Blog/BlogPost.cs
index f9936bfe..aa106b6c 100644
--- a/Yavsc.Server/Models/Blog/BlogPost.cs
+++ b/Yavsc.Server/Models/Blog/BlogPost.cs
@@ -4,6 +4,7 @@ using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 using Newtonsoft.Json;
+using Yavsc.Abstract.Identity.Security;
 using Yavsc.Interfaces;
 using Yavsc.Models.Access;
 using Yavsc.Models.Relationship;
diff --git a/Yavsc.Server/Models/HairCut/HairCutQuery.cs b/Yavsc.Server/Models/HairCut/HairCutQuery.cs
index 839d2477..5554d11e 100644
--- a/Yavsc.Server/Models/HairCut/HairCutQuery.cs
+++ b/Yavsc.Server/Models/HairCut/HairCutQuery.cs
@@ -8,11 +8,11 @@ using Yavsc.Models.Relationship;
 using Yavsc.Billing;
 using System.Globalization;
 using Yavsc.Helpers;
-using Yavsc.Models.Messaging;
 using System.Linq;
 using Microsoft.Extensions.Localization;
 using Yavsc.ViewModels.PayPal;
 using Yavsc.Models.HairCut;
+using Yavsc.Abstract.Identity;
 
 namespace Yavsc.Models.Haircut
 {
diff --git a/Yavsc.Server/Models/HairCut/Views/HaircutQueryInfo.cs b/Yavsc.Server/Models/HairCut/Views/HaircutQueryInfo.cs
index 8f53355a..bfc6691a 100644
--- a/Yavsc.Server/Models/HairCut/Views/HaircutQueryInfo.cs
+++ b/Yavsc.Server/Models/HairCut/Views/HaircutQueryInfo.cs
@@ -22,6 +22,8 @@
 
 using System;
 using System.ComponentModel.DataAnnotations;
+using Yavsc.Abstract.Identity;
+using Yavsc.Abstract.Identity;
 using Yavsc.Models.Auth;
 using Yavsc.Models.Relationship;
 
diff --git a/Yavsc.Server/Models/Messaging/ProviderClientInfo.cs b/Yavsc.Server/Models/Messaging/ProviderClientInfo.cs
index 6e4ae6db..8d808190 100644
--- a/Yavsc.Server/Models/Messaging/ProviderClientInfo.cs
+++ b/Yavsc.Server/Models/Messaging/ProviderClientInfo.cs
@@ -1,4 +1,6 @@
 
+using Yavsc.Abstract.Identity;
+
 namespace Yavsc.Models.Messaging
 {
     public class ProviderClientInfo : ClientProviderInfo
diff --git a/Yavsc.Server/ViewModels/Account/Me.cs b/Yavsc.Server/ViewModels/Account/Me.cs
index 83264bdf..dad3ab01 100644
--- a/Yavsc.Server/ViewModels/Account/Me.cs
+++ b/Yavsc.Server/ViewModels/Account/Me.cs
@@ -1,3 +1,5 @@
+using Yavsc.Abstract.Identity;
+
 namespace Yavsc.Models.Auth
 {
     public class Me : IApplicationUser {
diff --git a/Yavsc.Server/ViewModels/Administration/RoleUserCollection.cs b/Yavsc.Server/ViewModels/Administration/RoleUserCollection.cs
index 93de88a8..2a3a68bc 100644
--- a/Yavsc.Server/ViewModels/Administration/RoleUserCollection.cs
+++ b/Yavsc.Server/ViewModels/Administration/RoleUserCollection.cs
@@ -1,3 +1,5 @@
+using Yavsc.Abstract.Identity;
+using Yavsc.Abstract.Identity;
 using Yavsc.Models.Auth;
 
 namespace Yavsc.ViewModels.Administration
diff --git a/Yavsc/AuthorizationHandlers/BlogEditHandler.cs b/Yavsc/AuthorizationHandlers/BlogEditHandler.cs
index 066c6a64..0dc772c1 100644
--- a/Yavsc/AuthorizationHandlers/BlogEditHandler.cs
+++ b/Yavsc/AuthorizationHandlers/BlogEditHandler.cs
@@ -1,9 +1,9 @@
 using Microsoft.AspNet.Authorization;
+using System.Security.Claims;
+using Yavsc.Models.Blog;
 
 namespace Yavsc.ViewModels.Auth.Handlers
 {
-    using System.Security.Claims;
-    using Models.Blog;
     public class BlogEditHandler : AuthorizationHandler<EditRequirement, BlogPost>
     {
         protected override void Handle(AuthorizationContext context, EditRequirement requirement, BlogPost resource)