diff --git a/astro.config.mjs b/astro.config.mjs
index d29b12d..fad6358 100644
--- a/astro.config.mjs
+++ b/astro.config.mjs
@@ -8,7 +8,7 @@ import tailwindcss from '@tailwindcss/vite';
 import icon from 'astro-icon';
 import swup from '@swup/astro';
 
-import { getSiteURL } from './src/support/url';
+import { getSiteURL } from './src/scripts/url';
 
 export default defineConfig({
   site: getSiteURL(),
diff --git a/src/components/cards/BlogCard.astro b/src/components/cards/BlogCard.astro
index 7514d8a..d0da521 100644
--- a/src/components/cards/BlogCard.astro
+++ b/src/components/cards/BlogCard.astro
@@ -4,7 +4,7 @@ import { Image } from 'astro:assets';
 import type { Post } from '@lib/directusTypes';
 
 import PostMetadataSnippet from '@/components/snippets/PostMetadataSnippet.astro';
-import { getDirectusImageURL } from '@/support/url';
+import { getDirectusImageURL } from '@/scripts/url';
 
 interface Props {
   post: Post;
diff --git a/src/components/cards/CategoryCard.astro b/src/components/cards/CategoryCard.astro
index ef1983f..583ef09 100644
--- a/src/components/cards/CategoryCard.astro
+++ b/src/components/cards/CategoryCard.astro
@@ -1,6 +1,6 @@
 ---
 import Logo from '@components/images/Logo.astro';
-import { getDirectusImageURL } from '@/support/url';
+import { getDirectusImageURL } from '@/scripts/url';
 
 interface Props {
   slug: string;
diff --git a/src/components/cards/EducationCard.astro b/src/components/cards/EducationCard.astro
index 79d3dbb..7d7fabc 100644
--- a/src/components/cards/EducationCard.astro
+++ b/src/components/cards/EducationCard.astro
@@ -2,7 +2,7 @@
 import { Icon } from 'astro-icon/components';
 
 import Logo from '@components/images/Logo.astro';
-import { getDirectusImageURL } from '@/support/url';
+import { getDirectusImageURL } from '@/scripts/url';
 
 interface Props {
   topic: string;
diff --git a/src/components/cards/LargeBlogLeftCard.astro b/src/components/cards/LargeBlogLeftCard.astro
index 01cc885..8993e9c 100644
--- a/src/components/cards/LargeBlogLeftCard.astro
+++ b/src/components/cards/LargeBlogLeftCard.astro
@@ -5,7 +5,7 @@ import type { Post } from '@lib/directusTypes';
 
 import ReadMoreButton from '@components/buttons/ReadMoreButton.astro';
 import PostMetadataSnippet from '@/components/snippets/PostMetadataSnippet.astro';
-import { getDirectusImageURL } from '@/support/url';
+import { getDirectusImageURL } from '@/scripts/url';
 
 interface Props {
   post: Post;
diff --git a/src/components/cards/LargeBlogRightCard.astro b/src/components/cards/LargeBlogRightCard.astro
index 3fead59..18a6bae 100644
--- a/src/components/cards/LargeBlogRightCard.astro
+++ b/src/components/cards/LargeBlogRightCard.astro
@@ -5,7 +5,7 @@ import type { Post } from '@lib/directusTypes';
 
 import ReadMoreButton from '@components/buttons/ReadMoreButton.astro';
 import PostMetadataSnippet from '@/components/snippets/PostMetadataSnippet.astro';
-import { getDirectusImageURL } from '@/support/url';
+import { getDirectusImageURL } from '@/scripts/url';
 
 interface Props {
   post: Post;
diff --git a/src/components/cards/LargeCategoryCard.astro b/src/components/cards/LargeCategoryCard.astro
index eda6cf1..4a116df 100644
--- a/src/components/cards/LargeCategoryCard.astro
+++ b/src/components/cards/LargeCategoryCard.astro
@@ -1,6 +1,6 @@
 ---
 import Logo from '@components/images/Logo.astro';
-import { getDirectusImageURL } from '@/support/url';
+import { getDirectusImageURL } from '@/scripts/url';
 
 interface Props {
   url: string;
diff --git a/src/components/cards/LargeInvisibleCard.astro b/src/components/cards/LargeInvisibleCard.astro
index 7ca7c0a..e68fe26 100644
--- a/src/components/cards/LargeInvisibleCard.astro
+++ b/src/components/cards/LargeInvisibleCard.astro
@@ -2,7 +2,7 @@
 import { Icon } from 'astro-icon/components';
 import { Image } from 'astro:assets';
 
-import { getDirectusImageURL } from '@/support/url';
+import { getDirectusImageURL } from '@/scripts/url';
 
 interface Props {
   title: string;
diff --git a/src/components/cards/LargeLinkCard.astro b/src/components/cards/LargeLinkCard.astro
index 3b0d461..d2a9e31 100644
--- a/src/components/cards/LargeLinkCard.astro
+++ b/src/components/cards/LargeLinkCard.astro
@@ -1,7 +1,7 @@
 ---
 import ReadMoreButton from '@components/buttons/ReadMoreButton.astro';
 import Logo from '@components/images/Logo.astro';
-import { getDirectusImageURL } from '@/support/url';
+import { getDirectusImageURL } from '@/scripts/url';
 
 interface Props {
   title: string;
diff --git a/src/components/sections/CategorySection.astro b/src/components/sections/CategorySection.astro
index 8481c97..544a715 100644
--- a/src/components/sections/CategorySection.astro
+++ b/src/components/sections/CategorySection.astro
@@ -6,7 +6,7 @@ import type { Post } from '@lib/directusTypes';
 import CategoryCard from '@components/cards/CategoryCard.astro';
 import LargeCategoryCard from '@components/cards/LargeCategoryCard.astro';
 import directus from '@lib/directus';
-import { formatFromNow } from '@support/time';
+import { formatFromNow } from '@/scripts/time';
 
 const global = await directus.request(readSingleton('site_global'));
 
diff --git a/src/components/sections/HeaderSection.astro b/src/components/sections/HeaderSection.astro
index c82ac1c..8de8ef1 100644
--- a/src/components/sections/HeaderSection.astro
+++ b/src/components/sections/HeaderSection.astro
@@ -1,7 +1,7 @@
 ---
 import GoLinkPrimaryButton from '@components/buttons/GoLinkPrimaryButton.astro';
 import Logo from '@components/images/Logo.astro';
-import { getDirectusImageURL } from '@/support/url';
+import { getDirectusImageURL } from '@/scripts/url';
 
 interface Props {
   title: string;
diff --git a/src/components/sections/HeroSection.astro b/src/components/sections/HeroSection.astro
index 95f092f..dae4859 100644
--- a/src/components/sections/HeroSection.astro
+++ b/src/components/sections/HeroSection.astro
@@ -7,7 +7,7 @@ import type { HeaderImage } from '@lib/directusTypes';
 import GoLinkPrimaryButton from '@components/buttons/GoLinkPrimaryButton.astro';
 import GoLinkSecondaryButton from '@components/buttons/GoLinkSecondaryButton.astro';
 import directus from '@lib/directus';
-import { getDirectusImageURL } from '@/support/url';
+import { getDirectusImageURL } from '@/scripts/url';
 
 interface Props {
   title: string;
diff --git a/src/components/sections/WeatherSection.astro b/src/components/sections/WeatherSection.astro
index fb3bb2c..ac57a02 100644
--- a/src/components/sections/WeatherSection.astro
+++ b/src/components/sections/WeatherSection.astro
@@ -1,6 +1,6 @@
 ---
 import WeatherCard from '@components/cards/WeatherCard.astro';
-import { getFiveDayForecast } from '@support/weather';
+import { getFiveDayForecast } from '@/scripts/weather';
 
 const { latitude = "44.95", longitude = "-93.09", cityName = "St. Paul, Minnesota", timezone = "America/Chicago" } = Astro.props;
 
diff --git a/src/components/snippets/PostMetadataSnippet.astro b/src/components/snippets/PostMetadataSnippet.astro
index 5ea4c81..36246d0 100644
--- a/src/components/snippets/PostMetadataSnippet.astro
+++ b/src/components/snippets/PostMetadataSnippet.astro
@@ -4,8 +4,8 @@ import getReadingTime from 'reading-time';
 import type { Post } from '@lib/directusTypes';
 
 import Logo from '@components/images/Logo.astro';
-import { formatShortDate, formatDate } from '@support/time';
-import { getDirectusImageURL } from '@/support/url';
+import { formatShortDate, formatDate } from '@/scripts/time';
+import { getDirectusImageURL } from '@/scripts/url';
 
 interface Props {
   post: Post;
diff --git a/src/layouts/BaseLayout.astro b/src/layouts/BaseLayout.astro
index ef49e6c..dae7e92 100644
--- a/src/layouts/BaseLayout.astro
+++ b/src/layouts/BaseLayout.astro
@@ -101,16 +101,22 @@ const normalizeTitle = !title ? global.name : `${title} | ${global.name}`;
 </html>
 
 <script>
+  import { initPhotoSwipe } from '@/scripts/photoswipe';
+  import { animateContent } from '@/scripts/animations';
+  
   const resetScroll = () => {
     const scrollContainer = document.getElementById('reset-scroll');
-    if (scrollContainer) {
-      scrollContainer.scrollTop = 0;
-    }
+    if (scrollContainer) scrollContainer.scrollTop = 0;
   };
+  
   resetScroll();
+  initPhotoSwipe();
+  animateContent();
 
   document.addEventListener('swup:page:view', () => {
     resetScroll();
+    initPhotoSwipe();
+    animateContent();
     if (typeof (window as any).HSStaticMethods !== 'undefined') {
       (window as any).HSStaticMethods.autoInit();
     }
@@ -120,84 +126,6 @@ const normalizeTitle = !title ? global.name : `${title} | ${global.name}`;
   });
 </script>
 
-<script>
-  import PhotoSwipeLightbox from 'photoswipe/lightbox';
-  import PhotoSwipe from "photoswipe";
-
-  let lightbox: PhotoSwipeLightbox | null = null;
-
-  function initPhotoSwipe() {
-    const links = document.querySelectorAll<HTMLAnchorElement>('a.pswp-link');
-    
-    links.forEach((link) => {
-      const img = link.querySelector('img');
-      if (img) {
-        const applyDimensions = () => {
-          link.dataset.pswpWidth = (img.naturalWidth || 1920).toString();
-          link.dataset.pswpHeight = (img.naturalHeight || 1080).toString();
-        };
-        if (img.complete) {
-          applyDimensions();
-        } else {
-          img.addEventListener('load', applyDimensions);
-        }
-      }
-    });
-
-    if (lightbox) {
-      lightbox.destroy();
-    }
-
-    lightbox = new PhotoSwipeLightbox({
-      gallery: '.prose',
-      children: 'a.pswp-link',
-      pswpModule: PhotoSwipe,
-      allowPanToNext: true,
-    });
-    
-    lightbox.init();
-  }
-
-  initPhotoSwipe();
-  document.addEventListener('swup:page:view', initPhotoSwipe);
-</script>
-
-<script>
-  const animateContent = () => {
-    const smoothReveal = document.querySelectorAll('.smooth-reveal');
-    smoothReveal.forEach((el, index) => {
-      setTimeout(() => {
-        el.classList.add('animate-reveal');
-      }, 50 + index * 100);
-    });
-
-    const smoothReveal2 = document.querySelectorAll('.smooth-reveal-2');
-    smoothReveal2.forEach((el, index) => {
-      setTimeout(() => {
-        el.classList.add('animate-reveal');
-      }, 200 + index * 250);
-    });
-
-    const smoothRevealCards = document.querySelectorAll('.smooth-reveal-cards');
-    smoothRevealCards.forEach((el, index) => {
-      setTimeout(() => {
-        el.classList.add('animate-reveal');
-      }, 400 + index * 250);
-    });
-
-    const smoothRevealFade = document.querySelectorAll('.smooth-reveal-fade');
-    smoothRevealFade.forEach((el, index) => {
-      setTimeout(() => {
-        el.classList.add('animate-reveal-fade');
-      }, 100 + index * 250);
-    });
-  };
-
-  animateContent();
-
-  document.addEventListener('swup:page:view', animateContent);
-</script>
-
 <style>
   /* Fade away content below header when scrolling */
   .mask-container {
diff --git a/src/lib/directus.ts b/src/lib/directus.ts
index fcf6e01..a54ecd8 100644
--- a/src/lib/directus.ts
+++ b/src/lib/directus.ts
@@ -14,7 +14,7 @@ import type {
   Skill,
 } from '@lib/directusTypes';
 
-import { getDirectusURL } from '@/support/url';
+import { getDirectusURL } from '@/scripts/url';
 
 type Schema = {
   site_global: Global;
diff --git a/src/pages/blog/[...slug].astro b/src/pages/blog/[...slug].astro
index 1edb472..4cc1916 100644
--- a/src/pages/blog/[...slug].astro
+++ b/src/pages/blog/[...slug].astro
@@ -12,7 +12,7 @@ import SocialShareButton from '@components/buttons/SocialShareButton.astro';
 import PostMetadataSnippet from '@/components/snippets/PostMetadataSnippet.astro';
 import BaseLayout from '@layouts/BaseLayout.astro';
 import directus from '@lib/directus';
-import { getDirectusImageURL } from '@/support/url';
+import { getDirectusImageURL } from '@/scripts/url';
 
 export async function getStaticPaths() {
   const posts = await directus.request(readItems('posts', {
diff --git a/src/scripts/animations.ts b/src/scripts/animations.ts
new file mode 100644
index 0000000..fe338d3
--- /dev/null
+++ b/src/scripts/animations.ts
@@ -0,0 +1,31 @@
+const animateContent = () => {
+  const smoothReveal = document.querySelectorAll('.smooth-reveal');
+  smoothReveal.forEach((el, index) => {
+    setTimeout(() => {
+      el.classList.add('animate-reveal');
+    }, 50 + index * 100);
+  });
+
+  const smoothReveal2 = document.querySelectorAll('.smooth-reveal-2');
+  smoothReveal2.forEach((el, index) => {
+    setTimeout(() => {
+      el.classList.add('animate-reveal');
+    }, 200 + index * 250);
+  });
+
+  const smoothRevealCards = document.querySelectorAll('.smooth-reveal-cards');
+  smoothRevealCards.forEach((el, index) => {
+    setTimeout(() => {
+      el.classList.add('animate-reveal');
+    }, 400 + index * 250);
+  });
+
+  const smoothRevealFade = document.querySelectorAll('.smooth-reveal-fade');
+  smoothRevealFade.forEach((el, index) => {
+    setTimeout(() => {
+      el.classList.add('animate-reveal-fade');
+    }, 100 + index * 250);
+  });
+};
+
+export { animateContent  };
diff --git a/src/scripts/photoswipe.ts b/src/scripts/photoswipe.ts
new file mode 100644
index 0000000..f6e9af9
--- /dev/null
+++ b/src/scripts/photoswipe.ts
@@ -0,0 +1,38 @@
+import PhotoSwipeLightbox from 'photoswipe/lightbox';
+import PhotoSwipe from "photoswipe";
+
+let lightbox: PhotoSwipeLightbox | null = null;
+
+function initPhotoSwipe() {
+  const links = document.querySelectorAll<HTMLAnchorElement>('a.pswp-link');
+  
+  links.forEach((link) => {
+    const img = link.querySelector('img');
+    if (img) {
+      const applyDimensions = () => {
+        link.dataset.pswpWidth = (img.naturalWidth || 1920).toString();
+        link.dataset.pswpHeight = (img.naturalHeight || 1080).toString();
+      };
+      if (img.complete) {
+        applyDimensions();
+      } else {
+        img.addEventListener('load', applyDimensions);
+      }
+    }
+  });
+
+  if (lightbox) {
+    lightbox.destroy();
+  }
+
+  lightbox = new PhotoSwipeLightbox({
+    gallery: '.prose',
+    children: 'a.pswp-link',
+    pswpModule: PhotoSwipe,
+    allowPanToNext: true,
+  });
+  
+  lightbox.init();
+}
+
+export { initPhotoSwipe };
diff --git a/src/support/time.ts b/src/scripts/time.ts
similarity index 100%
rename from src/support/time.ts
rename to src/scripts/time.ts
diff --git a/src/support/url.ts b/src/scripts/url.ts
similarity index 100%
rename from src/support/url.ts
rename to src/scripts/url.ts
diff --git a/src/support/weather.ts b/src/scripts/weather.ts
similarity index 100%
rename from src/support/weather.ts
rename to src/scripts/weather.ts
diff --git a/tsconfig.json b/tsconfig.json
index 76a0fbb..f195c27 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -17,7 +17,7 @@
       "@layouts/*": ["src/layouts/*"],
       "@styles/*": ["src/styles/*"],
       "@pages/*": ["src/pages/*"],
-      "@support/*": ["src/support/*"],
+      "@support/*": ["src/scripts/*"],
       "@images/*": ["src/images/*"]
     }
   }