diff --git a/src/components/Meta.astro b/src/components/Meta.astro
index 208219a..7589e23 100644
--- a/src/components/Meta.astro
+++ b/src/components/Meta.astro
@@ -1,8 +1,8 @@
 ---
 import { getImage } from "astro:assets";
-import { OG, SEO, SITE } from "@/data_files/constants";
-import faviconSvgSrc from "@/images/icon.svg";
-import faviconSrc from "@/images/icon.png";
+import { OG, SEO, SITE } from "@data/constants";
+import faviconSvgSrc from "@images/icon.svg";
+import faviconSrc from "@images/icon.png";
 
 // Default properties for the Meta component. These values are used if props are not provided.
 // 'meta' sets a default description meta tag to describe the page content.
diff --git a/src/components/sections/Authentication.astro b/src/components/sections/Authentication.astro
index ab6f840..319c472 100644
--- a/src/components/sections/Authentication.astro
+++ b/src/components/sections/Authentication.astro
@@ -1,9 +1,9 @@
 ---
 // Import the necessary components from their respective component files
-import LoginModal from "../ui/forms/LoginModal.astro";
-import RegisterModal from "../ui/forms/RegisterModal.astro";
-import RecoverModal from "../ui/forms/RecoverModal.astro";
-import LoginBtn from "../ui/buttons/LoginBtn.astro";
+import LoginModal from "@components/ui/forms/LoginModal.astro";
+import RegisterModal from "@components/ui/forms/RegisterModal.astro";
+import RecoverModal from "@components/ui/forms/RecoverModal.astro";
+import LoginBtn from "@components/ui/buttons/LoginBtn.astro";
 ---
 
 <!-- Login Button -->
diff --git a/src/components/sections/ContactSection.astro b/src/components/sections/ContactSection.astro
index 4555a16..80d42df 100644
--- a/src/components/sections/ContactSection.astro
+++ b/src/components/sections/ContactSection.astro
@@ -1,12 +1,12 @@
 ---
 // Import the necessary dependencies.
-import AuthBtn from "../ui/buttons/AuthBtn.astro";
-import ContactIconBlock from "../ui/blocks/ContactIconBlock.astro";
-import TextInput from "../ui/forms/input/TextInput.astro";
-import EmailContactInput from "../ui/forms/input/EmailContactInput.astro";
-import PhoneInput from "../ui/forms/input/PhoneInput.astro";
-import TextAreaInput from "../ui/forms/input/TextAreaInput.astro";
-import Icon from "../ui/icons/Icon.astro";
+import AuthBtn from "@components/ui/buttons/AuthBtn.astro";
+import ContactIconBlock from "@components/ui/blocks/ContactIconBlock.astro";
+import TextInput from "@components/ui/forms/input/TextInput.astro";
+import EmailContactInput from "@components/ui/forms/input/EmailContactInput.astro";
+import PhoneInput from "@components/ui/forms/input/PhoneInput.astro";
+import TextAreaInput from "@components/ui/forms/input/TextAreaInput.astro";
+import Icon from "@components/ui/icons/Icon.astro";
 
 // Define the variables that will be used in this component
 const title: string = "Contact us";
diff --git a/src/components/sections/FAQ.astro b/src/components/sections/FAQ.astro
index 90ee0f3..bddfa02 100644
--- a/src/components/sections/FAQ.astro
+++ b/src/components/sections/FAQ.astro
@@ -1,6 +1,6 @@
 ---
 // Import the necessary AccordionItem component and JSON data
-import AccordionItem from "../ui/blocks/AccordionItem.astro";
+import AccordionItem from "@components/ui/blocks/AccordionItem.astro";
 
 // Define props from Astro
 const { title, faqs } = Astro.props;
diff --git a/src/components/sections/FooterSection.astro b/src/components/sections/FooterSection.astro
index 60ae4fa..9923e18 100644
--- a/src/components/sections/FooterSection.astro
+++ b/src/components/sections/FooterSection.astro
@@ -1,12 +1,12 @@
 ---
 // Import the necessary dependencies
-import FooterSocialLink from "../ui/links/FooterSocialLink.astro";
-import EmailFooterInput from "../ui/forms/input/EmailFooterInput.astro";
-import enStrings from "@/utils/navigation.ts";
-import frStrings from "@/utils/fr/navigation.ts";
-import Icon from "../ui/icons/Icon.astro";
-import BrandLogo from "@/components/BrandLogo.astro";
-import { SITE } from "@/data_files/constants";
+import FooterSocialLink from "@components/ui/links/FooterSocialLink.astro";
+import EmailFooterInput from "@components/ui/forms/input/EmailFooterInput.astro";
+import enStrings from "@utils/navigation.ts";
+import frStrings from "@utils/fr/navigation.ts";
+import Icon from "@components/ui/icons/Icon.astro";
+import BrandLogo from "@components/BrandLogo.astro";
+import { SITE } from "@data/constants";
 
 // Select the correct translation based on the page's lang prop:
 const strings = Astro.currentLocale === "fr" ? frStrings : enStrings;
diff --git a/src/components/sections/Navbar.astro b/src/components/sections/Navbar.astro
index 1dd3323..9e0fced 100644
--- a/src/components/sections/Navbar.astro
+++ b/src/components/sections/Navbar.astro
@@ -1,12 +1,12 @@
 ---
 //Import relevant dependencies
-import ThemeIcon from "../ThemeIcon.astro";
-import NavLink from "../ui/links/NavLink.astro";
+import ThemeIcon from "@components/ThemeIcon.astro";
+import NavLink from "@components/ui/links/NavLink.astro";
 import Authentication from "./Authentication.astro";
-import enStrings from "@/utils/navigation.ts";
-import frStrings from "@/utils/fr/navigation.ts";
-import BrandLogo from "../BrandLogo.astro";
-import LanguagePicker from "../ui/LanguagePicker.astro";
+import enStrings from "@utils/navigation.ts";
+import frStrings from "@utils/fr/navigation.ts";
+import BrandLogo from "@components/BrandLogo.astro";
+import LanguagePicker from "@components/ui/LanguagePicker.astro";
 
 // Select the correct translation based on the page's lang prop:
 const strings = Astro.currentLocale === "fr" ? frStrings : enStrings;
