remove v2 dir

client/src/App.tsx

@@ -5,7 +5,7 @@ import { ToastContainer } from "react-toastify";
 import { ThemeProvider } from "@emotion/react";
 import { CssBaseline, GlobalStyles } from "@mui/material";
 import { Routes } from "./Routes";
-import AppLayout from "@/Components/v2/layout/AppLayout";
+import AppLayout from "@/Components/layout/AppLayout";
 import type { RootState } from "@/Types/state";
 import { lightTheme, darkTheme } from "@/Utils/Theme/Theme";
 

client/src/Components/common/charts/HeatmapResponseTime.tsx

@@ -2,7 +2,7 @@ import Box from "@mui/material/Box";
 import { useTheme } from "@mui/material/styles";
 import type { CheckSnapshot } from "@/Types/Check";
 import { getResponseColor } from "@/Utils/DataUtils";
-import { HeatmapResponseTimeTooltip } from "@/Components/v2/common/charts/HeatmapResponseTimeTooltip";
+import { HeatmapResponseTimeTooltip } from "@/Components/common/charts/HeatmapResponseTimeTooltip";
 import type { SxProps } from "@mui/material/styles";
 import type { ResponsiveStyleValue } from "@mui/system";
 

client/src/Components/common/controls/HeaderTimeRange.tsx

@@ -1,7 +1,7 @@
 import Stack from "@mui/material/Stack";
 import Box from "@mui/material/Box";
 import Typography from "@mui/material/Typography";
-import { ToggleButtonGroup, ToggleButton } from "@/Components/v2/inputs";
+import { ToggleButtonGroup, ToggleButton } from "@/Components/inputs";
 import { useTheme } from "@mui/material/styles";
 import CircularProgress from "@mui/material/CircularProgress";
 import { useTranslation } from "react-i18next";

client/src/Components/common/index.ts

@@ -0,0 +1,5 @@
+export * from "./charts/HistogramResponseTime";
+export * from "./charts/HeatmapResponseTime";
+export * from "./charts/HeatmapResponseTimeTooltip";
+export * from "./controls/HeaderCreate";
+export * from "./controls/HeaderTimeRange";

client/src/Components/design-elements/BaseChart.tsx

@@ -1,4 +1,4 @@
-import { BaseBox } from "../design-elements";
+import { BaseBox } from ".";
 import Stack from "@mui/material/Stack";
 import Box from "@mui/material/Box";
 import Typography from "@mui/material/Typography";

client/src/Components/design-elements/BasePage.tsx

@@ -8,8 +8,8 @@ import {
 	EmptyFallback,
 	EmptyMonitorFallback,
 	BaseFallback,
-} from "@/Components/v2/design-elements/Fallback";
-import { Breadcrumb } from "@/Components/v2/design-elements/Breadcrumb";
+} from "@/Components/design-elements/Fallback";
+import { Breadcrumb } from "@/Components/design-elements/Breadcrumb";
 import CircularProgress from "@mui/material/CircularProgress";
 import { HeaderAuthControls } from "@/Pages/Auth/components/HeaderAuthControls";
 

client/src/Components/design-elements/Fallback.tsx

@@ -1,7 +1,7 @@
 import Stack from "@mui/material/Stack";
 import Typography from "@mui/material/Typography";
-import { BulletPointCheck, SkeletonCard } from "@/Components/v2/design-elements";
-import { Button } from "@/Components/v2/inputs";
+import { BulletPointCheck, SkeletonCard } from "@/Components/design-elements";
+import { Button } from "@/Components/inputs";
 
 import { useNavigate } from "react-router";
 import useMediaQuery from "@mui/material/useMediaQuery";

client/src/Components/design-elements/Gauge.tsx

@@ -1,4 +1,4 @@
-import { BaseChart } from "@/Components/v2/design-elements";
+import { BaseChart } from "@/Components/design-elements";
 import Stack from "@mui/material/Stack";
 import Box from "@mui/material/Box";
 import Typography from "@mui/material/Typography";

client/src/Components/design-elements/MonitorStatus.tsx

@@ -1,7 +1,7 @@
 import type { Monitor } from "@/Types/Monitor";
 import Stack from "@mui/material/Stack";
 import Typography from "@mui/material/Typography";
