diff --git a/app/(withRecent)/layout.tsx b/app/(withRecent)/layout.tsx
index 0a1041f..cb2077f 100644
--- a/app/(withRecent)/layout.tsx
+++ b/app/(withRecent)/layout.tsx
@@ -1,4 +1,4 @@
-import { RecentlyUpdatedPosts } from '@/components/common/RecentlyUpdatedPosts'
+import { RecentlyUpdatedPosts } from '@/components/post/RecentlyUpdatedPosts'
 
 export default function WithRecentLayout({ children }: { children: React.ReactNode }) {
   return (
diff --git a/app/(withRecent)/page.tsx b/app/(withRecent)/page.tsx
index d3d63e2..f347463 100644
--- a/app/(withRecent)/page.tsx
+++ b/app/(withRecent)/page.tsx
@@ -1,5 +1,5 @@
 import { getAllPostsMeta } from '@/lib/posts'
-import { Post } from '@/components/common/Post'
+import { Post } from '@/components/post/Post'
 
 export default function BlogIndex() {
   const posts = getAllPostsMeta()
diff --git a/app/posts/[slug]/page.tsx b/app/posts/[slug]/page.tsx
index 15ff702..8776d4c 100644
--- a/app/posts/[slug]/page.tsx
+++ b/app/posts/[slug]/page.tsx
@@ -1,7 +1,7 @@
 import { metadata } from '@/app/metadata'
-import { ImageWrapper } from '@/components/common/ImageWrapper'
-import { ShareLinks } from '@/components/common/ShareLinks'
-import { TableOfContents } from '@/components/common/TableOfContents'
+import { ImageWrapper } from '@/components/content/ImageWrapper'
+import { ShareLinks } from '@/components/post/ShareLinks'
+import { TableOfContents } from '@/components/post/TableOfContents'
 import { getAllPostSlugs, getNextAndPreviousPosts, getPostBySlug } from '@/lib/posts'
 import { slugify } from '@/utils/slug'
 import type { Metadata } from 'next'
diff --git a/components/common/BlockquoteWrapper.tsx b/components/content/BlockquoteWrapper.tsx
similarity index 100%
rename from components/common/BlockquoteWrapper.tsx
rename to components/content/BlockquoteWrapper.tsx
diff --git a/components/common/CodeWrapper.tsx b/components/content/CodeWrapper.tsx
similarity index 97%
rename from components/common/CodeWrapper.tsx
rename to components/content/CodeWrapper.tsx
index 0ec48c1..313b6b0 100644
--- a/components/common/CodeWrapper.tsx
+++ b/components/content/CodeWrapper.tsx
@@ -1,6 +1,6 @@
 'use client'
 
-import { CopyButton } from './CopyButton'
+import { CopyButton } from '../ui/CopyButton'
 import { getTextContent } from '@/lib/react-node-text'
 
 type CodeWrapperProps = {
diff --git a/components/common/ImageWrapper.tsx b/components/content/ImageWrapper.tsx
similarity index 100%
rename from components/common/ImageWrapper.tsx
rename to components/content/ImageWrapper.tsx
diff --git a/components/layout/NavLinks.tsx b/components/layout/NavLinks.tsx
index 49cde42..3274ad9 100644
--- a/components/layout/NavLinks.tsx
+++ b/components/layout/NavLinks.tsx
@@ -3,7 +3,7 @@
 import { cn } from '@/utils/cn'
 import Link from 'next/link'
 import { usePathname } from 'next/navigation'
-import { ExternalLink } from '../common/ExternalLink'
+import { ExternalLink } from '../ui/ExternalLink'
 import { navItems } from './navItems'
 
 export function NavLinks() {
diff --git a/components/common/Post.tsx b/components/post/Post.tsx
similarity index 96%
rename from components/common/Post.tsx
rename to components/post/Post.tsx
index 50dc928..6650079 100644
--- a/components/common/Post.tsx
+++ b/components/post/Post.tsx
@@ -1,4 +1,4 @@
-import { ImageWrapper } from '@/components/common/ImageWrapper'
+import { ImageWrapper } from '@/components/content/ImageWrapper'
 import { cn } from '@/utils/cn'
 import { PostMeta } from '@/types/Post.type'
 import Link from 'next/link'
diff --git a/components/common/RecentlyUpdatedPosts.tsx b/components/post/RecentlyUpdatedPosts.tsx
similarity index 100%
rename from components/common/RecentlyUpdatedPosts.tsx
rename to components/post/RecentlyUpdatedPosts.tsx
diff --git a/components/common/ShareLinks.tsx b/components/post/ShareLinks.tsx
similarity index 95%
rename from components/common/ShareLinks.tsx
rename to components/post/ShareLinks.tsx
index 68c3acd..8be58f2 100644
--- a/components/common/ShareLinks.tsx
+++ b/components/post/ShareLinks.tsx
@@ -1,5 +1,5 @@
 import { siBluesky, siX, siFacebook, siReddit } from 'simple-icons'
-import { ExternalLink } from '@/components/common/ExternalLink'
+import { ExternalLink } from '@/components/ui/ExternalLink'
 
 type ShareLinksProps = {
   url: string
diff --git a/components/common/TableOfContents.tsx b/components/post/TableOfContents.tsx
similarity index 100%
rename from components/common/TableOfContents.tsx
rename to components/post/TableOfContents.tsx
diff --git a/components/common/CopyButton.tsx b/components/ui/CopyButton.tsx
similarity index 100%
rename from components/common/CopyButton.tsx
rename to components/ui/CopyButton.tsx
diff --git a/components/common/ExternalLink.tsx b/components/ui/ExternalLink.tsx
similarity index 100%
rename from components/common/ExternalLink.tsx
rename to components/ui/ExternalLink.tsx
diff --git a/lib/posts.tsx b/lib/posts.tsx
index b4d05d0..779d8e1 100644
--- a/lib/posts.tsx
+++ b/lib/posts.tsx
@@ -12,14 +12,14 @@ import rehypeReact from 'rehype-react'
 import { cloneElement, isValidElement, type ReactElement, Fragment, type ReactNode } from 'react'
 import { jsx, jsxs } from 'react/jsx-runtime'
 import { rehypeCodeMeta } from './rehype-code-meta'
-import { CodeWrapper } from '@/components/common/CodeWrapper'
-import { ImageWrapper } from '@/components/common/ImageWrapper'
-import { ExternalLink } from '@/components/common/ExternalLink'
+import { CodeWrapper } from '@/components/content/CodeWrapper'
+import { ImageWrapper } from '@/components/content/ImageWrapper'
+import { ExternalLink } from '@/components/ui/ExternalLink'
 import readingTime from 'reading-time'
 import { rehypeUnwrapImages } from './rehype-unwrap-images'
 import { rehypeMermaidSsg } from './rehype-mermaid-ssg'
 import { getTextContent, stripLeadingMatch } from './react-node-text'
-import { BlockquoteWrapper } from '@/components/common/BlockquoteWrapper'
+import { BlockquoteWrapper } from '@/components/content/BlockquoteWrapper'
 import type { NoteType } from '@/types/Note.type'
 import { rehypeMark } from './rehype-mark'
 import { rehypeDefinition } from './rehype-definition'