diff --git a/.github/workflows/pipeline.yaml b/.github/workflows/pipeline.yaml
index 5e141ed..7289c33 100644
--- a/.github/workflows/pipeline.yaml
+++ b/.github/workflows/pipeline.yaml
@@ -33,6 +33,13 @@ jobs:
 
       - run: npm run test --workspace=@lumiere/${{ matrix.lambdaFunction }}
 
+      - name: Check if build directory exists
+        run: |
+          if [ ! -d "./build/${{ matrix.lambdaFunction }}" ]; then
+            echo "❌ Directory ./build/${{ matrix.lambdaFunction }} does not exist! Build step likely failed."
+            exit 1
+          fi
+
       - uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.lambdaFunction }}-build-artifact
@@ -51,6 +58,13 @@ jobs:
         with:
           name: ${{ matrix.lambdaFunction }}-build-artifact
 
+      - name: Check if dist directory exists
+        run: |
+          if [ ! -d "./build/${{ matrix.lambdaFunction }}/dist" ]; then
+            echo "❌ Directory ./build/${{ matrix.lambdaFunction }}/dist does not exist! Likely build artifact is incomplete."
+            exit 1
+          fi
+
       - name: Package Lambda
         run: |
           cd ./build/${{ matrix.lambdaFunction }}/dist
diff --git a/api/storageUrl/package.json b/api/storageUrl/package.json
index 3abd316..28f37c3 100644
--- a/api/storageUrl/package.json
+++ b/api/storageUrl/package.json
@@ -4,11 +4,11 @@
   "main": "index.js",
   "scripts": {
     "test": "npx jest --passWithNoTests",
-    "prebuild": "rm -rf dist",
+    "prebuild": "rm -rf ../../build/storage-url/dist",
     "build": "tsc -p tsconfig.json",
-    "postbuild": "cp package.json ./dist/",
-    "prepackage": "npm install --omit=dev && cp -rL ../../node_modules/. ./dist/node_modules",
-    "package": "cd ./dist && zip -q -r ../../../infra/artifacts/storageUrl.zip .",
+    "postbuild": "cp package.json ../../build/storage-url/dist/",
+    "prepackage": "npm install --omit=dev && cp -rL ../../node_modules/. ../../build/storage-url/dist/node_modules",
+    "package": "cd ../../build/storage-url/dist && zip -q -r ../../../../../infra/artifacts/storageUrl.zip .",
     "postpackage": "rm -rf ../../node_modules"
   },
   "dependencies": {
@@ -16,6 +16,4 @@
     "aws-lambda": "^1.0.7",
     "bs-logger": "^0.2.6"
   }
-}
-
-
+}
\ No newline at end of file
diff --git a/api/storageUrl/tsconfig.json b/api/storageUrl/tsconfig.json
index 637fb2b..faf0289 100644
--- a/api/storageUrl/tsconfig.json
+++ b/api/storageUrl/tsconfig.json
@@ -1,9 +1,9 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "outDir": "dist",
-    "rootDir": "src"
-  },
+  "outDir": "../../build/storage-url/dist",
+  "rootDir": "src"
+},
   "include": [
     "src"
   ],
diff --git a/api/userRecords/package.json b/api/userRecords/package.json
index 44e11c1..df69351 100644
--- a/api/userRecords/package.json
+++ b/api/userRecords/package.json
@@ -4,11 +4,11 @@
   "main": "index.js",
   "scripts": {
     "test": "npx jest --passWithNoTests",
-    "prebuild": "rm -rf dist",
+    "prebuild": "rm -rf ../../build/user-records/dist",
     "build": "tsc -p tsconfig.json",
-    "postbuild": "cp package.json ./dist/",
-    "prepackage": "npm install --omit=dev && cp -rL ../../node_modules/. ./dist/node_modules",
-    "package": "cd ./dist && zip -q -r ../../../infra/artifacts/userRecords.zip .",
+    "postbuild": "cp package.json ../../build/user-records/dist/",
+    "prepackage": "npm install --omit=dev && cp -rL ../../node_modules/. ../../build/user-records/dist/node_modules",
+    "package": "cd ../../build/user-records/dist && zip -q -r ../../../../../infra/artifacts/userRecords.zip .",
     "postpackage": "rm -rf ../../node_modules"
   },
   "dependencies": {
@@ -16,6 +16,4 @@
     "aws-lambda": "^1.0.7",
     "bs-logger": "^0.2.6"
   }