-import { PulseDot, Dot } from "@/Components/v2/design-elements";
+import { PulseDot, Dot } from "@/Components/design-elements";
 import { getStatusColor, formatUrl } from "@/Utils/MonitorUtils";
 import { useTheme } from "@mui/material/styles";
 import prettyMilliseconds from "pretty-ms";

client/src/Components/design-elements/StatBox.tsx

@@ -5,7 +5,7 @@ import { useTheme } from "@mui/material/styles";
 import { lighten } from "@mui/material/styles";
 import useMediaQuery from "@mui/material/useMediaQuery";
 import type { PaletteKey } from "@/Utils/Theme/Theme";
-import { BaseBox, TooltipWithInfo } from "@/Components/v2/design-elements";
+import { BaseBox, TooltipWithInfo } from "@/Components/design-elements";
 import type { SxProps } from "@mui/material";
 
 type GradientBox = React.PropsWithChildren<{

client/src/Components/design-elements/StatusBox.tsx

@@ -1,7 +1,7 @@
 import Stack from "@mui/material/Stack";
 import Typography from "@mui/material/Typography";
 import Box from "@mui/material/Box";
-import { BaseBox } from "@/Components/v2/design-elements";
+import { BaseBox } from "@/Components/design-elements";
 import { useTranslation } from "react-i18next";
 import type { SxProps } from "@mui/material";
 

client/src/Components/design-elements/StatusLabel.tsx

@@ -1,5 +1,5 @@
 import Box from "@mui/material/Box";
-import { BaseBox } from "@/Components/v2/design-elements";
+import { BaseBox } from "@/Components/design-elements";
 import Typography from "@mui/material/Typography";
 
 import type { MonitorStatus } from "@/Types/Monitor";

client/src/Components/inputs/AutoComplete.tsx

@@ -1,6 +1,6 @@
 import Autocomplete from "@mui/material/Autocomplete";
 import type { AutocompleteProps } from "@mui/material/Autocomplete";
-import { TextField, Checkbox } from "@/Components/v2/inputs";
+import { TextField, Checkbox } from "@/Components/inputs";
 import ListItem from "@mui/material/ListItem";
 import Stack from "@mui/material/Stack";
 import { useTheme } from "@mui/material/styles";

client/src/Components/inputs/ColorPicker.tsx

@@ -3,7 +3,7 @@ import type { MuiColorInputProps } from "mui-color-input";
 import { typographyLevels } from "@/Utils/Theme/Palette";
 import { useTheme } from "@mui/material";
 import Stack from "@mui/material/Stack";
-import { FieldLabel } from "@/Components/v2/inputs/FieldLabel";
+import { FieldLabel } from "@/Components/inputs/FieldLabel";
 
 interface ColorPickerProps extends MuiColorInputProps {
 	fieldLabel?: string;

client/src/Components/inputs/Dialog.tsx

@@ -4,7 +4,7 @@ import DialogActions from "@mui/material/DialogActions";
 import DialogContent from "@mui/material/DialogContent";
 import DialogContentText from "@mui/material/DialogContentText";
 import DialogTitle from "@mui/material/DialogTitle";
-import { Button } from "@/Components/v2/inputs";
+import { Button } from "@/Components/inputs";
 import { typographyLevels } from "@/Utils/Theme/Palette";
 import { useTranslation } from "react-i18next";
 import type { ReactNode } from "react";

client/src/Components/inputs/LanguageSelector.tsx

@@ -1,7 +1,7 @@
 import Stack from "@mui/material/Stack";
 import Box from "@mui/material/Box";
 import MenuItem from "@mui/material/MenuItem";
-import { Select } from "@/Components/v2/inputs";
+import { Select } from "@/Components/inputs";
 import "flag-icons/css/flag-icons.min.css";
 
 import { useTranslation } from "react-i18next";

client/src/Components/layout/AppLayout.tsx

@@ -4,7 +4,7 @@ import { useTheme } from "@mui/material/styles";
 import { useSelector } from "react-redux";
 import BackgroundSVG from "@/assets/Images/background.svg";
 import type { RootState } from "@/Types/state";
-import { OfflineBanner } from "@/Components/v2/design-elements";
+import { OfflineBanner } from "@/Components/design-elements";
 import { setServerUnreachableCallback, get } from "@/Utils/ApiClient";
 
 interface AppLayoutProps {

client/src/Components/layout/RootLayout.tsx

@@ -1,4 +1,4 @@
-import { Sidebar } from "@/Components/v2/sidebar";
+import { Sidebar } from "@/Components/sidebar";
 import { Outlet } from "react-router";
 import Stack from "@mui/material/Stack";
 import { useMediaQuery } from "@mui/material";

client/src/Components/monitors/ControlsFilter.tsx

@@ -1,5 +1,5 @@
 import Stack from "@mui/material/Stack";
-import { Select, Button } from "@/Components/v2/inputs";
+import { Select, Button } from "@/Components/inputs";
 import MenuItem from "@mui/material/MenuItem";
 import useMediaQuery from "@mui/material/useMediaQuery";
 

client/src/Components/monitors/HeaderMonitorControls.tsx

@@ -1,6 +1,6 @@
 import Stack from "@mui/material/Stack";
-import { Icon, MonitorStatus } from "@/Components/v2/design-elements";
-import { Button } from "@/Components/v2/inputs";
+import { Icon, MonitorStatus } from "@/Components/design-elements";
+import { Button } from "@/Components/inputs";
 import { Settings, Pause, Play, Mail, Bug, Trash } from "lucide-react";
 
 import { useTranslation } from "react-i18next";

client/src/Components/monitors/HeaderMonitorsSummary.tsx

@@ -4,7 +4,7 @@ import {
 	PausedStatusBox,
 	InitializingStatusBox,
 	BreachedStatusBox,
-} from "@/Components/v2/design-elements";
+} from "@/Components/design-elements";
 import Stack from "@mui/material/Stack";
 
 import type { MonitorsSummary } from "@/Types/Monitor";

client/src/Components/monitors/MonitorStatBoxes.tsx

@@ -1,5 +1,5 @@
 import Stack from "@mui/material/Stack";
-import { StatBox } from "@/Components/v2/design-elements";
+import { StatBox } from "@/Components/design-elements";
 
 import prettyMilliseconds from "pretty-ms";
 import { useTheme } from "@mui/material/styles";

client/src/Components/monitors/charts/HistogramDetails.tsx

@@ -1,4 +1,4 @@
-import { BaseChart, BaseBox } from "@/Components/v2/design-elements";
+import { BaseChart, BaseBox } from "@/Components/design-elements";
 import { Clock } from "lucide-react";
 import {
 	AreaChart,

client/src/Components/monitors/charts/HistogramInfrastructure.tsx

@@ -1,4 +1,4 @@
-import { BaseChart } from "@/Components/v2/design-elements";
+import { BaseChart } from "@/Components/design-elements";
 import {
 	AreaChart,
 	Area,
@@ -8,7 +8,7 @@ import {
 	ResponsiveContainer,
 } from "recharts";
 import { Fragment, useId } from "react";
-import { XTick } from "@/Components/v2/monitors";
+import { XTick } from "@/Components/monitors";
 
 import { useTheme } from "@mui/material/styles";
 import type { HardwareCheckStats } from "@/Types/Monitor";

client/src/Components/monitors/charts/HistogramPageSpeed.tsx

@@ -1,6 +1,6 @@
 import Stack from "@mui/material/Stack";
 import { Area, AreaChart, CartesianGrid, ResponsiveContainer, Tooltip } from "recharts";
-import { HistogramPageSpeedTooltip } from "@/Components/v2/monitors/charts/HistogramPageSpeedTooltip";
+import { HistogramPageSpeedTooltip } from "@/Components/monitors/charts/HistogramPageSpeedTooltip";
 import { useTheme } from "@mui/material/styles";
 import type { CheckSnapshot } from "@/Types/Check";
 import type { MonitorStatus } from "@/Types/Monitor";

client/src/Components/monitors/charts/HistogramPageSpeedDetails.tsx

@@ -1,6 +1,6 @@
-import { BaseChart } from "@/Components/v2/design-elements";
+import { BaseChart } from "@/Components/design-elements";
 import { TrendingUp } from "lucide-react";
-import { XTick } from "@/Components/v2/monitors/";
+import { XTick } from "@/Components/monitors";
 import {
 	XAxis,
 	AreaChart,
@@ -9,7 +9,7 @@ import {
 	CartesianGrid,
 	ResponsiveContainer,
 } from "recharts";
-import { HistogramPageSpeedScoresTooltip } from "@/Components/v2/monitors";
+import { HistogramPageSpeedScoresTooltip } from "@/Components/monitors";
 
 import { useTheme } from "@mui/material/styles";
 import type { CheckSnapshot } from "@/Types/Check";

client/src/Components/monitors/charts/HistogramPageSpeedDetailsTooltip.tsx

@@ -3,7 +3,7 @@ import Stack from "@mui/material/Stack";
 import Typography from "@mui/material/Typography";
 import { useTheme } from "@mui/material/styles";
 import { formatDateWithTz } from "@/Utils/TimeUtils";
-import type { ConfigItem } from "@/Components/v2/monitors";
+import type { ConfigItem } from "@/Components/monitors";
 import type { TooltipProps } from "recharts";
 import { useSelector } from "react-redux";
 import type { RootState } from "@/Types/state";

client/src/Components/monitors/charts/HistogramStatus.tsx

@@ -1,6 +1,6 @@
 import Stack from "@mui/material/Stack";
 import Typography from "@mui/material/Typography";
-import { BaseChart } from "@/Components/v2/design-elements";
+import { BaseChart } from "@/Components/design-elements";
 import { useTheme } from "@mui/material/styles";
 import { useSelector } from "react-redux";
 import { formatDateWithTz } from "@/Utils/TimeUtils";

client/src/Components/monitors/charts/PiePageSpeed.tsx

@@ -1,4 +1,4 @@
-import { BaseChart } from "@/Components/v2/design-elements";
+import { BaseChart } from "@/Components/design-elements";
 import { FileText } from "lucide-react";
 import type { CheckAudits, CheckSnapshot } from "@/Types/Check";
 import { Pie, PieChart, ResponsiveContainer, Label } from "recharts";

client/src/Components/monitors/charts/PiePageSpeedLegend.tsx

@@ -1,7 +1,7 @@
 import Stack from "@mui/material/Stack";
 import Box from "@mui/material/Box";
 import { BarChart3 } from "lucide-react";
-import { BaseChart } from "@/Components/v2/design-elements";
+import { BaseChart } from "@/Components/design-elements";
 import Typography from "@mui/material/Typography";
 
 import type { CheckSnapshot } from "@/Types/Check";

client/src/Components/monitors/charts/RadialAvgResponse.tsx

@@ -1,4 +1,4 @@
-import { BaseChart } from "@/Components/v2/design-elements";
+import { BaseChart } from "@/Components/design-elements";
 import Stack from "@mui/material/Stack";
 import Typography from "@mui/material/Typography";
 import { Gauge } from "lucide-react";

client/src/Components/sidebar/Authfooter.tsx

@@ -10,7 +10,7 @@ import { useTranslation } from "react-i18next";
 import { useState } from "react";
 import { useNavigate } from "react-router";
 import { MoreVertical, LogOut } from "lucide-react";
-import { Avatar, Icon } from "@/Components/v2/design-elements";
+import { Avatar, Icon } from "@/Components/design-elements";
 import { clearAuthState } from "@/Features/Auth/authSlice.js";
 import type { RootState } from "@/Types/state.js";
 

client/src/Components/sidebar/Menu.tsx

@@ -1,4 +1,4 @@
-import { Icon } from "@/Components/v2/design-elements";
+import { Icon } from "@/Components/design-elements";
 
 import {
 	Globe,

client/src/Components/sidebar/StarPrompt.tsx

@@ -1,5 +1,5 @@
 import { Typography, IconButton, Stack, Box } from "@mui/material";
-import { Icon } from "@/Components/v2/design-elements";
+import { Icon } from "@/Components/design-elements";
 import { X } from "lucide-react";
 
 import { useTheme } from "@mui/material";

client/src/Components/sidebar/index.tsx

@@ -4,11 +4,11 @@ import Stack from "@mui/material/Stack";
 import List from "@mui/material/List";
 import Divider from "@mui/material/Divider";
 import { useSidebar } from "@/Hooks/useSidebar.js";
-import { Logo } from "@/Components/v2/sidebar/Logo";
-import { getMenu, getBottomMenu, getAccountMenu } from "@/Components/v2/sidebar/Menu";
-import { NavItem } from "@/Components/v2/sidebar/NavItem";
-import { StarPrompt } from "@/Components/v2/sidebar/StarPrompt";
-import { AuthFooter } from "@/Components/v2/sidebar/Authfooter";
+import { Logo } from "@/Components/sidebar/Logo";
+import { getMenu, getBottomMenu, getAccountMenu } from "@/Components/sidebar/Menu";
+import { NavItem } from "@/Components/sidebar/NavItem";
+import { StarPrompt } from "@/Components/sidebar/StarPrompt";
+import { AuthFooter } from "@/Components/sidebar/Authfooter";
 
 import { useNavigate, useLocation } from "react-router";
 import { useTranslation } from "react-i18next";

client/src/Components/v2/common/index.ts

@@ -1,5 +0,0 @@
-export * from "../common/charts/HistogramResponseTime";
-export * from "../common/charts/HeatmapResponseTime";
-export * from "../common/charts/HeatmapResponseTimeTooltip";
-export * from "../common/controls/HeaderCreate";
-export * from "../common/controls/HeaderTimeRange";

client/src/Pages/Account/EditUser/index.tsx

@@ -1,12 +1,12 @@
 import { Trash2 } from "lucide-react";
-import { TextField, Button, Autocomplete } from "@/Components/v2/inputs";
+import { TextField, Button, Autocomplete } from "@/Components/inputs";
 import Stack from "@mui/material/Stack";
 import Typography from "@mui/material/Typography";
 import IconButton from "@mui/material/IconButton";
 import Divider from "@mui/material/Divider";
 import FormHelperText from "@mui/material/FormHelperText";
 import { useForm, Controller } from "react-hook-form";
-import { ConfigBox, BasePage } from "@/Components/v2/design-elements";
+import { ConfigBox, BasePage } from "@/Components/design-elements";
 
 import { UserRoles } from "@/Types/User";
 import { useTranslation } from "react-i18next";

client/src/Pages/Account/TabPassword.tsx

@@ -1,6 +1,6 @@
 import { Stack } from "@mui/material";
-import { ConfigBox } from "@/Components/v2/design-elements";
-import { TextField, Button } from "@/Components/v2/inputs";
+import { ConfigBox } from "@/Components/design-elements";
+import { TextField, Button } from "@/Components/inputs";
 
 import { useTranslation } from "react-i18next";
 import { useTheme } from "@mui/material";

client/src/Pages/Account/TabProfile.tsx

@@ -1,7 +1,7 @@
 import { Stack } from "@mui/material";
-import { ConfigBox } from "@/Components/v2/design-elements";
-import { TextField, Button } from "@/Components/v2/inputs";
-import { ImageUpload } from "@/Components/v2/inputs";
+import { ConfigBox } from "@/Components/design-elements";
+import { TextField, Button } from "@/Components/inputs";
+import { ImageUpload } from "@/Components/inputs";
 
 import { useTheme } from "@mui/material";
 import { useTranslation } from "react-i18next";

client/src/Pages/Account/components/AddTeamMemberDialog.tsx

@@ -4,7 +4,7 @@ import { useTheme } from "@mui/material";
 import { useTranslation } from "react-i18next";
 import { useForm, Controller } from "react-hook-form";
 import { zodResolver } from "@hookform/resolvers/zod/dist/zod.js";
-import { Dialog, TextField, Select } from "@/Components/v2/inputs";
+import { Dialog, TextField, Select } from "@/Components/inputs";
 import { useAddTeamMemberForm } from "@/Hooks/useAddTeamMemberForm";
 import type { AddTeamMemberFormData } from "@/Validation/addTeamMember";
 import type { UserRole, User } from "@/Types/User";

client/src/Pages/Account/components/HeaderTeamControls.tsx

@@ -1,7 +1,7 @@
 import Stack from "@mui/material/Stack";
 import MenuItem from "@mui/material/MenuItem";
-import { Button, Select } from "@/Components/v2/inputs";
-import { Icon } from "@/Components/v2/design-elements";
+import { Button, Select } from "@/Components/inputs";
+import { Icon } from "@/Components/design-elements";
 import { UserPlus, Mail } from "lucide-react";
 
 import { UserRoles } from "@/Types/User";

client/src/Pages/Account/components/InviteTeamMemberDialog.tsx

@@ -4,7 +4,7 @@ import { useTheme, FormHelperText, Typography } from "@mui/material";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { useForm, Controller } from "react-hook-form";
-import { Dialog, TextField, Select, Button } from "@/Components/v2/inputs";
+import { Dialog, TextField, Select, Button } from "@/Components/inputs";
 import type { UserRole } from "@/Types/User";
 import { useInviteForm } from "@/Hooks/useInviteForm";
 import type { InviteFormData } from "@/Validation/invite";

client/src/Pages/Account/components/TeamTable.tsx

@@ -1,8 +1,8 @@
 import Typography from "@mui/material/Typography";
 import { useNavigate } from "react-router-dom";
 import { useTranslation } from "react-i18next";
-import { Table } from "@/Components/v2/design-elements";
-import type { Header } from "@/Components/v2/design-elements/Table";
+import { Table } from "@/Components/design-elements";
+import type { Header } from "@/Components/design-elements/Table";
 import { useIsSuperAdmin } from "@/Hooks/useIsAdmin";
 import type { User } from "@/Types/User";
 

client/src/Pages/Account/index.tsx

@@ -1,4 +1,4 @@
-import { BasePage, Tabs, Tab } from "@/Components/v2/design-elements";
+import { BasePage, Tabs, Tab } from "@/Components/design-elements";
 import { useState, useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { TabProfile } from "./TabProfile";

client/src/Pages/Auth/Login/index.tsx

@@ -1,5 +1,5 @@
-import { BaseAuthPage, TextLink } from "@/Components/v2/design-elements";
-import { Button, TextField } from "@/Components/v2/inputs";
+import { BaseAuthPage, TextLink } from "@/Components/design-elements";
+import { Button, TextField } from "@/Components/inputs";
 
 import { useTranslation } from "react-i18next";
 import { useForm, Controller } from "react-hook-form";

client/src/Pages/Auth/Recovery/index.tsx

@@ -1,5 +1,5 @@
-import { Button, TextField } from "@/Components/v2/inputs";
-import { BaseAuthPage, TextLink } from "@/Components/v2/design-elements";
+import { Button, TextField } from "@/Components/inputs";
+import { BaseAuthPage, TextLink } from "@/Components/design-elements";
 
 import { useForm, Controller } from "react-hook-form";
 import { zodResolver } from "@hookform/resolvers/zod/dist/zod.js";

client/src/Pages/Auth/Register/index.tsx

@@ -1,5 +1,5 @@
-import { BaseAuthPage } from "@/Components/v2/design-elements";
-import { Button, TextField } from "@/Components/v2/inputs";
+import { BaseAuthPage } from "@/Components/design-elements";
+import { Button, TextField } from "@/Components/inputs";
 import { useForm, Controller } from "react-hook-form";
 import { zodResolver } from "@hookform/resolvers/zod/dist/zod.js";
 import { useRegisterForm } from "@/Hooks/useRegisterForm";

client/src/Pages/Auth/SetNewPassword/index.tsx

@@ -1,9 +1,5 @@
-import {
-	BaseAuthPage,
-	BulletPointCheck,
-	TextLink,
-} from "@/Components/v2/design-elements";
-import { Button, TextField } from "@/Components/v2/inputs";
+import { BaseAuthPage, BulletPointCheck, TextLink } from "@/Components/design-elements";
+import { Button, TextField } from "@/Components/inputs";
 import Stack from "@mui/material/Stack";
 import { useTheme } from "@mui/material/styles";
 import { useTranslation } from "react-i18next";

client/src/Pages/Auth/components/HeaderAuthControls.tsx

@@ -1,7 +1,7 @@
 import Stack, { type StackProps } from "@mui/material/Stack";
 import Typography from "@mui/material/Typography";
 import Logo from "@/assets/icons/checkmate-icon.svg?react";
-import { LanguageSelector, SwitchTheme } from "@/Components/v2/inputs";
+import { LanguageSelector, SwitchTheme } from "@/Components/inputs";
 
 import { useTheme } from "@mui/material/styles";
 import { useTranslation } from "react-i18next";

client/src/Pages/Checks/Components/ChecksTable.tsx

@@ -1,11 +1,6 @@
-import {
-	Table,
-	Pagination,
-	ValueLabel,
-	StatusLabel,
-} from "@/Components/v2/design-elements";
+import { Table, Pagination, ValueLabel, StatusLabel } from "@/Components/design-elements";
 import Box from "@mui/material/Box";
-import type { Header } from "@/Components/v2/design-elements/Table";
+import type { Header } from "@/Components/design-elements/Table";
 import type { Monitor } from "@/Types/Monitor";
 
 import { useTranslation } from "react-i18next";

client/src/Pages/Checks/index.tsx

@@ -4,9 +4,9 @@ import {
 	TotalChecksBox,
 	UpChecksBox,
 	DownChecksBox,
-} from "@/Components/v2/design-elements";
-import { HeaderTimeRange } from "@/Components/v2/common";
-import { Select } from "@/Components/v2/inputs";
+} from "@/Components/design-elements";
+import { HeaderTimeRange } from "@/Components/common";
+import { Select } from "@/Components/inputs";
 import { ChecksTable } from "./Components/ChecksTable";
 
 import { MenuItem } from "@mui/material";

client/src/Pages/CreateMonitor/index.tsx

@@ -14,9 +14,9 @@ import Link from "@mui/material/Link";
 import Divider from "@mui/material/Divider";
 import IconButton from "@mui/material/IconButton";
 import { Trash2 } from "lucide-react";
-import { HeaderDeleteControls } from "@/Components/v2/monitors";
+import { HeaderDeleteControls } from "@/Components/monitors";
 
-import { BasePage, ConfigBox } from "@/Components/v2/design-elements";
+import { BasePage, ConfigBox } from "@/Components/design-elements";
 import {
 	RadioWithDescription,
 	Button,
@@ -26,7 +26,7 @@ import {
 	SwitchComponent as Switch,
 	SliderWithLabel,
 	Dialog,
-} from "@/Components/v2/inputs";
+} from "@/Components/inputs";
 import { useGet, usePost, usePatch, useDelete } from "@/Hooks/UseApi";
 import { useMonitorForm } from "@/Hooks/useMonitorForm";
 import type { Monitor, MonitorType, GamesMap } from "@/Types/Monitor";
@@ -620,7 +620,7 @@ const CreateMonitorPage = () => {
 						name="notifications"
 						control={control}
 						render={({ field }) => {
-							// Map notifications to have 'name' property for v2 Autocomplete
+							// Map notifications to have 'name' property for Autocomplete
 							const notificationOptions = (notifications ?? []).map((n) => ({
 								...n,
 								name: n.notificationName,

client/src/Pages/Incidents/Components/CardDetails.tsx

@@ -2,7 +2,7 @@ import Stack from "@mui/material/Stack";
 import Grid from "@mui/material/Grid";
 import Divider from "@mui/material/Divider";
 import Typography from "@mui/material/Typography";
-import { BaseBox, ValueLabel } from "@/Components/v2/design-elements";
+import { BaseBox, ValueLabel } from "@/Components/design-elements";
 
 import { useTranslation } from "react-i18next";
 import type { Incident } from "@/Types/Incident";

client/src/Pages/Incidents/Components/CardSummary.tsx

@@ -2,7 +2,7 @@ import Stack from "@mui/material/Stack";
 import Typography from "@mui/material/Typography";
 import Divider from "@mui/material/Divider";
 import Grid from "@mui/material/Grid";
-import { BaseBox, ValueLabel } from "@/Components/v2/design-elements";
+import { BaseBox, ValueLabel } from "@/Components/design-elements";
 import { CircleCheck, TriangleAlert, Bell, Wrench, Globe } from "lucide-react";
 import Box from "@mui/material/Box";
 

client/src/Pages/Incidents/Components/ControlsIncidentFilter.tsx

@@ -1,5 +1,5 @@
 import Stack from "@mui/material/Stack";
-import { Select, Button } from "@/Components/v2/inputs";
+import { Select, Button } from "@/Components/inputs";
 import MenuItem from "@mui/material/MenuItem";
 import useMediaQuery from "@mui/material/useMediaQuery";
 import { Typography, useTheme } from "@mui/material";

client/src/Pages/Incidents/Components/DialogIncidentDetails.tsx

@@ -1,4 +1,4 @@
-import { Dialog } from "@/Components/v2/inputs";
+import { Dialog } from "@/Components/inputs";
 import { CardDetails } from "@/Pages/Incidents/Components/CardDetails";
 
 import { useTranslation } from "react-i18next";

client/src/Pages/Incidents/Components/DialogResolution.tsx

@@ -1,6 +1,6 @@
 import { useState, useEffect } from "react";
 import Box from "@mui/material/Box";
-import { Dialog, TextField } from "@/Components/v2/inputs";
+import { Dialog, TextField } from "@/Components/inputs";
 import { usePut } from "@/Hooks/UseApi";
 import { useTranslation } from "react-i18next";
 import { useTheme } from "@mui/material";

client/src/Pages/Incidents/Components/IncidentTable.tsx

@@ -1,12 +1,12 @@
-import { Table } from "@/Components/v2/design-elements";
-import { Pagination } from "@/Components/v2/design-elements/Table";
-import type { Header } from "@/Components/v2/design-elements/Table";
-import { ValueLabel } from "@/Components/v2/design-elements";
-import type { ValueType } from "@/Components/v2/design-elements/StatusLabel";
-import { ActionsMenu } from "@/Components/v2/actions-menu";
+import { Table } from "@/Components/design-elements";
+import { Pagination } from "@/Components/design-elements/Table";
+import type { Header } from "@/Components/design-elements/Table";
+import { ValueLabel } from "@/Components/design-elements";
+import type { ValueType } from "@/Components/design-elements/StatusLabel";
+import { ActionsMenu } from "@/Components/actions-menu";
 import type { Incident } from "@/Types/Incident";
 import type { Monitor } from "@/Types/Monitor";
-import type { ActionMenuItem } from "@/Components/v2/actions-menu";
+import type { ActionMenuItem } from "@/Components/actions-menu";
 import { useTranslation } from "react-i18next";
 import { useNavigate } from "react-router-dom";
 import { formatDateWithTz } from "@/Utils/TimeUtils";

client/src/Pages/Incidents/index.tsx

@@ -1,4 +1,4 @@
-import { BasePage } from "@/Components/v2/design-elements";
+import { BasePage } from "@/Components/design-elements";
 import Stack from "@mui/material/Stack";
 import Typography from "@mui/material/Typography";
 import Divider from "@mui/material/Divider";
@@ -11,7 +11,7 @@ import {
 import { IncidentsTable } from "@/Pages/Incidents/Components/IncidentTable";
 import { DialogResolution } from "@/Pages/Incidents/Components/DialogResolution";
 import { DialogIncidentDetails } from "@/Pages/Incidents/Components/DialogIncidentDetails";
-import { HeaderTimeRange } from "@/Components/v2/common";
+import { HeaderTimeRange } from "@/Components/common";
 import { ControlsIncidentFilter } from "@/Pages/Incidents/Components/ControlsIncidentFilter";
 
 import { useGet } from "@/Hooks/UseApi";

client/src/Pages/Infrastructure/Details/Components/Charts.tsx

@@ -1,5 +1,5 @@
 import Grid from "@mui/material/Grid";
-import { HistogramInfrastructure } from "@/Components/v2/monitors";
+import { HistogramInfrastructure } from "@/Components/monitors";
 
 import { useTranslation } from "react-i18next";
 import type { HardwareCheckStats } from "@/Types/Monitor";

client/src/Pages/Infrastructure/Details/Components/ChartsNetwork.tsx

@@ -1,5 +1,5 @@
 import Grid from "@mui/material/Grid";
-import { HistogramInfrastructure } from "@/Components/v2/monitors";
+import { HistogramInfrastructure } from "@/Components/monitors";
 
 import { useTranslation } from "react-i18next";
 import type { HardwareCheckStats } from "@/Types/Monitor";