diff --git a/docs/deepstream_validation.md b/docs/deepstream_validation.md
index f795b62b..524472cc 100644
--- a/docs/deepstream_validation.md
+++ b/docs/deepstream_validation.md
@@ -71,7 +71,7 @@ The models are **validated and ready for performance benchmarking**.
 - **Engines:** `/workspace/models/deepstream/`  
 - **Script used:** `src/validate_deepstream_vs_onnx.py`  
 - **Execution environments:**
-  - `run_dev.sh` (x86_64) → ONNX inference  
-  - `run_dev_jetson.sh` (ARM Jetson) → DeepStream inference  
+  - `scripts/run_dev_ml_cpu.sh` (x86_64) → ONNX inference  
+  - `scripts/run_dev_jetson.sh` (ARM Jetson) → DeepStream inference  
 
 ---
diff --git a/docs/general/setup_guide.md b/docs/general/setup_guide.md
index 76309b7f..c86f57fc 100755
--- a/docs/general/setup_guide.md
+++ b/docs/general/setup_guide.md
@@ -23,7 +23,7 @@ We use **Docker** to make sure everyone has the same environment. You can think
 
 Then run:
 ```bash
-bash run_dev.sh
+bash scripts/run_dev_ml_cpu.sh
 ```
 
 This will:
diff --git a/docs/mongodb_setup.md b/docs/mongodb_setup.md
index 7bf115e3..31c12667 100644
--- a/docs/mongodb_setup.md
+++ b/docs/mongodb_setup.md
@@ -6,17 +6,17 @@ Deploy a simple MongoDB setup with scripts for up/down/cleanup, and provide usag
 
 ## Scripts
 
-* `up.sh` - starts MongoDB container
-* `down.sh` - stops MongoDB container
-* `cleanup.sh` - removes container, network, and data
+* `database_up.sh` - starts MongoDB container
+* `database_down.sh` - stops MongoDB container
+* `database_cleanup.sh` - removes container, network, and data
 
 ## Usage
 
 ```bash
-cd ~/AgStream/database/scripts
-./up.sh      # Start MongoDB
-./down.sh    # Stop MongoDB
-./cleanup.sh # Cleanup all data and containers
+cd ~/AgStream/scripts
+./database_up.sh   # Start MongoDB
+./database_down.sh    # Stop MongoDB
+./database_cleanup.sh # Cleanup all data and containers
 ```
 
 ## Connection
diff --git a/docs/nvmsgbroker_integration.md b/docs/nvmsgbroker_integration.md
index 56afc0db..549ec2fe 100644
--- a/docs/nvmsgbroker_integration.md
+++ b/docs/nvmsgbroker_integration.md
@@ -29,20 +29,20 @@ It processes **RTSP video streams**, runs **classification inference**, and stor
 
 ```bash
 # 1. Start database services (MongoDB + MQTT broker)
-./services/database/up.sh
+./scripts/database_up.sh
 
 
 # 2. Clear MongoDB (for fresh start)
 docker exec -it agstream_mongo mongosh agstream --eval "db.predictions.deleteMany({})"
 
 # 3. Start Consumer (builds image automatically on first run)
-./services/consumer/start_consumer.sh
+./scripts/start_mqtt_consumer.sh
 
 # 4. Verify Consumer is running
 docker logs mqtt_consumer -f
 
 # 5. Start DeepStream
-./run_dev_arm.sh
+./scripts/run_dev_jetson.sh
 
 # 6. Inside DeepStream container
 python3 src/rtsp/rtsp_server.py &
@@ -64,7 +64,7 @@ python3 src/nvmsgbroker_pipeline.py
 * **Purpose:** Transfers MQTT messages to MongoDB
 * **Technology:** Python script using `paho-mqtt` and `pymongo`
 * **Auto-build:** First run creates Docker image with dependencies pre-installed
-* **Restart:** `./start_consumer.sh` stops old container and starts a new one
+* **Restart:** `./scripts/start_mqtt_consumer.sh` stops old container and starts a new one
 
 ### 🧩 Data Flow
 
@@ -120,7 +120,7 @@ docker ps | grep agstream
 
 # Restart if needed
 docker compose up -d
-./start_consumer.sh
+./scripts/start_mqtt_consumer.sh
 ```
 
 ### No data in MongoDB
