diff --git a/src/app/deals/components/Boards/Boards.tsx b/src/app/deals/components/Boards/Boards.tsx
index ae21d97..b2c4bb8 100644
--- a/src/app/deals/components/Boards/Boards.tsx
+++ b/src/app/deals/components/Boards/Boards.tsx
@@ -7,7 +7,7 @@ import Board from "@/app/deals/components/Board/Board";
 import { useBoardsContext } from "@/app/deals/contexts/BoardsContext";
 import { BoardSchema } from "@/lib/client";
 import { updateBoardMutation } from "@/lib/client/@tanstack/react-query.gen";
-import SortableDnd from "@/components/SortableDnd";
+import SortableDnd from "@/components/dnd/SortableDnd";
 import { notifications } from "@/lib/notifications";
 
 const Boards = () => {
diff --git a/src/app/deals/components/DealContainer/DealContainer.tsx b/src/app/deals/components/DealContainer/DealContainer.tsx
index b3fa9a6..9798aeb 100644
--- a/src/app/deals/components/DealContainer/DealContainer.tsx
+++ b/src/app/deals/components/DealContainer/DealContainer.tsx
@@ -2,7 +2,7 @@ import React, { FC, useMemo } from "react";
 import { Box } from "@mantine/core";
 import DealCard from "@/app/deals/components/DealCard/DealCard";
 import { DealSchema } from "@/lib/client";
-import { SortableItem } from "@/components/SortableDnd/SortableItem";
+import { SortableItem } from "@/components/dnd/SortableDnd/SortableItem";
 
 type Props = {
     deal: DealSchema;
diff --git a/src/app/deals/components/StatusColumnsDnd/StatusColumnsDnd.tsx b/src/app/deals/components/StatusColumnsDnd/StatusColumnsDnd.tsx
index f95e21e..1d3c080 100644
--- a/src/app/deals/components/StatusColumnsDnd/StatusColumnsDnd.tsx
+++ b/src/app/deals/components/StatusColumnsDnd/StatusColumnsDnd.tsx
@@ -11,7 +11,7 @@ import DndOverlay from "@/app/deals/components/DndOverlay/DndOverlay";
 import StatusColumn from "@/app/deals/components/StatusColumn/StatusColumn";
 import { useStatusesContext } from "@/app/deals/contexts/StatusesContext";
 import useDealsAndStatusesDnd from "@/app/deals/hooks/useDealsAndStatusesDnd";
-import { SortableItem } from "@/components/SortableDnd/SortableItem";
+import { SortableItem } from "@/components/dnd/SortableDnd/SortableItem";
 import useDndSensors from "../../hooks/useSensors";
 
 type Props = {
diff --git a/src/app/deals/page.tsx b/src/app/deals/page.tsx
index 7fcc6be..a6f4a3b 100644
--- a/src/app/deals/page.tsx
+++ b/src/app/deals/page.tsx
@@ -5,8 +5,8 @@ import StatusColumns from "@/app/deals/components/StatusColumns/StatusColumns";
 import { BoardsContextProvider } from "@/app/deals/contexts/BoardsContext";
 import { ProjectsContextProvider } from "@/app/deals/contexts/ProjectsContext";
 import { StatusesContextProvider } from "@/app/deals/contexts/StatusesContext";
-import PageBlock from "@/components/PageBlock/PageBlock";
-import PageContainer from "@/components/PageContainer/PageContainer";
+import PageBlock from "@/components/layout/PageBlock/PageBlock";
+import PageContainer from "@/components/layout/PageContainer/PageContainer";
 
 export default function DealsPage() {
     return (
diff --git a/src/components/SortableDnd/index.ts b/src/components/SortableDnd/index.ts
deleted file mode 100644
index 262151e..0000000
--- a/src/components/SortableDnd/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import SortableDnd from "@/components/SortableDnd/SortableDnd";
-
-export default SortableDnd;
diff --git a/src/components/Draggable/Draggable.tsx b/src/components/dnd/Draggable/Draggable.tsx
similarity index 100%
rename from src/components/Draggable/Draggable.tsx
rename to src/components/dnd/Draggable/Draggable.tsx
diff --git a/src/components/Droppable/Droppable.tsx b/src/components/dnd/Droppable/Droppable.tsx
similarity index 100%
rename from src/components/Droppable/Droppable.tsx
rename to src/components/dnd/Droppable/Droppable.tsx
diff --git a/src/components/SortableDnd/DragHandle.tsx b/src/components/dnd/SortableDnd/DragHandle.tsx
similarity index 87%
rename from src/components/SortableDnd/DragHandle.tsx
rename to src/components/dnd/SortableDnd/DragHandle.tsx
index 886b037..6d2c0d7 100644
--- a/src/components/SortableDnd/DragHandle.tsx
+++ b/src/components/dnd/SortableDnd/DragHandle.tsx
@@ -1,5 +1,5 @@
 import React, { CSSProperties, ReactNode, useContext } from "react";
-import SortableItemContext from "@/components/SortableDnd/SortableItemContext";
+import SortableItemContext from "@/components/dnd/SortableDnd/SortableItemContext";
 
 type Props = {
     children: ReactNode;
diff --git a/src/components/SortableDnd/SortableDnd.tsx b/src/components/dnd/SortableDnd/SortableDnd.tsx
similarity index 96%
rename from src/components/SortableDnd/SortableDnd.tsx
rename to src/components/dnd/SortableDnd/SortableDnd.tsx
index 50bd4e1..56b73af 100644
--- a/src/components/SortableDnd/SortableDnd.tsx
+++ b/src/components/dnd/SortableDnd/SortableDnd.tsx
@@ -12,8 +12,8 @@ import { SortableContext } from "@dnd-kit/sortable";
 import { LexoRank } from "lexorank";
 import { Box, Group } from "@mantine/core";
 import useDndSensors from "@/app/deals/hooks/useSensors";
-import { SortableItem } from "@/components/SortableDnd/SortableItem";
-import { SortableOverlay } from "@/components/SortableDnd/SortableOverlay";
+import { SortableItem } from "@/components/dnd/SortableDnd/SortableItem";
+import { SortableOverlay } from "@/components/dnd/SortableDnd/SortableOverlay";
 import { getNewLexorank, sortByLexorank } from "@/utils/lexorank";
 
 type BaseItem = {
diff --git a/src/components/SortableDnd/SortableItem.tsx b/src/components/dnd/SortableDnd/SortableItem.tsx
similarity index 95%
rename from src/components/SortableDnd/SortableItem.tsx
rename to src/components/dnd/SortableDnd/SortableItem.tsx
index 59291f4..11dc0e5 100644
--- a/src/components/SortableDnd/SortableItem.tsx
+++ b/src/components/dnd/SortableDnd/SortableItem.tsx
@@ -1,7 +1,7 @@
 import React, { CSSProperties, PropsWithChildren, useMemo } from "react";
 import { useSortable } from "@dnd-kit/sortable";
 import { CSS } from "@dnd-kit/utilities";
-import DragHandle from "@/components/SortableDnd/DragHandle";
+import DragHandle from "@/components/dnd/SortableDnd/DragHandle";
 import SortableItemContext from "./SortableItemContext";
 
 type Props = {
diff --git a/src/components/SortableDnd/SortableItemContext.tsx b/src/components/dnd/SortableDnd/SortableItemContext.tsx
similarity index 100%
rename from src/components/SortableDnd/SortableItemContext.tsx
rename to src/components/dnd/SortableDnd/SortableItemContext.tsx
diff --git a/src/components/SortableDnd/SortableOverlay.tsx b/src/components/dnd/SortableDnd/SortableOverlay.tsx
similarity index 100%
rename from src/components/SortableDnd/SortableOverlay.tsx
rename to src/components/dnd/SortableDnd/SortableOverlay.tsx
diff --git a/src/components/dnd/SortableDnd/index.ts b/src/components/dnd/SortableDnd/index.ts
new file mode 100644
index 0000000..3731bc0
--- /dev/null
+++ b/src/components/dnd/SortableDnd/index.ts
@@ -0,0 +1,3 @@
+import SortableDnd from "@/components/dnd/SortableDnd/SortableDnd";
+
+export default SortableDnd;
diff --git a/src/components/PageBlock/PageBlock.module.css b/src/components/layout/PageBlock/PageBlock.module.css
similarity index 100%
rename from src/components/PageBlock/PageBlock.module.css
rename to src/components/layout/PageBlock/PageBlock.module.css
diff --git a/src/components/PageBlock/PageBlock.tsx b/src/components/layout/PageBlock/PageBlock.tsx
similarity index 100%
rename from src/components/PageBlock/PageBlock.tsx
rename to src/components/layout/PageBlock/PageBlock.tsx
diff --git a/src/components/PageContainer/PageContainer.module.css b/src/components/layout/PageContainer/PageContainer.module.css
similarity index 100%
rename from src/components/PageContainer/PageContainer.module.css
rename to src/components/layout/PageContainer/PageContainer.module.css
diff --git a/src/components/PageContainer/PageContainer.tsx b/src/components/layout/PageContainer/PageContainer.tsx
similarity index 100%
rename from src/components/PageContainer/PageContainer.tsx
rename to src/components/layout/PageContainer/PageContainer.tsx
diff --git a/src/components/ColorSchemeToggle/ColorSchemeToggle.tsx b/src/components/ui/ColorSchemeToggle/ColorSchemeToggle.tsx
similarity index 100%
rename from src/components/ColorSchemeToggle/ColorSchemeToggle.tsx
rename to src/components/ui/ColorSchemeToggle/ColorSchemeToggle.tsx