diff --git a/src/pages/ManageValidator/LeftManage/LeftManage.tsx b/src/pages/ManageValidator/LeftManage/LeftManage.tsx
index b19df375..26ab2579 100644
--- a/src/pages/ManageValidator/LeftManage/LeftManage.tsx
+++ b/src/pages/ManageValidator/LeftManage/LeftManage.tsx
@@ -4,8 +4,8 @@ import { InformationBox } from '@status-im/components'
 import { CloseCircleIcon } from '@status-im/icons'
 
 import Header from './Header'
-import ValidatorDataCards from './ValidatorDataCards'
-import ValidatorSettingsCards from './ValidatorSettingsCards'
+import ValidatorDataCards from './ValidatorDataCards/ValidatorDataCards'
+import ValidatorSettingsCards from './ValidatorSettingsCards/ValidatorSettingsCards'
 import ValidatorGraffiti from './ValidatorGraffiti'
 import ValidatorDataTabs from './ManageValidatorTable/ValidatorDataTabs'
 import Footer from './Footer'
diff --git a/src/pages/ManageValidator/LeftManage/ValidatorDataCard.tsx b/src/pages/ManageValidator/LeftManage/ValidatorDataCards/ValidatorDataCard.tsx
similarity index 95%
rename from src/pages/ManageValidator/LeftManage/ValidatorDataCard.tsx
rename to src/pages/ManageValidator/LeftManage/ValidatorDataCards/ValidatorDataCard.tsx
index 5e714a87..5a56be7b 100644
--- a/src/pages/ManageValidator/LeftManage/ValidatorDataCard.tsx
+++ b/src/pages/ManageValidator/LeftManage/ValidatorDataCards/ValidatorDataCard.tsx
@@ -1,6 +1,7 @@
 import { Text } from '@status-im/components'
 import { XStack, YStack } from 'tamagui'
-import Icon from '../../../components/General/Icon'
+
+import Icon from '../../../../components/General/Icon'
 
 type ValidatorDataCardProps = {
   title: string
diff --git a/src/pages/ManageValidator/LeftManage/ValidatorDataCards.tsx b/src/pages/ManageValidator/LeftManage/ValidatorDataCards/ValidatorDataCards.tsx
similarity index 92%
rename from src/pages/ManageValidator/LeftManage/ValidatorDataCards.tsx
rename to src/pages/ManageValidator/LeftManage/ValidatorDataCards/ValidatorDataCards.tsx
index 5c99a313..53fd17d5 100644
--- a/src/pages/ManageValidator/LeftManage/ValidatorDataCards.tsx
+++ b/src/pages/ManageValidator/LeftManage/ValidatorDataCards/ValidatorDataCards.tsx
@@ -1,4 +1,5 @@
 import { Stack } from 'tamagui'
+
 import ValidatorDataCard from './ValidatorDataCard'
 import ValidatorPeersCard from './ValidatorPeersCard'
 
@@ -14,7 +15,7 @@ const ValidatorDataCards = () => {
         padding: '0 30px',
       }}
     >
-      <ValidatorPeersCard title="Peers" value="67"></ValidatorPeersCard>
+      <ValidatorPeersCard title="Peers" value="67" />
       <ValidatorDataCard title="Slots Behind" value={19} iconPath="ghost.png" />
       <ValidatorDataCard
         title="Blocks"
diff --git a/src/pages/ManageValidator/LeftManage/ValidatorPeersCard.tsx b/src/pages/ManageValidator/LeftManage/ValidatorDataCards/ValidatorPeersCard.tsx
similarity index 100%
rename from src/pages/ManageValidator/LeftManage/ValidatorPeersCard.tsx
rename to src/pages/ManageValidator/LeftManage/ValidatorDataCards/ValidatorPeersCard.tsx
diff --git a/src/pages/ManageValidator/LeftManage/ValidatorSettingCard.tsx b/src/pages/ManageValidator/LeftManage/ValidatorSettingsCards/ValidatorSettingCard.tsx
similarity index 95%
rename from src/pages/ManageValidator/LeftManage/ValidatorSettingCard.tsx
rename to src/pages/ManageValidator/LeftManage/ValidatorSettingsCards/ValidatorSettingCard.tsx
index 4f95eb3b..da5aa55c 100644
--- a/src/pages/ManageValidator/LeftManage/ValidatorSettingCard.tsx
+++ b/src/pages/ManageValidator/LeftManage/ValidatorSettingsCards/ValidatorSettingCard.tsx
@@ -3,7 +3,7 @@ import { DisconnectIcon, AdvancedIcon, ExternalIcon } from '@status-im/icons'
 import { useNavigate } from 'react-router-dom'
 import { Stack, YStack } from 'tamagui'
 
-import { CARD_TITLES } from '../../../constants'
+import { CARD_TITLES } from '../../../../constants'
 
 type CardTitle = (typeof CARD_TITLES)[number]
 
diff --git a/src/pages/ManageValidator/LeftManage/ValidatorSettingsCards.tsx b/src/pages/ManageValidator/LeftManage/ValidatorSettingsCards/ValidatorSettingsCards.tsx
similarity index 91%
rename from src/pages/ManageValidator/LeftManage/ValidatorSettingsCards.tsx
rename to src/pages/ManageValidator/LeftManage/ValidatorSettingsCards/ValidatorSettingsCards.tsx
index acd2fdc1..0fc12da6 100644
--- a/src/pages/ManageValidator/LeftManage/ValidatorSettingsCards.tsx
+++ b/src/pages/ManageValidator/LeftManage/ValidatorSettingsCards/ValidatorSettingsCards.tsx
@@ -1,7 +1,7 @@
 import { Stack } from 'tamagui'
 
 import ValidatorSettingCard from './ValidatorSettingCard'
-import { CARD_TITLES } from '../../../constants'
+import { CARD_TITLES } from '../../../../constants'
 
 const ValidatorSettingsCards = () => {
   return (