diff --git a/README.md b/README.md
index e1cdabf..f179f9f 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,34 @@
 # astro-personal-website
 Personal Website template with blog and themes made with Astro
+
+## Project Strucutre
+
+``` php
+├── src/ 
+│   ├── components/
+│   │   ├── cs/
+│   │   │   ├── TimeLine 
+│   │   ├── BaseHead.astro
+│   │   ├── Card.astro 
+│   │   ├── Footer.astro 
+│   │   ├── Header.astro 
+│   │   └-─ HorizontalCard.jsx
+│   │   └-─ SideBar.jsx
+│   ├── layouts/
+│   │   └-─ BaseLayout.astro
+│   │   └-─ PostLayout.astro
+│   └── pages/
+│   │   ├── posts/
+│   │   │   ├── post1.md
+│   │   │   ├── post2.md
+│   │   │   └── post3.md
+│   │   └── index.astro
+│   └── styles/
+│       └-─ global.css
+├── public/
+│   ├── favicon.svg
+│   └-─ social-image.png
+├── astro.config.mjs
+├── package.json
+└── tsconfig.json
+```
diff --git a/src/components/HeaderLink.astro b/src/components/HeaderLink.astro
deleted file mode 100644
index d82155c..0000000
--- a/src/components/HeaderLink.astro
+++ /dev/null
@@ -1,20 +0,0 @@
----
-export interface Props extends astroHTML.JSX.AnchorHTMLAttributes {}
-
-const { href, class: className, ...props } = Astro.props;
-const isActive = href === Astro.url.pathname.replace(/\/$/, '');
----
-
-<a href={href} class:list={[className, { active: isActive }]} {...props}>
-	<slot />
-</a>
-<style>
-	a {
-		display: inline-block;
-		text-decoration: none;
-	}
-	a.active {
-		font-weight: bolder;
-		text-decoration: underline;
-	}
-</style>
diff --git a/src/layouts/Base.astro b/src/layouts/BaseLayout.astro
similarity index 100%
rename from src/layouts/Base.astro
rename to src/layouts/BaseLayout.astro
diff --git a/src/layouts/BlogPost.astro b/src/layouts/PostLayout.astro
similarity index 87%
rename from src/layouts/BlogPost.astro
rename to src/layouts/PostLayout.astro
index 47a3be1..56d91a6 100644
--- a/src/layouts/BlogPost.astro
+++ b/src/layouts/PostLayout.astro
@@ -1,6 +1,6 @@
 ---
 import BaseHead from "../components/BaseHead.astro";
-import PageLayout from "./Base.astro";
+import BaseLayout from "./BaseLayout.astro";
 
 export interface Props {
   content: {
@@ -17,7 +17,7 @@ const {
 } = Astro.props;
 ---
 
-<PageLayout title={title} description={description} image={heroImage}>
+<BaseLayout title={title} description={description} image={heroImage}>
   <main class="flex justify-center">
     <article class="prose prose-lg max-w-[750px] prose-img:mx-auto">
       {heroImage && <img src={heroImage} alt={title} class="w-full mb-6" />}
@@ -35,4 +35,4 @@ const {
         <slot />
     </article>
   </main>
-</PageLayout>
+</BaseLayout>
diff --git a/src/pages/blog/[page].astro b/src/pages/blog/[page].astro
index 03d19b2..da67336 100644
--- a/src/pages/blog/[page].astro
+++ b/src/pages/blog/[page].astro
@@ -1,5 +1,5 @@
 ---
-import PageLayout from "../../layouts/Base.astro";
+import BaseLayout from "../../layouts/BaseLayout.astro";
 import HorizontalCard from "../../components/HorizontalCard.astro";
 
 export async function getStaticPaths({ paginate }) {
@@ -12,7 +12,7 @@ export async function getStaticPaths({ paginate }) {
 const { page } = Astro.props;
 ---
 
-<PageLayout>
+<BaseLayout>
   <ul>
     <!--List the array of astronaut info-->
     {page.data.map(( post ) => (
@@ -34,4 +34,4 @@ const { page } = Astro.props;
       {page.url.next ? <a href={page.url.next} class="btn btn-ghost my-10 mx-5">Older Posts <svg class="h-6 w-6 fill-current md:h-8 md:w-8" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"> <path d="M8.59,16.58L13.17,12L8.59,7.41L10,6L16,12L10,18L8.59,16.58Z"></path></svg></a> : <div></div>}
     </div>
 
-</PageLayout>
+</BaseLayout>
diff --git a/src/pages/blog/demo-post-1.md b/src/pages/blog/post1.md
similarity index 100%
rename from src/pages/blog/demo-post-1.md
rename to src/pages/blog/post1.md
diff --git a/src/pages/blog/demo-post-2.md b/src/pages/blog/post2.md
similarity index 100%
rename from src/pages/blog/demo-post-2.md
rename to src/pages/blog/post2.md
diff --git a/src/pages/blog/demo-post-3.md b/src/pages/blog/post3.md
similarity index 100%
rename from src/pages/blog/demo-post-3.md
rename to src/pages/blog/post3.md
diff --git a/src/pages/cv.astro b/src/pages/cv.astro
index dffad69..3c5fe46 100644
--- a/src/pages/cv.astro
+++ b/src/pages/cv.astro
@@ -1,9 +1,9 @@
 ---
-import PageLayout from "../layouts/Base.astro";
+import BaseLayout from "../layouts/BaseLayout.astro";
 import TimeLineElement from "../components/cv/TimeLine.astro";
 ---
 
-<PageLayout>
+<BaseLayout>
   <div class="mb-5">
     <div class="text-3xl w-full font-bold">Profile</div>
   </div>
@@ -118,4 +118,4 @@ import TimeLineElement from "../components/cv/TimeLine.astro";
     <li>Adobe Photoshop</li>
     <li>KdenLive</li>
   </ul>
-</PageLayout>
+</BaseLayout>
diff --git a/src/pages/index.astro b/src/pages/index.astro
index 24aff22..c1358d1 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -1,5 +1,5 @@
 ---
-import PageLayout from "../layouts/Base.astro";
+import BaseLayout from "../layouts/BaseLayout.astro";
 import HorizontalCard from "../components/HorizontalCard.astro";
 
 const posts = (await Astro.glob("./blog/*.{md,mdx}")).sort(
@@ -9,7 +9,7 @@ const posts = (await Astro.glob("./blog/*.{md,mdx}")).sort(
 const last_posts = posts.slice(0, 3);
 ---
 
-<PageLayout>
+<BaseLayout>
 
     <div class="pb-12 mt-5">
       <div class="text-xl py-1">Hey there 👋</div>
@@ -71,4 +71,4 @@ const last_posts = posts.slice(0, 3);
       ))
     }
 
-</PageLayout>
+</BaseLayout>
diff --git a/src/pages/projects.astro b/src/pages/projects.astro
index 78d4327..61a5b87 100644
--- a/src/pages/projects.astro
+++ b/src/pages/projects.astro
@@ -1,9 +1,9 @@
 ---
-import PageLayout from "../layouts/Base.astro";
+import BaseLayout from "../layouts/BaseLayout.astro";
 import HorizontalCard from "../components/HorizontalCard.astro";
 ---
 
-<PageLayout>
+<BaseLayout>
   <div>
     <div class="text-3xl w-full font-bold mb-5">Applications</div>
   </div>
@@ -62,4 +62,4 @@ import HorizontalCard from "../components/HorizontalCard.astro";
     url="https://github.com/manuelernestog/joplin-minimalist-light-theme"
     badge="FOSS"
   />
-</PageLayout>
+</BaseLayout>