diff --git a/app/@modal/(.)account/sign-in/page.tsx b/app/@modal/(.)account/sign-in/page.tsx
index 9e21b33..2a0d09c 100644
--- a/app/@modal/(.)account/sign-in/page.tsx
+++ b/app/@modal/(.)account/sign-in/page.tsx
@@ -1,5 +1,5 @@
 "use client";
-import SignInButton from "@/components/SignInButton";
+import SignInButton from "@/components/common/SignInButton";
 import {
   FloatingFocusManager,
   FloatingOverlay,
diff --git a/app/@modal/(.)schedule/event-groups/[alias]/export/page.tsx b/app/@modal/(.)schedule/event-groups/[alias]/export/page.tsx
index b6dfd9c..3b8670a 100644
--- a/app/@modal/(.)schedule/event-groups/[alias]/export/page.tsx
+++ b/app/@modal/(.)schedule/event-groups/[alias]/export/page.tsx
@@ -1,6 +1,6 @@
 "use client";
-import Calendar from "@/components/Calendar";
-import ScheduleLinkCopy from "@/components/ScheduleLinkCopy";
+import Calendar from "@/components/common/calendar/Calendar";
+import ScheduleLinkCopy from "@/components/schedule/ScheduleLinkCopy";
 import {
   getICSLink,
   useEventGroupsFindEventGroupByAlias,
diff --git a/app/@modal/(.)schedule/event-groups/[alias]/page.tsx b/app/@modal/(.)schedule/event-groups/[alias]/page.tsx
index d016ef8..1ec8495 100644
--- a/app/@modal/(.)schedule/event-groups/[alias]/page.tsx
+++ b/app/@modal/(.)schedule/event-groups/[alias]/page.tsx
@@ -1,7 +1,7 @@
 "use client";
-import Calendar from "@/components/Calendar";
-import ExportButton from "@/components/ExportButton";
-import FavoriteButton from "@/components/FavoriteButton";
+import Calendar from "@/components/common/calendar/Calendar";
+import ExportButton from "@/components/schedule/ExportButton";
+import FavoriteButton from "@/components/schedule/group-card/FavoriteButton";
 import {
   getICSLink,
   useEventGroupsFindEventGroupByAlias,
diff --git a/app/dashboard/page.tsx b/app/dashboard/page.tsx
index b3f5f63..4780fd0 100644
--- a/app/dashboard/page.tsx
+++ b/app/dashboard/page.tsx
@@ -1,7 +1,7 @@
 "use client";
-import Calendar from "@/components/Calendar";
-import { GroupCard } from "@/components/GroupCard";
-import SignInButton from "@/components/SignInButton";
+import Calendar from "@/components/common/calendar/Calendar";
+import { GroupCard } from "@/components/schedule/group-card/GroupCard";
+import SignInButton from "@/components/common/SignInButton";
 import {
   getICSLink,
   UserXFavoriteGroupView,
diff --git a/app/dashboard/template.tsx b/app/dashboard/template.tsx
index fd145c3..164338e 100644
--- a/app/dashboard/template.tsx
+++ b/app/dashboard/template.tsx
@@ -1,4 +1,4 @@
-import { NavbarTemplate } from "@/components/Navbar";
+import { NavbarTemplate } from "@/components/layout/Navbar";
 
 export default function Template({ children }: React.PropsWithChildren) {
   return (
diff --git a/app/layout.tsx b/app/layout.tsx
index e810d08..d295c98 100755
--- a/app/layout.tsx
+++ b/app/layout.tsx
@@ -1,6 +1,6 @@
 import Providers from "@/app/providers";
 import ThemedHtml from "@/app/theme";
-import Sidebar from "@/components/Sidebar";
+import Sidebar from "@/components/layout/Sidebar";
 import GoogleAnalytics from "@/lib/tracking/GoogleAnalytics";
 import UserInfoTracker from "@/lib/tracking/UserInfoTracker";
 import YandexMetrika from "@/lib/tracking/YandexMetrika";
diff --git a/app/schedule/[category]/page.tsx b/app/schedule/[category]/page.tsx
index 25128ce..a01449a 100755
--- a/app/schedule/[category]/page.tsx
+++ b/app/schedule/[category]/page.tsx
@@ -1,5 +1,5 @@
-import { NavbarTemplate } from "@/components/Navbar";
-import ScheduleList from "@/components/ScheduleList";
+import { NavbarTemplate } from "@/components/layout/Navbar";
+import ScheduleList from "@/components/schedule/ScheduleList";
 import { getCategoryInfoBySlug, viewConfig } from "@/lib/events-view-config";
 import { Metadata, ResolvingMetadata } from "next";
 import { notFound } from "next/navigation";
diff --git a/app/schedule/event-groups/[alias]/page.tsx b/app/schedule/event-groups/[alias]/page.tsx
index 96ad7dc..1b55787 100644
--- a/app/schedule/event-groups/[alias]/page.tsx
+++ b/app/schedule/event-groups/[alias]/page.tsx
@@ -1,8 +1,8 @@
 "use client";
-import Calendar from "@/components/Calendar";
-import ExportButton from "@/components/ExportButton";
-import FavoriteButton from "@/components/FavoriteButton";
-import { NavbarTemplate } from "@/components/Navbar";
+import Calendar from "@/components/common/calendar/Calendar";
+import ExportButton from "@/components/schedule/ExportButton";
+import FavoriteButton from "@/components/schedule/group-card/FavoriteButton";
+import { NavbarTemplate } from "@/components/layout/Navbar";
 import {
   getICSLink,
   useEventGroupsFindEventGroupByAlias,
diff --git a/app/schedule/page.tsx b/app/schedule/page.tsx
index ce5f329..a417023 100755
--- a/app/schedule/page.tsx
+++ b/app/schedule/page.tsx
@@ -1,7 +1,7 @@
-import CategoryContainer from "@/components/CategoryContainer";
-import ClarificationContainer from "@/components/ClarificationContainer";
-import { DashboardButton } from "@/components/DashboardButton";
-import { NavbarTemplate } from "@/components/Navbar";
+import CategoryContainer from "@/components/schedule/CategoryContainer";
+import ClarificationContainer from "@/components/schedule/ClarificationContainer";
+import { DashboardButton } from "@/components/schedule/DashboardButton";
+import { NavbarTemplate } from "@/components/layout/Navbar";
 
 export default function Page() {
   return (
diff --git a/app/scholarship/page.tsx b/app/scholarship/page.tsx
index a32808c..46e2b81 100644
--- a/app/scholarship/page.tsx
+++ b/app/scholarship/page.tsx
@@ -3,8 +3,8 @@ import { ScholarshipBmin } from "@/components/icons/ScholarshipBmin";
 import { ScholarshipFormula } from "@/components/icons/ScholarshipFormula";
 import { ScholarshipGPA } from "@/components/icons/ScholarshipGPA";
 import { ScholarshipS } from "@/components/icons/ScholarshipS";
-import { NavbarTemplate } from "@/components/Navbar";
-import ScholarshipCalculator from "@/components/ScholarshipCalculator";
+import { NavbarTemplate } from "@/components/layout/Navbar";
+import ScholarshipCalculator from "@/components/scholarship/ScholarshipCalculator";
 
 export default function Page() {
   return (
diff --git a/components/SignInButton.tsx b/components/common/SignInButton.tsx
similarity index 100%
rename from components/SignInButton.tsx
rename to components/common/SignInButton.tsx
diff --git a/components/Tooltip.tsx b/components/common/Tooltip.tsx
similarity index 100%
rename from components/Tooltip.tsx
rename to components/common/Tooltip.tsx
diff --git a/components/Calendar.tsx b/components/common/calendar/Calendar.tsx
similarity index 98%
rename from components/Calendar.tsx
rename to components/common/calendar/Calendar.tsx
index e3c3c85..9b1524b 100644
--- a/components/Calendar.tsx
+++ b/components/common/calendar/Calendar.tsx
@@ -1,5 +1,5 @@
 "use client";
-import CalendarEventPopover from "@/components/CalendarEventPopover";
+import CalendarEventPopover from "@/components/common/calendar/CalendarEventPopover";
 import { EventApi, EventContentArg } from "@fullcalendar/core";
 import dayGridPlugin from "@fullcalendar/daygrid";
 import interactionPlugin from "@fullcalendar/interaction";
diff --git a/components/CalendarEventPopover.tsx b/components/common/calendar/CalendarEventPopover.tsx
similarity index 100%
rename from components/CalendarEventPopover.tsx
rename to components/common/calendar/CalendarEventPopover.tsx
diff --git a/components/iCalendarPlugin/event-source-def.ts b/components/common/calendar/iCalendarPlugin/event-source-def.ts
similarity index 100%
rename from components/iCalendarPlugin/event-source-def.ts
rename to components/common/calendar/iCalendarPlugin/event-source-def.ts
diff --git a/components/iCalendarPlugin/ical-expander/IcalExpander.js b/components/common/calendar/iCalendarPlugin/ical-expander/IcalExpander.js
similarity index 100%
rename from components/iCalendarPlugin/ical-expander/IcalExpander.js
rename to components/common/calendar/iCalendarPlugin/ical-expander/IcalExpander.js
diff --git a/components/iCalendarPlugin/index.global.ts b/components/common/calendar/iCalendarPlugin/index.global.ts
similarity index 100%
rename from components/iCalendarPlugin/index.global.ts
rename to components/common/calendar/iCalendarPlugin/index.global.ts
diff --git a/components/iCalendarPlugin/index.ts b/components/common/calendar/iCalendarPlugin/index.ts
similarity index 100%
rename from components/iCalendarPlugin/index.ts
rename to components/common/calendar/iCalendarPlugin/index.ts
diff --git a/components/Navbar.tsx b/components/layout/Navbar.tsx
similarity index 81%
rename from components/Navbar.tsx
rename to components/layout/Navbar.tsx
index f44728a..f48d281 100644
--- a/components/Navbar.tsx
+++ b/components/layout/Navbar.tsx
@@ -1,6 +1,6 @@
-import { SidebarMenuButton } from "@/components/Sidebar";
-import SwitchThemeButton from "@/components/SwitchThemeButton";
-import UserMenu from "@/components/UserMenu";
+import { SidebarMenuButton } from "@/components/layout/Sidebar";
+import SwitchThemeButton from "@/components/layout/SwitchThemeButton";
+import UserMenu from "@/components/layout/UserMenu";
 import clsx from "clsx";
 
 export function Navbar({
diff --git a/components/Sidebar.tsx b/components/layout/Sidebar.tsx
old mode 100755
new mode 100644
similarity index 97%
rename from components/Sidebar.tsx
rename to components/layout/Sidebar.tsx
index 09a2a8e..d56daa1
--- a/components/Sidebar.tsx
+++ b/components/layout/Sidebar.tsx
@@ -1,13 +1,13 @@
 "use client";
-import SwitchThemeButton from "@/components/SwitchThemeButton";
-import UserMenu from "@/components/UserMenu";
+import SwitchThemeButton from "@/components/layout/SwitchThemeButton";
+import UserMenu from "@/components/layout/UserMenu";
 import { useUsersGetMe } from "@/lib/events";
 import clsx from "clsx";
 import Link from "next/link";
 import { usePathname } from "next/navigation";
 import React, { useState } from "react";
 import { useMediaQuery } from "usehooks-ts";
-import Logo from "./icons/Logo";
+import Logo from "../icons/Logo";
 import SidebarSection from "./SidebarSection";
 
 type Item = {
diff --git a/components/SidebarSection.tsx b/components/layout/SidebarSection.tsx
old mode 100755
new mode 100644
similarity index 96%
rename from components/SidebarSection.tsx
rename to components/layout/SidebarSection.tsx
index 3ed9cad..dfbbb0e
--- a/components/SidebarSection.tsx
+++ b/components/layout/SidebarSection.tsx
@@ -1,4 +1,4 @@
-import Tooltip from "@/components/Tooltip";
+import Tooltip from "@/components/common/Tooltip";
 import clsx from "clsx";
 import Link from "next/link";
 
diff --git a/components/SwitchThemeButton.tsx b/components/layout/SwitchThemeButton.tsx
similarity index 100%
rename from components/SwitchThemeButton.tsx
rename to components/layout/SwitchThemeButton.tsx
diff --git a/components/UserMenu.tsx b/components/layout/UserMenu.tsx
similarity index 97%
rename from components/UserMenu.tsx
rename to components/layout/UserMenu.tsx
index 228629b..c68284b 100644
--- a/components/UserMenu.tsx
+++ b/components/layout/UserMenu.tsx
@@ -1,6 +1,6 @@
 "use client";
-import { SidebarContext } from "@/components/Sidebar";
-import { SignInButtonIcon } from "@/components/SignInButton";
+import { SidebarContext } from "@/components/layout/Sidebar";
+import { SignInButtonIcon } from "@/components/common/SignInButton";
 import { useAuthPaths } from "@/lib/auth";
 import { useUsersGetMe } from "@/lib/events";
 import {
diff --git a/components/CategoriesDropdown.tsx b/components/schedule/CategoriesDropdown.tsx
old mode 100755
new mode 100644
similarity index 100%
rename from components/CategoriesDropdown.tsx
rename to components/schedule/CategoriesDropdown.tsx
diff --git a/components/CategoryCard.tsx b/components/schedule/CategoryCard.tsx
similarity index 100%
rename from components/CategoryCard.tsx
rename to components/schedule/CategoryCard.tsx
diff --git a/components/CategoryContainer.tsx b/components/schedule/CategoryContainer.tsx
similarity index 96%
rename from components/CategoryContainer.tsx
rename to components/schedule/CategoryContainer.tsx
index 5c1b0fc..e196a9f 100644
--- a/components/CategoryContainer.tsx
+++ b/components/schedule/CategoryContainer.tsx
@@ -1,4 +1,4 @@
-import CategoryCard from "@/components/CategoryCard";
+import CategoryCard from "@/components/schedule/CategoryCard";
 import { viewConfig } from "@/lib/events-view-config";
 
 const categoriesIcons: {
diff --git a/components/ClarificationCard.tsx b/components/schedule/ClarificationCard.tsx
similarity index 100%
rename from components/ClarificationCard.tsx
rename to components/schedule/ClarificationCard.tsx
diff --git a/components/ClarificationContainer.tsx b/components/schedule/ClarificationContainer.tsx
similarity index 95%
rename from components/ClarificationContainer.tsx
rename to components/schedule/ClarificationContainer.tsx
index 8f67b77..c81d190 100644
--- a/components/ClarificationContainer.tsx
+++ b/components/schedule/ClarificationContainer.tsx
@@ -1,4 +1,4 @@
-import ClarificationCard from "@/components/ClarificationCard";
+import ClarificationCard from "@/components/schedule/ClarificationCard";
 import Arrow from "@/components/icons/Arrow";
 
 export default function ClarificationContainer() {
diff --git a/components/DashboardButton.tsx b/components/schedule/DashboardButton.tsx
similarity index 89%
rename from components/DashboardButton.tsx
rename to components/schedule/DashboardButton.tsx
index fe4a1c1..285af5c 100644
--- a/components/DashboardButton.tsx
+++ b/components/schedule/DashboardButton.tsx
@@ -1,5 +1,5 @@
 "use client";
-import SignInButton from "@/components/SignInButton";
+import SignInButton from "@/components/common/SignInButton";
 import { useUsersGetMe } from "@/lib/events";
 import Link from "next/link";
 
diff --git a/components/ExportButton.tsx b/components/schedule/ExportButton.tsx
similarity index 91%
rename from components/ExportButton.tsx
rename to components/schedule/ExportButton.tsx
index 213d6c9..a3dd3f7 100644
--- a/components/ExportButton.tsx
+++ b/components/schedule/ExportButton.tsx
@@ -1,4 +1,4 @@
-import Tooltip from "@/components/Tooltip";
+import Tooltip from "@/components/common/Tooltip";
 import Link from "next/link";
 
 export default function ExportButton({ alias }: { alias: string }) {
diff --git a/components/FilterDropdown.tsx b/components/schedule/FilterDropdown.tsx
old mode 100755
new mode 100644
similarity index 100%
rename from components/FilterDropdown.tsx
rename to components/schedule/FilterDropdown.tsx
diff --git a/components/ScheduleLinkCopy.tsx b/components/schedule/ScheduleLinkCopy.tsx
similarity index 100%
rename from components/ScheduleLinkCopy.tsx
rename to components/schedule/ScheduleLinkCopy.tsx
diff --git a/components/ScheduleList.tsx b/components/schedule/ScheduleList.tsx
old mode 100755
new mode 100644
similarity index 96%
rename from components/ScheduleList.tsx
rename to components/schedule/ScheduleList.tsx
index 04a1f91..3d5b8ba
--- a/components/ScheduleList.tsx
+++ b/components/schedule/ScheduleList.tsx
@@ -1,6 +1,6 @@
 "use client";
-import { GroupCard } from "@/components/GroupCard";
-import SearchBar from "@/components/SearchBar";
+import { GroupCard } from "@/components/schedule/group-card/GroupCard";
+import SearchBar from "@/components/schedule/SearchBar";
 import { getFirstTagByType } from "@/lib/event-group";
 import { useEventGroupsListEventGroups, ViewEventGroup } from "@/lib/events";
 import { getCategoryInfoBySlug } from "@/lib/events-view-config";
diff --git a/components/SearchBar.tsx b/components/schedule/SearchBar.tsx
similarity index 100%
rename from components/SearchBar.tsx
rename to components/schedule/SearchBar.tsx
diff --git a/components/FavoriteButton.tsx b/components/schedule/group-card/FavoriteButton.tsx
similarity index 96%
rename from components/FavoriteButton.tsx
rename to components/schedule/group-card/FavoriteButton.tsx
index 3585634..3375883 100644
--- a/components/FavoriteButton.tsx
+++ b/components/schedule/group-card/FavoriteButton.tsx
@@ -1,4 +1,4 @@
-import Tooltip from "@/components/Tooltip";
+import Tooltip from "@/components/common/Tooltip";
 import { useEventGroup } from "@/lib/event-group";
 import { useUsersGetMe } from "@/lib/events";
 import { useRouter } from "next/navigation";
diff --git a/components/GroupCard.tsx b/components/schedule/group-card/GroupCard.tsx
similarity index 93%
rename from components/GroupCard.tsx
rename to components/schedule/group-card/GroupCard.tsx
index 8866987..7a5ad37 100644
--- a/components/GroupCard.tsx
+++ b/components/schedule/group-card/GroupCard.tsx
@@ -1,9 +1,8 @@
-import FavoriteButton from "@/components/FavoriteButton";
-import HideButton from "@/components/HideButton";
+import FavoriteButton from "@/components/schedule/group-card/FavoriteButton";
+import HideButton from "@/components/schedule/group-card/HideButton";
 import {
   getAllTagsByType,
   getFirstTagByType,
-  useEventGroup,
 } from "@/lib/event-group";
 import { ViewEventGroup } from "@/lib/events";
 import { viewConfig } from "@/lib/events-view-config";
diff --git a/components/HideButton.tsx b/components/schedule/group-card/HideButton.tsx
similarity index 94%
rename from components/HideButton.tsx
rename to components/schedule/group-card/HideButton.tsx
index d6d4141..7516aa4 100644
--- a/components/HideButton.tsx
+++ b/components/schedule/group-card/HideButton.tsx
@@ -1,4 +1,4 @@
-import Tooltip from "@/components/Tooltip";
+import Tooltip from "@/components/common/Tooltip";
 import {useEventGroup} from "@/lib/event-group";
 
 export default function HideButton({ groupId }: { groupId: number }) {
diff --git a/components/ScholarshipCalculator.tsx b/components/scholarship/ScholarshipCalculator.tsx
similarity index 100%
rename from components/ScholarshipCalculator.tsx
rename to components/scholarship/ScholarshipCalculator.tsx