diff --git a/.github/workflows/bump_versions.yml b/.github/workflows/bump_versions.yml
index 78ea667bb..28f64dc00 100644
--- a/.github/workflows/bump_versions.yml
+++ b/.github/workflows/bump_versions.yml
@@ -71,16 +71,16 @@ jobs:
         if: github.event.inputs.VSCODE_EXT != 'none'
         run: |
           VERSION=$(bumpversion --allow-dirty ${{ github.event.inputs.VSCODE_EXT }} --list | grep new_version | cut -d '=' -f 2)
-          echo "::notice file=vscode-ext/package.json::Upgrading to version ${VERSION}"
+          echo "::notice file=typescript/vscode-ext/packages/package.json::Upgrading to version ${VERSION}"
           echo "COMMIT_MSG=${COMMIT_MSG} [BUMP:vscode_ext:${VERSION}]" >> $GITHUB_ENV
-        working-directory: ./vscode-ext
+        working-directory: ./typescript/vscode-ext/packages
 
       - name: Bump version - cli
         id: cli
         if: github.event.inputs.CLI != 'none'
         run: |
           VERSION=$(bumpversion --allow-dirty ${{ github.event.inputs.CLI }} --list | grep new_version | cut -d '=' -f 2)
-          echo "::notice file=cli/Cargo.toml::Upgrading to version ${VERSION}"
+          echo "::notice file=engine/baml-cli/Cargo.toml::Upgrading to version ${VERSION}"
           echo "COMMIT_MSG=${COMMIT_MSG} [BUMP:cli:${VERSION}]" >> $GITHUB_ENV
         working-directory: ./cli
 
@@ -92,7 +92,7 @@ jobs:
           echo "::notice file=clients/python/pyproject.toml::Upgrading to version ${VERSION}"
           echo "COMMIT_MSG=${COMMIT_MSG} [BUMP:py_client:${VERSION}]" >> $GITHUB_ENV
         working-directory: ./clients/python
-      
+
       - id: commit
         run: |
           git config --global user.email "github-actions[bot]@users.noreply.github.com"
diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml
index 3d83d56e2..08262be4d 100644
--- a/.github/workflows/cli.yml
+++ b/.github/workflows/cli.yml
@@ -3,16 +3,16 @@ name: Gloo CLI
 on:
   pull_request:
     paths:
-      - "cli/**"
+      - "engine/baml-cli/**"
     branches:
-      - canary
+      - vscode-baml-release
   push:
     paths:
-      - "cli/.bumpversion.cfg"
+      - "engine/.bumpversion.cfg"
     branches:
-      - canary
+      - vscode-baml-release
     tags:
-      - "release/cli/v*.*.*"
+      - "release/baml-cli/v*.*.*"
 
 jobs:
   build:
@@ -24,25 +24,25 @@ jobs:
         platform:
           - os: ubuntu-20.04
             target: x86_64-unknown-linux-gnu
-            bin: gloo
-            name: gloo-linux-x86_64
+            bin: baml
+            name: baml-linux-x86_64
             command: build
 
           - os: windows-latest
             target: x86_64-pc-windows-msvc
-            bin: gloo.exe
-            name: gloo-Windows-x86_64
+            bin: baml.exe
+            name: baml-Windows-x86_64
             command: both
 
           - os: macOS-latest
             target: x86_64-apple-darwin
-            bin: gloo
-            name: gloo-Darwin-x86_64
+            bin: baml
+            name: baml-Darwin-x86_64
             command: both
           - os: macOS-latest
             target: aarch64-apple-darwin
-            bin: gloo
-            name: gloo-Darwin-apple-silicon
+            bin: baml
+            name: baml-Darwin-apple-silicon
             command: build # Can't test on macOS-latest because it's Intel
 
     runs-on: ${{ matrix.platform.os }}
@@ -52,7 +52,7 @@ jobs:
       - uses: Swatinem/rust-cache@v2
         with:
           workspaces: |
-            cli
+            engine/baml-cli
 
       - name: Build binary
         uses: houseabsolute/actions-rust-cross@v0
@@ -61,20 +61,20 @@ jobs:
           target: ${{ matrix.platform.target }}
           args: "--locked --release"
           strip: ${{ github.event_name != 'pull_request' }}
-          working-directory: cli
+          working-directory: engine/baml-cli
 
       - name: Add artifact
         uses: actions/upload-artifact@v3
         with:
           name: ${{ matrix.platform.name }}
-          path: cli/target/${{ matrix.platform.target }}/release/${{ matrix.platform.bin }}
+          path: engine/baml-cli/target/${{ matrix.platform.target }}/release/${{ matrix.platform.bin }}
 
   pre-release:
     permissions:
       contents: write
     runs-on: ubuntu-latest
     needs: build
-    if: github.ref == 'refs/heads/canary'
+    if: github.ref == 'refs/heads/vscode-baml-release'
     environment: nightly
 
     steps:
@@ -84,37 +84,38 @@ jobs:
       - name: Get artifact [Darwin-Intel]
         uses: actions/download-artifact@v3
         with:
-          name: gloo-Darwin-x86_64
-          path: cli/target/x86_64-apple-darwin/release/
+          name: baml-Darwin-x86_64
+          path: engine/baml-cli/target/x86_64-apple-darwin/release/
       - name: Get artifact [Darwin-Silicon]
         uses: actions/download-artifact@v3
         with:
-          name: gloo-Darwin-apple-silicon
-          path: cli/target/aarch64-apple-darwin/release/
+          name: baml-Darwin-apple-silicon
+          path: engine/baml-cli/target/aarch64-apple-darwin/release/
       - name: Get artifact [Linux]
         uses: actions/download-artifact@v3
         with:
