diff --git a/src/components/GlossaryItem.astro b/src/components/GlossaryItem.astro
deleted file mode 100644
index 357610f..0000000
--- a/src/components/GlossaryItem.astro
+++ /dev/null
@@ -1,19 +0,0 @@
----
-import type { CollectionEntry } from "astro:content";
-import HorizontalLine from "./horizontalLine.astro";
-interface Props {
-  item: CollectionEntry<"glossary">;
-}
-
-const { item } = Astro.props;
-const { Content } = await item.render();
-const title = item.data.term.replaceAll("-", " ");
----
-
-<li class="item">
-  <h2 id={item.data.term} class="title"># {title}</h2>
-  <div class="content">
-    <Content />
-  </div>
-</li>
-<style scoped></style>
diff --git a/src/components/BlogSideBar.astro b/src/components/blog/BlogSideBar.astro
similarity index 96%
rename from src/components/BlogSideBar.astro
rename to src/components/blog/BlogSideBar.astro
index b0932f4..ba93022 100644
--- a/src/components/BlogSideBar.astro
+++ b/src/components/blog/BlogSideBar.astro
@@ -1,5 +1,5 @@
 ---
-import { getTags } from "../helpers/getTags";
+import { getTags } from "../../helpers/getTags";
 import TagItem from "./TagItem.astro";
 const tags = await getTags();
 
diff --git a/src/components/PostCard.astro b/src/components/blog/PostCard.astro
similarity index 100%
rename from src/components/PostCard.astro
rename to src/components/blog/PostCard.astro
diff --git a/src/components/TagItem.astro b/src/components/blog/TagItem.astro
similarity index 72%
rename from src/components/TagItem.astro
rename to src/components/blog/TagItem.astro
index fb838e5..60b7f72 100644
--- a/src/components/TagItem.astro
+++ b/src/components/blog/TagItem.astro
@@ -1,5 +1,5 @@
 ---
-import { getRandomColor } from "../helpers/colorGenerator";
+import { getRandomColor } from "../../helpers/colorGenerator";
 
 const { tag } = Astro.props;
 ---
diff --git a/src/components/TagList.astro b/src/components/blog/TagList.astro
similarity index 55%
rename from src/components/TagList.astro
rename to src/components/blog/TagList.astro
index cf5bc66..518385f 100644
--- a/src/components/TagList.astro
+++ b/src/components/blog/TagList.astro
@@ -2,19 +2,20 @@
 import TagItem from "./TagItem.astro";
 
 type TagItem = {
-  label: string,
-  url: string
-}
+  label: string;
+  url: string;
+};
 
 const { tags } = Astro.props;
 
-const mappedTags: TagItem[] = tags.map((tag: string) => ({label: tag, url: `/tags/${tag}`}))
+const mappedTags: TagItem[] = tags.map((tag: string) => ({
+  label: tag,
+  url: `/tags/${tag}`,
+}));
 ---
 
 <ul class="tags">
