diff --git a/components/homepage/HomeCover.tsx b/components/home-page/HomeCover.tsx
similarity index 100%
rename from components/homepage/HomeCover.tsx
rename to components/home-page/HomeCover.tsx
diff --git a/components/readerpage/BottomCard.tsx b/components/reader-page/BottomCard.tsx
similarity index 100%
rename from components/readerpage/BottomCard.tsx
rename to components/reader-page/BottomCard.tsx
diff --git a/components/readerpage/DrawerTOC.tsx b/components/reader-page/DrawerTOC.tsx
similarity index 100%
rename from components/readerpage/DrawerTOC.tsx
rename to components/reader-page/DrawerTOC.tsx
diff --git a/components/readerpage/PostComments.tsx b/components/reader-page/PostComments.tsx
similarity index 100%
rename from components/readerpage/PostComments.tsx
rename to components/reader-page/PostComments.tsx
diff --git a/components/readerpage/PostCover.tsx b/components/reader-page/PostCover.tsx
similarity index 100%
rename from components/readerpage/PostCover.tsx
rename to components/reader-page/PostCover.tsx
diff --git a/components/readerpage/ShareButtons.tsx b/components/reader-page/ShareButtons.tsx
similarity index 100%
rename from components/readerpage/ShareButtons.tsx
rename to components/reader-page/ShareButtons.tsx
diff --git a/components/readerpage/TOC.tsx b/components/reader-page/TOC.tsx
similarity index 100%
rename from components/readerpage/TOC.tsx
rename to components/reader-page/TOC.tsx
diff --git a/components/layouts/index.tsx b/components/utils/Layout.tsx
similarity index 100%
rename from components/layouts/index.tsx
rename to components/utils/Layout.tsx
diff --git a/pages/404.tsx b/pages/404.tsx
index 8d9fcaa..6e11d26 100644
--- a/pages/404.tsx
+++ b/pages/404.tsx
@@ -1,4 +1,4 @@
-import { ContentContainer, Page } from "@/components/layouts";
+import { ContentContainer, Page } from "@/components/utils/Layout";
 import { Button } from "@/components/ui/button";
 import { Separator } from "@/components/ui/separator";
 import { Footer } from "@/components/utils/Footer";
diff --git a/pages/500.tsx b/pages/500.tsx
index 280f653..14609ca 100644
--- a/pages/500.tsx
+++ b/pages/500.tsx
@@ -1,4 +1,4 @@
-import { ContentContainer, Page } from "@/components/layouts";
+import { ContentContainer, Page } from "@/components/utils/Layout";
 import { Button } from "@/components/ui/button";
 import { Separator } from "@/components/ui/separator";
 import { Footer } from "@/components/utils/Footer";
diff --git a/pages/about.tsx b/pages/about.tsx
index ed19484..c3d39a7 100644
--- a/pages/about.tsx
+++ b/pages/about.tsx
@@ -1,4 +1,4 @@
-import { ContentContainer, Page } from "@/components/layouts";
+import { ContentContainer, Page } from "@/components/utils/Layout";
 import { Separator } from "@/components/ui/separator";
 import { Footer } from "@/components/utils/Footer";
 import { NavBar } from "@/components/utils/NavBar";
diff --git a/pages/blog/[id].tsx b/pages/blog/[id].tsx
index fa9dfd7..5302690 100644
--- a/pages/blog/[id].tsx
+++ b/pages/blog/[id].tsx
@@ -1,11 +1,11 @@
-import { ContentContainer, Page } from "@/components/layouts";
+import { ContentContainer, Page } from "@/components/utils/Layout";
 import { MDXComponentsSet } from "@/components/mdx";
