diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index eccaa9c..51ae427 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -44,38 +44,36 @@ jobs:
     steps:
       - name: Checkout trustless-generic-relayer
         uses: actions/checkout@v3
-        with:
-          path: trustless-generic-relayer
       - name: Checkout wormhole
         uses: actions/checkout@v3
         with:
           repository: wormhole-foundation/wormhole
-          path: trustless-generic-relayer/ethereum/wormhole
+          path: ethereum/wormhole
           ref: feat/batch_vaa_alternative
       - uses: actions/setup-node@v3
         with:
           node-version: 18
           cache: "npm"
           cache-dependency-path: |
-            trustless-generic-relayer/ethereum/package-lock.json
-            trustless-generic-relayer/ethereum/wormhole/ethereum/package-lock.json
-            trustless-generic-relayer/relayer_engine/package-lock.json
-            trustless-generic-relayer/sdk/package-lock.json
+            ethereum/package-lock.json
+            ethereum/wormhole/ethereum/package-lock.json
+            relayer_engine/package-lock.json
+            sdk/package-lock.json
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1
       - name: Generate contract typechain typings
         run: |
-          cd trustless-generic-relayer/ethereum
+          cd ethereum
           make build
-      - run: cd trustless-generic-relayer/sdk && npm ci
+      - run: cd sdk && npm ci
       - name: Typecheck ethereum/ts-scripts
         run: |
-          cd trustless-generic-relayer/ethereum
+          cd ethereum
           npm ci
           npx tsc --noEmit --project ts-scripts
       - name: Typecheck relayer engine plugin
         run: |
-          cd trustless-generic-relayer/relayer_engine
+          cd relayer_engine
           npm ci
           npx tsc --noEmit --project tsconfig.json
 
@@ -84,32 +82,30 @@ jobs:
     steps:
       - name: Checkout trustless-generic-relayer
         uses: actions/checkout@v3
-        with:
-          path: trustless-generic-relayer
       - name: Checkout wormhole
         uses: actions/checkout@v3
         with:
           repository: wormhole-foundation/wormhole
-          path: trustless-generic-relayer/ethereum/wormhole
+          path: ethereum/wormhole
           ref: feat/batch_vaa_alternative
       - uses: actions/setup-node@v3
         with:
           node-version: 18
           cache: "npm"
           cache-dependency-path: |
-            trustless-generic-relayer/ethereum/package-lock.json
-            trustless-generic-relayer/ethereum/wormhole/ethereum/package-lock.json
-            trustless-generic-relayer/relayer_engine/package-lock.json
-            trustless-generic-relayer/sdk/package-lock.json
+            ethereum/package-lock.json
+            ethereum/wormhole/ethereum/package-lock.json
+            relayer_engine/package-lock.json
+            sdk/package-lock.json
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1
       - name: Generate contract typechain typings
         run: |
-          cd trustless-generic-relayer/ethereum
+          cd ethereum
           make build
-      - name: Typecheck relayer engine plugin
+      - name: Install relayer engine dependencies
         run: |
-          cd trustless-generic-relayer/relayer_engine
+          cd relayer_engine
           npm ci
 
       - name: Log in to the Container registry
@@ -128,7 +124,7 @@ jobs:
       - name: Build and push Docker image
         uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
         with:
-          context: trustless-generic-relayer/relayer_engine
+          context: relayer_engine
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}