Skip to content

🪢 Open source agent evals & observability: Trace, evaluate, and improve LLM applications with one open platform.

refactor(web): Resolve some component-file-structure issues (#19165)

Ben Bachem66fcfd36bb5e
diff --git a/web/src/__tests__/blob-storage-settings-page.clienttest.tsx b/web/src/__tests__/blob-storage-settings-page.clienttest.tsx
index 7afee94b84..825f3e6d0f 100644
--- a/web/src/__tests__/blob-storage-settings-page.clienttest.tsx
+++ b/web/src/__tests__/blob-storage-settings-page.clienttest.tsx
@@ -15,7 +15,7 @@ vi.mock("next/link", () => ({
default: ({ children }: { children: ReactNode }) => <a>{children}</a>,
}));
-vi.mock("@/src/components/layouts/container-page", () => ({
+vi.mock("@/src/components/layouts/ContainerPage", () => ({
default: ({
children,
headerProps,
diff --git a/web/src/__tests__/organization-settings-pages.clienttest.tsx b/web/src/__tests__/organization-settings-pages.clienttest.tsx
index 5a57d145cf..5494b8ec05 100644
--- a/web/src/__tests__/organization-settings-pages.clienttest.tsx
+++ b/web/src/__tests__/organization-settings-pages.clienttest.tsx
@@ -94,7 +94,7 @@ vi.mock("@/src/features/rbac/utils/checkOrganizationAccess", () => ({
useHasOrganizationAccess: vi.fn(),
}));
-vi.mock("@/src/components/layouts/container-page", () => ({
+vi.mock("@/src/components/layouts/ContainerPage", () => ({
default: () => null,
}));
diff --git a/web/src/components/level-counts-display.tsx b/web/src/components/LevelCountsDisplay.tsx
similarity index 96%
rename from web/src/components/level-counts-display.tsx
rename to web/src/components/LevelCountsDisplay.tsx
index 86456d34c8..2d55bbed11 100644
--- a/web/src/components/level-counts-display.tsx
+++ b/web/src/components/LevelCountsDisplay.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @repo/component-file-structure */
import React from "react";
import { Separator } from "@/src/components/ui/separator";
import { numberFormatter } from "@/src/utils/numbers";
diff --git a/web/src/components/SettingsTable/SettingsTable.tsx b/web/src/components/SettingsTable/SettingsTable.tsx
index 4d1bc801af..9bd1c3e721 100644
--- a/web/src/components/SettingsTable/SettingsTable.tsx
+++ b/web/src/components/SettingsTable/SettingsTable.tsx
@@ -14,8 +14,8 @@ import {
import { MultiSelectInput } from "@/src/components/design-system/MultiSelectInput/MultiSelectInput";
import { SearchInput } from "@/src/components/design-system/SearchInput/SearchInput";
import { SelectInput } from "@/src/components/design-system/SelectInput/SelectInput";
-import { SettingsTableCard } from "@/src/components/layouts/settings-table-card";
-import { DataTableColumnVisibilityFilter } from "@/src/components/table/data-table-column-visibility-filter";
+import { SettingsTableCard } from "@/src/components/layouts/SettingsTableCard";
+import { DataTableColumnVisibilityFilter } from "@/src/components/table/DataTableColumnVisibilityFilter";
import { type RowHeight } from "@/src/components/table/data-table-row-height-switch";
import { DropdownMenu } from "@/src/components/design-system/DropdownMenu/DropdownMenu";
import { Button } from "@/src/components/ui/button";
diff --git a/web/src/components/date-picker.tsx b/web/src/components/date-picker.tsx
index 8ba64ce0f3..e03c44e1c1 100644
--- a/web/src/components/date-picker.tsx
+++ b/web/src/components/date-picker.tsx
@@ -17,7 +17,7 @@ import { cn } from "@/src/utils/tailwind";
import { type DateRange as RDPDateRange } from "react-day-picker";
import { useEffect, useMemo, useState, useCallback } from "react";
import { setBeginningOfDay, setEndOfDay } from "@/src/utils/dates";
-import { TimePicker } from "@/src/components/ui/time-picker";
+import { TimePicker } from "@/src/components/ui/TimePicker";
import { DashboardDateRangeDropdown } from "@/src/components/DashboardDateRangeDropdown";
import {
DASHBOARD_AGGREGATION_PLACEHOLDER,
diff --git a/web/src/components/layouts/container-page.tsx b/web/src/components/layouts/ContainerPage.tsx
similarity index 90%
rename from web/src/components/layouts/container-page.tsx
rename to web/src/components/layouts/ContainerPage.tsx
index 67961f8164..9c5cd7b178 100644
--- a/web/src/components/layouts/container-page.tsx
+++ b/web/src/components/layouts/ContainerPage.tsx
@@ -1,9 +1,8 @@
-/* eslint-disable @repo/component-file-structure */
import PageHeader, {
type PageHeaderProps,
} from "@/src/components/layouts/page-header";
-import { MobileTopBar } from "@/src/components/layouts/mobile-top-bar";
-import { MobilePageTitle } from "@/src/components/layouts/mobile-page-title";
+import { MobileTopBar } from "@/src/components/layouts/MobileTopBar";
+import { MobilePageTitle } from "@/src/components/layouts/MobilePageTitle";
import { useIsMobile } from "@/src/hooks/use-mobile";
import { cn } from "@/src/utils/tailwind";
diff --git a/web/src/components/layouts/mobile-page-actions-content.tsx b/web/src/components/layouts/MobilePageActionsContent.tsx
similarity index 94%
rename from web/src/components/layouts/mobile-page-actions-content.tsx
rename to web/src/components/layouts/MobilePageActionsContent.tsx
index 73ad5dfa9d..de3495638f 100644
--- a/web/src/components/layouts/mobile-page-actions-content.tsx
+++ b/web/src/components/layouts/MobilePageActionsContent.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @repo/component-file-structure */
import { PopoverContent } from "@/src/components/ui/popover";
import { type ComponentPropsWithoutRef, type ReactNode } from "react";
diff --git a/web/src/components/layouts/mobile-page-title.tsx b/web/src/components/layouts/MobilePageTitle.tsx
similarity index 97%
rename from web/src/components/layouts/mobile-page-title.tsx
rename to web/src/components/layouts/MobilePageTitle.tsx
index 9bb273df3a..0e6c982ab5 100644
--- a/web/src/components/layouts/mobile-page-title.tsx
+++ b/web/src/components/layouts/MobilePageTitle.tsx
@@ -1,7 +1,7 @@
-/* eslint-disable @repo/component-file-structure, @typescript-eslint/no-deprecated -- Legacy UI usage retained during migration to design-system components. */
+/* eslint-disable @typescript-eslint/no-deprecated -- Legacy UI usage retained during migration to design-system components. */
import { ItemBadge } from "@/src/components/ItemBadge";
import BreadcrumbComponent from "@/src/components/layouts/breadcrumb";
-import { MobilePageActionsContent } from "@/src/components/layouts/mobile-page-actions-content";
+import { MobilePageActionsContent } from "@/src/components/layouts/MobilePageActionsContent";
import DocPopup from "@/src/components/layouts/doc-popup";
import { PageHeaderControlsSlotTarget } from "@/src/components/layouts/page-header-controls-slot";
import { PageTabs } from "@/src/components/layouts/page-tabs";
diff --git a/web/src/components/layouts/mobile-top-bar.tsx b/web/src/components/layouts/MobileTopBar.tsx
similarity index 98%
rename from web/src/components/layouts/mobile-top-bar.tsx
rename to web/src/components/layouts/MobileTopBar.tsx
index ee817eda07..3680d60d7a 100644
--- a/web/src/components/layouts/mobile-top-bar.tsx
+++ b/web/src/components/layouts/MobileTopBar.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @repo/component-file-structure */
import { type ReactNode } from "react";
import { useSession } from "next-auth/react";
import { Menu } from "@langfuse/icons";
diff --git a/web/src/components/layouts/settings-table-card.tsx b/web/src/components/layouts/SettingsTableCard.tsx
similarity index 91%
rename from web/src/components/layouts/settings-table-card.tsx
rename to web/src/components/layouts/SettingsTableCard.tsx
index 5f438084e4..6bc913dd92 100644
--- a/web/src/components/layouts/settings-table-card.tsx
+++ b/web/src/components/layouts/SettingsTableCard.tsx
@@ -1,4 +1,4 @@
-/* eslint-disable @repo/no-style-props, @repo/no-margin-on-root-elements, @repo/component-file-structure */
+/* eslint-disable @repo/no-style-props, @repo/no-margin-on-root-elements */
import { Card } from "@/src/components/ui/card";
import { cn } from "@/src/utils/tailwind";
diff --git a/web/src/components/layouts/spinner.tsx b/web/src/components/layouts/Spinner.tsx
similarity index 92%
rename from web/src/components/layouts/spinner.tsx
rename to web/src/components/layouts/Spinner.tsx
index 2faac25d03..6fa8b9e73d 100644
--- a/web/src/components/layouts/spinner.tsx
+++ b/web/src/components/layouts/Spinner.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @repo/component-file-structure */
import { LangfuseIcon } from "@/src/components/design-system/LangfuseIcon/LangfuseIcon";
export function Spinner(props: { message: string }) {
diff --git a/web/src/components/layouts/app-layout/variants/AuthenticatedLayout.tsx b/web/src/components/layouts/app-layout/variants/AuthenticatedLayout.tsx
index 39d6f2688a..cb4f3ff6e7 100644
--- a/web/src/components/layouts/app-layout/variants/AuthenticatedLayout.tsx
+++ b/web/src/components/layouts/app-layout/variants/AuthenticatedLayout.tsx
@@ -23,7 +23,7 @@ import {
} from "@/src/components/ui/sidebar";
import { AppSidebar } from "@/src/components/nav/AppSidebar/AppSidebar";
import { SidebarPresenceProvider } from "@/src/components/nav/SidebarPresenceProvider";
-import { Toaster } from "@/src/components/ui/sonner";
+import { Toaster } from "@/src/components/ui/Toaster";
import { Layer } from "@/src/components/design-system/Layer/Layer";
import {
VersionUpdateBanner,
diff --git a/web/src/components/layouts/app-layout/variants/LoadingLayout.tsx b/web/src/components/layouts/app-layout/variants/LoadingLayout.tsx
index b44016763f..2e9ebf6880 100644
--- a/web/src/components/layouts/app-layout/variants/LoadingLayout.tsx
+++ b/web/src/components/layouts/app-layout/variants/LoadingLayout.tsx
@@ -3,7 +3,7 @@
* Shown during session loading and authentication redirects
*/
-import { Spinner } from "@/src/components/layouts/spinner";
+import { Spinner } from "@/src/components/layouts/Spinner";
type LoadingLayoutProps = {
message?: string;
diff --git a/web/src/components/layouts/app-shell-chrome.clienttest.tsx b/web/src/components/layouts/app-shell-chrome.clienttest.tsx
index c197392aa8..2ce1b32a37 100644
--- a/web/src/components/layouts/app-shell-chrome.clienttest.tsx
+++ b/web/src/components/layouts/app-shell-chrome.clienttest.tsx
@@ -8,7 +8,7 @@ import {
import { Home, Settings } from "@langfuse/icons";
import { APP_SHELL_CHROME_ROW_TEST_ID } from "@/src/components/layouts/app-shell-chrome";
-import { MobilePageTitle } from "@/src/components/layouts/mobile-page-title";
+import { MobilePageTitle } from "@/src/components/layouts/MobilePageTitle";
import PageHeader from "@/src/components/layouts/page-header";
import { AppSidebar } from "@/src/components/nav/AppSidebar/AppSidebar";
import { SidebarPresenceProvider } from "@/src/components/nav/SidebarPresenceProvider";
diff --git a/web/src/components/layouts/mobile-page-actions-content.stories.tsx b/web/src/components/layouts/mobile-page-actions-content.stories.tsx
index 027a17004f..3e32f8f16b 100644
--- a/web/src/components/layouts/mobile-page-actions-content.stories.tsx
+++ b/web/src/components/layouts/mobile-page-actions-content.stories.tsx
@@ -8,7 +8,7 @@ import { fn } from "storybook/test";
import preview from "../../../.storybook/preview";
import { Button } from "@/src/components/ui/button";
import { Popover, PopoverTrigger } from "@/src/components/ui/popover";
-import { MobilePageActionsContent } from "@/src/components/layouts/mobile-page-actions-content";
+import { MobilePageActionsContent } from "@/src/components/layouts/MobilePageActionsContent";
const meta = preview.meta({
component: MobilePageActionsContent,
diff --git a/web/src/components/layouts/page.tsx b/web/src/components/layouts/page.tsx
index 158975733d..57b5db5992 100644
--- a/web/src/components/layouts/page.tsx
+++ b/web/src/components/layouts/page.tsx
@@ -3,8 +3,8 @@ import PageHeader, {
type PageHeaderProps,
} from "@/src/components/layouts/page-header";
import { PageHeaderControlsSlotProvider } from "@/src/components/layouts/page-header-controls-slot";
-import { MobileTopBar } from "@/src/components/layouts/mobile-top-bar";
-import { MobilePageTitle } from "@/src/components/layouts/mobile-page-title";
+import { MobileTopBar } from "@/src/components/layouts/MobileTopBar";
+import { MobilePageTitle } from "@/src/components/layouts/MobilePageTitle";
import { useIsMobile } from "@/src/hooks/use-mobile";
import { cn } from "@/src/utils/tailwind";
diff --git a/web/src/components/magicui/rainbow-button.tsx b/web/src/components/magicui/RainbowButton.tsx
similarity index 97%
rename from web/src/components/magicui/rainbow-button.tsx
rename to web/src/components/magicui/RainbowButton.tsx
index 7e62dcc3e8..49c424faa3 100644
--- a/web/src/components/magicui/rainbow-button.tsx
+++ b/web/src/components/magicui/RainbowButton.tsx
@@ -1,4 +1,4 @@
-/* eslint-disable @repo/no-style-props, @repo/component-file-structure */
+/* eslint-disable @repo/no-style-props */
import { cn } from "@/src/utils/tailwind";
import { Slot } from "@radix-ui/react-slot";
import { cva, type VariantProps } from "class-variance-authority";
diff --git a/web/src/components/onboarding/AnnotationQueuesOnboarding.tsx b/web/src/components/onboarding/AnnotationQueuesOnboarding.tsx
index 23a42c6172..1471077e08 100644
--- a/web/src/components/onboarding/AnnotationQueuesOnboarding.tsx
+++ b/web/src/components/onboarding/AnnotationQueuesOnboarding.tsx
@@ -1,7 +1,7 @@
import {
SplashScreen,
type ValueProposition,
-} from "@/src/components/ui/splash-screen";
+} from "@/src/components/ui/SplashScreen";
import { ClipboardCheck, Users, BarChart4, GitMerge } from "@langfuse/icons";
import { CreateOrEditAnnotationQueueButton } from "@/src/features/annotation-queues";
diff --git a/web/src/components/onboarding/DatasetItemsOnboarding.tsx b/web/src/components/onboarding/DatasetItemsOnboarding.tsx
index 4145c4be9a..9981f0b218 100644
--- a/web/src/components/onboarding/DatasetItemsOnboarding.tsx
+++ b/web/src/components/onboarding/DatasetItemsOnboarding.tsx
@@ -1,6 +1,6 @@
/* eslint-disable @typescript-eslint/no-deprecated -- Legacy UI usage retained during migration to design-system components. */
import { useRef, useState } from "react";
-import { SplashScreen } from "@/src/components/ui/splash-screen";
+import { SplashScreen } from "@/src/components/ui/SplashScreen";
import { Braces, Code, ListTree, Upload } from "@langfuse/icons";
import Link from "next/link";
import {
diff --git a/web/src/components/onboarding/DatasetsOnboarding.tsx b/web/src/components/onboarding/DatasetsOnboarding.tsx
index 6aaabc04dd..bc8ca5e588 100644
--- a/web/src/components/onboarding/DatasetsOnboarding.tsx
+++ b/web/src/components/onboarding/DatasetsOnboarding.tsx
@@ -2,7 +2,7 @@
import {
SplashScreen,
type ValueProposition,
-} from "@/src/components/ui/splash-screen";
+} from "@/src/components/ui/SplashScreen";
import { ButtonWithIcon } from "@/src/components/ButtonWithIcon";
import { DialogTrigger } from "@/src/components/ui/dialog";
import { CreateDatasetDialogController } from "@/src/features/datasets/components/CreateDatasetDialogController";
diff --git a/web/src/components/onboarding/EvaluatorsOnboarding.tsx b/web/src/components/onboarding/EvaluatorsOnboarding.tsx
index 6ed588815b..e17da41e75 100644
--- a/web/src/components/onboarding/EvaluatorsOnboarding.tsx
+++ b/web/src/components/onboarding/EvaluatorsOnboarding.tsx
@@ -1,7 +1,7 @@
import { EvalTemplateSourceCodeLanguage } from "@langfuse/shared";
import { EvaluatorsOnboardingView } from "@/src/components/onboarding/components/EvaluatorsOnboardingView/EvaluatorsOnboardingView";
-import type { ActionConfig } from "@/src/components/ui/splash-screen";
+import type { ActionConfig } from "@/src/components/ui/SplashScreen";
import { useIsCodeEvalEnabled } from "@/src/features/evals/hooks/useIsCodeEvalEnabled";
interface EvaluatorsOnboardingProps {
diff --git a/web/src/components/onboarding/PromptsOnboarding.tsx b/web/src/components/onboarding/PromptsOnboarding.tsx
index 7fd7f0b23c..8a7f0bc5ba 100644
--- a/web/src/components/onboarding/PromptsOnboarding.tsx
+++ b/web/src/components/onboarding/PromptsOnboarding.tsx
@@ -1,7 +1,7 @@
import {
SplashScreen,
type ValueProposition,
-} from "@/src/components/ui/splash-screen";
+} from "@/src/components/ui/SplashScreen";
import { FileText, GitBranch, Zap, BarChart4 } from "@langfuse/icons";
export function PromptsOnboarding({ projectId }: { projectId: string }) {
diff --git a/web/src/components/onboarding/ScoresOnboarding.tsx b/web/src/components/onboarding/ScoresOnboarding.tsx
index 767b046e57..16e3d80dde 100644
--- a/web/src/components/onboarding/ScoresOnboarding.tsx
+++ b/web/src/components/onboarding/ScoresOnboarding.tsx
@@ -1,7 +1,7 @@
import {
SplashScreen,
type ValueProposition,
-} from "@/src/components/ui/splash-screen";
+} from "@/src/components/ui/SplashScreen";
import { ThumbsUp, Star, LineChart, Code } from "@langfuse/icons";
export function ScoresOnboarding() {
diff --git a/web/src/components/onboarding/SessionsOnboarding.tsx b/web/src/components/onboarding/SessionsOnboarding.tsx
index 3b8689423d..9bcb171a19 100644
--- a/web/src/components/onboarding/SessionsOnboarding.tsx
+++ b/web/src/components/onboarding/SessionsOnboarding.tsx
@@ -1,5 +1,5 @@
import React from "react";
-import { SplashScreen } from "@/src/components/ui/splash-screen";
+import { SplashScreen } from "@/src/components/ui/SplashScreen";
import { ActionButton } from "@/src/components/ActionButton";
export function SessionsOnboarding() {
diff --git a/web/src/components/onboarding/UsersOnboarding.tsx b/web/src/components/onboarding/UsersOnboarding.tsx
index d9984b4a33..4f6faec277 100644
--- a/web/src/components/onboarding/UsersOnboarding.tsx
+++ b/web/src/components/onboarding/UsersOnboarding.tsx
@@ -1,5 +1,5 @@
import React from "react";
-import { SplashScreen } from "@/src/components/ui/splash-screen";
+import { SplashScreen } from "@/src/components/ui/SplashScreen";
import { ActionButton } from "@/src/components/ActionButton";
export function UsersOnboarding() {
diff --git a/web/src/components/onboarding/components/EvaluatorsOnboardingView/EvaluatorsOnboardingView.tsx b/web/src/components/onboarding/components/EvaluatorsOnboardingView/EvaluatorsOnboardingView.tsx
index 4d0962fbeb..cb22102464 100644
--- a/web/src/components/onboarding/components/EvaluatorsOnboardingView/EvaluatorsOnboardingView.tsx
+++ b/web/src/components/onboarding/components/EvaluatorsOnboardingView/EvaluatorsOnboardingView.tsx
@@ -4,7 +4,7 @@ import {
type ActionConfig,
SplashScreen,
type ValueProposition,
-} from "@/src/components/ui/splash-screen";
+} from "@/src/components/ui/SplashScreen";
const llmAsJudgeValuePropositions: ValueProposition[] = [
{
diff --git a/web/src/components/table/DataTable.stories.tsx b/web/src/components/table/DataTable.stories.tsx
index ed49132fd2..14a3202182 100644
--- a/web/src/components/table/DataTable.stories.tsx
+++ b/web/src/components/table/DataTable.stories.tsx
@@ -46,7 +46,7 @@ import { type MediaDescriptor } from "@/src/components/ui/media/mediaUtils";
import {
LevelCountsDisplay,
type LevelCount,
-} from "@/src/components/level-counts-display";
+} from "@/src/components/LevelCountsDisplay";
import { formatAsLabel, LevelSymbols } from "@/src/components/level-colors";
import { TagList } from "@/src/features/tag";
import { BreakdownTooltip } from "@/src/features/traces/components/BreakdownTooltip";
diff --git a/web/src/components/table/data-table-column-visibility-filter.tsx b/web/src/components/table/DataTableColumnVisibilityFilter.tsx
similarity index 99%
rename from web/src/components/table/data-table-column-visibility-filter.tsx
rename to web/src/components/table/DataTableColumnVisibilityFilter.tsx
index c9aca9a7b4..0d41f09404 100644
--- a/web/src/components/table/data-table-column-visibility-filter.tsx
+++ b/web/src/components/table/DataTableColumnVisibilityFilter.tsx
@@ -1,4 +1,4 @@
-/* eslint-disable no-nested-ternary, @repo/component-file-structure */
+/* eslint-disable no-nested-ternary */
import React, {
useCallback,
useMemo,
diff --git a/web/src/components/table/data-table-pagination.tsx b/web/src/components/table/DataTablePagination.tsx
similarity index 98%
rename from web/src/components/table/data-table-pagination.tsx
rename to web/src/components/table/DataTablePagination.tsx
index 57dcbfe4f5..25a7189b6e 100644
--- a/web/src/components/table/data-table-pagination.tsx
+++ b/web/src/components/table/DataTablePagination.tsx
@@ -1,4 +1,4 @@
-/* eslint-disable no-nested-ternary, @repo/component-file-structure, @typescript-eslint/no-deprecated -- Legacy UI usage retained during migration to design-system components. */
+/* eslint-disable no-nested-ternary, @typescript-eslint/no-deprecated -- Legacy UI usage retained during migration to design-system components. */
import {
ChevronLeft,
ChevronRight,
diff --git a/web/src/components/table/filtered-run-pills.tsx b/web/src/components/table/FilteredRunPills.tsx
similarity index 98%
rename from web/src/components/table/filtered-run-pills.tsx
rename to web/src/components/table/FilteredRunPills.tsx
index 3dd22f2e21..de7b93343d 100644
--- a/web/src/components/table/filtered-run-pills.tsx
+++ b/web/src/components/table/FilteredRunPills.tsx
@@ -1,4 +1,4 @@
-/* eslint-disable @repo/no-style-props, @repo/component-file-structure */
+/* eslint-disable @repo/no-style-props */
import { Badge } from "@/src/components/ui/badge";
import { HoverCard } from "@/src/components/design-system/HoverCard/HoverCard";
import { api } from "@/src/utils/api";
diff --git a/web/src/components/table/table-header-controls.tsx b/web/src/components/table/TableHeaderControls.tsx
similarity index 97%
rename from web/src/components/table/table-header-controls.tsx
rename to web/src/components/table/TableHeaderControls.tsx
index 7ca40facfa..d5594b6426 100644
--- a/web/src/components/table/table-header-controls.tsx
+++ b/web/src/components/table/TableHeaderControls.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @repo/component-file-structure */
import { TimeRangePicker } from "@/src/components/date-picker";
import { DataTableRefreshButton } from "@/src/components/table/data-table-refresh-button";
import { type RefreshInterval } from "@/src/components/table/utils/refresh-intervals";
diff --git a/web/src/components/table/data-table-column-visibility-filter.clienttest.tsx b/web/src/components/table/data-table-column-visibility-filter.clienttest.tsx
index acf723c9f5..ea4271f913 100644
--- a/web/src/components/table/data-table-column-visibility-filter.clienttest.tsx
+++ b/web/src/components/table/data-table-column-visibility-filter.clienttest.tsx
@@ -1,7 +1,7 @@
import { StrictMode, useState } from "react";
import { fireEvent, render, screen } from "@testing-library/react";
import { type VisibilityState } from "@tanstack/react-table";
-import { DataTableColumnVisibilityFilter } from "@/src/components/table/data-table-column-visibility-filter";
+import { DataTableColumnVisibilityFilter } from "@/src/components/table/DataTableColumnVisibilityFilter";
import {
useColumnOrder,
useColumnVisibility,
diff --git a/web/src/components/table/data-table-toolbar.tsx b/web/src/components/table/data-table-toolbar.tsx
index bea1d7e5b9..f986b906f4 100644
--- a/web/src/components/table/data-table-toolbar.tsx
+++ b/web/src/components/table/data-table-toolbar.tsx
@@ -9,7 +9,7 @@ import { SearchInput } from "@/src/components/design-system/SearchInput/SearchIn
import {
DataTableColumnVisibilityFilter,
type ColumnGroupTogglePayload,
-} from "@/src/components/table/data-table-column-visibility-filter";
+} from "@/src/components/table/DataTableColumnVisibilityFilter";
import { FilterToggleButton } from "@/src/components/table/FilterToggleButton";
import {
InlineFilterBuilder,
diff --git a/web/src/components/table/data-table.tsx b/web/src/components/table/data-table.tsx
index 7b7aa74278..2da0676e64 100644
--- a/web/src/components/table/data-table.tsx
+++ b/web/src/components/table/data-table.tsx
@@ -13,7 +13,7 @@ import React, {
type UIEventHandler,
} from "react";
import DocPopup from "@/src/components/layouts/doc-popup";
-import { DataTablePagination } from "@/src/components/table/data-table-pagination";
+import { DataTablePagination } from "@/src/components/table/DataTablePagination";
import { shouldIgnoreRowClickTarget } from "@/src/components/table/shouldIgnoreRowClickTarget";
import { getPlainTextFromReactNode } from "@/src/utils/react-node-plain-text";
import {
diff --git a/web/src/components/table/peek/peek-evaluator-config-detail.tsx b/web/src/components/table/peek/peek-evaluator-config-detail.tsx
index ddaf02c898..5117489e32 100644
--- a/web/src/components/table/peek/peek-evaluator-config-detail.tsx
+++ b/web/src/components/table/peek/peek-evaluator-config-detail.tsx
@@ -23,7 +23,7 @@ import { useState } from "react";
import { cn } from "@/src/utils/tailwind";
import { showSuccessToast } from "@/src/features/notifications";
import { api } from "@/src/utils/api";
-import { EvaluatorPausedCallout } from "@/src/features/evals/components/evaluator-paused-callout";
+import { EvaluatorPausedCallout } from "@/src/features/evals/components/EvaluatorPausedCallout";
import {
requiresLegacyMigrationAction,
isLegacyEvalTarget,
diff --git a/web/src/components/table/peek/peek-evaluator-template-detail.tsx b/web/src/components/table/peek/peek-evaluator-template-detail.tsx
index b3ad6e980a..4aeb551365 100644
--- a/web/src/components/table/peek/peek-evaluator-template-detail.tsx
+++ b/web/src/components/table/peek/peek-evaluator-template-detail.tsx
@@ -3,7 +3,7 @@ import { useRouter } from "next/router";
import { Skeleton } from "@/src/components/ui/skeleton";
import { usePeekEvalTemplateData } from "@/src/components/table/peek/hooks/usePeekEvalTemplateData";
import { EvalTemplateForm } from "@/src/features/evals/components/template-form";
-import { MaintainerTooltip } from "@/src/features/evals/components/maintainer-tooltip";
+import { MaintainerTooltip } from "@/src/features/evals/components/MaintainerTooltip";
import { getMaintainer } from "@/src/features/evals/utils/typeHelpers";
import { TablePeekView } from "@/src/components/table/peek";
diff --git a/web/src/components/ui/action-button-count-badge.tsx b/web/src/components/ui/ActionButtonCountBadge.tsx
similarity index 91%
rename from web/src/components/ui/action-button-count-badge.tsx
rename to web/src/components/ui/ActionButtonCountBadge.tsx
index 42e2b0467d..6560a3aacc 100644
--- a/web/src/components/ui/action-button-count-badge.tsx
+++ b/web/src/components/ui/ActionButtonCountBadge.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @repo/component-file-structure */
import { cn } from "@/src/utils/tailwind";
export function ActionButtonCountBadge({
diff --git a/web/src/components/ui/splash-screen.tsx b/web/src/components/ui/SplashScreen.tsx
similarity index 98%
rename from web/src/components/ui/splash-screen.tsx
rename to web/src/components/ui/SplashScreen.tsx
index 6bff5ef6a2..2c26aa4119 100644
--- a/web/src/components/ui/splash-screen.tsx
+++ b/web/src/components/ui/SplashScreen.tsx
@@ -1,4 +1,4 @@
-/* eslint-disable @repo/no-margin-on-root-elements, @repo/component-file-structure */
+/* eslint-disable @repo/no-margin-on-root-elements */
import React, { useState } from "react";
import { cn } from "@/src/utils/tailwind";
import Image from "next/image";
diff --git a/web/src/components/ui/time-icon.tsx b/web/src/components/ui/TimeIcon.tsx
similarity index 94%
rename from web/src/components/ui/time-icon.tsx
rename to web/src/components/ui/TimeIcon.tsx
index bbcea0e5c6..1ed9ab514e 100644
--- a/web/src/components/ui/time-icon.tsx
+++ b/web/src/components/ui/TimeIcon.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @repo/component-file-structure */
import * as React from "react";
import { Clock, Moon, Sun } from "@langfuse/icons";
import { type Period } from "@/src/components/ui/time-picker-utils";
diff --git a/web/src/components/ui/time-period-select.tsx b/web/src/components/ui/TimePeriodSelect.tsx
similarity index 97%
rename from web/src/components/ui/time-period-select.tsx
rename to web/src/components/ui/TimePeriodSelect.tsx
index 4026ce2e10..938b6ff3b3 100644
--- a/web/src/components/ui/time-period-select.tsx
+++ b/web/src/components/ui/TimePeriodSelect.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @repo/component-file-structure */
"use client";
import * as React from "react";
diff --git a/web/src/components/ui/time-picker.tsx b/web/src/components/ui/TimePicker.tsx
similarity index 90%
rename from web/src/components/ui/time-picker.tsx
rename to web/src/components/ui/TimePicker.tsx
index d6257470fb..797cfa8cb2 100644
--- a/web/src/components/ui/time-picker.tsx
+++ b/web/src/components/ui/TimePicker.tsx
@@ -1,12 +1,12 @@
-/* eslint-disable @repo/no-style-props, @repo/component-file-structure, @typescript-eslint/no-deprecated -- Legacy UI usage retained during migration to design-system components. */
+/* eslint-disable @repo/no-style-props, @typescript-eslint/no-deprecated -- Legacy UI usage retained during migration to design-system components. */
"use client";
import * as React from "react";
-import { TimePickerInput } from "./time-picker-input";
-import { TimePeriodSelect } from "./time-period-select";
+import { TimePickerInput } from "./TimePickerInput";
+import { TimePeriodSelect } from "./TimePeriodSelect";
import { type Period } from "./time-picker-utils";
import { getTimezoneDetails, getShortLocalTimezone } from "@/src/utils/dates";
-import { TimeIcon } from "@/src/components/ui/time-icon";
+import { TimeIcon } from "@/src/components/ui/TimeIcon";
import { cn } from "@/src/utils/tailwind";
import {
Tooltip,
diff --git a/web/src/components/ui/time-picker-input.tsx b/web/src/components/ui/TimePickerInput.tsx
similarity index 97%
rename from web/src/components/ui/time-picker-input.tsx
rename to web/src/components/ui/TimePickerInput.tsx
index e816dd8e72..c3ced53118 100644
--- a/web/src/components/ui/time-picker-input.tsx
+++ b/web/src/components/ui/TimePickerInput.tsx
@@ -1,4 +1,4 @@
-/* eslint-disable @repo/no-style-props, @repo/component-file-structure */
+/* eslint-disable @repo/no-style-props */
import React from "react";
import {
diff --git a/web/src/components/ui/sonner.tsx b/web/src/components/ui/Toaster.tsx
similarity index 94%
rename from web/src/components/ui/sonner.tsx
rename to web/src/components/ui/Toaster.tsx
index 0815640f58..3e38d34bf7 100644
--- a/web/src/components/ui/sonner.tsx
+++ b/web/src/components/ui/Toaster.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @repo/component-file-structure */
"use client";
import { Toaster as Sonner } from "sonner";
diff --git a/web/src/components/ui/action-button-count-badge.stories.tsx b/web/src/components/ui/action-button-count-badge.stories.tsx
index d3c6e37f8e..6cf336606a 100644
--- a/web/src/components/ui/action-button-count-badge.stories.tsx
+++ b/web/src/components/ui/action-button-count-badge.stories.tsx
@@ -1,5 +1,5 @@
import preview from "../../../.storybook/preview";
-import { ActionButtonCountBadge } from "@/src/components/ui/action-button-count-badge";
+import { ActionButtonCountBadge } from "@/src/components/ui/ActionButtonCountBadge";
const meta = preview.meta({
component: ActionButtonCountBadge,
diff --git a/web/src/components/ui/splash-screen.clienttest.tsx b/web/src/components/ui/splash-screen.clienttest.tsx
index 376db1a3bd..b420e7f8be 100644
--- a/web/src/components/ui/splash-screen.clienttest.tsx
+++ b/web/src/components/ui/splash-screen.clienttest.tsx
@@ -1,7 +1,7 @@
import { fireEvent, render, waitFor } from "@testing-library/react";
import { afterEach, describe, expect, it, vi } from "vitest";
-import { SplashScreen } from "./splash-screen";
+import { SplashScreen } from "./SplashScreen";
describe("SplashScreen video autoplay", () => {
afterEach(() => {
diff --git a/web/src/features/annotation-queues/components/AnnotationQueueItemPage.tsx b/web/src/features/annotation-queues/components/AnnotationQueueItemPage.tsx
index 5ffae0c851..179c2ca148 100644
--- a/web/src/features/annotation-queues/components/AnnotationQueueItemPage.tsx
+++ b/web/src/features/annotation-queues/components/AnnotationQueueItemPage.tsx
@@ -41,7 +41,7 @@ import { TraceAnnotationProcessor } from "./processors/TraceAnnotationProcessor"
import { SessionAnnotationProcessor } from "./processors/SessionAnnotationProcessor";
import { ObjectNotFoundCard } from "@/src/features/annotation-queues/components/ObjectNotFoundCard";
import { useSession } from "next-auth/react";
-import { SplashScreen } from "@/src/components/ui/splash-screen";
+import { SplashScreen } from "@/src/components/ui/SplashScreen";
// A single row in the keyboard-shortcuts cheatsheet: label on the left, one or
// more <KeyboardShortcut> glyphs on the right.
diff --git a/web/src/features/annotation-queues/components/processors/SessionAnnotationProcessor.tsx b/web/src/features/annotation-queues/components/processors/SessionAnnotationProcessor.tsx
index 55806205fd..6ed7e0b3c7 100644
--- a/web/src/features/annotation-queues/components/processors/SessionAnnotationProcessor.tsx
+++ b/web/src/features/annotation-queues/components/processors/SessionAnnotationProcessor.tsx
@@ -11,7 +11,7 @@ import {
} from "@/src/features/sessions";
import { useState, useMemo, useCallback } from "react";
import { Button } from "@/src/components/ui/button";
-import { ActionButtonCountBadge } from "@/src/components/ui/action-button-count-badge";
+import { ActionButtonCountBadge } from "@/src/components/ui/ActionButtonCountBadge";
import { ItemBadge } from "@/src/components/ItemBadge";
import { CopyIdsPopover } from "@/src/features/traces";
import { Badge } from "@/src/components/ui/badge";
diff --git a/web/src/features/auth/SignInPage.tsx b/web/src/features/auth/SignInPage.tsx
index 169e690eef..57b41fd610 100644
--- a/web/src/features/auth/SignInPage.tsx
+++ b/web/src/features/auth/SignInPage.tsx
@@ -48,7 +48,7 @@ import { AuthProviderButton } from "@/src/features/auth/components/AuthProviderB
import { cn } from "@/src/utils/tailwind";
import { useLangfuseCloudRegion } from "@/src/features/organizations";
import { getSafeRedirectPath } from "@/src/utils/redirect";
-import { Spinner } from "@/src/components/layouts/spinner";
+import { Spinner } from "@/src/components/layouts/Spinner";
import {
TurnstileWidget,
type TurnstileWidgetHandle,
diff --git a/web/src/features/auth/SsoInitiatePage.tsx b/web/src/features/auth/SsoInitiatePage.tsx
index 0162becfef..99ee025b25 100644
--- a/web/src/features/auth/SsoInitiatePage.tsx
+++ b/web/src/features/auth/SsoInitiatePage.tsx
@@ -3,7 +3,7 @@ import Head from "next/head";
import { useEffect, useState } from "react";
import { useRouter } from "next/router";
import { ErrorPageWithSentry } from "@/src/components/error-page";
-import { Spinner } from "@/src/components/layouts/spinner";
+import { Spinner } from "@/src/components/layouts/Spinner";
export default function SsoInitiatePage() {
const router = useRouter();
diff --git a/web/src/features/automations/components/AutomationDetails.tsx b/web/src/features/automations/components/AutomationDetails.tsx
index d74c6cfc19..f94ca7c369 100644
--- a/web/src/features/automations/components/AutomationDetails.tsx
+++ b/web/src/features/automations/components/AutomationDetails.tsx
@@ -13,7 +13,7 @@ import {
} from "@langfuse/shared";
import { Tabs } from "@/src/components/design-system/Tabs/Tabs";
import Header from "@/src/components/layouts/header";
-import { SettingsTableCard } from "@/src/components/layouts/settings-table-card";
+import { SettingsTableCard } from "@/src/components/layouts/SettingsTableCard";
import { DeleteAutomationDialogController } from "./DeleteAutomationDialogController";
import { useQueryParam, StringParam, withDefault } from "use-query-params";
diff --git a/web/src/features/blobstorage-integration/BlobStorageIntegrationPage.tsx b/web/src/features/blobstorage-integration/BlobStorageIntegrationPage.tsx
index 39166f6167..41ed18eae7 100644
--- a/web/src/features/blobstorage-integration/BlobStorageIntegrationPage.tsx
+++ b/web/src/features/blobstorage-integration/BlobStorageIntegrationPage.tsx
@@ -1,6 +1,6 @@
/* eslint-disable no-nested-ternary */
import Header from "@/src/components/layouts/header";
-import ContainerPage from "@/src/components/layouts/container-page";
+import ContainerPage from "@/src/components/layouts/ContainerPage";
import { StatusBadge } from "@/src/components/ui/StatusBadge/StatusBadge";
import { Button } from "@/src/components/ui/button";
import { Card } from "@/src/components/ui/card";
diff --git a/web/src/features/datasets/components/DatasetCompareRunsTable.tsx b/web/src/features/datasets/components/DatasetCompareRunsTable.tsx
index 404680c7b6..e9927854e2 100644
--- a/web/src/features/datasets/components/DatasetCompareRunsTable.tsx
+++ b/web/src/features/datasets/components/DatasetCompareRunsTable.tsx
@@ -1,7 +1,7 @@
/* eslint-disable no-nested-ternary */
import { DataTable } from "@/src/components/table/data-table";
import { DataTableToolbar } from "@/src/components/table/data-table-toolbar";
-import { FilteredRunPills } from "@/src/components/table/filtered-run-pills";
+import { FilteredRunPills } from "@/src/components/table/FilteredRunPills";
import { type LangfuseColumnDef } from "@/src/components/table/types";
import { createLinkTableColumn } from "@/src/components/design-system/table/columns/createLinkTableColumn";
import { createIOTableColumn } from "@/src/components/design-system/table/columns/createIOTableColumn";
diff --git a/web/src/features/evals/components/eval-version-callout.tsx b/web/src/features/evals/components/EvalVersionCallout.tsx
similarity index 98%
rename from web/src/features/evals/components/eval-version-callout.tsx
rename to web/src/features/evals/components/EvalVersionCallout.tsx
index 0c26c1d42f..dbff78e8a2 100644
--- a/web/src/features/evals/components/eval-version-callout.tsx
+++ b/web/src/features/evals/components/EvalVersionCallout.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @repo/component-file-structure */
import { Alert } from "@/src/components/design-system/Alert/Alert";
import { AlertTriangle } from "@langfuse/icons";
import { type EvalCapabilities } from "@/src/features/evals/hooks/useEvalCapabilities";
diff --git a/web/src/features/evals/components/evaluation-prompt-preview.tsx b/web/src/features/evals/components/EvaluationPromptPreview.tsx
similarity index 98%
rename from web/src/features/evals/components/evaluation-prompt-preview.tsx
rename to web/src/features/evals/components/EvaluationPromptPreview.tsx
index 475057ddc8..e8349b7ca7 100644
--- a/web/src/features/evals/components/evaluation-prompt-preview.tsx
+++ b/web/src/features/evals/components/EvaluationPromptPreview.tsx
@@ -1,4 +1,4 @@
-/* eslint-disable @repo/no-style-props, @repo/component-file-structure */
+/* eslint-disable @repo/no-style-props */
import { ItemBadge, type LangfuseItemType } from "@/src/components/ItemBadge";
import { Skeleton } from "@/src/components/ui/skeleton";
import { useExtractVariables } from "@/src/features/evals/hooks/useExtractVariables";
diff --git a/web/src/features/evals/components/evaluator-paused-callout.tsx b/web/src/features/evals/components/EvaluatorPausedCallout.tsx
similarity index 99%
rename from web/src/features/evals/components/evaluator-paused-callout.tsx
rename to web/src/features/evals/components/EvaluatorPausedCallout.tsx
index b851be1dc5..4b9ef61fec 100644
--- a/web/src/features/evals/components/evaluator-paused-callout.tsx
+++ b/web/src/features/evals/components/EvaluatorPausedCallout.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @repo/component-file-structure */
import { Button } from "@/src/components/ui/button";
import { showErrorToast, showSuccessToast } from "@/src/features/notifications";
import { api } from "@/src/utils/api";
diff --git a/web/src/features/evals/components/execution-count-tooltip.tsx b/web/src/features/evals/components/ExecutionCountTooltip.tsx
similarity index 95%
rename from web/src/features/evals/components/execution-count-tooltip.tsx
rename to web/src/features/evals/components/ExecutionCountTooltip.tsx
index b1fad31311..f5492c06db 100644
--- a/web/src/features/evals/components/execution-count-tooltip.tsx
+++ b/web/src/features/evals/components/ExecutionCountTooltip.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @repo/component-file-structure */
import { type EvalFormType } from "@/src/features/evals/utils/evaluator-form-utils";
import { api } from "@/src/utils/api";
import { compactNumberFormatter } from "@/src/utils/numbers";
diff --git a/web/src/features/evals/components/maintainer-tooltip.tsx b/web/src/features/evals/components/MaintainerTooltip.tsx
similarity index 87%
rename from web/src/features/evals/components/maintainer-tooltip.tsx
rename to web/src/features/evals/components/MaintainerTooltip.tsx
index c3e948d2aa..75e69578dd 100644
--- a/web/src/features/evals/components/maintainer-tooltip.tsx
+++ b/web/src/features/evals/components/MaintainerTooltip.tsx
@@ -1,7 +1,6 @@
-/* eslint-disable @repo/component-file-structure */
import { LangfuseIcon } from "@/src/components/design-system/LangfuseIcon/LangfuseIcon";
import { Tooltip } from "@/src/components/design-system/Tooltip/Tooltip";
-import { RagasLogoIcon } from "@/src/features/evals/components/ragas-logo";
+import { RagasLogoIcon } from "@/src/features/evals/components/RagasLogoIcon";
import { UserCircle2Icon } from "@langfuse/icons";
function MaintainerIcon({ maintainer }: { maintainer: string }) {
diff --git a/web/src/features/evals/components/ragas-logo.tsx b/web/src/features/evals/components/RagasLogoIcon.tsx
similarity index 87%
rename from web/src/features/evals/components/ragas-logo.tsx
rename to web/src/features/evals/components/RagasLogoIcon.tsx
index 9cdd053359..30af52ecac 100644
--- a/web/src/features/evals/components/ragas-logo.tsx
+++ b/web/src/features/evals/components/RagasLogoIcon.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @repo/component-file-structure */
import { env } from "@/src/env.mjs";
export const RagasLogoIcon = () => {
diff --git a/web/src/features/evals/components/eval-templates-table.tsx b/web/src/features/evals/components/eval-templates-table.tsx
index f0508cad4b..61fc312b32 100644
--- a/web/src/features/evals/components/eval-templates-table.tsx
+++ b/web/src/features/evals/components/eval-templates-table.tsx
@@ -38,7 +38,7 @@ import {
useSingleTemplateValidation,
} from "@/src/features/evals/hooks/useSingleTemplateValidation";
import { getMaintainer } from "@/src/features/evals/utils/typeHelpers";
-import { MaintainerTooltip } from "@/src/features/evals/components/maintainer-tooltip";
+import { MaintainerTooltip } from "@/src/features/evals/components/MaintainerTooltip";
import { ActionButton } from "@/src/components/ActionButton";
import { useEntitlementLimit } from "@/src/features/entitlements";
import { useHasProjectAccess } from "@/src/features/rbac";
diff --git a/web/src/features/evals/components/evaluator-detail.tsx b/web/src/features/evals/components/evaluator-detail.tsx
index d31dd0f4c3..af3b6c7d61 100644
--- a/web/src/features/evals/components/evaluator-detail.tsx
+++ b/web/src/features/evals/components/evaluator-detail.tsx
@@ -6,9 +6,9 @@ import EvalLogTable from "@/src/features/evals/components/eval-log";
import { StatusBadge } from "@/src/components/ui/StatusBadge/StatusBadge";
import { DetailPageNav } from "@/src/features/navigate-detail-pages";
import Page from "@/src/components/layouts/page";
-import { LevelCountsDisplay } from "@/src/components/level-counts-display";
+import { LevelCountsDisplay } from "@/src/components/LevelCountsDisplay";
import { generateJobExecutionCounts } from "@/src/features/evals/utils/job-execution-utils";
-import { EvaluatorPausedCallout } from "@/src/features/evals/components/evaluator-paused-callout";
+import { EvaluatorPausedCallout } from "@/src/features/evals/components/EvaluatorPausedCallout";
import {
type EvalTargetObject,
validateEvaluatorFiltersForTarget,
diff --git a/web/src/features/evals/components/evaluator-selector.tsx b/web/src/features/evals/components/evaluator-selector.tsx
index 7e44257083..46872f5d12 100644
--- a/web/src/features/evals/components/evaluator-selector.tsx
+++ b/web/src/features/evals/components/evaluator-selector.tsx
@@ -23,7 +23,7 @@ import {
} from "@/src/components/ui/tooltip";
import { useSingleTemplateValidation } from "@/src/features/evals/hooks/useSingleTemplateValidation";
import { getMaintainer } from "@/src/features/evals/utils/typeHelpers";
-import { MaintainerTooltip } from "@/src/features/evals/components/maintainer-tooltip";
+import { MaintainerTooltip } from "@/src/features/evals/components/MaintainerTooltip";
import Link from "next/link";
import { useIsCodeEvalEnabled } from "@/src/features/evals/hooks/useIsCodeEvalEnabled";
import { shouldShowEvalTemplate } from "@/src/features/evals/utils/code-eval-template-utils";
diff --git a/web/src/features/evals/components/evaluator-table.tsx b/web/src/features/evals/components/evaluator-table.tsx
index df191d0d53..b1f226ac78 100644
--- a/web/src/features/evals/components/evaluator-table.tsx
+++ b/web/src/features/evals/components/evaluator-table.tsx
@@ -1,6 +1,6 @@
/* eslint-disable no-nested-ternary, @repo/component-file-structure, @typescript-eslint/no-deprecated -- Legacy UI usage retained during migration to design-system components. */
import { encodeFiltersGeneric } from "@langfuse/shared";
-import { LevelCountsDisplay } from "@/src/components/level-counts-display";
+import { LevelCountsDisplay } from "@/src/components/LevelCountsDisplay";
import { DataTable } from "@/src/components/table/data-table";
import { DataTableToolbar } from "@/src/components/table/data-table-toolbar";
import {
@@ -48,7 +48,7 @@ import {
} from "@/src/features/evals/components/evaluator-form";
import { useRouter } from "next/router";
import { DeleteEvalConfigButton } from "@/src/components/deleteButton";
-import { MaintainerTooltip } from "@/src/features/evals/components/maintainer-tooltip";
+import { MaintainerTooltip } from "@/src/features/evals/components/MaintainerTooltip";
import { useHasProjectAccess } from "@/src/features/rbac";
import { Skeleton } from "@/src/components/ui/skeleton";
import { usdFormatter } from "@/src/utils/numbers";
diff --git a/web/src/features/evals/components/inner-evaluator-form.tsx b/web/src/features/evals/components/inner-evaluator-form.tsx
index 21308dc2da..e84211f688 100644
--- a/web/src/features/evals/components/inner-evaluator-form.tsx
+++ b/web/src/features/evals/components/inner-evaluator-form.tsx
@@ -57,7 +57,7 @@ import {
} from "@/src/features/evals/utils/evaluator-form-utils";
import { validateAndTransformVariableMapping } from "@/src/features/evals/utils/variable-mapping-validation";
import { useVariableMappingSync } from "@/src/features/evals/hooks/useVariableMappingSync";
-import { ExecutionCountTooltip } from "@/src/features/evals/components/execution-count-tooltip";
+import { ExecutionCountTooltip } from "@/src/features/evals/components/ExecutionCountTooltip";
import {
getDateFromOption,
type TableDateRange,
@@ -67,7 +67,7 @@ import { type EvalCapabilities } from "@/src/features/evals/hooks/useEvalCapabil
import {
EvalVersionCallout,
getEvalVersionCalloutContent,
-} from "@/src/features/evals/components/eval-version-callout";
+} from "@/src/features/evals/components/EvalVersionCallout";
import { Skeleton } from "@/src/components/ui/skeleton";
import {
Dialog,
diff --git a/web/src/features/evals/components/template-selector.tsx b/web/src/features/evals/components/template-selector.tsx
index c68e5c328e..bdf1fa7fdf 100644
--- a/web/src/features/evals/components/template-selector.tsx
+++ b/web/src/features/evals/components/template-selector.tsx
@@ -37,7 +37,7 @@ import {
} from "@/src/components/ui/tooltip";
import { useSingleTemplateValidation } from "@/src/features/evals/hooks/useSingleTemplateValidation";
import { getMaintainer } from "@/src/features/evals/utils/typeHelpers";
-import { MaintainerTooltip } from "@/src/features/evals/components/maintainer-tooltip";
+import { MaintainerTooltip } from "@/src/features/evals/components/MaintainerTooltip";
import { env } from "@/src/env.mjs";
import { useIsCodeEvalEnabled } from "@/src/features/evals/hooks/useIsCodeEvalEnabled";
import { shouldShowEvalTemplate } from "@/src/features/evals/utils/code-eval-template-utils";
diff --git a/web/src/features/evals/components/variable-mapping-card.tsx b/web/src/features/evals/components/variable-mapping-card.tsx
index 208fcaa6b5..98140851cc 100644
--- a/web/src/features/evals/components/variable-mapping-card.tsx
+++ b/web/src/features/evals/components/variable-mapping-card.tsx
@@ -27,7 +27,7 @@ import { VariableMappingDescription } from "@/src/features/evals/components/eval
import {
EvaluationPromptPreview,
getVariableColor,
-} from "@/src/features/evals/components/evaluation-prompt-preview";
+} from "@/src/features/evals/components/EvaluationPromptPreview";
import { Skeleton } from "@/src/components/ui/skeleton";
import {
isEventTarget,
diff --git a/web/src/features/evals/pages/new-evaluator.tsx b/web/src/features/evals/pages/new-evaluator.tsx
index 370410a451..c28688debf 100644
--- a/web/src/features/evals/pages/new-evaluator.tsx
+++ b/web/src/features/evals/pages/new-evaluator.tsx
@@ -15,7 +15,7 @@ import { RunEvaluatorForm } from "@/src/features/evals/components/run-evaluator-
import { api } from "@/src/utils/api";
import { useHasProjectAccess } from "@/src/features/rbac";
import { getMaintainer } from "@/src/features/evals/utils/typeHelpers";
-import { MaintainerTooltip } from "@/src/features/evals/components/maintainer-tooltip";
+import { MaintainerTooltip } from "@/src/features/evals/components/MaintainerTooltip";
import { DefaultEvalModelSetup } from "@/src/features/evals/components/default-eval-model-setup";
import { useIsCodeEvalEnabled } from "@/src/features/evals/hooks/useIsCodeEvalEnabled";
import {
diff --git a/web/src/features/evals/v2/components/Evaluators/Testing/components/SampleObservationSelectorBase/SampleObservationSelectorBase.tsx b/web/src/features/evals/v2/components/Evaluators/Testing/components/SampleObservationSelectorBase/SampleObservationSelectorBase.tsx
index 3bfc79a18e..ad217ab74f 100644
--- a/web/src/features/evals/v2/components/Evaluators/Testing/components/SampleObservationSelectorBase/SampleObservationSelectorBase.tsx
+++ b/web/src/features/evals/v2/components/Evaluators/Testing/components/SampleObservationSelectorBase/SampleObservationSelectorBase.tsx
@@ -17,7 +17,7 @@ import { createDateTableColumn } from "@/src/components/design-system/table/colu
import { createIOTableColumn } from "@/src/components/design-system/table/columns/createIOTableColumn";
import { createTextTableColumn } from "@/src/components/design-system/table/columns/createTextTableColumn";
import { DataTable } from "@/src/components/table/data-table";
-import { DataTableColumnVisibilityFilter } from "@/src/components/table/data-table-column-visibility-filter";
+import { DataTableColumnVisibilityFilter } from "@/src/components/table/DataTableColumnVisibilityFilter";
import {
resolveRowHeightRendering,
useRowHeightLocalStorage,
diff --git a/web/src/features/evals/v2/pages/EvaluatorSetupPage.tsx b/web/src/features/evals/v2/pages/EvaluatorSetupPage.tsx
index d2c3eb4403..7d66e09b09 100644
--- a/web/src/features/evals/v2/pages/EvaluatorSetupPage.tsx
+++ b/web/src/features/evals/v2/pages/EvaluatorSetupPage.tsx
@@ -39,7 +39,7 @@ import { trpcErrorToast } from "@/src/utils/trpcErrorToast";
import { classifyTrpcToastError } from "@/src/utils/trpcErrorClassification";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { detailPageListKeys } from "@/src/features/navigate-detail-pages";
-import { TableHeaderControls } from "@/src/components/table/table-header-controls";
+import { TableHeaderControls } from "@/src/components/table/TableHeaderControls";
import { useTableDateRange } from "@/src/hooks/useTableDateRange";
import { toAbsoluteTimeRange } from "@/src/utils/date-range-utils";
import {
diff --git a/web/src/features/events/components/EventsTable.tsx b/web/src/features/events/components/EventsTable.tsx
index 0e2ae8434a..847c1f8de7 100644
--- a/web/src/features/events/components/EventsTable.tsx
+++ b/web/src/features/events/components/EventsTable.tsx
@@ -14,7 +14,7 @@ import {
import { EmptyValue } from "@/src/components/design-system/table/components/EmptyValue/EmptyValue";
import { DataTable } from "@/src/components/table/data-table";
-import { TRACING_PAGE_SIZE_OPTIONS } from "@/src/components/table/data-table-pagination";
+import { TRACING_PAGE_SIZE_OPTIONS } from "@/src/components/table/DataTablePagination";
import { DataTableToolbar } from "@/src/components/table/data-table-toolbar";
import {
DataTableControlsProvider,
@@ -96,7 +96,7 @@ import {
type TableDateRange,
TABLE_AGGREGATION_OPTIONS,
} from "@/src/utils/date-range-utils";
-import { TableHeaderControls } from "@/src/components/table/table-header-controls";
+import { TableHeaderControls } from "@/src/components/table/TableHeaderControls";
import { TimeRangePicker } from "@/src/components/date-picker";
import { DataTableRefreshButton } from "@/src/components/table/data-table-refresh-button";
import { MobileFiltersSheet } from "@/src/features/events/components/MobileFiltersSheet";
diff --git a/web/src/features/experiments/components/table/ExperimentItemsTable.tsx b/web/src/features/experiments/components/table/ExperimentItemsTable.tsx
index 0c316b9c6d..650521e2e8 100644
--- a/web/src/features/experiments/components/table/ExperimentItemsTable.tsx
+++ b/web/src/features/experiments/components/table/ExperimentItemsTable.tsx
@@ -42,7 +42,7 @@ import {
itemRegressionFilterAppliedProps,
scoreColumnScopeToggledProps,
} from "@/src/features/experiments/lib/analytics";
-import { type ColumnGroupTogglePayload } from "@/src/components/table/data-table-column-visibility-filter";
+import { type ColumnGroupTogglePayload } from "@/src/components/table/DataTableColumnVisibilityFilter";
import { useOrderByState } from "@/src/features/orderBy";
import {
customRowHeightMenu,
diff --git a/web/src/features/experiments/components/table/ExperimentScoreMatrix.tsx b/web/src/features/experiments/components/table/ExperimentScoreMatrix.tsx
index 108c61417a..196fd9319e 100644
--- a/web/src/features/experiments/components/table/ExperimentScoreMatrix.tsx
+++ b/web/src/features/experiments/components/table/ExperimentScoreMatrix.tsx
@@ -9,7 +9,7 @@ import {
type Table as TanStackTable,
} from "@tanstack/react-table";
import { Skeleton } from "@/src/components/ui/skeleton";
-import { DataTablePagination } from "@/src/components/table/data-table-pagination";
+import { DataTablePagination } from "@/src/components/table/DataTablePagination";
import {
Tooltip,
TooltipContent,
diff --git a/web/src/features/experiments/components/table/ExperimentsTable.tsx b/web/src/features/experiments/components/table/ExperimentsTable.tsx
index 8c46318a57..c22850373c 100644
--- a/web/src/features/experiments/components/table/ExperimentsTable.tsx
+++ b/web/src/features/experiments/components/table/ExperimentsTable.tsx
@@ -45,7 +45,7 @@ import {
} from "@/src/components/table/data-table-row-height-switch";
import { useTableDateRange } from "@/src/hooks/useTableDateRange";
import { toAbsoluteTimeRange } from "@/src/utils/date-range-utils";
-import { TableHeaderControls } from "@/src/components/table/table-header-controls";
+import { TableHeaderControls } from "@/src/components/table/TableHeaderControls";
import {
useColumnOrder,
useColumnVisibility,
@@ -95,7 +95,7 @@ import {
comparisonChangedProps,
scoreColumnScopeToggledProps,
} from "@/src/features/experiments/lib/analytics";
-import { type ColumnGroupTogglePayload } from "@/src/components/table/data-table-column-visibility-filter";
+import { type ColumnGroupTogglePayload } from "@/src/components/table/DataTableColumnVisibilityFilter";
/**
* LFE-10460: the metadata column's default position moved from last to right
diff --git a/web/src/features/external-media-storage/ExternalMediaStoragePage.tsx b/web/src/features/external-media-storage/ExternalMediaStoragePage.tsx
index 045f6962bd..9e7aebc58e 100644
--- a/web/src/features/external-media-storage/ExternalMediaStoragePage.tsx
+++ b/web/src/features/external-media-storage/ExternalMediaStoragePage.tsx
@@ -1,7 +1,7 @@
import Link from "next/link";
import { useRouter } from "next/router";
-import ContainerPage from "@/src/components/layouts/container-page";
+import ContainerPage from "@/src/components/layouts/ContainerPage";
import Header from "@/src/components/layouts/header";
import { Button as DesignSystemButton } from "@/src/components/design-system/Button/Button";
import { ConfirmationDialogController } from "@/src/components/design-system/ConfirmationDialogController/ConfirmationDialogController";
diff --git a/web/src/features/mixpanel-integration/MixpanelIntegrationPage.tsx b/web/src/features/mixpanel-integration/MixpanelIntegrationPage.tsx
index 4975dc0e77..fcb2deaf98 100644
--- a/web/src/features/mixpanel-integration/MixpanelIntegrationPage.tsx
+++ b/web/src/features/mixpanel-integration/MixpanelIntegrationPage.tsx
@@ -1,7 +1,7 @@
/* eslint-disable @typescript-eslint/no-deprecated -- Legacy UI usage retained during migration to design-system components. */
import { MixpanelLogo } from "@/src/components/MixpanelLogo";
import Header from "@/src/components/layouts/header";
-import ContainerPage from "@/src/components/layouts/container-page";
+import ContainerPage from "@/src/components/layouts/ContainerPage";
import { StatusBadge } from "@/src/components/ui/StatusBadge/StatusBadge";
import { Button } from "@/src/components/ui/button";
import {
diff --git a/web/src/features/monitors/components/MonitorsOnboarding.tsx b/web/src/features/monitors/components/MonitorsOnboarding.tsx
index 939b567221..7222683bb6 100644
--- a/web/src/features/monitors/components/MonitorsOnboarding.tsx
+++ b/web/src/features/monitors/components/MonitorsOnboarding.tsx
@@ -4,7 +4,7 @@ import { DropdownIndicator } from "@/src/components/design-system/DropdownIndica
import { ActionButton } from "@/src/components/ActionButton";
import { Button } from "@/src/components/ui/button";
-import { SplashScreen } from "@/src/components/ui/splash-screen";
+import { SplashScreen } from "@/src/components/ui/SplashScreen";
import { automationCreateHref } from "@/src/features/automations";
import { type ActionTypes } from "@langfuse/shared";
diff --git a/web/src/features/organizations/components/ProjectOverview.tsx b/web/src/features/organizations/components/ProjectOverview.tsx
index c1971be545..07e54d5d71 100644
--- a/web/src/features/organizations/components/ProjectOverview.tsx
+++ b/web/src/features/organizations/components/ProjectOverview.tsx
@@ -31,7 +31,7 @@ import {
createProjectRoute,
} from "@/src/features/setup";
import { isCloudPlan, planLabels } from "@langfuse/shared";
-import ContainerPage from "@/src/components/layouts/container-page";
+import ContainerPage from "@/src/components/layouts/ContainerPage";
import { type Session } from "next-auth";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { AgentToolsBanner } from "@/src/features/developer-tools";
diff --git a/web/src/features/posthog-integration/PostHogIntegrationPage.tsx b/web/src/features/posthog-integration/PostHogIntegrationPage.tsx
index bb0377cc41..dd894b7972 100644
--- a/web/src/features/posthog-integration/PostHogIntegrationPage.tsx
+++ b/web/src/features/posthog-integration/PostHogIntegrationPage.tsx
@@ -1,7 +1,7 @@
/* eslint-disable no-nested-ternary */
import { PostHogLogo } from "@/src/components/PostHogLogo";
import Header from "@/src/components/layouts/header";
-import ContainerPage from "@/src/components/layouts/container-page";
+import ContainerPage from "@/src/components/layouts/ContainerPage";
import { StatusBadge } from "@/src/components/ui/StatusBadge/StatusBadge";
import { Button } from "@/src/components/design-system/Button/Button";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
diff --git a/web/src/features/projects/ProjectSettingsPage.tsx b/web/src/features/projects/ProjectSettingsPage.tsx
index 660de52076..a9d147ddbd 100644
--- a/web/src/features/projects/ProjectSettingsPage.tsx
+++ b/web/src/features/projects/ProjectSettingsPage.tsx
@@ -29,7 +29,7 @@ import { BatchActionsSettingsPage } from "@/src/features/batch-actions";
import { AuditLogsSettingsPage } from "@/src/ee/features/audit-log-viewer";
import { ModelsSettings } from "@/src/features/models";
import ConfigureRetention from "@/src/features/projects/components/ConfigureRetention";
-import ContainerPage from "@/src/components/layouts/container-page";
+import ContainerPage from "@/src/components/layouts/ContainerPage";
import { NoDataOrLoading } from "@/src/components/NoDataOrLoading";
import { ProtectedLabelsSettings } from "@/src/features/prompts";
import { SiSlack } from "@langfuse/icons/si";
diff --git a/web/src/features/prompts/PromptMetricsPage.tsx b/web/src/features/prompts/PromptMetricsPage.tsx
index 459a94d985..094e75c53c 100644
--- a/web/src/features/prompts/PromptMetricsPage.tsx
+++ b/web/src/features/prompts/PromptMetricsPage.tsx
@@ -36,7 +36,7 @@ import useProjectIdFromURL from "@/src/hooks/useProjectIdFromURL";
import { useTableDateRange } from "@/src/hooks/useTableDateRange";
import { toAbsoluteTimeRange } from "@/src/utils/date-range-utils";
import { useMemo } from "react";
-import { TableHeaderControls } from "@/src/components/table/table-header-controls";
+import { TableHeaderControls } from "@/src/components/table/TableHeaderControls";
export type PromptVersionTableRow = {
version: number;
diff --git a/web/src/features/prompts/components/prompt-detail.tsx b/web/src/features/prompts/components/prompt-detail.tsx
index 7b1ed31e98..a25550ec9d 100644
--- a/web/src/features/prompts/components/prompt-detail.tsx
+++ b/web/src/features/prompts/components/prompt-detail.tsx
@@ -44,7 +44,7 @@ import {
import { DropdownIndicator } from "@/src/components/design-system/DropdownIndicator/DropdownIndicator";
import { useHasProjectAccess } from "@/src/features/rbac";
import { Button } from "@/src/components/ui/button";
-import { ActionButtonCountBadge } from "@/src/components/ui/action-button-count-badge";
+import { ActionButtonCountBadge } from "@/src/components/ui/ActionButtonCountBadge";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import {
Dialog,
diff --git a/web/src/features/scores/ScoresTable.tsx b/web/src/features/scores/ScoresTable.tsx
index d468d4d071..2efab09f4f 100644
--- a/web/src/features/scores/ScoresTable.tsx
+++ b/web/src/features/scores/ScoresTable.tsx
@@ -68,7 +68,7 @@ import { useOrderByState } from "@/src/features/orderBy";
import { useTableDateRange } from "@/src/hooks/useTableDateRange";
import { toAbsoluteTimeRange } from "@/src/utils/date-range-utils";
import { api } from "@/src/utils/api";
-import { TableHeaderControls } from "@/src/components/table/table-header-controls";
+import { TableHeaderControls } from "@/src/components/table/TableHeaderControls";
import type { RouterOutput } from "@/src/utils/types";
import { TagList } from "@/src/features/tag";
diff --git a/web/src/features/sessions/SessionPages.tsx b/web/src/features/sessions/SessionPages.tsx
index 27d4620786..cd5b8aa5a4 100644
--- a/web/src/features/sessions/SessionPages.tsx
+++ b/web/src/features/sessions/SessionPages.tsx
@@ -30,7 +30,7 @@ import React, {
import { useVirtualizer } from "@tanstack/react-virtual";
import { AnnotateDrawerController } from "@/src/features/scores";
import { type AnnotateDrawerPayload } from "@/src/features/scores/components/AnnotateDrawerController";
-import { ActionButtonCountBadge } from "@/src/components/ui/action-button-count-badge";
+import { ActionButtonCountBadge } from "@/src/components/ui/ActionButtonCountBadge";
import { Button } from "@/src/components/ui/button";
import {
CommentDrawerController,
diff --git a/web/src/features/sessions/SessionTraceActionButtons.tsx b/web/src/features/sessions/SessionTraceActionButtons.tsx
index b5c4261d3c..d37e985b22 100644
--- a/web/src/features/sessions/SessionTraceActionButtons.tsx
+++ b/web/src/features/sessions/SessionTraceActionButtons.tsx
@@ -1,7 +1,7 @@
/* eslint-disable @repo/no-style-props */
import { api, type RouterOutputs } from "@/src/utils/api";
import { getNumberFromMap } from "@/src/utils/map-utils";
-import { ActionButtonCountBadge } from "@/src/components/ui/action-button-count-badge";
+import { ActionButtonCountBadge } from "@/src/components/ui/ActionButtonCountBadge";
import { Button } from "@/src/components/ui/button";
import { AnnotateDrawerController } from "@/src/features/scores";
import { CommentDrawerController } from "@/src/features/comments";
diff --git a/web/src/features/sessions/SessionsTable.tsx b/web/src/features/sessions/SessionsTable.tsx
index 75a56bc02c..1af2578bd4 100644
--- a/web/src/features/sessions/SessionsTable.tsx
+++ b/web/src/features/sessions/SessionsTable.tsx
@@ -1,6 +1,6 @@
/* eslint-disable no-nested-ternary */
import { DataTable } from "@/src/components/table/data-table";
-import { TRACING_PAGE_SIZE_OPTIONS } from "@/src/components/table/data-table-pagination";
+import { TRACING_PAGE_SIZE_OPTIONS } from "@/src/components/table/DataTablePagination";
import { DataTableToolbar } from "@/src/components/table/data-table-toolbar";
import {
DataTableControlsProvider,
@@ -64,7 +64,7 @@ import {
useCompactRows,
useRowHeightLocalStorage,
} from "@/src/components/table/data-table-row-height-switch";
-import { TableHeaderControls } from "@/src/components/table/table-header-controls";
+import { TableHeaderControls } from "@/src/components/table/TableHeaderControls";
import { cn } from "@/src/utils/tailwind";
import { useTableViewManager } from "@/src/components/table/table-view-presets/hooks/useTableViewManager";
import { useTableViewFilterChange } from "@/src/components/table/table-view-presets/hooks/useTableViewFilterChange";
diff --git a/web/src/features/settings/SettingsPage.tsx b/web/src/features/settings/SettingsPage.tsx
index 8702968755..460c16e8e1 100644
--- a/web/src/features/settings/SettingsPage.tsx
+++ b/web/src/features/settings/SettingsPage.tsx
@@ -2,7 +2,7 @@ import { type ComponentProps } from "react";
import { useRouter } from "next/router";
import { useSession } from "next-auth/react";
import { PagedSettingsContainer } from "@/src/components/PagedSettingsContainer";
-import ContainerPage from "@/src/components/layouts/container-page";
+import ContainerPage from "@/src/components/layouts/ContainerPage";
import { NoDataOrLoading } from "@/src/components/NoDataOrLoading";
import { OrganizationDropdownMenu } from "@/src/components/OrganizationDropdownMenu/OrganizationDropdownMenu";
import { DropdownIndicator } from "@/src/components/design-system/DropdownIndicator/DropdownIndicator";
diff --git a/web/src/features/setup/components/SetupPage.tsx b/web/src/features/setup/components/SetupPage.tsx
index e171f80b11..a1a8ed3931 100644
--- a/web/src/features/setup/components/SetupPage.tsx
+++ b/web/src/features/setup/components/SetupPage.tsx
@@ -1,5 +1,5 @@
import Header from "@/src/components/layouts/header";
-import ContainerPage from "@/src/components/layouts/container-page";
+import ContainerPage from "@/src/components/layouts/ContainerPage";
import {
Breadcrumb,
BreadcrumbItem,
diff --git a/web/src/features/setup/components/TracesSetupOnboardingCard.tsx b/web/src/features/setup/components/TracesSetupOnboardingCard.tsx
index aad91597eb..168e70a4f0 100644
--- a/web/src/features/setup/components/TracesSetupOnboardingCard.tsx
+++ b/web/src/features/setup/components/TracesSetupOnboardingCard.tsx
@@ -1,7 +1,7 @@
import { ActionButton } from "@/src/components/ActionButton";
import { Badge } from "@/src/components/ui/badge";
import { Button } from "@/src/components/ui/button";
-import { SplashScreen } from "@/src/components/ui/splash-screen";
+import { SplashScreen } from "@/src/components/ui/SplashScreen";
import { copyTextToClipboard } from "@/src/utils/clipboard";
import { ApiKeyDetailContent } from "@/src/features/public-api/components/ApiKeyDetailContent";
import { useLangfuseBaseUrl } from "@/src/features/public-api/hooks/useLangfuseEnvCode";
diff --git a/web/src/features/skills/components/SkillAnalytics.tsx b/web/src/features/skills/components/SkillAnalytics.tsx
index 29d6c7aeba..d1c8d23665 100644
--- a/web/src/features/skills/components/SkillAnalytics.tsx
+++ b/web/src/features/skills/components/SkillAnalytics.tsx
@@ -8,7 +8,7 @@ import { createNumberTableColumn } from "@/src/components/design-system/table/co
import { IconButton } from "@/src/components/design-system/IconButton/IconButton";
import { StatusMessage } from "@/src/components/design-system/StatusMessage/StatusMessage";
import { Skeleton } from "@/src/components/ui/skeleton";
-import { TableHeaderControls } from "@/src/components/table/table-header-controls";
+import { TableHeaderControls } from "@/src/components/table/TableHeaderControls";
import { PageHeaderControlsPortal } from "@/src/components/layouts/page-header-controls-slot";
import { useTableDateRange } from "@/src/hooks/useTableDateRange";
import { rangeToString, type TimeRange } from "@/src/utils/date-range-utils";
diff --git a/web/src/features/skills/components/SkillLinkedTraces.tsx b/web/src/features/skills/components/SkillLinkedTraces.tsx
index f8a24f8524..4dbd927557 100644
--- a/web/src/features/skills/components/SkillLinkedTraces.tsx
+++ b/web/src/features/skills/components/SkillLinkedTraces.tsx
@@ -1,5 +1,5 @@
import EventsTable from "@/src/features/events/components/EventsTable";
-import { TableHeaderControls } from "@/src/components/table/table-header-controls";
+import { TableHeaderControls } from "@/src/components/table/TableHeaderControls";
import { useTableDateRange } from "@/src/hooks/useTableDateRange";
export function SkillLinkedTraces({
diff --git a/web/src/features/skills/components/SkillsPage.tsx b/web/src/features/skills/components/SkillsPage.tsx
index 24d3e8a070..aa591e6e14 100644
--- a/web/src/features/skills/components/SkillsPage.tsx
+++ b/web/src/features/skills/components/SkillsPage.tsx
@@ -21,7 +21,7 @@ import { Button as DesignSystemButton } from "@/src/components/design-system/But
import { Dialog } from "@/src/components/design-system/Dialog/Dialog";
import { DialogController } from "@/src/components/design-system/DialogController/DialogController";
import { PaginationBar } from "@/src/components/design-system/PaginationBar/PaginationBar";
-import { SplashScreen } from "@/src/components/ui/splash-screen";
+import { SplashScreen } from "@/src/components/ui/SplashScreen";
import {
Table,
type AsyncTableData,
diff --git a/web/src/features/slack/SlackIntegrationPage.tsx b/web/src/features/slack/SlackIntegrationPage.tsx
index 7f7e03fa7b..dc2f573f21 100644
--- a/web/src/features/slack/SlackIntegrationPage.tsx
+++ b/web/src/features/slack/SlackIntegrationPage.tsx
@@ -1,4 +1,4 @@
-import ContainerPage from "@/src/components/layouts/container-page";
+import ContainerPage from "@/src/components/layouts/ContainerPage";
import { StatusBadge } from "@/src/components/ui/StatusBadge/StatusBadge";
import { AutomationButton } from "@/src/features/automations";
import { SlackConnectionCard } from "@/src/features/slack/components/SlackConnectionCard";
diff --git a/web/src/features/support-chat/IntroSection.tsx b/web/src/features/support-chat/IntroSection.tsx
index 66c8ab5d11..16f6c44e53 100644
--- a/web/src/features/support-chat/IntroSection.tsx
+++ b/web/src/features/support-chat/IntroSection.tsx
@@ -10,7 +10,7 @@ import {
Calendar,
} from "@langfuse/icons";
import { SiDiscord, SiGithub } from "@langfuse/icons/si";
-import { RainbowButton } from "@/src/components/magicui/rainbow-button";
+import { RainbowButton } from "@/src/components/magicui/RainbowButton";
import { Separator } from "@/src/components/ui/separator";
import { usePlan } from "@/src/features/entitlements";
import { isCloudPlan } from "@langfuse/shared";
diff --git a/web/src/features/topics/TopicSetupNotice.tsx b/web/src/features/topics/TopicSetupNotice.tsx
index 901f3f28ea..27023abe2d 100644
--- a/web/src/features/topics/TopicSetupNotice.tsx
+++ b/web/src/features/topics/TopicSetupNotice.tsx
@@ -2,7 +2,7 @@ import { Sparkles } from "@langfuse/icons";
import { Alert } from "@/src/components/design-system/Alert/Alert";
import { Button } from "@/src/components/design-system/Button/Button";
import { StatusBadge } from "@/src/components/ui/StatusBadge/StatusBadge";
-import { SplashScreen } from "@/src/components/ui/splash-screen";
+import { SplashScreen } from "@/src/components/ui/SplashScreen";
import { type TopicSetupNoticeState } from "./TopicModelSettings";
type TopicSetupNoticeProps = {
diff --git a/web/src/features/traces/TracesSetupPage.tsx b/web/src/features/traces/TracesSetupPage.tsx
index 6008fbb2f7..ce7232e105 100644
--- a/web/src/features/traces/TracesSetupPage.tsx
+++ b/web/src/features/traces/TracesSetupPage.tsx
@@ -3,7 +3,7 @@ import React, { useEffect, useState } from "react";
import { useRouter } from "next/router";
import { api, reportNonTrpcError } from "@/src/utils/api";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
-import ContainerPage from "@/src/components/layouts/container-page";
+import ContainerPage from "@/src/components/layouts/ContainerPage";
import { ActionButton } from "@/src/components/ActionButton";
import { SubHeader } from "@/src/components/layouts/header";
import { Button } from "@/src/components/ui/button";
diff --git a/web/src/features/traces/TracesTable.tsx b/web/src/features/traces/TracesTable.tsx
index 920ca2a28f..2ff32b7ecc 100644
--- a/web/src/features/traces/TracesTable.tsx
+++ b/web/src/features/traces/TracesTable.tsx
@@ -1,6 +1,6 @@
/* eslint-disable no-nested-ternary */
import { DataTable } from "@/src/components/table/data-table";
-import { TRACING_PAGE_SIZE_OPTIONS } from "@/src/components/table/data-table-pagination";
+import { TRACING_PAGE_SIZE_OPTIONS } from "@/src/components/table/DataTablePagination";
import { DataTableToolbar } from "@/src/components/table/data-table-toolbar";
import {
DataTableControlsProvider,
@@ -87,7 +87,7 @@ import { showSuccessToast } from "@/src/features/notifications";
import {
LevelCountsDisplay,
type LevelCount,
-} from "@/src/components/level-counts-display";
+} from "@/src/components/LevelCountsDisplay";
import { DropdownMenuItem } from "@/src/components/ui/dropdown-menu";
import {
type UseSidebarFilterStateOptions,
@@ -115,7 +115,7 @@ import {
REFRESH_INTERVALS,
type RefreshInterval,
} from "@/src/components/table/utils/refresh-intervals";
-import { TableHeaderControls } from "@/src/components/table/table-header-controls";
+import { TableHeaderControls } from "@/src/components/table/TableHeaderControls";
import { usePeekTableState } from "@/src/components/table/peek/contexts/PeekTableStateContext";
import { useScoreColumns, scoreFilters } from "@/src/features/scores";
import { AddTracesToAnnotationQueueDialogController } from "@/src/features/annotation-queues";
diff --git a/web/src/features/traces/components/ObservationDetailView/components/ObservationDetailViewHeader/ObservationDetailViewHeader.tsx b/web/src/features/traces/components/ObservationDetailView/components/ObservationDetailViewHeader/ObservationDetailViewHeader.tsx
index 0b5d76a028..45d1febabb 100644
--- a/web/src/features/traces/components/ObservationDetailView/components/ObservationDetailViewHeader/ObservationDetailViewHeader.tsx
+++ b/web/src/features/traces/components/ObservationDetailView/components/ObservationDetailViewHeader/ObservationDetailViewHeader.tsx
@@ -52,7 +52,7 @@ import { ConnectedDetailHeaderActionsMenuController } from "@/src/features/trace
import { useViewPreferences } from "@/src/features/traces/contexts/ViewPreferencesContext";
import { useReadPath } from "@/src/features/events";
import { Button } from "@/src/components/ui/button";
-import { ActionButtonCountBadge } from "@/src/components/ui/action-button-count-badge";
+import { ActionButtonCountBadge } from "@/src/components/ui/ActionButtonCountBadge";
import {
EllipsisVertical,
LockIcon,
diff --git a/web/src/features/traces/components/TraceDetailView/components/TraceDetailViewHeader.tsx b/web/src/features/traces/components/TraceDetailView/components/TraceDetailViewHeader.tsx
index bb311f297c..7b2d38ddbf 100644
--- a/web/src/features/traces/components/TraceDetailView/components/TraceDetailViewHeader.tsx
+++ b/web/src/features/traces/components/TraceDetailView/components/TraceDetailViewHeader.tsx
@@ -28,7 +28,7 @@ import { Skeleton } from "@/src/components/ui/skeleton";
import { cn } from "@/src/utils/tailwind";
import { ConnectedDetailHeaderActionsMenuController } from "@/src/features/traces/components/DetailHeaderActionsMenuController";
import { AnnotateDrawerController } from "@/src/features/scores";
-import { ActionButtonCountBadge } from "@/src/components/ui/action-button-count-badge";
+import { ActionButtonCountBadge } from "@/src/components/ui/ActionButtonCountBadge";
import { ConnectedTraceObservationAddToDropdownMenuController } from "@/src/features/traces/components/ConnectedTraceObservationAddToDropdownMenuController";
import {
EnvironmentBadge,
diff --git a/web/src/features/tracing-tables/observations/ObservationsTable.tsx b/web/src/features/tracing-tables/observations/ObservationsTable.tsx
index 53d25df8db..b4a3970ac5 100644
--- a/web/src/features/tracing-tables/observations/ObservationsTable.tsx
+++ b/web/src/features/tracing-tables/observations/ObservationsTable.tsx
@@ -1,7 +1,7 @@
/* eslint-disable no-nested-ternary */
import { api } from "@/src/utils/api";
import { DataTable } from "@/src/components/table/data-table";
-import { TRACING_PAGE_SIZE_OPTIONS } from "@/src/components/table/data-table-pagination";
+import { TRACING_PAGE_SIZE_OPTIONS } from "@/src/components/table/DataTablePagination";
import { DataTableToolbar } from "@/src/components/table/data-table-toolbar";
import {
DataTableControlsProvider,
@@ -78,7 +78,7 @@ import {
toAbsoluteTimeRange,
type TableDateRange,
} from "@/src/utils/date-range-utils";
-import { TableHeaderControls } from "@/src/components/table/table-header-controls";
+import { TableHeaderControls } from "@/src/components/table/TableHeaderControls";
import { BatchExportTableButton } from "@/src/components/BatchExportTableButton";
import { useHasProjectAccess } from "@/src/features/rbac";
import {
diff --git a/web/src/features/users/UsersTable.tsx b/web/src/features/users/UsersTable.tsx
index 4cbdb66472..d9ff72bc28 100644
--- a/web/src/features/users/UsersTable.tsx
+++ b/web/src/features/users/UsersTable.tsx
@@ -53,7 +53,7 @@ import {
import { joinTableCoreAndMetrics } from "@/src/components/table/utils/joinTableCoreAndMetrics";
import { useTableDateRange } from "@/src/hooks/useTableDateRange";
import { toAbsoluteTimeRange } from "@/src/utils/date-range-utils";
-import { TableHeaderControls } from "@/src/components/table/table-header-controls";
+import { TableHeaderControls } from "@/src/components/table/TableHeaderControls";
type RowData = {
userId: string;
diff --git a/web/src/features/v4-migration/V4MigrationContent.tsx b/web/src/features/v4-migration/V4MigrationContent.tsx
index dfe5936ace..0fdd32583c 100644
--- a/web/src/features/v4-migration/V4MigrationContent.tsx
+++ b/web/src/features/v4-migration/V4MigrationContent.tsx
@@ -17,7 +17,7 @@ import { useLangfuseCloudRegion } from "@/src/features/organizations";
import { useSupportDrawer } from "@/src/features/support-chat";
import { Button } from "@/src/components/ui/button";
import { HoverCard } from "@/src/components/design-system/HoverCard/HoverCard";
-import { RainbowButton } from "@/src/components/magicui/rainbow-button";
+import { RainbowButton } from "@/src/components/magicui/RainbowButton";
import { Separator } from "@/src/components/ui/separator";
import {
Collapsible,
diff --git a/web/src/features/v4-migration/V4MigrationStatusPage.clienttest.tsx b/web/src/features/v4-migration/V4MigrationStatusPage.clienttest.tsx
index f39fd898ee..a731d12885 100644
--- a/web/src/features/v4-migration/V4MigrationStatusPage.clienttest.tsx
+++ b/web/src/features/v4-migration/V4MigrationStatusPage.clienttest.tsx
@@ -59,7 +59,7 @@ vi.mock("next-auth/react", () => ({
}),
}));
-vi.mock("@/src/components/layouts/container-page", () => ({
+vi.mock("@/src/components/layouts/ContainerPage", () => ({
default: ({ children }: { children: React.ReactNode }) => children,
}));
diff --git a/web/src/features/v4-migration/V4MigrationStatusPage.tsx b/web/src/features/v4-migration/V4MigrationStatusPage.tsx
index e418b3b6e0..84af9b4296 100644
--- a/web/src/features/v4-migration/V4MigrationStatusPage.tsx
+++ b/web/src/features/v4-migration/V4MigrationStatusPage.tsx
@@ -5,7 +5,7 @@ import Link from "next/link";
import { useRouter } from "next/router";
import { useSession } from "next-auth/react";
import { ArrowRight } from "@langfuse/icons";
-import ContainerPage from "@/src/components/layouts/container-page";
+import ContainerPage from "@/src/components/layouts/ContainerPage";
import { Card } from "@/src/components/ui/card";
import { SimpleDataTable } from "@/src/components/table/simple-data-table";
import { type LangfuseColumnDef } from "@/src/components/table/types";
diff --git a/web/src/features/web-callouts/WebCalloutsPage.tsx b/web/src/features/web-callouts/WebCalloutsPage.tsx
index b525bfc3a3..a4c3a1ea45 100644
--- a/web/src/features/web-callouts/WebCalloutsPage.tsx
+++ b/web/src/features/web-callouts/WebCalloutsPage.tsx
@@ -1,4 +1,4 @@
-import ContainerPage from "@/src/components/layouts/container-page";
+import ContainerPage from "@/src/components/layouts/ContainerPage";
import { StatusBadge } from "@/src/components/ui/StatusBadge/StatusBadge";
import { useWebCallouts } from "@/src/features/web-callouts/useWebCallouts";
import { WebCalloutSettingsPage } from "@/src/features/web-callouts/components/WebCalloutSettingsPage";