-          name: gloo-linux-x86_64
-          path: cli/target/x86_64-unknown-linux-gnu/release/
+          name: baml-linux-x86_64
+          path: engine/baml-cli/target/x86_64-unknown-linux-gnu/release/
       - name: Get artifact [Windows]
         uses: actions/download-artifact@v3
         with:
-          name: gloo-Windows-x86_64
-          path: cli/target/x86_64-pc-windows-msvc/release/
+          name: baml-Windows-x86_64
+          path: engine/baml-cli/target/x86_64-pc-windows-msvc/release/
       - id: hash
         run: |
-          VERSION=$(cat cli/.bumpversion.cfg | grep current_version | cut -d '=' -f 2 | sed 's/[", ]//g')
+          VERSION=$(cat engine/.bumpversion.cfg | grep current_version | cut -d '=' -f 2 | sed 's/[", ]//g')
+
           if [[ ! $VERSION =~ ^[0-9]+\.[0-9]+\.[0-9]+-canary\.[0-9]+$ ]]; then
             echo "Version ($VERSION) is not a pre-release build"
             exit 1
           fi
-          tar -czvf gloo-linux-x86_64.tar.gz cli/target/x86_64-unknown-linux-gnu/release/gloo
-          tar -czvf gloo-apple-intel.tar.gz cli/target/x86_64-apple-darwin/release/gloo
-          tar -czvf gloo-apple-arm.tar.gz cli/target/aarch64-apple-darwin/release/gloo
-          echo "linux_hash=$(shasum -a 256 gloo-linux-x86_64.tar.gz | cut -d ' ' -f 1)" >> $GITHUB_OUTPUT
-          echo "darwin_intel_hash=$(shasum -a 256 gloo-apple-intel.tar.gz | cut -d ' ' -f 1)" >> $GITHUB_OUTPUT
-          echo "darwin_arm_hash=$(shasum -a 256 gloo-apple-arm.tar.gz | cut -d ' ' -f 1)" >> $GITHUB_OUTPUT
-          echo "windows_hash=$(shasum -a 256 cli/target/x86_64-pc-windows-msvc/release/gloo.exe | cut -d ' ' -f 1)" >> $GITHUB_OUTPUT
+          tar -czvf baml-linux-x86_64.tar.gz engine/baml-cli/target/x86_64-unknown-linux-gnu/release/baml
+          tar -czvf baml-apple-intel.tar.gz engine/baml-cli/target/x86_64-apple-darwin/release/baml
+          tar -czvf baml-apple-arm.tar.gz engine/baml-cli/target/aarch64-apple-darwin/release/baml
+          echo "linux_hash=$(shasum -a 256 baml-linux-x86_64.tar.gz | cut -d ' ' -f 1)" >> $GITHUB_OUTPUT
+          echo "darwin_intel_hash=$(shasum -a 256 baml-apple-intel.tar.gz | cut -d ' ' -f 1)" >> $GITHUB_OUTPUT
+          echo "darwin_arm_hash=$(shasum -a 256 baml-apple-arm.tar.gz | cut -d ' ' -f 1)" >> $GITHUB_OUTPUT
+          echo "windows_hash=$(shasum -a 256 engine/baml-cli/target/x86_64-pc-windows-msvc/release/baml.exe | cut -d ' ' -f 1)" >> $GITHUB_OUTPUT
           echo "version=$(echo $VERSION | cut -d '-' -f 1)" >> $GITHUB_OUTPUT
           echo "full_version=$VERSION" >> $GITHUB_OUTPUT
 
@@ -123,10 +124,10 @@ jobs:
         with:
           tag_name: "unstable/cli/v${{ steps.hash.outputs.version }}"
           files: |
-            gloo-linux-x86_64.tar.gz
-            gloo-apple-intel.tar.gz
-            gloo-apple-arm.tar.gz
-            cli/target/x86_64-pc-windows-msvc/release/gloo.exe
+            baml-linux-x86_64.tar.gz
+            baml-apple-intel.tar.gz
+            baml-apple-arm.tar.gz
+            engine/baml-cli/target/x86_64-pc-windows-msvc/release/baml.exe
           prerelease: true # Must manually upgrade to release once homebrew is updated.
           body: |
             ## Hashes
@@ -151,37 +152,37 @@ jobs:
       - name: Get artifact [Darwin-Intel]
         uses: actions/download-artifact@v3
         with:
-          name: gloo-Darwin-x86_64
-          path: cli/target/x86_64-apple-darwin/release/
+          name: baml-Darwin-x86_64
+          path: engine/baml-cli/target/x86_64-apple-darwin/release/
       - name: Get artifact [Darwin-Silicon]
         uses: actions/download-artifact@v3
         with:
-          name: gloo-Darwin-apple-silicon
-          path: cli/target/aarch64-apple-darwin/release/
+          name: baml-Darwin-apple-silicon
+          path: engine/baml-cli/target/aarch64-apple-darwin/release/
       - name: Get artifact [Linux]
         uses: actions/download-artifact@v3
         with:
-          name: gloo-linux-x86_64
-          path: cli/target/x86_64-unknown-linux-gnu/release/
+          name: baml-linux-x86_64
+          path: engine/baml-cli/target/x86_64-unknown-linux-gnu/release/
       - name: Get artifact [Windows]
         uses: actions/download-artifact@v3
         with:
-          name: gloo-Windows-x86_64
-          path: cli/target/x86_64-pc-windows-msvc/release/
+          name: baml-Windows-x86_64
+          path: engine/baml-cli/target/x86_64-pc-windows-msvc/release/
       - id: hash
         run: |
