diff --git a/src/components/organisms/Recordings.tsx b/src/components/robot/Recordings.tsx
similarity index 96%
rename from src/components/organisms/Recordings.tsx
rename to src/components/robot/Recordings.tsx
index 13b2d025..a58ab109 100644
--- a/src/components/organisms/Recordings.tsx
+++ b/src/components/robot/Recordings.tsx
@@ -1,12 +1,12 @@
 import React, { useState } from 'react';
-import { RecordingsTable } from "../molecules/RecordingsTable";
+import { RecordingsTable } from "./RecordingsTable";
 import { Grid } from "@mui/material";
 import { RunSettings, RunSettingsModal } from "../molecules/RunSettings";
 import { ScheduleSettings, ScheduleSettingsModal } from "../molecules/ScheduleSettings";
 import { IntegrationSettings, IntegrationSettingsModal } from "../integration/IntegrationSettings";
-import { RobotSettings, RobotSettingsModal } from "../molecules/RobotSettings";
-import { RobotEditModal } from '../molecules/RobotEdit';
-import { RobotDuplicationModal } from '../molecules/RobotDuplicate';
+import { RobotSettings, RobotSettingsModal } from "./RobotSettings";
+import { RobotEditModal } from './RobotEdit';
+import { RobotDuplicationModal } from './RobotDuplicate';
 
 interface RecordingsProps {
   handleEditRecording: (id: string, fileName: string) => void;
diff --git a/src/components/molecules/RecordingsTable.tsx b/src/components/robot/RecordingsTable.tsx
similarity index 100%
rename from src/components/molecules/RecordingsTable.tsx
rename to src/components/robot/RecordingsTable.tsx
diff --git a/src/components/molecules/RobotDuplicate.tsx b/src/components/robot/RobotDuplicate.tsx
similarity index 99%
rename from src/components/molecules/RobotDuplicate.tsx
rename to src/components/robot/RobotDuplicate.tsx
index 370e23d3..6dea99e1 100644
--- a/src/components/molecules/RobotDuplicate.tsx
+++ b/src/components/robot/RobotDuplicate.tsx
@@ -1,7 +1,7 @@
 import React, { useState, useEffect } from 'react';
 import { GenericModal } from "../ui/GenericModal";
 import { TextField, Typography, Box, Button } from "@mui/material";
-import { modalStyle } from "./AddWhereCondModal";
+import { modalStyle } from "../molecules/AddWhereCondModal";
 import { useGlobalInfoStore } from '../../context/globalInfo';
 import { duplicateRecording, getStoredRecording } from '../../api/storage';
 import { WhereWhatPair } from 'maxun-core';
diff --git a/src/components/molecules/RobotEdit.tsx b/src/components/robot/RobotEdit.tsx
similarity index 99%
rename from src/components/molecules/RobotEdit.tsx
rename to src/components/robot/RobotEdit.tsx
index 172d5c84..c0baaa85 100644
--- a/src/components/molecules/RobotEdit.tsx
+++ b/src/components/robot/RobotEdit.tsx
@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import { GenericModal } from "../ui/GenericModal";
 import { TextField, Typography, Box, Button } from "@mui/material";
-import { modalStyle } from "./AddWhereCondModal";
+import { modalStyle } from "../molecules/AddWhereCondModal";
 import { useGlobalInfoStore } from '../../context/globalInfo';
 import { getStoredRecording, updateRecording } from '../../api/storage';
 import { WhereWhatPair } from 'maxun-core';
diff --git a/src/components/molecules/RobotSettings.tsx b/src/components/robot/RobotSettings.tsx
similarity index 99%
rename from src/components/molecules/RobotSettings.tsx
rename to src/components/robot/RobotSettings.tsx
index 984e63c8..57af9ca2 100644
--- a/src/components/molecules/RobotSettings.tsx
+++ b/src/components/robot/RobotSettings.tsx
@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import { GenericModal } from "../ui/GenericModal";
 import { TextField, Typography, Box } from "@mui/material";
-import { modalStyle } from "./AddWhereCondModal";
+import { modalStyle } from "../molecules/AddWhereCondModal";
 import { useGlobalInfoStore } from '../../context/globalInfo';
 import { getStoredRecording } from '../../api/storage';
 import { WhereWhatPair } from 'maxun-core';
diff --git a/src/pages/MainPage.tsx b/src/pages/MainPage.tsx
index df46b1ad..3bc23d6e 100644
--- a/src/pages/MainPage.tsx
+++ b/src/pages/MainPage.tsx
@@ -2,7 +2,7 @@ import React, { useCallback, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import { MainMenu } from "../components/organisms/MainMenu";
 import { Stack } from "@mui/material";
-import { Recordings } from "../components/organisms/Recordings";
+import { Recordings } from "../components/robot/Recordings";
 import { Runs } from "../components/organisms/Runs";
 import ProxyForm from '../components/proxy/ProxyForm';
 import ApiKey from '../components/api/ApiKey';
@@ -13,7 +13,7 @@ import { stopRecording } from "../api/recording";
 import { RunSettings } from "../components/molecules/RunSettings";
 import { ScheduleSettings } from "../components/molecules/ScheduleSettings";
 import { IntegrationSettings } from "../components/integration/IntegrationSettings";
-import { RobotSettings } from "../components/molecules/RobotSettings";
+import { RobotSettings } from "../components/robot/RobotSettings";
 import { apiUrl } from "../apiConfig";
 
 interface MainPageProps {