diff --git a/src/components/Header.astro b/src/components/Header.astro
index 8f8bd54..5663548 100644
--- a/src/components/Header.astro
+++ b/src/components/Header.astro
@@ -1,6 +1,6 @@
 ---
 import BrandLogo from '@components/ui/logos/BrandLogo.astro';
-import ThemeToggle from '@components/ui/buttons/ThemeToggle.astro';
+import ThemeToggle from '@components/buttons/ThemeToggle.astro';
 import { NavigationLinks } from '@/config';
 
 const pathname = new URL(Astro.request.url).pathname;
diff --git a/src/components/blog/BlogLeftSection.astro b/src/components/blog/BlogLeftSection.astro
index 931d0f8..5b761a7 100644
--- a/src/components/blog/BlogLeftSection.astro
+++ b/src/components/blog/BlogLeftSection.astro
@@ -1,5 +1,5 @@
 ---
-import GoLinkPrimary from '@components/ui/buttons/GoLinkPrimary.astro';
+import GoLinkPrimary from '@components/buttons/GoLinkPrimary.astro';
 import Image from '@components/ui/images/Image.astro';
 
 interface Props {
diff --git a/src/components/blog/BlogRightSection.astro b/src/components/blog/BlogRightSection.astro
index b6219be..1501902 100644
--- a/src/components/blog/BlogRightSection.astro
+++ b/src/components/blog/BlogRightSection.astro
@@ -1,5 +1,5 @@
 ---
-import GoLinkPrimary from '@components/ui/buttons/GoLinkPrimary.astro';
+import GoLinkPrimary from '@components/buttons/GoLinkPrimary.astro';
 import Image from '@components/ui/images/Image.astro';
 
 interface Props {
diff --git a/src/components/ui/buttons/Bookmark.astro b/src/components/buttons/Bookmark.astro
similarity index 100%
rename from src/components/ui/buttons/Bookmark.astro
rename to src/components/buttons/Bookmark.astro
diff --git a/src/components/ui/buttons/GiteaButton.astro b/src/components/buttons/GiteaButton.astro
similarity index 100%
rename from src/components/ui/buttons/GiteaButton.astro
rename to src/components/buttons/GiteaButton.astro
diff --git a/src/components/ui/buttons/GoBack.astro b/src/components/buttons/GoBack.astro
similarity index 100%
rename from src/components/ui/buttons/GoBack.astro
rename to src/components/buttons/GoBack.astro
diff --git a/src/components/ui/buttons/GoHome.astro b/src/components/buttons/GoHome.astro
similarity index 100%
rename from src/components/ui/buttons/GoHome.astro
rename to src/components/buttons/GoHome.astro
diff --git a/src/components/ui/buttons/GoLinkPrimary.astro b/src/components/buttons/GoLinkPrimary.astro
similarity index 100%
rename from src/components/ui/buttons/GoLinkPrimary.astro
rename to src/components/buttons/GoLinkPrimary.astro
diff --git a/src/components/ui/buttons/GoLinkSecondary.astro b/src/components/buttons/GoLinkSecondary.astro
similarity index 100%
rename from src/components/ui/buttons/GoLinkSecondary.astro
rename to src/components/buttons/GoLinkSecondary.astro
diff --git a/src/components/ui/buttons/SocialShare.astro b/src/components/buttons/SocialShare.astro
similarity index 100%
rename from src/components/ui/buttons/SocialShare.astro
rename to src/components/buttons/SocialShare.astro
diff --git a/src/components/ui/buttons/ThemeToggle.astro b/src/components/buttons/ThemeToggle.astro
similarity index 100%
rename from src/components/ui/buttons/ThemeToggle.astro
rename to src/components/buttons/ThemeToggle.astro
diff --git a/src/components/ui/cards/EducationCard.astro b/src/components/cards/EducationCard.astro
similarity index 100%
rename from src/components/ui/cards/EducationCard.astro
rename to src/components/cards/EducationCard.astro
diff --git a/src/components/ui/cards/FeaturesCard.astro b/src/components/cards/FeaturesCard.astro
similarity index 100%
rename from src/components/ui/cards/FeaturesCard.astro
rename to src/components/cards/FeaturesCard.astro
diff --git a/src/components/ui/cards/HighlightsCard.astro b/src/components/cards/HighlightsCard.astro
similarity index 100%
rename from src/components/ui/cards/HighlightsCard.astro
rename to src/components/cards/HighlightsCard.astro
diff --git a/src/components/ui/cards/WeatherCard.astro b/src/components/cards/WeatherCard.astro
similarity index 100%
rename from src/components/ui/cards/WeatherCard.astro
rename to src/components/cards/WeatherCard.astro
diff --git a/src/components/ui/sections/ApplicationSection.astro b/src/components/sections/ApplicationSection.astro
similarity index 92%
rename from src/components/ui/sections/ApplicationSection.astro
rename to src/components/sections/ApplicationSection.astro
index b01267d..5943ba1 100644
--- a/src/components/ui/sections/ApplicationSection.astro
+++ b/src/components/sections/ApplicationSection.astro
@@ -4,7 +4,7 @@ import { readItems } from '@directus/sdk';
 import type { Application } from '@lib/directusTypes';
 
 import directus from '@lib/directus';
-import HighlightsCard from '@components/ui/cards/HighlightsCard.astro';
+import HighlightsCard from '@components/cards/HighlightsCard.astro';
 
 const applications = ((await directus.request(
   readItems('site_applications' as any, {
diff --git a/src/components/ui/sections/EducationSection.astro b/src/components/sections/EducationSection.astro
similarity index 96%
rename from src/components/ui/sections/EducationSection.astro
rename to src/components/sections/EducationSection.astro
index 5122953..a635c54 100644
--- a/src/components/ui/sections/EducationSection.astro
+++ b/src/components/sections/EducationSection.astro
@@ -5,7 +5,7 @@ import type { Education, Certificate} from '@lib/directusTypes';
 
 import directus from '@lib/directus';
 import { getDirectusImageURL } from '@lib/directusFunctions';
-import EducationCard from '@components/ui/cards/EducationCard.astro';
+import EducationCard from '@components/cards/EducationCard.astro';
 
 const educations = ((await directus.request(
   readItems('site_education' as any, {
diff --git a/src/components/ui/sections/Experience.astro b/src/components/sections/Experience.astro
similarity index 100%
rename from src/components/ui/sections/Experience.astro
rename to src/components/sections/Experience.astro
diff --git a/src/components/ui/sections/FeaturesSection.astro b/src/components/sections/FeaturesSection.astro
similarity index 95%
rename from src/components/ui/sections/FeaturesSection.astro
rename to src/components/sections/FeaturesSection.astro
index f4af524..e50d3b4 100644
--- a/src/components/ui/sections/FeaturesSection.astro
+++ b/src/components/sections/FeaturesSection.astro
@@ -2,7 +2,7 @@
 import { readSingleton } from '@directus/sdk';
 
 import directus from '@lib/directus';
-import FeaturesCard from '@components/ui/cards/FeaturesCard.astro';
+import FeaturesCard from '@components/cards/FeaturesCard.astro';
 
 const global = await directus.request(readSingleton('site_global'));
 ---
diff --git a/src/components/ui/sections/GiteaSection.astro b/src/components/sections/GiteaSection.astro
similarity index 98%
rename from src/components/ui/sections/GiteaSection.astro
rename to src/components/sections/GiteaSection.astro
index e3d0163..76332a7 100644
--- a/src/components/ui/sections/GiteaSection.astro
+++ b/src/components/sections/GiteaSection.astro
@@ -1,5 +1,5 @@
 ---
-import GiteaButton from '@components/ui/buttons/GiteaButton.astro';
+import GiteaButton from '@components/buttons/GiteaButton.astro';
 
 const { title, subTitle, url } = Astro.props;
 const btnTitle = 'Continue to Gitea';
diff --git a/src/components/ui/sections/HeaderSection.astro b/src/components/sections/HeaderSection.astro
similarity index 92%
rename from src/components/ui/sections/HeaderSection.astro
rename to src/components/sections/HeaderSection.astro
index 5a712d6..9c2efa5 100644
--- a/src/components/ui/sections/HeaderSection.astro
+++ b/src/components/sections/HeaderSection.astro
@@ -1,5 +1,5 @@
 ---
-import GoLinkPrimary from '@components/ui/buttons/GoLinkPrimary.astro';
+import GoLinkPrimary from '@components/buttons/GoLinkPrimary.astro';
 
 interface Props {
   title: string;
diff --git a/src/components/ui/sections/HeroSection.astro b/src/components/sections/HeroSection.astro
similarity index 92%
rename from src/components/ui/sections/HeroSection.astro
rename to src/components/sections/HeroSection.astro
index 3d5d78b..30f8def 100644
--- a/src/components/ui/sections/HeroSection.astro
+++ b/src/components/sections/HeroSection.astro
@@ -1,6 +1,6 @@
 ---
-import GoLinkPrimary from '@components/ui/buttons/GoLinkPrimary.astro';
-import GoLinkSecondary from '@components/ui/buttons/GoLinkSecondary.astro';
+import GoLinkPrimary from '@components/buttons/GoLinkPrimary.astro';
+import GoLinkSecondary from '@components/buttons/GoLinkSecondary.astro';
 import Image from '@components/ui/images/Image.astro';
 
 const { title, subTitle, primaryBtn, primaryBtnURL, secondaryBtn, secondaryBtnURL, src, alt } =
diff --git a/src/components/ui/sections/LatestPosts.astro b/src/components/sections/LatestPosts.astro
similarity index 100%
rename from src/components/ui/sections/LatestPosts.astro
rename to src/components/sections/LatestPosts.astro
diff --git a/src/components/ui/sections/ProjectSection.astro b/src/components/sections/ProjectSection.astro
similarity index 92%
rename from src/components/ui/sections/ProjectSection.astro
rename to src/components/sections/ProjectSection.astro
index dc91c05..1647392 100644
--- a/src/components/ui/sections/ProjectSection.astro
+++ b/src/components/sections/ProjectSection.astro
@@ -4,7 +4,7 @@ import { readItems } from '@directus/sdk';
 import type { Project } from '@lib/directusTypes';
 
 import directus from '@lib/directus';
-import HighlightsCard from '@components/ui/cards/HighlightsCard.astro';
+import HighlightsCard from '@components/cards/HighlightsCard.astro';
 
 const projects = ((await directus.request(
   readItems('site_projects' as any, {
diff --git a/src/components/ui/sections/SkillsSlider.astro b/src/components/sections/SkillsSlider.astro
similarity index 100%
rename from src/components/ui/sections/SkillsSlider.astro
rename to src/components/sections/SkillsSlider.astro
diff --git a/src/components/ui/sections/WeatherSection.astro b/src/components/sections/WeatherSection.astro
similarity index 94%
rename from src/components/ui/sections/WeatherSection.astro
rename to src/components/sections/WeatherSection.astro
index 07febf1..fd5fab0 100644
--- a/src/components/ui/sections/WeatherSection.astro
+++ b/src/components/sections/WeatherSection.astro
@@ -1,5 +1,5 @@
 ---
-import WeatherCard from '@components/ui/cards/WeatherCard.astro';
+import WeatherCard from '@components/cards/WeatherCard.astro';
 import { getFiveDayForecast } from '@support/weather';
 
 const { latitude = "44.95", longitude = "-93.09", cityName = "St. Paul, Minnesota", timezone = "America/Chicago" } = Astro.props;
diff --git a/src/pages/404.astro b/src/pages/404.astro
index b43334e..c672b45 100644
--- a/src/pages/404.astro
+++ b/src/pages/404.astro
@@ -3,8 +3,8 @@ import { readSingleton } from '@directus/sdk';
 
 import directus from '@lib/directus';
 import BaseLayout from '@layouts/BaseLayout.astro';
-import GoBack from '@/components/ui/buttons/GoBack.astro';
-import GoHome from '@/components/ui/buttons/GoHome.astro';
+import GoBack from '@/components/buttons/GoBack.astro';
+import GoHome from '@/components/buttons/GoHome.astro';
 
 const global = await directus.request(readSingleton('site_global'));
 ---
diff --git a/src/pages/about.astro b/src/pages/about.astro
index 9b973b6..7521401 100644
--- a/src/pages/about.astro
+++ b/src/pages/about.astro
@@ -3,11 +3,11 @@ import { readSingleton } from '@directus/sdk';
 
 import directus from '@lib/directus';
 import BaseLayout from '@layouts/BaseLayout.astro';
-import HeroSection from '@components/ui/sections/HeroSection.astro';
-import Experience from '@components/ui/sections/Experience.astro';
-import EducationSection from '@components/ui/sections/EducationSection.astro';
-import ProjectSection from '@components/ui/sections/ProjectSection.astro';
-import SkillsSlider from '@components/ui/sections/SkillsSlider.astro';
+import HeroSection from '@components/sections/HeroSection.astro';
+import Experience from '@components/sections/Experience.astro';
+import EducationSection from '@components/sections/EducationSection.astro';
+import ProjectSection from '@components/sections/ProjectSection.astro';
+import SkillsSlider from '@components/sections/SkillsSlider.astro';
 
 import portraitImg from '@images/portrait.avif';
 
diff --git a/src/pages/apps.astro b/src/pages/apps.astro
index 996fc4f..b4d888c 100644
--- a/src/pages/apps.astro
+++ b/src/pages/apps.astro
@@ -3,8 +3,8 @@ import { readSingleton } from '@directus/sdk';
 
 import directus from '@lib/directus';
 import BaseLayout from '@layouts/BaseLayout.astro';
-import HeroSection from '@components/ui/sections/HeroSection.astro';
-import ApplicationSection from '@components/ui/sections/ApplicationSection.astro';
+import HeroSection from '@components/sections/HeroSection.astro';
+import ApplicationSection from '@components/sections/ApplicationSection.astro';
 
 import applicationImg from '@images/cedar_tree.png';
 
diff --git a/src/pages/blog/[...slug].astro b/src/pages/blog/[...slug].astro
index 4b02d07..b2107af 100644
--- a/src/pages/blog/[...slug].astro
+++ b/src/pages/blog/[...slug].astro
@@ -10,7 +10,7 @@ import { createHighlighter } from 'shiki';
 import { getDirectusImageURL } from '@lib/directusFunctions';
 import BaseLayout from '@layouts/BaseLayout.astro';
 import Image from '@components/ui/images/Image.astro';
-import SocialShare from '@components/ui/buttons/SocialShare.astro';
+import SocialShare from '@components/buttons/SocialShare.astro';
 import { formatDateTime } from '@support/time';
 
 export async function getStaticPaths() {
diff --git a/src/pages/blog/index.astro b/src/pages/blog/index.astro
index 635f068..49159b7 100644
--- a/src/pages/blog/index.astro
+++ b/src/pages/blog/index.astro
@@ -7,7 +7,7 @@ import directus from '@lib/directus';
 import BaseLayout from '@layouts/BaseLayout.astro';
 import BlogSelectedArticles from '@components/blog/BlogSelectedArticles.astro';
 import BlogRecentArticles from '@components/blog/BlogRecentArticles.astro';
-import HeroSection from '@components/ui/sections/HeroSection.astro';
+import HeroSection from '@components/sections/HeroSection.astro';
 import blogImg from '@images/autumn_tree.png';
 
 const global = await directus.request(readSingleton('site_global'));
diff --git a/src/pages/categories/[...slug].astro b/src/pages/categories/[...slug].astro
index 4c7051e..0868c9c 100644
--- a/src/pages/categories/[...slug].astro
+++ b/src/pages/categories/[...slug].astro
@@ -6,7 +6,7 @@ import directus from '@lib/directus';
 import type { Post } from '@lib/directusTypes';
 import BaseLayout from '@layouts/BaseLayout.astro';
 import BlogCard from '@components/blog/BlogCard.astro';
-import HeaderSection from '@components/ui/sections/HeaderSection.astro';
+import HeaderSection from '@components/sections/HeaderSection.astro';
 
 export async function getStaticPaths() {
   const categories = await getCollection('categories');
diff --git a/src/pages/categories/index.astro b/src/pages/categories/index.astro
index ee9ac52..f734a9a 100644
--- a/src/pages/categories/index.astro
+++ b/src/pages/categories/index.astro
@@ -7,7 +7,7 @@ import type { Post } from '@lib/directusTypes';
 import directus from '@lib/directus';
 import BaseLayout from '@layouts/BaseLayout.astro';
 import BlogCategoryCard from '@components/blog/BlogCategoryCard.astro';
-import HeroSection from '@components/ui/sections/HeroSection.astro';
+import HeroSection from '@components/sections/HeroSection.astro';
 import { timeago } from '@support/time';
 import categoryImg from '@images/autumn_bench.png';
 
diff --git a/src/pages/index.astro b/src/pages/index.astro
index ec9fab5..ac0b867 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -3,11 +3,11 @@ import { readSingleton } from '@directus/sdk';
 
 import directus from '@lib/directus';
 import BaseLayout from '@layouts/BaseLayout.astro';
-import HeroSection from '@components/ui/sections/HeroSection.astro';
-import FeaturesSection from '@components/ui/sections/FeaturesSection.astro';
-import WeatherSection from '@components/ui/sections/WeatherSection.astro';
-import LatestPosts from '@components/ui/sections/LatestPosts.astro';
-import GiteaSection from '@components/ui/sections/GiteaSection.astro';
+import HeroSection from '@components/sections/HeroSection.astro';
+import FeaturesSection from '@components/sections/FeaturesSection.astro';
+import WeatherSection from '@components/sections/WeatherSection.astro';
+import LatestPosts from '@components/sections/LatestPosts.astro';
+import GiteaSection from '@components/sections/GiteaSection.astro';
 
 import homeImg from '@images/autumn_mountain.png';