diff --git a/src/Untappd.Net.UnitTests/Authentication/TestAuthenticationHelper.cs b/src/Untappd.Net.UnitTests/Authentication/TestAuthenticationHelper.cs
index 7ea9b41..32c1741 100644
--- a/src/Untappd.Net.UnitTests/Authentication/TestAuthenticationHelper.cs
+++ b/src/Untappd.Net.UnitTests/Authentication/TestAuthenticationHelper.cs
@@ -1,7 +1,7 @@
 using System;
 using NUnit.Framework;
 using Untappd.Net.Authentication;
-using Untappd.Net.Client;
+using Untappd.Net.OAuth;
 
 namespace Untappd.Net.UnitTests.Authentication
 {
diff --git a/src/Untappd.Net.UnitTests/Client/TestAuthenticatedUntappdCredentials.cs b/src/Untappd.Net.UnitTests/Client/TestAuthenticatedUntappdCredentials.cs
index 5e6ed50..9b0fac7 100644
--- a/src/Untappd.Net.UnitTests/Client/TestAuthenticatedUntappdCredentials.cs
+++ b/src/Untappd.Net.UnitTests/Client/TestAuthenticatedUntappdCredentials.cs
@@ -1,6 +1,6 @@
 using System;
 using NUnit.Framework;
-using Untappd.Net.Client;
+using Untappd.Net.Authentication;
 
 namespace Untappd.Net.UnitTests.Client
 {
diff --git a/src/Untappd.Net.UnitTests/Client/TestUnAuthenticatedUntappdCredentials.cs b/src/Untappd.Net.UnitTests/Client/TestUnAuthenticatedUntappdCredentials.cs
index 535e46b..612de67 100644
--- a/src/Untappd.Net.UnitTests/Client/TestUnAuthenticatedUntappdCredentials.cs
+++ b/src/Untappd.Net.UnitTests/Client/TestUnAuthenticatedUntappdCredentials.cs
@@ -1,6 +1,6 @@
 using System;
 using NUnit.Framework;
-using Untappd.Net.Client;
+using Untappd.Net.Authentication;
 
 namespace Untappd.Net.UnitTests.Client
 {
diff --git a/src/Untappd.Net.UnitTests/Request/TestRepository.cs b/src/Untappd.Net.UnitTests/Request/TestRepository.cs
index e976997..c31e186 100644
--- a/src/Untappd.Net.UnitTests/Request/TestRepository.cs
+++ b/src/Untappd.Net.UnitTests/Request/TestRepository.cs
@@ -5,11 +5,11 @@ using Moq;
 using Newtonsoft.Json;
 using NUnit.Framework;
 using RestSharp;
-using Untappd.Net.Client;
 using Untappd.Net.Request;
 using Untappd.Net.Responses.BeerInfo;
 using Untappd.Net.Responses.Actions;
 using System.IO;
+using Untappd.Net.Authentication;
 
 namespace Untappd.Net.UnitTests.Request
 {
diff --git a/src/Untappd.Net.UnitTests/Responses/TestDeserializer.cs b/src/Untappd.Net.UnitTests/Responses/TestDeserializer.cs
index 7a3889f..aec075e 100644
--- a/src/Untappd.Net.UnitTests/Responses/TestDeserializer.cs
+++ b/src/Untappd.Net.UnitTests/Responses/TestDeserializer.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using Newtonsoft.Json;
 using NUnit.Framework;
-using Untappd.Net.Client;
+using Untappd.Net.Authentication;
 using Untappd.Net.Request;
 using Untappd.Net.Responses.BeerInfo;
 using Untappd.Net.Responses.BeerSearch;
diff --git a/src/Untappd.Net/Client/AuthenticatedUntappdCredentials.cs b/src/Untappd.Net/Authentication/AuthenticatedUntappdCredentials.cs
similarity index 95%
rename from src/Untappd.Net/Client/AuthenticatedUntappdCredentials.cs
rename to src/Untappd.Net/Authentication/AuthenticatedUntappdCredentials.cs
index 9970162..c216fe2 100644
--- a/src/Untappd.Net/Client/AuthenticatedUntappdCredentials.cs
+++ b/src/Untappd.Net/Authentication/AuthenticatedUntappdCredentials.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 
-namespace Untappd.Net.Client
+namespace Untappd.Net.Authentication
 {
     public class AuthenticatedUntappdCredentials : UntappdCredentials, IAuthenticatedUntappdCredentials
     {
diff --git a/src/Untappd.Net/Client/IAuthenticatedUntappdCredentials.cs b/src/Untappd.Net/Authentication/IAuthenticatedUntappdCredentials.cs
similarity index 69%
rename from src/Untappd.Net/Client/IAuthenticatedUntappdCredentials.cs
rename to src/Untappd.Net/Authentication/IAuthenticatedUntappdCredentials.cs
index 2b55242..9e0900c 100644
--- a/src/Untappd.Net/Client/IAuthenticatedUntappdCredentials.cs
+++ b/src/Untappd.Net/Authentication/IAuthenticatedUntappdCredentials.cs
@@ -1,4 +1,4 @@
-namespace Untappd.Net.Client
+namespace Untappd.Net.Authentication
 {
     public interface IAuthenticatedUntappdCredentials : IUntappdCredentials
     {
diff --git a/src/Untappd.Net/Client/IUnAuthenticatedUntappdCredentials.cs b/src/Untappd.Net/Authentication/IUnAuthenticatedUntappdCredentials.cs
similarity index 72%
rename from src/Untappd.Net/Client/IUnAuthenticatedUntappdCredentials.cs
rename to src/Untappd.Net/Authentication/IUnAuthenticatedUntappdCredentials.cs
index 770b596..b2ff2fb 100644
--- a/src/Untappd.Net/Client/IUnAuthenticatedUntappdCredentials.cs
+++ b/src/Untappd.Net/Authentication/IUnAuthenticatedUntappdCredentials.cs
@@ -1,5 +1,5 @@
 
-namespace Untappd.Net.Client
+namespace Untappd.Net.Authentication
 {
     public interface IUnAuthenticatedUntappdCredentials : IUntappdCredentials
     {
diff --git a/src/Untappd.Net/Client/IUntappdCredentials.cs b/src/Untappd.Net/Authentication/IUntappdCredentials.cs
similarity index 58%
rename from src/Untappd.Net/Client/IUntappdCredentials.cs
rename to src/Untappd.Net/Authentication/IUntappdCredentials.cs
index 9f2ebf7..1c43b11 100644
--- a/src/Untappd.Net/Client/IUntappdCredentials.cs
+++ b/src/Untappd.Net/Authentication/IUntappdCredentials.cs
@@ -1,7 +1,6 @@
-using System.Collections;
-using System.Collections.Generic;
+using System.Collections.Generic;
 
-namespace Untappd.Net.Client
+namespace Untappd.Net.Authentication
 {
     public interface IUntappdCredentials
     {
diff --git a/src/Untappd.Net/Client/UnAuthenticatedUntappdCredentials.cs b/src/Untappd.Net/Authentication/UnAuthenticatedUntappdCredentials.cs
similarity index 96%
rename from src/Untappd.Net/Client/UnAuthenticatedUntappdCredentials.cs
rename to src/Untappd.Net/Authentication/UnAuthenticatedUntappdCredentials.cs
index 78f0b29..ae9a674 100644
--- a/src/Untappd.Net/Client/UnAuthenticatedUntappdCredentials.cs
+++ b/src/Untappd.Net/Authentication/UnAuthenticatedUntappdCredentials.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 
-namespace Untappd.Net.Client
+namespace Untappd.Net.Authentication
 {
     public class UnAuthenticatedUntappdCredentials : UntappdCredentials, IUnAuthenticatedUntappdCredentials
     {
diff --git a/src/Untappd.Net/Client/UntappdCredentials.cs b/src/Untappd.Net/Authentication/UntappdCredentials.cs
similarity index 60%
rename from src/Untappd.Net/Client/UntappdCredentials.cs
rename to src/Untappd.Net/Authentication/UntappdCredentials.cs
index 15c10ee..8e265e6 100644
--- a/src/Untappd.Net/Client/UntappdCredentials.cs
+++ b/src/Untappd.Net/Authentication/UntappdCredentials.cs
@@ -1,8 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
+using System.Collections.Generic;
 
-namespace Untappd.Net.Client
+namespace Untappd.Net.Authentication
 {
     public abstract class UntappdCredentials : IUntappdCredentials
     {
diff --git a/src/Untappd.Net/Authentication/AuthenticationHelper.cs b/src/Untappd.Net/OAuth/AuthenticationHelper.cs
similarity index 97%
rename from src/Untappd.Net/Authentication/AuthenticationHelper.cs
rename to src/Untappd.Net/OAuth/AuthenticationHelper.cs
index 4b4aa30..198f210 100644
--- a/src/Untappd.Net/Authentication/AuthenticationHelper.cs
+++ b/src/Untappd.Net/OAuth/AuthenticationHelper.cs
@@ -1,7 +1,7 @@
 using System;
-using Untappd.Net.Client;
+using Untappd.Net.Authentication;
 
-namespace Untappd.Net.Authentication
+namespace Untappd.Net.OAuth
 {
     public static class AuthenticationHelper
     {
diff --git a/src/Untappd.Net/Request/Repository.cs b/src/Untappd.Net/Request/Repository.cs
index 6687c21..f557c14 100644
--- a/src/Untappd.Net/Request/Repository.cs
+++ b/src/Untappd.Net/Request/Repository.cs
@@ -4,9 +4,9 @@ using System.Threading.Tasks;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using RestSharp;
-using Untappd.Net.Client;
 using Untappd.Net.Exception;
 using System;
+using Untappd.Net.Authentication;
 
 namespace Untappd.Net.Request
 {
diff --git a/src/Untappd.Net/Request/RepositoryGet.cs b/src/Untappd.Net/Request/RepositoryGet.cs
index 9cecc19..1daabad 100644
--- a/src/Untappd.Net/Request/RepositoryGet.cs
+++ b/src/Untappd.Net/Request/RepositoryGet.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Untappd.Net.Client;
+using Untappd.Net.Authentication;
 using Untappd.Net.Exception;
 
 namespace Untappd.Net.Request
diff --git a/src/Untappd.Net/Request/RepositoryPost.cs b/src/Untappd.Net/Request/RepositoryPost.cs
index aa48e59..f5bffbb 100644
--- a/src/Untappd.Net/Request/RepositoryPost.cs
+++ b/src/Untappd.Net/Request/RepositoryPost.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using Untappd.Net.Client;
+using Untappd.Net.Authentication;
 
 namespace Untappd.Net.Request
 {
diff --git a/src/Untappd.Net/Untappd.Net.csproj b/src/Untappd.Net/Untappd.Net.csproj
index e1d4cc9..c980f55 100644
--- a/src/Untappd.Net/Untappd.Net.csproj
+++ b/src/Untappd.Net/Untappd.Net.csproj
@@ -46,7 +46,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Authentication\AuthenticationHelper.cs" />
+    <Compile Include="OAuth\AuthenticationHelper.cs" />
     <Compile Include="Exception\HttpErrorException.cs" />
     <Compile Include="Request\IAction.cs" />
     <Compile Include="Request\RepositoryGet.cs" />
@@ -61,12 +61,12 @@
     <Compile Include="Responses\Actions\AddFriend.cs" />
     <Compile Include="Responses\Actions\ToastUntoast.cs" />
     <Compile Include="SingleObjectArrayConverter.cs" />
-    <Compile Include="Client\AuthenticatedUntappdCredentials.cs" />
-    <Compile Include="Client\IAuthenticatedUntappdCredentials.cs" />
-    <Compile Include="Client\IUnAuthenticatedUntappdCredentials.cs" />
-    <Compile Include="Client\IUntappdCredentials.cs" />
-    <Compile Include="Client\UnAuthenticatedUntappdCredentials.cs" />
-    <Compile Include="Client\UntappdCredentials.cs" />
+    <Compile Include="Authentication\AuthenticatedUntappdCredentials.cs" />
+    <Compile Include="Authentication\IAuthenticatedUntappdCredentials.cs" />
+    <Compile Include="Authentication\IUnAuthenticatedUntappdCredentials.cs" />
+    <Compile Include="Authentication\IUntappdCredentials.cs" />
+    <Compile Include="Authentication\UnAuthenticatedUntappdCredentials.cs" />
+    <Compile Include="Authentication\UntappdCredentials.cs" />
     <Compile Include="Constants.cs" />
     <Compile Include="Exception\BaseUntappdException.cs" />
     <Compile Include="Exception\EndpointConfigurationException.cs" />