@@ -141,7 +141,7 @@ docker logs agstream_mosquitto
 **DeepStream → nvmsgbroker → MQTT → Consumer → MongoDB**
 
 📝 **Note:** The Consumer is **REQUIRED** to transfer data from MQTT to MongoDB.
-The `start_consumer.sh` script automatically builds the Docker image on first run.
+The `start_mqtt_consumer.sh` script automatically builds the Docker image on first run.
 
 ---
 
diff --git a/services/database/cleanup.sh b/scripts/database_cleanup.sh
similarity index 77%
rename from services/database/cleanup.sh
rename to scripts/database_cleanup.sh
index 8663c1f4..150b0c09 100755
--- a/services/database/cleanup.sh
+++ b/scripts/database_cleanup.sh
@@ -4,7 +4,7 @@ set -e
 echo "Cleaning MongoDB data and containers..."
 
 # Move to MongoDB environment directory
-docker compose -f "$(dirname "$0")/../../env/mongodb/docker-compose.yml" down -v
+docker compose -f "$(dirname "$0")/../env/mongodb/docker-compose.yml" down -v
 
 # Remove any persisted data directory (if it exists)
 rm -rf "$(dirname "$0")/../../env/mongodb/data/"
diff --git a/services/database/down.sh b/scripts/database_down.sh
similarity index 67%
rename from services/database/down.sh
rename to scripts/database_down.sh
index 47329e99..4f3bf4a0 100755
--- a/services/database/down.sh
+++ b/scripts/database_down.sh
@@ -4,6 +4,6 @@ set -e
 echo "Stopping MongoDB container..."
 
 # Move to MongoDB directory (relative to project root)
-docker compose -f "$(dirname "$0")/../../env/mongodb/docker-compose.yml" down
+docker compose -f "$(dirname "$0")/../env/mongodb/docker-compose.yml" down
 
 echo "MongoDB stopped and removed successfully."
diff --git a/services/database/up.sh b/scripts/database_up.sh
similarity index 84%
rename from services/database/up.sh
rename to scripts/database_up.sh
index fd285679..00953f4b 100755
--- a/services/database/up.sh
+++ b/scripts/database_up.sh
@@ -4,7 +4,7 @@ set -e
 echo "Starting MongoDB container..."
 
 # Define the compose file path
-COMPOSE_FILE="$(dirname "$0")/../../env/mongodb/docker-compose.yml"
+COMPOSE_FILE="$(dirname "$0")/../env/mongodb/docker-compose.yml"
 
 # Ensure old containers are cleaned up if needed
 docker compose -f "$COMPOSE_FILE" down --remove-orphans >/dev/null 2>&1 || true
diff --git a/run_dev_jetson.sh b/scripts/run_dev_jetson.sh
similarity index 96%
rename from run_dev_jetson.sh
rename to scripts/run_dev_jetson.sh
index cbb41cd9..057be4ae 100755
--- a/run_dev_jetson.sh
+++ b/scripts/run_dev_jetson.sh
@@ -9,7 +9,7 @@ USER_ID=$(id -u)
 # Base directories
 script_dir=$(dirname "$(realpath "$0")")
 workspace_dir=${script_dir}
-env_dir=${workspace_dir}/env/jetson
+env_dir=${workspace_dir}/../env/jetson
 
 # Container and image names
 IMAGE_NAME="inference-opt-jetson"
diff --git a/run_dev.sh b/scripts/run_dev_ml_cpu.sh
similarity index 95%
rename from run_dev.sh
rename to scripts/run_dev_ml_cpu.sh
index 0e3d61a8..ed37f20d 100755
--- a/run_dev.sh
+++ b/scripts/run_dev_ml_cpu.sh
@@ -6,7 +6,7 @@ set -o xtrace    # print each command before executing
 # Base directories
 script_dir=$(dirname "$(realpath "$0")")
 workspace_dir=${script_dir}
-env_dir=${workspace_dir}/env/ml_cpu
+env_dir=${workspace_dir}/../env/ml_cpu
 
 # Container and image names
 IMAGE_NAME="inference-opt"
diff --git a/services/consumer/start_consumer.sh b/scripts/start_mqtt_consumer.sh
similarity index 100%
rename from services/consumer/start_consumer.sh
rename to scripts/start_mqtt_consumer.sh