diff --git a/src/app/booking/page.tsx b/src/app/booking/page.tsx
index 24f9fde..0baba91 100644
--- a/src/app/booking/page.tsx
+++ b/src/app/booking/page.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import { ThemeProvider } from "@/components/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
 import ContactSplit from '@/components/sections/contact/ContactSplit';
 import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
@@ -25,23 +25,15 @@ export default function LandingPage() {
       <NavbarLayoutFloatingInline
       navItems={[
         {
-          name: "Home",
-          id: "/",
-        },
+          name: "Home",          id: "/"},
         {
-          name: "Testimonials",
-          id: "/testimonials",
-        },
+          name: "Testimonials",          id: "/testimonials"},
         {
-          name: "Schedule",
-          id: "/booking",
-        },
+          name: "Schedule",          id: "/booking"},
       ]}
       brandName="Best Team Roofing"
       button={{
-        text: "Call (213) 642-2600",
-        href: "tel:+12136422600",
-      }}
+        text: "Call (213) 642-2600",        href: "tel:+12136422600"}}
     />
   </div>
 
@@ -49,8 +41,7 @@ export default function LandingPage() {
       <ContactSplit
       useInvertedBackground={false}
       background={{
-        variant: "plain",
-      }}
+        variant: "plain"}}
       tag="Booking"
       title="Schedule Service"
       description="Ready to get started? Contact us for a quote or to schedule a roof assessment today."
@@ -66,38 +57,25 @@ export default function LandingPage() {
       <FooterBaseReveal
       columns={[
         {
-          title: "Services",
-          items: [
+          title: "Services",          items: [
             {
-              label: "Roof Repairs",
-              href: "/",
-            },
+              label: "Roof Repairs",              href: "/"},
             {
-              label: "Full Replacement",
-              href: "/",
-            },
+              label: "Full Replacement",              href: "/"},
           ],
         },
         {
-          title: "Contact",
-          items: [
+          title: "Contact",          items: [
             {
-              label: "(213) 642-2600",
-              href: "tel:+12136422600",
-            },
+              label: "(213) 642-2600",              href: "tel:+12136422600"},
             {
-              label: "155 N Occidental Blvd STE 228",
-              href: "#",
-            },
+              label: "155 N Occidental Blvd STE 228",              href: "#"},
           ],
         },
         {
-          title: "Company",
-          items: [
+          title: "Company",          items: [
             {
-              label: "Privacy Policy",
-              href: "#",
-            },
+              label: "Privacy Policy",              href: "#"},
           ],
         },
       ]}
diff --git a/src/app/page.tsx b/src/app/page.tsx
index d575b0c..7c4cca7 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import { ThemeProvider } from "@/components/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
 import FeatureCardTwelve from '@/components/sections/feature/FeatureCardTwelve';
 import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