-import { BottomCard } from "@/components/readerpage/BottomCard";
-import { DrawerTOC } from "@/components/readerpage/DrawerTOC";
-import { PostComments } from "@/components/readerpage/PostComments";
-import { PostCover } from "@/components/readerpage/PostCover";
-import { ShareButtons } from "@/components/readerpage/ShareButtons";
-import { TOC } from "@/components/readerpage/TOC";
+import { BottomCard } from "@/components/reader-page/BottomCard";
+import { DrawerTOC } from "@/components/reader-page/DrawerTOC";
+import { PostComments } from "@/components/reader-page/PostComments";
+import { PostCover } from "@/components/reader-page/PostCover";
+import { ShareButtons } from "@/components/reader-page/ShareButtons";
+import { TOC } from "@/components/reader-page/TOC";
 import { Separator } from "@/components/ui/separator";
 import { Toaster } from "@/components/ui/toaster";
 import { Footer } from "@/components/utils/Footer";
diff --git a/pages/friends.tsx b/pages/friends.tsx
index ce0b170..ae0886f 100644
--- a/pages/friends.tsx
+++ b/pages/friends.tsx
@@ -1,4 +1,4 @@
-import { ContentContainer, Page } from "@/components/layouts";
+import { ContentContainer, Page } from "@/components/utils/Layout";
 import { Separator } from "@/components/ui/separator";
 import { Footer } from "@/components/utils/Footer";
 import { NavBar } from "@/components/utils/NavBar";
diff --git a/pages/index.tsx b/pages/index.tsx
index 3faa9c8..601a9d2 100644
--- a/pages/index.tsx
+++ b/pages/index.tsx
@@ -1,5 +1,5 @@
-import { HomeCover } from "@/components/homepage/HomeCover";
-import { ContentContainer, Page } from "@/components/layouts";
+import { HomeCover } from "@/components/home-page/HomeCover";
+import { ContentContainer, Page } from "@/components/utils/Layout";
 import { Button } from "@/components/ui/button";
 import { Separator } from "@/components/ui/separator";
 import { Footer } from "@/components/utils/Footer";
diff --git a/pages/posts/[[...slug]].tsx b/pages/posts/[[...slug]].tsx
index fc9ec05..0c79492 100644
--- a/pages/posts/[[...slug]].tsx
+++ b/pages/posts/[[...slug]].tsx
@@ -1,4 +1,4 @@
-import { ContentContainer, Page } from "@/components/layouts";
+import { ContentContainer, Page } from "@/components/utils/Layout";
 import { Accordion, AccordionContent, AccordionItem, AccordionTrigger } from "@/components/ui/accordion";
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
diff --git a/pages/search.tsx b/pages/search.tsx
index 78fd568..ae7b6e0 100644
--- a/pages/search.tsx
+++ b/pages/search.tsx
@@ -1,4 +1,4 @@
-import { ContentContainer, Page } from "@/components/layouts";
+import { ContentContainer, Page } from "@/components/utils/Layout";
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
 import { Toaster } from "@/components/ui/toaster";
diff --git a/pages/sponsor.tsx b/pages/sponsor.tsx
index d5c35bc..fab34c8 100644
--- a/pages/sponsor.tsx
+++ b/pages/sponsor.tsx
@@ -1,4 +1,4 @@
-import { ContentContainer, Page } from "@/components/layouts";
+import { ContentContainer, Page } from "@/components/utils/Layout";
 import { SponsorBoard } from "@/components/sponsor-page/SponsorBoard";
 import { SponsorDescription } from "@/components/sponsor-page/SponsorDescription";
 import { Toaster } from "@/components/ui/toaster";
diff --git a/pages/tags/[...slug].tsx b/pages/tags/[...slug].tsx
index d6e2cea..34e9b66 100644
--- a/pages/tags/[...slug].tsx
+++ b/pages/tags/[...slug].tsx
@@ -1,4 +1,4 @@
-import { ContentContainer, Page } from "@/components/layouts";
+import { ContentContainer, Page } from "@/components/utils/Layout";
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
 import { Separator } from "@/components/ui/separator";