diff --git a/SignalR.sln b/SignalR.sln
index 9ed5bf0f00..63c6f13670 100644
--- a/SignalR.sln
+++ b/SignalR.sln
@@ -68,6 +68,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{6CEC3D
 		test\Common\XUnitLoggerProvider.cs = test\Common\XUnitLoggerProvider.cs
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "client-ts", "client-ts", "{3A76C5A2-79ED-49BC-8BDC-6A3A766FFA1B}"
+	ProjectSection(SolutionItems) = preProject
+		client-ts\package.json = client-ts\package.json
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -187,7 +192,7 @@ Global
 		{58E771EC-8454-4558-B61A-C9D049065911} = {6A35B453-52EC-48AF-89CA-D4A69800F131}
 		{300979F6-A02E-407A-B8DF-F6200806C18D} = {C4BC9889-B49F-41B6-806B-F84941B2549B}
 		{8D789F94-CB74-45FD-ACE7-92AF6E55042E} = {C4BC9889-B49F-41B6-806B-F84941B2549B}
-		{A0BF246B-FE7D-4E12-99BF-FFDC131B85D8} = {6A35B453-52EC-48AF-89CA-D4A69800F131}
+		{A0BF246B-FE7D-4E12-99BF-FFDC131B85D8} = {3A76C5A2-79ED-49BC-8BDC-6A3A766FFA1B}
 		{1CE2B3BE-056C-41E3-A5F5-6A1EF1D288BA} = {6A35B453-52EC-48AF-89CA-D4A69800F131}
 		{BA99C2A1-48F9-4FA5-B95A-9687A73B7CC9} = {C4BC9889-B49F-41B6-806B-F84941B2549B}
 		{EE790D50-C632-46B9-A430-06FA2F2FDCD7} = {C4BC9889-B49F-41B6-806B-F84941B2549B}
@@ -198,7 +203,7 @@ Global
 		{455B68D2-C5B6-4BF4-A685-964B07AFAAF8} = {6A35B453-52EC-48AF-89CA-D4A69800F131}
 		{F3EFFD9F-DD85-48A2-9B11-83A133ECC099} = {DA69F624-5398-4884-87E4-B816698CDE65}
 		{B0D32729-48AA-4841-B52A-2A61B60EED61} = {6A35B453-52EC-48AF-89CA-D4A69800F131}
-		{333526A4-633B-491A-AC45-CC62A0012D1C} = {DA69F624-5398-4884-87E4-B816698CDE65}
+		{333526A4-633B-491A-AC45-CC62A0012D1C} = {3A76C5A2-79ED-49BC-8BDC-6A3A766FFA1B}
 		{6CEC3DC2-5B01-45A8-8F0D-8531315DA90B} = {6A35B453-52EC-48AF-89CA-D4A69800F131}
 	EndGlobalSection
 EndGlobal
diff --git a/client-ts/Microsoft.AspNetCore.Client.SignalR.TS.Tests/Connection.spec.ts b/client-ts/Microsoft.AspNetCore.SignalR.Client.TS.Tests/Connection.spec.ts
similarity index 100%
rename from client-ts/Microsoft.AspNetCore.Client.SignalR.TS.Tests/Connection.spec.ts
rename to client-ts/Microsoft.AspNetCore.SignalR.Client.TS.Tests/Connection.spec.ts
diff --git a/client-ts/Microsoft.AspNetCore.Client.SignalR.TS.Tests/Formatters.spec.ts b/client-ts/Microsoft.AspNetCore.SignalR.Client.TS.Tests/Formatters.spec.ts
similarity index 100%
rename from client-ts/Microsoft.AspNetCore.Client.SignalR.TS.Tests/Formatters.spec.ts
rename to client-ts/Microsoft.AspNetCore.SignalR.Client.TS.Tests/Formatters.spec.ts
diff --git a/client-ts/Microsoft.AspNetCore.Client.SignalR.TS.Tests/jasmine.json b/client-ts/Microsoft.AspNetCore.SignalR.Client.TS.Tests/jasmine.json
similarity index 100%
rename from client-ts/Microsoft.AspNetCore.Client.SignalR.TS.Tests/jasmine.json
rename to client-ts/Microsoft.AspNetCore.SignalR.Client.TS.Tests/jasmine.json
diff --git a/client-ts/Microsoft.AspNetCore.Client.SignalR.TS.Tests/tsconfig.json b/client-ts/Microsoft.AspNetCore.SignalR.Client.TS.Tests/tsconfig.json
similarity index 100%
rename from client-ts/Microsoft.AspNetCore.Client.SignalR.TS.Tests/tsconfig.json
rename to client-ts/Microsoft.AspNetCore.SignalR.Client.TS.Tests/tsconfig.json
diff --git a/client-ts/package.json b/client-ts/package.json
index c4914b1b7e..03d269eccd 100644
--- a/client-ts/package.json
+++ b/client-ts/package.json
@@ -9,8 +9,8 @@
   },
   "scripts": {
     "gulp": "gulp",
-    "pretest": "tsc -p Microsoft.AspNetCore.Client.SignalR.TS.Tests",
-    "test": "jasmine JASMINE_CONFIG_PATH=Microsoft.AspNetCore.Client.SignalR.TS.Tests/jasmine.json"
+    "pretest": "tsc -p Microsoft.AspNetCore.SignalR.Client.TS.Tests",
+    "test": "jasmine JASMINE_CONFIG_PATH=Microsoft.AspNetCore.SignalR.Client.TS.Tests/jasmine.json"
   },
   "repository": {
     "type": "git",