diff --git a/components/ArticleLayout.tsx b/components/layouts/ArticleLayout.tsx
similarity index 96%
rename from components/ArticleLayout.tsx
rename to components/layouts/ArticleLayout.tsx
index 051afb4..da20ac4 100644
--- a/components/ArticleLayout.tsx
+++ b/components/layouts/ArticleLayout.tsx
@@ -1,10 +1,10 @@
 import {ReactNode} from 'react'
 import Head from 'next/head'
 import {usePathname} from 'next/navigation'
-import {Container} from './Container'
+import {Container} from '@/components/Container'
 import {formatDate} from '@/lib/formatDate'
-import {Prose} from './Prose'
-import {Views} from './Views'
+import {Prose} from '@/components/Prose'
+import {Views} from '@/components/Views'
 
 type ArticleLayout = {
     children?: ReactNode
diff --git a/components/SimpleLayout.tsx b/components/layouts/SimpleLayout.tsx
similarity index 95%
rename from components/SimpleLayout.tsx
rename to components/layouts/SimpleLayout.tsx
index 72ba212..3b7d3e7 100644
--- a/components/SimpleLayout.tsx
+++ b/components/layouts/SimpleLayout.tsx
@@ -1,6 +1,6 @@
 import {ReactNode} from 'react'
 import clsx from 'clsx'
-import {Container} from './Container'
+import {Container} from '@/components/Container'
 
 type SimpleLayout = {
     title: string
diff --git a/pages/dashboard.tsx b/pages/dashboard.tsx
index ecb77a2..23768af 100644
--- a/pages/dashboard.tsx
+++ b/pages/dashboard.tsx
@@ -1,7 +1,7 @@
 import React from 'react'
 import Head from 'next/head'
 import {GetStaticProps} from 'next'
-import {SimpleLayout} from '@/components/SimpleLayout'
+import {SimpleLayout} from '@/components/layouts/SimpleLayout'
 import {Card} from '@/components/Card'
 import {CardGroup} from '@/components/CardGroup'
 import {numberFormat} from '@/lib/numberFormat'
diff --git a/pages/projects.tsx b/pages/projects.tsx
index 5d20958..b730f8b 100644
--- a/pages/projects.tsx
+++ b/pages/projects.tsx
@@ -1,7 +1,7 @@
 import {GetStaticProps} from 'next'
 import Head from 'next/head'
 import {Card} from '@/components/Card'
-import {SimpleLayout} from '@/components/SimpleLayout'
+import {SimpleLayout} from '@/components/layouts/SimpleLayout'
 import {SocialLink} from '@/components/SocialLink'
 import {StarIcon} from '@/components/icons/StarIcon'
 import {ForkIcon} from '@/components/icons/ForkIcon'
diff --git a/pages/uses.jsx b/pages/uses.jsx
index 5d577d6..c8c1291 100644
--- a/pages/uses.jsx
+++ b/pages/uses.jsx
@@ -2,7 +2,7 @@ import Head from 'next/head'
 
 import {Card} from '@/components/Card'
 import {Section} from '@/components/Section'
-import {SimpleLayout} from '@/components/SimpleLayout'
+import {SimpleLayout} from '@/components/layouts/SimpleLayout'
 
 function ToolsSection({children, ...props}) {
     return (
diff --git a/pages/writing/a-personal-journey-in-software-engineering.mdx b/pages/writing/a-personal-journey-in-software-engineering.mdx
index eb10afb..68ac9cd 100644
--- a/pages/writing/a-personal-journey-in-software-engineering.mdx
+++ b/pages/writing/a-personal-journey-in-software-engineering.mdx
@@ -1,4 +1,4 @@
-import {ArticleLayout} from '@/components/ArticleLayout'
+import {ArticleLayout} from '@/components/layouts/ArticleLayout'
 import {createSlug} from '@/lib/createSlug'
 
 export const meta = {
diff --git a/pages/writing/how-to-add-typescript-to-an-existing-next-js-project.mdx b/pages/writing/how-to-add-typescript-to-an-existing-next-js-project.mdx
index b47fc6e..7fbdb87 100644
--- a/pages/writing/how-to-add-typescript-to-an-existing-next-js-project.mdx
+++ b/pages/writing/how-to-add-typescript-to-an-existing-next-js-project.mdx
@@ -1,4 +1,4 @@
-import {ArticleLayout} from '@/components/ArticleLayout'
+import {ArticleLayout} from '@/components/layouts/ArticleLayout'
 import {createSlug} from '@/lib/createSlug'
 
 export const meta = {
diff --git a/pages/writing/index.tsx b/pages/writing/index.tsx
index 8ac7acc..a63e100 100644
--- a/pages/writing/index.tsx
+++ b/pages/writing/index.tsx
@@ -2,7 +2,7 @@ import {GetStaticProps} from 'next'
 import Head from 'next/head'
 
 import {Card} from '@/components/Card'
-import {SimpleLayout} from '@/components/SimpleLayout'
+import {SimpleLayout} from '@/components/layouts/SimpleLayout'
 import {getAllArticles} from '@/lib/getAllArticles'
 import {formatDate} from '@/lib/formatDate'