diff --git a/apps/evm/src/app/faq/(root)/components/get-in-touch.tsx b/apps/web/src/app/(cms)/faq/faq/(root)/components/get-in-touch.tsx
similarity index 100%
rename from apps/evm/src/app/faq/(root)/components/get-in-touch.tsx
rename to apps/web/src/app/(cms)/faq/faq/(root)/components/get-in-touch.tsx
diff --git a/apps/evm/src/app/faq/(root)/components/help-by-categories.tsx b/apps/web/src/app/(cms)/faq/faq/(root)/components/help-by-categories.tsx
similarity index 100%
rename from apps/evm/src/app/faq/(root)/components/help-by-categories.tsx
rename to apps/web/src/app/(cms)/faq/faq/(root)/components/help-by-categories.tsx
diff --git a/apps/evm/src/app/faq/(root)/components/help-by-products.tsx b/apps/web/src/app/(cms)/faq/faq/(root)/components/help-by-products.tsx
similarity index 100%
rename from apps/evm/src/app/faq/(root)/components/help-by-products.tsx
rename to apps/web/src/app/(cms)/faq/faq/(root)/components/help-by-products.tsx
diff --git a/apps/evm/src/app/faq/(root)/components/most-searched-questions.tsx b/apps/web/src/app/(cms)/faq/faq/(root)/components/most-searched-questions.tsx
similarity index 100%
rename from apps/evm/src/app/faq/(root)/components/most-searched-questions.tsx
rename to apps/web/src/app/(cms)/faq/faq/(root)/components/most-searched-questions.tsx
diff --git a/apps/evm/src/app/faq/(root)/components/search-box.tsx b/apps/web/src/app/(cms)/faq/faq/(root)/components/search-box.tsx
similarity index 100%
rename from apps/evm/src/app/faq/(root)/components/search-box.tsx
rename to apps/web/src/app/(cms)/faq/faq/(root)/components/search-box.tsx
diff --git a/apps/evm/src/app/faq/(root)/page.tsx b/apps/web/src/app/(cms)/faq/faq/(root)/page.tsx
similarity index 100%
rename from apps/evm/src/app/faq/(root)/page.tsx
rename to apps/web/src/app/(cms)/faq/faq/(root)/page.tsx
diff --git a/apps/evm/src/app/faq/[category-slug]/(category)/components/category-layout.tsx b/apps/web/src/app/(cms)/faq/faq/[category-slug]/(category)/components/category-layout.tsx
similarity index 100%
rename from apps/evm/src/app/faq/[category-slug]/(category)/components/category-layout.tsx
rename to apps/web/src/app/(cms)/faq/faq/[category-slug]/(category)/components/category-layout.tsx
diff --git a/apps/evm/src/app/faq/[category-slug]/(category)/layout.tsx b/apps/web/src/app/(cms)/faq/faq/[category-slug]/(category)/layout.tsx
similarity index 100%
rename from apps/evm/src/app/faq/[category-slug]/(category)/layout.tsx
rename to apps/web/src/app/(cms)/faq/faq/[category-slug]/(category)/layout.tsx
diff --git a/apps/evm/src/app/faq/[category-slug]/(category)/page.tsx b/apps/web/src/app/(cms)/faq/faq/[category-slug]/(category)/page.tsx
similarity index 100%
rename from apps/evm/src/app/faq/[category-slug]/(category)/page.tsx
rename to apps/web/src/app/(cms)/faq/faq/[category-slug]/(category)/page.tsx
diff --git a/apps/evm/src/app/faq/[category-slug]/[answer-group-slug]/[answer-slug]/loading.tsx b/apps/web/src/app/(cms)/faq/faq/[category-slug]/[answer-group-slug]/[answer-slug]/loading.tsx
similarity index 100%
rename from apps/evm/src/app/faq/[category-slug]/[answer-group-slug]/[answer-slug]/loading.tsx
rename to apps/web/src/app/(cms)/faq/faq/[category-slug]/[answer-group-slug]/[answer-slug]/loading.tsx
diff --git a/apps/evm/src/app/faq/[category-slug]/[answer-group-slug]/[answer-slug]/page.tsx b/apps/web/src/app/(cms)/faq/faq/[category-slug]/[answer-group-slug]/[answer-slug]/page.tsx
similarity index 100%
rename from apps/evm/src/app/faq/[category-slug]/[answer-group-slug]/[answer-slug]/page.tsx
rename to apps/web/src/app/(cms)/faq/faq/[category-slug]/[answer-group-slug]/[answer-slug]/page.tsx
diff --git a/apps/evm/src/app/faq/[category-slug]/[answer-group-slug]/components/answer-group-layout.tsx b/apps/web/src/app/(cms)/faq/faq/[category-slug]/[answer-group-slug]/components/answer-group-layout.tsx
similarity index 100%
rename from apps/evm/src/app/faq/[category-slug]/[answer-group-slug]/components/answer-group-layout.tsx
rename to apps/web/src/app/(cms)/faq/faq/[category-slug]/[answer-group-slug]/components/answer-group-layout.tsx
diff --git a/apps/evm/src/app/faq/[category-slug]/[answer-group-slug]/layout.tsx b/apps/web/src/app/(cms)/faq/faq/[category-slug]/[answer-group-slug]/layout.tsx
similarity index 100%
rename from apps/evm/src/app/faq/[category-slug]/[answer-group-slug]/layout.tsx
rename to apps/web/src/app/(cms)/faq/faq/[category-slug]/[answer-group-slug]/layout.tsx
diff --git a/apps/evm/src/app/faq/[category-slug]/[answer-group-slug]/route.ts b/apps/web/src/app/(cms)/faq/faq/[category-slug]/[answer-group-slug]/route.ts
similarity index 100%
rename from apps/evm/src/app/faq/[category-slug]/[answer-group-slug]/route.ts
rename to apps/web/src/app/(cms)/faq/faq/[category-slug]/[answer-group-slug]/route.ts
diff --git a/apps/evm/src/app/faq/components/sidebar.tsx b/apps/web/src/app/(cms)/faq/faq/components/sidebar.tsx
similarity index 100%
rename from apps/evm/src/app/faq/components/sidebar.tsx
rename to apps/web/src/app/(cms)/faq/faq/components/sidebar.tsx
diff --git a/apps/evm/src/app/faq/header.tsx b/apps/web/src/app/(cms)/faq/faq/header.tsx
similarity index 100%
rename from apps/evm/src/app/faq/header.tsx
rename to apps/web/src/app/(cms)/faq/faq/header.tsx
diff --git a/apps/evm/src/app/faq/layout.tsx b/apps/web/src/app/(cms)/faq/faq/layout.tsx
similarity index 100%
rename from apps/evm/src/app/faq/layout.tsx
rename to apps/web/src/app/(cms)/faq/faq/layout.tsx
diff --git a/apps/evm/src/app/faq/lib/ghost/ghost.ts b/apps/web/src/app/(cms)/faq/faq/lib/ghost/ghost.ts
similarity index 100%
rename from apps/evm/src/app/faq/lib/ghost/ghost.ts
rename to apps/web/src/app/(cms)/faq/faq/lib/ghost/ghost.ts
diff --git a/apps/evm/src/app/faq/lib/strapi/answer.ts b/apps/web/src/app/(cms)/faq/faq/lib/strapi/answer.ts
similarity index 100%
rename from apps/evm/src/app/faq/lib/strapi/answer.ts
rename to apps/web/src/app/(cms)/faq/faq/lib/strapi/answer.ts
diff --git a/apps/evm/src/app/faq/lib/strapi/answerGroup.ts b/apps/web/src/app/(cms)/faq/faq/lib/strapi/answerGroup.ts
similarity index 100%
rename from apps/evm/src/app/faq/lib/strapi/answerGroup.ts
rename to apps/web/src/app/(cms)/faq/faq/lib/strapi/answerGroup.ts
diff --git a/apps/evm/src/app/faq/lib/strapi/answerSearch.ts b/apps/web/src/app/(cms)/faq/faq/lib/strapi/answerSearch.ts
similarity index 100%
rename from apps/evm/src/app/faq/lib/strapi/answerSearch.ts
rename to apps/web/src/app/(cms)/faq/faq/lib/strapi/answerSearch.ts
diff --git a/apps/evm/src/app/faq/lib/strapi/category.ts b/apps/web/src/app/(cms)/faq/faq/lib/strapi/category.ts
similarity index 100%
rename from apps/evm/src/app/faq/lib/strapi/category.ts
rename to apps/web/src/app/(cms)/faq/faq/lib/strapi/category.ts
diff --git a/apps/evm/src/app/faq/lib/strapi/categoryList.ts b/apps/web/src/app/(cms)/faq/faq/lib/strapi/categoryList.ts
similarity index 100%
rename from apps/evm/src/app/faq/lib/strapi/categoryList.ts
rename to apps/web/src/app/(cms)/faq/faq/lib/strapi/categoryList.ts
diff --git a/apps/evm/src/app/faq/lib/strapi/image.ts b/apps/web/src/app/(cms)/faq/faq/lib/strapi/image.ts
similarity index 100%
rename from apps/evm/src/app/faq/lib/strapi/image.ts
rename to apps/web/src/app/(cms)/faq/faq/lib/strapi/image.ts
diff --git a/apps/evm/src/app/faq/lib/strapi/mostSearchedQuestionList.ts b/apps/web/src/app/(cms)/faq/faq/lib/strapi/mostSearchedQuestionList.ts
similarity index 100%
rename from apps/evm/src/app/faq/lib/strapi/mostSearchedQuestionList.ts
rename to apps/web/src/app/(cms)/faq/faq/lib/strapi/mostSearchedQuestionList.ts
diff --git a/apps/evm/src/app/faq/lib/strapi/product.ts b/apps/web/src/app/(cms)/faq/faq/lib/strapi/product.ts
similarity index 100%
rename from apps/evm/src/app/faq/lib/strapi/product.ts
rename to apps/web/src/app/(cms)/faq/faq/lib/strapi/product.ts
diff --git a/apps/evm/src/app/faq/lib/strapi/productList.ts b/apps/web/src/app/(cms)/faq/faq/lib/strapi/productList.ts
similarity index 100%
rename from apps/evm/src/app/faq/lib/strapi/productList.ts
rename to apps/web/src/app/(cms)/faq/faq/lib/strapi/productList.ts
diff --git a/apps/evm/src/app/faq/lib/strapi/strapi.ts b/apps/web/src/app/(cms)/faq/faq/lib/strapi/strapi.ts
similarity index 100%
rename from apps/evm/src/app/faq/lib/strapi/strapi.ts
rename to apps/web/src/app/(cms)/faq/faq/lib/strapi/strapi.ts