diff --git a/app/layout.tsx b/app/layout.tsx
index 31c355c..b5ff6d2 100644
--- a/app/layout.tsx
+++ b/app/layout.tsx
@@ -1,7 +1,7 @@
 import type { Metadata } from "next";
 import { Space_Grotesk } from 'next/font/google';
 import "./globals.css";
-import Navbar from "@/components/Navbar";
+import Navbar from "@/components/main/navbar/Navbar";
 
 export const metadata: Metadata = {
   title: "Create Next App",
diff --git a/app/page.tsx b/app/page.tsx
index 947d4cd..fb430f3 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -1,12 +1,12 @@
 
-import Accordian from "@/components/Accordian";
-import { Bottom } from "@/components/Bottom";
-import ContactPage from "@/components/Contact";
-import HeroSection from "@/components/main/Hero";
+import Accordian from "@/components/main/accordian/Accordian";
+import { Bottom } from "@/components/main/bottom/Bottom";
+import ContactPage from "@/components/main/contact/Contact";
+import HeroSection from "@/components/main/hero/Hero";
 import PricingSection from "@/components/Pricing/PricingSection";
 
-import Services from "@/components/Services";
-import TeamPage from "@/components/Team";
+import Services from "@/components/main/services/Services";
+import TeamPage from "@/components/main/team/Team";
 
 export default function Home() {
   return (
diff --git a/components/Pricing/GrowthCard.tsx b/components/Pricing/GrowthCard.tsx
index c1c23cc..48c532e 100644
--- a/components/Pricing/GrowthCard.tsx
+++ b/components/Pricing/GrowthCard.tsx
@@ -43,7 +43,7 @@ export const GrowthCard = () => {
           </div>
         </div>
         
-        <Link href="https://cal.com/acex-labs">
+        <Link href="https://cal.com/acex-labs" target="_blank">
         <div className="space-y-4">
           <Button className="w-full bg-gray-800 text-white hover:bg-gray-700 rounded-xl py-6 text-lg transition-all duration-300 shadow-lg hover:shadow-xl">
             Schedule a Call →
diff --git a/components/Pricing/MvpCard.tsx b/components/Pricing/MvpCard.tsx
index a67fa73..03721d6 100644
--- a/components/Pricing/MvpCard.tsx
+++ b/components/Pricing/MvpCard.tsx
@@ -46,7 +46,7 @@ export const MvpCard = () => {
           </div>
         </div>
         
-        <Link href="https://cal.com/acex-labs">
+        <Link href="https://cal.com/acex-labs" target="_blank">
         <div className="space-y-4">
           <Button className="w-full bg-gray-800 text-white hover:bg-gray-700 rounded-xl py-6 text-lg transition-all duration-300 shadow-lg hover:shadow-xl">
             Get Started Now →
diff --git a/components/Pricing/StartupCard.tsx b/components/Pricing/StartupCard.tsx
index f1b6102..7d2c84e 100644
--- a/components/Pricing/StartupCard.tsx
+++ b/components/Pricing/StartupCard.tsx
@@ -1,52 +1,55 @@
-import { Check} from "lucide-react"
-import Link from "next/link"
-import { Button } from "../ui/button"
-import { Card } from "../ui/card"
+import { Check } from "lucide-react";
+import Link from "next/link";
+import { Button } from "../ui/button";
+import { Card } from "../ui/card";
 
 export const StartupCard = () => {
-    return(
-        <Card className="relative bg-black rounded-3xl p-8 shadow-2xl flex flex-col justify-between transition-all duration-300 hover:shadow-[0_0_30px_rgba(255,255,255,0.2)] hover:scale-105 border border-gray-700">
-        <div>
-          <div className="inline-block bg-white text-black px-4 py-1.5 rounded-full text-sm mb-6 shadow-lg">
-            Quarterly Plan
-          </div>
-          <h2 className="text-2xl font-bold mb-2 text-white">Startup Booster Package</h2>
-          <div className="mb-4">
-            <span className="text-4xl font-bold text-white">$4997/quarter</span>
-          </div>
-          <p className="text-gray-400 mb-8">Billed quarterly, 3-month minimum</p>
-          
-          <div className="mb-8">
-            <h3 className="text-xl font-semibold mb-4 text-white">What&apos;s Included:</h3>
-            <ul className="space-y-4">
-              {[
-                "120 hours of development time per quarter",
-                "Bi-weekly strategy calls",
-                "Priority bug fixes and feature updates",
-                "Quarterly performance review",
-                "Dedicated project manager",
-                "Scalability planning and implementation",
-                "24/7 emergency support"
-              ].map((feature, index) => (
-                <li key={index} className="flex items-center gap-3">
-                  <div className="bg-white rounded-full p-1 shadow-md">
-                    <Check className="w-4 h-4 text-black" />
-                  </div>
-                  <span className="text-gray-300">{feature}</span>
-                </li>
-              ))}
-            </ul>
-          </div>
+  return (
+    <Card className="relative bg-black rounded-3xl p-8 shadow-2xl flex flex-col justify-between transition-all duration-300 hover:shadow-[0_0_30px_rgba(255,255,255,0.2)] hover:scale-105 border border-gray-700">
+      <div>
+        <div className="inline-block bg-white text-black px-4 py-1.5 rounded-full text-sm mb-6 shadow-lg">
+          Quarterly Plan
         </div>
+        <h2 className="text-2xl font-bold mb-2 text-white">
+          Startup Booster Package
+        </h2>
+        <div className="mb-4">
+          <span className="text-4xl font-bold text-white">$4997/quarter</span>
+        </div>
+        <p className="text-gray-400 mb-8">Billed quarterly, 3-month minimum</p>
+
+        <div className="mb-8">
+          <h3 className="text-xl font-semibold mb-4 text-white">
+            What&apos;s Included:
+          </h3>
+          <ul className="space-y-4">
+            {[
+              "120 hours of development time per quarter",
+              "Bi-weekly strategy calls",
+              "Priority bug fixes and feature updates",
+              "Quarterly performance review",
+              "Dedicated project manager",
+              "Scalability planning and implementation",
+              "24/7 emergency support",
+            ].map((feature, index) => (
+              <li key={index} className="flex items-center gap-3">
+                <div className="bg-white rounded-full p-1 shadow-md">
+                  <Check className="w-4 h-4 text-black" />
+                </div>
+                <span className="text-gray-300">{feature}</span>
+              </li>
+            ))}
+          </ul>
+        </div>
+      </div>
 
-        <Link href="https://cal.com/acex-labs">
+      <Link href="https://cal.com/acex-labs" target="_blank">
         <div className="space-y-4">
           <Button className="w-full bg-white text-black hover:bg-gray-200 rounded-xl py-6 text-lg transition-all duration-300 shadow-lg hover:shadow-xl">
             Start Your Journey →
           </Button>
         </div>
-        </Link>
-      </Card>
-
-    )
-}
\ No newline at end of file
+      </Link>
+    </Card>
+  );
+};
diff --git a/components/Team/Team.tsx b/components/Team/Team.tsx
index 8389a99..a67730c 100644
--- a/components/Team/Team.tsx
+++ b/components/Team/Team.tsx
@@ -1,5 +1,5 @@
 "use client";
-import Container from "../Container";
+import Container from "../shared/Container";
 import {
   TopLeftShiningLight,
   TopRightShiningLight,
diff --git a/components/Accordian.tsx b/components/main/accordian/Accordian.tsx
similarity index 88%
rename from components/Accordian.tsx
rename to components/main/accordian/Accordian.tsx
index 0f72ac5..f3c331c 100644
--- a/components/Accordian.tsx
+++ b/components/main/accordian/Accordian.tsx
@@ -1,8 +1,8 @@
 
 import { Process } from '@/data/process'
-import Container from './Container'
+import Container from '../../shared/Container'
 import AccordionItem from './AccordianItem'
-import Topic from './Topic'
+import Topic from '../../shared/Topic'
 
 export default function Accordian() {
   return (
diff --git a/components/AccordianItem.tsx b/components/main/accordian/AccordianItem.tsx
similarity index 100%
rename from components/AccordianItem.tsx
rename to components/main/accordian/AccordianItem.tsx
diff --git a/components/Bottom.tsx b/components/main/bottom/Bottom.tsx
similarity index 97%
rename from components/Bottom.tsx
rename to components/main/bottom/Bottom.tsx
index faf650b..3e9a14a 100644
--- a/components/Bottom.tsx
+++ b/components/main/bottom/Bottom.tsx
@@ -1,6 +1,6 @@
 /* eslint-disable @next/next/no-img-element */
 import Link from "next/link"
-import Container from "./Container"
+import Container from "../../shared/Container"
 
 export const Bottom = () => {
     return (
diff --git a/components/Contact.tsx b/components/main/contact/Contact.tsx
similarity index 98%
rename from components/Contact.tsx
rename to components/main/contact/Contact.tsx
index 2ba6f30..0d284e7 100644
--- a/components/Contact.tsx
+++ b/components/main/contact/Contact.tsx
@@ -1,8 +1,8 @@
 "use client"
 
 import { useState, FormEvent } from 'react';
-import Container from './Container';
-import Topic from './Topic';
+import Container from '../../shared/Container';
+import Topic from '../../shared/Topic';
 import Image from 'next/image';
 
 
diff --git a/components/main/Hero.tsx b/components/main/hero/Hero.tsx
similarity index 98%
rename from components/main/Hero.tsx
rename to components/main/hero/Hero.tsx
index afa72bc..d0ed988 100644
--- a/components/main/Hero.tsx
+++ b/components/main/hero/Hero.tsx
@@ -8,7 +8,7 @@ import {
   TopLeftShiningLight,
   TopRightShiningLight,
 } from "@/components/farmui/ShinyLights";
-import Container from "../Container";
+import Container from "../../shared/Container";
 import Link from "next/link";
 
 export default function FUIDarkHeroSectionWithScrolls() {
diff --git a/components/Navbar.tsx b/components/main/navbar/Navbar.tsx
similarity index 98%
rename from components/Navbar.tsx
rename to components/main/navbar/Navbar.tsx
index 5c5a24b..f949f1d 100644
--- a/components/Navbar.tsx
+++ b/components/main/navbar/Navbar.tsx
@@ -1,7 +1,7 @@
 "use client";
 import { useState } from "react";
 import Link from "next/link";
-import Container from "./Container";
+import Container from "../../shared/Container";
 import { menuItems } from "@/data/menuitems";
 
 const Navigation = () => {
diff --git a/components/Services.tsx b/components/main/services/Services.tsx
similarity index 96%
rename from components/Services.tsx
rename to components/main/services/Services.tsx
index f7a865d..e12a697 100644
--- a/components/Services.tsx
+++ b/components/main/services/Services.tsx
@@ -1,7 +1,7 @@
 /* eslint-disable @next/next/no-img-element */
 import { servicesData } from "@/data/service";
-import Container from "./Container";
-import Topic from "./Topic";
+import Container from "../../shared/Container";
+import Topic from "../../shared/Topic";
 
 function Services() {
   return (
diff --git a/components/Team.tsx b/components/main/team/Team.tsx
similarity index 97%
rename from components/Team.tsx
rename to components/main/team/Team.tsx
index 27e45c7..f873f05 100644
--- a/components/Team.tsx
+++ b/components/main/team/Team.tsx
@@ -1,8 +1,8 @@
 /* eslint-disable @next/next/no-img-element */
 "use client"
 import { teamData } from "@/data/process";
-import Container from "./Container";
-import Topic from "./Topic";
+import Container from "../../shared/Container";
+import Topic from "../../shared/Topic";
 import { useRouter } from "next/navigation";
 import { TeamMember } from "@/data/TeamMember";
 
diff --git a/components/Container.tsx b/components/shared/Container.tsx
similarity index 100%
rename from components/Container.tsx
rename to components/shared/Container.tsx
diff --git a/components/Topic.tsx b/components/shared/Topic.tsx
similarity index 100%
rename from components/Topic.tsx
rename to components/shared/Topic.tsx