diff --git a/src/components/PositionCard.svelte b/src/components/PositionCard.svelte
deleted file mode 100644
index e69de29..0000000
diff --git a/src/components/Avatar.svelte b/src/components/council/Avatar.svelte
similarity index 100%
rename from src/components/Avatar.svelte
rename to src/components/council/Avatar.svelte
diff --git a/src/components/CouncilCard.svelte b/src/components/council/CouncilCard.svelte
similarity index 90%
rename from src/components/CouncilCard.svelte
rename to src/components/council/CouncilCard.svelte
index 809a28a..ae62956 100644
--- a/src/components/CouncilCard.svelte
+++ b/src/components/council/CouncilCard.svelte
@@ -1,7 +1,7 @@
 <script>
 	let { onViewProfile, name, position, image } = $props();
 	import Button from 'components/Button.svelte';
-	import Avatar from 'components/Avatar.svelte';
+	import Avatar from 'components/council/Avatar.svelte';
 </script>
 
 <div class="text-ecsess-200 flex max-w-md items-center gap-6 p-3">
diff --git a/src/components/CouncilCardPopUp.svelte b/src/components/council/CouncilCardPopUp.svelte
similarity index 100%
rename from src/components/CouncilCardPopUp.svelte
rename to src/components/council/CouncilCardPopUp.svelte
diff --git a/src/components/EventBlock.svelte b/src/components/event/EventBlock.svelte
similarity index 100%
rename from src/components/EventBlock.svelte
rename to src/components/event/EventBlock.svelte
diff --git a/src/components/EventTabControl.svelte b/src/components/event/EventTabControl.svelte
similarity index 100%
rename from src/components/EventTabControl.svelte
rename to src/components/event/EventTabControl.svelte
diff --git a/src/components/EventTabPanel.svelte b/src/components/event/EventTabPanel.svelte
similarity index 94%
rename from src/components/EventTabPanel.svelte
rename to src/components/event/EventTabPanel.svelte
index 91ec8f1..bb1eed9 100644
--- a/src/components/EventTabPanel.svelte
+++ b/src/components/event/EventTabPanel.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Tabs } from '@skeletonlabs/skeleton-svelte';
-	import EventBlock from 'components/EventBlock.svelte';
+	import EventBlock from 'components/event/EventBlock.svelte';
 	import type { EventPost } from '$lib/schemas';
 
 	type Category = 'allEvents' | 'academic' | 'professional' | 'social' | 'technical';
diff --git a/src/components/FAQAccordion.svelte b/src/components/homepage/FAQAccordion.svelte
similarity index 100%
rename from src/components/FAQAccordion.svelte
rename to src/components/homepage/FAQAccordion.svelte
diff --git a/src/components/Gallery.svelte b/src/components/homepage/Gallery.svelte
similarity index 100%
rename from src/components/Gallery.svelte
rename to src/components/homepage/Gallery.svelte
diff --git a/src/components/Footer.svelte b/src/components/layout/Footer.svelte
similarity index 100%
rename from src/components/Footer.svelte
rename to src/components/layout/Footer.svelte
diff --git a/src/components/NavBar.svelte b/src/components/layout/NavBar.svelte
similarity index 97%
rename from src/components/NavBar.svelte
rename to src/components/layout/NavBar.svelte
index f20c245..d6a7ef8 100644
--- a/src/components/NavBar.svelte
+++ b/src/components/layout/NavBar.svelte
@@ -1,5 +1,4 @@
 <script>
-	import Button from './Button.svelte';
 	import NavButton from './NavButton.svelte';
 	import ECSESS from 'assets/ECSESS.png';
 	import { Menu } from '@lucide/svelte';
diff --git a/src/components/NavButton.svelte b/src/components/layout/NavButton.svelte
similarity index 100%
rename from src/components/NavButton.svelte
rename to src/components/layout/NavButton.svelte
diff --git a/src/components/Section.svelte b/src/components/layout/Section.svelte
similarity index 100%
rename from src/components/Section.svelte
rename to src/components/layout/Section.svelte
diff --git a/src/components/SeoMetaTags.svelte b/src/components/layout/SeoMetaTags.svelte
similarity index 100%
rename from src/components/SeoMetaTags.svelte
rename to src/components/layout/SeoMetaTags.svelte
diff --git a/src/components/OHSchedule.svelte b/src/components/officehour/OHSchedule.svelte
similarity index 100%
rename from src/components/OHSchedule.svelte
rename to src/components/officehour/OHSchedule.svelte
diff --git a/src/components/ResourceCard.svelte b/src/components/resource/ResourceCard.svelte
similarity index 100%
rename from src/components/ResourceCard.svelte
rename to src/components/resource/ResourceCard.svelte
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 3e3a0fc..0017a41 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -2,8 +2,8 @@
 	import '../app.css';
 	import { dev } from '$app/environment';
     import { inject } from '@vercel/analytics';
