diff --git a/app/admin/page.tsx b/app/admin/page.tsx
index e8b52b0..bd3248e 100644
--- a/app/admin/page.tsx
+++ b/app/admin/page.tsx
@@ -2,8 +2,8 @@ import { redirect } from "next/navigation";
 import { auth } from "@/lib/auth";
 import { sitePreferencesService } from "@/services/preferences/site-preferences.service";
 import { Role } from "@/prisma/generated/prisma/client";
-import NavigationWrapper from "@/components/NavigationWrapper";
-import AdminPanel from "@/components/AdminPanel";
+import NavigationWrapper from "@/components/navigation/NavigationWrapper";
+import AdminPanel from "@/components/admin/AdminPanel";
 
 export const dynamic = "force-dynamic";
 
diff --git a/app/admin/style-guide/page.tsx b/app/admin/style-guide/page.tsx
index 765e1c1..858d2b3 100644
--- a/app/admin/style-guide/page.tsx
+++ b/app/admin/style-guide/page.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { useState } from "react";
-import Navigation from "@/components/Navigation";
+import Navigation from "@/components/navigation/Navigation";
 import {
   Button,
   Input,
diff --git a/app/events/page.tsx b/app/events/page.tsx
index 9feab53..54ccc00 100644
--- a/app/events/page.tsx
+++ b/app/events/page.tsx
@@ -1,5 +1,5 @@
-import NavigationWrapper from "@/components/NavigationWrapper";
-import EventsPageSection from "@/components/EventsPageSection";
+import NavigationWrapper from "@/components/navigation/NavigationWrapper";
+import EventsPageSection from "@/components/events/EventsPageSection";
 import { eventService } from "@/services/events/event.service";
 import { eventRegistrationService } from "@/services/events/event-registration.service";
 import { getBackgroundImage } from "@/lib/preferences";
diff --git a/app/feedback/[eventId]/FeedbackPageClient.tsx b/app/feedback/[eventId]/FeedbackPageClient.tsx
index 12d270a..aec711c 100644
--- a/app/feedback/[eventId]/FeedbackPageClient.tsx
+++ b/app/feedback/[eventId]/FeedbackPageClient.tsx
@@ -3,7 +3,7 @@
 import { useState, useEffect, useTransition, type FormEvent } from "react";
 import { useSession } from "next-auth/react";
 import { useRouter, useParams } from "next/navigation";
-import Navigation from "@/components/Navigation";
+import Navigation from "@/components/navigation/Navigation";
 import { createFeedback } from "@/actions/events/feedback";
 import {
   StarRating,
diff --git a/app/layout.tsx b/app/layout.tsx
index 51f2691..d88dd2a 100644
--- a/app/layout.tsx
+++ b/app/layout.tsx
@@ -2,7 +2,7 @@ import type { Metadata } from "next";
 import type { ReactNode } from "react";
 import { Orbitron, Rajdhani } from "next/font/google";
 import "./globals.css";
-import SessionProvider from "@/components/SessionProvider";
+import SessionProvider from "@/components/layout/SessionProvider";
 
 const orbitron = Orbitron({
   subsets: ["latin"],
diff --git a/app/leaderboard/page.tsx b/app/leaderboard/page.tsx
index f65bd43..1df4dbb 100644
--- a/app/leaderboard/page.tsx
+++ b/app/leaderboard/page.tsx
@@ -1,5 +1,5 @@
-import NavigationWrapper from "@/components/NavigationWrapper";
-import LeaderboardSection from "@/components/LeaderboardSection";
+import NavigationWrapper from "@/components/navigation/NavigationWrapper";
+import LeaderboardSection from "@/components/leaderboard/LeaderboardSection";
 import { userStatsService } from "@/services/users/user-stats.service";
 import { getBackgroundImage } from "@/lib/preferences";
 
diff --git a/app/login/page.tsx b/app/login/page.tsx
index 3d77513..fc31174 100644
--- a/app/login/page.tsx
+++ b/app/login/page.tsx
@@ -4,7 +4,7 @@ import { useState, type FormEvent } from "react";
 import { signIn } from "next-auth/react";
 import { useRouter } from "next/navigation";
 import Link from "next/link";
-import Navigation from "@/components/Navigation";
+import Navigation from "@/components/navigation/Navigation";
 import {
   Input,
   Button,
diff --git a/app/page.tsx b/app/page.tsx
index 896fbd3..1a0311e 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -1,6 +1,6 @@
-import NavigationWrapper from "@/components/NavigationWrapper";
-import HeroSection from "@/components/HeroSection";
-import EventsSection from "@/components/EventsSection";
+import NavigationWrapper from "@/components/navigation/NavigationWrapper";
+import HeroSection from "@/components/layout/HeroSection";
+import EventsSection from "@/components/events/EventsSection";
 import { eventService } from "@/services/events/event.service";
 import { getBackgroundImage } from "@/lib/preferences";
 
diff --git a/app/profile/page.tsx b/app/profile/page.tsx
index 0e6790c..dbaab1e 100644
--- a/app/profile/page.tsx
+++ b/app/profile/page.tsx
@@ -2,8 +2,8 @@ import { redirect } from "next/navigation";
 import { auth } from "@/lib/auth";
 import { userService } from "@/services/users/user.service";
 import { getBackgroundImage } from "@/lib/preferences";
-import NavigationWrapper from "@/components/NavigationWrapper";
-import ProfileForm from "@/components/ProfileForm";
+import NavigationWrapper from "@/components/navigation/NavigationWrapper";
+import ProfileForm from "@/components/profile/ProfileForm";
 
 export default async function ProfilePage() {
   const session = await auth();
diff --git a/app/register/page.tsx b/app/register/page.tsx
index 07bfe79..bfcebfd 100644
--- a/app/register/page.tsx
+++ b/app/register/page.tsx
@@ -3,7 +3,7 @@
 import { useState, useRef, type ChangeEvent, type FormEvent } from "react";
 import { useRouter } from "next/navigation";
 import Link from "next/link";
-import Navigation from "@/components/Navigation";
+import Navigation from "@/components/navigation/Navigation";
 import {
   Avatar,
   Input,
diff --git a/components/AdminPanel.tsx b/components/admin/AdminPanel.tsx
similarity index 93%
rename from components/AdminPanel.tsx
rename to components/admin/AdminPanel.tsx
index 960b3fb..d5e7ae4 100644
--- a/components/AdminPanel.tsx
+++ b/components/admin/AdminPanel.tsx
@@ -2,10 +2,10 @@
 
 import { useState } from "react";
 import Link from "next/link";
-import UserManagement from "@/components/UserManagement";
-import EventManagement from "@/components/EventManagement";
-import FeedbackManagement from "@/components/FeedbackManagement";
-import BackgroundPreferences from "@/components/BackgroundPreferences";
+import UserManagement from "@/components/admin/UserManagement";
+import EventManagement from "@/components/admin/EventManagement";
+import FeedbackManagement from "@/components/admin/FeedbackManagement";
+import BackgroundPreferences from "@/components/admin/BackgroundPreferences";
 import { Button, Card, SectionTitle } from "@/components/ui";
 
 interface SitePreferences {
diff --git a/components/BackgroundPreferences.tsx b/components/admin/BackgroundPreferences.tsx
similarity index 99%
rename from components/BackgroundPreferences.tsx
rename to components/admin/BackgroundPreferences.tsx
index d7ed931..126063d 100644
--- a/components/BackgroundPreferences.tsx
+++ b/components/admin/BackgroundPreferences.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { useState, useEffect, useMemo } from "react";
-import ImageSelector from "@/components/ImageSelector";
+import ImageSelector from "@/components/layout/ImageSelector";
 import { updateSitePreferences } from "@/actions/admin/preferences";
 import { Button, Card } from "@/components/ui";
 
diff --git a/components/EventManagement.tsx b/components/admin/EventManagement.tsx
similarity index 100%
rename from components/EventManagement.tsx
rename to components/admin/EventManagement.tsx
diff --git a/components/FeedbackManagement.tsx b/components/admin/FeedbackManagement.tsx
similarity index 100%
rename from components/FeedbackManagement.tsx
rename to components/admin/FeedbackManagement.tsx
diff --git a/components/UserManagement.tsx b/components/admin/UserManagement.tsx
similarity index 100%
rename from components/UserManagement.tsx
rename to components/admin/UserManagement.tsx
diff --git a/components/EventsPageSection.tsx b/components/events/EventsPageSection.tsx
similarity index 99%
rename from components/EventsPageSection.tsx
rename to components/events/EventsPageSection.tsx
index 1c61f8f..6b39083 100644
--- a/components/EventsPageSection.tsx
+++ b/components/events/EventsPageSection.tsx
@@ -4,7 +4,7 @@ import { useState, useEffect, useMemo, useRef, useTransition } from "react";
 import { useSession } from "next-auth/react";
 import { useRouter } from "next/navigation";
 import { calculateEventStatus } from "@/lib/eventStatus";
-import FeedbackModal from "@/components/FeedbackModal";
+import FeedbackModal from "@/components/feedback/FeedbackModal";
 import {
   registerForEvent,
   unregisterFromEvent,
diff --git a/components/EventsSection.tsx b/components/events/EventsSection.tsx
similarity index 100%
rename from components/EventsSection.tsx
rename to components/events/EventsSection.tsx
diff --git a/components/FeedbackModal.tsx b/components/feedback/FeedbackModal.tsx
similarity index 100%
rename from components/FeedbackModal.tsx
rename to components/feedback/FeedbackModal.tsx
diff --git a/components/HeroSection.tsx b/components/layout/HeroSection.tsx
similarity index 100%
rename from components/HeroSection.tsx
rename to components/layout/HeroSection.tsx
diff --git a/components/ImageSelector.tsx b/components/layout/ImageSelector.tsx
similarity index 100%
rename from components/ImageSelector.tsx
rename to components/layout/ImageSelector.tsx
diff --git a/components/SessionProvider.tsx b/components/layout/SessionProvider.tsx
similarity index 100%
rename from components/SessionProvider.tsx
rename to components/layout/SessionProvider.tsx
diff --git a/components/Leaderboard.tsx b/components/leaderboard/Leaderboard.tsx
similarity index 100%
rename from components/Leaderboard.tsx
rename to components/leaderboard/Leaderboard.tsx
diff --git a/components/LeaderboardSection.tsx b/components/leaderboard/LeaderboardSection.tsx
similarity index 100%
rename from components/LeaderboardSection.tsx
rename to components/leaderboard/LeaderboardSection.tsx
diff --git a/components/Navigation.tsx b/components/navigation/Navigation.tsx
similarity index 99%
rename from components/Navigation.tsx
rename to components/navigation/Navigation.tsx
index d938577..9a8d0de 100644
--- a/components/Navigation.tsx
+++ b/components/navigation/Navigation.tsx
@@ -4,7 +4,7 @@ import Link from "next/link";
 import { useSession, signOut } from "next-auth/react";
 import { useState } from "react";
 import { usePathname } from "next/navigation";
-import PlayerStats from "./PlayerStats";
+import PlayerStats from "@/components/profile/PlayerStats";
 import { Button } from "@/components/ui";
 
 interface UserData {
diff --git a/components/NavigationWrapper.tsx b/components/navigation/NavigationWrapper.tsx
similarity index 100%
rename from components/NavigationWrapper.tsx
rename to components/navigation/NavigationWrapper.tsx
diff --git a/components/PlayerStats.tsx b/components/profile/PlayerStats.tsx
similarity index 100%
rename from components/PlayerStats.tsx
rename to components/profile/PlayerStats.tsx
diff --git a/components/ProfileForm.tsx b/components/profile/ProfileForm.tsx
similarity index 100%
rename from components/ProfileForm.tsx
rename to components/profile/ProfileForm.tsx