diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 46fe9a7..991dc31 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -41,17 +41,18 @@ jobs:
 
       - name: Configure VSDbg Engine Extension (x64)
         run: |
-          mkdir build-x64
-          cd build-x64
+          mkdir build/x64
+          cd build/x64
           cmake "${{ github.workspace }}\vsdbg-engine-extension" `
           -G Ninja `
           -DCMAKE_BUILD_TYPE=Debug `
           -DCMAKE_PREFIX_PATH="${{ github.workspace }}\Microsoft.VSSDK.Debugger.VSDebugEng.17.0.2012801\build\native;${{ github.workspace }}\Microsoft.VSSDK.Debugger.VSDConfigTool.17.0.2012801\build" `
-          -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}\vsdbg-engine-extension"
+          -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}\vsdbg-engine-extension" `
+          -DCHILDDEBUGGER_INSTALL_PDB=ON
   
       - name: Build & Install VSDbg Engine Extension (x64)
         run: |
-          cd build-x64
+          cd build/x64
           ninja install
 
       - uses: TheMrMilchmann/setup-msvc-dev@v2
@@ -60,17 +61,18 @@ jobs:
 
       - name: Configure VSDbg Engine Extension (x86)
         run: |
-          mkdir build-x86
-          cd build-x86
+          mkdir build/x86
+          cd build/x86
           cmake "${{ github.workspace }}\vsdbg-engine-extension" `
           -G Ninja `
           -DCMAKE_BUILD_TYPE=Debug `
           -DCMAKE_PREFIX_PATH="${{ github.workspace }}\Microsoft.VSSDK.Debugger.VSDebugEng.17.0.2012801\build\native;${{ github.workspace }}\Microsoft.VSSDK.Debugger.VSDConfigTool.17.0.2012801\build" `
-          -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}\vsdbg-engine-extension"
+          -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}\vsdbg-engine-extension" `
+          -DCHILDDEBUGGER_INSTALL_PDB=ON
   
       - name: Build & Install VSDbg Engine Extension (x86)
         run: |
-          cd build-x86
+          cd build/x86
           ninja install
 
       - name: Compile VSCode Test Sources
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
index 94266c5..5da6414 100644
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@@ -47,17 +47,18 @@ jobs:
   
       - name: Configure VSDbg Engine Extension (x64)
         run: |
-          mkdir build-x64
-          cd build-x64
+          mkdir build/x64
+          cd build/x64
           cmake "${{ github.workspace }}\vsdbg-engine-extension" `
           -G Ninja `
           -DCMAKE_BUILD_TYPE=Debug `
           -DCMAKE_PREFIX_PATH="${{ github.workspace }}\Microsoft.VSSDK.Debugger.VSDebugEng.17.0.2012801\build\native;${{ github.workspace }}\Microsoft.VSSDK.Debugger.VSDConfigTool.17.0.2012801\build" `
-          -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}\vsdbg-engine-extension"
+          -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}\vsdbg-engine-extension" `
+          -DCHILDDEBUGGER_INSTALL_PDB=ON
   
       - name: Build & Install VSDbg Engine Extension (x64)
         run: |
-          cd build-x64
+          cd build/x64
           ninja install
 
       - uses: TheMrMilchmann/setup-msvc-dev@v2
@@ -66,25 +67,26 @@ jobs:
   
       - name: Configure VSDbg Engine Extension (x86)
         run: |
-          mkdir build-x86
-          cd build-x86
+          mkdir build/x86
+          cd build/x86
           cmake "${{ github.workspace }}\vsdbg-engine-extension" `
           -G Ninja `
           -DCMAKE_BUILD_TYPE=Debug `
           -DCMAKE_PREFIX_PATH="${{ github.workspace }}\Microsoft.VSSDK.Debugger.VSDebugEng.17.0.2012801\build\native;${{ github.workspace }}\Microsoft.VSSDK.Debugger.VSDConfigTool.17.0.2012801\build" `
-          -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}\vsdbg-engine-extension"
+          -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}\vsdbg-engine-extension" `
+          -DCHILDDEBUGGER_INSTALL_PDB=ON
   
       - name: Build & Install VSDbg Engine Extension (x86)
         run: |
-          cd build-x86
+          cd build/x86
           ninja install
 
       - name: Add build info
         run: |
           "ref:    ${{ github.ref_name }}`n" + `
           "commit: ${{ github.sha }}`n"  + `
-          "date:   $(Get-Date -UFormat '%FT%T%Z' -AsUTC)" | Out-File -Path "${{ github.workspace }}/build-x64/bin/info.txt"
-    
+          "date:   $(Get-Date -UFormat '%FT%T%Z' -AsUTC)" | Out-File -Path "${{ github.workspace }}/vsdbg-engine-extension/bin/info.txt"
+
       - name: Package VSIX
         run: |
           vsce package --target win32-x64 --pre-release
@@ -101,24 +103,24 @@ jobs:
         with:
           name: childdebugger-win32-x64-tests
           path: |