-  {mappedTags.map((tag) => 
-  <TagItem tag={tag}/>
-  )}
+  {mappedTags.map((tag) => <TagItem tag={tag} />)}
 </ul>
 <style scoped>
   .tags {
diff --git a/src/components/JobItem.astro b/src/components/work/JobItem.astro
similarity index 91%
rename from src/components/JobItem.astro
rename to src/components/work/JobItem.astro
index 0296391..926e66f 100644
--- a/src/components/JobItem.astro
+++ b/src/components/work/JobItem.astro
@@ -1,7 +1,7 @@
 ---
 import type { CollectionEntry } from "astro:content";
-import Markdown from "./MarkdownComponent.astro";
-import TagList from "./TagList.astro";
+import Markdown from "../MarkdownComponent.astro";
+import TagList from "../blog/TagList.astro";
 import JobTag from "./JobTag.astro";
 interface Props {
   job: CollectionEntry<"work">;
diff --git a/src/components/JobTag.astro b/src/components/work/JobTag.astro
similarity index 80%
rename from src/components/JobTag.astro
rename to src/components/work/JobTag.astro
index 2d16e67..a9c93f9 100644
--- a/src/components/JobTag.astro
+++ b/src/components/work/JobTag.astro
@@ -1,5 +1,5 @@
 ---
-import { getRandomColor } from "../helpers/colorGenerator";
+import { getRandomColor } from "../../helpers/colorGenerator";
 const { tag } = Astro.props;
 ---
 
diff --git a/src/layouts/BlogLayout.astro b/src/layouts/BlogLayout.astro
index 4104e72..21ef995 100644
--- a/src/layouts/BlogLayout.astro
+++ b/src/layouts/BlogLayout.astro
@@ -1,6 +1,6 @@
 ---
 import PageLayout from "../layouts/PageLayout.astro";
-import BlogSideBar from "../components/BlogSideBar.astro";
+import BlogSideBar from "../components/blog/BlogSideBar.astro";
 
 const { title } = Astro.props;
 ---
diff --git a/src/layouts/BlogPostLayout.astro b/src/layouts/BlogPostLayout.astro
index 1a6d7d5..d9fe14d 100644
--- a/src/layouts/BlogPostLayout.astro
+++ b/src/layouts/BlogPostLayout.astro
@@ -2,7 +2,7 @@
 import type { CollectionEntry } from "astro:content";
 import BlogLayout from "./BlogLayout.astro";
 import Markdown from "../components/MarkdownComponent.astro";
-import TagList from "../components/TagList.astro";
+import TagList from "../components/blog/TagList.astro";
 
 type Props = CollectionEntry<"blog">["data"];
 const { title, updateDate, tags } = Astro.props;
@@ -38,9 +38,9 @@ const postDate = updateDate.toLocaleDateString("en-uk", {
   h2 {
     margin-bottom: var(--space-extra-small);
   }
-  
+
   time {
-    color: var(--highligth-color)
+    color: var(--highligth-color);
   }
 
   .content {
diff --git a/src/pages/index.astro b/src/pages/index.astro
index 7185365..66467d1 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -1,34 +1,33 @@
 ---
 import BlogLayout from "../layouts/BlogLayout.astro";
 import { getCollection } from "astro:content";
-import PostCard from "../components/PostCard.astro";
+import PostCard from "../components/blog/PostCard.astro";
 
 const postList = await getCollection("blog");
 const blogPostList = postList.filter((post) => !post.data.draft);
-
 ---
 
 <BlogLayout title="Blog">
-    <div>
-      {
-        blogPostList
-          .sort(
-            (a, b) => b.data.updateDate.getTime() - a.data.updateDate.getTime()
-          )
-          .map((post) => {
-            const { title, description, updateDate, tags } = post.data;
-            return (
-              <>
-                <PostCard
-                  title={title}
-                  date={updateDate}
-                  description={description}
-                  tags={tags}
-                  slug={post.slug}
-                />
-              </>
-            );
-          })
-      }
-    </div>
+  <div>
+    {
+      blogPostList
+        .sort(
+          (a, b) => b.data.updateDate.getTime() - a.data.updateDate.getTime()
+        )
+        .map((post) => {
+          const { title, description, updateDate, tags } = post.data;
+          return (
+            <>
+              <PostCard
+                title={title}
+                date={updateDate}
+                description={description}
+                tags={tags}
+                slug={post.slug}
+              />
+            </>
+          );
+        })
+    }
+  </div>
 </BlogLayout>
diff --git a/src/pages/tags/[tag].astro b/src/pages/tags/[tag].astro
index 039ccee..46afe3f 100644
--- a/src/pages/tags/[tag].astro
+++ b/src/pages/tags/[tag].astro
@@ -1,21 +1,22 @@
 ---
-import PostCard from '../../components/PostCard.astro';
-import BlogLayout from '../../layouts/BlogLayout.astro';
+import PostCard from "../../components/blog/PostCard.astro";
+import BlogLayout from "../../layouts/BlogLayout.astro";
 import { getCollection } from "astro:content";
 
-
 export async function getStaticPaths() {
   const posts = await getCollection("blog");
-  const tags = [...new Set(posts.map((post) => post.data.tags).flat())]
-  return tags.map((tag)=> ({ params: { tag: String(tag) }, props: { posts }}))
+  const tags = [...new Set(posts.map((post) => post.data.tags).flat())];
+  return tags.map((tag) => ({
+    params: { tag: String(tag) },
+    props: { posts },
+  }));
 }
 
-
 const { tag } = Astro.params;
 const { posts } = Astro.props;
-const filteredPosts = posts.filter((post) => post.data.tags.includes(tag) );
-
+const filteredPosts = posts.filter((post) => post.data.tags.includes(tag));
 ---
+
 <BlogLayout pageTitle={tag}>
   <div>
     <h2>#{tag}</h2>
@@ -46,4 +47,4 @@ const filteredPosts = posts.filter((post) => post.data.tags.includes(tag) );
   h2 {
     margin-bottom: var(--space-large);
   }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/pages/work.astro b/src/pages/work.astro
index e4e7da8..ab9eaf4 100644
--- a/src/pages/work.astro
+++ b/src/pages/work.astro
@@ -1,7 +1,7 @@
 ---
 import { getCollection } from "astro:content";
 import PageLayout from "../layouts/PageLayout.astro";
-import JobItem from "../components/JobItem.astro";
+import JobItem from "../components/work/JobItem.astro";
 
 const jobs = await getCollection("work");
 ---