diff --git a/app/(auth)/login/page.tsx b/app/(auth)/login/page.tsx
index 5b453c19..07a8356b 100644
--- a/app/(auth)/login/page.tsx
+++ b/app/(auth)/login/page.tsx
@@ -3,7 +3,7 @@
 import {useEffect, useRef} from "react";
 import {useSearchParams} from "next/navigation";
 
-import {LoginForm} from "@/components/wrappers/auth/Login/LoginForm/LoginForm";
+import {LoginForm} from "@/components/wrappers/auth/login/loginForm/LoginForm";
 import {toast} from "sonner";
 
 export default function SignInPage(props: {
diff --git a/app/(customer)/dashboard/agents/[agentId]/page.tsx b/app/(customer)/dashboard/agents/[agentId]/page.tsx
index c6c65b49..e5cc6f70 100644
--- a/app/(customer)/dashboard/agents/[agentId]/page.tsx
+++ b/app/(customer)/dashboard/agents/[agentId]/page.tsx
@@ -9,8 +9,8 @@ import {formatDateLastContact} from "@/utils/date-formatting";
 import {Button, buttonVariants} from "@/components/ui/button";
 import {Card, CardContent, CardHeader} from "@/components/ui/card";
 import {AgentModalKey} from "@/components/wrappers/dashboard/agent/AgentModalKey/AgentModalKey";
-import {CardsWithPagination} from "@/components/wrappers/cards-with-pagination";
-import {DatabaseCard} from "@/components/wrappers/dashboard/Projects/ProjectCard/ProjectDatabaseCard";
+import {CardsWithPagination} from "@/components/wrappers/common/cards-with-pagination";
+import {DatabaseCard} from "@/components/wrappers/dashboard/projects/ProjectCard/ProjectDatabaseCard";
 
 
 export default async function RoutePage(props: PageParams<{ agentId: string }>) {
diff --git a/app/(customer)/dashboard/agents/page.tsx b/app/(customer)/dashboard/agents/page.tsx
index 8d1f4601..bb88c1a2 100644
--- a/app/(customer)/dashboard/agents/page.tsx
+++ b/app/(customer)/dashboard/agents/page.tsx
@@ -1,7 +1,7 @@
 import {PageParams} from "@/types/next";
 import {prisma} from "@/prisma";
 import {AgentCard} from "@/components/wrappers/dashboard/agent/AgentCard/AgentCard";
-import {CardsWithPagination} from "@/components/wrappers/cards-with-pagination";
+import {CardsWithPagination} from "@/components/wrappers/common/cards-with-pagination";
 import {Button} from "@/components/ui/button";
 import Link from 'next/link'
 import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
diff --git a/app/(customer)/dashboard/layout.tsx b/app/(customer)/dashboard/layout.tsx
index 265c0d32..3aac4b10 100644
--- a/app/(customer)/dashboard/layout.tsx
+++ b/app/(customer)/dashboard/layout.tsx
@@ -2,7 +2,7 @@ import React from "react";
 import {redirect} from "next/navigation";
 
 import {SidebarInset, SidebarProvider} from "@/components/ui/sidebar"
-import {AppSidebar} from "@/components/wrappers/dashboard/SideBar/app-sidebar";
+import {AppSidebar} from "@/components/wrappers/dashboard/sideBar/app-sidebar";
 import {currentUser} from "@/auth/current-user";
 import {Header} from "@/features/layout/Header";
 import {prisma} from "@/prisma";
diff --git a/app/(customer)/dashboard/loading.tsx b/app/(customer)/dashboard/loading.tsx
index 583b9b46..6bb99a62 100644
--- a/app/(customer)/dashboard/loading.tsx
+++ b/app/(customer)/dashboard/loading.tsx
@@ -1,4 +1,4 @@
-import {LoadingSpinner} from "@/components/wrappers/Loading/LoadingSpinner";
+import {LoadingSpinner} from "@/components/wrappers/common/loading/LoadingSpinner";
 
 export default function Loading() {
     return (
diff --git a/app/(customer)/dashboard/profile/page.tsx b/app/(customer)/dashboard/profile/page.tsx
index 1b711eba..faefd99d 100644
--- a/app/(customer)/dashboard/profile/page.tsx
+++ b/app/(customer)/dashboard/profile/page.tsx
@@ -1,13 +1,12 @@
 import {PageParams} from "@/types/next";
 import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
-import {Avatar, AvatarFallback, AvatarImage} from "@/components/ui/avatar";
 import {notFound} from "next/navigation";
 import {requiredCurrentUser} from "@/auth/current-user";
-import {UserForm} from "@/components/wrappers/dashboard/Profile/UserForm/UserForm";
+import {UserForm} from "@/components/wrappers/dashboard/profile/UserForm/UserForm";
 import {prisma} from "@/prisma";
 import {Badge} from "@/components/ui/badge";
-import {ButtonDeleteAccount} from "@/components/wrappers/dashboard/Profile/ButtonDeleteAccount/ButtonDeleteAccount";
-import {AvatarWithUpload} from "@/components/wrappers/dashboard/Profile/Avatar/AvatarWithUpload";
+import {ButtonDeleteAccount} from "@/components/wrappers/dashboard/profile/ButtonDeleteAccount/ButtonDeleteAccount";
+import {AvatarWithUpload} from "@/components/wrappers/dashboard/profile/Avatar/AvatarWithUpload";
 
 export default async function RoutePage(props: PageParams<{}>) {
 
diff --git a/app/(customer)/dashboard/projects/[projectId]/database/[databaseId]/edit/page.tsx b/app/(customer)/dashboard/projects/[projectId]/database/[databaseId]/edit/page.tsx
index 53166d73..6b76b4b1 100644
--- a/app/(customer)/dashboard/projects/[projectId]/database/[databaseId]/edit/page.tsx
+++ b/app/(customer)/dashboard/projects/[projectId]/database/[databaseId]/edit/page.tsx
@@ -1,6 +1,5 @@
 import {PageParams} from "@/types/next";
 import {Page, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
-import {AgentForm} from "@/components/wrappers/dashboard/agent/AgentForm/AgentForm";
 import {requiredCurrentUser} from "@/auth/current-user";
 import {prisma} from "@/prisma";
 import {notFound} from "next/navigation";
diff --git a/app/(customer)/dashboard/projects/[projectId]/database/[databaseId]/page.tsx b/app/(customer)/dashboard/projects/[projectId]/database/[databaseId]/page.tsx
index 38a7df2f..dc0152f0 100644
--- a/app/(customer)/dashboard/projects/[projectId]/database/[databaseId]/page.tsx
+++ b/app/(customer)/dashboard/projects/[projectId]/database/[databaseId]/page.tsx
@@ -3,8 +3,8 @@ import {prisma} from "@/prisma";
 import {notFound} from "next/navigation";
 import {Page, PageActions, PageContent, PageDescription, PageTitle} from "@/features/layout/page";
 import {BackupButton} from "@/components/wrappers/dashboard/backup/backup-button/backup-button";
-import {DatabaseTabs} from "@/components/wrappers/dashboard/Projects/Database/DatabaseTabs";
-import {DatabaseKpi} from "@/components/wrappers/dashboard/Projects/Database/DatabaseKpi";
+import {DatabaseTabs} from "@/components/wrappers/dashboard/projects/Database/DatabaseTabs";
+import {DatabaseKpi} from "@/components/wrappers/dashboard/projects/Database/DatabaseKpi";
 import {EditButton} from "@/components/wrappers/dashboard/database/EditButton/EditButton";
 import {CronButton} from "@/components/wrappers/dashboard/database/CronButton/CronButton";
 
diff --git a/app/(customer)/dashboard/projects/[projectId]/edit/page.tsx b/app/(customer)/dashboard/projects/[projectId]/edit/page.tsx
index e312d80f..e18aaf6b 100644
--- a/app/(customer)/dashboard/projects/[projectId]/edit/page.tsx
+++ b/app/(customer)/dashboard/projects/[projectId]/edit/page.tsx
@@ -3,7 +3,7 @@ import {notFound} from "next/navigation";
 import {PageParams} from "@/types/next";
 import {Page, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
 import {prisma} from "@/prisma";
-import {ProjectForm} from "@/components/wrappers/dashboard/Projects/ProjectsForm/ProjectForm";
+import {ProjectForm} from "@/components/wrappers/dashboard/projects/ProjectsForm/ProjectForm";
 
 
 export default async function RoutePage(props: PageParams<{
diff --git a/app/(customer)/dashboard/projects/[projectId]/page.tsx b/app/(customer)/dashboard/projects/[projectId]/page.tsx
index 5a0f802f..5c40708e 100644
--- a/app/(customer)/dashboard/projects/[projectId]/page.tsx
+++ b/app/(customer)/dashboard/projects/[projectId]/page.tsx
@@ -4,9 +4,9 @@ import {buttonVariants} from "@/components/ui/button";
 import {prisma} from "@/prisma";
 import {GearIcon} from "@radix-ui/react-icons";
 import Link from "next/link";
-import {ButtonDeleteProject} from "@/components/wrappers/dashboard/Projects/ButtonDeleteProject/ButtonDeleteProject";
-import {CardsWithPagination} from "@/components/wrappers/cards-with-pagination";
-import {ProjectDatabaseCard} from "@/components/wrappers/dashboard/Projects/ProjectCard/ProjectDatabaseCard";
+import {ButtonDeleteProject} from "@/components/wrappers/dashboard/projects/ButtonDeleteProject/ButtonDeleteProject";
+import {CardsWithPagination} from "@/components/wrappers/common/cards-with-pagination";
+import {ProjectDatabaseCard} from "@/components/wrappers/dashboard/projects/ProjectCard/ProjectDatabaseCard";
 import {notFound} from "next/navigation";
 
 
diff --git a/app/(customer)/dashboard/projects/new/page.tsx b/app/(customer)/dashboard/projects/new/page.tsx
index 2c867207..c12eb65d 100644
--- a/app/(customer)/dashboard/projects/new/page.tsx
+++ b/app/(customer)/dashboard/projects/new/page.tsx
@@ -1,7 +1,7 @@
 import {PageParams} from "@/types/next";
 import {Page, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
 import {prisma} from "@/prisma";
-import {ProjectForm} from "@/components/wrappers/dashboard/Projects/ProjectsForm/ProjectForm";
+import {ProjectForm} from "@/components/wrappers/dashboard/projects/ProjectsForm/ProjectForm";
 
 
 export default async function RoutePage(props: PageParams<{}>) {
diff --git a/app/(customer)/dashboard/projects/page.tsx b/app/(customer)/dashboard/projects/page.tsx
index 40e36b4c..5fa72965 100644
--- a/app/(customer)/dashboard/projects/page.tsx
+++ b/app/(customer)/dashboard/projects/page.tsx
@@ -1,10 +1,10 @@
 import {PageParams} from "@/types/next";
 import {prisma} from "@/prisma";
-import {CardsWithPagination} from "@/components/wrappers/cards-with-pagination";
+import {CardsWithPagination} from "@/components/wrappers/common/cards-with-pagination";
 import {Button} from "@/components/ui/button";
 import Link from 'next/link'
 import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
-import {ProjectCard} from "@/components/wrappers/dashboard/Projects/ProjectCard/ProjectCard";
+import {ProjectCard} from "@/components/wrappers/dashboard/projects/ProjectCard/ProjectCard";
 import {requiredCurrentUser} from "@/auth/current-user";
 
 export default async function RoutePage(props: PageParams<{}>) {
diff --git a/app/(customer)/dashboard/settings/page.tsx b/app/(customer)/dashboard/settings/page.tsx
index 898b5933..1e382583 100644
--- a/app/(customer)/dashboard/settings/page.tsx
+++ b/app/(customer)/dashboard/settings/page.tsx
@@ -2,7 +2,7 @@ import {prisma} from "@/prisma";
 import {PageParams} from "@/types/next";
 import {Page, PageContent, PageDescription, PageHeader, PageTitle} from "@/features/layout/page";
 import {requiredCurrentUser} from "@/auth/current-user";
-import {SettingsTabs} from "@/components/wrappers/dashboard/Settings/SettingsTabs/SettingsTabs";
+import {SettingsTabs} from "@/components/wrappers/dashboard/settings/SettingsTabs/SettingsTabs";
 
 
 export default async function RoutePage(props: PageParams<{}>) {
diff --git a/app/api/agent/[agentId]/backup/route.ts b/app/api/agent/[agentId]/backup/route.ts
index 5cade3d3..71f809f4 100644
--- a/app/api/agent/[agentId]/backup/route.ts
+++ b/app/api/agent/[agentId]/backup/route.ts
@@ -1,5 +1,4 @@
 import {NextResponse} from "next/server";
-import {Body} from "../status/route";
 import {prisma} from "@/prisma";
 import {isUuidv4} from "@/utils/verify-uuid";
 import {uploadLocalPrivate} from "@/features/upload/private/upload.action";
diff --git a/app/api/agent/[agentId]/status/helpers.ts b/app/api/agent/[agentId]/status/helpers.ts
index 09ba3b44..319089f4 100644
--- a/app/api/agent/[agentId]/status/helpers.ts
+++ b/app/api/agent/[agentId]/status/helpers.ts
@@ -6,12 +6,6 @@ import {isUuidv4} from "@/utils/verify-uuid";
 import {getFileUrlPresignedLocal} from "@/features/upload/private/upload.action";
 
 
-
-
-
-
-
-
 export async function handleDatabases(body: Body, agent: Agent, lastContact: Date) {
     const databasesResponse = [];
 
diff --git a/app/api/events/route.ts b/app/api/events/route.ts
index 73fd97d8..2150020c 100644
--- a/app/api/events/route.ts
+++ b/app/api/events/route.ts
@@ -1,100 +1,3 @@
-// import { EventEmitter } from 'events';
-
-//
-// const eventEmitter = new EventEmitter();
-//
-//
-// export async function GET(request: Request) {
-//     return new Response(new ReadableStream({
-//         async pull(controller) {
-//             eventEmitter.on('modification', (data) => {
-//                 controller.enqueue(`event: modification\n`);
-//                 controller.enqueue(`data: ${JSON.stringify(data)}\n\n`);
-//                 controller.close();
-//             });
-//         },
-//     }), {
-//         status: 200,
-//         headers: {
-//             'Content-Type': 'text/event-stream',
-//             'Cache-Control': 'no-cache',
-//             Connection: 'keep-alive',
-//         },
-//     });
-// }
-//
-// export async function POST(request: Request) {
-//     const data = await request.json();
-//     eventEmitter.emit('modification', data);
-//     return new Response('Event sent', { status: 200 });
-// }
-//
-// const eventEmitter = new EventEmitter();
-//
-// export async function GET(request: Request) {
-//     return new Response(new ReadableStream({
-//         async pull(controller) {
-//             eventEmitter.on('modification', (data) => {
-//                 console.log('Modification event triggered:', data);
-//                 controller.enqueue(`event: modification\n`);
-//                 controller.enqueue(`data: ${JSON.stringify(data)}\n\n`);
-//             });
-//
-//             // Close the controller when the client closes the connection
-//             request.signal.addEventListener('abort', () => {
-//                 controller.close();
-//             });
-//         },
-//     }), {
-//         status: 200,
-//         headers: {
-//             'Content-Type': 'text/event-stream',
-//             'Cache-Control': 'no-cache',
-//             Connection: 'keep-alive',
-//         },
-//     });
-// }
-//
-// export async function POST(request: Request) {
-//     const data = await request.json();
-//     console.log(data);
-//     eventEmitter.emit('modification', data);
-//     return new Response('Event sent', { status: 200 });
-// }
-// const eventEmitter = new EventEmitter();
-//
-// export async function GET(request: Request) {
-//     console.log('GET request received');
-//     return new Response(new ReadableStream({
-//         async pull(controller) {
-//             console.log('Controller created:', controller);
-//             eventEmitter.on('modification', (data) => {
-//                 console.log('Modification event triggered:', data);
-//                 controller.enqueue(`event: modification\n`);
-//                 controller.enqueue(`data: ${JSON.stringify(data)}\n\n`);
-//             });
-//             // Close the controller when the client closes the connection
-//             request.signal.addEventListener('abort', () => {
-//                 controller.close();
-//             });
-//         },
-//     }), {
-//         status: 200,
-//         headers: {
-//             'Content-Type': 'text/event-stream',
-//             'Cache-Control': 'no-cache',
-//             Connection: 'keep-alive',
-//         },
-//     });
-// }
-//
-// export async function POST(request: Request) {
-//     console.log('POST request received');
-//     const data = await request.json();
-//     console.log('Data received:', data);
-//     eventEmitter.emit('modification', data);
-//     return new Response('Event sent', { status: 200 });
-// }
 import { EventEmitter } from 'events';
 
 export const eventEmitter = new EventEmitter();
diff --git a/src/components/wrappers/auth/Login/LoginForm/LoginForm.tsx b/src/components/wrappers/auth/login/loginForm/LoginForm.tsx
similarity index 96%
rename from src/components/wrappers/auth/Login/LoginForm/LoginForm.tsx
rename to src/components/wrappers/auth/login/loginForm/LoginForm.tsx
index b599082a..01228ff8 100644
--- a/src/components/wrappers/auth/Login/LoginForm/LoginForm.tsx
+++ b/src/components/wrappers/auth/login/loginForm/LoginForm.tsx
@@ -12,10 +12,9 @@ import {useMutation} from "@tanstack/react-query";
 import {TooltipProvider} from "@/components/ui/tooltip";
 import Link from "next/link";
 import {PasswordInput} from "@/components/wrappers/auth/PaswordInput/password-input";
-import {LoginSchema, LoginType} from "@/components/wrappers/auth/Login/LoginForm/login-form.schema";
 import {signInAction} from "@/features/auth/auth.action";
-import {SocialAuthButton} from "@/components/wrappers/auth/Login/SocialAuth/SocialAuthButtons/SocialAuthButton";
-import Image from 'next/image';
+import {LoginSchema, LoginType} from "@/components/wrappers/auth/login/loginForm/login-form.schema";
+import {SocialAuthButton} from "@/components/wrappers/auth/login/socialAuth/socialAuthButtons/SocialAuthButton";
 
 export type loginFormProps = {
     defaultValues?: LoginType;
diff --git a/src/components/wrappers/auth/Login/LoginForm/login-form.action.ts b/src/components/wrappers/auth/login/loginForm/login-form.action.ts
similarity index 100%
rename from src/components/wrappers/auth/Login/LoginForm/login-form.action.ts
rename to src/components/wrappers/auth/login/loginForm/login-form.action.ts
diff --git a/src/components/wrappers/auth/Login/LoginForm/login-form.schema.ts b/src/components/wrappers/auth/login/loginForm/login-form.schema.ts
similarity index 100%
rename from src/components/wrappers/auth/Login/LoginForm/login-form.schema.ts
rename to src/components/wrappers/auth/login/loginForm/login-form.schema.ts
diff --git a/src/components/wrappers/auth/Login/SocialAuth/SocialAuthButtons/SocialAuthButton.tsx b/src/components/wrappers/auth/login/socialAuth/socialAuthButtons/SocialAuthButton.tsx
similarity index 100%
rename from src/components/wrappers/auth/Login/SocialAuth/SocialAuthButtons/SocialAuthButton.tsx
rename to src/components/wrappers/auth/login/socialAuth/socialAuthButtons/SocialAuthButton.tsx
diff --git a/src/components/wrappers/CodeSnippet/CodeSnippet.tsx b/src/components/wrappers/codeSnippet/CodeSnippet.tsx
similarity index 100%
rename from src/components/wrappers/CodeSnippet/CodeSnippet.tsx
rename to src/components/wrappers/codeSnippet/CodeSnippet.tsx
diff --git a/src/components/wrappers/cards-with-pagination.tsx b/src/components/wrappers/common/cards-with-pagination.tsx
similarity index 94%
rename from src/components/wrappers/cards-with-pagination.tsx
rename to src/components/wrappers/common/cards-with-pagination.tsx
index a8cb2b34..466fd63c 100644
--- a/src/components/wrappers/cards-with-pagination.tsx
+++ b/src/components/wrappers/common/cards-with-pagination.tsx
@@ -3,7 +3,7 @@
 import React, {useState} from 'react'
 import {cn} from "@/lib/utils";
 
-import {PaginationNavigation} from "@/components/wrappers/pagination/pagination-navigation";
+import {PaginationNavigation} from "@/components/wrappers/common/pagination/pagination-navigation";
 
 export type cardsWithPaginationProps = {
     className?: string
diff --git a/src/components/wrappers/common/combobox.tsx b/src/components/wrappers/common/combobox.tsx
index bc41f7f0..69756142 100644
--- a/src/components/wrappers/common/combobox.tsx
+++ b/src/components/wrappers/common/combobox.tsx
@@ -2,7 +2,7 @@
 
 import {useEffect, useState} from "react";
 
-import {Check, ChevronDown, KeyRound} from "lucide-react"
+import {Check, ChevronDown} from "lucide-react"
 
 import {cn} from "@/lib/utils"
 import {Button} from "@/components/ui/button"
@@ -22,8 +22,7 @@ import {
 import {FormControl} from "@/components/ui/form";
 import {SidebarMenuButton} from "@/components/ui/sidebar";
 import {Separator} from "@/components/ui/separator";
-import {AgentModalKey} from "@/components/wrappers/dashboard/agent/AgentModalKey/AgentModalKey";
-import {CreateOrganizationModal} from "@/components/wrappers/dashboard/Organization/create-organisation-modal";
+import {CreateOrganizationModal} from "@/components/wrappers/dashboard/organization/create-organisation-modal";
 
 export type comboBoxProps = {
     values: Array<{ value: string, label: string }>
diff --git a/src/components/wrappers/connection-circle.tsx b/src/components/wrappers/common/connection-circle.tsx
similarity index 100%
rename from src/components/wrappers/connection-circle.tsx
rename to src/components/wrappers/common/connection-circle.tsx
diff --git a/src/components/wrappers/daytime-picker.tsx b/src/components/wrappers/common/daytime-picker.tsx
similarity index 100%
rename from src/components/wrappers/daytime-picker.tsx
rename to src/components/wrappers/common/daytime-picker.tsx
diff --git a/src/components/wrappers/dialog.tsx b/src/components/wrappers/common/dialog.tsx
similarity index 100%
rename from src/components/wrappers/dialog.tsx
rename to src/components/wrappers/common/dialog.tsx
diff --git a/src/components/wrappers/Loading/LoadingSpinner.tsx b/src/components/wrappers/common/loading/LoadingSpinner.tsx
similarity index 100%
rename from src/components/wrappers/Loading/LoadingSpinner.tsx
rename to src/components/wrappers/common/loading/LoadingSpinner.tsx
diff --git a/src/components/wrappers/MultiSelect/MultiSelect.tsx b/src/components/wrappers/common/multiSelect/MultiSelect.tsx
similarity index 100%
rename from src/components/wrappers/MultiSelect/MultiSelect.tsx
rename to src/components/wrappers/common/multiSelect/MultiSelect.tsx
diff --git a/src/components/wrappers/pagination/pagination-indexes.tsx b/src/components/wrappers/common/pagination/pagination-indexes.tsx
similarity index 100%
rename from src/components/wrappers/pagination/pagination-indexes.tsx
rename to src/components/wrappers/common/pagination/pagination-indexes.tsx
diff --git a/src/components/wrappers/pagination/pagination-navigation.tsx b/src/components/wrappers/common/pagination/pagination-navigation.tsx
similarity index 92%
rename from src/components/wrappers/pagination/pagination-navigation.tsx
rename to src/components/wrappers/common/pagination/pagination-navigation.tsx
index da7fd06b..34e083a6 100644
--- a/src/components/wrappers/pagination/pagination-navigation.tsx
+++ b/src/components/wrappers/common/pagination/pagination-navigation.tsx
@@ -5,7 +5,7 @@ import {
     PaginationNext,
     PaginationPrevious
 } from "@/components/ui/pagination";
-import {PaginationIndexes} from "@/components/wrappers/pagination/pagination-indexes";
+import {PaginationIndexes} from "@/components/wrappers/common/pagination/pagination-indexes";
 import {cn} from "@/lib/utils";
 
 
diff --git a/src/components/wrappers/status-badge.tsx b/src/components/wrappers/common/status-badge.tsx
similarity index 100%
rename from src/components/wrappers/status-badge.tsx
rename to src/components/wrappers/common/status-badge.tsx
diff --git a/src/components/wrappers/table/data-table-with-pagination.tsx b/src/components/wrappers/common/table/data-table-with-pagination.tsx
similarity index 92%
rename from src/components/wrappers/table/data-table-with-pagination.tsx
rename to src/components/wrappers/common/table/data-table-with-pagination.tsx
index ca759b42..a6f2758d 100644
--- a/src/components/wrappers/table/data-table-with-pagination.tsx
+++ b/src/components/wrappers/common/table/data-table-with-pagination.tsx
@@ -5,8 +5,8 @@ import {useState} from "react";
 import {
     ColumnDef, getCoreRowModel, getPaginationRowModel, getSortedRowModel, SortingState, useReactTable
 } from "@tanstack/react-table"
-import {DataTable as BaseDataTable} from "@/components/wrappers/table/data-table";
-import {TablePagination} from "@/components/wrappers/table/table-pagination";
+import {DataTable as BaseDataTable} from "@/components/wrappers/common/table/data-table";
+import {TablePagination} from "@/components/wrappers/common/table/table-pagination";
 
 interface DataTableProps<TData, TValue> {
     columns: ColumnDef<TData, TValue>[]
diff --git a/src/components/wrappers/table/data-table.tsx b/src/components/wrappers/common/table/data-table.tsx
similarity index 100%
rename from src/components/wrappers/table/data-table.tsx
rename to src/components/wrappers/common/table/data-table.tsx
diff --git a/src/components/wrappers/table/table-pagination-navigation.tsx b/src/components/wrappers/common/table/table-pagination-navigation.tsx
similarity index 90%
rename from src/components/wrappers/table/table-pagination-navigation.tsx
rename to src/components/wrappers/common/table/table-pagination-navigation.tsx
index 17de947d..381ecd9e 100644
--- a/src/components/wrappers/table/table-pagination-navigation.tsx
+++ b/src/components/wrappers/common/table/table-pagination-navigation.tsx
@@ -1,4 +1,4 @@
-import {PaginationNavigation} from "@/components/wrappers/pagination/pagination-navigation";
+import {PaginationNavigation} from "@/components/wrappers/common/pagination/pagination-navigation";
 
 
 export type paginationNavigationProps = {
diff --git a/src/components/wrappers/table/table-pagination-size.tsx b/src/components/wrappers/common/table/table-pagination-size.tsx
similarity index 100%
rename from src/components/wrappers/table/table-pagination-size.tsx
rename to src/components/wrappers/common/table/table-pagination-size.tsx
diff --git a/src/components/wrappers/table/table-pagination.tsx b/src/components/wrappers/common/table/table-pagination.tsx
similarity index 76%
rename from src/components/wrappers/table/table-pagination.tsx
rename to src/components/wrappers/common/table/table-pagination.tsx
index f68f5e67..e7e0c6c1 100644
--- a/src/components/wrappers/table/table-pagination.tsx
+++ b/src/components/wrappers/common/table/table-pagination.tsx
@@ -1,7 +1,7 @@
 "use client"
 
-import {TablePaginationNavigation} from "@/components/wrappers/table/table-pagination-navigation";
-import {TablePaginationSize} from "@/components/wrappers/table/table-pagination-size";
+import {TablePaginationNavigation} from "@/components/wrappers/common/table/table-pagination-navigation";
+import {TablePaginationSize} from "@/components/wrappers/common/table/table-pagination-size";
 import {cn} from "@/lib/utils";
 
 interface tablePaginationProps {
diff --git a/src/components/wrappers/TooltipCustom/TooltipCustom.tsx b/src/components/wrappers/common/tooltipCustom/TooltipCustom.tsx
similarity index 100%
rename from src/components/wrappers/TooltipCustom/TooltipCustom.tsx
rename to src/components/wrappers/common/tooltipCustom/TooltipCustom.tsx
diff --git a/src/components/wrappers/dashboard/admin/AdminEmailTab/SettingsEmailTab.tsx b/src/components/wrappers/dashboard/admin/AdminEmailTab/SettingsEmailTab.tsx
index a6bb5ab7..6afa544e 100644
--- a/src/components/wrappers/dashboard/admin/AdminEmailTab/SettingsEmailTab.tsx
+++ b/src/components/wrappers/dashboard/admin/AdminEmailTab/SettingsEmailTab.tsx
@@ -7,7 +7,6 @@ import {sendEmail} from "@/utils/email-helper";
 import TestEmailSettings from "../../../../../../emails/TestEmailSettings";
 import {render} from "@react-email/render";
 import {toast} from "sonner";
-import HelloEmail from "../../../../../../emails/HelloEmail";
 
 
 
diff --git a/src/components/wrappers/dashboard/admin/AdminStorageTab/SettingsStorageTab.tsx b/src/components/wrappers/dashboard/admin/AdminStorageTab/SettingsStorageTab.tsx
index 35928230..49a15afe 100644
--- a/src/components/wrappers/dashboard/admin/AdminStorageTab/SettingsStorageTab.tsx
+++ b/src/components/wrappers/dashboard/admin/AdminStorageTab/SettingsStorageTab.tsx
@@ -9,7 +9,6 @@ import {ButtonWithLoading} from "@/components/wrappers/common/button/ButtonWithL
 import {useMutation} from "@tanstack/react-query";
 import {checkConnexionToS3} from "@/features/upload/public/upload.action";
 import {toast} from "sonner";
-import {updateUserAction} from "@/components/wrappers/dashboard/Profile/UserForm/user-form.action";
 import {useRouter} from "next/navigation";
 import {
     updateStorageSettingsAction
diff --git a/src/components/wrappers/dashboard/admin/admin-user-table.tsx b/src/components/wrappers/dashboard/admin/admin-user-table.tsx
index 5cd8165d..5b3aae95 100644
--- a/src/components/wrappers/dashboard/admin/admin-user-table.tsx
+++ b/src/components/wrappers/dashboard/admin/admin-user-table.tsx
@@ -1,8 +1,8 @@
 import {flexRender, Row, RowData} from "@tanstack/react-table";
 
 import {User} from "@prisma/client";
-import {DataTableWithPagination} from "@/components/wrappers/table/data-table-with-pagination";
-import {usersColumns} from "@/components/wrappers/dashboard/Settings/SettingsUsersTab/columns-users";
+import {DataTableWithPagination} from "@/components/wrappers/common/table/data-table-with-pagination";
+import {usersColumns} from "@/components/wrappers/dashboard/settings/SettingsUsersTab/columns-users";
 import {Table, TableBody, TableCell, TableHead, TableHeader, TableRow} from "@/components/ui/table";
 import {cn} from "@/lib/utils";
 
diff --git a/src/components/wrappers/dashboard/agent/AgentCard/AgentCard.tsx b/src/components/wrappers/dashboard/agent/AgentCard/AgentCard.tsx
index b97b9c5e..2def1681 100644
--- a/src/components/wrappers/dashboard/agent/AgentCard/AgentCard.tsx
+++ b/src/components/wrappers/dashboard/agent/AgentCard/AgentCard.tsx
@@ -4,7 +4,7 @@ import {Card, CardContent, CardHeader} from "@/components/ui/card";
 import Link from "next/link";
 import {ValueIcon} from "@radix-ui/react-icons";
 import {Circle} from "lucide-react";
-import {ConnectionCircle} from "@/components/wrappers/connection-circle";
+import {ConnectionCircle} from "@/components/wrappers/common/connection-circle";
 import {formatDateLastContact} from "@/utils/date-formatting";
 
 export type agentCardProps = {
diff --git a/src/components/wrappers/dashboard/agent/AgentModalKey/AgentModalKey.tsx b/src/components/wrappers/dashboard/agent/AgentModalKey/AgentModalKey.tsx
index 5e32d6b2..90d330d7 100644
--- a/src/components/wrappers/dashboard/agent/AgentModalKey/AgentModalKey.tsx
+++ b/src/components/wrappers/dashboard/agent/AgentModalKey/AgentModalKey.tsx
@@ -10,13 +10,13 @@ import {
     DialogTrigger,
 } from "@/components/ui/dialog"
 
-import {CodeSnippet} from "@/components/wrappers/CodeSnippet/CodeSnippet";
 import {generateEdgeKey} from "@/utils/edge_key";
 import {Copy} from "lucide-react";
 import {PropsWithChildren, useState} from "react";
 import {CopyButton} from "@/components/wrappers/common/button/copy-button";
 import {Agent} from "@prisma/client";
 import {getServerUrl} from "@/utils/get-server-url";
+import {CodeSnippet} from "@/components/wrappers/codeSnippet/CodeSnippet";
 
 export type agentRegistrationDialogProps = PropsWithChildren<{
     agent: Agent
diff --git a/src/components/wrappers/dashboard/database/RestoreForm.tsx b/src/components/wrappers/dashboard/database/RestoreForm.tsx
index 689df9d4..ab122034 100644
--- a/src/components/wrappers/dashboard/database/RestoreForm.tsx
+++ b/src/components/wrappers/dashboard/database/RestoreForm.tsx
@@ -2,7 +2,7 @@
 
 import {useState} from "react";
 
-import {DateTimePicker} from "@/components/wrappers/daytime-picker";
+import {DateTimePicker} from "@/components/wrappers/common/daytime-picker";
 import {Button} from "@/components/ui/button";
 import {
     Form,
diff --git a/src/components/wrappers/dashboard/LoggedInButton/LoggedInButton.tsx b/src/components/wrappers/dashboard/loggedInButton/LoggedInButton.tsx
similarity index 96%
rename from src/components/wrappers/dashboard/LoggedInButton/LoggedInButton.tsx
rename to src/components/wrappers/dashboard/loggedInButton/LoggedInButton.tsx
index 9287ca70..cd3a7cc5 100644
--- a/src/components/wrappers/dashboard/LoggedInButton/LoggedInButton.tsx
+++ b/src/components/wrappers/dashboard/loggedInButton/LoggedInButton.tsx
@@ -1,8 +1,8 @@
 import {Avatar, AvatarFallback, AvatarImage} from "@/components/ui/avatar"
 import {currentUser} from "@/auth/current-user";
-import {LoggedInDropdown} from "@/components/wrappers/dashboard/LoggedInDropdown/LoggedInDropdown";
 import {SidebarMenuButton} from "@/components/ui/sidebar";
 import {ChevronUp} from "lucide-react";
+import {LoggedInDropdown} from "@/components/wrappers/dashboard/loggedInDropdown/LoggedInDropdown";
 
 export const LoggedInButton = async () => {
 
diff --git a/src/components/wrappers/dashboard/LoggedInDropdown/LoggedInDropdown.tsx b/src/components/wrappers/dashboard/loggedInDropdown/LoggedInDropdown.tsx
similarity index 100%
rename from src/components/wrappers/dashboard/LoggedInDropdown/LoggedInDropdown.tsx
rename to src/components/wrappers/dashboard/loggedInDropdown/LoggedInDropdown.tsx
diff --git a/src/components/wrappers/dashboard/Organization/create-organisation-modal.tsx b/src/components/wrappers/dashboard/organization/create-organisation-modal.tsx
similarity index 98%
rename from src/components/wrappers/dashboard/Organization/create-organisation-modal.tsx
rename to src/components/wrappers/dashboard/organization/create-organisation-modal.tsx
index 4620a02c..f3900c56 100644
--- a/src/components/wrappers/dashboard/Organization/create-organisation-modal.tsx
+++ b/src/components/wrappers/dashboard/organization/create-organisation-modal.tsx
@@ -6,7 +6,7 @@ import {Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle, DialogTr
 import {Button} from "@/components/ui/button";
 import {Form, FormControl, FormField, FormItem, FormLabel, FormMessage, useZodForm} from "@/components/ui/form";
 import {Input} from "@/components/ui/input";
-import {OrganizationSchema} from "@/components/wrappers/dashboard/Organization/organization.schema";
+import {OrganizationSchema} from "@/components/wrappers/dashboard/organization/organization.schema";
 
 export type createOrganizationModalProps = {
     children: any
diff --git a/src/components/wrappers/dashboard/Organization/organization-combobox.tsx b/src/components/wrappers/dashboard/organization/organization-combobox.tsx
similarity index 97%
rename from src/components/wrappers/dashboard/Organization/organization-combobox.tsx
rename to src/components/wrappers/dashboard/organization/organization-combobox.tsx
index 97e1b294..4f78a19e 100644
--- a/src/components/wrappers/dashboard/Organization/organization-combobox.tsx
+++ b/src/components/wrappers/dashboard/organization/organization-combobox.tsx
@@ -4,7 +4,6 @@ import {useEffect, useState} from "react";
 
 import {ComboBox} from "@/components/wrappers/common/combobox";
 import {Organization} from "@prisma/client";
-import {useStore} from "@/state-management/store";
 import {getCurrentOrganizationSlug, setCurrentOrganizationSlug} from "@/features/dashboard/organization-cookie";
 import {useSidebar} from "@/components/ui/sidebar";
 
diff --git a/src/components/wrappers/dashboard/Organization/organization.schema.ts b/src/components/wrappers/dashboard/organization/organization.schema.ts
similarity index 100%
rename from src/components/wrappers/dashboard/Organization/organization.schema.ts
rename to src/components/wrappers/dashboard/organization/organization.schema.ts
diff --git a/src/components/wrappers/dashboard/Profile/Avatar/AvatarWithUpload.tsx b/src/components/wrappers/dashboard/profile/Avatar/AvatarWithUpload.tsx
similarity index 98%
rename from src/components/wrappers/dashboard/Profile/Avatar/AvatarWithUpload.tsx
rename to src/components/wrappers/dashboard/profile/Avatar/AvatarWithUpload.tsx
index 1a39fe83..62988266 100644
--- a/src/components/wrappers/dashboard/Profile/Avatar/AvatarWithUpload.tsx
+++ b/src/components/wrappers/dashboard/profile/Avatar/AvatarWithUpload.tsx
@@ -6,7 +6,7 @@ import {toast} from "sonner";
 import {uploadImageAction} from "@/features/upload/public/upload.action";
 import {useMutation} from "@tanstack/react-query";
 import {prisma} from "@/prisma";
-import {updateImageUserAction} from "@/components/wrappers/dashboard/Profile/Avatar/avatar.action";
+import {updateImageUserAction} from "@/components/wrappers/dashboard/profile/Avatar/avatar.action";
 import {useRouter} from "next/navigation";
 import {useSession} from "next-auth/react";
 
diff --git a/src/components/wrappers/dashboard/Profile/Avatar/avatar.action.ts b/src/components/wrappers/dashboard/profile/Avatar/avatar.action.ts
similarity index 100%
rename from src/components/wrappers/dashboard/Profile/Avatar/avatar.action.ts
rename to src/components/wrappers/dashboard/profile/Avatar/avatar.action.ts
diff --git a/src/components/wrappers/dashboard/Profile/ButtonDeleteAccount/ButtonDeleteAccount.tsx b/src/components/wrappers/dashboard/profile/ButtonDeleteAccount/ButtonDeleteAccount.tsx
similarity index 94%
rename from src/components/wrappers/dashboard/Profile/ButtonDeleteAccount/ButtonDeleteAccount.tsx
rename to src/components/wrappers/dashboard/profile/ButtonDeleteAccount/ButtonDeleteAccount.tsx
index dcd96846..11a0c73a 100644
--- a/src/components/wrappers/dashboard/Profile/ButtonDeleteAccount/ButtonDeleteAccount.tsx
+++ b/src/components/wrappers/dashboard/profile/ButtonDeleteAccount/ButtonDeleteAccount.tsx
@@ -2,7 +2,7 @@
 import {useMutation} from "@tanstack/react-query";
 import {signOutAction} from "@/features/auth/auth.action";
 import {ButtonWithConfirm} from "@/components/wrappers/common/button/ButtonWithConfirm/ButtonWithConfirm";
-import {deleteUserAction} from "@/components/wrappers/dashboard/Profile/ButtonDeleteAccount/delete-account.action";
+import {deleteUserAction} from "@/components/wrappers/dashboard/profile/ButtonDeleteAccount/delete-account.action";
 import {Trash2} from "lucide-react";
 
 export type ButtonDeleteAccountProps = {
diff --git a/src/components/wrappers/dashboard/Profile/ButtonDeleteAccount/delete-account.action.ts b/src/components/wrappers/dashboard/profile/ButtonDeleteAccount/delete-account.action.ts
similarity index 100%
rename from src/components/wrappers/dashboard/Profile/ButtonDeleteAccount/delete-account.action.ts
rename to src/components/wrappers/dashboard/profile/ButtonDeleteAccount/delete-account.action.ts
diff --git a/src/components/wrappers/dashboard/UserAvatar/UserAvatar.tsx b/src/components/wrappers/dashboard/profile/UserAvatar/UserAvatar.tsx
similarity index 100%
rename from src/components/wrappers/dashboard/UserAvatar/UserAvatar.tsx
rename to src/components/wrappers/dashboard/profile/UserAvatar/UserAvatar.tsx
diff --git a/src/components/wrappers/dashboard/Profile/UserForm/UserForm.tsx b/src/components/wrappers/dashboard/profile/UserForm/UserForm.tsx
similarity index 98%
rename from src/components/wrappers/dashboard/Profile/UserForm/UserForm.tsx
rename to src/components/wrappers/dashboard/profile/UserForm/UserForm.tsx
index 94d242b6..e775efd2 100644
--- a/src/components/wrappers/dashboard/Profile/UserForm/UserForm.tsx
+++ b/src/components/wrappers/dashboard/profile/UserForm/UserForm.tsx
@@ -10,9 +10,9 @@ import {Button} from "@/components/ui/button";
 import {useRouter} from "next/navigation";
 import {useMutation} from "@tanstack/react-query";
 import {TooltipProvider} from "@/components/ui/tooltip";
-import {UserSchema, UserType} from "@/components/wrappers/dashboard/Profile/UserForm/user-form.schema";
+import {UserSchema, UserType} from "@/components/wrappers/dashboard/profile/UserForm/user-form.schema";
 import {toast} from "sonner";
-import {updateUserAction} from "@/components/wrappers/dashboard/Profile/UserForm/user-form.action";
+import {updateUserAction} from "@/components/wrappers/dashboard/profile/UserForm/user-form.action";
 import { useSession } from "next-auth/react";
 
 export type userFormProps = {
diff --git a/src/components/wrappers/dashboard/Profile/UserForm/user-form.action.ts b/src/components/wrappers/dashboard/profile/UserForm/user-form.action.ts
similarity index 90%
rename from src/components/wrappers/dashboard/Profile/UserForm/user-form.action.ts
rename to src/components/wrappers/dashboard/profile/UserForm/user-form.action.ts
index fd7ad9b2..61205d61 100644
--- a/src/components/wrappers/dashboard/Profile/UserForm/user-form.action.ts
+++ b/src/components/wrappers/dashboard/profile/UserForm/user-form.action.ts
@@ -2,7 +2,7 @@
 import {userAction} from "@/safe-actions";
 import {z} from "zod";
 import {prisma} from "@/prisma";
-import {UserSchema} from "@/components/wrappers/dashboard/Profile/UserForm/user-form.schema";
+import {UserSchema} from "@/components/wrappers/dashboard/profile/UserForm/user-form.schema";
 
 export const updateUserAction = userAction
     .schema(
diff --git a/src/components/wrappers/dashboard/Profile/UserForm/user-form.schema.ts b/src/components/wrappers/dashboard/profile/UserForm/user-form.schema.ts
similarity index 100%
rename from src/components/wrappers/dashboard/Profile/UserForm/user-form.schema.ts
rename to src/components/wrappers/dashboard/profile/UserForm/user-form.schema.ts
diff --git a/src/components/wrappers/dashboard/Projects/ButtonDeleteProject/ButtonDeleteProject.tsx b/src/components/wrappers/dashboard/projects/ButtonDeleteProject/ButtonDeleteProject.tsx
similarity index 100%
rename from src/components/wrappers/dashboard/Projects/ButtonDeleteProject/ButtonDeleteProject.tsx
rename to src/components/wrappers/dashboard/projects/ButtonDeleteProject/ButtonDeleteProject.tsx
diff --git a/src/components/wrappers/dashboard/Projects/Database/DatabaseKpi.tsx b/src/components/wrappers/dashboard/projects/Database/DatabaseKpi.tsx
similarity index 100%
rename from src/components/wrappers/dashboard/Projects/Database/DatabaseKpi.tsx
rename to src/components/wrappers/dashboard/projects/Database/DatabaseKpi.tsx
diff --git a/src/components/wrappers/dashboard/Projects/Database/DatabaseTabs.tsx b/src/components/wrappers/dashboard/projects/Database/DatabaseTabs.tsx
similarity index 94%
rename from src/components/wrappers/dashboard/Projects/Database/DatabaseTabs.tsx
rename to src/components/wrappers/dashboard/projects/Database/DatabaseTabs.tsx
index 08435775..ec547f46 100644
--- a/src/components/wrappers/dashboard/Projects/Database/DatabaseTabs.tsx
+++ b/src/components/wrappers/dashboard/projects/Database/DatabaseTabs.tsx
@@ -1,7 +1,7 @@
 "use client"
 
 import {Tabs, TabsContent, TabsList, TabsTrigger} from "@/components/ui/tabs";
-import {DataTableWithPagination} from "@/components/wrappers/table/data-table-with-pagination";
+import {DataTableWithPagination} from "@/components/wrappers/common/table/data-table-with-pagination";
 import {backupColumns} from "@/features/backup/columns";
 import {restoreColumns} from "@/features/restore/columns";
 import {Backup, Database, Restoration} from "@prisma/client";
diff --git a/src/components/wrappers/dashboard/Projects/ProjectCard/ProjectCard.tsx b/src/components/wrappers/dashboard/projects/ProjectCard/ProjectCard.tsx
similarity index 100%
rename from src/components/wrappers/dashboard/Projects/ProjectCard/ProjectCard.tsx
rename to src/components/wrappers/dashboard/projects/ProjectCard/ProjectCard.tsx
diff --git a/src/components/wrappers/dashboard/Projects/ProjectCard/ProjectDatabaseCard.tsx b/src/components/wrappers/dashboard/projects/ProjectCard/ProjectDatabaseCard.tsx
similarity index 95%
rename from src/components/wrappers/dashboard/Projects/ProjectCard/ProjectDatabaseCard.tsx
rename to src/components/wrappers/dashboard/projects/ProjectCard/ProjectDatabaseCard.tsx
index 80e61b8f..3dce8129 100644
--- a/src/components/wrappers/dashboard/Projects/ProjectCard/ProjectDatabaseCard.tsx
+++ b/src/components/wrappers/dashboard/projects/ProjectCard/ProjectDatabaseCard.tsx
@@ -4,7 +4,7 @@ import Link from "next/link";
 import Image from "next/image"
 import {Database} from "@prisma/client";
 import {Card, CardContent, CardHeader} from "@/components/ui/card";
-import {ConnectionCircle} from "@/components/wrappers/connection-circle";
+import {ConnectionCircle} from "@/components/wrappers/common/connection-circle";
 import {formatDateLastContact} from "@/utils/date-formatting";
 
 export type projectDatabaseCardProps = {
diff --git a/src/components/wrappers/dashboard/Projects/ProjectsForm/ProjectForm.schema.ts b/src/components/wrappers/dashboard/projects/ProjectsForm/ProjectForm.schema.ts
similarity index 100%
rename from src/components/wrappers/dashboard/Projects/ProjectsForm/ProjectForm.schema.ts
rename to src/components/wrappers/dashboard/projects/ProjectsForm/ProjectForm.schema.ts
diff --git a/src/components/wrappers/dashboard/Projects/ProjectsForm/ProjectForm.tsx b/src/components/wrappers/dashboard/projects/ProjectsForm/ProjectForm.tsx
similarity index 96%
rename from src/components/wrappers/dashboard/Projects/ProjectsForm/ProjectForm.tsx
rename to src/components/wrappers/dashboard/projects/ProjectsForm/ProjectForm.tsx
index 5ca2cba0..c8c23fce 100644
--- a/src/components/wrappers/dashboard/Projects/ProjectsForm/ProjectForm.tsx
+++ b/src/components/wrappers/dashboard/projects/ProjectsForm/ProjectForm.tsx
@@ -14,14 +14,14 @@ import {Input} from "@/components/ui/input";
 import {Form} from "@/components/ui/form"
 import {Button} from "@/components/ui/button";
 import {useMutation} from "@tanstack/react-query";
-import {ProjectSchema, ProjectType} from "@/components/wrappers/dashboard/Projects/ProjectsForm/ProjectForm.schema";
+import {ProjectSchema, ProjectType} from "@/components/wrappers/dashboard/projects/ProjectsForm/ProjectForm.schema";
 import {
     createProjectAction,
     updateProjectAction
-} from "@/components/wrappers/dashboard/Projects/ProjectsForm/project-form.action";
+} from "@/components/wrappers/dashboard/projects/ProjectsForm/project-form.action";
 import {useRouter} from "next/navigation";
 import {Database, Organization, Projects} from "@prisma/client"
-import {MultiSelect} from "@/components/wrappers/MultiSelect/MultiSelect";
+import {MultiSelect} from "@/components/wrappers/common/multiSelect/MultiSelect";
 import {toast} from "sonner";
 
 
diff --git a/src/components/wrappers/dashboard/Projects/ProjectsForm/project-form.action.ts b/src/components/wrappers/dashboard/projects/ProjectsForm/project-form.action.ts
similarity index 98%
rename from src/components/wrappers/dashboard/Projects/ProjectsForm/project-form.action.ts
rename to src/components/wrappers/dashboard/projects/ProjectsForm/project-form.action.ts
index 9b5dcb43..82af9795 100644
--- a/src/components/wrappers/dashboard/Projects/ProjectsForm/project-form.action.ts
+++ b/src/components/wrappers/dashboard/projects/ProjectsForm/project-form.action.ts
@@ -2,7 +2,7 @@
 
 import {userAction} from "@/safe-actions";
 import {prisma} from "@/prisma";
-import {ProjectSchema} from "@/components/wrappers/dashboard/Projects/ProjectsForm/ProjectForm.schema";
+import {ProjectSchema} from "@/components/wrappers/dashboard/projects/ProjectsForm/ProjectForm.schema";
 import {z} from "zod";
 import {ServerActionResult} from "@/types/action-type";
 import {Projects} from "@prisma/client";
diff --git a/src/components/wrappers/dashboard/Settings/SettingsTabs/SettingsTabs.tsx b/src/components/wrappers/dashboard/settings/SettingsTabs/SettingsTabs.tsx
similarity index 91%
rename from src/components/wrappers/dashboard/Settings/SettingsTabs/SettingsTabs.tsx
rename to src/components/wrappers/dashboard/settings/SettingsTabs/SettingsTabs.tsx
index 35850429..fd91319a 100644
--- a/src/components/wrappers/dashboard/Settings/SettingsTabs/SettingsTabs.tsx
+++ b/src/components/wrappers/dashboard/settings/SettingsTabs/SettingsTabs.tsx
@@ -1,13 +1,13 @@
 "use client"
 
 import {Tabs, TabsContent, TabsList, TabsTrigger} from "@/components/ui/tabs";
-import {DataTableWithPagination} from "@/components/wrappers/table/data-table-with-pagination";
-import {usersColumns} from "@/components/wrappers/dashboard/Settings/SettingsUsersTab/columns-users";
+import {DataTableWithPagination} from "@/components/wrappers/common/table/data-table-with-pagination";
+import {usersColumns} from "@/components/wrappers/dashboard/settings/SettingsUsersTab/columns-users";
 import {User, Settings} from "@prisma/client";
 import {backupColumns} from "@/features/backup/columns";
 import {SettingsEmailTab} from "@/components/wrappers/dashboard/admin/AdminEmailTab/SettingsEmailTab";
 import {SettingsStorageTab} from "@/components/wrappers/dashboard/admin/AdminStorageTab/SettingsStorageTab";
-import {SettingsUsersTab} from "@/components/wrappers/dashboard/Settings/SettingsUsersTab/SettingsUsersTab";
+import {SettingsUsersTab} from "@/components/wrappers/dashboard/settings/SettingsUsersTab/SettingsUsersTab";
 
 
 export type SettingsTabsProps = {
diff --git a/src/components/wrappers/dashboard/Settings/SettingsUsersTab/SettingsUsersTab.tsx b/src/components/wrappers/dashboard/settings/SettingsUsersTab/SettingsUsersTab.tsx
similarity index 83%
rename from src/components/wrappers/dashboard/Settings/SettingsUsersTab/SettingsUsersTab.tsx
rename to src/components/wrappers/dashboard/settings/SettingsUsersTab/SettingsUsersTab.tsx
index 23f9db31..27b78d40 100644
--- a/src/components/wrappers/dashboard/Settings/SettingsUsersTab/SettingsUsersTab.tsx
+++ b/src/components/wrappers/dashboard/settings/SettingsUsersTab/SettingsUsersTab.tsx
@@ -1,6 +1,6 @@
 import {User} from "@prisma/client";
-import {DataTableWithPagination} from "@/components/wrappers/table/data-table-with-pagination";
-import {usersColumns} from "@/components/wrappers/dashboard/Settings/SettingsUsersTab/columns-users";
+import {DataTableWithPagination} from "@/components/wrappers/common/table/data-table-with-pagination";
+import {usersColumns} from "@/components/wrappers/dashboard/settings/SettingsUsersTab/columns-users";
 import {UsersDataTable} from "@/components/wrappers/dashboard/admin/admin-user-table";
 
 
diff --git a/src/components/wrappers/dashboard/Settings/SettingsUsersTab/columns-users.tsx b/src/components/wrappers/dashboard/settings/SettingsUsersTab/columns-users.tsx
similarity index 97%
rename from src/components/wrappers/dashboard/Settings/SettingsUsersTab/columns-users.tsx
rename to src/components/wrappers/dashboard/settings/SettingsUsersTab/columns-users.tsx
index cb10c80c..73ede393 100644
--- a/src/components/wrappers/dashboard/Settings/SettingsUsersTab/columns-users.tsx
+++ b/src/components/wrappers/dashboard/settings/SettingsUsersTab/columns-users.tsx
@@ -3,13 +3,13 @@
 import {ColumnDef} from "@tanstack/react-table"
 import {Badge} from "@/components/ui/badge";
 import {User} from "@prisma/client";
-import {updateUserAction} from "@/components/wrappers/dashboard/Profile/UserForm/user-form.action";
+import {updateUserAction} from "@/components/wrappers/dashboard/profile/UserForm/user-form.action";
 import {useMutation} from "@tanstack/react-query";
 import {toast} from "sonner";
 import {useRouter} from "next/navigation";
 import {useState} from "react";
 import {Trash2} from "lucide-react";
-import {deleteUserAction} from "@/components/wrappers/dashboard/Profile/ButtonDeleteAccount/delete-account.action";
+import {deleteUserAction} from "@/components/wrappers/dashboard/profile/ButtonDeleteAccount/delete-account.action";
 import {ButtonWithLoading} from "@/components/wrappers/common/button/ButtonWithLoading/ButtonWithLoading";
 
 export const usersColumns: ColumnDef<User>[] = [
diff --git a/src/components/wrappers/dashboard/Settings/SettingsUsersTab/settings-user-tab.action.ts b/src/components/wrappers/dashboard/settings/SettingsUsersTab/settings-user-tab.action.ts
similarity index 100%
rename from src/components/wrappers/dashboard/Settings/SettingsUsersTab/settings-user-tab.action.ts
rename to src/components/wrappers/dashboard/settings/SettingsUsersTab/settings-user-tab.action.ts
diff --git a/src/components/wrappers/Dashboard/SideBar/SideBarFooterCredit/SideBarFooterCredit.tsx b/src/components/wrappers/dashboard/sideBar/SideBarFooterCredit/SideBarFooterCredit.tsx
similarity index 100%
rename from src/components/wrappers/Dashboard/SideBar/SideBarFooterCredit/SideBarFooterCredit.tsx
rename to src/components/wrappers/dashboard/sideBar/SideBarFooterCredit/SideBarFooterCredit.tsx
diff --git a/src/components/wrappers/Dashboard/SideBar/SideBarLogo/SideBarLogo.tsx b/src/components/wrappers/dashboard/sideBar/SideBarLogo/SideBarLogo.tsx
similarity index 100%
rename from src/components/wrappers/Dashboard/SideBar/SideBarLogo/SideBarLogo.tsx
rename to src/components/wrappers/dashboard/sideBar/SideBarLogo/SideBarLogo.tsx
diff --git a/src/components/wrappers/dashboard/SideBar/SideBarMenu/SideBarMenu.tsx b/src/components/wrappers/dashboard/sideBar/SideBarMenu/SideBarMenu.tsx
similarity index 100%
rename from src/components/wrappers/dashboard/SideBar/SideBarMenu/SideBarMenu.tsx
rename to src/components/wrappers/dashboard/sideBar/SideBarMenu/SideBarMenu.tsx
diff --git a/src/components/wrappers/dashboard/SideBar/app-sidebar.tsx b/src/components/wrappers/dashboard/sideBar/app-sidebar.tsx
similarity index 86%
rename from src/components/wrappers/dashboard/SideBar/app-sidebar.tsx
rename to src/components/wrappers/dashboard/sideBar/app-sidebar.tsx
index 4fff3975..c5d5b069 100644
--- a/src/components/wrappers/dashboard/SideBar/app-sidebar.tsx
+++ b/src/components/wrappers/dashboard/sideBar/app-sidebar.tsx
@@ -6,13 +6,13 @@ import {
     SidebarMenu,
     SidebarMenuItem,
 } from "@/components/ui/sidebar"
-import {LoggedInButton} from "@/components/wrappers/dashboard/LoggedInButton/LoggedInButton";
-import {SidebarMenuCustom} from "@/components/wrappers/dashboard/SideBar/SideBarMenu/SideBarMenu";
-import {OrganizationCombobox} from "@/components/wrappers/dashboard/Organization/organization-combobox";
+import {SidebarMenuCustom} from "@/components/wrappers/dashboard/sideBar/SideBarMenu/SideBarMenu";
+import {OrganizationCombobox} from "@/components/wrappers/dashboard/organization/organization-combobox";
 import {prisma} from "@/prisma";
 import {requiredCurrentUser} from "@/auth/current-user";
-import {SideBarLogo} from "@/components/wrappers/Dashboard/SideBar/SideBarLogo/SideBarLogo";
-import {SideBarFooterCredit} from "@/components/wrappers/Dashboard/SideBar/SideBarFooterCredit/SideBarFooterCredit";
+import {SideBarLogo} from "@/components/wrappers/dashboard/sideBar/SideBarLogo/SideBarLogo";
+import {SideBarFooterCredit} from "@/components/wrappers/dashboard/sideBar/SideBarFooterCredit/SideBarFooterCredit";
+import {LoggedInButton} from "@/components/wrappers/dashboard/loggedInButton/LoggedInButton";
 
 export async function AppSidebar() {
 
diff --git a/src/features/backup/columns.tsx b/src/features/backup/columns.tsx
index 4729e361..25d57516 100644
--- a/src/features/backup/columns.tsx
+++ b/src/features/backup/columns.tsx
@@ -1,7 +1,7 @@
 "use client"
 
 import {ColumnDef} from "@tanstack/react-table"
-import {StatusBadge} from "@/components/wrappers/status-badge";
+import {StatusBadge} from "@/components/wrappers/common/status-badge";
 import {
     DropdownMenu,
     DropdownMenuContent,
@@ -18,7 +18,7 @@ import {useMutation} from "@tanstack/react-query";
 import {createRestorationAction} from "@/features/restore/restore.action";
 import {toast} from "sonner";
 import {useRouter} from "next/navigation";
-import {TooltipCustom} from "@/components/wrappers/TooltipCustom/TooltipCustom";
+import {TooltipCustom} from "@/components/wrappers/common/tooltipCustom/TooltipCustom";
 
 
 export const backupColumns: ColumnDef<Backup>[] = [
diff --git a/src/features/layout/Header.tsx b/src/features/layout/Header.tsx
index 58fa3447..edaecbe0 100644
--- a/src/features/layout/Header.tsx
+++ b/src/features/layout/Header.tsx
@@ -1,9 +1,9 @@
 import {notFound} from "next/navigation";
 
 import {currentUser} from "@/auth/current-user";
-import {LoggedInButton} from "@/components/wrappers/dashboard/LoggedInButton/LoggedInButton";
 import {SidebarTrigger} from "@/components/ui/sidebar";
 import {ModeToggle} from "@/features/theme/ModeToggle";
+import {LoggedInButton} from "@/components/wrappers/dashboard/loggedInButton/LoggedInButton";
 
 export const Header = async () => {
     const user = await currentUser()
diff --git a/src/features/restore/columns.tsx b/src/features/restore/columns.tsx
index f8175aee..33ced66a 100644
--- a/src/features/restore/columns.tsx
+++ b/src/features/restore/columns.tsx
@@ -1,7 +1,7 @@
 "use client"
 
 import {ColumnDef} from "@tanstack/react-table"
-import {StatusBadge} from "@/components/wrappers/status-badge";
+import {StatusBadge} from "@/components/wrappers/common/status-badge";
 import {
     DropdownMenu,
     DropdownMenuContent,