@@ -29,68 +29,43 @@ export default function LandingPage() {
       <NavbarLayoutFloatingInline
       navItems={[
         {
-          name: "Home",
-          id: "/",
-        },
+          name: "Home",          id: "/"},
         {
-          name: "Testimonials",
-          id: "/testimonials",
-        },
+          name: "Testimonials",          id: "/testimonials"},
         {
-          name: "Schedule",
-          id: "/booking",
-        },
+          name: "Schedule",          id: "/booking"},
       ]}
       brandName="Best Team Roofing"
       button={{
-        text: "Call (213) 642-2600",
-        href: "tel:+12136422600",
-      }}
+        text: "Call (213) 642-2600",        href: "tel:+12136422600"}}
     />
   </div>
 
   <div id="hero" data-section="hero">
       <HeroBillboardCarousel
       background={{
-        variant: "gradient-bars",
-      }}
+        variant: "gradient-bars"}}
       title="#1 Rated Los Angeles Roof Repair"
       description="Licensed, Bonded, and Insured. We handle structural, storm damage, leaks, and more. Same day service available."
       buttons={[
         {
-          text: "Get a Quote",
-          href: "/booking",
-        },
+          text: "Get a Quote",          href: "/booking"},
         {
-          text: "Call Now",
-          href: "tel:+12136422600",
-        },
+          text: "Call Now",          href: "tel:+12136422600"},
       ]}
       mediaItems={[
         {
-          imageSrc: "http://img.b2bpic.net/free-photo/full-shot-man-working-roof_23-2149343660.jpg?_wi=1",
-          imageAlt: "Roof Repair 1",
-        },
+          imageSrc: "http://img.b2bpic.net/free-photo/full-shot-man-working-roof_23-2149343660.jpg?_wi=1",          imageAlt: "Roof Repair 1"},
         {
-          imageSrc: "http://img.b2bpic.net/free-photo/full-shot-man-working-roof_23-2149343660.jpg?_wi=2",
-          imageAlt: "Roof Repair 2",
-        },
+          imageSrc: "http://img.b2bpic.net/free-photo/full-shot-man-working-roof_23-2149343660.jpg?_wi=2",          imageAlt: "Roof Repair 2"},
         {
-          imageSrc: "http://img.b2bpic.net/free-photo/full-shot-man-working-roof_23-2149343660.jpg?_wi=3",
-          imageAlt: "Roof Repair 3",
-        },
+          imageSrc: "http://img.b2bpic.net/free-photo/full-shot-man-working-roof_23-2149343660.jpg?_wi=3",          imageAlt: "Roof Repair 3"},
         {
-          imageSrc: "http://img.b2bpic.net/free-photo/full-shot-man-working-roof_23-2149343660.jpg?_wi=4",
-          imageAlt: "Roof Repair 4",
-        },
+          imageSrc: "http://img.b2bpic.net/free-photo/full-shot-man-working-roof_23-2149343660.jpg?_wi=4",          imageAlt: "Roof Repair 4"},
         {
-          imageSrc: "http://img.b2bpic.net/free-photo/full-shot-man-working-roof_23-2149343660.jpg?_wi=5",
-          imageAlt: "Roof Repair 5",
-        },
+          imageSrc: "http://img.b2bpic.net/free-photo/full-shot-man-working-roof_23-2149343660.jpg?_wi=5",          imageAlt: "Roof Repair 5"},
         {
-          imageSrc: "http://img.b2bpic.net/free-photo/full-shot-man-working-roof_23-2149343660.jpg?_wi=6",
-          imageAlt: "Roof Repair 6",
-        },
+          imageSrc: "http://img.b2bpic.net/free-photo/full-shot-man-working-roof_23-2149343660.jpg?_wi=6",          imageAlt: "Roof Repair 6"},
       ]}
     />
   </div>
@@ -103,17 +78,11 @@ export default function LandingPage() {
       description="When it comes to roofs, we do it all! We offer comprehensive roofing services in Los Angeles, from emergency hail repair to full replacement."
       bulletPoints={[
         {
-          title: "Emergency Repair",
-          description: "Same day or next day service for leaks and storm damage.",
-        },
+          title: "Emergency Repair",          description: "Same day or next day service for leaks and storm damage."},
         {
-          title: "Fully Licensed",
-          description: "Licensed, bonded, and insured for your protection.",
-        },
+          title: "Fully Licensed",          description: "Licensed, bonded, and insured for your protection."},
         {
-          title: "Complete Services",
-          description: "Structural repairs, shingles, gutters, ventilation, and more.",
-        },
+          title: "Complete Services",          description: "Structural repairs, shingles, gutters, ventilation, and more."},
       ]}
       imageSrc="http://img.b2bpic.net/free-photo/tennis-player-training_23-2147821254.jpg?_wi=1"
       mediaAnimation="slide-up"
