diff --git a/src/NetrunnerDb.Net.Tests/Class1.cs b/src/NetrunnerDb.Net.Tests/Class1.cs
index 342572e..5109ec7 100644
--- a/src/NetrunnerDb.Net.Tests/Class1.cs
+++ b/src/NetrunnerDb.Net.Tests/Class1.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using NetrunnerDb.Net.Responses;
 using NUnit.Framework;
 
 namespace NetrunnerDb.Net.Tests
diff --git a/src/NetrunnerDb.Net.Tests/NetrunnerDb.Net.Tests.csproj b/src/NetrunnerDb.Net.Tests/NetrunnerDb.Net.Tests.csproj
index 8787ccb..91776d8 100644
--- a/src/NetrunnerDb.Net.Tests/NetrunnerDb.Net.Tests.csproj
+++ b/src/NetrunnerDb.Net.Tests/NetrunnerDb.Net.Tests.csproj
@@ -71,6 +71,9 @@
       <Name>NetrunnerDb.Net</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/NetrunnerDb.Net/Repository.cs b/src/NetrunnerDb.Net/Repository.cs
index 04ca6cb..1fc7724 100644
--- a/src/NetrunnerDb.Net/Repository.cs
+++ b/src/NetrunnerDb.Net/Repository.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Net;
+using NetrunnerDb.Net.Responses;
 using Newtonsoft.Json;
 using RestSharp;
 
diff --git a/src/NetrunnerDb.Net/Responses/Cards.cs b/src/NetrunnerDb.Net/Responses/Cards.cs
index 08d1d28..482097e 100644
--- a/src/NetrunnerDb.Net/Responses/Cards.cs
+++ b/src/NetrunnerDb.Net/Responses/Cards.cs
@@ -1,11 +1,7 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Newtonsoft.Json;
 
-namespace NetrunnerDb.Net
+namespace NetrunnerDb.Net.Responses
 {
     public class Cards : IRequest
     {
diff --git a/src/NetrunnerDb.Net/Responses/IRequest.cs b/src/NetrunnerDb.Net/Responses/IRequest.cs
index 97ff14f..7b9bfb5 100644
--- a/src/NetrunnerDb.Net/Responses/IRequest.cs
+++ b/src/NetrunnerDb.Net/Responses/IRequest.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace NetrunnerDb.Net
+namespace NetrunnerDb.Net.Responses
 {
     public interface IRequest
     {
diff --git a/src/NetrunnerDb.Net/Responses/Set.cs b/src/NetrunnerDb.Net/Responses/Set.cs
index d295b69..1c66df7 100644
--- a/src/NetrunnerDb.Net/Responses/Set.cs
+++ b/src/NetrunnerDb.Net/Responses/Set.cs
@@ -1,11 +1,7 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Newtonsoft.Json;
 
-namespace NetrunnerDb.Net
+namespace NetrunnerDb.Net.Responses
 {
     public class Set : IRequest
     {
diff --git a/src/NetrunnerDb.Net/Responses/Sets.cs b/src/NetrunnerDb.Net/Responses/Sets.cs
index 9e02122..938807c 100644
--- a/src/NetrunnerDb.Net/Responses/Sets.cs
+++ b/src/NetrunnerDb.Net/Responses/Sets.cs
@@ -1,11 +1,7 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Newtonsoft.Json;
 
-namespace NetrunnerDb.Net
+namespace NetrunnerDb.Net.Responses
 {
     public class Sets : IRequest
     {