diff --git a/MediaBrowser.Api/HttpHandlers/UserAuthenticationHandler.cs b/MediaBrowser.Api/HttpHandlers/UserAuthenticationHandler.cs
index b9499e9df6..b3867cde7a 100644
--- a/MediaBrowser.Api/HttpHandlers/UserAuthenticationHandler.cs
+++ b/MediaBrowser.Api/HttpHandlers/UserAuthenticationHandler.cs
@@ -1,5 +1,6 @@
 using MediaBrowser.Common.Net.Handlers;
 using MediaBrowser.Controller;
+using MediaBrowser.Model.Authentication;
 using MediaBrowser.Model.Entities;
 using System.ComponentModel.Composition;
 using System.Net;
diff --git a/MediaBrowser.ApiInteraction.Portable/ApiClient.cs b/MediaBrowser.ApiInteraction.Portable/ApiClient.cs
index c870b1c3ee..cbd179b02e 100644
--- a/MediaBrowser.ApiInteraction.Portable/ApiClient.cs
+++ b/MediaBrowser.ApiInteraction.Portable/ApiClient.cs
@@ -1,6 +1,6 @@
-using MediaBrowser.Model.Configuration;
+using MediaBrowser.Model.Authentication;
+using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.DTO;
-using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Weather;
 using System;
 using System.Collections.Generic;
diff --git a/MediaBrowser.ApiInteraction/ApiClient.cs b/MediaBrowser.ApiInteraction/ApiClient.cs
index a621963ec9..62a534e326 100644
--- a/MediaBrowser.ApiInteraction/ApiClient.cs
+++ b/MediaBrowser.ApiInteraction/ApiClient.cs
@@ -1,6 +1,6 @@
-using MediaBrowser.Model.Configuration;
+using MediaBrowser.Model.Authentication;
+using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.DTO;
-using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Weather;
 using System;
 using System.IO;
diff --git a/MediaBrowser.Controller/Kernel.cs b/MediaBrowser.Controller/Kernel.cs
index 2414364c0b..0e4f7e5fd8 100644
--- a/MediaBrowser.Controller/Kernel.cs
+++ b/MediaBrowser.Controller/Kernel.cs
@@ -5,6 +5,7 @@ using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Controller.Resolvers;
 using MediaBrowser.Controller.Weather;
+using MediaBrowser.Model.Authentication;
 using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Progress;
diff --git a/MediaBrowser.Model/Entities/AuthenticationResult.cs b/MediaBrowser.Model/Authentication/AuthenticationResult.cs
similarity index 74%
rename from MediaBrowser.Model/Entities/AuthenticationResult.cs
rename to MediaBrowser.Model/Authentication/AuthenticationResult.cs
index 312e71f388..ebc253172d 100644
--- a/MediaBrowser.Model/Entities/AuthenticationResult.cs
+++ b/MediaBrowser.Model/Authentication/AuthenticationResult.cs
@@ -1,6 +1,6 @@
 using ProtoBuf;
 
-namespace MediaBrowser.Model.Entities
+namespace MediaBrowser.Model.Authentication
 {
     [ProtoContract]
     public class AuthenticationResult
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index baa04d72b7..8b51f6ec46 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -36,7 +36,7 @@
     <Compile Include="Configuration\ServerConfiguration.cs" />
     <Compile Include="DTO\AudioInfo.cs" />
     <Compile Include="DTO\SeriesInfo.cs" />
-    <Compile Include="Entities\AuthenticationResult.cs" />
+    <Compile Include="Authentication\AuthenticationResult.cs" />
     <Compile Include="DTO\DTOBaseItem.cs" />
     <Compile Include="DTO\DTOUser.cs" />
     <Compile Include="DTO\VideoInfo.cs" />