diff --git a/config/scripts/ci-shard-timings.json b/config/scripts/ci-shard-timings.json
index 62e9ab990b3..5c270873713 100644
--- a/config/scripts/ci-shard-timings.json
+++ b/config/scripts/ci-shard-timings.json
@@ -9435,12 +9435,12 @@
       "src/renderer/src/components/task-page-jira-quick-copy.test.tsx": 2171,
       "src/renderer/src/components/task-page-jira-saved-filter-application.test.tsx": 1838,
       "src/renderer/src/components/task-page-jira-saved-filter-load-failure.test.tsx": 2974,
-      "src/renderer/src/components/task-page-jira-search.test.ts": 42,
+      "src/renderer/src/components/task-page/jira/task-page-jira-search.test.ts": 42,
       "src/renderer/src/components/task-page-jira-sort-controls.test.tsx": 721,
       "src/renderer/src/components/task-page-jira-sorting.test.ts": 107,
       "src/renderer/src/components/task-page-jira-status-catalog.test.ts": 60,
       "src/renderer/src/components/task-page-jira-status-order-session.test.tsx": 2111,
-      "src/renderer/src/components/task-page-jira-text-fallback-notice.test.tsx": 375,
+      "src/renderer/src/components/task-page/jira/task-page-jira-text-fallback-notice.test.tsx": 375,
       "src/renderer/src/components/task-page-jira-workspace-actions.test.tsx": 1971,
       "src/renderer/src/components/task-page/task-page-list-chrome-visibility.test.ts": 33,
       "src/renderer/src/components/task-page/task-page-mutation-page-allocation.test.ts": 128,
diff --git a/src/renderer/src/components/task-page/jira/Content.tsx b/src/renderer/src/components/task-page/jira/Content.tsx
index e84807ae739..24db49b2d10 100644
--- a/src/renderer/src/components/task-page/jira/Content.tsx
+++ b/src/renderer/src/components/task-page/jira/Content.tsx
@@ -9,7 +9,7 @@ import { jiraListGridStyle } from '../../jira-list-columns'
 import { JiraListColumnsMenu } from '../../jira-list-columns-menu'
 import { TaskPageJiraSortControls } from '../../task-page-jira-sort-controls'
 import { TaskPageJiraErrorBanner } from '../linear/task-page-linear-jira-list-model'
-import { TaskPageJiraTextFallbackNotice } from '../../task-page-jira-text-fallback-notice'
+import { TaskPageJiraTextFallbackNotice } from './task-page-jira-text-fallback-notice'
 import { TaskPageJiraIssueList } from '@/components/task-page-jira-issue-list'
 import { TaskPageJiraBoardView } from '@/components/task-page-jira-board-view'
 import { TaskPageJiraViewControls } from '@/components/task-page-jira-view-controls'
