diff --git a/AgentQnA/docker_compose/Intel/CPU/openai/docker-compose-agent-openai.yaml b/AgentQnA/docker_compose/Intel/CPU/xeon/compose_openai.yaml
similarity index 100%
rename from AgentQnA/docker_compose/Intel/CPU/openai/docker-compose-agent-openai.yaml
rename to AgentQnA/docker_compose/Intel/CPU/xeon/compose_openai.yaml
diff --git a/AgentQnA/docker_compose/Intel/CPU/openai/launch_agent_service_openai.sh b/AgentQnA/docker_compose/Intel/CPU/xeon/launch_agent_service_openai.sh
similarity index 100%
rename from AgentQnA/docker_compose/Intel/CPU/openai/launch_agent_service_openai.sh
rename to AgentQnA/docker_compose/Intel/CPU/xeon/launch_agent_service_openai.sh
diff --git a/AgentQnA/tests/_test_agentqna_on_xeon.sh b/AgentQnA/tests/_test_compose_openai_on_xeon.sh
similarity index 100%
rename from AgentQnA/tests/_test_agentqna_on_xeon.sh
rename to AgentQnA/tests/_test_compose_openai_on_xeon.sh
diff --git a/AudioQnA/docker_compose/Intel/CPU/README.md b/AudioQnA/docker_compose/Intel/CPU/xeon/README.md
similarity index 100%
rename from AudioQnA/docker_compose/Intel/CPU/README.md
rename to AudioQnA/docker_compose/Intel/CPU/xeon/README.md
diff --git a/AudioQnA/docker_compose/Intel/CPU/compose.yaml b/AudioQnA/docker_compose/Intel/CPU/xeon/compose.yaml
similarity index 100%
rename from AudioQnA/docker_compose/Intel/CPU/compose.yaml
rename to AudioQnA/docker_compose/Intel/CPU/xeon/compose.yaml
diff --git a/AudioQnA/docker_compose/Intel/HPU/README.md b/AudioQnA/docker_compose/Intel/HPU/gaudi/README.md
similarity index 100%
rename from AudioQnA/docker_compose/Intel/HPU/README.md
rename to AudioQnA/docker_compose/Intel/HPU/gaudi/README.md
diff --git a/AudioQnA/docker_compose/Intel/HPU/compose.yaml b/AudioQnA/docker_compose/Intel/HPU/gaudi/compose.yaml
similarity index 100%
rename from AudioQnA/docker_compose/Intel/HPU/compose.yaml
rename to AudioQnA/docker_compose/Intel/HPU/gaudi/compose.yaml
diff --git a/AudioQnA/kubernetes/manifests/Intel/README.md b/AudioQnA/kubernetes/intel/README.md
similarity index 100%
rename from AudioQnA/kubernetes/manifests/Intel/README.md
rename to AudioQnA/kubernetes/intel/README.md
diff --git a/AudioQnA/kubernetes/manifests/Intel/CPU/audioqna.yaml b/AudioQnA/kubernetes/intel/cpu/xeon/manifest/audioqna.yaml
similarity index 100%
rename from AudioQnA/kubernetes/manifests/Intel/CPU/audioqna.yaml
rename to AudioQnA/kubernetes/intel/cpu/xeon/manifest/audioqna.yaml
diff --git a/AudioQnA/kubernetes/manifests/Intel/HPU/audioqna.yaml b/AudioQnA/kubernetes/intel/hpu/gaudi/manifest/audioqna.yaml
similarity index 100%
rename from AudioQnA/kubernetes/manifests/Intel/HPU/audioqna.yaml
rename to AudioQnA/kubernetes/intel/hpu/gaudi/manifest/audioqna.yaml
diff --git a/AudioQnA/tests/test_audioqna_on_gaudi.sh b/AudioQnA/tests/test_compose_on_gaudi.sh
similarity index 100%
rename from AudioQnA/tests/test_audioqna_on_gaudi.sh
rename to AudioQnA/tests/test_compose_on_gaudi.sh
diff --git a/AudioQnA/tests/test_audioqna_on_xeon.sh b/AudioQnA/tests/test_compose_on_xeon.sh
similarity index 100%
rename from AudioQnA/tests/test_audioqna_on_xeon.sh
rename to AudioQnA/tests/test_compose_on_xeon.sh
diff --git a/AudioQnA/Dockerfile_ui b/AudioQnA/ui/docker/Dockerfile
similarity index 100%
rename from AudioQnA/Dockerfile_ui
rename to AudioQnA/ui/docker/Dockerfile
diff --git a/ChatQnA/kubernetes/manifests/Intel/benchmark/README.md b/ChatQnA/benchmark/README.md
similarity index 100%
rename from ChatQnA/kubernetes/manifests/Intel/benchmark/README.md
rename to ChatQnA/benchmark/README.md
diff --git a/ChatQnA/kubernetes/manifests/Intel/benchmark/benchmark.yaml b/ChatQnA/benchmark/benchmark.yaml
similarity index 100%
rename from ChatQnA/kubernetes/manifests/Intel/benchmark/benchmark.yaml
rename to ChatQnA/benchmark/benchmark.yaml
diff --git a/ChatQnA/kubernetes/manifests/Intel/benchmark/four_gaudi/chatqna_config_map.yaml b/ChatQnA/benchmark/four_gaudi/chatqna_config_map.yaml
similarity index 100%
rename from ChatQnA/kubernetes/manifests/Intel/benchmark/four_gaudi/chatqna_config_map.yaml
rename to ChatQnA/benchmark/four_gaudi/chatqna_config_map.yaml
diff --git a/ChatQnA/kubernetes/manifests/Intel/benchmark/four_gaudi/chatqna_mega_service_run.yaml b/ChatQnA/benchmark/four_gaudi/chatqna_mega_service_run.yaml
similarity index 100%
rename from ChatQnA/kubernetes/manifests/Intel/benchmark/four_gaudi/chatqna_mega_service_run.yaml
rename to ChatQnA/benchmark/four_gaudi/chatqna_mega_service_run.yaml
diff --git a/ChatQnA/kubernetes/manifests/Intel/benchmark/four_gaudi/dataprep-microservice_run.yaml b/ChatQnA/benchmark/four_gaudi/dataprep-microservice_run.yaml
similarity index 100%
rename from ChatQnA/kubernetes/manifests/Intel/benchmark/four_gaudi/dataprep-microservice_run.yaml
rename to ChatQnA/benchmark/four_gaudi/dataprep-microservice_run.yaml
diff --git a/ChatQnA/kubernetes/manifests/Intel/benchmark/four_gaudi/embedding-dependency_run.yaml b/ChatQnA/benchmark/four_gaudi/embedding-dependency_run.yaml
similarity index 100%
rename from ChatQnA/kubernetes/manifests/Intel/benchmark/four_gaudi/embedding-dependency_run.yaml
rename to ChatQnA/benchmark/four_gaudi/embedding-dependency_run.yaml
diff --git a/ChatQnA/kubernetes/manifests/Intel/benchmark/four_gaudi/embedding-microservice_run.yaml b/ChatQnA/benchmark/four_gaudi/embedding-microservice_run.yaml
similarity index 100%
rename from ChatQnA/kubernetes/manifests/Intel/benchmark/four_gaudi/embedding-microservice_run.yaml
rename to ChatQnA/benchmark/four_gaudi/embedding-microservice_run.yaml
diff --git a/ChatQnA/kubernetes/manifests/Intel/benchmark/four_gaudi/llm-dependency_run.yaml b/ChatQnA/benchmark/four_gaudi/llm-dependency_run.yaml
similarity index 100%
rename from ChatQnA/kubernetes/manifests/Intel/benchmark/four_gaudi/llm-dependency_run.yaml
rename to ChatQnA/benchmark/four_gaudi/llm-dependency_run.yaml
diff --git a/ChatQnA/kubernetes/manifests/Intel/benchmark/four_gaudi/llm-microservice_run.yaml b/ChatQnA/benchmark/four_gaudi/llm-microservice_run.yaml
similarity index 100%
rename from ChatQnA/kubernetes/manifests/Intel/benchmark/four_gaudi/llm-microservice_run.yaml
rename to ChatQnA/benchmark/four_gaudi/llm-microservice_run.yaml
diff --git a/ChatQnA/kubernetes/manifests/Intel/benchmark/four_gaudi/reranking-dependency_run.yaml b/ChatQnA/benchmark/four_gaudi/reranking-dependency_run.yaml
similarity index 100%
rename from ChatQnA/kubernetes/manifests/Intel/benchmark/four_gaudi/reranking-dependency_run.yaml
rename to ChatQnA/benchmark/four_gaudi/reranking-dependency_run.yaml
diff --git a/ChatQnA/kubernetes/manifests/Intel/benchmark/four_gaudi/reranking-microservice_run.yaml b/ChatQnA/benchmark/four_gaudi/reranking-microservice_run.yaml
similarity index 100%
rename from ChatQnA/kubernetes/manifests/Intel/benchmark/four_gaudi/reranking-microservice_run.yaml
rename to ChatQnA/benchmark/four_gaudi/reranking-microservice_run.yaml
diff --git a/ChatQnA/kubernetes/manifests/Intel/benchmark/four_gaudi/retrieval-microservice_run.yaml b/ChatQnA/benchmark/four_gaudi/retrieval-microservice_run.yaml
similarity index 100%
rename from ChatQnA/kubernetes/manifests/Intel/benchmark/four_gaudi/retrieval-microservice_run.yaml
rename to ChatQnA/benchmark/four_gaudi/retrieval-microservice_run.yaml
diff --git a/ChatQnA/kubernetes/manifests/Intel/benchmark/four_gaudi/vector-db_run.yaml b/ChatQnA/benchmark/four_gaudi/vector-db_run.yaml
similarity index 100%
rename from ChatQnA/kubernetes/manifests/Intel/benchmark/four_gaudi/vector-db_run.yaml
rename to ChatQnA/benchmark/four_gaudi/vector-db_run.yaml
diff --git a/ChatQnA/kubernetes/manifests/Intel/benchmark/single_gaudi/chatqna_config_map.yaml b/ChatQnA/benchmark/single_gaudi/chatqna_config_map.yaml
similarity index 100%
rename from ChatQnA/kubernetes/manifests/Intel/benchmark/single_gaudi/chatqna_config_map.yaml
rename to ChatQnA/benchmark/single_gaudi/chatqna_config_map.yaml
diff --git a/ChatQnA/kubernetes/manifests/Intel/benchmark/single_gaudi/chatqna_mega_service_run.yaml b/ChatQnA/benchmark/single_gaudi/chatqna_mega_service_run.yaml
similarity index 100%
rename from ChatQnA/kubernetes/manifests/Intel/benchmark/single_gaudi/chatqna_mega_service_run.yaml
rename to ChatQnA/benchmark/single_gaudi/chatqna_mega_service_run.yaml
diff --git a/ChatQnA/kubernetes/manifests/Intel/benchmark/single_gaudi/dataprep-microservice_run.yaml b/ChatQnA/benchmark/single_gaudi/dataprep-microservice_run.yaml
similarity index 100%
rename from ChatQnA/kubernetes/manifests/Intel/benchmark/single_gaudi/dataprep-microservice_run.yaml
rename to ChatQnA/benchmark/single_gaudi/dataprep-microservice_run.yaml
diff --git a/ChatQnA/kubernetes/manifests/Intel/benchmark/single_gaudi/embedding-dependency_run.yaml b/ChatQnA/benchmark/single_gaudi/embedding-dependency_run.yaml
similarity index 100%
rename from ChatQnA/kubernetes/manifests/Intel/benchmark/single_gaudi/embedding-dependency_run.yaml
rename to ChatQnA/benchmark/single_gaudi/embedding-dependency_run.yaml
diff --git a/ChatQnA/kubernetes/manifests/Intel/benchmark/single_gaudi/embedding-microservice_run.yaml b/ChatQnA/benchmark/single_gaudi/embedding-microservice_run.yaml
similarity index 100%
rename from ChatQnA/kubernetes/manifests/Intel/benchmark/single_gaudi/embedding-microservice_run.yaml
rename to ChatQnA/benchmark/single_gaudi/embedding-microservice_run.yaml
diff --git a/ChatQnA/kubernetes/manifests/Intel/benchmark/single_gaudi/llm-dependency_run.yaml b/ChatQnA/benchmark/single_gaudi/llm-dependency_run.yaml
similarity index 100%
rename from ChatQnA/kubernetes/manifests/Intel/benchmark/single_gaudi/llm-dependency_run.yaml
rename to ChatQnA/benchmark/single_gaudi/llm-dependency_run.yaml
diff --git a/ChatQnA/kubernetes/manifests/Intel/benchmark/single_gaudi/llm-microservice_run.yaml b/ChatQnA/benchmark/single_gaudi/llm-microservice_run.yaml
similarity index 100%
rename from ChatQnA/kubernetes/manifests/Intel/benchmark/single_gaudi/llm-microservice_run.yaml
rename to ChatQnA/benchmark/single_gaudi/llm-microservice_run.yaml
diff --git a/ChatQnA/kubernetes/manifests/Intel/benchmark/single_gaudi/reranking-dependency_run.yaml b/ChatQnA/benchmark/single_gaudi/reranking-dependency_run.yaml
similarity index 100%
rename from ChatQnA/kubernetes/manifests/Intel/benchmark/single_gaudi/reranking-dependency_run.yaml
rename to ChatQnA/benchmark/single_gaudi/reranking-dependency_run.yaml
diff --git a/ChatQnA/kubernetes/manifests/Intel/benchmark/single_gaudi/reranking-microservice_run.yaml b/ChatQnA/benchmark/single_gaudi/reranking-microservice_run.yaml
similarity index 100%
rename from ChatQnA/kubernetes/manifests/Intel/benchmark/single_gaudi/reranking-microservice_run.yaml
rename to ChatQnA/benchmark/single_gaudi/reranking-microservice_run.yaml
diff --git a/ChatQnA/kubernetes/manifests/Intel/benchmark/single_gaudi/retrieval-microservice_run.yaml b/ChatQnA/benchmark/single_gaudi/retrieval-microservice_run.yaml
similarity index 100%
rename from ChatQnA/kubernetes/manifests/Intel/benchmark/single_gaudi/retrieval-microservice_run.yaml
rename to ChatQnA/benchmark/single_gaudi/retrieval-microservice_run.yaml
diff --git a/ChatQnA/kubernetes/manifests/Intel/benchmark/single_gaudi/vector-db_run.yaml b/ChatQnA/benchmark/single_gaudi/vector-db_run.yaml
similarity index 100%
rename from ChatQnA/kubernetes/manifests/Intel/benchmark/single_gaudi/vector-db_run.yaml
rename to ChatQnA/benchmark/single_gaudi/vector-db_run.yaml
diff --git a/ChatQnA/kubernetes/manifests/Intel/benchmark/two_gaudi/chatqna_config_map.yaml b/ChatQnA/benchmark/two_gaudi/chatqna_config_map.yaml
similarity index 100%
rename from ChatQnA/kubernetes/manifests/Intel/benchmark/two_gaudi/chatqna_config_map.yaml
rename to ChatQnA/benchmark/two_gaudi/chatqna_config_map.yaml
diff --git a/ChatQnA/kubernetes/manifests/Intel/benchmark/two_gaudi/chatqna_mega_service_run.yaml b/ChatQnA/benchmark/two_gaudi/chatqna_mega_service_run.yaml
similarity index 100%
rename from ChatQnA/kubernetes/manifests/Intel/benchmark/two_gaudi/chatqna_mega_service_run.yaml
rename to ChatQnA/benchmark/two_gaudi/chatqna_mega_service_run.yaml
diff --git a/ChatQnA/kubernetes/manifests/Intel/benchmark/two_gaudi/dataprep-microservice_run.yaml b/ChatQnA/benchmark/two_gaudi/dataprep-microservice_run.yaml
similarity index 100%
rename from ChatQnA/kubernetes/manifests/Intel/benchmark/two_gaudi/dataprep-microservice_run.yaml
rename to ChatQnA/benchmark/two_gaudi/dataprep-microservice_run.yaml
diff --git a/ChatQnA/kubernetes/manifests/Intel/benchmark/two_gaudi/embedding-dependency_run.yaml b/ChatQnA/benchmark/two_gaudi/embedding-dependency_run.yaml
similarity index 100%
rename from ChatQnA/kubernetes/manifests/Intel/benchmark/two_gaudi/embedding-dependency_run.yaml
rename to ChatQnA/benchmark/two_gaudi/embedding-dependency_run.yaml
diff --git a/ChatQnA/kubernetes/manifests/Intel/benchmark/two_gaudi/embedding-microservice_run.yaml b/ChatQnA/benchmark/two_gaudi/embedding-microservice_run.yaml
similarity index 100%
rename from ChatQnA/kubernetes/manifests/Intel/benchmark/two_gaudi/embedding-microservice_run.yaml
rename to ChatQnA/benchmark/two_gaudi/embedding-microservice_run.yaml
diff --git a/ChatQnA/kubernetes/manifests/Intel/benchmark/two_gaudi/llm-dependency_run.yaml b/ChatQnA/benchmark/two_gaudi/llm-dependency_run.yaml
similarity index 100%
rename from ChatQnA/kubernetes/manifests/Intel/benchmark/two_gaudi/llm-dependency_run.yaml
rename to ChatQnA/benchmark/two_gaudi/llm-dependency_run.yaml
diff --git a/ChatQnA/kubernetes/manifests/Intel/benchmark/two_gaudi/llm-microservice_run.yaml b/ChatQnA/benchmark/two_gaudi/llm-microservice_run.yaml
similarity index 100%
rename from ChatQnA/kubernetes/manifests/Intel/benchmark/two_gaudi/llm-microservice_run.yaml
rename to ChatQnA/benchmark/two_gaudi/llm-microservice_run.yaml
diff --git a/ChatQnA/kubernetes/manifests/Intel/benchmark/two_gaudi/reranking-dependency_run.yaml b/ChatQnA/benchmark/two_gaudi/reranking-dependency_run.yaml
similarity index 100%
rename from ChatQnA/kubernetes/manifests/Intel/benchmark/two_gaudi/reranking-dependency_run.yaml
rename to ChatQnA/benchmark/two_gaudi/reranking-dependency_run.yaml
diff --git a/ChatQnA/kubernetes/manifests/Intel/benchmark/two_gaudi/reranking-microservice_run.yaml b/ChatQnA/benchmark/two_gaudi/reranking-microservice_run.yaml
similarity index 100%
rename from ChatQnA/kubernetes/manifests/Intel/benchmark/two_gaudi/reranking-microservice_run.yaml
rename to ChatQnA/benchmark/two_gaudi/reranking-microservice_run.yaml
diff --git a/ChatQnA/kubernetes/manifests/Intel/benchmark/two_gaudi/retrieval-microservice_run.yaml b/ChatQnA/benchmark/two_gaudi/retrieval-microservice_run.yaml
similarity index 100%
rename from ChatQnA/kubernetes/manifests/Intel/benchmark/two_gaudi/retrieval-microservice_run.yaml
rename to ChatQnA/benchmark/two_gaudi/retrieval-microservice_run.yaml
diff --git a/ChatQnA/kubernetes/manifests/Intel/benchmark/two_gaudi/vector-db_run.yaml b/ChatQnA/benchmark/two_gaudi/vector-db_run.yaml
similarity index 100%
rename from ChatQnA/kubernetes/manifests/Intel/benchmark/two_gaudi/vector-db_run.yaml
rename to ChatQnA/benchmark/two_gaudi/vector-db_run.yaml
diff --git a/ChatQnA/docker_compose/Intel/HPU/README.md b/ChatQnA/docker_compose/Intel/HPU/gaudi/README.md
similarity index 100%
rename from ChatQnA/docker_compose/Intel/HPU/README.md
rename to ChatQnA/docker_compose/Intel/HPU/gaudi/README.md
diff --git a/ChatQnA/docker_compose/Intel/HPU/compose.yaml b/ChatQnA/docker_compose/Intel/HPU/gaudi/compose.yaml
similarity index 100%
rename from ChatQnA/docker_compose/Intel/HPU/compose.yaml
rename to ChatQnA/docker_compose/Intel/HPU/gaudi/compose.yaml
diff --git a/ChatQnA/docker_compose/Intel/HPU/compose_guardrails.yaml b/ChatQnA/docker_compose/Intel/HPU/gaudi/compose_guardrails.yaml
similarity index 100%
rename from ChatQnA/docker_compose/Intel/HPU/compose_guardrails.yaml
rename to ChatQnA/docker_compose/Intel/HPU/gaudi/compose_guardrails.yaml
diff --git a/ChatQnA/docker_compose/Intel/HPU/compose_vllm.yaml b/ChatQnA/docker_compose/Intel/HPU/gaudi/compose_vllm.yaml
similarity index 100%
rename from ChatQnA/docker_compose/Intel/HPU/compose_vllm.yaml
rename to ChatQnA/docker_compose/Intel/HPU/gaudi/compose_vllm.yaml
diff --git a/ChatQnA/docker_compose/Intel/HPU/compose_vllm_ray.yaml b/ChatQnA/docker_compose/Intel/HPU/gaudi/compose_vllm_ray.yaml
similarity index 100%
rename from ChatQnA/docker_compose/Intel/HPU/compose_vllm_ray.yaml
rename to ChatQnA/docker_compose/Intel/HPU/gaudi/compose_vllm_ray.yaml
diff --git a/ChatQnA/docker_compose/Intel/HPU/compose_without_rerank.yaml b/ChatQnA/docker_compose/Intel/HPU/gaudi/compose_without_rerank.yaml
similarity index 100%
rename from ChatQnA/docker_compose/Intel/HPU/compose_without_rerank.yaml
rename to ChatQnA/docker_compose/Intel/HPU/gaudi/compose_without_rerank.yaml
diff --git a/ChatQnA/docker_compose/Intel/HPU/how_to_validate_service.md b/ChatQnA/docker_compose/Intel/HPU/gaudi/how_to_validate_service.md
similarity index 100%
rename from ChatQnA/docker_compose/Intel/HPU/how_to_validate_service.md
rename to ChatQnA/docker_compose/Intel/HPU/gaudi/how_to_validate_service.md
diff --git a/ChatQnA/docker_compose/Intel/HPU/set_env.sh b/ChatQnA/docker_compose/Intel/HPU/gaudi/set_env.sh
similarity index 100%
rename from ChatQnA/docker_compose/Intel/HPU/set_env.sh
rename to ChatQnA/docker_compose/Intel/HPU/gaudi/set_env.sh
diff --git a/ChatQnA/docker_compose/NVIDIA/README.md b/ChatQnA/docker_compose/NVIDIA/GPU/README.md
similarity index 100%
rename from ChatQnA/docker_compose/NVIDIA/README.md
rename to ChatQnA/docker_compose/NVIDIA/GPU/README.md
diff --git a/ChatQnA/docker_compose/NVIDIA/compose.yaml b/ChatQnA/docker_compose/NVIDIA/GPU/compose.yaml
similarity index 100%
rename from ChatQnA/docker_compose/NVIDIA/compose.yaml
rename to ChatQnA/docker_compose/NVIDIA/GPU/compose.yaml
diff --git a/ChatQnA/docker_compose/NVIDIA/set_env.sh b/ChatQnA/docker_compose/NVIDIA/GPU/set_env.sh
similarity index 100%
rename from ChatQnA/docker_compose/NVIDIA/set_env.sh
rename to ChatQnA/docker_compose/NVIDIA/GPU/set_env.sh
diff --git a/ChatQnA/kubernetes/manifests/Intel/README.md b/ChatQnA/kubernetes/intel/README.md
similarity index 100%
rename from ChatQnA/kubernetes/manifests/Intel/README.md
rename to ChatQnA/kubernetes/intel/README.md
diff --git a/ChatQnA/kubernetes/manifests/Intel/CPU/chatqna.yaml b/ChatQnA/kubernetes/intel/cpu/xeon/manifest/chatqna.yaml
similarity index 100%
rename from ChatQnA/kubernetes/manifests/Intel/CPU/chatqna.yaml
rename to ChatQnA/kubernetes/intel/cpu/xeon/manifest/chatqna.yaml
diff --git a/ChatQnA/kubernetes/manifests/Intel/HPU/chatqna.yaml b/ChatQnA/kubernetes/intel/hpu/gaudi/manifest/chatqna.yaml
similarity index 100%
rename from ChatQnA/kubernetes/manifests/Intel/HPU/chatqna.yaml
rename to ChatQnA/kubernetes/intel/hpu/gaudi/manifest/chatqna.yaml
diff --git a/ChatQnA/Dockerfile_ui b/ChatQnA/ui/docker/Dockerfile
similarity index 100%
rename from ChatQnA/Dockerfile_ui
rename to ChatQnA/ui/docker/Dockerfile
diff --git a/ChatQnA/Dockerfile_ui.react b/ChatQnA/ui/docker/Dockerfile.react
similarity index 100%
rename from ChatQnA/Dockerfile_ui.react
rename to ChatQnA/ui/docker/Dockerfile.react
diff --git a/CodeGen/docker_compose/Intel/CPU/README.md b/CodeGen/docker_compose/Intel/CPU/xeon/README.md
similarity index 100%
rename from CodeGen/docker_compose/Intel/CPU/README.md
rename to CodeGen/docker_compose/Intel/CPU/xeon/README.md
diff --git a/CodeGen/docker_compose/Intel/CPU/compose.yaml b/CodeGen/docker_compose/Intel/CPU/xeon/compose.yaml
similarity index 100%
rename from CodeGen/docker_compose/Intel/CPU/compose.yaml
rename to CodeGen/docker_compose/Intel/CPU/xeon/compose.yaml
diff --git a/CodeGen/docker_compose/Intel/HPU/README.md b/CodeGen/docker_compose/Intel/HPU/gaudi/README.md
similarity index 100%
rename from CodeGen/docker_compose/Intel/HPU/README.md
rename to CodeGen/docker_compose/Intel/HPU/gaudi/README.md
diff --git a/CodeGen/docker_compose/Intel/HPU/compose.yaml b/CodeGen/docker_compose/Intel/HPU/gaudi/compose.yaml
similarity index 100%
rename from CodeGen/docker_compose/Intel/HPU/compose.yaml
rename to CodeGen/docker_compose/Intel/HPU/gaudi/compose.yaml
diff --git a/CodeGen/kubernetes/manifests/Intel/README.md b/CodeGen/kubernetes/intel/README.md
similarity index 100%
rename from CodeGen/kubernetes/manifests/Intel/README.md
rename to CodeGen/kubernetes/intel/README.md
diff --git a/CodeGen/kubernetes/manifests/Intel/CPU/codegen.yaml b/CodeGen/kubernetes/intel/cpu/xeon/manifest/codegen.yaml
similarity index 100%
rename from CodeGen/kubernetes/manifests/Intel/CPU/codegen.yaml
rename to CodeGen/kubernetes/intel/cpu/xeon/manifest/codegen.yaml
diff --git a/CodeGen/kubernetes/manifests/Intel/CPU/ui/README.md b/CodeGen/kubernetes/intel/cpu/xeon/manifest/ui/README.md
similarity index 100%
rename from CodeGen/kubernetes/manifests/Intel/CPU/ui/README.md
rename to CodeGen/kubernetes/intel/cpu/xeon/manifest/ui/README.md
diff --git a/CodeGen/kubernetes/manifests/Intel/CPU/ui/react-codegen.yaml b/CodeGen/kubernetes/intel/cpu/xeon/manifest/ui/react-codegen.yaml
similarity index 100%
rename from CodeGen/kubernetes/manifests/Intel/CPU/ui/react-codegen.yaml
rename to CodeGen/kubernetes/intel/cpu/xeon/manifest/ui/react-codegen.yaml
diff --git a/CodeGen/kubernetes/manifests/Intel/HPU/codegen.yaml b/CodeGen/kubernetes/intel/hpu/gaudi/manifest/codegen.yaml
similarity index 100%
rename from CodeGen/kubernetes/manifests/Intel/HPU/codegen.yaml
rename to CodeGen/kubernetes/intel/hpu/gaudi/manifest/codegen.yaml
diff --git a/CodeGen/Dockerfile_ui b/CodeGen/ui/docker/Dockerfile
similarity index 100%
rename from CodeGen/Dockerfile_ui
rename to CodeGen/ui/docker/Dockerfile
diff --git a/CodeGen/Dockerfile_ui.react b/CodeGen/ui/docker/Dockerfile.react
similarity index 100%
rename from CodeGen/Dockerfile_ui.react
rename to CodeGen/ui/docker/Dockerfile.react
diff --git a/CodeTrans/docker_compose/Intel/CPU/README.md b/CodeTrans/docker_compose/Intel/CPU/xeon/README.md
similarity index 100%
rename from CodeTrans/docker_compose/Intel/CPU/README.md
rename to CodeTrans/docker_compose/Intel/CPU/xeon/README.md
diff --git a/CodeTrans/docker_compose/Intel/CPU/compose.yaml b/CodeTrans/docker_compose/Intel/CPU/xeon/compose.yaml
similarity index 100%
rename from CodeTrans/docker_compose/Intel/CPU/compose.yaml
rename to CodeTrans/docker_compose/Intel/CPU/xeon/compose.yaml
diff --git a/CodeTrans/docker_compose/Intel/HPU/README.md b/CodeTrans/docker_compose/Intel/HPU/gaudi/README.md
similarity index 100%
rename from CodeTrans/docker_compose/Intel/HPU/README.md
rename to CodeTrans/docker_compose/Intel/HPU/gaudi/README.md
diff --git a/CodeTrans/docker_compose/Intel/HPU/compose.yaml b/CodeTrans/docker_compose/Intel/HPU/gaudi/compose.yaml
similarity index 100%
rename from CodeTrans/docker_compose/Intel/HPU/compose.yaml
rename to CodeTrans/docker_compose/Intel/HPU/gaudi/compose.yaml
diff --git a/CodeTrans/kubernetes/manifests/Intel/README.md b/CodeTrans/kubernetes/intel/README.md
similarity index 100%
rename from CodeTrans/kubernetes/manifests/Intel/README.md
rename to CodeTrans/kubernetes/intel/README.md
diff --git a/CodeTrans/kubernetes/manifests/Intel/CPU/codetrans.yaml b/CodeTrans/kubernetes/intel/cpu/xeon/manifest/codetrans.yaml
similarity index 100%
rename from CodeTrans/kubernetes/manifests/Intel/CPU/codetrans.yaml
rename to CodeTrans/kubernetes/intel/cpu/xeon/manifest/codetrans.yaml
diff --git a/CodeTrans/kubernetes/manifests/Intel/HPU/codetrans.yaml b/CodeTrans/kubernetes/intel/hpu/gaudi/manifest/codetrans.yaml
similarity index 100%
rename from CodeTrans/kubernetes/manifests/Intel/HPU/codetrans.yaml
rename to CodeTrans/kubernetes/intel/hpu/gaudi/manifest/codetrans.yaml
diff --git a/CodeTrans/Dockerfile_ui b/CodeTrans/ui/docker/Dockerfile
similarity index 100%
rename from CodeTrans/Dockerfile_ui
rename to CodeTrans/ui/docker/Dockerfile
diff --git a/DocIndexRetriever/docker_compose/Intel/CPU/docker_compose.yaml b/DocIndexRetriever/docker_compose/Intel/CPU/xeon/docker_compose.yaml
similarity index 100%
rename from DocIndexRetriever/docker_compose/Intel/CPU/docker_compose.yaml
rename to DocIndexRetriever/docker_compose/Intel/CPU/xeon/docker_compose.yaml
diff --git a/DocIndexRetriever/docker_compose/Intel/HPU/docker_compose.yaml b/DocIndexRetriever/docker_compose/Intel/HPU/gaudi/docker_compose.yaml
similarity index 100%
rename from DocIndexRetriever/docker_compose/Intel/HPU/docker_compose.yaml
rename to DocIndexRetriever/docker_compose/Intel/HPU/gaudi/docker_compose.yaml
diff --git a/DocSum/docker_compose/Intel/CPU/README.md b/DocSum/docker_compose/Intel/CPU/xeon/README.md
similarity index 100%
rename from DocSum/docker_compose/Intel/CPU/README.md
rename to DocSum/docker_compose/Intel/CPU/xeon/README.md
diff --git a/DocSum/docker_compose/Intel/CPU/compose.yaml b/DocSum/docker_compose/Intel/CPU/xeon/compose.yaml
similarity index 100%
rename from DocSum/docker_compose/Intel/CPU/compose.yaml
rename to DocSum/docker_compose/Intel/CPU/xeon/compose.yaml
diff --git a/DocSum/docker_compose/Intel/HPU/README.md b/DocSum/docker_compose/Intel/HPU/gaudi/README.md
similarity index 100%
rename from DocSum/docker_compose/Intel/HPU/README.md
rename to DocSum/docker_compose/Intel/HPU/gaudi/README.md
diff --git a/DocSum/docker_compose/Intel/HPU/compose.yaml b/DocSum/docker_compose/Intel/HPU/gaudi/compose.yaml
similarity index 100%
rename from DocSum/docker_compose/Intel/HPU/compose.yaml
rename to DocSum/docker_compose/Intel/HPU/gaudi/compose.yaml
diff --git a/DocSum/kubernetes/manifests/Intel/README.md b/DocSum/kubernetes/intel/README.md
similarity index 100%
rename from DocSum/kubernetes/manifests/Intel/README.md
rename to DocSum/kubernetes/intel/README.md
diff --git a/DocSum/kubernetes/manifests/Intel/CPU/docsum.yaml b/DocSum/kubernetes/intel/cpu/xeon/manifest/docsum.yaml
similarity index 100%
rename from DocSum/kubernetes/manifests/Intel/CPU/docsum.yaml
rename to DocSum/kubernetes/intel/cpu/xeon/manifest/docsum.yaml
diff --git a/DocSum/kubernetes/manifests/Intel/CPU/ui/README.md b/DocSum/kubernetes/intel/cpu/xeon/manifest/ui/README.md
similarity index 100%
rename from DocSum/kubernetes/manifests/Intel/CPU/ui/README.md
rename to DocSum/kubernetes/intel/cpu/xeon/manifest/ui/README.md
diff --git a/DocSum/kubernetes/manifests/Intel/CPU/ui/react-docsum.yaml b/DocSum/kubernetes/intel/cpu/xeon/manifest/ui/react-docsum.yaml
similarity index 100%
rename from DocSum/kubernetes/manifests/Intel/CPU/ui/react-docsum.yaml
rename to DocSum/kubernetes/intel/cpu/xeon/manifest/ui/react-docsum.yaml
diff --git a/DocSum/kubernetes/manifests/Intel/HPU/docsum.yaml b/DocSum/kubernetes/intel/hpu/gaudi/manifest/docsum.yaml
similarity index 100%
rename from DocSum/kubernetes/manifests/Intel/HPU/docsum.yaml
rename to DocSum/kubernetes/intel/hpu/gaudi/manifest/docsum.yaml
diff --git a/DocSum/Dockerfile_ui b/DocSum/ui/docker/Dockerfile
similarity index 100%
rename from DocSum/Dockerfile_ui
rename to DocSum/ui/docker/Dockerfile
diff --git a/DocSum/Dockerfile_ui.react b/DocSum/ui/docker/Dockerfile.react
similarity index 100%
rename from DocSum/Dockerfile_ui.react
rename to DocSum/ui/docker/Dockerfile.react
diff --git a/FaqGen/docker_compose/Intel/CPU/README.md b/FaqGen/docker_compose/Intel/CPU/xeon/README.md
similarity index 100%
rename from FaqGen/docker_compose/Intel/CPU/README.md
rename to FaqGen/docker_compose/Intel/CPU/xeon/README.md
diff --git a/FaqGen/docker_compose/Intel/CPU/compose.yaml b/FaqGen/docker_compose/Intel/CPU/xeon/compose.yaml
similarity index 100%
rename from FaqGen/docker_compose/Intel/CPU/compose.yaml
rename to FaqGen/docker_compose/Intel/CPU/xeon/compose.yaml
diff --git a/FaqGen/docker_compose/Intel/HPU/README.md b/FaqGen/docker_compose/Intel/HPU/gaudi/README.md
similarity index 100%
rename from FaqGen/docker_compose/Intel/HPU/README.md
rename to FaqGen/docker_compose/Intel/HPU/gaudi/README.md
diff --git a/FaqGen/docker_compose/Intel/HPU/compose.yaml b/FaqGen/docker_compose/Intel/HPU/gaudi/compose.yaml
similarity index 100%
rename from FaqGen/docker_compose/Intel/HPU/compose.yaml
rename to FaqGen/docker_compose/Intel/HPU/gaudi/compose.yaml
diff --git a/FaqGen/kubernetes/manifests/Intel/README.md b/FaqGen/kubernetes/intel/README.md
similarity index 100%
rename from FaqGen/kubernetes/manifests/Intel/README.md
rename to FaqGen/kubernetes/intel/README.md
diff --git a/FaqGen/kubernetes/manifests/Intel/CPU/faqgen.yaml b/FaqGen/kubernetes/intel/cpu/xeon/manifest/faqgen.yaml
similarity index 100%
rename from FaqGen/kubernetes/manifests/Intel/CPU/faqgen.yaml
rename to FaqGen/kubernetes/intel/cpu/xeon/manifest/faqgen.yaml
diff --git a/FaqGen/kubernetes/manifests/Intel/CPU/ui/README.md b/FaqGen/kubernetes/intel/cpu/xeon/manifest/ui/README.md
similarity index 100%
rename from FaqGen/kubernetes/manifests/Intel/CPU/ui/README.md
rename to FaqGen/kubernetes/intel/cpu/xeon/manifest/ui/README.md
diff --git a/FaqGen/kubernetes/manifests/Intel/CPU/ui/react-faqgen.yaml b/FaqGen/kubernetes/intel/cpu/xeon/manifest/ui/react-faqgen.yaml
similarity index 100%
rename from FaqGen/kubernetes/manifests/Intel/CPU/ui/react-faqgen.yaml
rename to FaqGen/kubernetes/intel/cpu/xeon/manifest/ui/react-faqgen.yaml
diff --git a/FaqGen/kubernetes/manifests/Intel/HPU/faqgen.yaml b/FaqGen/kubernetes/intel/hpu/gaudi/manifest/faqgen.yaml
similarity index 100%
rename from FaqGen/kubernetes/manifests/Intel/HPU/faqgen.yaml
rename to FaqGen/kubernetes/intel/hpu/gaudi/manifest/faqgen.yaml
diff --git a/FaqGen/kubernetes/manifests/Intel/ui.yaml b/FaqGen/kubernetes/intel/ui.yaml
similarity index 100%
rename from FaqGen/kubernetes/manifests/Intel/ui.yaml
rename to FaqGen/kubernetes/intel/ui.yaml
diff --git a/FaqGen/Dockerfile_ui b/FaqGen/ui/docker/Dockerfile
similarity index 100%
rename from FaqGen/Dockerfile_ui
rename to FaqGen/ui/docker/Dockerfile
diff --git a/FaqGen/Dockerfile_ui.react b/FaqGen/ui/docker/Dockerfile.react
similarity index 100%
rename from FaqGen/Dockerfile_ui.react
rename to FaqGen/ui/docker/Dockerfile.react
diff --git a/InstructionTuning/docker_compose/Intel/CPU/README.md b/InstructionTuning/docker_compose/Intel/CPU/xeon/README.md
similarity index 100%
rename from InstructionTuning/docker_compose/Intel/CPU/README.md
rename to InstructionTuning/docker_compose/Intel/CPU/xeon/README.md
diff --git a/InstructionTuning/docker_compose/Intel/HPU/README.md b/InstructionTuning/docker_compose/Intel/HPU/gaudi/README.md
similarity index 100%
rename from InstructionTuning/docker_compose/Intel/HPU/README.md
rename to InstructionTuning/docker_compose/Intel/HPU/gaudi/README.md
diff --git a/ProductivitySuite/docker_compose/Intel/CPU/README.md b/ProductivitySuite/docker_compose/Intel/CPU/xeon/README.md
similarity index 100%
rename from ProductivitySuite/docker_compose/Intel/CPU/README.md
rename to ProductivitySuite/docker_compose/Intel/CPU/xeon/README.md
diff --git a/ProductivitySuite/docker_compose/Intel/CPU/compose.yaml b/ProductivitySuite/docker_compose/Intel/CPU/xeon/compose.yaml
similarity index 100%
rename from ProductivitySuite/docker_compose/Intel/CPU/compose.yaml
rename to ProductivitySuite/docker_compose/Intel/CPU/xeon/compose.yaml
diff --git a/ProductivitySuite/docker_compose/Intel/CPU/keycloak_setup_guide.md b/ProductivitySuite/docker_compose/Intel/CPU/xeon/keycloak_setup_guide.md
similarity index 100%
rename from ProductivitySuite/docker_compose/Intel/CPU/keycloak_setup_guide.md
rename to ProductivitySuite/docker_compose/Intel/CPU/xeon/keycloak_setup_guide.md
diff --git a/ProductivitySuite/docker_compose/Intel/CPU/set_env.sh b/ProductivitySuite/docker_compose/Intel/CPU/xeon/set_env.sh
similarity index 100%
rename from ProductivitySuite/docker_compose/Intel/CPU/set_env.sh
rename to ProductivitySuite/docker_compose/Intel/CPU/xeon/set_env.sh
diff --git a/ProductivitySuite/kubernetes/manifests/Intel/README.md b/ProductivitySuite/kubernetes/intel/README.md
similarity index 100%
rename from ProductivitySuite/kubernetes/manifests/Intel/README.md
rename to ProductivitySuite/kubernetes/intel/README.md
diff --git a/ProductivitySuite/kubernetes/manifests/Intel/CPU/chat_history.yaml b/ProductivitySuite/kubernetes/intel/cpu/xeon/manifest/chat_history.yaml
similarity index 100%
rename from ProductivitySuite/kubernetes/manifests/Intel/CPU/chat_history.yaml
rename to ProductivitySuite/kubernetes/intel/cpu/xeon/manifest/chat_history.yaml
diff --git a/ProductivitySuite/kubernetes/manifests/Intel/CPU/chatqna.yaml b/ProductivitySuite/kubernetes/intel/cpu/xeon/manifest/chatqna.yaml
similarity index 100%
rename from ProductivitySuite/kubernetes/manifests/Intel/CPU/chatqna.yaml
rename to ProductivitySuite/kubernetes/intel/cpu/xeon/manifest/chatqna.yaml
diff --git a/ProductivitySuite/kubernetes/manifests/Intel/CPU/codegen.yaml b/ProductivitySuite/kubernetes/intel/cpu/xeon/manifest/codegen.yaml
similarity index 100%
rename from ProductivitySuite/kubernetes/manifests/Intel/CPU/codegen.yaml
rename to ProductivitySuite/kubernetes/intel/cpu/xeon/manifest/codegen.yaml
diff --git a/ProductivitySuite/kubernetes/manifests/Intel/CPU/docsum.yaml b/ProductivitySuite/kubernetes/intel/cpu/xeon/manifest/docsum.yaml
similarity index 100%
rename from ProductivitySuite/kubernetes/manifests/Intel/CPU/docsum.yaml
rename to ProductivitySuite/kubernetes/intel/cpu/xeon/manifest/docsum.yaml
diff --git a/ProductivitySuite/kubernetes/manifests/Intel/CPU/faqgen.yaml b/ProductivitySuite/kubernetes/intel/cpu/xeon/manifest/faqgen.yaml
similarity index 100%
rename from ProductivitySuite/kubernetes/manifests/Intel/CPU/faqgen.yaml
rename to ProductivitySuite/kubernetes/intel/cpu/xeon/manifest/faqgen.yaml
diff --git a/ProductivitySuite/kubernetes/manifests/Intel/CPU/keycloak_install.yaml b/ProductivitySuite/kubernetes/intel/cpu/xeon/manifest/keycloak_install.yaml
similarity index 100%
rename from ProductivitySuite/kubernetes/manifests/Intel/CPU/keycloak_install.yaml
rename to ProductivitySuite/kubernetes/intel/cpu/xeon/manifest/keycloak_install.yaml
diff --git a/ProductivitySuite/kubernetes/manifests/Intel/CPU/mongo.yaml b/ProductivitySuite/kubernetes/intel/cpu/xeon/manifest/mongo.yaml
similarity index 100%
rename from ProductivitySuite/kubernetes/manifests/Intel/CPU/mongo.yaml
rename to ProductivitySuite/kubernetes/intel/cpu/xeon/manifest/mongo.yaml
diff --git a/ProductivitySuite/kubernetes/manifests/Intel/CPU/productivity_suite_reactui.yaml b/ProductivitySuite/kubernetes/intel/cpu/xeon/manifest/productivity_suite_reactui.yaml
similarity index 100%
rename from ProductivitySuite/kubernetes/manifests/Intel/CPU/productivity_suite_reactui.yaml
rename to ProductivitySuite/kubernetes/intel/cpu/xeon/manifest/productivity_suite_reactui.yaml
diff --git a/ProductivitySuite/kubernetes/manifests/Intel/CPU/prompt_registry.yaml b/ProductivitySuite/kubernetes/intel/cpu/xeon/manifest/prompt_registry.yaml
similarity index 100%
rename from ProductivitySuite/kubernetes/manifests/Intel/CPU/prompt_registry.yaml
rename to ProductivitySuite/kubernetes/intel/cpu/xeon/manifest/prompt_registry.yaml
diff --git a/ProductivitySuite/Dockerfile_ui.react b/ProductivitySuite/ui/docker/Dockerfile.react
similarity index 100%
rename from ProductivitySuite/Dockerfile_ui.react
rename to ProductivitySuite/ui/docker/Dockerfile.react
diff --git a/RerankFinetuning/docker/xeon/README.md b/RerankFinetuning/docker_compose/Intel/CPU/xeon/README.md
similarity index 100%
rename from RerankFinetuning/docker/xeon/README.md
rename to RerankFinetuning/docker_compose/Intel/CPU/xeon/README.md
diff --git a/SearchQnA/docker_compose/Intel/CPU/README.md b/SearchQnA/docker_compose/Intel/CPU/xeon/README.md
similarity index 100%
rename from SearchQnA/docker_compose/Intel/CPU/README.md
rename to SearchQnA/docker_compose/Intel/CPU/xeon/README.md
diff --git a/SearchQnA/docker_compose/Intel/CPU/compose.yaml b/SearchQnA/docker_compose/Intel/CPU/xeon/compose.yaml
similarity index 100%
rename from SearchQnA/docker_compose/Intel/CPU/compose.yaml
rename to SearchQnA/docker_compose/Intel/CPU/xeon/compose.yaml
diff --git a/SearchQnA/docker_compose/Intel/HPU/README.md b/SearchQnA/docker_compose/Intel/HPU/gaudi/README.md
similarity index 100%
rename from SearchQnA/docker_compose/Intel/HPU/README.md
rename to SearchQnA/docker_compose/Intel/HPU/gaudi/README.md
diff --git a/SearchQnA/docker_compose/Intel/HPU/compose.yaml b/SearchQnA/docker_compose/Intel/HPU/gaudi/compose.yaml
similarity index 100%
rename from SearchQnA/docker_compose/Intel/HPU/compose.yaml
rename to SearchQnA/docker_compose/Intel/HPU/gaudi/compose.yaml
diff --git a/SearchQnA/Dockerfile_ui b/SearchQnA/ui/docker/Dockerfile
similarity index 100%
rename from SearchQnA/Dockerfile_ui
rename to SearchQnA/ui/docker/Dockerfile
diff --git a/Translation/docker_compose/Intel/CPU/README.md b/Translation/docker_compose/Intel/CPU/xeon/README.md
similarity index 100%
rename from Translation/docker_compose/Intel/CPU/README.md
rename to Translation/docker_compose/Intel/CPU/xeon/README.md
diff --git a/Translation/docker_compose/Intel/CPU/compose.yaml b/Translation/docker_compose/Intel/CPU/xeon/compose.yaml
similarity index 100%
rename from Translation/docker_compose/Intel/CPU/compose.yaml
rename to Translation/docker_compose/Intel/CPU/xeon/compose.yaml
diff --git a/Translation/docker_compose/Intel/HPU/README.md b/Translation/docker_compose/Intel/HPU/gaudi/README.md
similarity index 100%
rename from Translation/docker_compose/Intel/HPU/README.md
rename to Translation/docker_compose/Intel/HPU/gaudi/README.md
diff --git a/Translation/docker_compose/Intel/HPU/compose.yaml b/Translation/docker_compose/Intel/HPU/gaudi/compose.yaml
similarity index 100%
rename from Translation/docker_compose/Intel/HPU/compose.yaml
rename to Translation/docker_compose/Intel/HPU/gaudi/compose.yaml
diff --git a/Translation/kubernetes/manifests/README.md b/Translation/kubernetes/manifests/README.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/Translation/Dockerfile_ui b/Translation/ui/docker/Dockerfile
similarity index 100%
rename from Translation/Dockerfile_ui
rename to Translation/ui/docker/Dockerfile
diff --git a/VisualQnA/docker_compose/Intel/CPU/README.md b/VisualQnA/docker_compose/Intel/CPU/xeon/README.md
similarity index 100%
rename from VisualQnA/docker_compose/Intel/CPU/README.md
rename to VisualQnA/docker_compose/Intel/CPU/xeon/README.md
diff --git a/VisualQnA/docker_compose/Intel/CPU/compose.yaml b/VisualQnA/docker_compose/Intel/CPU/xeon/compose.yaml
similarity index 100%
rename from VisualQnA/docker_compose/Intel/CPU/compose.yaml
rename to VisualQnA/docker_compose/Intel/CPU/xeon/compose.yaml
diff --git a/VisualQnA/docker_compose/Intel/CPU/set_env.sh b/VisualQnA/docker_compose/Intel/CPU/xeon/set_env.sh
similarity index 100%
rename from VisualQnA/docker_compose/Intel/CPU/set_env.sh
rename to VisualQnA/docker_compose/Intel/CPU/xeon/set_env.sh
diff --git a/VisualQnA/docker_compose/Intel/HPU/README.md b/VisualQnA/docker_compose/Intel/HPU/gaudi/README.md
similarity index 100%
rename from VisualQnA/docker_compose/Intel/HPU/README.md
rename to VisualQnA/docker_compose/Intel/HPU/gaudi/README.md
diff --git a/VisualQnA/docker_compose/Intel/HPU/compose.yaml b/VisualQnA/docker_compose/Intel/HPU/gaudi/compose.yaml
similarity index 100%
rename from VisualQnA/docker_compose/Intel/HPU/compose.yaml
rename to VisualQnA/docker_compose/Intel/HPU/gaudi/compose.yaml
diff --git a/VisualQnA/docker_compose/Intel/HPU/set_env.sh b/VisualQnA/docker_compose/Intel/HPU/gaudi/set_env.sh
similarity index 100%
rename from VisualQnA/docker_compose/Intel/HPU/set_env.sh
rename to VisualQnA/docker_compose/Intel/HPU/gaudi/set_env.sh
diff --git a/VisualQnA/kubernetes/manifests/Intel/README.md b/VisualQnA/kubernetes/intel/README.md
similarity index 100%
rename from VisualQnA/kubernetes/manifests/Intel/README.md
rename to VisualQnA/kubernetes/intel/README.md
diff --git a/VisualQnA/kubernetes/manifests/Intel/CPU/visualqna.yaml b/VisualQnA/kubernetes/intel/cpu/xeon/manifest/visualqna.yaml
similarity index 100%
rename from VisualQnA/kubernetes/manifests/Intel/CPU/visualqna.yaml
rename to VisualQnA/kubernetes/intel/cpu/xeon/manifest/visualqna.yaml
diff --git a/VisualQnA/kubernetes/manifests/Intel/HPU/visualqna.yaml b/VisualQnA/kubernetes/intel/hpu/gaudi/manifest/visualqna.yaml
similarity index 100%
rename from VisualQnA/kubernetes/manifests/Intel/HPU/visualqna.yaml
rename to VisualQnA/kubernetes/intel/hpu/gaudi/manifest/visualqna.yaml
diff --git a/VisualQnA/Dockerfile_ui b/VisualQnA/ui/docker/Dockerfile
similarity index 100%
rename from VisualQnA/Dockerfile_ui
rename to VisualQnA/ui/docker/Dockerfile