diff --git a/src/Appium.Net.sln b/Appium.Net.sln
similarity index 88%
rename from src/Appium.Net.sln
rename to Appium.Net.sln
index f08cfa7c..a26caa57 100644
--- a/src/Appium.Net.sln
+++ b/Appium.Net.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29509.3
+# Visual Studio Version 17
+VisualStudioVersion = 17.11.35327.3
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{DD79BA21-B485-411E-B132-0C1A462FFABF}"
 	ProjectSection(SolutionItems) = preProject
@@ -11,9 +11,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		..\README.md = ..\README.md
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Appium.Net.Integration.Tests", "..\test\integration\Appium.Net.Integration.Tests.csproj", "{278EE5EC-9414-43D8-B8C0-E7B4F8C8D283}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Appium.Net", "src\Appium.Net\Appium.Net.csproj", "{543DA877-7D38-4761-9623-BFD8DA4259DA}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Appium.Net", "Appium.Net\Appium.Net.csproj", "{F83BBAB0-9359-45AF-BADC-6A338EF668F6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Appium.Net.Integration.Tests", "test\integration\Appium.Net.Integration.Tests.csproj", "{70D3D545-5F3D-4196-90AD-666FE2E0E740}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -21,14 +21,14 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{278EE5EC-9414-43D8-B8C0-E7B4F8C8D283}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{278EE5EC-9414-43D8-B8C0-E7B4F8C8D283}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{278EE5EC-9414-43D8-B8C0-E7B4F8C8D283}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{278EE5EC-9414-43D8-B8C0-E7B4F8C8D283}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F83BBAB0-9359-45AF-BADC-6A338EF668F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F83BBAB0-9359-45AF-BADC-6A338EF668F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F83BBAB0-9359-45AF-BADC-6A338EF668F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F83BBAB0-9359-45AF-BADC-6A338EF668F6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{543DA877-7D38-4761-9623-BFD8DA4259DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{543DA877-7D38-4761-9623-BFD8DA4259DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{543DA877-7D38-4761-9623-BFD8DA4259DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{543DA877-7D38-4761-9623-BFD8DA4259DA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{70D3D545-5F3D-4196-90AD-666FE2E0E740}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{70D3D545-5F3D-4196-90AD-666FE2E0E740}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{70D3D545-5F3D-4196-90AD-666FE2E0E740}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{70D3D545-5F3D-4196-90AD-666FE2E0E740}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE