diff --git a/.travis.yml b/.travis.yml
index effd609..3998652 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,4 +7,4 @@ install:
 
 script:
  - dotnet build
- - dotnet test -f netcoreapp2.0
\ No newline at end of file
+ - dotnet test SeatsioDotNet.Test
diff --git a/SeatsioDotNet.Test/SeatsioDotNet.Test.csproj b/SeatsioDotNet.Test/SeatsioDotNet.Test.csproj
new file mode 100644
index 0000000..a21025d
--- /dev/null
+++ b/SeatsioDotNet.Test/SeatsioDotNet.Test.csproj
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\SeatsioDotNet\SeatsioDotNet.csproj" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
+    <PackageReference Include="xunit" Version="2.3.1" />
+    <PackageReference Include="RestSharp" Version="106.2.1" />
+    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
+  </ItemGroup>
+</Project>
diff --git a/seatsio-dotnet.csproj b/SeatsioDotNet/SeatsioDotNet.csproj
similarity index 59%
rename from seatsio-dotnet.csproj
rename to SeatsioDotNet/SeatsioDotNet.csproj
index b06abb5..07dec0d 100644
--- a/seatsio-dotnet.csproj
+++ b/SeatsioDotNet/SeatsioDotNet.csproj
@@ -5,17 +5,11 @@
     <Version>5</Version>
     <TargetFrameworks>netcoreapp2.0;netstandard2.0</TargetFrameworks>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
-    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
-  </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
     <PackageReference Include="Microsoft.CSharp" Version="4.4.1" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.1" />
     <PackageReference Include="RestSharp" Version="106.2.1" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/deploy.md b/deploy.md
index da5a9b8..71831bd 100644
--- a/deploy.md
+++ b/deploy.md
@@ -1,5 +1,6 @@
 How to deploy:
 
-1) increase version number in seatsio-dotnet.csproj
+1) cd SeatsioDotNet
+1) increase version number in SeatsioDotNet.csproj
 2) dotnet pack
-3) dotnet nuget push bin/Debug/seatsio-dotnet.<version>.nupkg -s nuget.org -k <nuget API key>
\ No newline at end of file
+3) dotnet nuget push bin/Debug/seatsio-dotnet.<version>.nupkg -s nuget.org -k <nuget API key>
diff --git a/seatsio-dotnet.sln b/seatsio-dotnet.sln
index 1f69442..129b1f7 100644
--- a/seatsio-dotnet.sln
+++ b/seatsio-dotnet.sln
@@ -1,6 +1,8 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "seatsio-dotnet", "seatsio-dotnet.csproj", "{42CB17AA-1703-4F2B-B194-895EF0EB5DD3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SeatsioDotNet", "SeatsioDotNet/SeatsioDotNet.csproj", "{42CB17AA-1703-4F2B-B194-895EF0EB5DD3}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SeatsioDotNet.Test", "SeatsioDotNet.Test/SeatsioDotNet.Test.csproj", "{4F99CB9F-5F3A-4A92-89BA-7C4AF5C93E91}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -12,5 +14,9 @@ Global
 		{42CB17AA-1703-4F2B-B194-895EF0EB5DD3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{42CB17AA-1703-4F2B-B194-895EF0EB5DD3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{42CB17AA-1703-4F2B-B194-895EF0EB5DD3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4F99CB9F-5F3A-4A92-89BA-7C4AF5C93E91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4F99CB9F-5F3A-4A92-89BA-7C4AF5C93E91}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4F99CB9F-5F3A-4A92-89BA-7C4AF5C93E91}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4F99CB9F-5F3A-4A92-89BA-7C4AF5C93E91}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal