diff --git a/.github/workflows/E2E_test_with_compose.yml b/.github/workflows/E2E_test_with_compose.yml
index 192e63df5..8be309367 100644
--- a/.github/workflows/E2E_test_with_compose.yml
+++ b/.github/workflows/E2E_test_with_compose.yml
@@ -8,7 +8,7 @@ on:
     branches: [main]
     types: [opened, reopened, ready_for_review, synchronize] # added `ready_for_review` since draft is skipped
     paths:
-      - "**/docker-composer/**"
+      - "**/docker/**"
       - "**/tests/**"
       - "**/ui/**"
       - "!**.md"
@@ -90,7 +90,7 @@ jobs:
           hardware: ${{ matrix.hardware }}
         if: always()
         run: |
-          cd ${{ github.workspace }}/$example/docker-composer/$hardware
+          cd ${{ github.workspace }}/$example/docker/$hardware
           container_list=$(cat docker_compose.yaml | grep container_name | cut -d':' -f2)
           for container_name in $container_list; do
               cid=$(docker ps -aq --filter "name=$container_name")
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 6f939c00c..f5aa2287c 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -11,9 +11,9 @@ repos:
       - id: check-json
         exclude: |
           (?x)^(
-              ChatQnA/ui/svelte/tsconfig.json|
+              ChatQnA/docker/ui/svelte/tsconfig.json|
               SearchQnA/ui/svelte/tsconfig.json|
-              DocSum/ui/svelte/tsconfig.json
+              DocSum/docker/ui/svelte/tsconfig.json
           )$
       - id: check-yaml
         args: [--allow-multiple-documents]
