diff --git a/KustoExplorerVscode.slnx b/KustoExplorerVscode.slnx
new file mode 100644
index 0000000..c82e46e
--- /dev/null
+++ b/KustoExplorerVscode.slnx
@@ -0,0 +1,15 @@
+<Solution>
+  <Folder Name="/root/">
+    <File Path=".github/workflows/ci.yml" />
+    <File Path="CONTRIBUTING.md" />
+    <File Path="LICENSE" />
+    <File Path="README.md" />
+    <File Path="SECURITY.md" />
+  </Folder>
+  <Project Path="src/Client/Client.esproj">
+    <Build />
+    <Deploy />
+  </Project>
+  <Project Path="src/Server/Server.csproj" />
+  <Project Path="src/ServerTests/ServerTests.csproj" />
+</Solution>
diff --git a/README.md b/README.md
index a06430e..5115cce 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@
 
 ## Using this Repository
 
-- src/KustoExplorerVscode.slnx - Visual Studio solution file for the entire extension
+- KustoExplorerVscode.slnx - Visual Studio solution file for the entire extension
 - src/Client - TypeScript vscode extension
 - src/Server - C# LSP Server
 - src/ServerTests - C# Tests for the server codebase
@@ -38,8 +38,9 @@ Some other custom features are also implemented here, but eventually most of the
 
 ### Debugging the Server
 1. Run the extension in debug mode as described above, which will also launch the server in debug mode
-1. Open `src/KustoExplorerVscode.slnx` in Visual Studio
-2. Attach to the dotnet.exe process associated with the extension
+2. Attach to the server process using one of the following:
+   - **Visual Studio**: Open `KustoExplorerVscode.slnx` and attach to the dotnet.exe process associated with the extension
+   - **VS Code**: Open the repository root folder, then run command `Debug: Attach to a .NET 5+ or .NET Core process` (Ctrl+Shift+P) and select the `Server` process
 
 ### Creating the VSIX installer
 
diff --git a/src/Client/.npmrc b/src/Client/.npmrc
new file mode 100644
index 0000000..0e5e9ca
--- /dev/null
+++ b/src/Client/.npmrc
@@ -0,0 +1 @@
+legacy-peer-deps=true
diff --git a/src/KustoExplorerVscode.slnx b/src/KustoExplorerVscode.slnx
deleted file mode 100644
index 82124d5..0000000
--- a/src/KustoExplorerVscode.slnx
+++ /dev/null
@@ -1,15 +0,0 @@
-<Solution>
-  <Folder Name="/root/">
-    <File Path="../.github/workflows/ci.yml" />
-    <File Path="../CONTRIBUTING.md" />
-    <File Path="../LICENSE" />
-    <File Path="../README.md" />
-    <File Path="../SECURITY.md" />
-  </Folder>
-  <Project Path="Client/Client.esproj">
-    <Build />
-    <Deploy />
-  </Project>
-  <Project Path="Server/Server.csproj" />
-  <Project Path="ServerTests/ServerTests.csproj" />
-</Solution>