diff --git a/demos/sample_apps/java/weather_forcecast_service/Dockerfile b/demos/samples_java/weather_forcecast_service/Dockerfile
similarity index 100%
rename from demos/sample_apps/java/weather_forcecast_service/Dockerfile
rename to demos/samples_java/weather_forcecast_service/Dockerfile
diff --git a/demos/sample_apps/java/weather_forcecast_service/arch_config.yaml b/demos/samples_java/weather_forcecast_service/arch_config.yaml
similarity index 100%
rename from demos/sample_apps/java/weather_forcecast_service/arch_config.yaml
rename to demos/samples_java/weather_forcecast_service/arch_config.yaml
diff --git a/demos/sample_apps/java/weather_forcecast_service/docker-compose.yaml b/demos/samples_java/weather_forcecast_service/docker-compose.yaml
similarity index 100%
rename from demos/sample_apps/java/weather_forcecast_service/docker-compose.yaml
rename to demos/samples_java/weather_forcecast_service/docker-compose.yaml
diff --git a/demos/sample_apps/java/weather_forcecast_service/pom.xml b/demos/samples_java/weather_forcecast_service/pom.xml
similarity index 100%
rename from demos/sample_apps/java/weather_forcecast_service/pom.xml
rename to demos/samples_java/weather_forcecast_service/pom.xml
diff --git a/demos/sample_apps/currency_exchange/run_demo.sh b/demos/samples_java/weather_forcecast_service/run_demo.sh
similarity index 100%
rename from demos/sample_apps/currency_exchange/run_demo.sh
rename to demos/samples_java/weather_forcecast_service/run_demo.sh
diff --git a/demos/sample_apps/java/weather_forcecast_service/src/main/java/weather/WeatherForecastApplication.java b/demos/samples_java/weather_forcecast_service/src/main/java/weather/WeatherForecastApplication.java
similarity index 100%
rename from demos/sample_apps/java/weather_forcecast_service/src/main/java/weather/WeatherForecastApplication.java
rename to demos/samples_java/weather_forcecast_service/src/main/java/weather/WeatherForecastApplication.java
diff --git a/demos/sample_apps/java/weather_forcecast_service/src/main/java/weather/controller/WeatherController.java b/demos/samples_java/weather_forcecast_service/src/main/java/weather/controller/WeatherController.java
similarity index 100%
rename from demos/sample_apps/java/weather_forcecast_service/src/main/java/weather/controller/WeatherController.java
rename to demos/samples_java/weather_forcecast_service/src/main/java/weather/controller/WeatherController.java
diff --git a/demos/sample_apps/java/weather_forcecast_service/src/main/java/weather/model/DayForecast.java b/demos/samples_java/weather_forcecast_service/src/main/java/weather/model/DayForecast.java
similarity index 100%
rename from demos/sample_apps/java/weather_forcecast_service/src/main/java/weather/model/DayForecast.java
rename to demos/samples_java/weather_forcecast_service/src/main/java/weather/model/DayForecast.java
diff --git a/demos/sample_apps/java/weather_forcecast_service/src/main/java/weather/model/WeatherForecastResponse.java b/demos/samples_java/weather_forcecast_service/src/main/java/weather/model/WeatherForecastResponse.java
similarity index 100%
rename from demos/sample_apps/java/weather_forcecast_service/src/main/java/weather/model/WeatherForecastResponse.java
rename to demos/samples_java/weather_forcecast_service/src/main/java/weather/model/WeatherForecastResponse.java
diff --git a/demos/sample_apps/java/weather_forcecast_service/src/main/java/weather/model/WeatherRequest.java b/demos/samples_java/weather_forcecast_service/src/main/java/weather/model/WeatherRequest.java
similarity index 100%
rename from demos/sample_apps/java/weather_forcecast_service/src/main/java/weather/model/WeatherRequest.java
rename to demos/samples_java/weather_forcecast_service/src/main/java/weather/model/WeatherRequest.java
diff --git a/demos/sample_apps/java/weather_forcecast_service/src/main/resources/application.properties b/demos/samples_java/weather_forcecast_service/src/main/resources/application.properties
similarity index 100%
rename from demos/sample_apps/java/weather_forcecast_service/src/main/resources/application.properties
rename to demos/samples_java/weather_forcecast_service/src/main/resources/application.properties
diff --git a/demos/sample_apps/currency_exchange/README.md b/demos/samples_python/currency_exchange/README.md
similarity index 100%
rename from demos/sample_apps/currency_exchange/README.md
rename to demos/samples_python/currency_exchange/README.md
diff --git a/demos/sample_apps/currency_exchange/arch_config.yaml b/demos/samples_python/currency_exchange/arch_config.yaml
similarity index 100%
rename from demos/sample_apps/currency_exchange/arch_config.yaml
rename to demos/samples_python/currency_exchange/arch_config.yaml
diff --git a/demos/sample_apps/currency_exchange/docker-compose.yaml b/demos/samples_python/currency_exchange/docker-compose.yaml
similarity index 100%
rename from demos/sample_apps/currency_exchange/docker-compose.yaml
rename to demos/samples_python/currency_exchange/docker-compose.yaml
diff --git a/demos/sample_apps/java/weather_forcecast_service/run_demo.sh b/demos/samples_python/currency_exchange/run_demo.sh
similarity index 100%
rename from demos/sample_apps/java/weather_forcecast_service/run_demo.sh
rename to demos/samples_python/currency_exchange/run_demo.sh
diff --git a/demos/sample_apps/currency_exchange/test_data.yaml b/demos/samples_python/currency_exchange/test_data.yaml
similarity index 100%
rename from demos/sample_apps/currency_exchange/test_data.yaml
rename to demos/samples_python/currency_exchange/test_data.yaml
diff --git a/demos/sample_apps/human_resources_agent/Dockerfile b/demos/samples_python/human_resources_agent/Dockerfile
similarity index 100%
rename from demos/sample_apps/human_resources_agent/Dockerfile
rename to demos/samples_python/human_resources_agent/Dockerfile
diff --git a/demos/sample_apps/human_resources_agent/README.md b/demos/samples_python/human_resources_agent/README.md
similarity index 100%
rename from demos/sample_apps/human_resources_agent/README.md
rename to demos/samples_python/human_resources_agent/README.md
diff --git a/demos/sample_apps/human_resources_agent/arch_config.yaml b/demos/samples_python/human_resources_agent/arch_config.yaml
similarity index 100%
rename from demos/sample_apps/human_resources_agent/arch_config.yaml
rename to demos/samples_python/human_resources_agent/arch_config.yaml
diff --git a/demos/sample_apps/human_resources_agent/docker-compose.yaml b/demos/samples_python/human_resources_agent/docker-compose.yaml
similarity index 100%
rename from demos/sample_apps/human_resources_agent/docker-compose.yaml
rename to demos/samples_python/human_resources_agent/docker-compose.yaml
diff --git a/demos/sample_apps/human_resources_agent/image.png b/demos/samples_python/human_resources_agent/image.png
similarity index 100%
rename from demos/sample_apps/human_resources_agent/image.png
rename to demos/samples_python/human_resources_agent/image.png
diff --git a/demos/sample_apps/human_resources_agent/main.py b/demos/samples_python/human_resources_agent/main.py
similarity index 100%
rename from demos/sample_apps/human_resources_agent/main.py
rename to demos/samples_python/human_resources_agent/main.py
diff --git a/demos/sample_apps/human_resources_agent/requirements.txt b/demos/samples_python/human_resources_agent/requirements.txt
similarity index 100%
rename from demos/sample_apps/human_resources_agent/requirements.txt
rename to demos/samples_python/human_resources_agent/requirements.txt
diff --git a/demos/sample_apps/human_resources_agent/run_demo.sh b/demos/samples_python/human_resources_agent/run_demo.sh
similarity index 100%
rename from demos/sample_apps/human_resources_agent/run_demo.sh
rename to demos/samples_python/human_resources_agent/run_demo.sh
diff --git a/demos/sample_apps/human_resources_agent/test_data.yaml b/demos/samples_python/human_resources_agent/test_data.yaml
similarity index 100%
rename from demos/sample_apps/human_resources_agent/test_data.yaml
rename to demos/samples_python/human_resources_agent/test_data.yaml
diff --git a/demos/sample_apps/human_resources_agent/workforce_data.json b/demos/samples_python/human_resources_agent/workforce_data.json
similarity index 100%
rename from demos/sample_apps/human_resources_agent/workforce_data.json
rename to demos/samples_python/human_resources_agent/workforce_data.json
diff --git a/demos/use_cases/multi_turn_rag_agent/Dockerfile b/demos/samples_python/multi_turn_rag_agent/Dockerfile
similarity index 100%
rename from demos/use_cases/multi_turn_rag_agent/Dockerfile
rename to demos/samples_python/multi_turn_rag_agent/Dockerfile
diff --git a/demos/use_cases/multi_turn_rag_agent/README.md b/demos/samples_python/multi_turn_rag_agent/README.md
similarity index 100%
rename from demos/use_cases/multi_turn_rag_agent/README.md
rename to demos/samples_python/multi_turn_rag_agent/README.md
diff --git a/demos/use_cases/multi_turn_rag_agent/arch_config.yaml b/demos/samples_python/multi_turn_rag_agent/arch_config.yaml
similarity index 100%
rename from demos/use_cases/multi_turn_rag_agent/arch_config.yaml
rename to demos/samples_python/multi_turn_rag_agent/arch_config.yaml
diff --git a/demos/use_cases/multi_turn_rag_agent/docker-compose.yaml b/demos/samples_python/multi_turn_rag_agent/docker-compose.yaml
similarity index 100%
rename from demos/use_cases/multi_turn_rag_agent/docker-compose.yaml
rename to demos/samples_python/multi_turn_rag_agent/docker-compose.yaml
diff --git a/demos/use_cases/multi_turn_rag_agent/main.py b/demos/samples_python/multi_turn_rag_agent/main.py
similarity index 100%
rename from demos/use_cases/multi_turn_rag_agent/main.py
rename to demos/samples_python/multi_turn_rag_agent/main.py
diff --git a/demos/use_cases/multi_turn_rag_agent/mutli-turn-example.png b/demos/samples_python/multi_turn_rag_agent/mutli-turn-example.png
similarity index 100%
rename from demos/use_cases/multi_turn_rag_agent/mutli-turn-example.png
rename to demos/samples_python/multi_turn_rag_agent/mutli-turn-example.png
diff --git a/demos/use_cases/multi_turn_rag_agent/requirements.txt b/demos/samples_python/multi_turn_rag_agent/requirements.txt
similarity index 100%
rename from demos/use_cases/multi_turn_rag_agent/requirements.txt
rename to demos/samples_python/multi_turn_rag_agent/requirements.txt
diff --git a/demos/use_cases/multi_turn_rag_agent/run_demo.sh b/demos/samples_python/multi_turn_rag_agent/run_demo.sh
similarity index 100%
rename from demos/use_cases/multi_turn_rag_agent/run_demo.sh
rename to demos/samples_python/multi_turn_rag_agent/run_demo.sh
diff --git a/demos/sample_apps/network_switch_operator_agent/Dockerfile b/demos/samples_python/network_switch_operator_agent/Dockerfile
similarity index 100%
rename from demos/sample_apps/network_switch_operator_agent/Dockerfile
rename to demos/samples_python/network_switch_operator_agent/Dockerfile
diff --git a/demos/sample_apps/network_switch_operator_agent/README.md b/demos/samples_python/network_switch_operator_agent/README.md
similarity index 100%
rename from demos/sample_apps/network_switch_operator_agent/README.md
rename to demos/samples_python/network_switch_operator_agent/README.md
diff --git a/demos/sample_apps/network_switch_operator_agent/arch_config.yaml b/demos/samples_python/network_switch_operator_agent/arch_config.yaml
similarity index 100%
rename from demos/sample_apps/network_switch_operator_agent/arch_config.yaml
rename to demos/samples_python/network_switch_operator_agent/arch_config.yaml
diff --git a/demos/sample_apps/network_switch_operator_agent/docker-compose.yaml b/demos/samples_python/network_switch_operator_agent/docker-compose.yaml
similarity index 100%
rename from demos/sample_apps/network_switch_operator_agent/docker-compose.yaml
rename to demos/samples_python/network_switch_operator_agent/docker-compose.yaml
diff --git a/demos/sample_apps/network_switch_operator_agent/image.png b/demos/samples_python/network_switch_operator_agent/image.png
similarity index 100%
rename from demos/sample_apps/network_switch_operator_agent/image.png
rename to demos/samples_python/network_switch_operator_agent/image.png
diff --git a/demos/sample_apps/network_switch_operator_agent/main.py b/demos/samples_python/network_switch_operator_agent/main.py
similarity index 100%
rename from demos/sample_apps/network_switch_operator_agent/main.py
rename to demos/samples_python/network_switch_operator_agent/main.py
diff --git a/demos/sample_apps/network_switch_operator_agent/requirements.txt b/demos/samples_python/network_switch_operator_agent/requirements.txt
similarity index 100%
rename from demos/sample_apps/network_switch_operator_agent/requirements.txt
rename to demos/samples_python/network_switch_operator_agent/requirements.txt
diff --git a/demos/sample_apps/network_switch_operator_agent/run_demo.sh b/demos/samples_python/network_switch_operator_agent/run_demo.sh
similarity index 100%
rename from demos/sample_apps/network_switch_operator_agent/run_demo.sh
rename to demos/samples_python/network_switch_operator_agent/run_demo.sh
diff --git a/demos/sample_apps/stock_quote/README.md b/demos/samples_python/stock_quote/README.md
similarity index 100%
rename from demos/sample_apps/stock_quote/README.md
rename to demos/samples_python/stock_quote/README.md
diff --git a/demos/sample_apps/stock_quote/arch_config.yaml b/demos/samples_python/stock_quote/arch_config.yaml
similarity index 100%
rename from demos/sample_apps/stock_quote/arch_config.yaml
rename to demos/samples_python/stock_quote/arch_config.yaml
diff --git a/demos/sample_apps/stock_quote/docker-compose.yaml b/demos/samples_python/stock_quote/docker-compose.yaml
similarity index 100%
rename from demos/sample_apps/stock_quote/docker-compose.yaml
rename to demos/samples_python/stock_quote/docker-compose.yaml
diff --git a/demos/sample_apps/stock_quote/run_demo.sh b/demos/samples_python/stock_quote/run_demo.sh
similarity index 100%
rename from demos/sample_apps/stock_quote/run_demo.sh
rename to demos/samples_python/stock_quote/run_demo.sh
diff --git a/demos/sample_apps/stock_quote/stock_quote_demo.png b/demos/samples_python/stock_quote/stock_quote_demo.png
similarity index 100%
rename from demos/sample_apps/stock_quote/stock_quote_demo.png
rename to demos/samples_python/stock_quote/stock_quote_demo.png
diff --git a/demos/sample_apps/weather_forecast/Dockerfile b/demos/samples_python/weather_forecast/Dockerfile
similarity index 100%
rename from demos/sample_apps/weather_forecast/Dockerfile
rename to demos/samples_python/weather_forecast/Dockerfile
diff --git a/demos/sample_apps/weather_forecast/README.md b/demos/samples_python/weather_forecast/README.md
similarity index 100%
rename from demos/sample_apps/weather_forecast/README.md
rename to demos/samples_python/weather_forecast/README.md
diff --git a/demos/sample_apps/weather_forecast/arch_config.yaml b/demos/samples_python/weather_forecast/arch_config.yaml
similarity index 100%
rename from demos/sample_apps/weather_forecast/arch_config.yaml
rename to demos/samples_python/weather_forecast/arch_config.yaml
diff --git a/demos/sample_apps/weather_forecast/docker-compose-honeycomb.yaml b/demos/samples_python/weather_forecast/docker-compose-honeycomb.yaml
similarity index 100%
rename from demos/sample_apps/weather_forecast/docker-compose-honeycomb.yaml
rename to demos/samples_python/weather_forecast/docker-compose-honeycomb.yaml
diff --git a/demos/sample_apps/weather_forecast/docker-compose-jaeger.yaml b/demos/samples_python/weather_forecast/docker-compose-jaeger.yaml
similarity index 100%
rename from demos/sample_apps/weather_forecast/docker-compose-jaeger.yaml
rename to demos/samples_python/weather_forecast/docker-compose-jaeger.yaml
diff --git a/demos/sample_apps/weather_forecast/docker-compose-logfire.yaml b/demos/samples_python/weather_forecast/docker-compose-logfire.yaml
similarity index 100%
rename from demos/sample_apps/weather_forecast/docker-compose-logfire.yaml
rename to demos/samples_python/weather_forecast/docker-compose-logfire.yaml
diff --git a/demos/sample_apps/weather_forecast/docker-compose-signoz.yaml b/demos/samples_python/weather_forecast/docker-compose-signoz.yaml
similarity index 100%
rename from demos/sample_apps/weather_forecast/docker-compose-signoz.yaml
rename to demos/samples_python/weather_forecast/docker-compose-signoz.yaml
diff --git a/demos/sample_apps/weather_forecast/docker-compose.yaml b/demos/samples_python/weather_forecast/docker-compose.yaml
similarity index 100%
rename from demos/sample_apps/weather_forecast/docker-compose.yaml
rename to demos/samples_python/weather_forecast/docker-compose.yaml
diff --git a/demos/sample_apps/weather_forecast/main.py b/demos/samples_python/weather_forecast/main.py
similarity index 100%
rename from demos/sample_apps/weather_forecast/main.py
rename to demos/samples_python/weather_forecast/main.py
diff --git a/demos/sample_apps/weather_forecast/poetry.lock b/demos/samples_python/weather_forecast/poetry.lock
similarity index 100%
rename from demos/sample_apps/weather_forecast/poetry.lock
rename to demos/samples_python/weather_forecast/poetry.lock
diff --git a/demos/sample_apps/weather_forecast/pyproject.toml b/demos/samples_python/weather_forecast/pyproject.toml
similarity index 100%
rename from demos/sample_apps/weather_forecast/pyproject.toml
rename to demos/samples_python/weather_forecast/pyproject.toml
diff --git a/demos/sample_apps/weather_forecast/run_demo.sh b/demos/samples_python/weather_forecast/run_demo.sh
similarity index 100%
rename from demos/sample_apps/weather_forecast/run_demo.sh
rename to demos/samples_python/weather_forecast/run_demo.sh