-          VERSION=$(cat cli/.bumpversion.cfg | grep current_version | cut -d '=' -f 2 | sed 's/[", ]//g')
+          VERSION=$(cat engine/.bumpversion.cfg | grep current_version | cut -d '=' -f 2 | sed 's/[", ]//g')
           if [[ ! $VERSION =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
             echo "Version ($VERSION) is not a release build"
             exit 1
           fi
-          tar -czvf gloo-linux-x86_64.tar.gz cli/target/x86_64-unknown-linux-gnu/release/gloo
-          tar -czvf gloo-apple-intel.tar.gz cli/target/x86_64-apple-darwin/release/gloo
-          tar -czvf gloo-apple-arm.tar.gz cli/target/aarch64-apple-darwin/release/gloo
-          echo "linux_hash=$(shasum -a 256 gloo-linux-x86_64.tar.gz | cut -d ' ' -f 1)" >> $GITHUB_OUTPUT
-          echo "darwin_intel_hash=$(shasum -a 256 gloo-apple-intel.tar.gz | cut -d ' ' -f 1)" >> $GITHUB_OUTPUT
-          echo "darwin_arm_hash=$(shasum -a 256 gloo-apple-arm.tar.gz | cut -d ' ' -f 1)" >> $GITHUB_OUTPUT
-          echo "windows_hash=$(shasum -a 256 cli/target/x86_64-pc-windows-msvc/release/gloo.exe | cut -d ' ' -f 1)" >> $GITHUB_OUTPUT
+          tar -czvf baml-linux-x86_64.tar.gz engine/baml-cli/target/x86_64-unknown-linux-gnu/release/baml
+          tar -czvf baml-apple-intel.tar.gz engine/baml-cli/target/x86_64-apple-darwin/release/baml
+          tar -czvf baml-apple-arm.tar.gz engine/baml-cli/target/aarch64-apple-darwin/release/baml
+          echo "linux_hash=$(shasum -a 256 baml-linux-x86_64.tar.gz | cut -d ' ' -f 1)" >> $GITHUB_OUTPUT
+          echo "darwin_intel_hash=$(shasum -a 256 baml-apple-intel.tar.gz | cut -d ' ' -f 1)" >> $GITHUB_OUTPUT
+          echo "darwin_arm_hash=$(shasum -a 256 baml-apple-arm.tar.gz | cut -d ' ' -f 1)" >> $GITHUB_OUTPUT
+          echo "windows_hash=$(shasum -a 256 engine/baml-cli/target/x86_64-pc-windows-msvc/release/baml.exe | cut -d ' ' -f 1)" >> $GITHUB_OUTPUT
           echo "version=$VERSION" >> $GITHUB_OUTPUT
 
       - name: Release
@@ -190,10 +191,10 @@ jobs:
           name: "Cli: ${{ steps.hash.outputs.version }}"
           tag_name: "releases/cli/v${{ steps.hash.outputs.version }}"
           files: |
-            gloo-linux-x86_64.tar.gz
-            gloo-apple-intel.tar.gz
-            gloo-apple-arm.tar.gz
-            cli/target/x86_64-pc-windows-msvc/release/gloo.exe
+            baml-linux-x86_64.tar.gz
+            baml-apple-intel.tar.gz
+            baml-apple-arm.tar.gz
+            engine/baml-cli/target/x86_64-pc-windows-msvc/release/baml.exe
           prerelease: true # Must manually upgrade to release once homebrew is updated.
           body: |
             ## Hashes
@@ -202,5 +203,5 @@ jobs:
             Mac: Apple Silicon: `${{ steps.hash.outputs.darwin_arm_hash }}`
             Windows: `${{ steps.hash.outputs.windows_hash }}`
 
-      # TODO: Create a pull request on GlooHQ/homebrew-gloo to update the version by running
+      # TODO: Create a pull request on GlooHQ/homebrew-baml to update the version by running
       # release/patch-homebrew.sh
diff --git a/.github/workflows/client_python.yml b/.github/workflows/client_python.yml
index dfa261d67..eb6b624f9 100644
--- a/.github/workflows/client_python.yml
+++ b/.github/workflows/client_python.yml
@@ -5,12 +5,12 @@ on:
     paths:
       - "clients/python/**"
     branches:
-      - canary
+      - vscode-baml-release
   push:
     paths:
       - "clients/python/.bumpversion.cfg"
     branches:
-      - canary
+      - vscode-baml-release
     tags:
       - "release/py_client/v*.*.*"
 
@@ -104,12 +104,11 @@ jobs:
             Full Build: ${{ steps.hash.outputs.full_version }}
             Tarball: ${{ steps.hash.outputs.tarball_hash }}
             Wheel: ${{ steps.hash.outputs.whl_hash }}
-     
 
       - name: Mint token
         id: mint
         uses: tschm/token-mint-action@v1.0.2
-      
+
       - name: Install Poetry
         run: |
           pipx install poetry
@@ -165,12 +164,12 @@ jobs:
       - name: Mint token
         id: mint
         uses: tschm/token-mint-action@v1.0.2
-      
+
       - name: Install Poetry
         run: |
           pipx install poetry
-  
+
       - name: Publish the package with poetry
         run: |
           poetry publish -u __token__ -p '${{ steps.mint.outputs.api-token }}'
-        working-directory: clients/python
\ No newline at end of file
+        working-directory: clients/python
diff --git a/.github/workflows/vscode_ext.yml b/.github/workflows/vscode_ext.yml
index 103afa395..03396d24d 100644
--- a/.github/workflows/vscode_ext.yml
+++ b/.github/workflows/vscode_ext.yml
@@ -1,184 +1,184 @@
-name: VSCode Extension
-
-on:
-  pull_request:
-    paths:
-      - "vscode-ext/**"
-    branches:
-      - canary
-  push:
-    paths:
-      - "vscode-ext/.bumpversion.cfg"
-    branches:
-      - canary
-    tags:
-      - "release/vscode_ext/v*.*.*"
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - uses: pnpm/action-setup@v2
-        with:
-          version: 8
-          package_json_file: vscode-ext/package.json
-          run_install: false
-
-      # Set up Node.js
-      - name: Setup Node.js
-        uses: actions/setup-node@v3
-        with:
-          cache: "pnpm"
-          node-version: 18
-          cache-dependency-path: vscode-ext/pnpm-lock.yaml
-
-      - name: Install Dependencies
-        run: pnpm install --frozen-lockfile
-        working-directory: vscode-ext/
-
-      # Build the VSCode Extension
-      - name: Build VSCode Extension
-        id: build
-        run: |
-          pnpm run vscode:package
-          VERSION=$(cat package.json| grep version | cut -d ' ' -f 4 | sed 's/[",]//g')
-          echo "version=$VERSION" >> $GITHUB_OUTPUT
-        working-directory: vscode-ext/
-
-      # Upload the artifact (helpful for debugging and manual downloads)
-      - name: Upload VSCode Extension Artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: gloo-vscode.vsix
-          path: vscode-ext/gloo-${{ steps.build.outputs.version }}.vsix
-
-  pre-release:
-    runs-on: ubuntu-latest
-    needs: build
-    if: github.ref == 'refs/heads/canary'
-    environment: nightly
-    permissions:
-      contents: write
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Get artifact
-        uses: actions/download-artifact@v3
-        with:
-          name: gloo-vscode.vsix
-          path: vscode-ext/
-
-      - id: hash
-        run: |
-          VERSION=$(cat vscode-ext/.bumpversion.cfg | grep current_version | cut -d '=' -f 2 | sed 's/[", ]//g')
-          if [[ ! $VERSION =~ ^[0-9]+\.[0-9]+\.[0-9]+-canary\.[0-9]+$ ]]; then
-            echo "Version ($VERSION) is not a pre-release build"
-            exit 1
-          fi
-
-          echo "version=$(echo $VERSION | cut -d '-' -f 1)" >> $GITHUB_OUTPUT
-          echo "full_version=$VERSION" >> $GITHUB_OUTPUT
-          echo "vsix_hash=$(shasum -a 256 vscode-ext/gloo-${echo $VERSION | cut -d '-' -f 1}.vsix | cut -d ' ' -f 1)" >> $GITHUB_OUTPUT
-
-      - name: Pre-release
-        uses: softprops/action-gh-release@v1
-        with:
-          tag_name: "unstable/vscode_ext/v${{ steps.hash.outputs.version }}"
-          files: |
-            vscode-ext/gloo-${{ steps.hash.outputs.version }}.vsix
-          prerelease: true
-          body: |
-            ## Hashes
-            Full Version: ${{ steps.hash.outputs.full_version }}
-            VSIX: ${{ steps.hash.outputs.vsix_hash }}
-
-      - uses: pnpm/action-setup@v2
-        with:
-          version: 8
-          package_json_file: vscode-ext/package.json
-          run_install: false
-
-      # Set up Node.js
-      - name: Setup Node.js
-        uses: actions/setup-node@v3
-        with:
-          cache: "pnpm"
-          node-version: 18
-          cache-dependency-path: vscode-ext/pnpm-lock.yaml
-
-      - name: Install Dependencies
-        run: pnpm install --frozen-lockfile
-        working-directory: vscode-ext/
-
-      - name: Publish
-        run: |
-          pnpm run vscode:publish --pre-release --no-git-tag-version -p ${{ secrets.VSCODE_PAT }}
-        working-directory: vscode-ext/
-
-  release:
-    permissions:
-      contents: write
-    runs-on: ubuntu-latest
-    needs: build
-    if: startsWith(github.ref, 'refs/tags/release/')
-    environment: release
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Get artifact
-        uses: actions/download-artifact@v3
-        with:
-          name: gloo-vscode
-          path: vscode-ext/
-
-      - id: hash
-        run: |
-          VERSION=$(cat vscode-ext/.bumpversion.cfg | grep current_version | cut -d '=' -f 2 | sed 's/[", ]//g')
-          if [[ ! $VERSION =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
-            echo "Version ($VERSION) is not a release build"
-            exit 1
-          fi
-          echo "version=$VERSION" >> $GITHUB_OUTPUT
-          echo "vsix_hash=$(shasum -a 256 vscode-ext/gloo-${VERSION}.vsix | cut -d ' ' -f 1)" >> $GITHUB_OUTPUT
-
-      - name: Release
-        uses: softprops/action-gh-release@v1
-        with:
-          tag_name: "release/vscode_ext/v${{ steps.hash.outputs.version }}"
-          files: |
-            vscode-ext/gloo-${{ steps.hash.outputs.version }}.vsix
-          prerelease: true
-          body: |
-            ## Hashes
-            VSIX: ${{ steps.hash.outputs.vsix_hash }}
-
-      - uses: pnpm/action-setup@v2
-        with:
-          version: 8
-          package_json_file: vscode-ext/package.json
-          run_install: false
-
-      # Set up Node.js
-      - name: Setup Node.js
-        uses: actions/setup-node@v3
-        with:
-          cache: "pnpm"
-          node-version: 18
-          cache-dependency-path: vscode-ext/pnpm-lock.yaml
-
-      - name: Install Dependencies
-        run: pnpm install --frozen-lockfile
-        working-directory: vscode-ext/
-
-      - name: Publish
-        run: |
-          pnpm run vscode:publish --no-git-tag-version -p ${{ secrets.VSCODE_PAT }}
-        working-directory: vscode-ext/
+# name: VSCode Extension
+
+# on:
+#   pull_request:
+#     paths:
+#       - "vscode-ext/**"
+#     branches:
+#       - vscode-baml-release
+#   push:
+#     paths:
+#       - "vscode-ext/.bumpversion.cfg"
+#     branches:
+#       - vscode-baml-release
+#     tags:
+#       - "release/vscode_ext/v*.*.*"
+
+# jobs:
+#   build:
+#     runs-on: ubuntu-latest
+
+#     steps:
+#       - name: Checkout code
+#         uses: actions/checkout@v4
+
+#       - uses: pnpm/action-setup@v2
+#         with:
+#           version: 8
+#           package_json_file: vscode-ext/package.json
+#           run_install: false
+
+#       # Set up Node.js
+#       - name: Setup Node.js
+#         uses: actions/setup-node@v3
+#         with:
+#           cache: "pnpm"
+#           node-version: 18
+#           cache-dependency-path: vscode-ext/pnpm-lock.yaml
+
+#       - name: Install Dependencies
+#         run: pnpm install --frozen-lockfile
+#         working-directory: vscode-ext/
+
+#       # Build the VSCode Extension
+#       - name: Build VSCode Extension
+#         id: build
+#         run: |
+#           pnpm run vscode:package
+#           VERSION=$(cat package.json| grep version | cut -d ' ' -f 4 | sed 's/[",]//g')
+#           echo "version=$VERSION" >> $GITHUB_OUTPUT
+#         working-directory: vscode-ext/
+
+#       # Upload the artifact (helpful for debugging and manual downloads)
+#       - name: Upload VSCode Extension Artifact
+#         uses: actions/upload-artifact@v3
+#         with:
+#           name: gloo-vscode.vsix
+#           path: vscode-ext/gloo-${{ steps.build.outputs.version }}.vsix
+
+#   pre-release:
+#     runs-on: ubuntu-latest
+#     needs: build
+#     if: github.ref == 'refs/heads/canary'
+#     environment: nightly
+#     permissions:
+#       contents: write
+
+#     steps:
+#       - name: Checkout code
+#         uses: actions/checkout@v4
+
+#       - name: Get artifact
+#         uses: actions/download-artifact@v3
+#         with:
+#           name: gloo-vscode.vsix
+#           path: vscode-ext/
+
+#       - id: hash
+#         run: |
+#           VERSION=$(cat vscode-ext/.bumpversion.cfg | grep current_version | cut -d '=' -f 2 | sed 's/[", ]//g')
+#           if [[ ! $VERSION =~ ^[0-9]+\.[0-9]+\.[0-9]+-canary\.[0-9]+$ ]]; then
+#             echo "Version ($VERSION) is not a pre-release build"
+#             exit 1
+#           fi
+
+#           echo "version=$(echo $VERSION | cut -d '-' -f 1)" >> $GITHUB_OUTPUT
+#           echo "full_version=$VERSION" >> $GITHUB_OUTPUT
+#           echo "vsix_hash=$(shasum -a 256 vscode-ext/gloo-${echo $VERSION | cut -d '-' -f 1}.vsix | cut -d ' ' -f 1)" >> $GITHUB_OUTPUT
+
+#       - name: Pre-release
+#         uses: softprops/action-gh-release@v1
+#         with:
+#           tag_name: "unstable/vscode_ext/v${{ steps.hash.outputs.version }}"
+#           files: |
+#             vscode-ext/gloo-${{ steps.hash.outputs.version }}.vsix
+#           prerelease: true
+#           body: |
+#             ## Hashes
+#             Full Version: ${{ steps.hash.outputs.full_version }}
+#             VSIX: ${{ steps.hash.outputs.vsix_hash }}
+
+#       - uses: pnpm/action-setup@v2
+#         with:
+#           version: 8
+#           package_json_file: vscode-ext/package.json
+#           run_install: false
+
+#       # Set up Node.js
+#       - name: Setup Node.js
+#         uses: actions/setup-node@v3
+#         with:
+#           cache: "pnpm"
+#           node-version: 18
+#           cache-dependency-path: vscode-ext/pnpm-lock.yaml
+
+#       - name: Install Dependencies
+#         run: pnpm install --frozen-lockfile
+#         working-directory: vscode-ext/
+
+#       - name: Publish
+#         run: |
+#           pnpm run vscode:publish --pre-release --no-git-tag-version -p ${{ secrets.VSCODE_PAT }}
+#         working-directory: vscode-ext/
+
+#   release:
+#     permissions:
+#       contents: write
+#     runs-on: ubuntu-latest
+#     needs: build
+#     if: startsWith(github.ref, 'refs/tags/release/')
+#     environment: release
+
+#     steps:
+#       - name: Checkout code
+#         uses: actions/checkout@v4
+
+#       - name: Get artifact
+#         uses: actions/download-artifact@v3
+#         with:
+#           name: gloo-vscode
+#           path: vscode-ext/
+
+#       - id: hash
+#         run: |
+#           VERSION=$(cat vscode-ext/.bumpversion.cfg | grep current_version | cut -d '=' -f 2 | sed 's/[", ]//g')
+#           if [[ ! $VERSION =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+#             echo "Version ($VERSION) is not a release build"
+#             exit 1
+#           fi
+#           echo "version=$VERSION" >> $GITHUB_OUTPUT
+#           echo "vsix_hash=$(shasum -a 256 vscode-ext/gloo-${VERSION}.vsix | cut -d ' ' -f 1)" >> $GITHUB_OUTPUT
+
+#       - name: Release
+#         uses: softprops/action-gh-release@v1
+#         with:
+#           tag_name: "release/vscode_ext/v${{ steps.hash.outputs.version }}"
+#           files: |
+#             vscode-ext/gloo-${{ steps.hash.outputs.version }}.vsix
+#           prerelease: true
+#           body: |
+#             ## Hashes
+#             VSIX: ${{ steps.hash.outputs.vsix_hash }}
+
+#       - uses: pnpm/action-setup@v2
+#         with:
+#           version: 8
+#           package_json_file: vscode-ext/package.json
+#           run_install: false
+
+#       # Set up Node.js
+#       - name: Setup Node.js
+#         uses: actions/setup-node@v3
+#         with:
+#           cache: "pnpm"
+#           node-version: 18
+#           cache-dependency-path: vscode-ext/pnpm-lock.yaml
+
+#       - name: Install Dependencies
+#         run: pnpm install --frozen-lockfile
+#         working-directory: vscode-ext/
+
+#       - name: Publish
+#         run: |
+#           pnpm run vscode:publish --no-git-tag-version -p ${{ secrets.VSCODE_PAT }}
+#         working-directory: vscode-ext/
diff --git a/client-tests/test1/python/poetry.lock b/client-tests/test1/python/poetry.lock
index 58638e6d4..0dd4ea5df 100644
--- a/client-tests/test1/python/poetry.lock
+++ b/client-tests/test1/python/poetry.lock
@@ -205,6 +205,36 @@ docs = ["furo", "myst-parser", "sphinx", "sphinx-notfound-page", "sphinxcontrib-
 tests = ["attrs[tests-no-zope]", "zope-interface"]
 tests-no-zope = ["cloudpickle", "hypothesis", "mypy (>=1.1.1)", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "pytest-xdist[psutil]"]
 
+[[package]]
+name = "baml"
+version = "0.1.0"
+description = ""
+optional = false
+python-versions = "^3.8"
+files = []
+develop = true
+
+[package.dependencies]
+aiohttp = "^3.8.5"
+anthropic = "^0.3.11"
+colorama = "^0.4.6"
+coloredlogs = "^15.0.1"
+json5 = "^0.9.14"
+openai = ">=0.27.9"
+opentelemetry-api = "^1.20.0"
+opentelemetry-instrumentation = "^0.41b0"
+opentelemetry-sdk = "^1.20.0"
+pydantic = "^2.3.0"
+pytest = "^7.4.2"
+pytest-asyncio = "^0.21.1"
+python-dotenv = "^1.0.0"
+typeguard = "^4.1.5"
+types-requests = "^2.31.0.2"
+
+[package.source]
+type = "directory"
+url = "../../../clients/python"
+
 [[package]]
 name = "certifi"
 version = "2023.7.22"
@@ -506,36 +536,6 @@ smb = ["smbprotocol"]
 ssh = ["paramiko"]
 tqdm = ["tqdm"]
 
-[[package]]
-name = "gloo-lib"
-version = "1.3.0.dev4"
-description = ""
-optional = false
-python-versions = "^3.8"
-files = []
-develop = true
-
-[package.dependencies]
-aiohttp = "^3.8.5"
-anthropic = "^0.3.11"
-colorama = "^0.4.6"
-coloredlogs = "^15.0.1"
-json5 = "^0.9.14"
-openai = ">=0.27.9"
-opentelemetry-api = "^1.20.0"
-opentelemetry-instrumentation = "^0.41b0"
-opentelemetry-sdk = "^1.20.0"
-pydantic = "^2.3.0"
-pytest = "^7.4.2"
-pytest-asyncio = "^0.21.1"
-python-dotenv = "^1.0.0"
-typeguard = "^4.1.5"
-types-requests = "^2.31.0.2"
-
-[package.source]
-type = "directory"
-url = "../../../clients/python"
-
 [[package]]
 name = "h11"
 version = "0.14.0"
@@ -1634,4 +1634,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.8"
-content-hash = "6861a9b34fb54167975f6b844903ca81de25c544f55878a9a8fc7367ba7823ca"
+content-hash = "54a4186ea3b275dd5c32d31411573bb1246ceb5bcb784bf64fc641ebd79d005f"
diff --git a/client-tests/test1/python/pyproject.toml b/client-tests/test1/python/pyproject.toml
index 448b16d99..4f3fd7b50 100644
--- a/client-tests/test1/python/pyproject.toml
+++ b/client-tests/test1/python/pyproject.toml
@@ -7,7 +7,7 @@ readme = "README.md"
 
 [tool.poetry.dependencies]
 python = "^3.8"
-gloo-lib = { path = "../../../clients/python", develop = true }
+baml = { path = "../../../clients/python", develop = true }
 mypy = "^1.5.1"
 
 [build-system]
diff --git a/clients/python/pyproject.toml b/clients/python/pyproject.toml
index a48c1926c..e81b19442 100644
--- a/clients/python/pyproject.toml
+++ b/clients/python/pyproject.toml
@@ -3,27 +3,11 @@ requires = [ "poetry-core",]
 build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
-name = "gloo-lib"
-version = "1.3.0.dev4"
+name = "baml"
+version = "0.1.0"
 description = ""
 authors = [ "Gloo <contact@trygloo.com>",]
 
-[[tool.poetry.packages]]
-include = "gloo_py"
-from = "."
-
-[[tool.poetry.packages]]
-include = "gloo_stringify"
-from = "."
-
-[[tool.poetry.packages]]
-include = "gloo_internal"
-from = "."
-
-[[tool.poetry.packages]]
-include = "gloo_testing"
-from = "."
-
 [[tool.poetry.packages]]
 include = "baml_core"
 from = "."
diff --git a/engine/.bumpversion.cfg b/engine/.bumpversion.cfg
new file mode 100644
index 000000000..f87a86a64
--- /dev/null
+++ b/engine/.bumpversion.cfg
@@ -0,0 +1,19 @@
+[bumpversion]
+current_version = 0.2.0-canary.1
+commit = False
+tag = False
+parse = ^(?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(?:-(?P<pre>canary)\.(?P<prerelease>\d+))?$
+serialize = 
+	{major}.{minor}.{patch}-{pre}.{prerelease}
+	{major}.{minor}.{patch}
+
+[bumpversion:part:pre]
+first_value = canary
+optional_value = release
+values = 
+	canary
+	release
+
+[bumpversion:file:Cargo.toml]
+
+[bumpversion:file:Cargo.lock]
diff --git a/engine/Cargo.lock b/engine/Cargo.lock
index d4a3b0d84..5a5611f7e 100644
--- a/engine/Cargo.lock
+++ b/engine/Cargo.lock
@@ -137,13 +137,13 @@ dependencies = [
 ]
 
 [[package]]
-name = "baml-cli"
+name = "baml"
 version = "0.0.1"
 dependencies = [
  "baml-lib",
  "base64 0.13.1",
  "check-latest",
- "clap 4.4.6",
+ "clap 4.4.7",
  "colored",
  "dissimilar",
  "either",
@@ -206,9 +206,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
 [[package]]
 name = "base64"
-version = "0.21.4"
+version = "0.21.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2"
+checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9"
 
 [[package]]
 name = "bitflags"
@@ -218,9 +218,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.4.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "block-buffer"
@@ -303,9 +303,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.4.6"
+version = "4.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956"
+checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -313,9 +313,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.4.6"
+version = "4.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45"
+checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663"
 dependencies = [
  "anstream",
  "anstyle",
@@ -325,9 +325,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.4.2"
+version = "4.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873"
+checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442"
 dependencies = [
  "heck 0.4.1",
  "proc-macro2",
@@ -337,9 +337,9 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.5.1"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961"
+checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"
 
 [[package]]
 name = "colorchoice"
@@ -376,9 +376,9 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.9"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1"
+checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0"
 dependencies = [
  "libc",
 ]
@@ -539,57 +539,45 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"
+checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb"
 dependencies = [
  "futures-core",
 ]
 
 [[package]]
 name = "futures-core"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
+checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c"
 
 [[package]]
 name = "futures-io"
-version = "0.3.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
-
-[[package]]
-name = "futures-macro"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.38",
-]
+checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa"
 
 [[package]]
 name = "futures-sink"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"
+checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817"
 
 [[package]]
 name = "futures-task"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
+checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2"
 
 [[package]]
 name = "futures-util"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
+checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104"
 dependencies = [
  "futures-core",
  "futures-io",
- "futures-macro",
  "futures-task",
  "memchr",
  "pin-project-lite",
@@ -607,6 +595,17 @@ dependencies = [
  "version_check",
 ]
 
+[[package]]
+name = "getrandom"
+version = "0.2.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
 [[package]]
 name = "gimli"
 version = "0.28.0"
@@ -660,9 +659,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.1"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 
 [[package]]
 name = "heck"
@@ -751,7 +750,7 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2 0.4.9",
+ "socket2 0.4.10",
  "tokio",
  "tower-service",
  "tracing",
@@ -760,9 +759,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-rustls"
-version = "0.24.1"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97"
+checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590"
 dependencies = [
  "futures-util",
  "http",
@@ -774,16 +773,16 @@ dependencies = [
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.57"
+version = "0.1.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613"
+checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
  "iana-time-zone-haiku",
  "js-sys",
  "wasm-bindgen",
- "windows",
+ "windows-core",
 ]
 
 [[package]]
@@ -817,12 +816,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.0.2"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897"
+checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.1",
+ "hashbrown 0.14.2",
 ]
 
 [[package]]
@@ -912,9 +911,9 @@ dependencies = [
 
 [[package]]
 name = "ipnet"
-version = "2.8.0"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6"
+checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
 
 [[package]]
 name = "is-terminal"
@@ -1021,9 +1020,9 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.8.8"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
+checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0"
 dependencies = [
  "libc",
  "wasi",
@@ -1095,9 +1094,9 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
 
 [[package]]
 name = "pest"
-version = "2.7.4"
+version = "2.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c022f1e7b65d6a24c0dbbd5fb344c66881bc01f3e5ae74a1c8100f2f985d98a4"
+checksum = "ae9cee2a55a544be8b89dc6848072af97a20f2422603c10865be2a42b580fff5"
 dependencies = [
  "memchr",
  "thiserror",
@@ -1106,9 +1105,9 @@ dependencies = [
 
 [[package]]
 name = "pest_derive"
-version = "2.7.4"
+version = "2.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35513f630d46400a977c4cb58f78e1bfbe01434316e60c37d27b9ad6139c66d8"
+checksum = "81d78524685f5ef2a3b3bd1cafbc9fcabb036253d9b1463e726a91cd16e2dfc2"
 dependencies = [
  "pest",
  "pest_generator",
@@ -1116,9 +1115,9 @@ dependencies = [
 
 [[package]]
 name = "pest_generator"
-version = "2.7.4"
+version = "2.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc9fc1b9e7057baba189b5c626e2d6f40681ae5b6eb064dc7c7834101ec8123a"
+checksum = "68bd1206e71118b5356dae5ddc61c8b11e28b09ef6a31acbd15ea48a28e0c227"
 dependencies = [
  "pest",
  "pest_meta",
@@ -1129,9 +1128,9 @@ dependencies = [
 
 [[package]]
 name = "pest_meta"
-version = "2.7.4"
+version = "2.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1df74e9e7ec4053ceb980e7c0c8bd3594e977fde1af91daba9c928e8e8c6708d"
+checksum = "7c747191d4ad9e4a4ab9c8798f1e82a39affe7ef9648390b7e5548d18e099de6"
 dependencies = [
  "once_cell",
  "pest",
@@ -1327,7 +1326,7 @@ version = "0.11.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b"
 dependencies = [
- "base64 0.21.4",
+ "base64 0.21.5",
  "bytes",
  "encoding_rs",
  "futures-core",
@@ -1363,17 +1362,16 @@ dependencies = [
 
 [[package]]
 name = "ring"
-version = "0.16.20"
+version = "0.17.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
+checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b"
 dependencies = [
  "cc",
+ "getrandom",
  "libc",
- "once_cell",
  "spin",
  "untrusted",
- "web-sys",
- "winapi",
+ "windows-sys",
 ]
 
 [[package]]
@@ -1394,7 +1392,7 @@ version = "0.38.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3"
 dependencies = [
- "bitflags 2.4.0",
+ "bitflags 2.4.1",
  "errno",
  "libc",
  "linux-raw-sys",
@@ -1403,9 +1401,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.21.7"
+version = "0.21.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8"
+checksum = "446e14c5cda4f3f30fe71863c34ec70f5ac79d6087097ad0bb433e1be5edf04c"
 dependencies = [
  "log",
  "ring",
@@ -1419,14 +1417,14 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2"
 dependencies = [
- "base64 0.21.4",
+ "base64 0.21.5",
 ]
 
 [[package]]
 name = "rustls-webpki"
-version = "0.101.6"
+version = "0.101.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe"
+checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765"
 dependencies = [
  "ring",
  "untrusted",
@@ -1446,9 +1444,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "sct"
-version = "0.7.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"
+checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414"
 dependencies = [
  "ring",
  "untrusted",
@@ -1465,18 +1463,18 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.189"
+version = "1.0.190"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537"
+checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.189"
+version = "1.0.190"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5"
+checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1485,11 +1483,11 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.107"
+version = "1.0.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65"
+checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
 dependencies = [
- "indexmap 2.0.2",
+ "indexmap 2.1.0",
  "itoa",
  "ryu",
  "serde",
@@ -1497,9 +1495,9 @@ dependencies = [
 
 [[package]]
 name = "serde_repr"
-version = "0.1.16"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00"
+checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1552,9 +1550,9 @@ checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c"
 
 [[package]]
 name = "socket2"
-version = "0.4.9"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"
+checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d"
 dependencies = [
  "libc",
  "winapi",
@@ -1562,9 +1560,9 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.5.4"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e"
+checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
 dependencies = [
  "libc",
  "windows-sys",
@@ -1572,9 +1570,9 @@ dependencies = [
 
 [[package]]
 name = "spin"
-version = "0.5.2"
+version = "0.9.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
 
 [[package]]
 name = "strip-ansi-escapes"
@@ -1701,18 +1699,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.49"
+version = "1.0.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4"
+checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.49"
+version = "1.0.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc"
+checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1746,7 +1744,7 @@ dependencies = [
  "mio",
  "num_cpus",
  "pin-project-lite",
- "socket2 0.5.4",
+ "socket2 0.5.5",
  "windows-sys",
 ]
 
@@ -1762,9 +1760,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.9"
+version = "0.7.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d"
+checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15"
 dependencies = [
  "bytes",
  "futures-core",
@@ -1782,9 +1780,9 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
 
 [[package]]
 name = "tracing"
-version = "0.1.39"
+version = "0.1.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee2ef2af84856a50c1d430afce2fdded0a4ec7eda868db86409b4543df0797f9"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
 dependencies = [
  "pin-project-lite",
  "tracing-core",
@@ -1864,9 +1862,9 @@ checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce"
 
 [[package]]
 name = "untrusted"
-version = "0.7.1"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "url"
@@ -2068,10 +2066,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
-name = "windows"
-version = "0.48.0"
+name = "windows-core"
+version = "0.51.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
+checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64"
 dependencies = [
  "windows-targets",
 ]
diff --git a/engine/Cargo.toml b/engine/Cargo.toml
index 6bd1e716e..37ce023b8 100644
--- a/engine/Cargo.toml
+++ b/engine/Cargo.toml
@@ -12,6 +12,7 @@ serde_json = { version = "1", features = ["float_roundtrip", "preserve_order"] }
 serde = { version = "1", features = ["derive"] }
 indoc = "2.0.1"
 
+# 
 [workspace.package]
 version = "0.0.1"
 authors = ["Gloo <contact@trygloo.com>"]
diff --git a/engine/LICENCE b/engine/LICENSE
similarity index 100%
rename from engine/LICENCE
rename to engine/LICENSE
diff --git a/engine/baml-cli/Cargo.toml b/engine/baml-cli/Cargo.toml
index eb23dfb59..2b6fdd930 100644
--- a/engine/baml-cli/Cargo.toml
+++ b/engine/baml-cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 edition = "2021"
-name = "baml-cli"
+name = "baml"
 version.workspace = true
 authors.workspace = true
 description.workspace = true
diff --git a/release/package.sh b/release/package.sh
index 3940c96b0..39e6f31be 100755
--- a/release/package.sh
+++ b/release/package.sh
@@ -5,5 +5,5 @@ set -x
 # cd into target/release from the current dir
 cargo build --release
 cd ./target/release
-tar -czvf gloo.tar.gz gloo
-echo $(shasum -a 256 "gloo.tar.gz")
\ No newline at end of file
+tar -czvf baml.tar.gz baml
+echo $(shasum -a 256 "baml.tar.gz")
\ No newline at end of file