diff --git a/components/Achievements/Achievements.module.scss b/components/Achievements/Achievements.module.scss
index e5866fa8..cf66fe4b 100644
--- a/components/Achievements/Achievements.module.scss
+++ b/components/Achievements/Achievements.module.scss
@@ -3,6 +3,7 @@
 .achYear {
   width: 100%;
   margin: 50px auto;
+
   h3 {
     text-align: center;
     width: 40%;
@@ -10,6 +11,7 @@
     color: $light;
     font-size: 1.8rem;
     border-bottom: 2px solid $light;
+
     padding: {
       bottom: 10px;
     }
@@ -24,9 +26,10 @@
     flex-wrap: wrap;
 
     .ach {
-      width: 250px;
-      height: 300px;
+      width: 300px;
+      height: 360px;
       margin: 30px;
+
       // background-color: rebeccapurple;
       .achImg {
         height: 70%;
@@ -35,6 +38,7 @@
         background-position: center;
         background-repeat: no-repeat;
       }
+
       .achName {
         padding-top: 10px;
         height: 30%;
diff --git a/components/Teams/Alumni/Alumni.js b/components/Alumni/Alumni.js
similarity index 95%
rename from components/Teams/Alumni/Alumni.js
rename to components/Alumni/Alumni.js
index 162e754a..a955fb14 100644
--- a/components/Teams/Alumni/Alumni.js
+++ b/components/Alumni/Alumni.js
@@ -1,7 +1,7 @@
-import Hero from '../../Hero/Hero';
+import Hero from '../Hero/Hero';
 import styles from './Alumni.module.scss';
-import Card from '../../Card/Card';
-import { AlumniList } from '../../../data';
+import Card from '../Card/Card';
+import { AlumniList } from '../../data';
 import { useState } from 'react';
 
 let updatedList = [];
@@ -88,7 +88,7 @@ const Alumni = () => {
         <input
           className={styles.search}
           type='search'
-          placeholder='Search by keyword'
+          placeholder='Search name of Alumni'
           onChange={(ev) => selKeyword(ev)}
         />
         <div className={styles.dropdown}>
diff --git a/components/Teams/Alumni/Alumni.module.scss b/components/Alumni/Alumni.module.scss
similarity index 98%
rename from components/Teams/Alumni/Alumni.module.scss
rename to components/Alumni/Alumni.module.scss
index 4a4efb5b..83f6f643 100644
--- a/components/Teams/Alumni/Alumni.module.scss
+++ b/components/Alumni/Alumni.module.scss
@@ -1,4 +1,4 @@
-@import '../../variables';
+@import '../variables';
 
 .filter {
   display: flex;
diff --git a/components/ContributionCard/ContributionCard.js b/components/ContributionCard/ContributionCard.js
index 0a55d933..21009e92 100644
--- a/components/ContributionCard/ContributionCard.js
+++ b/components/ContributionCard/ContributionCard.js
@@ -26,7 +26,13 @@ const ContributionCard = ({
         <div className={styles.contributor}>{repoName}</div>
         <div className={styles.desc}>{description}</div>
         <div className={styles.meta}>
-          <span className={styles.competition}>{competition}</span>
+          <span
+            className={`${styles.competition} ${
+              styles[competition?.toLowerCase()] || ''
+            }`}
+          >
+            {competition}
+          </span>
         </div>
         <div className={styles.icons}>
           <GitHubLink githubLink={githubLink} />
diff --git a/components/ContributionCard/ContributionCard.module.scss b/components/ContributionCard/ContributionCard.module.scss
index 8c78a096..14939167 100644
--- a/components/ContributionCard/ContributionCard.module.scss
+++ b/components/ContributionCard/ContributionCard.module.scss
@@ -6,9 +6,17 @@
   min-height: 22rem;
   display: flex;
   flex-direction: column;
-  background-color: #1a1a1a;
+  background-color: rgba(26, 26, 26, 0.6);
+  backdrop-filter: blur(5px);
   border-radius: 10px;
   overflow: hidden;
+  transition: all 0.3s ease;
+
+  &:hover {
+    background-color: rgba(26, 26, 26, 0.8);
+    transform: translateY(-5px);
+    cursor: pointer;
+  }
 
   .top {
     height: 6rem;
@@ -73,6 +81,16 @@
         background-color: #0d0d0d;
         color: #4caf50;
         border: 1px solid #4caf50;
+
+        &.lfx {
+          color: #ff4d4d;
+          border-color: #ff4d4d;
+        }
+
+        &.ospp {
+          color: #ffeb3b;
+          border-color: #ffeb3b;
+        }
       }
     }
 
diff --git a/components/Teams/Opensource/Opensource.js b/components/Opensource/Opensource.js
similarity index 61%
rename from components/Teams/Opensource/Opensource.js
rename to components/Opensource/Opensource.js
index 4ffbc29a..3123c9e5 100644
--- a/components/Teams/Opensource/Opensource.js
+++ b/components/Opensource/Opensource.js
@@ -1,33 +1,12 @@
-import Hero from '../../Hero/Hero';
+import Hero from '../Hero/Hero';
 import styles from './Opensource.module.scss';
-import ContributionCard from '../../ContributionCard/ContributionCard.js';
-import { OpenSourceList } from '../../../data';
-import { useState } from 'react';
-
-let updatedList = [];
-
-const competitions = ['GSoC', 'OSPP', 'LFX', 'Other'];
+import ContributionCard from '../ContributionCard/ContributionCard.js';
+import { OpenSourceList } from '../../data';
+import { useState, useEffect, useMemo } from 'react';
 
+const competitions = ['GSoC', 'OSPP', 'LFX'];
 const years = [2025, 2024, 2023, 2022, 2021, 2020, 2019, 2018];
 
-OpenSourceList.forEach((year) => {
-  year.contributions.forEach((contribution) => {
-    updatedList.push({
-      repoName: contribution.repoName,
-      repoIcon: contribution.repoIcon,
-      description: contribution.description,
-      prLink: contribution.prLink,
-
-      githubLink: contribution.githubLink,
-      contributor: contribution.contributor,
-      competition: contribution.competition,
-      year: year.year,
-    });
-  });
-});
-
-let filteredList = updatedList;
-
 const OpenSource = () => {
   const [clicked, setClicked] = useState(false);
   const [clickedComp, setClickedComp] = useState(false);
@@ -35,55 +14,80 @@ const OpenSource = () => {
   const [filComp, setFilComp] = useState('Show all');
   const [key, setKey] = useState('');
 
-  const toggleYear = () => {
-    setClicked(!clicked);
-    setClickedComp(false);
-  };
+  // Memoize the flattened list to avoid re-calculation on every render
+  const updatedList = useMemo(() => {
+    const list = [];
+    if (OpenSourceList) {
+      OpenSourceList.forEach((year) => {
+        year.contributions.forEach((contribution) => {
+          if (competitions.includes(contribution.competition)) {
+            list.push({
+              repoName: contribution.repoName,
+              repoIcon: contribution.repoIcon,
+              description: contribution.description,
+              prLink: contribution.prLink,
+              githubLink: contribution.githubLink,
+              contributor: contribution.contributor,
+              competition: contribution.competition,
+              year: year.year,
+              language: contribution.language || '', // Ensure language exists
+            });
+          }
+        });
+      });
+    }
+    return list;
+  }, []);
 
-  const toggleComp = () => {
-    setClickedComp(!clickedComp);
-    setClicked(false);
-  };
+  const [filteredList, setFilteredList] = useState(updatedList);
 
-  const applyFilters = (year, comp, keyword) => {
-    filteredList = updatedList.filter((contribution) => {
-      const matchesYear = year === 'Show all' || contribution.year == year;
+  // Update filteredList whenever filters change
+  useEffect(() => {
+    const newList = updatedList.filter((contribution) => {
+      const matchesYear =
+        filYear === 'Show all' || contribution.year == filYear;
       const matchesComp =
-        comp === 'Show all' || contribution.competition === comp;
+        filComp === 'Show all' || contribution.competition === filComp;
+
+      const keyword = key.toLowerCase();
       const matchesKeyword =
         keyword === '' ||
-        contribution.repoName.toLowerCase().includes(keyword) ||
-        contribution.description.toLowerCase().includes(keyword) ||
-        contribution.language.toLowerCase().includes(keyword) ||
-        contribution.contributor.toLowerCase().includes(keyword);
+        (contribution.repoName &&
+          contribution.repoName.toLowerCase().includes(keyword)) ||
+        (contribution.description &&
+          contribution.description.toLowerCase().includes(keyword)) ||
+        (contribution.language &&
+          contribution.language.toLowerCase().includes(keyword)) ||
+        (contribution.contributor &&
+          contribution.contributor.toLowerCase().includes(keyword));
 
       return matchesYear && matchesComp && matchesKeyword;
     });
+    setFilteredList(newList);
+  }, [filYear, filComp, key, updatedList]);
+
+  const toggleYear = () => {
+    setClicked(!clicked);
+    setClickedComp(false);
+  };
+
+  const toggleComp = () => {
+    setClickedComp(!clickedComp);
+    setClicked(false);
   };
 
   const selYear = (year) => {
     setFilYear(year);
-    applyFilters(year, filComp, key);
     setClicked(false);
   };
 
   const selComp = (comp) => {
     setFilComp(comp);
-    applyFilters(filYear, comp, key);
     setClickedComp(false);
   };
 
   const selKeyword = (ev) => {
-    const value = ev.currentTarget.value.toLowerCase();
-    setKey(value);
-
-    if (value === '') {
-      setFilYear('Show all');
-      setFilComp('Show all');
-      filteredList = updatedList;
-    } else {
-      applyFilters(filYear, filComp, value);
-    }
+    setKey(ev.currentTarget.value);
   };
 
   return (
@@ -99,7 +103,8 @@ const OpenSource = () => {
         <input
           className={styles.search}
           type='search'
-          placeholder='Search by repo, language or contributor'
+          placeholder='Search name of the contributor'
+          value={key}
           onChange={(ev) => selKeyword(ev)}
         />
 
diff --git a/components/Teams/Opensource/Opensource.module.scss b/components/Opensource/Opensource.module.scss
similarity index 99%
rename from components/Teams/Opensource/Opensource.module.scss
rename to components/Opensource/Opensource.module.scss
index 01c4fc08..c55789cf 100644
--- a/components/Teams/Opensource/Opensource.module.scss
+++ b/components/Opensource/Opensource.module.scss
@@ -1,4 +1,4 @@
-@import '../../variables';
+@import '../variables';
 
 .filter {
   display: flex;
diff --git a/components/Projects/FlagshipProjects/FlagshipProjects.js b/components/Projects/FlagshipProjects/FlagshipProjects.js
deleted file mode 100644
index a91dc924..00000000
--- a/components/Projects/FlagshipProjects/FlagshipProjects.js
+++ /dev/null
@@ -1,54 +0,0 @@
-import styles from './FlagshipProjects.module.scss';
-import Link from 'next/link';
-import { FlagshipProjectsData } from '../../../data';
-import { faGithub, faLinkedinIn } from '@fortawesome/free-brands-svg-icons';
-import Hero from '../../Hero/Hero';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-
-const FlagshipProjects = () => {
-  return (
-    <>
-      <Hero
-        imgName={'flagship-hero.jpg'}
-        title={<>Flagship Projects</>}
-        subtitleList={['Innovation exemplified.']}
-        isHome={false}
-      />
-      <div className={styles.flagshipProjects} id='is'>
-        {FlagshipProjectsData.map((proj, idx) => {
-          return (
-            <FlagshipProjectCard
-              key={`flagship_project_${idx}`}
-              imgName={proj.imgName}
-              name={proj.name}
-              sub={proj.sub}
-              githubLink={proj.githubLink}
-            />
-          );
-        })}
-      </div>
-    </>
-  );
-};
-
-const FlagshipProjectCard = ({ imgName, name, sub, githubLink }) => {
-  return (
-    <div className={styles.flagshipProj}>
-      <div
-        style={{ backgroundImage: `url("/static/images/${imgName}")` }}
-        className={styles.flagshipProjImg}
-      ></div>
-      <div className={styles.flagshipProjCont}>
-        <div className={styles.flagshipProjContName}>{name}</div>
-        <div className={styles.flagshipProjContSub}>{sub}</div>
-        <div className={styles.flagshipProjContLinks}>
-          <a href={githubLink}>
-            <FontAwesomeIcon icon={faGithub} />
-          </a>
-        </div>
-      </div>
-    </div>
-  );
-};
-
-export default FlagshipProjects;
diff --git a/components/Projects/FlagshipProjects/FlagshipProjects.module.scss b/components/Projects/FlagshipProjects/FlagshipProjects.module.scss
deleted file mode 100644
index da17fbb8..00000000
--- a/components/Projects/FlagshipProjects/FlagshipProjects.module.scss
+++ /dev/null
@@ -1,50 +0,0 @@
-@import '../../variables';
-
-.flagshipProj {
-  width: 100%;
-  min-height: 70vh;
-  // margin: 0 auto;
-  margin-bottom: 3em;
-
-  .flagshipProjImg {
-    background-position: center center;
-    margin-bottom: 10px;
-    background-repeat: no-repeat;
-    // background-attachment: fixed;
-    background-size: 100vw;
-    height: 60vh;
-    @media (max-width: 650px) {
-      height: 40vh;
-    }
-    @media (max-width: 450px) {
-      height: 30vh;
-    }
-  }
-  .flagshipProjCont {
-    width: 70%;
-    margin: auto;
-    border-bottom: 2px solid $light;
-    padding-bottom: 1em;
-    .flagshipProjContName {
-      font-size: 3rem;
-      text-align: center;
-      padding: 0em;
-    }
-    .flagshipProjContSub {
-      padding: 0.1em;
-      line-height: 160%;
-      margin: 1em 0;
-      text-align: center;
-    }
-    .flagshipProjContLinks {
-      text-align: center;
-      a {
-        font-size: 1.5rem;
-        transition: color 0.2s;
-        &:hover {
-          color: $dark;
-        }
-      }
-    }
-  }
-}
diff --git a/components/Sponsors/Sponsors.module.scss b/components/Sponsors/Sponsors.module.scss
index ace9573c..0edcc6d8 100644
--- a/components/Sponsors/Sponsors.module.scss
+++ b/components/Sponsors/Sponsors.module.scss
@@ -208,6 +208,5 @@
         width: 100px;
       }
     }
-
   }
 }
diff --git a/components/Teams/Current/Current.js b/components/Teams/Current/Current.js
deleted file mode 100644
index 359db8fd..00000000
--- a/components/Teams/Current/Current.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import Hero from '../../Hero/Hero';
-import styles from './Current.module.scss';
-import Card from '../../Card/Card';
-import { SenateList } from '../../../data';
-
-const Current = () => {
-  return (
-    <>
-      <Hero
-        imgName={'team_2026.webp'}
-        backgroundPosition={'center top'}
-        title={<>The Current Team</>}
-        subtitleList={['The Torch Runners']}
-        isHome={false}
-      />
-
-      <div className={styles.cardGrp}>
-        {SenateList.map((member, index) => {
-          return (
-            <Card
-              key={`senate_member_${index}`}
-              index={index}
-              name={member.name}
-              sub={member.sub}
-              imgName={member.imgName}
-              linkedInLink={member.linkedInLink}
-              githubLink={member.githubLink}
-            />
-          );
-        })}
-      </div>
-    </>
-  );
-};
-
-export default Current;
diff --git a/components/Teams/Current/Current.module.scss b/components/Teams/Current/Current.module.scss
deleted file mode 100644
index c26e5b1c..00000000
--- a/components/Teams/Current/Current.module.scss
+++ /dev/null
@@ -1,16 +0,0 @@
-@import '../../variables';
-
-.cardGrp {
-  display: grid;
-  grid-template-columns: 1fr 1fr 1fr 1fr;
-  gap: 2rem;
-  padding: 2rem;
-
-  @media (max-width: 850px) {
-    grid-template-columns: 1fr 1fr;
-  }
-
-  @media (max-width: 650px) {
-    grid-template-columns: 1fr;
-  }
-}
diff --git a/components/Teams/TeacherIncharge/TeacherIncharge.js b/components/Teams/TeacherIncharge/TeacherIncharge.js
deleted file mode 100644
index b183baf6..00000000
--- a/components/Teams/TeacherIncharge/TeacherIncharge.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import Hero from '../../Hero/Hero';
-import styles from './TeacherIncharge.module.scss';
-import Person from '../../Person/Person';
-import { FacultyInchargeList } from '../../../data';
-
-const TeacherIncharge = () => {
-  return (
-    <>
-      <Hero
-        imgName={'teachers-hero.jpg'}
-        backgroundPosition={'center top'}
-        title={<>Teachers Incharge</>}
-        subtitleList={['']}
-        isHome={false}
-      />
-      <div className={styles.teachers} id='is'>
-        {FacultyInchargeList.map((teacher, index) => {
-          return (
-            <Person
-              key={`farculty_incharge_${index}`}
-              index={index}
-              name={teacher.name}
-              sub={teacher.sub}
-              imgName={teacher.imgName}
-              linkedInLink={teacher.linkedInLink}
-              githubLink={teacher.githubLink}
-            />
-          );
-        })}
-      </div>
-    </>
-  );
-};
-
-export default TeacherIncharge;
diff --git a/components/Teams/TeacherIncharge/TeacherIncharge.module.scss b/components/Teams/TeacherIncharge/TeacherIncharge.module.scss
deleted file mode 100644
index e69de29b..00000000
diff --git a/components/Teams/TeamSelection/TeamsIndex.js b/components/Teams/TeamSelection/TeamsIndex.js
deleted file mode 100644
index aad866e1..00000000
--- a/components/Teams/TeamSelection/TeamsIndex.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import Link from 'next/link';
-import styles from './TeamsIndex.module.scss';
-
-const TeamsIndex = () => {
-  return (
-    <div className={styles.teamSelect}>
-      <h1>Teams</h1>
-      <div className={styles.teamSelList}>
-        <Link href='teams/teacherincharge' className={styles.link}>
-          Teachers Incharge
-        </Link>
-        <Link href='teams/alumni' className={styles.link}>
-          Alumni
-        </Link>
-        <Link href='teams/current' className={styles.link}>
-          Current Team
-        </Link>
-      </div>
-    </div>
-  );
-};
-
-export default TeamsIndex;
diff --git a/components/Teams/TeamSelection/TeamsIndex.module.scss b/components/Teams/TeamSelection/TeamsIndex.module.scss
deleted file mode 100644
index c79e3b02..00000000
--- a/components/Teams/TeamSelection/TeamsIndex.module.scss
+++ /dev/null
@@ -1,65 +0,0 @@
-.teamSelect {
-  width: 100%;
-  height: 100vh;
-  // overflow: auto;
-
-  background-image: linear-gradient(rgba(0, 0, 0, 0.6), rgba(0, 0, 0, 0.6)),
-    url('/static/images/hero/team-selection-hero.jpg');
-  background-size: cover;
-  background-repeat: no-repeat;
-  background-position: center;
-
-  h1 {
-    font-size: 4rem;
-    font-family: 'Oswald', sans-serif;
-    padding-top: 1.5em;
-    text-align: center;
-  }
-
-  .teamSelList {
-    width: 40%;
-    margin: auto;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: stretch;
-    padding: 3em;
-
-    .link {
-      text-align: center;
-      font-size: 2rem;
-      border: 2px solid white;
-      border-radius: 2px;
-      padding: 0.5em 1em;
-      margin: 1em;
-      &:hover {
-        background-color: rgba(255, 255, 255, 0.164);
-      }
-    }
-    @media (max-width: 1250px) {
-      width: 50%;
-    }
-    @media (max-width: 1000px) {
-      width: 60%;
-    }
-    @media (max-width: 850px) {
-      width: 70%;
-    }
-    @media (max-width: 750px) {
-      width: 70%;
-      .link {
-        font-size: 1.5rem;
-      }
-    }
-    @media (max-width: 575px) {
-      width: 80%;
-      padding: 0.5em;
-    }
-    @media (max-width: 500px) {
-      width: 90%;
-    }
-    @media (max-width: 450px) {
-      width: 95%;
-    }
-  }
-}
diff --git a/data/alumnilist.js b/data/alumnilist.js
index fc212e5c..a154ac96 100644
--- a/data/alumnilist.js
+++ b/data/alumnilist.js
@@ -142,6 +142,26 @@ const AlumniList = [
         linkedInLink: 'https://www.linkedin.com/in/viraj-jagadale-173b23231',
         githubLink: 'https://github.com/Jviraj',
       },
+      {
+        name: 'Alqama Shaikh',
+        imgName: 'Team/2025/Alqama_Shaikh_25.jpeg',
+        previous: [{ t: 'BruBotics - Vrije Universiteit Brussel, Project Intern', b: true },
+        { t: 'National University of Singapore, Research Intern', b: true },],
+        current: [{ t: 'Co-Founder, EyeCandy Robotrics', b: false }],
+        linkedInLink: 'https://www.linkedin.com/in/alqama-shaikh/?originalSubdomain=in',
+        githubLink: 'https://github.com/aPR0T0',
+      },
+      {
+        name: 'Zain Siddavatam',
+        imgName: 'Team/2025/Zain_Siddavatam_25.jpeg',
+        previous: [
+          { t: 'Embedded Software Engineer Intern at BeagleBoard.org', b: true },
+          { t: 'Robotics Software Intern at Acceleration Robotics', b: true },
+        ],
+        current: [{ t: 'Engineer 1 @ InCore Semiconductors', b: false }],
+        linkedInLink: 'https://www.linkedin.com/in/zain-siddavatam/',
+        githubLink: 'https://github.com/SuperChamp234',
+      },
     ],
   },
   {
diff --git a/data/faculty.js b/data/faculty.js
deleted file mode 100644
index a19cb7af..00000000
--- a/data/faculty.js
+++ /dev/null
@@ -1,25 +0,0 @@
-const FacultyInchargeList = [
-  {
-    name: 'Dr. A. S. Rao',
-    imgName: 'Dr. A. S. Rao.jpg',
-    sub: <>Faculty Coordinator</>,
-    linkedInLink: 'https://www.linkedin.com/in/dr-a-s-rao-a82aa620/',
-    githubLink: '',
-  },
-  {
-    name: 'Dr. V. B. Suryawanshi',
-    imgName: 'Dr. V. B. Suryawanshi.jpg',
-    sub: <>Vice-Chairman</>,
-    linkedInLink: 'https://www.linkedin.com/in/dr-vinod-suryawanshi-b02a8515/',
-    githubLink: '',
-  },
-  {
-    name: 'Dr. S. A. Mastud',
-    imgName: 'Dr. S. A. Mastud.jpg',
-    sub: <>Chairman</>,
-    linkedInLink: 'https://www.linkedin.com/in/sachin-mastud-670602206/',
-    githubLink: '',
-  },
-];
-
-export default FacultyInchargeList;
diff --git a/data/flagshipprojects.js b/data/flagshipprojects.js
deleted file mode 100644
index 4a78bfaa..00000000
--- a/data/flagshipprojects.js
+++ /dev/null
@@ -1,22 +0,0 @@
-const FlagshipProjectsData = [
-  {
-    imgName: 'Avitra.jpg',
-    name: 'AVITRA',
-    sub: "AVITRA is a 5-DOF Serial Manipulator retro-fitted on a holonomic drive platform capable of mapping unknown environments, autonomously navigating known environments and manipulating small objects of various shapes. It's driven by an Intel NUC, which gives the robot the ability to process the information around it with the help of industry-standard software like ROS due to which development and customization to fit various applications becomes more feasible.",
-    githubLink: 'https://github.com/SRA-AVITRA',
-  },
-  {
-    imgName: 'Venom.jpg',
-    name: 'VENOM (Quadruped)',
-    sub: 'Venom is an unmanned four legged robot equipped with RGB-Depth Camera and an ARM Processor for onboard computation. Most of the robots available in the industry make use of wheels for navigation. Whereas a legged vehicle like Venom, will give multiple-terrain mobility, superior to existing wheeled and tracked vehicles. It can also negotiate terrain with minimum of human guidance and intervention.',
-    githubLink: 'https://github.com/chinmaynehate/Venom',
-  },
-  {
-    imgName: 'drone.jpg',
-    name: 'PUSHPAC (Drone)',
-    sub: 'PUSHPAC ( Polymorphic & Unmanned Surveillance Hybrid Platform with Autonomous Capabilities ) is a hybrid unmanned vehicle developed for functioning both in air and underwater. PUSHPAC is capable of extracting data regarding the bed profile of a water body up to a depth of 10 metres, and also performing surveillance and localisation using its vision capabilities, underwater as well as in flight.',
-    githubLink: 'https://github.com/apoorva-21/PUSHPAC',
-  },
-];
-
-export default FlagshipProjectsData;
diff --git a/data/index.js b/data/index.js
index 19eceaa7..df259552 100644
--- a/data/index.js
+++ b/data/index.js
@@ -6,7 +6,6 @@ import {
   AboutUsImages,
 } from './aboutus';
 
-import SenateList from './senate';
 import SocialMediaLinks from './socialmedia';
 import HeroTags from './herotags';
 import NavbarData from './navbar';
@@ -24,7 +23,7 @@ import StartupsList from './startups';
 import OngoingProjectsData from './ongoingprojects';
 import EklavyaProjectList from './eklavyaprojects';
 import ActivitiesList from './activities';
-import FacultyInchargeList from './faculty';
+
 import PublicationsList from './publications';
 
 export {
@@ -47,7 +46,5 @@ export {
   ActivitiesList,
   StartupsList,
   Achievementlist,
-  FacultyInchargeList,
-  SenateList,
   PublicationsList,
 };
diff --git a/data/navbar.js b/data/navbar.js
index 47965448..fdb60148 100644
--- a/data/navbar.js
+++ b/data/navbar.js
@@ -35,11 +35,15 @@ const NavbarData = [
   },
   {
     name: 'Alumni',
-    link: '/teams/alumni',
+    link: '/alumni',
+  },
+  {
+    name: 'Startups',
+    link: '/startups',
   },
   {
     name: 'Opensource',
-    link: '/teams/opensource',
+    link: '/opensource',
   },
   {
     name: 'Achievements',
@@ -59,10 +63,6 @@ const NavbarData = [
       },
     ],
   },
-  {
-    name: 'Startups',
-    link: '/startups',
-  },
 ];
 
 export default NavbarData;
diff --git a/data/opensource.js b/data/opensource.js
index bda43959..5aaf5a63 100644
--- a/data/opensource.js
+++ b/data/opensource.js
@@ -12,15 +12,6 @@ const OpenSourceList = [
         prLink: 'https://gitlab.rtems.org/rtems/programs/gsoc/-/issues/81',
         githubLink: 'https://github.com/ShaunakKDatar',
       },
-      {
-        contributor: 'Prithvi Tambewagh',
-        repoName: 'RTEMS',
-        repoIcon: 'https://avatars.githubusercontent.com/u/156917709?v=4',
-        description: 'Provide SPARC greth network drivers for LWIP',
-        competition: 'GSoC',
-        prLink: 'https://github.com/rkt-1597/GSoC-2025-Final-Report',
-        githubLink: 'https://github.com/rkt-1597',
-      },
       {
         contributor: 'Suraj Sonawane',
         repoName: 'The Linux Foundation',
@@ -43,7 +34,8 @@ const OpenSourceList = [
         contributor: 'Aryan Nanda',
         repoName: 'Ianvs',
         repoIcon: 'https://avatars.githubusercontent.com/u/125150482?v=4',
-        description:'Designed resource-sensitive router & enhanced Cloud-Edge LLM inference in Ianvs',
+        description:
+          'Designed resource-sensitive router & enhanced Cloud-Edge LLM inference in Ianvs',
         competition: 'LFX',
         prLink: 'https://github.com/kubeedge/ianvs',
         githubLink: 'https://github.com/AryanNanda17',
@@ -52,16 +44,19 @@ const OpenSourceList = [
         contributor: 'Shankari',
         repoName: 'Rust-for-Linux',
         repoIcon: 'https://avatars.githubusercontent.com/u/129577901?v=4',
-        description:'Contributed Rust-for-Linux refactoring, Kconfig & filesystem patches',
+        description:
+          'Contributed Rust-for-Linux refactoring, Kconfig & filesystem patches',
         competition: 'LFX',
-        prLink:'https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=b9ff1c2a26fa31216be18e9b14c419ff8fe39e72',
+        prLink:
+          'https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=b9ff1c2a26fa31216be18e9b14c419ff8fe39e72',
         githubLink: 'https://github.com/Shankari02',
       },
       {
         contributor: 'Purva Yeshi',
         repoName: '',
         repoIcon: 'https://avatars.githubusercontent.com/u/129578264?v=4',
-        description: 'Fixed real kernel bugs, performed RCA & pushed upstream patches',
+        description:
+          'Fixed real kernel bugs, performed RCA & pushed upstream patches',
         competition: 'LFX',
         prLink: '',
         githubLink: 'https://github.com/purviyeshi',
@@ -70,7 +65,8 @@ const OpenSourceList = [
         contributor: 'Abhinav Ananthu',
         repoName: 'Embox',
         repoIcon: 'https://avatars.githubusercontent.com/u/114341094?v=4',
-        description: 'Integrating TensorFlow Lite Micro with Embox RTOS to enable real-time ML inference on RISC-V and STM32 embedded systems.',
+        description:
+          'Integrating TensorFlow Lite Micro with Embox RTOS to enable real-time ML inference on RISC-V and STM32 embedded systems.',
         competition: 'OSPP',
         prLink: 'https://github.com/embox/embox/pull/3692',
         githubLink: 'https://github.com/herculoxz',
@@ -79,11 +75,21 @@ const OpenSourceList = [
         contributor: 'Shankari',
         repoName: 'Embox',
         repoIcon: 'https://avatars.githubusercontent.com/u/129577901?v=4',
-        description:'Enhancing Embox RTOS with Device Tree support for improved hardware abstraction, dynamic configuration, and maintainable bindings.',
+        description:
+          'Enhancing Embox RTOS with Device Tree support for improved hardware abstraction, dynamic configuration, and maintainable bindings.',
         competition: 'OSPP',
-        prLink:'https://github.com/embox/embox/pull/3755',
+        prLink: 'https://github.com/embox/embox/pull/3755',
         githubLink: 'https://github.com/Shankari02',
       },
+      {
+        contributor: 'Prithvi Tambewagh',
+        repoName: 'RTEMS',
+        repoIcon: 'https://avatars.githubusercontent.com/u/156917709?v=4',
+        description: 'Provide SPARC greth network drivers for LWIP',
+        competition: 'GSoC',
+        prLink: 'https://github.com/rkt-1597/GSoC-2025-Final-Report',
+        githubLink: 'https://github.com/rkt-1597',
+      },
     ],
   },
   {
@@ -114,7 +120,8 @@ const OpenSourceList = [
         contributor: 'Purva Yeshi',
         repoName: '',
         repoIcon: 'https://avatars.githubusercontent.com/u/129578264?v=4',
-        description: 'Creating a BSP for the BeagleV-Fire board, which is based on RISC-V architecture.',
+        description:
+          'Creating a BSP for the BeagleV-Fire board, which is based on RISC-V architecture.',
         competition: 'GSoC',
         prLink: '',
         githubLink: 'https://github.com/purviyeshi',
@@ -129,16 +136,14 @@ const OpenSourceList = [
         githubLink: 'https://github.com/advait-0',
       },
       {
-        
-          contributor: 'Suraj Sonawane',
-          repoName:'Embox',
-          repoIcon:'https://avatars.githubusercontent.com/u/129578177?v=4',
-          competition: 'OSPP',
-          description: 'Enhancing RISC-V support for Embox RTOS',
-          competition: 'OSPP',
-          prLink:'https://github.com/embox/embox/pull/3427',
-          githubLink: 'https://github.com/SurajSonawane2415',
-
+        contributor: 'Suraj Sonawane',
+        repoName: 'Embox',
+        repoIcon: 'https://avatars.githubusercontent.com/u/129578177?v=4',
+        competition: 'OSPP',
+        description: 'Enhancing RISC-V support for Embox RTOS',
+        competition: 'OSPP',
+        prLink: 'https://github.com/embox/embox/pull/3427',
+        githubLink: 'https://github.com/SurajSonawane2415',
       },
     ],
   },
@@ -160,7 +165,8 @@ const OpenSourceList = [
         contributor: 'Aryan Karawale',
         repoName: 'RTEMS',
         repoIcon: 'https://avatars.githubusercontent.com/u/111671667?v=4',
-        description: 'Refactors FDT handling for GPIO, IRQ, SPI, and QEP drivers to use a unified QEP driver structure.',
+        description:
+          'Refactors FDT handling for GPIO, IRQ, SPI, and QEP drivers to use a unified QEP driver structure.',
         competition: 'GSoC',
         prLink: 'https://github.com/Aryan-karawale/rtems',
         githubLink: 'https://github.com/Aryan-karawale',
@@ -169,7 +175,8 @@ const OpenSourceList = [
         contributor: 'Viraj Shah',
         repoName: 'LLVM',
         repoIcon: '',
-        description: 'Applies machine-guided compiler optimizations such as register allocation tuning and inlining to improve performance and reduce size.',
+        description:
+          'Applies machine-guided compiler optimizations such as register allocation tuning and inlining to improve performance and reduce size.',
         competition: 'GSoC',
         prLink: '',
         githubLink: '',
@@ -178,7 +185,8 @@ const OpenSourceList = [
         contributor: 'Advait Dharmorkar',
         repoName: 'OpenCV',
         repoIcon: 'https://avatars.githubusercontent.com/u/99654265?v=4',
-        description: 'Adds upstream support to integrate OpenCV as a plugin and enhance existing V4L2 functionality.',
+        description:
+          'Adds upstream support to integrate OpenCV as a plugin and enhance existing V4L2 functionality.',
         competition: 'GSoC',
         prLink: 'https://github.com/opencv/opencv/pull/27155',
         githubLink: 'https://github.com/advait-0',
@@ -187,7 +195,8 @@ const OpenSourceList = [
         contributor: 'Pratham Deshmukh',
         repoName: 'BeagleBoard',
         repoIcon: 'https://avatars.githubusercontent.com/u/99491133?v=4',
-        description: 'Focuses on accelerating deep learning workloads using APIs like OpenGL ES and Vulkan.',
+        description:
+          'Focuses on accelerating deep learning workloads using APIs like OpenGL ES and Vulkan.',
         competition: 'GSoC',
         prLink: '',
         githubLink: 'https://github.com/Pratham-Bot',
@@ -196,7 +205,8 @@ const OpenSourceList = [
         contributor: 'Krishna Narayanan',
         repoName: 'LLVM',
         repoIcon: 'https://avatars.githubusercontent.com/u/84722531?v=4',
-        description: 'Develops demonstrations for current robotics capabilities and conducts long-term research on adding C-language support to Zeus.',
+        description:
+          'Develops demonstrations for current robotics capabilities and conducts long-term research on adding C-language support to Zeus.',
         competition: 'GSoC',
         prLink: 'https://github.com/Krishna-13-cyber/GSoC23-LLVM',
         githubLink: 'https://github.com/Krishna-13-cyber',
@@ -210,7 +220,8 @@ const OpenSourceList = [
         contributor: 'Abhinav Venkatadri',
         repoName: 'INCF',
         repoIcon: 'https://avatars.githubusercontent.com/u/52126773?v=4',
-        description: 'INCF: eyetracker using deep learning with python+tensorflow/pytorch',
+        description:
+          'INCF: eyetracker using deep learning with python+tensorflow/pytorch',
         competition: 'GSoC',
         prLink: 'https://github.com/Abhinavvenkatadri/Eye-tracking-GSoC',
         githubLink: 'https://github.com/Abhinavvenkatadri',
@@ -219,9 +230,11 @@ const OpenSourceList = [
         contributor: 'Aniruddha Thakre',
         repoName: 'uccross',
         repoIcon: 'https://avatars.githubusercontent.com/u/84729149?v=4',
-        description: 'Genome Assembly and Annotation :Building a graphical interface for gene viewing and comparisons',
+        description:
+          'Genome Assembly and Annotation :Building a graphical interface for gene viewing and comparisons',
         competition: 'GSoC',
-        prLink: 'https://github.com/uccross/open-source-autonomous-vehicle-controller/pull/34',
+        prLink:
+          'https://github.com/uccross/open-source-autonomous-vehicle-controller/pull/34',
         githubLink: 'https://github.com/Aniruddha1261',
       },
       {
@@ -239,7 +252,7 @@ const OpenSourceList = [
         repoIcon: 'https://avatars.githubusercontent.com/u/41233856?v=4',
         description: 'The linux foundation : Arduino module based on zephyr',
         competition: 'GSoC',
-        prLink:'https://github.com/DhruvaG2000/Blog-GSoC22/blob/main/index.md',
+        prLink: 'https://github.com/DhruvaG2000/Blog-GSoC22/blob/main/index.md',
         githubLink: 'https://github.com/DhruvaG2000',
       },
       {
@@ -293,14 +306,16 @@ const OpenSourceList = [
         repoIcon: 'https://avatars.githubusercontent.com/u/83249996?v=4',
         description: 'libcamera: A GPU-based Software ISP implementation',
         competition: 'GSoC',
-        prLink: 'https://github.com/KunalA18/Gsoc_22_Final/blob/main/docs/index.md',
+        prLink:
+          'https://github.com/KunalA18/Gsoc_22_Final/blob/main/docs/index.md',
         githubLink: 'https://github.com/KunalA18',
       },
       {
         contributor: 'Kush Kothari',
         repoName: 'CERN',
         repoIcon: 'https://avatars.githubusercontent.com/u/53650538?v=4',
-        description: 'CERN-HSF|Princeton: Data analysis on large hadron collision data',
+        description:
+          'CERN-HSF|Princeton: Data analysis on large hadron collision data',
         competition: 'GSoC',
         prLink: 'https://github.com/CERN',
         githubLink: 'https://github.com/kkothari2001',
@@ -309,7 +324,8 @@ const OpenSourceList = [
         contributor: 'Neel Shah',
         repoName: 'CERN',
         repoIcon: 'https://avatars.githubusercontent.com/u/84740927?v=4',
-        description: 'CERN-HSF|ROOT project: ROOT-TMVA SOFIE Developments- Inference code generation for deep learning models',
+        description:
+          'CERN-HSF|ROOT project: ROOT-TMVA SOFIE Developments- Inference code generation for deep learning models',
         competition: 'GSoC',
         prLink: '',
         githubLink: 'https://github.com/Neel-Shah-29',
@@ -318,7 +334,8 @@ const OpenSourceList = [
         contributor: 'Om Sheladia',
         repoName: 'libssh',
         repoIcon: '',
-        description: 'libssh : Support for FIDO/U2F security keys on the client side',
+        description:
+          'libssh : Support for FIDO/U2F security keys on the client side',
         competition: 'GSoC',
         prLink: '',
         githubLink: '',
@@ -327,16 +344,19 @@ const OpenSourceList = [
         contributor: 'Pratham Shah',
         repoName: 'Forschungszentrum Julich',
         repoIcon: 'https://avatars.githubusercontent.com/u/82367556?v=4',
-        description: 'Forschungszentrum Julich (Heat) :RFI mitigation using 2D convolution and statistical estimators on memory-distributed data',
+        description:
+          'Forschungszentrum Julich (Heat) :RFI mitigation using 2D convolution and statistical estimators on memory-distributed data',
         competition: 'GSoC',
-        prLink: 'https://gist.github.com/shahpratham/73478f6f26873fe2f10c4446e3ab89d0',
+        prLink:
+          'https://gist.github.com/shahpratham/73478f6f26873fe2f10c4446e3ab89d0',
         githubLink: 'https://github.com/shahpratham',
       },
       {
         contributor: 'Rishikesh Donadkar',
         repoName: 'libcamera',
         repoIcon: '',
-        description: 'libcamera: Improve GStreamer elements to add support for properties like framerate and colorimetry in the libcamera GStreamer element.',
+        description:
+          'libcamera: Improve GStreamer elements to add support for properties like framerate and colorimetry in the libcamera GStreamer element.',
         competition: 'GSoC',
         prLink: '',
         githubLink: '',
@@ -354,7 +374,8 @@ const OpenSourceList = [
         contributor: 'Sarrah Bastawala',
         repoName: 'GNU Octave',
         repoIcon: 'https://avatars.githubusercontent.com/u/84874044?v=4',
-        description: 'GNU Octave : Make the ode15i,s DAE solvers more MATLAB-compatible and improve accuracy',
+        description:
+          'GNU Octave : Make the ode15i,s DAE solvers more MATLAB-compatible and improve accuracy',
         competition: 'GSoC',
         prLink: 'https://github.com/gnu-octave/octave/pull/20',
         githubLink: 'https://github.com/sarrah-basta',
@@ -381,7 +402,8 @@ const OpenSourceList = [
         contributor: 'Utkarsh Gandhi',
         repoName: 'GNOME Foundation',
         repoIcon: '',
-        description: 'GNOME Foundation | Nautilus : Revamp “New Document” submenu in GNOME Files',
+        description:
+          'GNOME Foundation | Nautilus : Revamp “New Document” submenu in GNOME Files',
         competition: 'GSoC',
         prLink: '',
         githubLink: '',
@@ -426,71 +448,70 @@ const OpenSourceList = [
   },
   {
     year: '2021',
-    contributions:[
-    {
-      contributor: 'Vedant Paranjape',
-      repoName: 'libcamera',
-      repoIcon: 'https://avatars.githubusercontent.com/u/22630228?v=4',
-      description: 'libcamera: Multistream support in GStreamer element',
-      competition: 'GSoC',
-      prLink: 'https://github.com/VedantParanjape/gsoc2021',
-      githubLink: 'https://github.com/VedantParanjape',
-    },
-    {
-      contributor: 'Omkar Bhilare',
-      repoName: 'BeagleBoard',
-      repoIcon: 'https://avatars.githubusercontent.com/u/40693854?v=4',
-      description: 'BeagleBoard: BeagleWire software',
-      competition: 'GSoC',
-      prLink: 'https://github.com/ombhilare999/GSoC-2021',
-      githubLink: 'https://github.com/ombhilare999',
-    },
-    {
-      contributor: 'Dhruva Gole',
-      repoName: 'BeagleBoard',
-      repoIcon: 'https://avatars.githubusercontent.com/u/41233856?v=4',
-      description: 'BeagleBoard: Bela support for BBAI / later chips',
-      competition: 'GSoC',
-      prLink: 'https://github.com/DhruvaG2000/Blog-GSoC21',
-      githubLink: 'https://github.com/DhruvaG2000',
-    },
-    {
-      contributor: 'Prathamesh Tagore',
-      repoName: 'Boostorg',
-      repoIcon: 'https://avatars.githubusercontent.com/u/63031630?v=4',
-      description: 'Boost: 2D convolution & correlation',
-      competition: 'GSoC',
-      prLink: 'https://github.com/boostorg/gil/pull/541',
-      githubLink: 'https://github.com/meshtag',
-    },
-    {
-      contributor: 'Kush Kothari',
-      repoName: 'Weecology',
-      repoIcon: 'https://avatars.githubusercontent.com/u/53650538?v=4',
-      description: 'Data Retriever: Adding spatial dataset support',
-      competition: 'GSoC',
-      prLink: 'https://github.com/weecology',
-      githubLink: 'https://github.com/kkothari2001',
-    },
-    {
-      contributor: 'Ninad Jangle',
-      repoName: 'FOSS Foundation',
-      repoIcon: 'https://avatars.githubusercontent.com/u/51434707?v=4',
-      description: 'FOSS Foundation: Block-based circuit design',
-      competition: 'GSoC',
-      prLink: 'https://github.com/ninja3011/Block_Based_Circuit_Design',
-      githubLink: 'https://github.com/ninja3011',
-    },
-    {
-      contributor: 'Shreyas Atre',
-      repoName: 'BeagleBoard',
-      repoIcon: 'https://avatars.githubusercontent.com/u/61797109?v=4',
-      description: 'BeagleBoard: Beagle config',
-      competition: 'GSoC',
-      prLink: 'https://github.com/SAtacker/bb-config',
-      githubLink: 'https://github.com/SAtacker',
-    },
-
+    contributions: [
+      {
+        contributor: 'Vedant Paranjape',
+        repoName: 'libcamera',
+        repoIcon: 'https://avatars.githubusercontent.com/u/22630228?v=4',
+        description: 'libcamera: Multistream support in GStreamer element',
+        competition: 'GSoC',
+        prLink: 'https://github.com/VedantParanjape/gsoc2021',
+        githubLink: 'https://github.com/VedantParanjape',
+      },
+      {
+        contributor: 'Omkar Bhilare',
+        repoName: 'BeagleBoard',
+        repoIcon: 'https://avatars.githubusercontent.com/u/40693854?v=4',
+        description: 'BeagleBoard: BeagleWire software',
+        competition: 'GSoC',
+        prLink: 'https://github.com/ombhilare999/GSoC-2021',
+        githubLink: 'https://github.com/ombhilare999',
+      },
+      {
+        contributor: 'Dhruva Gole',
+        repoName: 'BeagleBoard',
+        repoIcon: 'https://avatars.githubusercontent.com/u/41233856?v=4',
+        description: 'BeagleBoard: Bela support for BBAI / later chips',
+        competition: 'GSoC',
+        prLink: 'https://github.com/DhruvaG2000/Blog-GSoC21',
+        githubLink: 'https://github.com/DhruvaG2000',
+      },
+      {
+        contributor: 'Prathamesh Tagore',
+        repoName: 'Boostorg',
+        repoIcon: 'https://avatars.githubusercontent.com/u/63031630?v=4',
+        description: 'Boost: 2D convolution & correlation',
+        competition: 'GSoC',
+        prLink: 'https://github.com/boostorg/gil/pull/541',
+        githubLink: 'https://github.com/meshtag',
+      },
+      {
+        contributor: 'Kush Kothari',
+        repoName: 'Weecology',
+        repoIcon: 'https://avatars.githubusercontent.com/u/53650538?v=4',
+        description: 'Data Retriever: Adding spatial dataset support',
+        competition: 'GSoC',
+        prLink: 'https://github.com/weecology',
+        githubLink: 'https://github.com/kkothari2001',
+      },
+      {
+        contributor: 'Ninad Jangle',
+        repoName: 'FOSS Foundation',
+        repoIcon: 'https://avatars.githubusercontent.com/u/51434707?v=4',
+        description: 'FOSS Foundation: Block-based circuit design',
+        competition: 'GSoC',
+        prLink: 'https://github.com/ninja3011/Block_Based_Circuit_Design',
+        githubLink: 'https://github.com/ninja3011',
+      },
+      {
+        contributor: 'Shreyas Atre',
+        repoName: 'BeagleBoard',
+        repoIcon: 'https://avatars.githubusercontent.com/u/61797109?v=4',
+        description: 'BeagleBoard: Beagle config',
+        competition: 'GSoC',
+        prLink: 'https://github.com/SAtacker/bb-config',
+        githubLink: 'https://github.com/SAtacker',
+      },
     ],
   },
 ];
diff --git a/data/senate.js b/data/senate.js
deleted file mode 100644
index 97ba6015..00000000
--- a/data/senate.js
+++ /dev/null
@@ -1,230 +0,0 @@
-const SenateList = [
-  {
-    name: 'Atharva Kashalkar',
-    imgName: 'Team/2026/atharva_kashalkar.jpg',
-    sub: (
-      <>
-        General Secretary <br />
-        B.Tech Electronics ' 26
-      </>
-    ),
-    linkedInLink:
-      'https://www.linkedin.com/in/atharva-kashalkar-19598a297?utm_source=share&utm_campaign=share_via&utm_content=profile&utm_medium=android_app',
-    githubLink: 'https://github.com/RapidRoger18',
-  },
-  {
-    name: 'Shankari Anandakrishnan',
-    imgName: 'Team/2026/Shankari.jpg',
-    sub: (
-      <>
-        Jt. General Secretary <br />
-        B.Tech Electronics and Telecommunication ' 26
-      </>
-    ),
-    linkedInLink: 'https://www.linkedin.com/in/shankari-anand/',
-    githubLink: 'https://github.com/Shankari02',
-  },
-  {
-    name: 'Atharva Atre',
-    imgName: 'Team/2026/Atharva Atre.jpg',
-    sub: (
-      <>
-        Jt. General Secretary <br />
-        B.Tech Electronics ' 26
-      </>
-    ),
-    linkedInLink: 'https://www.linkedin.com/in/atharva-atre-817694252/',
-    githubLink: 'https://github.com/AtharvaAtre',
-  },
-  {
-    name: 'Atharv Shailesh Patil',
-    imgName: 'Team/2026/atharva_patil.webp',
-    sub: (
-      <>
-        Electronics head <br />
-        B.Tech Electronics ' 26
-      </>
-    ),
-    linkedInLink: 'https://www.linkedin.com/in/atharv-patil-a43264304/',
-    githubLink: 'https://github.com/Atharv1035',
-  },
-  {
-    name: 'Sarvesh Patki',
-    imgName: 'Team/2026/_storage_emulated_0_DCIM_Camera_Sarvesh_Patki.jpg',
-    sub: (
-      <>
-        Mechanical head <br />
-        B.Tech Mechanical ' 26
-      </>
-    ),
-    linkedInLink: 'https://www.linkedin.com/in/sarvesh-patki-873b10282',
-    githubLink: 'https://github.com/skybirdsgp',
-  },
-  {
-    name: 'Saish Karole',
-    imgName: 'Team/2026/Saish_Karole.jpg',
-    sub: (
-      <>
-        Sponsorship head <br />
-        B.Tech Electronics ' 26
-      </>
-    ),
-    linkedInLink: 'https://www.linkedin.com/in/saish-karole',
-    githubLink: 'https://github.com/nachtspyder04',
-  },
-  {
-    name: 'Aditya Vivekanand',
-    imgName: 'Team/2026/Aditya_Vivekanand.jpeg',
-    sub: (
-      <>
-        Marketing head <br />
-        B.Tech Electronics and Telecommunication ' 26
-      </>
-    ),
-    linkedInLink:
-      'https://www.linkedin.com/in/aditya-vivekanand-929693221?utm_source=share&utm_campaign=share_via&utm_content=profile&utm_medium=ios_app',
-    githubLink: 'https://github.com/adityavivekanand',
-  },
-  {
-    name: 'Anish Mahadevan',
-    imgName: 'Team/2026/Anish_Mahadevan.jpg',
-    sub: (
-      <>
-        Marketing head <br />
-        B.Tech Electronics ' 26
-      </>
-    ),
-    linkedInLink: 'https://www.linkedin.com/in/anish-mahadevan/',
-    githubLink: 'https://github.com/Faulty404',
-  },
-  {
-    name: 'Atharv Dubey',
-    imgName: 'Team/2026/Atharv_Dubey.jpeg',
-    sub: (
-      <>
-        TY Core
-        <br />
-        B.Tech Electronics and Telecommunication ' 26
-      </>
-    ),
-    linkedInLink: 'https://www.linkedin.com/in/atharv-dubey-10103b24a/',
-    githubLink: 'https://github.com/DoobyDoPap/',
-  },
-  {
-    name: 'Abhinav Ananthu',
-    imgName: 'Team/2026/Abhinav_ananthu.jpg',
-    sub: (
-      <>
-        TY Core
-        <br />
-        B.Tech Electronics and Telecommunication ' 26
-      </>
-    ),
-    linkedInLink: 'https://www.linkedin.com/in/abhinav-ananthu-005a23263/',
-    githubLink: 'https://github.com/herculoxz',
-  },
-  {
-    name: 'Aryan Nanda',
-    imgName: 'Team/2026/Aryan Nanda.jpg',
-    sub: (
-      <>
-        TY Core
-        <br />
-        B.Tech Computer Science ' 26
-      </>
-    ),
-    linkedInLink: 'https://www.linkedin.com/in/aryan-nanda-25b32224b/',
-    githubLink: 'https://github.com/AryanNanda17',
-  },
-  {
-    name: 'Purva Sunil Yeshi',
-    imgName: 'Team/2026/Purva_Yeshi.jpg',
-    sub: (
-      <>
-        Core member
-        <br />
-        B.Tech Electronics and Telecommunication ' 26
-      </>
-    ),
-    linkedInLink: 'https://www.linkedin.com/in/purva-yeshi-6491021a1',
-    githubLink: 'https://github.com/purviyeshi',
-  },
-  {
-    name: 'Suraj Sonawane',
-    imgName: 'Team/2026/Suraj Sonawane.jpg',
-    sub: (
-      <>
-        Core member
-        <br />
-        B.Tech Electronics and Telecommunication ' 26
-      </>
-    ),
-    linkedInLink: 'https://www.linkedin.com/in/suraj-sonawane-aba34b231',
-    githubLink: 'https://github.com/SurajSonawane2415',
-  },
-  {
-    name: 'Mahesh Tupe ',
-    imgName: 'Team/2025/Mahesh_Tupe_25.jpg',
-    sub: <>B.Tech Textile ' 25</>,
-    linkedInLink: 'https://www.linkedin.com/in/mahesh-tupe-879393243/',
-    githubLink: 'https://github.com/Asc91',
-  },
-  {
-    name: 'Zain Siddavatam',
-    imgName: 'Team/2025/Zain_Siddavatam_25.jpeg',
-    sub: <>B.Tech Electrical ' 25</>,
-    linkedInLink: 'https://www.linkedin.com/in/zain-siddavatam/',
-    githubLink: 'https://github.com/SuperChamp234',
-  },
-  {
-    name: 'Alqama Shaikh',
-    imgName: 'Team/2025/Alqama_Shaikh_25.jpeg',
-    sub: <>B.Tech Mechanical ' 25</>,
-    linkedInLink: 'https://www.linkedin.com/in/mohd-alqama-shaikh-636587229/',
-    githubLink: 'https://github.com/aPR0T0',
-  },
-  {
-    name: 'Harsh Bhosale',
-    imgName: 'Team/2025/Harsh.jpeg',
-    sub: <>B.Tech Electronics ' 25</>,
-    linkedInLink: 'https://in.linkedin.com/in/hsbh/',
-    githubLink: 'https://github.com/harshbhosale01',
-  },
-  {
-    name: 'Janhavi Deshpande',
-    imgName: 'Team/2025/Janhavi.jpg',
-    sub: <>B.Tech Mechanical ' 25</>,
-    linkedInLink: 'https://in.linkedin.com/in/janhavi-deshpande-a104b8238/',
-    githubLink: 'https://github.com/janhavi1803',
-  },
-  {
-    name: 'Advait Dhamorikar',
-    imgName: 'Team/2025/Advait.jpg',
-    sub: <>B.Tech Electrical ' 25</>,
-    linkedInLink: 'https://in.linkedin.com/in/advait-dhamorikar/',
-    githubLink: 'https://github.com/advait-0',
-  },
-  {
-    name: 'Vaidic Gupta',
-    imgName: 'Team/2025/Vaidic.JPG',
-    sub: <>B.Tech Electrical ' 25</>,
-    linkedInLink: 'https://in.linkedin.com/in/vaidic-gupta-605257230/',
-    githubLink: 'https://github.com/Vaidicgupta',
-  },
-  {
-    name: 'Pratham Deshmukh',
-    imgName: 'Team/2025/Pratham.jpg',
-    sub: <>B.Tech Electrical ' 25</>,
-    linkedInLink: 'https://www.linkedin.com/in/pratham-deshmukh-a027a7227/',
-    githubLink: 'https://github.com/Pratham-Bot',
-  },
-  {
-    name: 'Aryan Karawale',
-    imgName: 'Team/2025/Aryan.jpg',
-    sub: <>B.Tech Electronics & Telecommunication ' 25</>,
-    linkedInLink: 'https://www.linkedin.com/in/aryan-karawale-54b6b7233/',
-    githubLink: 'https://github.com/Aryan-karawale',
-  },
-];
-
-export default SenateList;
diff --git a/pages/teams/alumni.js b/pages/alumni.js
similarity index 77%
rename from pages/teams/alumni.js
rename to pages/alumni.js
index 3d71090e..6b79de1d 100644
--- a/pages/teams/alumni.js
+++ b/pages/alumni.js
@@ -1,4 +1,4 @@
-import Alumni from '../../components/Teams/Alumni/Alumni';
+import Alumni from '../components/Alumni/Alumni';
 import Head from 'next/head';
 
 const AlumniPage = () => {
diff --git a/pages/teams/opensource.js b/pages/opensource.js
similarity index 75%
rename from pages/teams/opensource.js
rename to pages/opensource.js
index e0f15cd6..285fcdb9 100644
--- a/pages/teams/opensource.js
+++ b/pages/opensource.js
@@ -1,4 +1,4 @@
-import OpenSource from '../../components/Teams/Opensource/Opensource';
+import OpenSource from '../components/Opensource/Opensource';
 import Head from 'next/head';
 
 const OpenSourcePage = () => {
diff --git a/pages/teams/current.js b/pages/teams/current.js
deleted file mode 100644
index 1dc41c37..00000000
--- a/pages/teams/current.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import Current from '../../components/Teams/Current/Current';
-import Head from 'next/head';
-
-const CurrentPage = () => {
-  return (
-    <>
-      <Head>
-        <title>Current Team | SRA VJTI</title>
-      </Head>
-      <Current />
-    </>
-  );
-};
-
-export default CurrentPage;
diff --git a/pages/teams/index.js b/pages/teams/index.js
deleted file mode 100644
index 584daad1..00000000
--- a/pages/teams/index.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import TeamsIndex from '../../components/Teams/TeamSelection/TeamsIndex';
-import Head from 'next/head';
-
-const TeamsPage = () => {
-  return (
-    <>
-      <Head>
-        <title>Team | SRA VJTI</title>
-      </Head>
-      <TeamsIndex />
-    </>
-  );
-};
-
-export default TeamsPage;
diff --git a/pages/teams/teacherincharge.js b/pages/teams/teacherincharge.js
deleted file mode 100644
index 84cc6712..00000000
--- a/pages/teams/teacherincharge.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import TeacherIncharge from '../../components/Teams/TeacherIncharge/TeacherIncharge';
-import Head from 'next/head';
-
-const TeacherInchargePage = () => {
-  return (
-    <>
-      <Head>
-        <title>Teachers Incharge | SRA VJTI</title>
-      </Head>
-      <TeacherIncharge />
-    </>
-  );
-};
-
-export default TeacherInchargePage;