diff --git a/apps/infoalloggi/src/components/tables/annunci-tables.tsx b/apps/infoalloggi/src/components/tables/annunci-tables.tsx
index 1554906..5e9e6f7 100644
--- a/apps/infoalloggi/src/components/tables/annunci-tables.tsx
+++ b/apps/infoalloggi/src/components/tables/annunci-tables.tsx
@@ -1,13 +1,13 @@
 import type { ColumnDef } from "@tanstack/react-table";
 import { Wrench } from "lucide-react";
 import Link from "next/link";
-import { DataTable } from "~/components/custom_ui/data-table";
-import { DataTableColumnHeader } from "~/components/custom_ui/dataTable-header";
+import { Button } from "~/components/ui/button";
+import { DataTable } from "~/components/ui/data-table";
+import { DataTableColumnHeader } from "~/components/ui/dataTable-header";
 import type {
 	PinnedFiltro,
 	SearchFiltro,
-} from "~/components/custom_ui/dataTable-toolbar";
-import { Button } from "~/components/ui/button";
+} from "~/components/ui/dataTable-toolbar";
 import { StatusBadge } from "~/pages/area-riservata/admin/edit-annuncio/[id]";
 import type { Annunci } from "~/schemas/public/Annunci";
 export const AnnunciTable = ({
diff --git a/apps/infoalloggi/src/components/tables/banlist-table.tsx b/apps/infoalloggi/src/components/tables/banlist-table.tsx
index f5f3bdf..43f69e9 100644
--- a/apps/infoalloggi/src/components/tables/banlist-table.tsx
+++ b/apps/infoalloggi/src/components/tables/banlist-table.tsx
@@ -1,9 +1,9 @@
 import type { ColumnDef } from "@tanstack/react-table";
 import { Cog } from "lucide-react";
-import { DataTable } from "~/components/custom_ui/data-table";
-import { DataTableColumnHeader } from "~/components/custom_ui/dataTable-header";
-import type { SearchFiltro } from "~/components/custom_ui/dataTable-toolbar";
 import { Button } from "~/components/ui/button";
+import { DataTable } from "~/components/ui/data-table";
+import { DataTableColumnHeader } from "~/components/ui/dataTable-header";
+import type { SearchFiltro } from "~/components/ui/dataTable-toolbar";
 import type { Banlist } from "~/schemas/public/Banlist";
 
 export const BanlistTable = (props: {
diff --git a/apps/infoalloggi/src/components/tables/banners-table.tsx b/apps/infoalloggi/src/components/tables/banners-table.tsx
index f8046eb..86e408a 100644
--- a/apps/infoalloggi/src/components/tables/banners-table.tsx
+++ b/apps/infoalloggi/src/components/tables/banners-table.tsx
@@ -1,9 +1,9 @@
 import type { ColumnDef } from "@tanstack/react-table";
 import { Cog } from "lucide-react";
-import { DataTable } from "~/components/custom_ui/data-table";
-import { DataTableColumnHeader } from "~/components/custom_ui/dataTable-header";
-import type { SearchFiltro } from "~/components/custom_ui/dataTable-toolbar";
 import { Button } from "~/components/ui/button";
+import { DataTable } from "~/components/ui/data-table";
+import { DataTableColumnHeader } from "~/components/ui/dataTable-header";
+import type { SearchFiltro } from "~/components/ui/dataTable-toolbar";
 import type { Banners } from "~/schemas/public/Banners";
 export const BannersTable = (props: {
 	data: Banners[];
diff --git a/apps/infoalloggi/src/components/tables/etichette.tsx b/apps/infoalloggi/src/components/tables/etichette.tsx
index b702e67..3a31e7e 100644
--- a/apps/infoalloggi/src/components/tables/etichette.tsx
+++ b/apps/infoalloggi/src/components/tables/etichette.tsx
@@ -1,10 +1,10 @@
 import type { ColumnDef } from "@tanstack/react-table";
 import { Cog } from "lucide-react";
-import { DataTable } from "~/components/custom_ui/data-table";
-import { DataTableColumnHeader } from "~/components/custom_ui/dataTable-header";
-import type { SearchFiltro } from "~/components/custom_ui/dataTable-toolbar";
 import { Etichetta } from "~/components/etichette";
 import { Button } from "~/components/ui/button";
+import { DataTable } from "~/components/ui/data-table";
+import { DataTableColumnHeader } from "~/components/ui/dataTable-header";
+import type { SearchFiltro } from "~/components/ui/dataTable-toolbar";
 import type { Etichette } from "~/schemas/public/Etichette";
 export const EtichetteTable = (props: {
 	data: Etichette[];
diff --git a/apps/infoalloggi/src/components/tables/flags-table.tsx b/apps/infoalloggi/src/components/tables/flags-table.tsx
index c1a826b..81f03f9 100644
--- a/apps/infoalloggi/src/components/tables/flags-table.tsx
+++ b/apps/infoalloggi/src/components/tables/flags-table.tsx
@@ -1,9 +1,9 @@
 import type { ColumnDef } from "@tanstack/react-table";
 import { Cog } from "lucide-react";
-import { DataTable } from "~/components/custom_ui/data-table";
-import { DataTableColumnHeader } from "~/components/custom_ui/dataTable-header";
-import type { SearchFiltro } from "~/components/custom_ui/dataTable-toolbar";
 import { Button } from "~/components/ui/button";
+import { DataTable } from "~/components/ui/data-table";
+import { DataTableColumnHeader } from "~/components/ui/dataTable-header";
+import type { SearchFiltro } from "~/components/ui/dataTable-toolbar";
 import type { Flags } from "~/schemas/public/Flags";
 export const FlagsTable = (props: {
 	data: Flags[];
diff --git a/apps/infoalloggi/src/components/tables/orders-table.tsx b/apps/infoalloggi/src/components/tables/orders-table.tsx
index c33ca1a..677d14e 100644
--- a/apps/infoalloggi/src/components/tables/orders-table.tsx
+++ b/apps/infoalloggi/src/components/tables/orders-table.tsx
@@ -6,13 +6,13 @@ import {
 	AdminWrapperOrdiniModal,
 	UserOrdiniModal,
 } from "~/components/area-riservata/ordini";
-import { DataTable } from "~/components/custom_ui/data-table";
-import { DataTableColumnHeader } from "~/components/custom_ui/dataTable-header";
+import { Button } from "~/components/ui/button";
+import { DataTable } from "~/components/ui/data-table";
+import { DataTableColumnHeader } from "~/components/ui/dataTable-header";
 import type {
 	PinnedFiltro,
 	SearchFiltro,
-} from "~/components/custom_ui/dataTable-toolbar";
-import { Button } from "~/components/ui/button";
+} from "~/components/ui/dataTable-toolbar";
 import { formatCurrency } from "~/lib/utils";
 import OrderTypeEnum from "~/schemas/public/OrderTypeEnum";
 import type { OrdiniOrdineId } from "~/schemas/public/Ordini";
diff --git a/apps/infoalloggi/src/components/tables/prezziario-tables.tsx b/apps/infoalloggi/src/components/tables/prezziario-tables.tsx
index 5e8ecbc..9f68f4b 100644
--- a/apps/infoalloggi/src/components/tables/prezziario-tables.tsx
+++ b/apps/infoalloggi/src/components/tables/prezziario-tables.tsx
@@ -1,13 +1,13 @@
 import type { ColumnDef } from "@tanstack/react-table";
 import { CircleSlash, Cog } from "lucide-react";
-import { DataTable } from "~/components/custom_ui/data-table";
-import { DataTableColumnHeader } from "~/components/custom_ui/dataTable-header";
+import { Badge } from "~/components/ui/badge";
+import { Button } from "~/components/ui/button";
+import { DataTable } from "~/components/ui/data-table";
+import { DataTableColumnHeader } from "~/components/ui/dataTable-header";
 import type {
 	PinnedFiltro,
 	SearchFiltro,
-} from "~/components/custom_ui/dataTable-toolbar";
-import { Badge } from "~/components/ui/badge";
-import { Button } from "~/components/ui/button";
+} from "~/components/ui/dataTable-toolbar";
 import { cn, formatCurrency } from "~/lib/utils";
 import OrderTypeEnum from "~/schemas/public/OrderTypeEnum";
 import type { Prezziario } from "~/schemas/public/Prezziario";
diff --git a/apps/infoalloggi/src/components/tables/richieste-table.tsx b/apps/infoalloggi/src/components/tables/richieste-table.tsx
index 6ad3afc..8a66847 100644
--- a/apps/infoalloggi/src/components/tables/richieste-table.tsx
+++ b/apps/infoalloggi/src/components/tables/richieste-table.tsx
@@ -1,13 +1,13 @@
 import type { ColumnDef } from "@tanstack/react-table";
 import { ExternalLink } from "lucide-react";
 import Link from "next/link";
-import { DataTable } from "~/components/custom_ui/data-table";
-import { DataTableColumnHeader } from "~/components/custom_ui/dataTable-header";
+import { Button } from "~/components/ui/button";
+import { DataTable } from "~/components/ui/data-table";
+import { DataTableColumnHeader } from "~/components/ui/dataTable-header";
 import type {
 	PinnedFiltro,
 	SearchFiltro,
-} from "~/components/custom_ui/dataTable-toolbar";
-import { Button } from "~/components/ui/button";
+} from "~/components/ui/dataTable-toolbar";
 import TipologiaPosizioneEnum from "~/schemas/public/TipologiaPosizioneEnum";
 import type { RichiesteData } from "~/server/controllers/servizio.controller";
 
diff --git a/apps/infoalloggi/src/components/tables/storage-table.tsx b/apps/infoalloggi/src/components/tables/storage-table.tsx
index 23e15d9..fb869a0 100644
--- a/apps/infoalloggi/src/components/tables/storage-table.tsx
+++ b/apps/infoalloggi/src/components/tables/storage-table.tsx
@@ -3,9 +3,6 @@ import { ExternalLink, MoreHorizontal, Pen, Trash } from "lucide-react";
 import Link from "next/link";
 import { type FormEvent, useEffect, useState } from "react";
 import toast from "react-hot-toast";
-import { DataTable } from "~/components/custom_ui/data-table";
-import { DataTableColumnHeader } from "~/components/custom_ui/dataTable-header";
-import type { SearchFiltro } from "~/components/custom_ui/dataTable-toolbar";
 import {
 	AlertDialog,
 	AlertDialogAction,
@@ -19,6 +16,9 @@ import {
 } from "~/components/ui/alert-dialog";
 import { Button, buttonVariants } from "~/components/ui/button";
 import { Checkbox } from "~/components/ui/checkbox";
+import { DataTable } from "~/components/ui/data-table";
+import { DataTableColumnHeader } from "~/components/ui/dataTable-header";
+import type { SearchFiltro } from "~/components/ui/dataTable-toolbar";
 import {
 	Dialog,
 	DialogContent,
diff --git a/apps/infoalloggi/src/components/tables/stringhe-table.tsx b/apps/infoalloggi/src/components/tables/stringhe-table.tsx
index f96eba5..637920f 100644
--- a/apps/infoalloggi/src/components/tables/stringhe-table.tsx
+++ b/apps/infoalloggi/src/components/tables/stringhe-table.tsx
@@ -1,9 +1,9 @@
 import type { ColumnDef } from "@tanstack/react-table";
 import { Cog } from "lucide-react";
-import { DataTable } from "~/components/custom_ui/data-table";
-import { DataTableColumnHeader } from "~/components/custom_ui/dataTable-header";
-import type { SearchFiltro } from "~/components/custom_ui/dataTable-toolbar";
 import { Button } from "~/components/ui/button";
+import { DataTable } from "~/components/ui/data-table";
+import { DataTableColumnHeader } from "~/components/ui/dataTable-header";
+import type { SearchFiltro } from "~/components/ui/dataTable-toolbar";
 import type { TestiEStringhe } from "~/schemas/public/TestiEStringhe";
 
 export const StringheTable = ({
diff --git a/apps/infoalloggi/src/components/tables/users-table.tsx b/apps/infoalloggi/src/components/tables/users-table.tsx
index 79578ac..f04efd1 100644
--- a/apps/infoalloggi/src/components/tables/users-table.tsx
+++ b/apps/infoalloggi/src/components/tables/users-table.tsx
@@ -16,12 +16,12 @@ import Link from "next/link";
 import { useRouter } from "next/router";
 import { useState } from "react";
 import toast from "react-hot-toast";
-import { DataTable } from "~/components/custom_ui/data-table";
-import { DataTableColumnHeader } from "~/components/custom_ui/dataTable-header";
+import { DataTable } from "~/components/ui/data-table";
+import { DataTableColumnHeader } from "~/components/ui/dataTable-header";
 import type {
 	PinnedFiltro,
 	SearchFiltro,
-} from "~/components/custom_ui/dataTable-toolbar";
+} from "~/components/ui/dataTable-toolbar";
 import { UserAvatar } from "~/components/user_avatar";
 import { cn } from "~/lib/utils";
 import type { Etichette } from "~/schemas/public/Etichette";
diff --git a/apps/infoalloggi/src/components/custom_ui/data-table.tsx b/apps/infoalloggi/src/components/ui/data-table.tsx
similarity index 96%
rename from apps/infoalloggi/src/components/custom_ui/data-table.tsx
rename to apps/infoalloggi/src/components/ui/data-table.tsx
index 5f84223..3701506 100644
--- a/apps/infoalloggi/src/components/custom_ui/data-table.tsx
+++ b/apps/infoalloggi/src/components/ui/data-table.tsx
@@ -16,12 +16,12 @@ import {
 import { useVirtualizer } from "@tanstack/react-virtual";
 import type React from "react";
 import { useEffect, useRef, useState } from "react";
-import { DataTablePagination } from "~/components/custom_ui/dataTable-pagination";
+import { DataTablePagination } from "~/components/ui/dataTable-pagination";
 import {
 	DataTableToolbar,
 	type PinnedFiltro,
 	type SearchFiltro,
-} from "~/components/custom_ui/dataTable-toolbar";
+} from "~/components/ui/dataTable-toolbar";
 import {
 	Table,
 	TableBody,
@@ -32,7 +32,7 @@ import {
 } from "~/components/ui/table";
 import { cn } from "~/lib/utils";
 import { DataTableProvider } from "~/providers/DataTableProvider";
-import { ContextMenu, ContextMenuTrigger } from "../ui/context-menu";
+import { ContextMenu, ContextMenuTrigger } from "./context-menu";
 
 type DataTableProps<TData, TValue> = {
 	columns: ColumnDef<TData, TValue>[];
diff --git a/apps/infoalloggi/src/components/custom_ui/dataTable-FacetedFilter.tsx b/apps/infoalloggi/src/components/ui/dataTable-FacetedFilter.tsx
similarity index 98%
rename from apps/infoalloggi/src/components/custom_ui/dataTable-FacetedFilter.tsx
rename to apps/infoalloggi/src/components/ui/dataTable-FacetedFilter.tsx
index ae26dab..c73dfef 100644
--- a/apps/infoalloggi/src/components/custom_ui/dataTable-FacetedFilter.tsx
+++ b/apps/infoalloggi/src/components/ui/dataTable-FacetedFilter.tsx
@@ -79,7 +79,7 @@ export function DataTableFacetedFilter<TData, TValue>({
 					)}
 				</Button>
 			</PopoverTrigger>
-			<PopoverContent align="start" className="w-[200px] p-0">
+			<PopoverContent align="start" className="w-50 p-0">
 				<Command>
 					<CommandInput placeholder={title} />
 					<CommandList>
diff --git a/apps/infoalloggi/src/components/custom_ui/dataTable-ViewToggle.tsx b/apps/infoalloggi/src/components/ui/dataTable-ViewToggle.tsx
similarity index 100%
rename from apps/infoalloggi/src/components/custom_ui/dataTable-ViewToggle.tsx
rename to apps/infoalloggi/src/components/ui/dataTable-ViewToggle.tsx
diff --git a/apps/infoalloggi/src/components/custom_ui/dataTable-header.tsx b/apps/infoalloggi/src/components/ui/dataTable-header.tsx
similarity index 100%
rename from apps/infoalloggi/src/components/custom_ui/dataTable-header.tsx
rename to apps/infoalloggi/src/components/ui/dataTable-header.tsx
diff --git a/apps/infoalloggi/src/components/custom_ui/dataTable-pagination.tsx b/apps/infoalloggi/src/components/ui/dataTable-pagination.tsx
similarity index 100%
rename from apps/infoalloggi/src/components/custom_ui/dataTable-pagination.tsx
rename to apps/infoalloggi/src/components/ui/dataTable-pagination.tsx
diff --git a/apps/infoalloggi/src/components/custom_ui/dataTable-toolbar.tsx b/apps/infoalloggi/src/components/ui/dataTable-toolbar.tsx
similarity index 92%
rename from apps/infoalloggi/src/components/custom_ui/dataTable-toolbar.tsx
rename to apps/infoalloggi/src/components/ui/dataTable-toolbar.tsx
index ba35926..606737c 100644
--- a/apps/infoalloggi/src/components/custom_ui/dataTable-toolbar.tsx
+++ b/apps/infoalloggi/src/components/ui/dataTable-toolbar.tsx
@@ -1,8 +1,8 @@
 import { RotateCcw } from "lucide-react";
 import type { ComponentType } from "react";
-import { DataTableFacetedFilter } from "~/components/custom_ui/dataTable-FacetedFilter";
-import { DataTableViewOptions } from "~/components/custom_ui/dataTable-ViewToggle";
 import { Button } from "~/components/ui/button";
+import { DataTableFacetedFilter } from "~/components/ui/dataTable-FacetedFilter";
+import { DataTableViewOptions } from "~/components/ui/dataTable-ViewToggle";
 import Input from "~/components/ui/input";
 import { useDataTable } from "~/providers/DataTableProvider";
 
diff --git a/apps/infoalloggi/src/providers/DataTableProvider.tsx b/apps/infoalloggi/src/providers/DataTableProvider.tsx
index 78ac6d2..af5ab5c 100644
--- a/apps/infoalloggi/src/providers/DataTableProvider.tsx
+++ b/apps/infoalloggi/src/providers/DataTableProvider.tsx
@@ -3,7 +3,7 @@ import { createContext, type ReactNode, useContext } from "react";
 import type {
 	PinnedFiltro,
 	SearchFiltro,
-} from "~/components/custom_ui/dataTable-toolbar";
+} from "~/components/ui/dataTable-toolbar";
 
 type DataTableContextType<TData> = {
 	table: Table<TData>;