diff --git a/src/App.tsx b/src/App.tsx
index ce3c82fa..714cd839 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -35,9 +35,10 @@ import Activation from './pages/ValidatorOnboarding/Activation/Activation'
 import ConfirmRecoveryPhrase from './pages/ValidatorOnboarding/KeyGeneration/ConfirmRecoveryPhrase/ConfirmRecoveryPhrase'
 import Deposit from './pages/ValidatorOnboarding/Deposit/Deposit'
 import DeviceHealthCheck from './pages/DeviceHealthCheck/DeviceHealthCheck'
-import ExitPanel from './pages/ManageValidator/RightManage/Panels/ExitPanel'
-import MigratePanel from './pages/ManageValidator/RightManage/Panels/MigratePanel'
-import DepositPanel from './pages/ManageValidator/RightManage/Panels/DepositPanel'
+import ExitPanel from './pages/ManageValidator/RightManagePanels/ExitPanel'
+import MigratePanel from './pages/ManageValidator/RightManagePanels/MigratePanel'
+import DepositPanel from './pages/ManageValidator/RightManagePanels/DepositPanel'
+import DefaultPanel from './pages/ManageValidator/RightManagePanels/DefaultPanel'
 
 const injected = injectedModule()
 const walletConnect = walletConnectModule(wcV2InitOptions)
diff --git a/src/pages/ManageValidator/RightManage/RightManage.tsx b/src/pages/ManageValidator/RightManage/RightManage.tsx
deleted file mode 100644
index 07aa4006..00000000
--- a/src/pages/ManageValidator/RightManage/RightManage.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import DefaultPanel from './Panels/DefaultPanel'
-import DepositPanel from './Panels/DepositPanel'
-import ExitPanel from './Panels/ExitPanel'
-import MigratePanel from './Panels/MigratePanel'
-
-const RightManage = () => {
-  const lastUrlSegment = window.location.pathname.split('/').pop()
-
-  const getPanel = () => {
-    switch (lastUrlSegment) {
-      case 'migrate':
-        return <MigratePanel />
-      case 'deposit':
-        return <DepositPanel />
-      case 'exit':
-        return <ExitPanel />
-      default:
-        return <DefaultPanel />
-    }
-  }
-
-  return <div style={{ flexGrow: 1 }}>{getPanel()}</div>
-}
-
-export default RightManage
diff --git a/src/pages/ManageValidator/RightManage/Panels/DefaultPanel.stories.tsx b/src/pages/ManageValidator/RightManagePanels/DefaultPanel.stories.tsx
similarity index 100%
rename from src/pages/ManageValidator/RightManage/Panels/DefaultPanel.stories.tsx
rename to src/pages/ManageValidator/RightManagePanels/DefaultPanel.stories.tsx
diff --git a/src/pages/ManageValidator/RightManage/Panels/DefaultPanel.tsx b/src/pages/ManageValidator/RightManagePanels/DefaultPanel.tsx
similarity index 90%
rename from src/pages/ManageValidator/RightManage/Panels/DefaultPanel.tsx
rename to src/pages/ManageValidator/RightManagePanels/DefaultPanel.tsx
index fa9f2fc9..b2b77422 100644
--- a/src/pages/ManageValidator/RightManage/Panels/DefaultPanel.tsx
+++ b/src/pages/ManageValidator/RightManagePanels/DefaultPanel.tsx
@@ -1,7 +1,7 @@
 import { Text } from '@status-im/components'
 import { YStack } from 'tamagui'
 