-	import Navbar from 'components/NavBar.svelte';
-	import Footer from 'components/Footer.svelte';
+	import Navbar from 'components/layout/NavBar.svelte';
+	import Footer from 'components/layout/Footer.svelte';
 
 	inject({ mode: dev ? 'development' : 'production' });
 
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 8ce1d43..ec43245 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1,10 +1,10 @@
 <script>
-	import FaqAccordion from 'components/FAQAccordion.svelte';
-	import Section from 'components/Section.svelte';
+	import FaqAccordion from 'components/homepage/FAQAccordion.svelte';
+	import Section from 'components/layout/Section.svelte';
 	import RichText from 'components/RichText.svelte';
-	import OhSchedule from 'components/OHSchedule.svelte';
+	import OhSchedule from 'components/officehour/OHSchedule.svelte';
 	import Link from 'components/Link.svelte';
-	import SeoMetaTags from 'components/SeoMetaTags.svelte';
+	import SeoMetaTags from 'components/layout/SeoMetaTags.svelte';
 	import { fade } from 'svelte/transition';
 
 	/** loading things from the server side */
diff --git a/src/routes/council/+page.svelte b/src/routes/council/+page.svelte
index f206796..fb08ae6 100644
--- a/src/routes/council/+page.svelte
+++ b/src/routes/council/+page.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
-	import CouncilCardPopUp from 'components/CouncilCardPopUp.svelte';
-	import Section from 'components/Section.svelte';
-	import CardCouncil from 'components/CouncilCard.svelte';
+	import CouncilCardPopUp from 'components/council/CouncilCardPopUp.svelte';
+	import Section from 'components/layout/Section.svelte';
+	import CardCouncil from 'components/council/CouncilCard.svelte';
 	import type { CouncilMember } from '$lib/schemas';
 	import { fly } from 'svelte/transition';
 	import Button from 'components/Button.svelte';
-	import SeoMetaTags from 'components/SeoMetaTags.svelte';
+	import SeoMetaTags from 'components/layout/SeoMetaTags.svelte';
 
 	let { data } = $props();
 
diff --git a/src/routes/events/+page.svelte b/src/routes/events/+page.svelte
index 33df253..683b157 100644
--- a/src/routes/events/+page.svelte
+++ b/src/routes/events/+page.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
-	import Section from 'components/Section.svelte';
-	import SeoMetaTags from 'components/SeoMetaTags.svelte';
+	import Section from 'components/layout/Section.svelte';
+	import SeoMetaTags from 'components/layout/SeoMetaTags.svelte';
 	let { data } = $props();
 
-	import EventTabControl from 'components/EventTabControl.svelte';
+	import EventTabControl from 'components/event/EventTabControl.svelte';
 	import { Tabs } from '@skeletonlabs/skeleton-svelte';
-	import EventTabPanel from 'components/EventTabPanel.svelte';
+	import EventTabPanel from 'components/event/EventTabPanel.svelte';
 	import type { EventPost } from '$lib/schemas';
 
 	let events: EventPost[] = data.events ?? [];
diff --git a/src/routes/resources/+page.svelte b/src/routes/resources/+page.svelte
index 2710f74..c7ba87a 100644
--- a/src/routes/resources/+page.svelte
+++ b/src/routes/resources/+page.svelte
@@ -1,7 +1,7 @@
 <script>
-	import ResourceCard from 'components/ResourceCard.svelte';
-	import Section from 'components/Section.svelte';
-	import SeoMetaTags from 'components/SeoMetaTags.svelte';
+	import ResourceCard from 'components/resource/ResourceCard.svelte';
+	import Section from 'components/layout/Section.svelte';
+	import SeoMetaTags from 'components/layout/SeoMetaTags.svelte';
 	let { data } = $props();
 </script>