diff --git a/frontend/src/components/settings/SettingsPage.jsx b/frontend/src/components/settings/SettingsPage.jsx
index ef283a7..2ed1241 100644
--- a/frontend/src/components/settings/SettingsPage.jsx
+++ b/frontend/src/components/settings/SettingsPage.jsx
@@ -11,7 +11,7 @@ import {
 import {
     Loader,
 } from 'lucide-react';
-import SettingsBranchModal from './SettingsBranchModal';
+import ViewBranches from './git/modal/ViewBranches';
 import Alert from '../ui/Alert';
 import ArrContainer from './arrs/ArrContainer';
 import RepoContainer from './git/RepoContainer';
@@ -200,7 +200,7 @@ const SettingsPage = () => {
             <ArrContainer />
 
             {settings && changes && (
-                <SettingsBranchModal
+                <ViewBranches
                     isOpen={showBranchModal}
                     onClose={() => setShowBranchModal(false)}
                     repoUrl={settings.gitRepo}
diff --git a/frontend/src/components/settings/CommitSection.jsx b/frontend/src/components/settings/git/CommitMessage.jsx
similarity index 98%
rename from frontend/src/components/settings/CommitSection.jsx
rename to frontend/src/components/settings/git/CommitMessage.jsx
index 7d9e12a..c9e8f53 100644
--- a/frontend/src/components/settings/CommitSection.jsx
+++ b/frontend/src/components/settings/git/CommitMessage.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import Textarea from '../ui/TextArea';
+import Textarea from '../../ui/TextArea';
 
 const CommitSection = ({
     status,
diff --git a/frontend/src/components/settings/git/StatusContainer.jsx b/frontend/src/components/settings/git/StatusContainer.jsx
index 4547834..86dfb58 100644
--- a/frontend/src/components/settings/git/StatusContainer.jsx
+++ b/frontend/src/components/settings/git/StatusContainer.jsx
@@ -10,7 +10,7 @@ import {
 } from 'lucide-react';
 import ChangeTable from './ChangeTable';
 import Tooltip from '../../ui/Tooltip';
-import CommitSection from '../CommitSection';
+import CommitSection from './CommitMessage';
 
 const StatusContainer = ({
     status,
diff --git a/frontend/src/components/settings/SettingsBranchModal.jsx b/frontend/src/components/settings/git/modal/ViewBranches.jsx
similarity index 98%
rename from frontend/src/components/settings/SettingsBranchModal.jsx
rename to frontend/src/components/settings/git/modal/ViewBranches.jsx
index 4ec1eab..3e6f318 100644
--- a/frontend/src/components/settings/SettingsBranchModal.jsx
+++ b/frontend/src/components/settings/git/modal/ViewBranches.jsx
@@ -1,12 +1,12 @@
 import React, {useState, useEffect} from 'react';
-import Modal from '../ui/Modal';
+import Modal from '../../../ui/Modal';
 import {
     getBranches,
     checkoutBranch,
     createBranch,
     deleteBranch,
     pushBranchToRemote
-} from '../../api/api';
+} from '../../../../api/api';
 import {
     ExternalLink,
     Trash2,
@@ -16,8 +16,8 @@ import {
     CloudUpload,
     Search
 } from 'lucide-react';
-import Tooltip from '../ui/Tooltip';
-import Alert from '../ui/Alert';
+import Tooltip from '../../../ui/Tooltip';
+import Alert from '../../../ui/Alert';
 
 const SettingsBranchModal = ({
     isOpen,
@@ -259,9 +259,9 @@ const SettingsBranchModal = ({
                                             {branch.isLocal && !branch.isRemote
                                                 ? '(Local)'
                                                 : !branch.isLocal &&
-                                                    branch.isRemote
-                                                  ? '(Remote)'
-                                                  : '(Local & Remote)'}
+                                                  branch.isRemote
+                                                ? '(Remote)'
+                                                : '(Local & Remote)'}
                                         </span>
                                     </div>
                                     <div className='flex items-center space-x-2'>