-import Icon from '../../../../components/General/Icon'
+import Icon from '../../../components/General/Icon'
 
 const DefaultPanel = () => {
   return (
diff --git a/src/pages/ManageValidator/RightManage/Panels/DepositPanel.tsx b/src/pages/ManageValidator/RightManagePanels/DepositPanel.tsx
similarity index 73%
rename from src/pages/ManageValidator/RightManage/Panels/DepositPanel.tsx
rename to src/pages/ManageValidator/RightManagePanels/DepositPanel.tsx
index dc3ea021..81c2f109 100644
--- a/src/pages/ManageValidator/RightManage/Panels/DepositPanel.tsx
+++ b/src/pages/ManageValidator/RightManagePanels/DepositPanel.tsx
@@ -3,13 +3,13 @@ import { YStack } from 'tamagui'
 import { useSelector } from 'react-redux'
 
 import PanelWrapper from './PanelWrapper'
-import { getDepositTitle } from '../../../../utilities'
-import { RootState } from '../../../../redux/store'
-import ConnectedWallet from '../../../../components/General/ConnectedWallet'
-import ConnectWallet from '../../../../components/General/ConnectWallet'
-import ChainParity from '../../../../components/General/ChainParity'
-import ValidatorRequest from '../../../../components/General/ValidatorRequest/ValidatorRequest'
-import ValidatorBalanceInfoBox from '../../../../components/General/ValidatorBalanceInfoBox'
+import { getDepositTitle } from '../../../utilities'
+import { RootState } from '../../../redux/store'
+import ConnectedWallet from '../../../components/General/ConnectedWallet'
+import ConnectWallet from '../../../components/General/ConnectWallet'
+import ChainParity from '../../../components/General/ChainParity'
+import ValidatorRequest from '../../../components/General/ValidatorRequest/ValidatorRequest'
+import ValidatorBalanceInfoBox from '../../../components/General/ValidatorBalanceInfoBox'
 import DepositValidator from './DepositValidator'
 
 const DepositPanel = () => {
diff --git a/src/pages/ManageValidator/RightManage/Panels/DepositValidator.tsx b/src/pages/ManageValidator/RightManagePanels/DepositValidator.tsx
similarity index 94%
rename from src/pages/ManageValidator/RightManage/Panels/DepositValidator.tsx
rename to src/pages/ManageValidator/RightManagePanels/DepositValidator.tsx
index ad5607c0..f9d09c71 100644
--- a/src/pages/ManageValidator/RightManage/Panels/DepositValidator.tsx
+++ b/src/pages/ManageValidator/RightManagePanels/DepositValidator.tsx
@@ -3,7 +3,7 @@ import { ClearIcon } from '@status-im/icons'
 import { XStack, YStack } from 'tamagui'
 import { useState } from 'react'
 
-import CurrencyDropdown from '../../../../components/General/CurrencyDropdown'
+import CurrencyDropdown from '../../../components/General/CurrencyDropdown'
 
 const DepositValidator = () => {
   const [depositAmount, setDepositAmount] = useState('')
diff --git a/src/pages/ManageValidator/RightManage/Panels/ExitPanel.stories.tsx b/src/pages/ManageValidator/RightManagePanels/ExitPanel.stories.tsx
similarity index 100%
rename from src/pages/ManageValidator/RightManage/Panels/ExitPanel.stories.tsx
rename to src/pages/ManageValidator/RightManagePanels/ExitPanel.stories.tsx
diff --git a/src/pages/ManageValidator/RightManage/Panels/ExitPanel.tsx b/src/pages/ManageValidator/RightManagePanels/ExitPanel.tsx
similarity index 100%
rename from src/pages/ManageValidator/RightManage/Panels/ExitPanel.tsx
rename to src/pages/ManageValidator/RightManagePanels/ExitPanel.tsx
diff --git a/src/pages/ManageValidator/RightManage/Panels/MigratePanel.stories.tsx b/src/pages/ManageValidator/RightManagePanels/MigratePanel.stories.tsx
similarity index 100%
rename from src/pages/ManageValidator/RightManage/Panels/MigratePanel.stories.tsx
rename to src/pages/ManageValidator/RightManagePanels/MigratePanel.stories.tsx
diff --git a/src/pages/ManageValidator/RightManage/Panels/MigratePanel.tsx b/src/pages/ManageValidator/RightManagePanels/MigratePanel.tsx
similarity index 96%
rename from src/pages/ManageValidator/RightManage/Panels/MigratePanel.tsx
rename to src/pages/ManageValidator/RightManagePanels/MigratePanel.tsx
index cb2338a7..6b7f16ab 100644
--- a/src/pages/ManageValidator/RightManage/Panels/MigratePanel.tsx
+++ b/src/pages/ManageValidator/RightManagePanels/MigratePanel.tsx
@@ -3,7 +3,7 @@ import { CloseCircleIcon } from '@status-im/icons'
 import { XStack, YStack } from 'tamagui'
 import { useState } from 'react'
 
-import KeystoreBackupsCard from '../../../../components/General/KeystoreBackupsCard'
+import KeystoreBackupsCard from '../../../components/General/KeystoreBackupsCard'
 import PanelWrapper from './PanelWrapper'
 
 const MigratePanel = () => {
diff --git a/src/pages/ManageValidator/RightManage/Panels/PanelWrapper.stories.tsx b/src/pages/ManageValidator/RightManagePanels/PanelWrapper.stories.tsx
similarity index 100%
rename from src/pages/ManageValidator/RightManage/Panels/PanelWrapper.stories.tsx
rename to src/pages/ManageValidator/RightManagePanels/PanelWrapper.stories.tsx
diff --git a/src/pages/ManageValidator/RightManage/Panels/PanelWrapper.tsx b/src/pages/ManageValidator/RightManagePanels/PanelWrapper.tsx
similarity index 100%
rename from src/pages/ManageValidator/RightManage/Panels/PanelWrapper.tsx
rename to src/pages/ManageValidator/RightManagePanels/PanelWrapper.tsx