-            ${{ github.workspace }}/build-x64/tests/bin/caller.exe
-            ${{ github.workspace }}/build-x64/tests/bin/caller.pdb
-            ${{ github.workspace }}/build-x64/tests/bin/callee.exe
-            ${{ github.workspace }}/build-x64/tests/bin/callee.pdb
-            ${{ github.workspace }}/build-x86/tests/bin/caller.exe
-            ${{ github.workspace }}/build-x86/tests/bin/caller.pdb
-            ${{ github.workspace }}/build-x86/tests/bin/callee.exe
-            ${{ github.workspace }}/build-x86/tests/bin/callee.pdb
-            ${{ github.workspace }}/build-x64/bin/info.txt
+            ${{ github.workspace }}/vsdbg-engine-extension/bin/tests/x64/caller.exe
+            ${{ github.workspace }}/vsdbg-engine-extension/bin/tests/x64/caller.pdb
+            ${{ github.workspace }}/vsdbg-engine-extension/bin/tests/x64/callee.exe
+            ${{ github.workspace }}/vsdbg-engine-extension/bin/tests/x64/callee.pdb
+            ${{ github.workspace }}/vsdbg-engine-extension/bin/tests/x86/caller.exe
+            ${{ github.workspace }}/vsdbg-engine-extension/bin/tests/x86/caller.pdb
+            ${{ github.workspace }}/vsdbg-engine-extension/bin/tests/x86/callee.exe
+            ${{ github.workspace }}/vsdbg-engine-extension/bin/tests/x86/callee.pdb
+            ${{ github.workspace }}/vsdbg-engine-extension/bin/info.txt
 
       - name: Upload debug symbols
         uses: actions/upload-artifact@v3
         with:
           name: childdebugger-win32-x64-debug-symbols
           path: |
-            ${{ github.workspace }}/build-x64/bin/ChildDebugger.pdb
-            ${{ github.workspace }}/build-x86/bin/ChildDebugger.pdb
-            ${{ github.workspace }}/build-x64/bin/info.txt
+            ${{ github.workspace }}/vsdbg-engine-extension/bin/x64/ChildDebugger.pdb
+            ${{ github.workspace }}/vsdbg-engine-extension/bin/x86/ChildDebugger.pdb
+            ${{ github.workspace }}/vsdbg-engine-extension/bin/info.txt
 
   deploy-head:
     name: "Deploy head"
diff --git a/.gitignore b/.gitignore
index c773f0f..3d73146 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,4 @@ node_modules
 .vscode-test/
 *.vsix
 vsdbg-engine-extension/bin/
-build-*/
+build/
diff --git a/.vscodeignore b/.vscodeignore
index 1703c65..79b2d15 100644
--- a/.vscodeignore
+++ b/.vscodeignore
@@ -9,13 +9,9 @@
 
 !dist/*.js
 
-!vsdbg-engine-extension/bin/x86/*.dll
-!vsdbg-engine-extension/bin/x86/*.pdb
-!vsdbg-engine-extension/bin/x64/*.dll
-!vsdbg-engine-extension/bin/x64/*.pdb
-!vsdbg-engine-extension/bin/arm/*.dll
-!vsdbg-engine-extension/bin/arm/*.pdb
-!vsdbg-engine-extension/bin/arm64/*.dll
-!vsdbg-engine-extension/bin/arm64/*.pdb
-!vsdbg-engine-extension/bin/*.vsdconfig
-!vsdbg-engine-extension/info.txt
+!vsdbg-engine-extension/bin/x86/ChildDebugger.dll
+!vsdbg-engine-extension/bin/x64/ChildDebugger.dll
+!vsdbg-engine-extension/bin/arm/ChildDebugger.dll
+!vsdbg-engine-extension/bin/arm64/ChildDebugger.dll
+!vsdbg-engine-extension/bin/ChildDebugger.vsdconfig
+!vsdbg-engine-extension/bin/info.txt
diff --git a/src/test/suite/extension.test.ts b/src/test/suite/extension.test.ts
index 041cb16..ada8fa3 100644
--- a/src/test/suite/extension.test.ts
+++ b/src/test/suite/extension.test.ts
@@ -563,7 +563,7 @@ function testArchitecture(callerPath: string, calleePath: string, arch: string)
 }
 
 suite('Auto attach x64', () => {
-	const testExeDirX64 = path.join(__dirname, "..", "..", "..", "build-x64", "tests", "bin");
+	const testExeDirX64 = path.join(__dirname, "..", "..", "..", "vsdbg-engine-extension", "bin", "tests", "x64");
 
 	const callerPathX64 = path.join(testExeDirX64, "caller.exe");
 	const calleePathX64 = path.join(testExeDirX64, "callee.exe");
@@ -572,7 +572,7 @@ suite('Auto attach x64', () => {
 });
 
 suite('Auto attach x86', () => {
-	const testExeDirX86 = path.join(__dirname, "..", "..", "..", "build-x86", "tests", "bin");
+	const testExeDirX86 = path.join(__dirname, "..", "..", "..", "vsdbg-engine-extension", "bin", "tests", "x86");
 
 	const callerPathX86 = path.join(testExeDirX86, "caller.exe");
 	const calleePathX86 = path.join(testExeDirX86, "callee.exe");