@@ -127,37 +96,16 @@ export default function LandingPage() {
       useInvertedBackground={false}
       features={[
         {
-          id: "1",
-          label: "Repair",
-          title: "Structural & Storm Damage",
-          items: [
-            "Leak Detection",
-            "Storm Damage Repair",
-            "Hail Damage Repair",
-            "Wind Lift Repairs",
-          ],
+          id: "1",          label: "Repair",          title: "Structural & Storm Damage",          items: [
+            "Leak Detection",            "Storm Damage Repair",            "Hail Damage Repair",            "Wind Lift Repairs"],
         },
         {
-          id: "2",
-          label: "Maintenance",
-          title: "Roof Health",
-          items: [
-            "Moss & Algae Cleaning",
-            "Gutter Cleaning",
-            "Ventilation Issues",
-            "Waterproofing",
-          ],
+          id: "2",          label: "Maintenance",          title: "Roof Health",          items: [
+            "Moss & Algae Cleaning",            "Gutter Cleaning",            "Ventilation Issues",            "Waterproofing"],
         },
         {
-          id: "3",
-          label: "Upgrade",
-          title: "Energy & Durability",
-          items: [
-            "Thermal Insulation",
-            "Energy Efficiency Upgrades",
-            "Granule Loss Replacement",
-            "Full Replacement",
-          ],
+          id: "3",          label: "Upgrade",          title: "Energy & Durability",          items: [
+            "Thermal Insulation",            "Energy Efficiency Upgrades",            "Granule Loss Replacement",            "Full Replacement"],
         },
       ]}
       title="Our Expert Roofing Services"
@@ -174,27 +122,12 @@ export default function LandingPage() {
       description="Transparent pricing for all your roofing needs."
       plans={[
         {
-          id: "basic",
-          badge: "Essential",
-          price: "$499",
-          subtitle: "Basic Roof Inspection",
-          features: [
-            "Visual Assessment",
-            "Leak Identification",
-            "Repair Quote",
-          ],
+          id: "basic",          badge: "Essential",          price: "$499",          subtitle: "Basic Roof Inspection",          features: [
+            "Visual Assessment",            "Leak Identification",            "Repair Quote"],
         },
         {
-          id: "pro",
-          badge: "Most Popular",
-          price: "$1299",
-          subtitle: "Full Roof Tune-Up",
-          features: [
-            "Gutter Cleaning",
-            "Sealing",
-            "Ventilation Check",
-            "Small Repairs",
-          ],
+          id: "pro",          badge: "Most Popular",          price: "$1299",          subtitle: "Full Roof Tune-Up",          features: [
+            "Gutter Cleaning",            "Sealing",            "Ventilation Check",            "Small Repairs"],
         },
       ]}
     />
@@ -209,15 +142,9 @@ export default function LandingPage() {
       membersAnimation="slide-up"
       members={[
         {
-          id: "1",
-          name: "John Smith",
-          imageSrc: "http://img.b2bpic.net/free-photo/man-focusing-conversation-with-interviewers_1163-5324.jpg?_wi=1",
-        },
+          id: "1",          name: "John Smith",          imageSrc: "http://img.b2bpic.net/free-photo/man-focusing-conversation-with-interviewers_1163-5324.jpg?_wi=1"},
         {
-          id: "2",
-          name: "Elena Rodriguez",
-          imageSrc: "http://img.b2bpic.net/free-photo/young-woman-doing-okay_1187-3780.jpg",
-        },
+          id: "2",          name: "Elena Rodriguez",          imageSrc: "http://img.b2bpic.net/free-photo/young-woman-doing-okay_1187-3780.jpg"},
       ]}
     />
   </div>
@@ -226,38 +153,25 @@ export default function LandingPage() {
       <FooterBaseReveal
       columns={[
         {
-          title: "Services",
-          items: [
+          title: "Services",          items: [
             {
-              label: "Roof Repairs",
-              href: "/",
-            },
+              label: "Roof Repairs",              href: "/"},
             {
-              label: "Full Replacement",
-              href: "/",
-            },
+              label: "Full Replacement",              href: "/"},
           ],
         },
         {
-          title: "Contact",
-          items: [
+          title: "Contact",          items: [
             {
-              label: "(213) 642-2600",
-              href: "tel:+12136422600",
-            },
+              label: "(213) 642-2600",              href: "tel:+12136422600"},
             {
-              label: "155 N Occidental Blvd STE 228",
-              href: "#",
-            },
+              label: "155 N Occidental Blvd STE 228",              href: "#"},
           ],
         },
         {
-          title: "Company",
-          items: [
+          title: "Company",          items: [
             {
-              label: "Privacy Policy",
-              href: "#",
-            },
+              label: "Privacy Policy",              href: "#"},
           ],
         },
       ]}
diff --git a/src/app/testimonials/page.tsx b/src/app/testimonials/page.tsx
index 2b5207a..ac53111 100644
--- a/src/app/testimonials/page.tsx
+++ b/src/app/testimonials/page.tsx
@@ -1,10 +1,9 @@
 "use client";
 
-import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import { ThemeProvider } from "@/components/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
 import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
 import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
-import { ShieldCheck } from "lucide-react";
 import TestimonialCardFive from '@/components/sections/testimonial/TestimonialCardFive';
 import SplitAbout from '@/components/sections/about/SplitAbout';