diff --git a/ChatQnA/Dockerfile b/ChatQnA/docker/Dockerfile
similarity index 100%
rename from ChatQnA/Dockerfile
rename to ChatQnA/docker/Dockerfile
diff --git a/ChatQnA/chatqna.py b/ChatQnA/docker/chatqna.py
similarity index 100%
rename from ChatQnA/chatqna.py
rename to ChatQnA/docker/chatqna.py
diff --git a/ChatQnA/docker-composer/gaudi/README.md b/ChatQnA/docker/gaudi/README.md
similarity index 100%
rename from ChatQnA/docker-composer/gaudi/README.md
rename to ChatQnA/docker/gaudi/README.md
diff --git a/ChatQnA/docker-composer/gaudi/docker_compose.yaml b/ChatQnA/docker/gaudi/docker_compose.yaml
similarity index 100%
rename from ChatQnA/docker-composer/gaudi/docker_compose.yaml
rename to ChatQnA/docker/gaudi/docker_compose.yaml
diff --git a/ChatQnA/ui/docker/Dockerfile b/ChatQnA/docker/ui/docker/Dockerfile
similarity index 100%
rename from ChatQnA/ui/docker/Dockerfile
rename to ChatQnA/docker/ui/docker/Dockerfile
diff --git a/ChatQnA/ui/svelte/.editorconfig b/ChatQnA/docker/ui/svelte/.editorconfig
similarity index 100%
rename from ChatQnA/ui/svelte/.editorconfig
rename to ChatQnA/docker/ui/svelte/.editorconfig
diff --git a/ChatQnA/ui/svelte/.env b/ChatQnA/docker/ui/svelte/.env
similarity index 100%
rename from ChatQnA/ui/svelte/.env
rename to ChatQnA/docker/ui/svelte/.env
diff --git a/ChatQnA/ui/svelte/.eslintignore b/ChatQnA/docker/ui/svelte/.eslintignore
similarity index 100%
rename from ChatQnA/ui/svelte/.eslintignore
rename to ChatQnA/docker/ui/svelte/.eslintignore
diff --git a/ChatQnA/ui/svelte/.eslintrc.cjs b/ChatQnA/docker/ui/svelte/.eslintrc.cjs
similarity index 100%
rename from ChatQnA/ui/svelte/.eslintrc.cjs
rename to ChatQnA/docker/ui/svelte/.eslintrc.cjs
diff --git a/ChatQnA/ui/svelte/.prettierignore b/ChatQnA/docker/ui/svelte/.prettierignore
similarity index 100%
rename from ChatQnA/ui/svelte/.prettierignore
rename to ChatQnA/docker/ui/svelte/.prettierignore
diff --git a/ChatQnA/ui/svelte/.prettierrc b/ChatQnA/docker/ui/svelte/.prettierrc
similarity index 100%
rename from ChatQnA/ui/svelte/.prettierrc
rename to ChatQnA/docker/ui/svelte/.prettierrc
diff --git a/ChatQnA/ui/svelte/README.md b/ChatQnA/docker/ui/svelte/README.md
similarity index 100%
rename from ChatQnA/ui/svelte/README.md
rename to ChatQnA/docker/ui/svelte/README.md
diff --git a/ChatQnA/ui/svelte/package.json b/ChatQnA/docker/ui/svelte/package.json
similarity index 100%
rename from ChatQnA/ui/svelte/package.json
rename to ChatQnA/docker/ui/svelte/package.json
diff --git a/ChatQnA/ui/svelte/playwright.config.ts b/ChatQnA/docker/ui/svelte/playwright.config.ts
similarity index 100%
rename from ChatQnA/ui/svelte/playwright.config.ts
rename to ChatQnA/docker/ui/svelte/playwright.config.ts
diff --git a/ChatQnA/ui/svelte/postcss.config.cjs b/ChatQnA/docker/ui/svelte/postcss.config.cjs
similarity index 100%
rename from ChatQnA/ui/svelte/postcss.config.cjs
rename to ChatQnA/docker/ui/svelte/postcss.config.cjs
diff --git a/ChatQnA/ui/svelte/src/app.d.ts b/ChatQnA/docker/ui/svelte/src/app.d.ts
similarity index 100%
rename from ChatQnA/ui/svelte/src/app.d.ts
rename to ChatQnA/docker/ui/svelte/src/app.d.ts
diff --git a/ChatQnA/ui/svelte/src/app.html b/ChatQnA/docker/ui/svelte/src/app.html
similarity index 100%
rename from ChatQnA/ui/svelte/src/app.html
rename to ChatQnA/docker/ui/svelte/src/app.html
diff --git a/ChatQnA/ui/svelte/src/app.postcss b/ChatQnA/docker/ui/svelte/src/app.postcss
similarity index 100%
rename from ChatQnA/ui/svelte/src/app.postcss
rename to ChatQnA/docker/ui/svelte/src/app.postcss
diff --git a/ChatQnA/ui/svelte/src/lib/assets/avatar/svelte/Delete.svelte b/ChatQnA/docker/ui/svelte/src/lib/assets/avatar/svelte/Delete.svelte
similarity index 100%
rename from ChatQnA/ui/svelte/src/lib/assets/avatar/svelte/Delete.svelte
rename to ChatQnA/docker/ui/svelte/src/lib/assets/avatar/svelte/Delete.svelte
diff --git a/ChatQnA/ui/svelte/src/lib/assets/chat/svelte/Assistant.svelte b/ChatQnA/docker/ui/svelte/src/lib/assets/chat/svelte/Assistant.svelte
similarity index 100%
rename from ChatQnA/ui/svelte/src/lib/assets/chat/svelte/Assistant.svelte
rename to ChatQnA/docker/ui/svelte/src/lib/assets/chat/svelte/Assistant.svelte
diff --git a/ChatQnA/ui/svelte/src/lib/assets/chat/svelte/PaperAirplane.svelte b/ChatQnA/docker/ui/svelte/src/lib/assets/chat/svelte/PaperAirplane.svelte
similarity index 100%
rename from ChatQnA/ui/svelte/src/lib/assets/chat/svelte/PaperAirplane.svelte
rename to ChatQnA/docker/ui/svelte/src/lib/assets/chat/svelte/PaperAirplane.svelte
diff --git a/ChatQnA/ui/svelte/src/lib/assets/chat/svelte/PersonOutlined.svelte b/ChatQnA/docker/ui/svelte/src/lib/assets/chat/svelte/PersonOutlined.svelte
similarity index 100%
rename from ChatQnA/ui/svelte/src/lib/assets/chat/svelte/PersonOutlined.svelte
rename to ChatQnA/docker/ui/svelte/src/lib/assets/chat/svelte/PersonOutlined.svelte
diff --git a/ChatQnA/ui/svelte/src/lib/assets/layout/css/driver.css b/ChatQnA/docker/ui/svelte/src/lib/assets/layout/css/driver.css
similarity index 100%
rename from ChatQnA/ui/svelte/src/lib/assets/layout/css/driver.css
rename to ChatQnA/docker/ui/svelte/src/lib/assets/layout/css/driver.css
diff --git a/ChatQnA/ui/svelte/src/lib/assets/upload/next.svelte b/ChatQnA/docker/ui/svelte/src/lib/assets/upload/next.svelte
similarity index 100%
rename from ChatQnA/ui/svelte/src/lib/assets/upload/next.svelte
rename to ChatQnA/docker/ui/svelte/src/lib/assets/upload/next.svelte
diff --git a/ChatQnA/ui/svelte/src/lib/assets/upload/previous.svelte b/ChatQnA/docker/ui/svelte/src/lib/assets/upload/previous.svelte
similarity index 100%
rename from ChatQnA/ui/svelte/src/lib/assets/upload/previous.svelte
rename to ChatQnA/docker/ui/svelte/src/lib/assets/upload/previous.svelte
diff --git a/ChatQnA/ui/svelte/src/lib/assets/voice/svg/paste.svg b/ChatQnA/docker/ui/svelte/src/lib/assets/voice/svg/paste.svg
similarity index 100%
rename from ChatQnA/ui/svelte/src/lib/assets/voice/svg/paste.svg
rename to ChatQnA/docker/ui/svelte/src/lib/assets/voice/svg/paste.svg
diff --git a/ChatQnA/ui/svelte/src/lib/assets/voice/svg/uploadFile.svg b/ChatQnA/docker/ui/svelte/src/lib/assets/voice/svg/uploadFile.svg
similarity index 100%
rename from ChatQnA/ui/svelte/src/lib/assets/voice/svg/uploadFile.svg
rename to ChatQnA/docker/ui/svelte/src/lib/assets/voice/svg/uploadFile.svg
diff --git a/ChatQnA/ui/svelte/src/lib/modules/chat/ChatMessage.svelte b/ChatQnA/docker/ui/svelte/src/lib/modules/chat/ChatMessage.svelte
similarity index 100%
rename from ChatQnA/ui/svelte/src/lib/modules/chat/ChatMessage.svelte
rename to ChatQnA/docker/ui/svelte/src/lib/modules/chat/ChatMessage.svelte
diff --git a/ChatQnA/ui/svelte/src/lib/modules/chat/MessageAvatar.svelte b/ChatQnA/docker/ui/svelte/src/lib/modules/chat/MessageAvatar.svelte
similarity index 100%
rename from ChatQnA/ui/svelte/src/lib/modules/chat/MessageAvatar.svelte
rename to ChatQnA/docker/ui/svelte/src/lib/modules/chat/MessageAvatar.svelte
diff --git a/ChatQnA/ui/svelte/src/lib/modules/chat/MessageTimer.svelte b/ChatQnA/docker/ui/svelte/src/lib/modules/chat/MessageTimer.svelte
similarity index 100%
rename from ChatQnA/ui/svelte/src/lib/modules/chat/MessageTimer.svelte
rename to ChatQnA/docker/ui/svelte/src/lib/modules/chat/MessageTimer.svelte
diff --git a/ChatQnA/ui/svelte/src/lib/modules/frame/Layout.svelte b/ChatQnA/docker/ui/svelte/src/lib/modules/frame/Layout.svelte
similarity index 100%
rename from ChatQnA/ui/svelte/src/lib/modules/frame/Layout.svelte
rename to ChatQnA/docker/ui/svelte/src/lib/modules/frame/Layout.svelte
diff --git a/ChatQnA/ui/svelte/src/lib/network/chat/Network.ts b/ChatQnA/docker/ui/svelte/src/lib/network/chat/Network.ts
similarity index 100%
rename from ChatQnA/ui/svelte/src/lib/network/chat/Network.ts
rename to ChatQnA/docker/ui/svelte/src/lib/network/chat/Network.ts
diff --git a/ChatQnA/ui/svelte/src/lib/network/upload/Network.ts b/ChatQnA/docker/ui/svelte/src/lib/network/upload/Network.ts
similarity index 100%
rename from ChatQnA/ui/svelte/src/lib/network/upload/Network.ts
rename to ChatQnA/docker/ui/svelte/src/lib/network/upload/Network.ts
diff --git a/ChatQnA/ui/svelte/src/lib/shared/Utils.ts b/ChatQnA/docker/ui/svelte/src/lib/shared/Utils.ts
similarity index 100%
rename from ChatQnA/ui/svelte/src/lib/shared/Utils.ts
rename to ChatQnA/docker/ui/svelte/src/lib/shared/Utils.ts
diff --git a/ChatQnA/ui/svelte/src/lib/shared/components/chat/gallery.svelte b/ChatQnA/docker/ui/svelte/src/lib/shared/components/chat/gallery.svelte
similarity index 100%
rename from ChatQnA/ui/svelte/src/lib/shared/components/chat/gallery.svelte
rename to ChatQnA/docker/ui/svelte/src/lib/shared/components/chat/gallery.svelte
diff --git a/ChatQnA/ui/svelte/src/lib/shared/components/loading/Loading.svelte b/ChatQnA/docker/ui/svelte/src/lib/shared/components/loading/Loading.svelte
similarity index 100%
rename from ChatQnA/ui/svelte/src/lib/shared/components/loading/Loading.svelte
rename to ChatQnA/docker/ui/svelte/src/lib/shared/components/loading/Loading.svelte
diff --git a/ChatQnA/ui/svelte/src/lib/shared/components/scrollbar/Scrollbar.svelte b/ChatQnA/docker/ui/svelte/src/lib/shared/components/scrollbar/Scrollbar.svelte
similarity index 100%
rename from ChatQnA/ui/svelte/src/lib/shared/components/scrollbar/Scrollbar.svelte
rename to ChatQnA/docker/ui/svelte/src/lib/shared/components/scrollbar/Scrollbar.svelte
diff --git a/ChatQnA/ui/svelte/src/lib/shared/components/upload/PasteKnowledge.svelte b/ChatQnA/docker/ui/svelte/src/lib/shared/components/upload/PasteKnowledge.svelte
similarity index 100%
rename from ChatQnA/ui/svelte/src/lib/shared/components/upload/PasteKnowledge.svelte
rename to ChatQnA/docker/ui/svelte/src/lib/shared/components/upload/PasteKnowledge.svelte
diff --git a/ChatQnA/ui/svelte/src/lib/shared/components/upload/upload-knowledge.svelte b/ChatQnA/docker/ui/svelte/src/lib/shared/components/upload/upload-knowledge.svelte
similarity index 100%
rename from ChatQnA/ui/svelte/src/lib/shared/components/upload/upload-knowledge.svelte
rename to ChatQnA/docker/ui/svelte/src/lib/shared/components/upload/upload-knowledge.svelte
diff --git a/ChatQnA/ui/svelte/src/lib/shared/components/upload/uploadFile.svelte b/ChatQnA/docker/ui/svelte/src/lib/shared/components/upload/uploadFile.svelte
similarity index 100%
rename from ChatQnA/ui/svelte/src/lib/shared/components/upload/uploadFile.svelte
rename to ChatQnA/docker/ui/svelte/src/lib/shared/components/upload/uploadFile.svelte
diff --git a/ChatQnA/ui/svelte/src/lib/shared/constant/Interface.ts b/ChatQnA/docker/ui/svelte/src/lib/shared/constant/Interface.ts
similarity index 100%
rename from ChatQnA/ui/svelte/src/lib/shared/constant/Interface.ts
rename to ChatQnA/docker/ui/svelte/src/lib/shared/constant/Interface.ts
diff --git a/ChatQnA/ui/svelte/src/lib/shared/stores/common/Store.ts b/ChatQnA/docker/ui/svelte/src/lib/shared/stores/common/Store.ts
similarity index 100%
rename from ChatQnA/ui/svelte/src/lib/shared/stores/common/Store.ts
rename to ChatQnA/docker/ui/svelte/src/lib/shared/stores/common/Store.ts
diff --git a/ChatQnA/ui/svelte/src/routes/+layout.svelte b/ChatQnA/docker/ui/svelte/src/routes/+layout.svelte
similarity index 100%
rename from ChatQnA/ui/svelte/src/routes/+layout.svelte
rename to ChatQnA/docker/ui/svelte/src/routes/+layout.svelte
diff --git a/ChatQnA/ui/svelte/src/routes/+page.svelte b/ChatQnA/docker/ui/svelte/src/routes/+page.svelte
similarity index 100%
rename from ChatQnA/ui/svelte/src/routes/+page.svelte
rename to ChatQnA/docker/ui/svelte/src/routes/+page.svelte
diff --git a/ChatQnA/ui/svelte/src/routes/+page.ts b/ChatQnA/docker/ui/svelte/src/routes/+page.ts
similarity index 100%
rename from ChatQnA/ui/svelte/src/routes/+page.ts
rename to ChatQnA/docker/ui/svelte/src/routes/+page.ts
diff --git a/ChatQnA/ui/svelte/static/favicon.png b/ChatQnA/docker/ui/svelte/static/favicon.png
similarity index 100%
rename from ChatQnA/ui/svelte/static/favicon.png
rename to ChatQnA/docker/ui/svelte/static/favicon.png
diff --git a/ChatQnA/ui/svelte/svelte.config.js b/ChatQnA/docker/ui/svelte/svelte.config.js
similarity index 100%
rename from ChatQnA/ui/svelte/svelte.config.js
rename to ChatQnA/docker/ui/svelte/svelte.config.js
diff --git a/ChatQnA/ui/svelte/tailwind.config.cjs b/ChatQnA/docker/ui/svelte/tailwind.config.cjs
similarity index 100%
rename from ChatQnA/ui/svelte/tailwind.config.cjs
rename to ChatQnA/docker/ui/svelte/tailwind.config.cjs
diff --git a/ChatQnA/ui/svelte/tests/chatQnA.spec.ts b/ChatQnA/docker/ui/svelte/tests/chatQnA.spec.ts
similarity index 100%
rename from ChatQnA/ui/svelte/tests/chatQnA.spec.ts
rename to ChatQnA/docker/ui/svelte/tests/chatQnA.spec.ts
diff --git a/ChatQnA/ui/svelte/tests/test_file.txt b/ChatQnA/docker/ui/svelte/tests/test_file.txt
similarity index 100%
rename from ChatQnA/ui/svelte/tests/test_file.txt
rename to ChatQnA/docker/ui/svelte/tests/test_file.txt
diff --git a/ChatQnA/ui/svelte/tsconfig.json b/ChatQnA/docker/ui/svelte/tsconfig.json
similarity index 100%
rename from ChatQnA/ui/svelte/tsconfig.json
rename to ChatQnA/docker/ui/svelte/tsconfig.json
diff --git a/ChatQnA/ui/svelte/vite.config.ts b/ChatQnA/docker/ui/svelte/vite.config.ts
similarity index 100%
rename from ChatQnA/ui/svelte/vite.config.ts
rename to ChatQnA/docker/ui/svelte/vite.config.ts
diff --git a/ChatQnA/docker-composer/xeon/README.md b/ChatQnA/docker/xeon/README.md
similarity index 100%
rename from ChatQnA/docker-composer/xeon/README.md
rename to ChatQnA/docker/xeon/README.md
diff --git a/ChatQnA/docker-composer/xeon/docker_compose.yaml b/ChatQnA/docker/xeon/docker_compose.yaml
similarity index 100%
rename from ChatQnA/docker-composer/xeon/docker_compose.yaml
rename to ChatQnA/docker/xeon/docker_compose.yaml
diff --git a/ChatQnA/kubernetes/service-mesh/README.md b/ChatQnA/kubernetes/service-mesh/README.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/ChatQnA/tests/test_chatqna_on_gaudi.sh b/ChatQnA/tests/test_chatqna_on_gaudi.sh
index 4a049f692..f2ae74535 100644
--- a/ChatQnA/tests/test_chatqna_on_gaudi.sh
+++ b/ChatQnA/tests/test_chatqna_on_gaudi.sh
@@ -27,17 +27,17 @@ function build_docker_images() {
     docker pull ghcr.io/huggingface/tgi-gaudi:1.2.1
     docker pull ghcr.io/huggingface/text-embeddings-inference:cpu-1.2
 
-    cd $WORKPATH
+    cd $WORKPATH/docker
     docker build --no-cache -t opea/chatqna:latest -f Dockerfile .
 
-    cd $WORKPATH/ui
+    cd $WORKPATH/docker/ui
     docker build --no-cache -t opea/chatqna-ui:latest -f docker/Dockerfile .
 
     docker images
 }
 
 function start_services() {
-    cd $WORKPATH/docker-composer/gaudi
+    cd $WORKPATH/docker/gaudi
 
     export EMBEDDING_MODEL_ID="BAAI/bge-base-en-v1.5"
     export RERANK_MODEL_ID="BAAI/bge-reranker-large"
@@ -56,7 +56,7 @@ function start_services() {
     export BACKEND_SERVICE_ENDPOINT="http://${ip_address}:8888/v1/chatqna"
     export DATAPREP_SERVICE_ENDPOINT="http://${ip_address}:6007/v1/dataprep"
 
-    sed -i "s/backend_address/$ip_address/g" $WORKPATH/ui/svelte/.env
+    sed -i "s/backend_address/$ip_address/g" $WORKPATH/docker/ui/svelte/.env
 
     # Start Docker Containers
     # TODO: Replace the container name with a test-specific name
@@ -194,7 +194,7 @@ function validate_megaservice() {
 }
 
 function validate_frontend() {
-    cd $WORKPATH/ui/svelte
+    cd $WORKPATH/docker/ui/svelte
     local conda_env_name="ChatQnA_e2e"
     export PATH=${HOME}/miniconda3/bin/:$PATH
     conda remove -n ${conda_env_name} --all -y
@@ -218,7 +218,7 @@ function validate_frontend() {
 }
 
 function stop_docker() {
-    cd $WORKPATH/docker-composer/gaudi
+    cd $WORKPATH/docker/gaudi
     container_list=$(cat docker_compose.yaml | grep container_name | cut -d':' -f2)
     for container_name in $container_list; do
         cid=$(docker ps -aq --filter "name=$container_name")
diff --git a/ChatQnA/tests/test_chatqna_on_xeon.sh b/ChatQnA/tests/test_chatqna_on_xeon.sh
index 6b90a8a43..3d8bfb4ab 100644
--- a/ChatQnA/tests/test_chatqna_on_xeon.sh
+++ b/ChatQnA/tests/test_chatqna_on_xeon.sh
@@ -19,17 +19,17 @@ function build_docker_images() {
     docker build -t opea/llm-tgi:latest -f comps/llms/text-generation/tgi/Dockerfile .
     docker build -t opea/dataprep-redis:latest -f comps/dataprep/redis/docker/Dockerfile .
 
-    cd $WORKPATH
+    cd $WORKPATH/docker
     docker build --no-cache -t opea/chatqna:latest -f Dockerfile .
 
-    cd $WORKPATH/ui
+    cd $WORKPATH/docker/ui
     docker build --no-cache -t opea/chatqna-ui:latest -f docker/Dockerfile .
 
     docker images
 }
 
 function start_services() {
-    cd $WORKPATH/docker-composer/xeon
+    cd $WORKPATH/docker/xeon
 
     export EMBEDDING_MODEL_ID="BAAI/bge-base-en-v1.5"
     export RERANK_MODEL_ID="BAAI/bge-reranker-large"
@@ -48,7 +48,7 @@ function start_services() {
     export BACKEND_SERVICE_ENDPOINT="http://${ip_address}:8888/v1/chatqna"
     export DATAPREP_SERVICE_ENDPOINT="http://${ip_address}:6007/v1/dataprep"
 
-    sed -i "s/backend_address/$ip_address/g" $WORKPATH/ui/svelte/.env
+    sed -i "s/backend_address/$ip_address/g" $WORKPATH/docker/ui/svelte/.env
 
     # Start Docker Containers
     # TODO: Replace the container name with a test-specific name
@@ -183,7 +183,7 @@ function validate_megaservice() {
 }
 
 function validate_frontend() {
-    cd $WORKPATH/ui/svelte
+    cd $WORKPATH/docker/ui/svelte
     local conda_env_name="ChatQnA_e2e"
     export PATH=${HOME}/miniconda3/bin/:$PATH
     conda remove -n ${conda_env_name} --all -y
@@ -208,7 +208,7 @@ function validate_frontend() {
 }
 
 function stop_docker() {
-    cd $WORKPATH/docker-composer/xeon
+    cd $WORKPATH/docker/xeon
     container_list=$(cat docker_compose.yaml | grep container_name | cut -d':' -f2)
     for container_name in $container_list; do
         cid=$(docker ps -aq --filter "name=$container_name")
diff --git a/CodeGen/Dockerfile b/CodeGen/docker/Dockerfile
similarity index 100%
rename from CodeGen/Dockerfile
rename to CodeGen/docker/Dockerfile
diff --git a/CodeGen/codegen.py b/CodeGen/docker/codegen.py
similarity index 100%
rename from CodeGen/codegen.py
rename to CodeGen/docker/codegen.py
diff --git a/CodeGen/docker-composer/gaudi/README.md b/CodeGen/docker/gaudi/README.md
similarity index 100%
rename from CodeGen/docker-composer/gaudi/README.md
rename to CodeGen/docker/gaudi/README.md
diff --git a/CodeGen/docker-composer/gaudi/docker_compose.yaml b/CodeGen/docker/gaudi/docker_compose.yaml
similarity index 100%
rename from CodeGen/docker-composer/gaudi/docker_compose.yaml
rename to CodeGen/docker/gaudi/docker_compose.yaml
diff --git a/CodeGen/ui/docker/Dockerfile b/CodeGen/docker/ui/docker/Dockerfile
similarity index 100%
rename from CodeGen/ui/docker/Dockerfile
rename to CodeGen/docker/ui/docker/Dockerfile
diff --git a/CodeGen/ui/svelte/.env b/CodeGen/docker/ui/svelte/.env
similarity index 100%
rename from CodeGen/ui/svelte/.env
rename to CodeGen/docker/ui/svelte/.env
diff --git a/CodeGen/ui/svelte/.npmrc b/CodeGen/docker/ui/svelte/.npmrc
similarity index 100%
rename from CodeGen/ui/svelte/.npmrc
rename to CodeGen/docker/ui/svelte/.npmrc
diff --git a/CodeGen/ui/svelte/README.md b/CodeGen/docker/ui/svelte/README.md
similarity index 100%
rename from CodeGen/ui/svelte/README.md
rename to CodeGen/docker/ui/svelte/README.md
diff --git a/CodeGen/ui/svelte/package.json b/CodeGen/docker/ui/svelte/package.json
similarity index 100%
rename from CodeGen/ui/svelte/package.json
rename to CodeGen/docker/ui/svelte/package.json
diff --git a/CodeGen/ui/svelte/postcss.config.cjs b/CodeGen/docker/ui/svelte/postcss.config.cjs
similarity index 100%
rename from CodeGen/ui/svelte/postcss.config.cjs
rename to CodeGen/docker/ui/svelte/postcss.config.cjs
diff --git a/CodeGen/ui/svelte/src/app.d.ts b/CodeGen/docker/ui/svelte/src/app.d.ts
similarity index 100%
rename from CodeGen/ui/svelte/src/app.d.ts
rename to CodeGen/docker/ui/svelte/src/app.d.ts
diff --git a/CodeGen/ui/svelte/src/app.html b/CodeGen/docker/ui/svelte/src/app.html
similarity index 100%
rename from CodeGen/ui/svelte/src/app.html
rename to CodeGen/docker/ui/svelte/src/app.html
diff --git a/CodeGen/ui/svelte/src/app.pcss b/CodeGen/docker/ui/svelte/src/app.pcss
similarity index 100%
rename from CodeGen/ui/svelte/src/app.pcss
rename to CodeGen/docker/ui/svelte/src/app.pcss
diff --git a/CodeGen/ui/svelte/src/lib/InputAirPlane.svelte b/CodeGen/docker/ui/svelte/src/lib/InputAirPlane.svelte
similarity index 100%
rename from CodeGen/ui/svelte/src/lib/InputAirPlane.svelte
rename to CodeGen/docker/ui/svelte/src/lib/InputAirPlane.svelte
diff --git a/CodeGen/ui/svelte/src/lib/assets/PaperAirplane.svelte b/CodeGen/docker/ui/svelte/src/lib/assets/PaperAirplane.svelte
similarity index 100%
rename from CodeGen/ui/svelte/src/lib/assets/PaperAirplane.svelte
rename to CodeGen/docker/ui/svelte/src/lib/assets/PaperAirplane.svelte
diff --git a/CodeGen/ui/svelte/src/lib/assets/imgLogo.svelte b/CodeGen/docker/ui/svelte/src/lib/assets/imgLogo.svelte
similarity index 100%
rename from CodeGen/ui/svelte/src/lib/assets/imgLogo.svelte
rename to CodeGen/docker/ui/svelte/src/lib/assets/imgLogo.svelte
diff --git a/CodeGen/ui/svelte/src/lib/assets/loadingAnimation.svelte b/CodeGen/docker/ui/svelte/src/lib/assets/loadingAnimation.svelte
similarity index 100%
rename from CodeGen/ui/svelte/src/lib/assets/loadingAnimation.svelte
rename to CodeGen/docker/ui/svelte/src/lib/assets/loadingAnimation.svelte
diff --git a/CodeGen/ui/svelte/src/lib/assets/spinLoading.svelte b/CodeGen/docker/ui/svelte/src/lib/assets/spinLoading.svelte
similarity index 100%
rename from CodeGen/ui/svelte/src/lib/assets/spinLoading.svelte
rename to CodeGen/docker/ui/svelte/src/lib/assets/spinLoading.svelte
diff --git a/CodeGen/ui/svelte/src/lib/assets/summaryLogo.svelte b/CodeGen/docker/ui/svelte/src/lib/assets/summaryLogo.svelte
similarity index 100%
rename from CodeGen/ui/svelte/src/lib/assets/summaryLogo.svelte
rename to CodeGen/docker/ui/svelte/src/lib/assets/summaryLogo.svelte
diff --git a/CodeGen/ui/svelte/src/lib/doc.svelte b/CodeGen/docker/ui/svelte/src/lib/doc.svelte
similarity index 100%
rename from CodeGen/ui/svelte/src/lib/doc.svelte
rename to CodeGen/docker/ui/svelte/src/lib/doc.svelte
diff --git a/CodeGen/ui/svelte/src/lib/dropFile.svelte b/CodeGen/docker/ui/svelte/src/lib/dropFile.svelte
similarity index 100%
rename from CodeGen/ui/svelte/src/lib/dropFile.svelte
rename to CodeGen/docker/ui/svelte/src/lib/dropFile.svelte
diff --git a/CodeGen/ui/svelte/src/lib/header.svelte b/CodeGen/docker/ui/svelte/src/lib/header.svelte
similarity index 100%
rename from CodeGen/ui/svelte/src/lib/header.svelte
rename to CodeGen/docker/ui/svelte/src/lib/header.svelte
diff --git a/CodeGen/ui/svelte/src/lib/index.ts b/CodeGen/docker/ui/svelte/src/lib/index.ts
similarity index 100%
rename from CodeGen/ui/svelte/src/lib/index.ts
rename to CodeGen/docker/ui/svelte/src/lib/index.ts
diff --git a/CodeGen/ui/svelte/src/lib/shared/Network.ts b/CodeGen/docker/ui/svelte/src/lib/shared/Network.ts
similarity index 100%
rename from CodeGen/ui/svelte/src/lib/shared/Network.ts
rename to CodeGen/docker/ui/svelte/src/lib/shared/Network.ts
diff --git a/CodeGen/ui/svelte/src/lib/shared/Store.ts b/CodeGen/docker/ui/svelte/src/lib/shared/Store.ts
similarity index 100%
rename from CodeGen/ui/svelte/src/lib/shared/Store.ts
rename to CodeGen/docker/ui/svelte/src/lib/shared/Store.ts
diff --git a/CodeGen/ui/svelte/src/lib/shared/Utils.ts b/CodeGen/docker/ui/svelte/src/lib/shared/Utils.ts
similarity index 100%
rename from CodeGen/ui/svelte/src/lib/shared/Utils.ts
rename to CodeGen/docker/ui/svelte/src/lib/shared/Utils.ts
diff --git a/CodeGen/ui/svelte/src/lib/summary.svelte b/CodeGen/docker/ui/svelte/src/lib/summary.svelte
similarity index 100%
rename from CodeGen/ui/svelte/src/lib/summary.svelte
rename to CodeGen/docker/ui/svelte/src/lib/summary.svelte
diff --git a/CodeGen/ui/svelte/src/routes/+layout.svelte b/CodeGen/docker/ui/svelte/src/routes/+layout.svelte
similarity index 100%
rename from CodeGen/ui/svelte/src/routes/+layout.svelte
rename to CodeGen/docker/ui/svelte/src/routes/+layout.svelte
diff --git a/CodeGen/ui/svelte/src/routes/+page.svelte b/CodeGen/docker/ui/svelte/src/routes/+page.svelte
similarity index 100%
rename from CodeGen/ui/svelte/src/routes/+page.svelte
rename to CodeGen/docker/ui/svelte/src/routes/+page.svelte
diff --git a/CodeGen/ui/svelte/static/favicon.png b/CodeGen/docker/ui/svelte/static/favicon.png
similarity index 100%
rename from CodeGen/ui/svelte/static/favicon.png
rename to CodeGen/docker/ui/svelte/static/favicon.png
diff --git a/CodeGen/ui/svelte/svelte.config.js b/CodeGen/docker/ui/svelte/svelte.config.js
similarity index 100%
rename from CodeGen/ui/svelte/svelte.config.js
rename to CodeGen/docker/ui/svelte/svelte.config.js
diff --git a/CodeGen/ui/svelte/tailwind.config.cjs b/CodeGen/docker/ui/svelte/tailwind.config.cjs
similarity index 100%
rename from CodeGen/ui/svelte/tailwind.config.cjs
rename to CodeGen/docker/ui/svelte/tailwind.config.cjs
diff --git a/CodeGen/ui/svelte/tsconfig.json b/CodeGen/docker/ui/svelte/tsconfig.json
similarity index 100%
rename from CodeGen/ui/svelte/tsconfig.json
rename to CodeGen/docker/ui/svelte/tsconfig.json
diff --git a/CodeGen/ui/svelte/vite.config.ts b/CodeGen/docker/ui/svelte/vite.config.ts
similarity index 100%
rename from CodeGen/ui/svelte/vite.config.ts
rename to CodeGen/docker/ui/svelte/vite.config.ts
diff --git a/CodeGen/docker-composer/xeon/README.md b/CodeGen/docker/xeon/README.md
similarity index 100%
rename from CodeGen/docker-composer/xeon/README.md
rename to CodeGen/docker/xeon/README.md
diff --git a/CodeGen/docker-composer/xeon/docker_compose.yaml b/CodeGen/docker/xeon/docker_compose.yaml
similarity index 100%
rename from CodeGen/docker-composer/xeon/docker_compose.yaml
rename to CodeGen/docker/xeon/docker_compose.yaml
diff --git a/CodeGen/kubernetes/helm-charts/README.md b/CodeGen/kubernetes/helm-charts/README.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/CodeGen/kubernetes/service-mesh/README.md b/CodeGen/kubernetes/service-mesh/README.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/CodeGen/tests/test_codegen_on_gaudi.sh b/CodeGen/tests/test_codegen_on_gaudi.sh
index 769a29954..12af7a393 100644
--- a/CodeGen/tests/test_codegen_on_gaudi.sh
+++ b/CodeGen/tests/test_codegen_on_gaudi.sh
@@ -27,17 +27,17 @@ function build_docker_images() {
 
     docker pull ghcr.io/huggingface/tgi-gaudi:1.2.1
 
-    cd $WORKPATH
+    cd $WORKPATH/docker
     docker build --no-cache -t opea/codegen:latest -f Dockerfile .
 
-    cd $WORKPATH/ui
+    cd $WORKPATH/docker/ui
     docker build --no-cache -t opea/codegen-ui:latest -f docker/Dockerfile .
 
     docker images
 }
 
 function start_services() {
-    cd $WORKPATH/docker-composer/gaudi
+    cd $WORKPATH/docker/gaudi
 
     export LLM_MODEL_ID="Intel/neural-chat-7b-v3-3"
     export TGI_LLM_ENDPOINT="http://${ip_address}:8028"
@@ -108,7 +108,7 @@ function validate_megaservice() {
 }
 
 function stop_docker() {
-    cd $WORKPATH/docker-composer/gaudi
+    cd $WORKPATH/docker/gaudi
     container_list=$(cat docker_compose.yaml | grep container_name | cut -d':' -f2)
     for container_name in $container_list; do
         cid=$(docker ps -aq --filter "name=$container_name")
diff --git a/CodeGen/tests/test_codegen_on_xeon.sh b/CodeGen/tests/test_codegen_on_xeon.sh
index 2ae5b7825..b96d4395e 100644
--- a/CodeGen/tests/test_codegen_on_xeon.sh
+++ b/CodeGen/tests/test_codegen_on_xeon.sh
@@ -15,17 +15,17 @@ function build_docker_images() {
 
     docker build -t opea/llm-tgi:latest -f comps/llms/text-generation/tgi/Dockerfile .
 
-    cd $WORKPATH
+    cd $WORKPATH/docker
     docker build --no-cache -t opea/codegen:latest -f Dockerfile .
 
-    cd $WORKPATH/ui
+    cd $WORKPATH/docker/ui
     docker build --no-cache -t opea/codegen-ui:latest -f docker/Dockerfile .
 
     docker images
 }
 
 function start_services() {
-    cd $WORKPATH/docker-composer/xeon
+    cd $WORKPATH/docker/xeon
 
     export LLM_MODEL_ID="Intel/neural-chat-7b-v3-3"
     export TGI_LLM_ENDPOINT="http://${ip_address}:8028"
@@ -86,7 +86,7 @@ function validate_megaservice() {
 }
 
 function stop_docker() {
-    cd $WORKPATH/docker-composer/xeon
+    cd $WORKPATH/docker/xeon
     container_list=$(cat docker_compose.yaml | grep container_name | cut -d':' -f2)
     for container_name in $container_list; do
         cid=$(docker ps -aq --filter "name=$container_name")
diff --git a/CodeTrans/Dockerfile b/CodeTrans/docker/Dockerfile
similarity index 100%
rename from CodeTrans/Dockerfile
rename to CodeTrans/docker/Dockerfile
diff --git a/CodeTrans/code_translation.py b/CodeTrans/docker/code_translation.py
similarity index 100%
rename from CodeTrans/code_translation.py
rename to CodeTrans/docker/code_translation.py
diff --git a/CodeTrans/docker-composer/gaudi/README.md b/CodeTrans/docker/gaudi/README.md
similarity index 100%
rename from CodeTrans/docker-composer/gaudi/README.md
rename to CodeTrans/docker/gaudi/README.md
diff --git a/CodeTrans/docker-composer/gaudi/docker_compose.yaml b/CodeTrans/docker/gaudi/docker_compose.yaml
similarity index 100%
rename from CodeTrans/docker-composer/gaudi/docker_compose.yaml
rename to CodeTrans/docker/gaudi/docker_compose.yaml
diff --git a/CodeTrans/ui/docker/Dockerfile b/CodeTrans/docker/ui/docker/Dockerfile
similarity index 100%
rename from CodeTrans/ui/docker/Dockerfile
rename to CodeTrans/docker/ui/docker/Dockerfile
diff --git a/CodeTrans/ui/svelte/.env b/CodeTrans/docker/ui/svelte/.env
similarity index 100%
rename from CodeTrans/ui/svelte/.env
rename to CodeTrans/docker/ui/svelte/.env
diff --git a/CodeTrans/ui/svelte/.gitignore b/CodeTrans/docker/ui/svelte/.gitignore
similarity index 100%
rename from CodeTrans/ui/svelte/.gitignore
rename to CodeTrans/docker/ui/svelte/.gitignore
diff --git a/CodeTrans/ui/svelte/.npmrc b/CodeTrans/docker/ui/svelte/.npmrc
similarity index 100%
rename from CodeTrans/ui/svelte/.npmrc
rename to CodeTrans/docker/ui/svelte/.npmrc
diff --git a/CodeTrans/ui/svelte/README.md b/CodeTrans/docker/ui/svelte/README.md
similarity index 100%
rename from CodeTrans/ui/svelte/README.md
rename to CodeTrans/docker/ui/svelte/README.md
diff --git a/CodeTrans/ui/svelte/package.json b/CodeTrans/docker/ui/svelte/package.json
similarity index 100%
rename from CodeTrans/ui/svelte/package.json
rename to CodeTrans/docker/ui/svelte/package.json
diff --git a/CodeTrans/ui/svelte/postcss.config.cjs b/CodeTrans/docker/ui/svelte/postcss.config.cjs
similarity index 100%
rename from CodeTrans/ui/svelte/postcss.config.cjs
rename to CodeTrans/docker/ui/svelte/postcss.config.cjs
diff --git a/CodeTrans/ui/svelte/src/app.d.ts b/CodeTrans/docker/ui/svelte/src/app.d.ts
similarity index 100%
rename from CodeTrans/ui/svelte/src/app.d.ts
rename to CodeTrans/docker/ui/svelte/src/app.d.ts
diff --git a/CodeTrans/ui/svelte/src/app.html b/CodeTrans/docker/ui/svelte/src/app.html
similarity index 100%
rename from CodeTrans/ui/svelte/src/app.html
rename to CodeTrans/docker/ui/svelte/src/app.html
diff --git a/CodeTrans/ui/svelte/src/app.pcss b/CodeTrans/docker/ui/svelte/src/app.pcss
similarity index 100%
rename from CodeTrans/ui/svelte/src/app.pcss
rename to CodeTrans/docker/ui/svelte/src/app.pcss
diff --git a/CodeTrans/ui/svelte/src/lib/assets/loadingAnimation.svelte b/CodeTrans/docker/ui/svelte/src/lib/assets/loadingAnimation.svelte
similarity index 100%
rename from CodeTrans/ui/svelte/src/lib/assets/loadingAnimation.svelte
rename to CodeTrans/docker/ui/svelte/src/lib/assets/loadingAnimation.svelte
diff --git a/CodeTrans/ui/svelte/src/lib/assets/translateIcon.svelte b/CodeTrans/docker/ui/svelte/src/lib/assets/translateIcon.svelte
similarity index 100%
rename from CodeTrans/ui/svelte/src/lib/assets/translateIcon.svelte
rename to CodeTrans/docker/ui/svelte/src/lib/assets/translateIcon.svelte
diff --git a/CodeTrans/ui/svelte/src/lib/header.svelte b/CodeTrans/docker/ui/svelte/src/lib/header.svelte
similarity index 100%
rename from CodeTrans/ui/svelte/src/lib/header.svelte
rename to CodeTrans/docker/ui/svelte/src/lib/header.svelte
diff --git a/CodeTrans/ui/svelte/src/lib/shared/Network.ts b/CodeTrans/docker/ui/svelte/src/lib/shared/Network.ts
similarity index 100%
rename from CodeTrans/ui/svelte/src/lib/shared/Network.ts
rename to CodeTrans/docker/ui/svelte/src/lib/shared/Network.ts
diff --git a/CodeTrans/ui/svelte/src/lib/shared/constant.ts b/CodeTrans/docker/ui/svelte/src/lib/shared/constant.ts
similarity index 100%
rename from CodeTrans/ui/svelte/src/lib/shared/constant.ts
rename to CodeTrans/docker/ui/svelte/src/lib/shared/constant.ts
diff --git a/CodeTrans/ui/svelte/src/routes/+layout.svelte b/CodeTrans/docker/ui/svelte/src/routes/+layout.svelte
similarity index 100%
rename from CodeTrans/ui/svelte/src/routes/+layout.svelte
rename to CodeTrans/docker/ui/svelte/src/routes/+layout.svelte
diff --git a/CodeTrans/ui/svelte/src/routes/+page.svelte b/CodeTrans/docker/ui/svelte/src/routes/+page.svelte
similarity index 100%
rename from CodeTrans/ui/svelte/src/routes/+page.svelte
rename to CodeTrans/docker/ui/svelte/src/routes/+page.svelte
diff --git a/CodeTrans/ui/svelte/src/routes/types.d.ts b/CodeTrans/docker/ui/svelte/src/routes/types.d.ts
similarity index 100%
rename from CodeTrans/ui/svelte/src/routes/types.d.ts
rename to CodeTrans/docker/ui/svelte/src/routes/types.d.ts
diff --git a/CodeTrans/ui/svelte/static/favicon.png b/CodeTrans/docker/ui/svelte/static/favicon.png
similarity index 100%
rename from CodeTrans/ui/svelte/static/favicon.png
rename to CodeTrans/docker/ui/svelte/static/favicon.png
diff --git a/CodeTrans/ui/svelte/svelte.config.js b/CodeTrans/docker/ui/svelte/svelte.config.js
similarity index 100%
rename from CodeTrans/ui/svelte/svelte.config.js
rename to CodeTrans/docker/ui/svelte/svelte.config.js
diff --git a/CodeTrans/ui/svelte/tailwind.config.cjs b/CodeTrans/docker/ui/svelte/tailwind.config.cjs
similarity index 100%
rename from CodeTrans/ui/svelte/tailwind.config.cjs
rename to CodeTrans/docker/ui/svelte/tailwind.config.cjs
diff --git a/CodeTrans/ui/svelte/tsconfig.json b/CodeTrans/docker/ui/svelte/tsconfig.json
similarity index 100%
rename from CodeTrans/ui/svelte/tsconfig.json
rename to CodeTrans/docker/ui/svelte/tsconfig.json
diff --git a/CodeTrans/ui/svelte/vite.config.ts b/CodeTrans/docker/ui/svelte/vite.config.ts
similarity index 100%
rename from CodeTrans/ui/svelte/vite.config.ts
rename to CodeTrans/docker/ui/svelte/vite.config.ts
diff --git a/CodeTrans/docker-composer/xeon/README.md b/CodeTrans/docker/xeon/README.md
similarity index 100%
rename from CodeTrans/docker-composer/xeon/README.md
rename to CodeTrans/docker/xeon/README.md
diff --git a/CodeTrans/docker-composer/xeon/docker_compose.yaml b/CodeTrans/docker/xeon/docker_compose.yaml
similarity index 100%
rename from CodeTrans/docker-composer/xeon/docker_compose.yaml
rename to CodeTrans/docker/xeon/docker_compose.yaml
diff --git a/CodeTrans/kubernetes/helm-charts/README.md b/CodeTrans/kubernetes/helm-charts/README.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/CodeTrans/kubernetes/service-mesh/README.md b/CodeTrans/kubernetes/service-mesh/README.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/CodeTrans/tests/test_codetrans_on_gaudi.sh b/CodeTrans/tests/test_codetrans_on_gaudi.sh
index 9cae3e3ef..6e4773fac 100644
--- a/CodeTrans/tests/test_codetrans_on_gaudi.sh
+++ b/CodeTrans/tests/test_codetrans_on_gaudi.sh
@@ -17,17 +17,17 @@ function build_docker_images() {
 
     docker pull ghcr.io/huggingface/tgi-gaudi:1.2.1
 
-    cd $WORKPATH
+    cd $WORKPATH/docker
     docker build --no-cache -t opea/codetrans:latest -f Dockerfile .
 
-    cd $WORKPATH/ui
+    cd $WORKPATH/docker/ui
     docker build --no-cache -t opea/codetrans-ui:latest -f docker/Dockerfile .
 
     docker images
 }
 
 function start_services() {
-    cd $WORKPATH/docker-composer/gaudi
+    cd $WORKPATH/docker/gaudi
 
     export http_proxy=${http_proxy}
     export https_proxy=${http_proxy}
@@ -97,7 +97,7 @@ function validate_megaservice() {
 }
 
 function stop_docker() {
-    cd $WORKPATH/docker-composer/gaudi
+    cd $WORKPATH/docker/gaudi
     container_list=$(cat docker_compose.yaml | grep container_name | cut -d':' -f2)
     for container_name in $container_list; do
         cid=$(docker ps -aq --filter "name=$container_name")
diff --git a/CodeTrans/tests/test_codetrans_on_xeon.sh b/CodeTrans/tests/test_codetrans_on_xeon.sh
index b1b0dcda6..c6bbe09b6 100644
--- a/CodeTrans/tests/test_codetrans_on_xeon.sh
+++ b/CodeTrans/tests/test_codetrans_on_xeon.sh
@@ -15,17 +15,17 @@ function build_docker_images() {
 
     docker build -t opea/llm-tgi:latest -f comps/llms/text-generation/tgi/Dockerfile .
 
-    cd $WORKPATH
+    cd $WORKPATH/docker
     docker build --no-cache -t opea/codetrans:latest -f Dockerfile .
 
-    cd $WORKPATH/ui
+    cd $WORKPATH/docker/ui
     docker build --no-cache -t opea/codetrans-ui:latest -f docker/Dockerfile .
 
     docker images
 }
 
 function start_services() {
-    cd $WORKPATH/docker-composer/xeon
+    cd $WORKPATH/docker/xeon
     export http_proxy=${http_proxy}
     export https_proxy=${http_proxy}
     export LLM_MODEL_ID="HuggingFaceH4/mistral-7b-grok"
@@ -80,7 +80,7 @@ function validate_megaservice() {
 }
 
 function stop_docker() {
-    cd $WORKPATH/docker-composer/xeon
+    cd $WORKPATH/docker/xeon
     container_list=$(cat docker_compose.yaml | grep container_name | cut -d':' -f2)
     for container_name in $container_list; do
         cid=$(docker ps -aq --filter "name=$container_name")
diff --git a/DocSum/depracated/langchain/docker/summarize-app/packages/README.md b/DocSum/depracated/langchain/docker/summarize-app/packages/README.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/DocSum/depracated/README.md b/DocSum/deprecated/README.md
similarity index 100%
rename from DocSum/depracated/README.md
rename to DocSum/deprecated/README.md
diff --git a/DocSum/depracated/langchain/docker/Dockerfile b/DocSum/deprecated/langchain/docker/Dockerfile
similarity index 100%
rename from DocSum/depracated/langchain/docker/Dockerfile
rename to DocSum/deprecated/langchain/docker/Dockerfile
diff --git a/DocSum/depracated/langchain/docker/build_docker.sh b/DocSum/deprecated/langchain/docker/build_docker.sh
similarity index 100%
rename from DocSum/depracated/langchain/docker/build_docker.sh
rename to DocSum/deprecated/langchain/docker/build_docker.sh
diff --git a/DocSum/depracated/langchain/docker/requirements.txt b/DocSum/deprecated/langchain/docker/requirements.txt
similarity index 100%
rename from DocSum/depracated/langchain/docker/requirements.txt
rename to DocSum/deprecated/langchain/docker/requirements.txt
diff --git a/DocSum/depracated/langchain/docker/summarize-app/.gitignore b/DocSum/deprecated/langchain/docker/summarize-app/.gitignore
similarity index 100%
rename from DocSum/depracated/langchain/docker/summarize-app/.gitignore
rename to DocSum/deprecated/langchain/docker/summarize-app/.gitignore
diff --git a/DocSum/depracated/langchain/docker/summarize-app/Dockerfile b/DocSum/deprecated/langchain/docker/summarize-app/Dockerfile
similarity index 100%
rename from DocSum/depracated/langchain/docker/summarize-app/Dockerfile
rename to DocSum/deprecated/langchain/docker/summarize-app/Dockerfile
diff --git a/DocSum/depracated/langchain/docker/summarize-app/README.md b/DocSum/deprecated/langchain/docker/summarize-app/README.md
similarity index 100%
rename from DocSum/depracated/langchain/docker/summarize-app/README.md
rename to DocSum/deprecated/langchain/docker/summarize-app/README.md
diff --git a/DocSum/depracated/langchain/docker/summarize-app/app/__init__.py b/DocSum/deprecated/langchain/docker/summarize-app/app/__init__.py
similarity index 100%
rename from DocSum/depracated/langchain/docker/summarize-app/app/__init__.py
rename to DocSum/deprecated/langchain/docker/summarize-app/app/__init__.py
diff --git a/DocSum/depracated/langchain/docker/summarize-app/app/server.py b/DocSum/deprecated/langchain/docker/summarize-app/app/server.py
similarity index 100%
rename from DocSum/depracated/langchain/docker/summarize-app/app/server.py
rename to DocSum/deprecated/langchain/docker/summarize-app/app/server.py
diff --git a/DocSum/depracated/langchain/docker/summarize-app/app/utils.py b/DocSum/deprecated/langchain/docker/summarize-app/app/utils.py
similarity index 100%
rename from DocSum/depracated/langchain/docker/summarize-app/app/utils.py
rename to DocSum/deprecated/langchain/docker/summarize-app/app/utils.py
diff --git a/ChatQnA/kubernetes/helm-charts/README.md b/DocSum/deprecated/langchain/docker/summarize-app/packages/README.md
similarity index 100%
rename from ChatQnA/kubernetes/helm-charts/README.md
rename to DocSum/deprecated/langchain/docker/summarize-app/packages/README.md
diff --git a/DocSum/depracated/langchain/docker/summarize-app/pyproject.toml b/DocSum/deprecated/langchain/docker/summarize-app/pyproject.toml
similarity index 100%
rename from DocSum/depracated/langchain/docker/summarize-app/pyproject.toml
rename to DocSum/deprecated/langchain/docker/summarize-app/pyproject.toml
diff --git a/DocSum/depracated/serving/tgi_gaudi/build_docker.sh b/DocSum/deprecated/serving/tgi_gaudi/build_docker.sh
similarity index 100%
rename from DocSum/depracated/serving/tgi_gaudi/build_docker.sh
rename to DocSum/deprecated/serving/tgi_gaudi/build_docker.sh
diff --git a/DocSum/depracated/serving/tgi_gaudi/launch_tgi_service.sh b/DocSum/deprecated/serving/tgi_gaudi/launch_tgi_service.sh
similarity index 100%
rename from DocSum/depracated/serving/tgi_gaudi/launch_tgi_service.sh
rename to DocSum/deprecated/serving/tgi_gaudi/launch_tgi_service.sh
diff --git a/DocSum/depracated/tests/test_langchain_inference.sh b/DocSum/deprecated/tests/test_langchain_inference.sh
similarity index 100%
rename from DocSum/depracated/tests/test_langchain_inference.sh
rename to DocSum/deprecated/tests/test_langchain_inference.sh
diff --git a/DocSum/Dockerfile b/DocSum/docker/Dockerfile
similarity index 100%
rename from DocSum/Dockerfile
rename to DocSum/docker/Dockerfile
diff --git a/DocSum/docsum.py b/DocSum/docker/docsum.py
similarity index 100%
rename from DocSum/docsum.py
rename to DocSum/docker/docsum.py
diff --git a/DocSum/docker-composer/gaudi/README.md b/DocSum/docker/gaudi/README.md
similarity index 100%
rename from DocSum/docker-composer/gaudi/README.md
rename to DocSum/docker/gaudi/README.md
diff --git a/DocSum/docker-composer/gaudi/docker_compose.yaml b/DocSum/docker/gaudi/docker_compose.yaml
similarity index 100%
rename from DocSum/docker-composer/gaudi/docker_compose.yaml
rename to DocSum/docker/gaudi/docker_compose.yaml
diff --git a/DocSum/ui/docker/Dockerfile b/DocSum/docker/ui/docker/Dockerfile
similarity index 100%
rename from DocSum/ui/docker/Dockerfile
rename to DocSum/docker/ui/docker/Dockerfile
diff --git a/DocSum/ui/svelte/.env b/DocSum/docker/ui/svelte/.env
similarity index 100%
rename from DocSum/ui/svelte/.env
rename to DocSum/docker/ui/svelte/.env
diff --git a/DocSum/ui/svelte/.gitignore b/DocSum/docker/ui/svelte/.gitignore
similarity index 100%
rename from DocSum/ui/svelte/.gitignore
rename to DocSum/docker/ui/svelte/.gitignore
diff --git a/DocSum/ui/svelte/.npmrc b/DocSum/docker/ui/svelte/.npmrc
similarity index 100%
rename from DocSum/ui/svelte/.npmrc
rename to DocSum/docker/ui/svelte/.npmrc
diff --git a/DocSum/ui/svelte/README.md b/DocSum/docker/ui/svelte/README.md
similarity index 100%
rename from DocSum/ui/svelte/README.md
rename to DocSum/docker/ui/svelte/README.md
diff --git a/DocSum/ui/svelte/package.json b/DocSum/docker/ui/svelte/package.json
similarity index 100%
rename from DocSum/ui/svelte/package.json
rename to DocSum/docker/ui/svelte/package.json
diff --git a/DocSum/ui/svelte/postcss.config.cjs b/DocSum/docker/ui/svelte/postcss.config.cjs
similarity index 100%
rename from DocSum/ui/svelte/postcss.config.cjs
rename to DocSum/docker/ui/svelte/postcss.config.cjs
diff --git a/DocSum/ui/svelte/src/app.d.ts b/DocSum/docker/ui/svelte/src/app.d.ts
similarity index 100%
rename from DocSum/ui/svelte/src/app.d.ts
rename to DocSum/docker/ui/svelte/src/app.d.ts
diff --git a/DocSum/ui/svelte/src/app.html b/DocSum/docker/ui/svelte/src/app.html
similarity index 100%
rename from DocSum/ui/svelte/src/app.html
rename to DocSum/docker/ui/svelte/src/app.html
diff --git a/DocSum/ui/svelte/src/app.pcss b/DocSum/docker/ui/svelte/src/app.pcss
similarity index 100%
rename from DocSum/ui/svelte/src/app.pcss
rename to DocSum/docker/ui/svelte/src/app.pcss
diff --git a/DocSum/ui/svelte/src/lib/assets/imgLogo.svelte b/DocSum/docker/ui/svelte/src/lib/assets/imgLogo.svelte
similarity index 100%
rename from DocSum/ui/svelte/src/lib/assets/imgLogo.svelte
rename to DocSum/docker/ui/svelte/src/lib/assets/imgLogo.svelte
diff --git a/DocSum/ui/svelte/src/lib/assets/intelLogo.svelte b/DocSum/docker/ui/svelte/src/lib/assets/intelLogo.svelte
similarity index 100%
rename from DocSum/ui/svelte/src/lib/assets/intelLogo.svelte
rename to DocSum/docker/ui/svelte/src/lib/assets/intelLogo.svelte
diff --git a/DocSum/ui/svelte/src/lib/assets/loadingAnimation.svelte b/DocSum/docker/ui/svelte/src/lib/assets/loadingAnimation.svelte
similarity index 100%
rename from DocSum/ui/svelte/src/lib/assets/loadingAnimation.svelte
rename to DocSum/docker/ui/svelte/src/lib/assets/loadingAnimation.svelte
diff --git a/DocSum/ui/svelte/src/lib/assets/spinLoading.svelte b/DocSum/docker/ui/svelte/src/lib/assets/spinLoading.svelte
similarity index 100%
rename from DocSum/ui/svelte/src/lib/assets/spinLoading.svelte
rename to DocSum/docker/ui/svelte/src/lib/assets/spinLoading.svelte
diff --git a/DocSum/ui/svelte/src/lib/assets/summaryLogo.svelte b/DocSum/docker/ui/svelte/src/lib/assets/summaryLogo.svelte
similarity index 100%
rename from DocSum/ui/svelte/src/lib/assets/summaryLogo.svelte
rename to DocSum/docker/ui/svelte/src/lib/assets/summaryLogo.svelte
diff --git a/DocSum/ui/svelte/src/lib/doc.svelte b/DocSum/docker/ui/svelte/src/lib/doc.svelte
similarity index 100%
rename from DocSum/ui/svelte/src/lib/doc.svelte
rename to DocSum/docker/ui/svelte/src/lib/doc.svelte
diff --git a/DocSum/ui/svelte/src/lib/dropFile.svelte b/DocSum/docker/ui/svelte/src/lib/dropFile.svelte
similarity index 100%
rename from DocSum/ui/svelte/src/lib/dropFile.svelte
rename to DocSum/docker/ui/svelte/src/lib/dropFile.svelte
diff --git a/DocSum/ui/svelte/src/lib/header.svelte b/DocSum/docker/ui/svelte/src/lib/header.svelte
similarity index 100%
rename from DocSum/ui/svelte/src/lib/header.svelte
rename to DocSum/docker/ui/svelte/src/lib/header.svelte
diff --git a/DocSum/ui/svelte/src/lib/index.ts b/DocSum/docker/ui/svelte/src/lib/index.ts
similarity index 100%
rename from DocSum/ui/svelte/src/lib/index.ts
rename to DocSum/docker/ui/svelte/src/lib/index.ts
diff --git a/DocSum/ui/svelte/src/lib/shared/Network.ts b/DocSum/docker/ui/svelte/src/lib/shared/Network.ts
similarity index 100%
rename from DocSum/ui/svelte/src/lib/shared/Network.ts
rename to DocSum/docker/ui/svelte/src/lib/shared/Network.ts
diff --git a/DocSum/ui/svelte/src/lib/shared/Store.ts b/DocSum/docker/ui/svelte/src/lib/shared/Store.ts
similarity index 100%
rename from DocSum/ui/svelte/src/lib/shared/Store.ts
rename to DocSum/docker/ui/svelte/src/lib/shared/Store.ts
diff --git a/DocSum/ui/svelte/src/lib/shared/Utils.ts b/DocSum/docker/ui/svelte/src/lib/shared/Utils.ts
similarity index 100%
rename from DocSum/ui/svelte/src/lib/shared/Utils.ts
rename to DocSum/docker/ui/svelte/src/lib/shared/Utils.ts
diff --git a/DocSum/ui/svelte/src/lib/summary.svelte b/DocSum/docker/ui/svelte/src/lib/summary.svelte
similarity index 100%
rename from DocSum/ui/svelte/src/lib/summary.svelte
rename to DocSum/docker/ui/svelte/src/lib/summary.svelte
diff --git a/DocSum/ui/svelte/src/routes/+layout.svelte b/DocSum/docker/ui/svelte/src/routes/+layout.svelte
similarity index 100%
rename from DocSum/ui/svelte/src/routes/+layout.svelte
rename to DocSum/docker/ui/svelte/src/routes/+layout.svelte
diff --git a/DocSum/ui/svelte/src/routes/+page.svelte b/DocSum/docker/ui/svelte/src/routes/+page.svelte
similarity index 100%
rename from DocSum/ui/svelte/src/routes/+page.svelte
rename to DocSum/docker/ui/svelte/src/routes/+page.svelte
diff --git a/DocSum/ui/svelte/static/favicon.png b/DocSum/docker/ui/svelte/static/favicon.png
similarity index 100%
rename from DocSum/ui/svelte/static/favicon.png
rename to DocSum/docker/ui/svelte/static/favicon.png
diff --git a/DocSum/ui/svelte/svelte.config.js b/DocSum/docker/ui/svelte/svelte.config.js
similarity index 100%
rename from DocSum/ui/svelte/svelte.config.js
rename to DocSum/docker/ui/svelte/svelte.config.js
diff --git a/DocSum/ui/svelte/tailwind.config.cjs b/DocSum/docker/ui/svelte/tailwind.config.cjs
similarity index 100%
rename from DocSum/ui/svelte/tailwind.config.cjs
rename to DocSum/docker/ui/svelte/tailwind.config.cjs
diff --git a/DocSum/ui/svelte/tsconfig.json b/DocSum/docker/ui/svelte/tsconfig.json
similarity index 100%
rename from DocSum/ui/svelte/tsconfig.json
rename to DocSum/docker/ui/svelte/tsconfig.json
diff --git a/DocSum/ui/svelte/vite.config.ts b/DocSum/docker/ui/svelte/vite.config.ts
similarity index 100%
rename from DocSum/ui/svelte/vite.config.ts
rename to DocSum/docker/ui/svelte/vite.config.ts
diff --git a/DocSum/docker-composer/xeon/README.md b/DocSum/docker/xeon/README.md
similarity index 100%
rename from DocSum/docker-composer/xeon/README.md
rename to DocSum/docker/xeon/README.md
diff --git a/DocSum/docker-composer/xeon/docker_compose.yaml b/DocSum/docker/xeon/docker_compose.yaml
similarity index 100%
rename from DocSum/docker-composer/xeon/docker_compose.yaml
rename to DocSum/docker/xeon/docker_compose.yaml
diff --git a/DocSum/tests/test_docsum_on_gaudi.sh b/DocSum/tests/test_docsum_on_gaudi.sh
index eef35c4c9..a8686733a 100644
--- a/DocSum/tests/test_docsum_on_gaudi.sh
+++ b/DocSum/tests/test_docsum_on_gaudi.sh
@@ -17,17 +17,17 @@ function build_docker_images() {
 
     docker pull ghcr.io/huggingface/tgi-gaudi:1.2.1
 
-    cd $WORKPATH
+    cd $WORKPATH/docker
     docker build --no-cache -t opea/docsum:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f Dockerfile .
 
-    cd $WORKPATH/ui
+    cd $WORKPATH/docker/ui
     docker build --no-cache -t opea/docsum-ui:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f docker/Dockerfile .
 
     docker images
 }
 
 function start_services() {
-    cd $WORKPATH/docker-composer/gaudi
+    cd $WORKPATH/docker/gaudi
 
     export LLM_MODEL_ID="Intel/neural-chat-7b-v3-3"
     export TGI_LLM_ENDPOINT="http://${ip_address}:8008"
@@ -97,7 +97,7 @@ function validate_megaservice() {
 }
 
 function stop_docker() {
-    cd $WORKPATH/docker-composer/gaudi
+    cd $WORKPATH/docker/gaudi
     container_list=$(cat docker_compose.yaml | grep container_name | cut -d':' -f2)
     for container_name in $container_list; do
         cid=$(docker ps -aq --filter "name=$container_name")
diff --git a/DocSum/tests/test_docsum_on_xeon.sh b/DocSum/tests/test_docsum_on_xeon.sh
index 6e8f1955c..68ae5f3f4 100644
--- a/DocSum/tests/test_docsum_on_xeon.sh
+++ b/DocSum/tests/test_docsum_on_xeon.sh
@@ -15,17 +15,17 @@ function build_docker_images() {
 
     docker build --no-cache -t opea/llm-docsum-tgi:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/llms/summarization/tgi/Dockerfile .
 
-    cd $WORKPATH
+    cd $WORKPATH/docker
     docker build --no-cache -t opea/docsum:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f Dockerfile .
 
-    cd $WORKPATH/ui
+    cd $WORKPATH/docker/ui
     docker build --no-cache -t opea/docsum-ui:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f docker/Dockerfile .
 
     docker images
 }
 
 function start_services() {
-    cd $WORKPATH/docker-composer/xeon
+    cd $WORKPATH/docker/xeon
 
     export LLM_MODEL_ID="Intel/neural-chat-7b-v3-3"
     export TGI_LLM_ENDPOINT="http://${ip_address}:8008"
@@ -96,7 +96,7 @@ function validate_megaservice() {
 }
 
 function stop_docker() {
-    cd $WORKPATH/docker-composer/xeon
+    cd $WORKPATH/docker/xeon
     container_list=$(cat docker_compose.yaml | grep container_name | cut -d':' -f2)
     for container_name in $container_list; do
         cid=$(docker ps -aq --filter "name=$container_name")
diff --git a/README.md b/README.md
index 9f3e46dc1..9000128a8 100644
--- a/README.md
+++ b/README.md
@@ -230,6 +230,8 @@ All the examples are well-validated on Intel platforms. In addition, these examp
 	</tbody>
 </table>
 
+> **_NOTE:_** The `Language Translation`, `SearchQnA`, `VisualQnA` and other use cases not listing here are in active development. The code structure of these use cases are subject to change.
+
 ## Additional Content
 
 - [Contribution](/CONTRIBUTING.md)