-}
-
-
+}
\ No newline at end of file
diff --git a/api/userRecords/tsconfig.json b/api/userRecords/tsconfig.json
index 637fb2b..0d08d2c 100644
--- a/api/userRecords/tsconfig.json
+++ b/api/userRecords/tsconfig.json
@@ -1,15 +1,9 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "outDir": "dist",
+    "outDir": "../../build/user-records/dist",
     "rootDir": "src"
   },
-  "include": [
-    "src"
-  ],
-  "exclude": [
-    "dist",
-    "*.config.ts",
-    "**/*.test.ts"
-  ]
+  "include": ["src"],
+  "exclude": ["dist", "*.config.ts", "**/*.test.ts"]
 }
diff --git a/auth/authorizer/package.json b/auth/authorizer/package.json
index 6f642a9..792997b 100644
--- a/auth/authorizer/package.json
+++ b/auth/authorizer/package.json
@@ -4,11 +4,11 @@
   "main": "index.js",
   "scripts": {
     "test": "npx jest --passWithNoTests",
-    "prebuild": "rm -rf dist",
+    "prebuild": "rm -rf ../../build/authorizer/dist",
     "build": "tsc -p tsconfig.json",
-    "postbuild": "cp package.json ./dist/",
-    "prepackage": "npm install --omit=dev && cp -rL ../../node_modules/. ./dist/node_modules",
-    "package": "cd ./dist && zip -q -r ../../../infra/artifacts/authorizer.zip .",
+    "postbuild": "cp package.json ../../build/authorizer/dist/",
+    "prepackage": "npm install --omit=dev && cp -rL ../../node_modules/. ../../build/authorizer/dist/node_modules",
+    "package": "cd ../../build/authorizer/dist && zip -q -r ../../../../../infra/artifacts/authorizer.zip .",
     "postpackage": "rm -rf ../../node_modules"
   },
   "dependencies": {
diff --git a/auth/authorizer/tsconfig.json b/auth/authorizer/tsconfig.json
index 637fb2b..ac39c0b 100644
--- a/auth/authorizer/tsconfig.json
+++ b/auth/authorizer/tsconfig.json
@@ -1,8 +1,8 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "outDir": "dist",
-    "rootDir": "src"
+  "outDir": "../../build/authorizer/dist",
+  "rootDir": "src"
   },
   "include": [
     "src"
diff --git a/auth/signIn/package.json b/auth/signIn/package.json
index 1eeccac..e45f535 100644
--- a/auth/signIn/package.json
+++ b/auth/signIn/package.json
@@ -4,11 +4,11 @@
   "main": "index.js",
   "scripts": {
     "test": "npx jest --passWithNoTests",
-    "prebuild": "rm -rf dist",
+    "prebuild": "rm -rf ../../build/sign-in/dist",
     "build": "tsc -p tsconfig.json",
-    "postbuild": "cp package.json ./dist/",
-    "prepackage": "npm install --omit=dev && cp -rL ../../node_modules/. ./dist/node_modules",
-    "package": "cd ./dist && zip -q -r ../../../infra/artifacts/signIn.zip .",
+    "postbuild": "cp package.json ../../build/sign-in/dist/",
+    "prepackage": "npm install --omit=dev && cp -rL ../../node_modules/. ../../build/sign-in/dist/node_modules",
+    "package": "cd ../../build/sign-in/dist && zip -q -r ../../../../../infra/artifacts/signIn.zip .",
     "postpackage": "rm -rf ../../node_modules"
   },
   "dependencies": {
diff --git a/auth/signIn/tsconfig.json b/auth/signIn/tsconfig.json
index 637fb2b..6289406 100644
--- a/auth/signIn/tsconfig.json
+++ b/auth/signIn/tsconfig.json
@@ -1,8 +1,8 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "outDir": "dist",
-    "rootDir": "src"
+  "outDir": "../../build/sign-in/dist",
+  "rootDir": "src"
   },
   "include": [
     "src"
diff --git a/auth/signOut/package.json b/auth/signOut/package.json
index 3d38443..16e9852 100644
--- a/auth/signOut/package.json
+++ b/auth/signOut/package.json
@@ -4,11 +4,11 @@
   "main": "index.js",
   "scripts": {
     "test": "npx jest --passWithNoTests",
-    "prebuild": "rm -rf dist",
+    "prebuild": "rm -rf ../../build/sign-out/dist",
     "build": "tsc -p tsconfig.json",
-    "postbuild": "cp package.json ./dist/",
-    "prepackage": "npm install --omit=dev && cp -rL ../../node_modules/. ./dist/node_modules",
-    "package": "cd ./dist && zip -q -r ../../../infra/artifacts/signOut.zip .",
+    "postbuild": "cp package.json ../../build/sign-out/dist/",
+    "prepackage": "npm install --omit=dev && cp -rL ../../node_modules/. ../../build/sign-out/dist/node_modules",
+    "package": "cd ../../build/sign-out/dist && zip -q -r ../../../../../infra/artifacts/signOut.zip .",
     "postpackage": "rm -rf ../../node_modules"
   },
   "dependencies": {
@@ -17,4 +17,3 @@
     "bs-logger": "^0.2.6"
   }
 }
-
diff --git a/auth/signOut/tsconfig.json b/auth/signOut/tsconfig.json
index eee93b7..9b58c38 100644
--- a/auth/signOut/tsconfig.json
+++ b/auth/signOut/tsconfig.json
@@ -1,8 +1,8 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "outDir": "dist",
-    "rootDir": "src"
+  "outDir": "../../build/sign-out/dist",
+  "rootDir": "src"
   },
   "include": [
     "src"
diff --git a/auth/signUp/package.json b/auth/signUp/package.json
index 9bd1cda..c1acc52 100644
--- a/auth/signUp/package.json
+++ b/auth/signUp/package.json
@@ -4,11 +4,11 @@
   "main": "index.js",
   "scripts": {
     "test": "npx jest --passWithNoTests",
-    "prebuild": "rm -rf dist",
+    "prebuild": "rm -rf ../../build/sign-up/dist",
     "build": "tsc -p tsconfig.json",
-    "postbuild": "cp package.json ./dist/",
-    "prepackage": "npm install --omit=dev && cp -rL ../../node_modules/. ./dist/node_modules",
-    "package": "cd ./dist && zip -q -r ../../../infra/artifacts/signUp.zip .",
+    "postbuild": "cp package.json ../../build/sign-up/dist/",
+    "prepackage": "npm install --omit=dev && cp -rL ../../node_modules/. ../../build/sign-up/dist/node_modules",
+    "package": "cd ../../build/sign-up/dist && zip -q -r ../../../../../infra/artifacts/signUp.zip .",
     "postpackage": "rm -rf ../../node_modules"
   },
   "dependencies": {
@@ -16,4 +16,4 @@
     "aws-lambda": "^1.0.7",
     "bs-logger": "^0.2.6"
   }
-}
+}
\ No newline at end of file
diff --git a/auth/signUp/tsconfig.json b/auth/signUp/tsconfig.json
index 637fb2b..cbfaccc 100644
--- a/auth/signUp/tsconfig.json
+++ b/auth/signUp/tsconfig.json
@@ -1,8 +1,8 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "outDir": "dist",
-    "rootDir": "src"
+  "outDir": "../../build/sign-up/dist",
+  "rootDir": "src"
   },
   "include": [
     "src"
diff --git a/auth/userData/package.json b/auth/userData/package.json
index e97c8b3..b3d78a0 100644
--- a/auth/userData/package.json
+++ b/auth/userData/package.json
@@ -4,11 +4,11 @@
   "main": "index.js",
   "scripts": {
     "test": "npx jest --passWithNoTests",
-    "prebuild": "rm -rf dist",
+    "prebuild": "rm -rf ../../build/user-data/dist",
     "build": "tsc -p tsconfig.json",
-    "postbuild": "cp package.json ./dist/",
-    "prepackage": "npm install --omit=dev && cp -rL ../../node_modules/. ./dist/node_modules",
-    "package": "cd ./dist && zip -q -r ../../../infra/artifacts/userData.zip .",
+    "postbuild": "cp package.json ../../build/user-data/dist/",
+    "prepackage": "npm install --omit=dev && cp -rL ../../node_modules/. ../../build/user-data/dist/node_modules",
+    "package": "cd ../../build/user-data/dist && zip -q -r ../../../../../infra/artifacts/userData.zip .",
     "postpackage": "rm -rf ../../node_modules"
   },
   "dependencies": {
@@ -16,6 +16,4 @@
     "aws-lambda": "^1.0.7",
     "bs-logger": "^0.2.6"
   }
-}
-
-
+}
\ No newline at end of file
diff --git a/auth/userData/tsconfig.json b/auth/userData/tsconfig.json
index 637fb2b..111485f 100644
--- a/auth/userData/tsconfig.json
+++ b/auth/userData/tsconfig.json
@@ -1,8 +1,8 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "outDir": "dist",
-    "rootDir": "src"
+  "outDir": "../../build/user-data/dist",
+  "rootDir": "src"
   },
   "include": [
     "src"