diff --git a/build-nextcloud-mcp.sh b/build-nextcloud-mcp.sh
deleted file mode 100755
index a8163eb..0000000
--- a/build-nextcloud-mcp.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-# Build script for nextcloud-mcp that handles .dockerignore issue
-
-set -e
-
-NEXTCLOUD_DIR="vendor/nextcloud-mcp-server"
-DOCKERIGNORE_FILE="$NEXTCLOUD_DIR/.dockerignore"
-BACKUP_FILE="$NEXTCLOUD_DIR/.dockerignore.backup"
-
-echo "Backing up .dockerignore..."
-if [ -f "$DOCKERIGNORE_FILE" ]; then
-    cp "$DOCKERIGNORE_FILE" "$BACKUP_FILE"
-    rm "$DOCKERIGNORE_FILE"
-fi
-
-echo "Building nextcloud-mcp..."
-docker compose build nextcloud-mcp
-
-echo "Restoring .dockerignore..."
-if [ -f "$BACKUP_FILE" ]; then
-    mv "$BACKUP_FILE" "$DOCKERIGNORE_FILE"
-fi
-
-echo "Done!"
diff --git a/BuildAll.sh b/scripts/BuildAll.sh
similarity index 100%
rename from BuildAll.sh
rename to scripts/BuildAll.sh
diff --git a/CleanVendor.sh b/scripts/CleanVendor.sh
similarity index 100%
rename from CleanVendor.sh
rename to scripts/CleanVendor.sh
diff --git a/CloneVendorRepos.sh b/scripts/CloneVendorRepos.sh
similarity index 100%
rename from CloneVendorRepos.sh
rename to scripts/CloneVendorRepos.sh
diff --git a/StatusCheck.sh b/scripts/StatusCheck.sh
similarity index 96%
rename from StatusCheck.sh
rename to scripts/StatusCheck.sh
index e07f749..8f8f1dd 100755
--- a/StatusCheck.sh
+++ b/scripts/StatusCheck.sh
@@ -32,7 +32,7 @@ echo ""
 for SERVICE in $SERVICES; do
     TOTAL=$((TOTAL + 1))
     # Construct expected image name
-    IMAGE_NAME="knel-aimiddleware-$SERVICE"
+    IMAGE_NAME="kneldevstack-aimiddleware-$SERVICE"
 
     # Check if image exists
     if docker images --format '{{.Repository}}' | grep -q "^${IMAGE_NAME}$"; then
diff --git a/validate-mcp.sh b/scripts/validate-mcp.sh
similarity index 100%
rename from validate-mcp.sh
rename to scripts/validate-mcp.sh