diff --git a/src/components/General/BreadcrumbBar.stories.tsx b/src/components/General/BreadcrumbBar/BreadcrumbBar.stories.tsx
similarity index 100%
rename from src/components/General/BreadcrumbBar.stories.tsx
rename to src/components/General/BreadcrumbBar/BreadcrumbBar.stories.tsx
diff --git a/src/components/General/BreadcrumbBar.tsx b/src/components/General/BreadcrumbBar/BreadcrumbBar.tsx
similarity index 83%
rename from src/components/General/BreadcrumbBar.tsx
rename to src/components/General/BreadcrumbBar/BreadcrumbBar.tsx
index 0af4e9af..9034efbb 100644
--- a/src/components/General/BreadcrumbBar.tsx
+++ b/src/components/General/BreadcrumbBar/BreadcrumbBar.tsx
@@ -4,7 +4,7 @@ type BreadcrumbBarProps = {
   breadcrumbList: string[]
 }
 
-function BreadcrumbBar({ breadcrumbList }: BreadcrumbBarProps) {
+const BreadcrumbBar = ({ breadcrumbList }: BreadcrumbBarProps) => {
   return (
     <nav className="breadcrumb-bar-nav">
       <ul className="breadcrumb-bar-ul">
diff --git a/src/components/General/breadcrumbbar.css b/src/components/General/BreadcrumbBar/breadcrumbbar.css
similarity index 100%
rename from src/components/General/breadcrumbbar.css
rename to src/components/General/BreadcrumbBar/breadcrumbbar.css
diff --git a/src/pages/ConnectDevicePage/ConnectDevicePage.tsx b/src/pages/ConnectDevicePage/ConnectDevicePage.tsx
index ba5ca1ab..feafb723 100644
--- a/src/pages/ConnectDevicePage/ConnectDevicePage.tsx
+++ b/src/pages/ConnectDevicePage/ConnectDevicePage.tsx
@@ -1,5 +1,5 @@
 import { useState } from 'react'
-import BreadcrumbBar from '../../components/General/BreadcrumbBar'
+import BreadcrumbBar from '../../components/General/BreadcrumbBar/BreadcrumbBar'
 import { Button as StatusButton, Tag, Text, Avatar, Checkbox } from '@status-im/components'
 import { Label, Separator, XStack, YStack } from 'tamagui'
 import PageWrapperShadow from '../../components/PageWrappers/PageWrapperShadow'