diff --git a/.github/workflows/go-backend-deploy.yml b/.github/workflows/go-function-deploy.yml
similarity index 64%
rename from .github/workflows/go-backend-deploy.yml
rename to .github/workflows/go-function-deploy.yml
index 14397f36d..036de3b58 100644
--- a/.github/workflows/go-backend-deploy.yml
+++ b/.github/workflows/go-function-deploy.yml
@@ -1,11 +1,11 @@
-name: Go Backend Deploy
+name: Go Function Deploy
 
 on:
   push:
     branches: [master]
     paths:
-      - 'backend-go/**'
-      - '.github/workflows/go-backend-deploy.yml'
+      - 'functions/go/**'
+      - '.github/workflows/go-function-deploy.yml'
   workflow_dispatch:
 
 jobs:
@@ -22,8 +22,8 @@ jobs:
           go-version: '1.22'
 
       - name: Build Go service
-        working-directory: backend-go
+        working-directory: functions/go
         run: go build ./cmd/api
 
       - name: Deploy placeholder
-        run: echo "Deploy the Go backend binary to AWS Lambda or ECS from this step."
+        run: echo "Deploy the Go function to AWS Lambda from this step."
diff --git a/.github/workflows/python-backend-deploy.yml b/.github/workflows/python-function-deploy.yml
similarity index 56%
rename from .github/workflows/python-backend-deploy.yml
rename to .github/workflows/python-function-deploy.yml
index b4bb1dd55..9e2eb99b4 100644
--- a/.github/workflows/python-backend-deploy.yml
+++ b/.github/workflows/python-function-deploy.yml
@@ -1,11 +1,11 @@
-name: Python Backend Deploy
+name: Python Function Deploy
 
 on:
   push:
     branches: [master]
     paths:
-      - 'backend-python/**'
-      - '.github/workflows/python-backend-deploy.yml'
+      - 'functions/python/**'
+      - '.github/workflows/python-function-deploy.yml'
   workflow_dispatch:
 
 jobs:
@@ -22,8 +22,8 @@ jobs:
           python-version: '3.11'
 
       - name: Install dependencies
-        working-directory: backend-python
-        run: pip install -r requirements.txt
+        working-directory: functions/python
+        run: pip3 install -r requirements.txt
 
       - name: Deploy placeholder
-        run: echo "Deploy the Python API to AWS Lambda with Mangum from this step."
+        run: echo "Deploy the Python function to AWS Lambda with Mangum from this step."
diff --git a/.github/workflows/rust-backend-deploy.yml b/.github/workflows/rust-function-deploy.yml
similarity index 88%
rename from .github/workflows/rust-backend-deploy.yml
rename to .github/workflows/rust-function-deploy.yml
index c1486560a..6fa6a8ba0 100644
--- a/.github/workflows/rust-backend-deploy.yml
+++ b/.github/workflows/rust-function-deploy.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches: [master]
     paths:
-      - 'backend-rust/**'
+      - 'functions/rust/**'
       - '.github/workflows/rust-backend-deploy.yml'
   workflow_dispatch:
 
@@ -20,7 +20,7 @@ jobs:
         uses: dtolnay/rust-toolchain@stable
 
       - name: Build Rust service
-        working-directory: backend-rust
+        working-directory: functions/rust
         run: cargo build --release
 
       - name: Deploy placeholder
diff --git a/.github/workflows/test-pipeline-deploy.yml b/.github/workflows/test-pipeline-deploy.yml
index 073adab58..184be6876 100644
--- a/.github/workflows/test-pipeline-deploy.yml
+++ b/.github/workflows/test-pipeline-deploy.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches: [master]
     paths:
-      - 'pipeline-testing/**'
+      - 'tests/**'
       - '.github/workflows/test-pipeline-deploy.yml'
   workflow_dispatch:
 
@@ -22,9 +22,9 @@ jobs:
           python-version: '3.11'
 
       - name: Install test dependencies
-        working-directory: pipeline-testing
-        run: pip install -r requirements-test.txt
+        working-directory: tests/integration
+        run: pip3 install -r requirements-test.txt
 
       - name: Run test pipeline placeholder
-        working-directory: pipeline-testing
-        run: python src/test_runner.py
+        working-directory: tests/integration/integration_tests
+        run: python3 test_placeholder.py