diff --git a/src/components/sections/features/FeaturesGeneral.astro b/src/components/sections/features/FeaturesGeneral.astro
index be4c6d2..9bbe42a 100644
--- a/src/components/sections/features/FeaturesGeneral.astro
+++ b/src/components/sections/features/FeaturesGeneral.astro
@@ -1,8 +1,8 @@
 ---
 // Import the necessary dependencies
 import { Image } from "astro:assets";
-import IconBlock from "../../ui/blocks/IconBlock.astro";
-import Icon from "../../ui/icons/Icon.astro";
+import IconBlock from "@components/ui/blocks/IconBlock.astro";
+import Icon from "@components/ui/icons/Icon.astro";
 
 interface Feature {
   heading: string;
diff --git a/src/components/sections/features/FeaturesNavs.astro b/src/components/sections/features/FeaturesNavs.astro
index 96c215a..50de15c 100644
--- a/src/components/sections/features/FeaturesNavs.astro
+++ b/src/components/sections/features/FeaturesNavs.astro
@@ -1,8 +1,8 @@
 ---
 // Import the necessary dependencies
-import TabNav from "../../ui/blocks/TabNav.astro";
-import TabContent from "../../ui/blocks/TabContent.astro";
-import Icon from "../../ui/icons/Icon.astro";
+import TabNav from "@components/ui/blocks/TabNav.astro";
+import TabContent from "@components/ui/blocks/TabContent.astro";
+import Icon from "@components/ui/icons/Icon.astro";
 
 // Define props from Astro
 const { title, tabs } = Astro.props;
diff --git a/src/components/sections/features/FeaturesStats.astro b/src/components/sections/features/FeaturesStats.astro
index 184b6e1..75e067c 100644
--- a/src/components/sections/features/FeaturesStats.astro
+++ b/src/components/sections/features/FeaturesStats.astro
@@ -1,7 +1,7 @@
 ---
 // Import the necessary components
-import StatsBig from "../../ui/blocks/StatsBig.astro";
-import StatsSmall from "../../ui/blocks/StatsSmall.astro";
+import StatsBig from "@components/ui/blocks/StatsBig.astro";
+import StatsSmall from "@components/ui/blocks/StatsSmall.astro";
 
 const { title, subTitle, stats, mainStatTitle, mainStatSubTitle } = Astro.props;
 
diff --git a/src/components/sections/features/FeaturesStatsAlt.astro b/src/components/sections/features/FeaturesStatsAlt.astro
index e83d8f6..65a0f81 100644
--- a/src/components/sections/features/FeaturesStatsAlt.astro
+++ b/src/components/sections/features/FeaturesStatsAlt.astro
@@ -1,6 +1,6 @@
 ---
 import { Image } from "astro:assets";
-import product5 from "@/images/features-image.avif";
+import product5 from "@images/features-image.avif";
 
 // Define props from Astro
 const { title, subTitle, benefits } = Astro.props;
diff --git a/src/components/sections/fr/ContactSection_fr.astro b/src/components/sections/fr/ContactSection_fr.astro
index e0623b2..bf0e607 100644
--- a/src/components/sections/fr/ContactSection_fr.astro
+++ b/src/components/sections/fr/ContactSection_fr.astro
@@ -1,12 +1,12 @@
 ---
 // Import the necessary dependencies.
-import AuthBtn from "../../ui/buttons/AuthBtn.astro";
-import ContactIconBlock from "../../ui/blocks/ContactIconBlock.astro";
-import TextInput from "../../ui/forms/input/TextInput.astro";
-import EmailContactInput from "../../ui/forms/input/EmailContactInput.astro";
-import PhoneInput from "../../ui/forms/input/PhoneInput.astro";
-import TextAreaInput from "../../ui/forms/input/TextAreaInput.astro";
-import Icon from "../../ui/icons/Icon.astro";
+import AuthBtn from "@components/ui/buttons/AuthBtn.astro";
+import ContactIconBlock from "@components/ui/blocks/ContactIconBlock.astro";
+import TextInput from "@components/ui/forms/input/TextInput.astro";
+import EmailContactInput from "@components/ui/forms/input/EmailContactInput.astro";
+import PhoneInput from "@components/ui/forms/input/PhoneInput.astro";
+import TextAreaInput from "@components/ui/forms/input/TextAreaInput.astro";
+import Icon from "@components/ui/icons/Icon.astro";
 
 // Define the variables that will be used in this component
 const title: string = "Contactez-nous";
diff --git a/src/components/sections/landing/HeroSection.astro b/src/components/sections/landing/HeroSection.astro
index 5bb6c0b..d90980b 100644
--- a/src/components/sections/landing/HeroSection.astro
+++ b/src/components/sections/landing/HeroSection.astro
@@ -1,9 +1,9 @@
 ---
 // Import the necessary dependencies
 import { Image } from "astro:assets";
-import PrimaryCTA from "../../ui/buttons/PrimaryCTA.astro";
-import SecondaryCTA from "../../ui/buttons/SecondaryCTA.astro";
-import ReviewComponent from "../../ui/blocks/ReviewComponent.astro";
+import PrimaryCTA from "@components/ui/buttons/PrimaryCTA.astro";
+import SecondaryCTA from "@components/ui/buttons/SecondaryCTA.astro";
+import ReviewComponent from "@components/ui/blocks/ReviewComponent.astro";
 
 // Define props from Astro
 const {
diff --git a/src/components/sections/landing/HeroSectionAlt.astro b/src/components/sections/landing/HeroSectionAlt.astro
index ff0079a..c98679d 100644
--- a/src/components/sections/landing/HeroSectionAlt.astro
+++ b/src/components/sections/landing/HeroSectionAlt.astro
@@ -1,6 +1,6 @@
 ---
 // Import the necessary dependencies
-import GithubBtn from "../../ui/buttons/GithubBtn.astro";
+import GithubBtn from "@components/ui/buttons/GithubBtn.astro";
 
 // Define props from Astro
 const { title, subTitle, url } = Astro.props;
diff --git a/src/components/sections/pricing/PricingSection.astro b/src/components/sections/pricing/PricingSection.astro
index 2d882f1..c07b873 100644
--- a/src/components/sections/pricing/PricingSection.astro
+++ b/src/components/sections/pricing/PricingSection.astro
@@ -1,7 +1,7 @@
 ---
 // Import SecondaryCTA component for use in this module
-import SecondaryCTA from "../../ui/buttons/SecondaryCTA.astro";
-import Icon from "../../ui/icons/Icon.astro";
+import SecondaryCTA from "@components/ui/buttons/SecondaryCTA.astro";
+import Icon from "@components/ui/icons/Icon.astro";
 
 // Define props from Astro
 const { pricing } = Astro.props;
diff --git a/src/components/ui/LanguagePicker.astro b/src/components/ui/LanguagePicker.astro
index 1989778..5325c8f 100644
--- a/src/components/ui/LanguagePicker.astro
+++ b/src/components/ui/LanguagePicker.astro
@@ -1,5 +1,5 @@
 ---
-import { languages } from "@/utils//ui";
+import { languages } from "@utils//ui";
 import Icon from "./icons/Icon.astro";
 ---
 
diff --git a/src/components/ui/blocks/AccordionItem.astro b/src/components/ui/blocks/AccordionItem.astro
index 04d04ec..1ddc49f 100644
--- a/src/components/ui/blocks/AccordionItem.astro
+++ b/src/components/ui/blocks/AccordionItem.astro
@@ -1,5 +1,5 @@
 ---
-import Icon from "../icons/Icon.astro";
+import Icon from "@components/ui/icons/Icon.astro";
 // Define props from Astro
 const { id, collapseId, question, answer, first } = Astro.props;
 // Define TypeScript interface for props
diff --git a/src/components/ui/blocks/LeftSection.astro b/src/components/ui/blocks/LeftSection.astro
index 5277505..05c3443 100644
--- a/src/components/ui/blocks/LeftSection.astro
+++ b/src/components/ui/blocks/LeftSection.astro
@@ -1,7 +1,7 @@
 ---
 // Import the necessary modules
 import { Image } from "astro:assets";
-import PrimaryCTA from "../buttons/PrimaryCTA.astro";
+import PrimaryCTA from "@components/ui/buttons/PrimaryCTA.astro";
 // Destructure the props passed to the Astro component
 const { title, subTitle, btnExists, btnTitle, btnURL, img, imgAlt } =
   Astro.props;
diff --git a/src/components/ui/blocks/MainSection.astro b/src/components/ui/blocks/MainSection.astro
index e3f649d..15c873a 100644
--- a/src/components/ui/blocks/MainSection.astro
+++ b/src/components/ui/blocks/MainSection.astro
@@ -1,6 +1,6 @@
 ---
 // Import PrimaryCTA component
-import PrimaryCTA from "../buttons/PrimaryCTA.astro";
+import PrimaryCTA from "@components/ui/buttons/PrimaryCTA.astro";
 
 // Destructure the props passed to the Astro component
 const { title, subTitle, btnExists, btnTitle, btnURL } = Astro.props;
diff --git a/src/components/ui/blocks/ReviewComponent.astro b/src/components/ui/blocks/ReviewComponent.astro
index 0791cf8..a892d15 100644
--- a/src/components/ui/blocks/ReviewComponent.astro
+++ b/src/components/ui/blocks/ReviewComponent.astro
@@ -1,7 +1,7 @@
 ---
-import Avatar from "../../ui/avatars/Avatar.astro";
-import FullStar from "../../ui/stars/FullStar.astro";
-import HalfStar from "../../ui/stars/HalfStar.astro";
+import Avatar from "@components/ui/avatars/Avatar.astro";
+import FullStar from "@components/ui/stars/FullStar.astro";
+import HalfStar from "@components/ui/stars/HalfStar.astro";
 
 const { avatars, starCount = 0, rating, reviews } = Astro.props;
 
diff --git a/src/components/ui/blocks/RightSection.astro b/src/components/ui/blocks/RightSection.astro
index d9bab0f..5480ac7 100644
--- a/src/components/ui/blocks/RightSection.astro
+++ b/src/components/ui/blocks/RightSection.astro
@@ -1,7 +1,7 @@
 ---
 // Import the required modules
 import { Image } from "astro:assets";
-import PrimaryCTA from "../buttons/PrimaryCTA.astro";
+import PrimaryCTA from "@components/ui/buttons/PrimaryCTA.astro";
 // Extract properties from Astro.props
 const {
   title,
diff --git a/src/components/ui/blocks/StatsGrid.astro b/src/components/ui/blocks/StatsGrid.astro
index c8446ff..b49536c 100644
--- a/src/components/ui/blocks/StatsGrid.astro
+++ b/src/components/ui/blocks/StatsGrid.astro
@@ -1,5 +1,5 @@
 ---
-import Icon from "../icons/Icon.astro";
+import Icon from "@components/ui/icons/Icon.astro";
 
 const { count, description, index } = Astro.props;
 
diff --git a/src/components/ui/buttons/Bookmark.astro b/src/components/ui/buttons/Bookmark.astro
index 5265406..c517aa8 100644
--- a/src/components/ui/buttons/Bookmark.astro
+++ b/src/components/ui/buttons/Bookmark.astro
@@ -1,5 +1,5 @@
 ---
-import Icon from "../icons/Icon.astro";
+import Icon from "@components/ui/icons/Icon.astro";
 ---
 
 <button
diff --git a/src/components/ui/buttons/Btn404.astro b/src/components/ui/buttons/Btn404.astro
index a96703b..5b97537 100644
--- a/src/components/ui/buttons/Btn404.astro
+++ b/src/components/ui/buttons/Btn404.astro
@@ -1,5 +1,5 @@
 ---
-import Icon from "../icons/Icon.astro";
+import Icon from "@components/ui/icons/Icon.astro";
 // Destructure the properties from Astro.props
 const { title, id, noArrow } = Astro.props;
 // Define TypeScript interface for the properties
diff --git a/src/components/ui/buttons/GithubBtn.astro b/src/components/ui/buttons/GithubBtn.astro
index 0509150..79979cf 100644
--- a/src/components/ui/buttons/GithubBtn.astro
+++ b/src/components/ui/buttons/GithubBtn.astro
@@ -1,5 +1,5 @@
 ---
-import Icon from "../icons/Icon.astro";
+import Icon from "@components/ui/icons/Icon.astro";
 const { title, url } = Astro.props;
 
 interface Props {
diff --git a/src/components/ui/buttons/PrimaryCTA.astro b/src/components/ui/buttons/PrimaryCTA.astro
index df2d571..614ea3d 100644
--- a/src/components/ui/buttons/PrimaryCTA.astro
+++ b/src/components/ui/buttons/PrimaryCTA.astro
@@ -1,5 +1,5 @@
 ---
-import Icon from "../icons/Icon.astro";
+import Icon from "@components/ui/icons/Icon.astro";
 // Destructure the properties from Astro.props
 const { title, url, noArrow } = Astro.props;
 // Define TypeScript interface for the properties
diff --git a/src/components/ui/buttons/SocialShare.astro b/src/components/ui/buttons/SocialShare.astro
index c583096..63b49cf 100644
--- a/src/components/ui/buttons/SocialShare.astro
+++ b/src/components/ui/buttons/SocialShare.astro
@@ -1,5 +1,5 @@
 ---
-import Icon from "../icons/Icon.astro";
+import Icon from "@components/ui/icons/Icon.astro";
 // Destructure the properties from Astro.props
 const { pageTitle } = Astro.props;
 
diff --git a/src/components/ui/cards/CardBlog.astro b/src/components/ui/cards/CardBlog.astro
index 0c5056a..902afd0 100644
--- a/src/components/ui/cards/CardBlog.astro
+++ b/src/components/ui/cards/CardBlog.astro
@@ -1,8 +1,8 @@
 ---
 // Import necessary components and utilities
-import AvatarBlog from "../avatars/AvatarBlog.astro";
+import AvatarBlog from "@components/ui/avatars/AvatarBlog.astro";
 import { Image } from "astro:assets";
-import { formatDate } from "@/utils/utils";
+import { formatDate } from "@utils/utils";
 import type { CollectionEntry } from "astro:content";
 
 const { blogEntry } = Astro.props;
diff --git a/src/components/ui/cards/CardBlogRecent.astro b/src/components/ui/cards/CardBlogRecent.astro
index 7ec7d13..a935c61 100644
--- a/src/components/ui/cards/CardBlogRecent.astro
+++ b/src/components/ui/cards/CardBlogRecent.astro
@@ -2,8 +2,8 @@
 // Import all required components and utilities
 import { Image } from "astro:assets";
 import type { CollectionEntry } from "astro:content";
-import AvatarBlogLarge from "../avatars/AvatarBlogLarge.astro";
-import PrimaryCTA from "../buttons/PrimaryCTA.astro";
+import AvatarBlogLarge from "@components/ui/avatars/AvatarBlogLarge.astro";
+import PrimaryCTA from "@components/ui/buttons/PrimaryCTA.astro";
 
 const { blogEntry } = Astro.props;
 
diff --git a/src/components/ui/cards/CardInsight.astro b/src/components/ui/cards/CardInsight.astro
index fecb729..47260e2 100644
--- a/src/components/ui/cards/CardInsight.astro
+++ b/src/components/ui/cards/CardInsight.astro
@@ -1,7 +1,7 @@
 ---
 // Import necessary modules and utilities
 import { Image } from "astro:assets";
-import Icon from "../icons/Icon.astro";
+import Icon from "@components/ui/icons/Icon.astro";
 import type { CollectionEntry } from "astro:content";
 
 const { insightEntry } = Astro.props;
diff --git a/src/components/ui/cards/CardRelated.astro b/src/components/ui/cards/CardRelated.astro
index b8997e2..54c917b 100644
--- a/src/components/ui/cards/CardRelated.astro
+++ b/src/components/ui/cards/CardRelated.astro
@@ -1,7 +1,7 @@
 ---
 // Import necessary modules and utilities
 import { Image } from "astro:assets";
-import { formatDate } from "@/utils/utils";
+import { formatDate } from "@utils/utils";
 import type { CollectionEntry } from "astro:content";
 
 const { blogEntry } = Astro.props;
diff --git a/src/components/ui/cards/CardSmall.astro b/src/components/ui/cards/CardSmall.astro
index a033589..2da027e 100644
--- a/src/components/ui/cards/CardSmall.astro
+++ b/src/components/ui/cards/CardSmall.astro
@@ -1,7 +1,7 @@
 ---
 // Import necessary modules and utilities
 import { Image } from "astro:assets";
-import Icon from "../icons/Icon.astro";
+import Icon from "@components/ui/icons/Icon.astro";
 import type { CollectionEntry } from "astro:content";
 
 const { product } = Astro.props;
diff --git a/src/components/ui/cards/CardWide.astro b/src/components/ui/cards/CardWide.astro
index 522a78e..1a0a350 100644
--- a/src/components/ui/cards/CardWide.astro
+++ b/src/components/ui/cards/CardWide.astro
@@ -1,7 +1,7 @@
 ---
 // Import necessary modules and utilities
 import { Image } from "astro:assets";
-import Icon from "../icons/Icon.astro";
+import Icon from "@components/ui/icons/Icon.astro";
 import type { CollectionEntry } from "astro:content";
 
 const { product } = Astro.props;
diff --git a/src/components/ui/forms/LoginModal.astro b/src/components/ui/forms/LoginModal.astro
index cb1be46..fc350bb 100644
--- a/src/components/ui/forms/LoginModal.astro
+++ b/src/components/ui/forms/LoginModal.astro
@@ -3,8 +3,8 @@
 import EmailInput from "./input/EmailInput.astro";
 import PasswordInput from "./input/PasswordInput.astro";
 import Checkbox from "./input/Checkbox.astro";
-import AuthBtn from "../buttons/AuthBtn.astro";
-import GoogleBtn from "../buttons/GoogleBtn.astro";
+import AuthBtn from "@components/ui/buttons/AuthBtn.astro";
+import GoogleBtn from "@components/ui/buttons/GoogleBtn.astro";
 
 // Variables for customization of the LoginModal Component
 
diff --git a/src/components/ui/forms/RecoverModal.astro b/src/components/ui/forms/RecoverModal.astro
index 324c13a..7cd4aae 100644
--- a/src/components/ui/forms/RecoverModal.astro
+++ b/src/components/ui/forms/RecoverModal.astro
@@ -1,7 +1,7 @@
 ---
 // Import necessary components from individual files
 import EmailInput from "./input/EmailInput.astro";
-import AuthBtn from "../buttons/AuthBtn.astro";
+import AuthBtn from "@components/ui/buttons/AuthBtn.astro";
 
 // Config object for customization of the component
 const config = {
diff --git a/src/components/ui/forms/RegisterModal.astro b/src/components/ui/forms/RegisterModal.astro
index 0394f87..053ac61 100644
--- a/src/components/ui/forms/RegisterModal.astro
+++ b/src/components/ui/forms/RegisterModal.astro
@@ -3,8 +3,8 @@
 import EmailInput from "./input/EmailInput.astro";
 import PasswordInput from "./input/PasswordInput.astro";
 import Checkbox from "./input/Checkbox.astro";
-import GoogleBtn from "../buttons/GoogleBtn.astro";
-import AuthBtn from "../buttons/AuthBtn.astro";
+import GoogleBtn from "@components/ui/buttons/GoogleBtn.astro";
+import AuthBtn from "@components/ui/buttons/AuthBtn.astro";
 // Config object for customization of the component
 const config = {
   id: "hs-toggle-between-modals-register-modal", // Modal identifier
diff --git a/src/components/ui/starlight/SiteTitle.astro b/src/components/ui/starlight/SiteTitle.astro
index 883da21..bc97544 100644
--- a/src/components/ui/starlight/SiteTitle.astro
+++ b/src/components/ui/starlight/SiteTitle.astro
@@ -1,6 +1,6 @@
 ---
-import mainLogo from "@/images/starlight/screwfast_logo_dark.svg?raw";
-import docsLogo from "@/images/starlight/docs_logo.svg?raw";
+import mainLogo from "@images/starlight/screwfast_logo_dark.svg?raw";
+import docsLogo from "@images/starlight/docs_logo.svg?raw";
 import type { Props } from "@astrojs/starlight/props";
 
 
diff --git a/src/layouts/MainLayout.astro b/src/layouts/MainLayout.astro
index 85051e7..0f7bcba 100644
--- a/src/layouts/MainLayout.astro
+++ b/src/layouts/MainLayout.astro
@@ -1,9 +1,9 @@
 ---
 // Importing necessary components
-import Meta from "@/components/Meta.astro";
-import Navbar from "@/components/sections/Navbar.astro";
-import FooterSection from "@/components/sections/FooterSection.astro";
-import { SITE } from "@/data_files/constants";
+import Meta from "@components/Meta.astro";
+import Navbar from "@components/sections/Navbar.astro";
+import FooterSection from "@components/sections/FooterSection.astro";
+import { SITE } from "@data/constants";
 
 // Setting expected props
 const { title = SITE.title, meta, structuredData, lang = "en" } = Astro.props;
diff --git a/src/pages/404.astro b/src/pages/404.astro
index 2674fa7..c952dd7 100644
--- a/src/pages/404.astro
+++ b/src/pages/404.astro
@@ -1,8 +1,8 @@
 ---
 // Import section components
 import MainLayout from "@/layouts/MainLayout.astro";
-import Btn404 from "@/components/ui/buttons/Btn404.astro";
-import { SITE } from "@/data_files/constants";
+import Btn404 from "@components/ui/buttons/Btn404.astro";
+import { SITE } from "@data/constants";
 
 const pageTitle: string = `Page Not Found | ${SITE.title}`;
 
diff --git a/src/pages/blog/[...slug].astro b/src/pages/blog/[...slug].astro
index 42fbd3b..d8ccc24 100644
--- a/src/pages/blog/[...slug].astro
+++ b/src/pages/blog/[...slug].astro
@@ -1,16 +1,16 @@
 ---
 // Import necessary components and utilities
 import MainLayout from "@/layouts/MainLayout.astro";
-import AvatarBlogLarge from "@/components/ui/avatars/AvatarBlogLarge.astro";
-import CardRelated from "@/components/ui/cards/CardRelated.astro";
-import Bookmark from "@/components/ui/buttons/Bookmark.astro";
-import SocialShare from "@/components/ui/buttons/SocialShare.astro";
-import PostFeedback from "@/components/ui/feedback/PostFeedback.astro";
+import AvatarBlogLarge from "@components/ui/avatars/AvatarBlogLarge.astro";
+import CardRelated from "@components/ui/cards/CardRelated.astro";
+import Bookmark from "@components/ui/buttons/Bookmark.astro";
+import SocialShare from "@components/ui/buttons/SocialShare.astro";
+import PostFeedback from "@components/ui/feedback/PostFeedback.astro";
 import { Image } from "astro:assets";
-import { capitalize, formatDate } from "@/utils/utils";
+import { capitalize, formatDate } from "@utils/utils";
 import { getCollection } from "astro:content";
 import type { CollectionEntry } from "astro:content";
-import { SITE } from "@/data_files/constants";
+import { SITE } from "@data/constants";
 
 // getStaticPaths is used to pre-render all routes based on the blog posts
 export async function getStaticPaths() {
diff --git a/src/pages/blog/index.astro b/src/pages/blog/index.astro
index 6e1b501..2f051e8 100644
--- a/src/pages/blog/index.astro
+++ b/src/pages/blog/index.astro
@@ -1,12 +1,12 @@
 ---
 // Import necessary components, modules and types
 import MainLayout from "@/layouts/MainLayout.astro";
-import CardBlog from "@/components/ui/cards/CardBlog.astro";
-import CardBlogRecent from "@/components/ui/cards/CardBlogRecent.astro";
-import CardInsight from "@/components/ui/cards/CardInsight.astro";
+import CardBlog from "@components/ui/cards/CardBlog.astro";
+import CardBlogRecent from "@components/ui/cards/CardBlogRecent.astro";
+import CardInsight from "@components/ui/cards/CardInsight.astro";
 import { getCollection } from "astro:content";
 import type { CollectionEntry } from "astro:content";
-import { SITE } from "@/data_files/constants";
+import { SITE } from "@data/constants";
 
 // Get all blogs post and sort them based on publish date
 const blogPosts: CollectionEntry<"blog">[] = (await getCollection("blog")).sort(
diff --git a/src/pages/contact.astro b/src/pages/contact.astro
index 0d4a812..bdc9cca 100644
--- a/src/pages/contact.astro
+++ b/src/pages/contact.astro
@@ -1,8 +1,8 @@
 ---
 // Import the necessary components
 import MainLayout from "@/layouts/MainLayout.astro";
-import ContactSection from "@/components/sections/ContactSection.astro";
-import { SITE } from "@/data_files/constants";
+import ContactSection from "@components/sections/ContactSection.astro";
+import { SITE } from "@data/constants";
 
 const pageTitle: string = `Contact | ${SITE.title}`;
 ---
diff --git a/src/pages/fr/404.astro b/src/pages/fr/404.astro
index f03d793..bf42a7d 100644
--- a/src/pages/fr/404.astro
+++ b/src/pages/fr/404.astro
@@ -1,7 +1,7 @@
 ---
 // Import section components
 import MainLayout from "@/layouts/MainLayout.astro";
-import Btn404 from "@/components/ui/buttons/Btn404.astro";
+import Btn404 from "@components/ui/buttons/Btn404.astro";
 
 // Define variables for page content
 const title: string = "404";
diff --git a/src/pages/fr/blog/index.astro b/src/pages/fr/blog/index.astro
index 6e1b501..2f051e8 100644
--- a/src/pages/fr/blog/index.astro
+++ b/src/pages/fr/blog/index.astro
@@ -1,12 +1,12 @@
 ---
 // Import necessary components, modules and types
 import MainLayout from "@/layouts/MainLayout.astro";
-import CardBlog from "@/components/ui/cards/CardBlog.astro";
-import CardBlogRecent from "@/components/ui/cards/CardBlogRecent.astro";
-import CardInsight from "@/components/ui/cards/CardInsight.astro";
+import CardBlog from "@components/ui/cards/CardBlog.astro";
+import CardBlogRecent from "@components/ui/cards/CardBlogRecent.astro";
+import CardInsight from "@components/ui/cards/CardInsight.astro";
 import { getCollection } from "astro:content";
 import type { CollectionEntry } from "astro:content";
-import { SITE } from "@/data_files/constants";
+import { SITE } from "@data/constants";
 
 // Get all blogs post and sort them based on publish date
 const blogPosts: CollectionEntry<"blog">[] = (await getCollection("blog")).sort(
diff --git a/src/pages/fr/contact.astro b/src/pages/fr/contact.astro
index 68017f3..5afc6d8 100644
--- a/src/pages/fr/contact.astro
+++ b/src/pages/fr/contact.astro
@@ -1,7 +1,7 @@
 ---
 // Import the necessary components
 import MainLayout from "@/layouts/MainLayout.astro";
-import ContactSection from "@/components/sections/fr/ContactSection_fr.astro";
+import ContactSection from "@components/sections/fr/ContactSection_fr.astro";
 ---
 
 <!--Utilizing MainLayout for the outer layout of the page, and defining meta for SEO purposes-->
diff --git a/src/pages/fr/index.astro b/src/pages/fr/index.astro
index 9f9710d..f5cf391 100644
--- a/src/pages/fr/index.astro
+++ b/src/pages/fr/index.astro
@@ -1,23 +1,23 @@
 ---
 // Import the necessary components
 import MainLayout from "@/layouts/MainLayout.astro";
-import HeroSection from "@/components/sections/landing/HeroSection.astro";
-import HeroSectionAlt from "@/components/sections/landing/HeroSectionAlt.astro";
-import ClientsSection from "@/components/sections/landing/ClientsSection.astro";
-import FeaturesGeneral from "@/components/sections/features/FeaturesGeneral.astro";
-import FeaturesNavs from "@/components/sections/features/FeaturesNavs.astro";
-import TestimonialsSection from "@/components/sections/testimonials/TestimonialsSection.astro";
-import PricingSection from "@/components/sections/pricing/PricingSection.astro";
-import FAQ from "@/components/sections/FAQ.astro";
-import AnnouncementBanner from "@/components/ui/banners/AnnouncementBanner.astro";
-import heroImage from "@/images/hero-image.avif";
-import faqs from "@/data_files/fr/faqs.json";
-import features from "@/data_files/fr/features.json";
-import pricing from "@/data_files/fr/pricing.json";
-import featureImage from "@/images/features-image.avif";
-import construction from "@/images/construction-image.avif";
-import tools from "@/images/automated-tools.avif";
-import dashboard from "@/images/dashboard-image.avif";
+import HeroSection from "@components/sections/landing/HeroSection.astro";
+import HeroSectionAlt from "@components/sections/landing/HeroSectionAlt.astro";
+import ClientsSection from "@components/sections/landing/ClientsSection.astro";
+import FeaturesGeneral from "@components/sections/features/FeaturesGeneral.astro";
+import FeaturesNavs from "@components/sections/features/FeaturesNavs.astro";
+import TestimonialsSection from "@components/sections/testimonials/TestimonialsSection.astro";
+import PricingSection from "@components/sections/pricing/PricingSection.astro";
+import FAQ from "@components/sections/FAQ.astro";
+import AnnouncementBanner from "@components/ui/banners/AnnouncementBanner.astro";
+import heroImage from "@images/hero-image.avif";
+import faqs from "@data/fr/faqs.json";
+import features from "@data/fr/features.json";
+import pricing from "@data/fr/pricing.json";
+import featureImage from "@images/features-image.avif";
+import construction from "@images/construction-image.avif";
+import tools from "@images/automated-tools.avif";
+import dashboard from "@images/dashboard-image.avif";
 import { getRelativeLocaleUrl } from 'astro:i18n';
 
 const avatarSrcs: Array<string> = [
diff --git a/src/pages/fr/products/index.astro b/src/pages/fr/products/index.astro
index 8f215e5..9649f72 100644
--- a/src/pages/fr/products/index.astro
+++ b/src/pages/fr/products/index.astro
@@ -1,11 +1,11 @@
 ---
 // Importing necessary components
 import MainLayout from "@/layouts/MainLayout.astro";
-import PrimaryCTA from "@/components/ui/buttons/PrimaryCTA.astro";
-import CardSmall from "@/components/ui/cards/CardSmall.astro";
-import CardWide from "@/components/ui/cards/CardWide.astro";
-import FeaturesStatsAlt from "@/components/sections/features/FeaturesStatsAlt.astro";
-import TestimonialsSectionAlt from "@/components/sections/testimonials/TestimonialsSectionAlt.astro";
+import PrimaryCTA from "@components/ui/buttons/PrimaryCTA.astro";
+import CardSmall from "@components/ui/cards/CardSmall.astro";
+import CardWide from "@components/ui/cards/CardWide.astro";
+import FeaturesStatsAlt from "@components/sections/features/FeaturesStatsAlt.astro";
+import TestimonialsSectionAlt from "@components/sections/testimonials/TestimonialsSectionAlt.astro";
 
 // Importing necessary functions from Astro
 import { getCollection } from "astro:content";
diff --git a/src/pages/fr/services.astro b/src/pages/fr/services.astro
index 6e8cf9a..b470cb6 100644
--- a/src/pages/fr/services.astro
+++ b/src/pages/fr/services.astro
@@ -1,21 +1,21 @@
 ---
 // Import necessary components
 import MainLayout from "@/layouts/MainLayout.astro";
-import MainSection from "@/components/ui/blocks/MainSection.astro";
-import LeftSection from "@/components/ui/blocks/LeftSection.astro";
-import RightSection from "@/components/ui/blocks/RightSection.astro";
-import FeaturesStats from "@/components/sections/features/FeaturesStats.astro";
+import MainSection from "@components/ui/blocks/MainSection.astro";
+import LeftSection from "@components/ui/blocks/LeftSection.astro";
+import RightSection from "@components/ui/blocks/RightSection.astro";
+import FeaturesStats from "@components/sections/features/FeaturesStats.astro";
 import { getRelativeLocaleUrl } from 'astro:i18n';
 
 // Import necessary images
-import blueprints from "@/images/blueprints-image.avif";
-import personWorking from "@/images/person-working.avif";
-import beforeAfter from "@/images/before-after.avif";
-import constructionWorkers from "@/images/construction-workers.avif";
-import aerialView from "@/images/aerial-view.avif";
-import usingTools from "@/images/using-tools.avif";
-import progressBuilding from "@/images/progress-building.avif";
-import underConstruction from "@/images/under-construction.avif";
+import blueprints from "@images/blueprints-image.avif";
+import personWorking from "@images/person-working.avif";
+import beforeAfter from "@images/before-after.avif";
+import constructionWorkers from "@images/construction-workers.avif";
+import aerialView from "@images/aerial-view.avif";
+import usingTools from "@images/using-tools.avif";
+import progressBuilding from "@images/progress-building.avif";
+import underConstruction from "@images/under-construction.avif";
 
 interface Article {
   isRightSection: boolean;
diff --git a/src/pages/index.astro b/src/pages/index.astro
index c6df70d..2568e45 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -1,23 +1,23 @@
 ---
 // Import the necessary components
 import MainLayout from "@/layouts/MainLayout.astro";
-import HeroSection from "@/components/sections/landing/HeroSection.astro";
-import HeroSectionAlt from "@/components/sections/landing/HeroSectionAlt.astro";
-import ClientsSection from "@/components/sections/landing/ClientsSection.astro";
-import FeaturesGeneral from "@/components/sections/features/FeaturesGeneral.astro";
-import FeaturesNavs from "@/components/sections/features/FeaturesNavs.astro";
-import TestimonialsSection from "@/components/sections/testimonials/TestimonialsSection.astro";
-import PricingSection from "@/components/sections/pricing/PricingSection.astro";
-import FAQ from "@/components/sections/FAQ.astro";
-import AnnouncementBanner from "@/components/ui/banners/AnnouncementBanner.astro";
-import heroImage from "@/images/hero-image.avif";
-import faqs from "@/data_files/faqs.json";
-import features from "@/data_files/features.json";
-import pricing from "@/data_files/pricing.json";
-import featureImage from "@/images/features-image.avif";
-import construction from "@/images/construction-image.avif";
-import tools from "@/images/automated-tools.avif";
-import dashboard from "@/images/dashboard-image.avif";
+import HeroSection from "@components/sections/landing/HeroSection.astro";
+import HeroSectionAlt from "@components/sections/landing/HeroSectionAlt.astro";
+import ClientsSection from "@components/sections/landing/ClientsSection.astro";
+import FeaturesGeneral from "@components/sections/features/FeaturesGeneral.astro";
+import FeaturesNavs from "@components/sections/features/FeaturesNavs.astro";
+import TestimonialsSection from "@components/sections/testimonials/TestimonialsSection.astro";
+import PricingSection from "@components/sections/pricing/PricingSection.astro";
+import FAQ from "@components/sections/FAQ.astro";
+import AnnouncementBanner from "@components/ui/banners/AnnouncementBanner.astro";
+import heroImage from "@images/hero-image.avif";
+import faqs from "@data/faqs.json";
+import features from "@data/features.json";
+import pricing from "@data/pricing.json";
+import featureImage from "@images/features-image.avif";
+import construction from "@images/construction-image.avif";
+import tools from "@images/automated-tools.avif";
+import dashboard from "@images/dashboard-image.avif";
 
 const avatarSrcs: Array<string> = [
   "https://images.unsplash.com/photo-1568602471122-7832951cc4c5?ixlib=rb-4.0.3&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=facearea&facepad=2&w=300&h=300&q=80",
diff --git a/src/pages/insights/[...slug].astro b/src/pages/insights/[...slug].astro
index 71400b1..fb70622 100644
--- a/src/pages/insights/[...slug].astro
+++ b/src/pages/insights/[...slug].astro
@@ -1,6 +1,6 @@
 ---
 // Import section components
-import { SITE } from "@/data_files/constants";
+import { SITE } from "@data/constants";
 import MainLayout from "@/layouts/MainLayout.astro";
 import { Image } from "astro:assets";
 import { getCollection } from "astro:content";
diff --git a/src/pages/products/[...slug].astro b/src/pages/products/[...slug].astro
index 5779038..0e180cc 100644
--- a/src/pages/products/[...slug].astro
+++ b/src/pages/products/[...slug].astro
@@ -1,11 +1,11 @@
 ---
 // Import section components
 import MainLayout from "@/layouts/MainLayout.astro";
-import ProductTabBtn from "@/components/ui/buttons/ProductTabBtn.astro";
-import PrimaryCTA from "@/components/ui/buttons/PrimaryCTA.astro";
+import ProductTabBtn from "@components/ui/buttons/ProductTabBtn.astro";
+import PrimaryCTA from "@components/ui/buttons/PrimaryCTA.astro";
 import { Image } from "astro:assets";
 import { getCollection } from "astro:content";
-import { SITE } from "@/data_files/constants";
+import { SITE } from "@data/constants";
 
 // Global declaration for gsap animation library
 declare global {
diff --git a/src/pages/products/index.astro b/src/pages/products/index.astro
index 0403ed9..ec62dc5 100644
--- a/src/pages/products/index.astro
+++ b/src/pages/products/index.astro
@@ -1,16 +1,16 @@
 ---
 // Importing necessary components
 import MainLayout from "@/layouts/MainLayout.astro";
-import PrimaryCTA from "@/components/ui/buttons/PrimaryCTA.astro";
-import CardSmall from "@/components/ui/cards/CardSmall.astro";
-import CardWide from "@/components/ui/cards/CardWide.astro";
-import FeaturesStatsAlt from "@/components/sections/features/FeaturesStatsAlt.astro";
-import TestimonialsSectionAlt from "@/components/sections/testimonials/TestimonialsSectionAlt.astro";
+import PrimaryCTA from "@components/ui/buttons/PrimaryCTA.astro";
+import CardSmall from "@components/ui/cards/CardSmall.astro";
+import CardWide from "@components/ui/cards/CardWide.astro";
+import FeaturesStatsAlt from "@components/sections/features/FeaturesStatsAlt.astro";
+import TestimonialsSectionAlt from "@components/sections/testimonials/TestimonialsSectionAlt.astro";
 
 // Importing necessary functions from Astro
 import { getCollection } from "astro:content";
 import type { CollectionEntry } from "astro:content";
-import { SITE } from "@/data_files/constants";
+import { SITE } from "@data/constants";
 
 // Fetching all the product related content and sorting it by main.id
 const product: CollectionEntry<"products">[] = (
diff --git a/src/pages/services.astro b/src/pages/services.astro
index 83beab9..678913d 100644
--- a/src/pages/services.astro
+++ b/src/pages/services.astro
@@ -1,21 +1,21 @@
 ---
 // Import necessary components
 import MainLayout from "@/layouts/MainLayout.astro";
-import MainSection from "@/components/ui/blocks/MainSection.astro";
-import LeftSection from "@/components/ui/blocks/LeftSection.astro";
-import RightSection from "@/components/ui/blocks/RightSection.astro";
-import FeaturesStats from "@/components/sections/features/FeaturesStats.astro";
+import MainSection from "@components/ui/blocks/MainSection.astro";
+import LeftSection from "@components/ui/blocks/LeftSection.astro";
+import RightSection from "@components/ui/blocks/RightSection.astro";
+import FeaturesStats from "@components/sections/features/FeaturesStats.astro";
 
 // Import necessary images
-import blueprints from "@/images/blueprints-image.avif";
-import personWorking from "@/images/person-working.avif";
-import beforeAfter from "@/images/before-after.avif";
-import constructionWorkers from "@/images/construction-workers.avif";
-import aerialView from "@/images/aerial-view.avif";
-import usingTools from "@/images/using-tools.avif";
-import progressBuilding from "@/images/progress-building.avif";
-import underConstruction from "@/images/under-construction.avif";
-import { SITE } from "@/data_files/constants";
+import blueprints from "@images/blueprints-image.avif";
+import personWorking from "@images/person-working.avif";
+import beforeAfter from "@images/before-after.avif";
+import constructionWorkers from "@images/construction-workers.avif";
+import aerialView from "@images/aerial-view.avif";
+import usingTools from "@images/using-tools.avif";
+import progressBuilding from "@images/progress-building.avif";
+import underConstruction from "@images/under-construction.avif";
+import { SITE } from "@data/constants";
 
 interface Article {
   isRightSection: boolean;
diff --git a/tsconfig.json b/tsconfig.json
index f356c6f..a567456 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -3,7 +3,13 @@
   "compilerOptions": {
     "baseUrl": ".",
     "paths": {
-      "@/*": ["src/*"]
+      "@/*": ["src/*"],
+      "@components/*": ["src/components/*"],
+      "@content/*": ["src/content/*"],
+      "@data/*": ["src/data_files/*"],
+      "@images/*": ["src/images/*"],
+      "@styles/*": ["src/styles/*"],
+      "@utils/*": ["src/utils/*"]
     },
   }
 }
\ No newline at end of file