diff --git a/src/renderer/src/components/task-page-jira-search.test.ts b/src/renderer/src/components/task-page/jira/task-page-jira-search.test.ts
similarity index 99%
rename from src/renderer/src/components/task-page-jira-search.test.ts
rename to src/renderer/src/components/task-page/jira/task-page-jira-search.test.ts
index 7b87419bff7..b7f3fb85e8e 100644
--- a/src/renderer/src/components/task-page-jira-search.test.ts
+++ b/src/renderer/src/components/task-page/jira/task-page-jira-search.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it, vi } from 'vitest'
-import type { JiraIssue } from '../../../shared/jira/jira-types'
+import type { JiraIssue } from '../../../../../shared/jira/jira-types'
 import { searchTaskPageJiraIssues } from './task-page-jira-search'
 
 const ISSUE: JiraIssue = {
diff --git a/src/renderer/src/components/task-page-jira-search.ts b/src/renderer/src/components/task-page/jira/task-page-jira-search.ts
similarity index 84%
rename from src/renderer/src/components/task-page-jira-search.ts
rename to src/renderer/src/components/task-page/jira/task-page-jira-search.ts
index a7b0d1fb7af..80e3669481c 100644
--- a/src/renderer/src/components/task-page-jira-search.ts
+++ b/src/renderer/src/components/task-page/jira/task-page-jira-search.ts
@@ -1,7 +1,7 @@
-import type { JiraIssue } from '../../../shared/jira/jira-types'
-import { buildJiraTextMatchJql, mayBeJql } from '../../../shared/jira/jira-search-input-jql'
-import { searchJiraIssuesByKeyOrText } from './jira-key-or-text-search'
-import { getJiraBadRequestReason } from './task-page/jira/task-page-jira-load-state'
+import type { JiraIssue } from '../../../../../shared/jira/jira-types'
+import { buildJiraTextMatchJql, mayBeJql } from '../../../../../shared/jira/jira-search-input-jql'
+import { searchJiraIssuesByKeyOrText } from '../../jira-key-or-text-search'
+import { getJiraBadRequestReason } from './task-page-jira-load-state'
 
 export type TaskPageJiraJqlRejection = {
   /** Jira's reason; '' when it gave none. */
diff --git a/src/renderer/src/components/task-page-jira-text-fallback-notice.test.tsx b/src/renderer/src/components/task-page/jira/task-page-jira-text-fallback-notice.test.tsx
similarity index 100%
rename from src/renderer/src/components/task-page-jira-text-fallback-notice.test.tsx
rename to src/renderer/src/components/task-page/jira/task-page-jira-text-fallback-notice.test.tsx
diff --git a/src/renderer/src/components/task-page-jira-text-fallback-notice.tsx b/src/renderer/src/components/task-page/jira/task-page-jira-text-fallback-notice.tsx
similarity index 100%
rename from src/renderer/src/components/task-page-jira-text-fallback-notice.tsx
rename to src/renderer/src/components/task-page/jira/task-page-jira-text-fallback-notice.tsx
diff --git a/src/renderer/src/components/use-task-page-jira-list-effects.ts b/src/renderer/src/components/use-task-page-jira-list-effects.ts
index d353b49db6c..f8190ee3380 100644
--- a/src/renderer/src/components/use-task-page-jira-list-effects.ts
+++ b/src/renderer/src/components/use-task-page-jira-list-effects.ts
@@ -14,7 +14,7 @@ import {
   loadTaskPageJiraProjectStatusOrder
 } from '@/components/task-page-jira-status-order'
 import { createTaskPageJiraLoadFailureState } from '@/components/task-page/jira/task-page-jira-load-state'
-import { searchTaskPageJiraIssues } from '@/components/task-page-jira-search'
+import { searchTaskPageJiraIssues } from '@/components/task-page/jira/task-page-jira-search'
 import { JIRA_ITEM_LIMIT } from './task-page/task-page-source-context'
 import { useTaskSearchDebouncedApply } from './task-page/use-task-search-debounced-apply'
 import { readLinkedJiraIssues } from './task-page/jira/task-page-jira-linked-issues'
diff --git a/src/renderer/src/components/use-task-page-jira-list-state.ts b/src/renderer/src/components/use-task-page-jira-list-state.ts
index 75b3bee2bc2..1970b995380 100644
--- a/src/renderer/src/components/use-task-page-jira-list-state.ts
+++ b/src/renderer/src/components/use-task-page-jira-list-state.ts
@@ -12,7 +12,7 @@ import type {
   JiraPriority
 } from '../../../shared/jira/jira-types'
 import type { TaskPageJiraLoadError } from '@/components/task-page/jira/task-page-jira-load-state'
-import type { TaskPageJiraJqlRejection } from '@/components/task-page-jira-search'
+import type { TaskPageJiraJqlRejection } from '@/components/task-page/jira/task-page-jira-search'
 import type { JiraPresetId } from '@/components/task-page/task-page-localized-options'
 import type {
   JiraIssueSortColumn,