diff --git a/src/components/molecules/AddWhatCondModal.tsx b/src/components/molecules/AddWhatCondModal.tsx
index ac49aa02..6617cbd3 100644
--- a/src/components/molecules/AddWhatCondModal.tsx
+++ b/src/components/molecules/AddWhatCondModal.tsx
@@ -5,7 +5,7 @@ import { Button, MenuItem, TextField, Typography } from "@mui/material";
 import React, { useRef } from "react";
 import { Dropdown as MuiDropdown } from "../atoms/DropdownMui";
 import { KeyValueForm } from "./KeyValueForm";
-import { ClearButton } from "../atoms/buttons/ClearButton";
+import { ClearButton } from "../ui/buttons/ClearButton";
 import { useSocketStore } from "../../context/socket";
 
 interface AddWhatCondModalProps {
diff --git a/src/components/molecules/BrowserNavBar.tsx b/src/components/molecules/BrowserNavBar.tsx
index ce6218e0..9c981bdb 100644
--- a/src/components/molecules/BrowserNavBar.tsx
+++ b/src/components/molecules/BrowserNavBar.tsx
@@ -5,7 +5,7 @@ import ReplayIcon from '@mui/icons-material/Replay';
 import ArrowBackIcon from '@mui/icons-material/ArrowBack';
 import ArrowForwardIcon from '@mui/icons-material/ArrowForward';
 
-import { NavBarButton } from '../atoms/buttons/buttons';
+import { NavBarButton } from '../ui/buttons/buttons';
 import { UrlForm } from './UrlForm';
 import { useCallback, useEffect, useState } from "react";
 import { useSocketStore } from "../../context/socket";
diff --git a/src/components/molecules/DisplayWhereConditionSettings.tsx b/src/components/molecules/DisplayWhereConditionSettings.tsx
index 6068e124..bcd2b18b 100644
--- a/src/components/molecules/DisplayWhereConditionSettings.tsx
+++ b/src/components/molecules/DisplayWhereConditionSettings.tsx
@@ -1,8 +1,8 @@
 import React from "react";
 import { Dropdown as MuiDropdown } from "../atoms/DropdownMui";
 import { Checkbox, FormControlLabel, FormGroup, MenuItem, Stack, TextField } from "@mui/material";
-import { AddButton } from "../atoms/buttons/AddButton";
-import { RemoveButton } from "../atoms/buttons/RemoveButton";
+import { AddButton } from "../ui/buttons/AddButton";
+import { RemoveButton } from "../ui/buttons/RemoveButton";
 import { KeyValueForm } from "./KeyValueForm";
 import { WarningText } from "../atoms/texts";
 
diff --git a/src/components/molecules/KeyValueForm.tsx b/src/components/molecules/KeyValueForm.tsx
index 9e55c5f7..02d22d6a 100644
--- a/src/components/molecules/KeyValueForm.tsx
+++ b/src/components/molecules/KeyValueForm.tsx
@@ -1,7 +1,7 @@
 import React, { forwardRef, useImperativeHandle, useRef } from 'react';
 import { KeyValuePair } from "../atoms/KeyValuePair";
-import { AddButton } from "../atoms/buttons/AddButton";
-import { RemoveButton } from "../atoms/buttons/RemoveButton";
+import { AddButton } from "../ui/buttons/AddButton";
+import { RemoveButton } from "../ui/buttons/RemoveButton";
 
 export const KeyValueForm = forwardRef((props, ref) => {
   const [numberOfPairs, setNumberOfPairs] = React.useState<number>(1);
diff --git a/src/components/molecules/LeftSidePanelContent.tsx b/src/components/molecules/LeftSidePanelContent.tsx
index eb5d7b12..c524f466 100644
--- a/src/components/molecules/LeftSidePanelContent.tsx
+++ b/src/components/molecules/LeftSidePanelContent.tsx
@@ -5,7 +5,7 @@ import { WhereWhatPair, WorkflowFile } from "maxun-core";
 import { useSocketStore } from "../../context/socket";
 import { Add } from "@mui/icons-material";
 import { Socket } from "socket.io-client";
-import { AddButton } from "../atoms/buttons/AddButton";
+import { AddButton } from "../ui/buttons/AddButton";
 import { AddPair } from "../../api/workflow";
 import { GenericModal } from "../atoms/GenericModal";
 import { PairEditForm } from "./PairEditForm";
diff --git a/src/components/molecules/Pair.tsx b/src/components/molecules/Pair.tsx
index 23e1cc7d..91e3ce93 100644
--- a/src/components/molecules/Pair.tsx
+++ b/src/components/molecules/Pair.tsx
@@ -2,12 +2,12 @@ import React, { FC, useState } from 'react';
 import { Stack, Button, IconButton, Tooltip, Badge } from "@mui/material";
 import { AddPair, deletePair, UpdatePair } from "../../api/workflow";
 import { WorkflowFile } from "maxun-core";
-import { ClearButton } from "../atoms/buttons/ClearButton";
+import { ClearButton } from "../ui/buttons/ClearButton";
 import { GenericModal } from "../atoms/GenericModal";
 import { PairEditForm } from "./PairEditForm";
 import { PairDisplayDiv } from "../atoms/PairDisplayDiv";
-import { EditButton } from "../atoms/buttons/EditButton";
-import { BreakpointButton } from "../atoms/buttons/BreakpointButton";
+import { EditButton } from "../ui/buttons/EditButton";
+import { BreakpointButton } from "../ui/buttons/BreakpointButton";
 import VisibilityIcon from '@mui/icons-material/Visibility';
 import styled from "styled-components";
 import { LoadingButton } from "@mui/lab";
diff --git a/src/components/molecules/PairDetail.tsx b/src/components/molecules/PairDetail.tsx
index 7b5dca02..41f56bae 100644
--- a/src/components/molecules/PairDetail.tsx
+++ b/src/components/molecules/PairDetail.tsx
@@ -6,10 +6,10 @@ import TreeView from '@mui/lab/TreeView';
 import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
 import ChevronRightIcon from '@mui/icons-material/ChevronRight';
 import TreeItem from '@mui/lab/TreeItem';
-import { AddButton } from "../atoms/buttons/AddButton";
+import { AddButton } from "../ui/buttons/AddButton";
 import { WarningText } from "../atoms/texts";
 import NotificationImportantIcon from '@mui/icons-material/NotificationImportant';
-import { RemoveButton } from "../atoms/buttons/RemoveButton";
+import { RemoveButton } from "../ui/buttons/RemoveButton";
 import { AddWhereCondModal } from "./AddWhereCondModal";
 import { UpdatePair } from "../../api/workflow";
 import { useSocketStore } from "../../context/socket";
diff --git a/src/components/molecules/UrlForm.tsx b/src/components/molecules/UrlForm.tsx
index 8426f333..81ba523f 100644
--- a/src/components/molecules/UrlForm.tsx
+++ b/src/components/molecules/UrlForm.tsx
@@ -2,7 +2,7 @@ import React, { useState, useEffect, useCallback, useRef } from 'react';
 import type { SyntheticEvent } from 'react';
 import KeyboardArrowRightIcon from '@mui/icons-material/KeyboardArrowRight';
 import { NavBarForm, NavBarInput } from "../atoms/form";
-import { UrlFormButton } from "../atoms/buttons/buttons";
+import { UrlFormButton } from "../ui/buttons/buttons";
 import { useSocketStore } from '../../context/socket';
 import { Socket } from "socket.io-client";
 
diff --git a/src/components/atoms/buttons/AddButton.tsx b/src/components/ui/buttons/AddButton.tsx
similarity index 100%
rename from src/components/atoms/buttons/AddButton.tsx
rename to src/components/ui/buttons/AddButton.tsx
diff --git a/src/components/atoms/buttons/BreakpointButton.tsx b/src/components/ui/buttons/BreakpointButton.tsx
similarity index 100%
rename from src/components/atoms/buttons/BreakpointButton.tsx
rename to src/components/ui/buttons/BreakpointButton.tsx
diff --git a/src/components/atoms/buttons/ClearButton.tsx b/src/components/ui/buttons/ClearButton.tsx
similarity index 100%
rename from src/components/atoms/buttons/ClearButton.tsx
rename to src/components/ui/buttons/ClearButton.tsx
diff --git a/src/components/atoms/buttons/EditButton.tsx b/src/components/ui/buttons/EditButton.tsx
similarity index 100%
rename from src/components/atoms/buttons/EditButton.tsx
rename to src/components/ui/buttons/EditButton.tsx
diff --git a/src/components/atoms/buttons/RemoveButton.tsx b/src/components/ui/buttons/RemoveButton.tsx
similarity index 100%
rename from src/components/atoms/buttons/RemoveButton.tsx
rename to src/components/ui/buttons/RemoveButton.tsx
diff --git a/src/components/atoms/buttons/buttons.tsx b/src/components/ui/buttons/buttons.tsx
similarity index 100%
rename from src/components/atoms/buttons/buttons.tsx
rename to src/components/ui/buttons/buttons.tsx