diff --git a/components/sections/AboutSection.tsx b/app/[locale]/_components/AboutSection.tsx
similarity index 100%
rename from components/sections/AboutSection.tsx
rename to app/[locale]/_components/AboutSection.tsx
diff --git a/components/sections/AppoachSection.tsx b/app/[locale]/_components/AppoachSection.tsx
similarity index 100%
rename from components/sections/AppoachSection.tsx
rename to app/[locale]/_components/AppoachSection.tsx
diff --git a/components/sections/HeroSection.tsx b/app/[locale]/_components/HeroSection.tsx
similarity index 100%
rename from components/sections/HeroSection.tsx
rename to app/[locale]/_components/HeroSection.tsx
diff --git a/components/sections/WorksSection.tsx b/app/[locale]/_components/WorksSection.tsx
similarity index 97%
rename from components/sections/WorksSection.tsx
rename to app/[locale]/_components/WorksSection.tsx
index b255b68..bdbebbb 100644
--- a/components/sections/WorksSection.tsx
+++ b/app/[locale]/_components/WorksSection.tsx
@@ -4,7 +4,7 @@ import { useRef, useEffect } from 'react';
 import { useTranslations } from "next-intl";
 
 import { Project } from "@/lib/projects/types";
-import { ProjectCard } from "../ui/ProjectCard";
+import { ProjectCard } from "../../../components/ui/ProjectCard";
 
 type props = {
     projects: Project[];
diff --git a/components/sections/ArticleHero.tsx b/app/[locale]/blog/[slug]/_components/ArticleHero.tsx
similarity index 100%
rename from components/sections/ArticleHero.tsx
rename to app/[locale]/blog/[slug]/_components/ArticleHero.tsx
diff --git a/components/sections/ArticleList.tsx b/app/[locale]/blog/[slug]/_components/ArticleList.tsx
similarity index 100%
rename from components/sections/ArticleList.tsx
rename to app/[locale]/blog/[slug]/_components/ArticleList.tsx
diff --git a/components/sections/ArticleSummary.tsx b/app/[locale]/blog/[slug]/_components/ArticleSummary.tsx
similarity index 100%
rename from components/sections/ArticleSummary.tsx
rename to app/[locale]/blog/[slug]/_components/ArticleSummary.tsx
diff --git a/app/[locale]/blog/[slug]/page.tsx b/app/[locale]/blog/[slug]/page.tsx
index e830e05..7307b07 100644
--- a/app/[locale]/blog/[slug]/page.tsx
+++ b/app/[locale]/blog/[slug]/page.tsx
@@ -3,8 +3,8 @@ import type { Metadata } from "next";
 import { notFound } from "next/navigation";
 import { MDXRemote } from "next-mdx-remote/rsc";
 import { getArticleBySlug, getAllArticles, getAlternatesArticle } from "@/lib/blog/get-articles";
-import { ArticleHero } from "@/components/sections/ArticleHero";
-import { ArticleSummary } from "@/components/sections/ArticleSummary";
+import { ArticleHero } from "@/app/[locale]/blog/[slug]/_components/ArticleHero";
+import { ArticleSummary } from "@/app/[locale]/blog/[slug]/_components/ArticleSummary";
 import { locales } from "@/middleware";
 import Link from "next/link";
 import { MermaidDiagram } from "@/components/mdx/MermaidDiagram";
diff --git a/components/sections/BlogHero.tsx b/app/[locale]/blog/_components/BlogHero.tsx
similarity index 100%
rename from components/sections/BlogHero.tsx
rename to app/[locale]/blog/_components/BlogHero.tsx
diff --git a/app/[locale]/blog/page.tsx b/app/[locale]/blog/page.tsx
index 95ebda6..93192da 100644
--- a/app/[locale]/blog/page.tsx
+++ b/app/[locale]/blog/page.tsx
@@ -1,6 +1,6 @@
 import { getAllArticles } from "@/lib/blog/get-articles";
-import { BlogHero } from "@/components/sections/BlogHero";
-import { ArticleList } from "@/components/sections/ArticleList";
+import { BlogHero } from "@/app/[locale]/blog/_components/BlogHero";
+import { ArticleList } from "@/app/[locale]/blog/[slug]/_components/ArticleList";
 
 type props = {
     params: Promise<{ locale: string }>;
diff --git a/app/[locale]/page.tsx b/app/[locale]/page.tsx
index 065078f..f385e68 100644
--- a/app/[locale]/page.tsx
+++ b/app/[locale]/page.tsx
@@ -1,7 +1,7 @@
-import HeroSection from "@/components/sections/HeroSection";
-import WorksSection from "@/components/sections/WorksSection";
-import ApproachSection from "@/components/sections/AppoachSection";
-import TimelineSection from "@/components/sections/AboutSection";
+import HeroSection from "@/app/[locale]/_components/HeroSection";
+import WorksSection from "@/app/[locale]/_components/WorksSection";
+import ApproachSection from "@/app/[locale]/_components/AppoachSection";
+import TimelineSection from "@/app/[locale]/_components/AboutSection";
 
 import { getAllProjects } from "@/lib/projects/get-projects";
 
diff --git a/app/[locale]/works/[slug]/page.tsx b/app/[locale]/works/[slug]/page.tsx
index acb361b..1257281 100644
--- a/app/[locale]/works/[slug]/page.tsx
+++ b/app/[locale]/works/[slug]/page.tsx
@@ -2,10 +2,10 @@ import { notFound } from "next/navigation";
 import { MDXRemote } from "next-mdx-remote/rsc";
 import { getAllProjects, getProjectBySlug, getProjectSlugs } from "@/lib/projects/get-projects";
 import { mdxComponents } from "@/components/mdx/mdxComponents";
-import { ProjectHero } from "@/components/sections/ProjectHero";
-import { ProjectMeta } from "@/components/sections/ProjectMeta";
-import { ProjectTechnologies } from "@/components/sections/ProjectTechnologies";
-import { OtherProjects } from "@/components/sections/OtherProjects";
+import { ProjectHero } from "@/app/[locale]/works/_components/ProjectHero";
+import { ProjectMeta } from "@/app/[locale]/works/_components/ProjectMeta";
+import { ProjectTechnologies } from "@/app/[locale]/works/_components/ProjectTechnologies";
+import { OtherProjects } from "@/app/[locale]/works/_components/OtherProjects";
 
 type props = {
     params: Promise<{
diff --git a/components/sections/OtherProjects.tsx b/app/[locale]/works/_components/OtherProjects.tsx
similarity index 100%
rename from components/sections/OtherProjects.tsx
rename to app/[locale]/works/_components/OtherProjects.tsx
diff --git a/components/sections/ProjectHero.tsx b/app/[locale]/works/_components/ProjectHero.tsx
similarity index 100%
rename from components/sections/ProjectHero.tsx
rename to app/[locale]/works/_components/ProjectHero.tsx
diff --git a/components/sections/ProjectMeta.tsx b/app/[locale]/works/_components/ProjectMeta.tsx
similarity index 100%
rename from components/sections/ProjectMeta.tsx
rename to app/[locale]/works/_components/ProjectMeta.tsx
diff --git a/components/sections/ProjectTechnologies.tsx b/app/[locale]/works/_components/ProjectTechnologies.tsx
similarity index 100%
rename from components/sections/ProjectTechnologies.tsx
rename to app/[locale]/works/_components/ProjectTechnologies.tsx