diff --git a/browser_tests/helpers/actionbar.ts b/browser_tests/helpers/actionbar.ts
index 6c368c4d6..502b5184f 100644
--- a/browser_tests/helpers/actionbar.ts
+++ b/browser_tests/helpers/actionbar.ts
@@ -1,6 +1,6 @@
 import type { Locator, Page } from '@playwright/test'
 
-import type { AutoQueueMode } from '../../src/stores/queueStore'
+import type { AutoQueueMode } from '../../src/queue/stores/queueStore'
 
 export class ComfyActionbar {
   public readonly root: Locator
diff --git a/src/components/TopMenuSection.vue b/src/components/TopMenuSection.vue
index 0e0ffe627..0328c5f27 100644
--- a/src/components/TopMenuSection.vue
+++ b/src/components/TopMenuSection.vue
@@ -83,7 +83,7 @@ import { useI18n } from 'vue-i18n'
 
 import ComfyActionbar from '@/components/actionbar/ComfyActionbar.vue'
 import SubgraphBreadcrumb from '@/components/breadcrumb/SubgraphBreadcrumb.vue'
-import QueueProgressOverlay from '@/components/queue/QueueProgressOverlay.vue'
+import QueueProgressOverlay from '@/queue/components/QueueProgressOverlay.vue'
 import ActionBarButtons from '@/components/topbar/ActionBarButtons.vue'
 import CurrentUserButton from '@/components/topbar/CurrentUserButton.vue'
 import LoginButton from '@/components/topbar/LoginButton.vue'
@@ -92,7 +92,7 @@ import { useCurrentUser } from '@/composables/auth/useCurrentUser'
 import { useErrorHandling } from '@/composables/useErrorHandling'
 import { buildTooltipConfig } from '@/composables/useTooltipConfig'
 import { app } from '@/scripts/app'
-import { useQueueStore } from '@/stores/queueStore'
+import { useQueueStore } from '@/queue/stores/queueStore'
 import { useRightSidePanelStore } from '@/stores/workspace/rightSidePanelStore'
 import { useWorkspaceStore } from '@/stores/workspaceStore'
 import { isElectron } from '@/utils/envUtil'
diff --git a/src/components/actionbar/BatchCountEdit.vue b/src/components/actionbar/BatchCountEdit.vue
index 603ca6067..03be0e90c 100644
--- a/src/components/actionbar/BatchCountEdit.vue
+++ b/src/components/actionbar/BatchCountEdit.vue
@@ -38,7 +38,7 @@ import InputNumber from 'primevue/inputnumber'
 import { computed } from 'vue'
 
 import { useSettingStore } from '@/platform/settings/settingStore'
-import { useQueueSettingsStore } from '@/stores/queueStore'
+import { useQueueSettingsStore } from '@/queue/stores/queueStore'
 
 const queueSettingsStore = useQueueSettingsStore()
 const { batchCount } = storeToRefs(queueSettingsStore)
diff --git a/src/components/actionbar/ComfyRunButton/ComfyQueueButton.vue b/src/components/actionbar/ComfyRunButton/ComfyQueueButton.vue
index 4c0ea84e4..fd7ea05c5 100644
--- a/src/components/actionbar/ComfyRunButton/ComfyQueueButton.vue
+++ b/src/components/actionbar/ComfyRunButton/ComfyQueueButton.vue
@@ -48,7 +48,7 @@ import { useTelemetry } from '@/platform/telemetry'
 import { app } from '@/scripts/app'
 import { useCommandStore } from '@/stores/commandStore'
 import { useNodeDefStore } from '@/stores/nodeDefStore'
-import { useQueueSettingsStore } from '@/stores/queueStore'
+import { useQueueSettingsStore } from '@/queue/stores/queueStore'
 import { useWorkspaceStore } from '@/stores/workspaceStore'
 import { graphHasMissingNodes } from '@/workbench/extensions/manager/utils/graphHasMissingNodes'
 
diff --git a/src/components/sidebar/tabs/AssetsSidebarListView.stories.ts b/src/components/sidebar/tabs/AssetsSidebarListView.stories.ts
index fcbdf655d..98db019ec 100644
--- a/src/components/sidebar/tabs/AssetsSidebarListView.stories.ts
+++ b/src/components/sidebar/tabs/AssetsSidebarListView.stories.ts
@@ -1,11 +1,11 @@
 import type { Meta, StoryObj } from '@storybook/vue3-vite'
 
-import type { JobAction } from '@/composables/queue/useJobActions'
-import type { JobListItem } from '@/composables/queue/useJobList'
+import type { JobAction } from '@/queue/composables/useJobActions'
+import type { JobListItem } from '@/queue/composables/useJobList'
 import type { AssetItem } from '@/platform/assets/schemas/assetSchema'
 import { setMockJobActions } from '@/storybook/mocks/useJobActions'
 import { setMockJobItems } from '@/storybook/mocks/useJobList'
-import { iconForJobState } from '@/utils/queueDisplay'
+import { iconForJobState } from '@/queue/utils/queueDisplay'
 
 import AssetsSidebarListView from './AssetsSidebarListView.vue'
 
diff --git a/src/components/sidebar/tabs/AssetsSidebarListView.vue b/src/components/sidebar/tabs/AssetsSidebarListView.vue
index c746627cb..20c7c4d20 100644
--- a/src/components/sidebar/tabs/AssetsSidebarListView.vue
+++ b/src/components/sidebar/tabs/AssetsSidebarListView.vue
@@ -95,21 +95,21 @@ import { useI18n } from 'vue-i18n'
 
 import VirtualGrid from '@/components/common/VirtualGrid.vue'
 import Button from '@/components/ui/button/Button.vue'
-import type { JobAction } from '@/composables/queue/useJobActions'
-import { useJobActions } from '@/composables/queue/useJobActions'
-import type { JobListItem } from '@/composables/queue/useJobList'
-import { useJobList } from '@/composables/queue/useJobList'
+import type { JobAction } from '@/queue/composables/useJobActions'
+import { useJobActions } from '@/queue/composables/useJobActions'
+import type { JobListItem } from '@/queue/composables/useJobList'
+import { useJobList } from '@/queue/composables/useJobList'
 import AssetsListCard from '@/platform/assets/components/AssetsListCard.vue'
 import { getOutputAssetMetadata } from '@/platform/assets/schemas/assetMetadataSchema'
 import type { AssetItem } from '@/platform/assets/schemas/assetSchema'
-import type { JobState } from '@/types/queue'
+import type { JobState } from '@/queue/types/queue'
 import {
   formatDuration,
   formatSize,
   getMediaTypeFromFilename,
   truncateFilename
 } from '@/utils/formatUtil'
-import { iconForJobState } from '@/utils/queueDisplay'
+import { iconForJobState } from '@/queue/utils/queueDisplay'
 import { cn } from '@/utils/tailwindUtil'
 
 const { assets, isSelected } = defineProps<{
diff --git a/src/components/sidebar/tabs/AssetsSidebarTab.vue b/src/components/sidebar/tabs/AssetsSidebarTab.vue
index 7b8ed9ec3..bf6885a4e 100644
--- a/src/components/sidebar/tabs/AssetsSidebarTab.vue
+++ b/src/components/sidebar/tabs/AssetsSidebarTab.vue
@@ -234,7 +234,7 @@ import { isCloud } from '@/platform/distribution/types'
 import { useSettingStore } from '@/platform/settings/settingStore'
 import { useCommandStore } from '@/stores/commandStore'
 import { useDialogStore } from '@/stores/dialogStore'
-import { ResultItemImpl, useQueueStore } from '@/stores/queueStore'
+import { ResultItemImpl, useQueueStore } from '@/queue/stores/queueStore'
 import { formatDuration, getMediaTypeFromFilename } from '@/utils/formatUtil'
 import { cn } from '@/utils/tailwindUtil'
 
diff --git a/src/components/sidebar/tabs/queue/ResultAudio.vue b/src/components/sidebar/tabs/queue/ResultAudio.vue
index 7a55fb854..7af2be80d 100644
--- a/src/components/sidebar/tabs/queue/ResultAudio.vue
+++ b/src/components/sidebar/tabs/queue/ResultAudio.vue
@@ -8,7 +8,7 @@
 <script setup lang="ts">
 import { computed } from 'vue'
 
-import type { ResultItemImpl } from '@/stores/queueStore'
+import type { ResultItemImpl } from '@/queue/stores/queueStore'
 
 const { result } = defineProps<{
   result: ResultItemImpl
diff --git a/src/components/sidebar/tabs/queue/ResultGallery.test.ts b/src/components/sidebar/tabs/queue/ResultGallery.test.ts
index 49b365a0d..00c26255c 100644
--- a/src/components/sidebar/tabs/queue/ResultGallery.test.ts
+++ b/src/components/sidebar/tabs/queue/ResultGallery.test.ts
@@ -5,7 +5,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { createApp, nextTick } from 'vue'
 
 import type { NodeId } from '@/platform/workflow/validation/schemas/workflowSchema'
-import type { ResultItemImpl } from '@/stores/queueStore'
+import type { ResultItemImpl } from '@/queue/stores/queueStore'
 
 import ResultGallery from './ResultGallery.vue'
 
diff --git a/src/components/sidebar/tabs/queue/ResultGallery.vue b/src/components/sidebar/tabs/queue/ResultGallery.vue
index dbb7d9102..050ab8e94 100644
--- a/src/components/sidebar/tabs/queue/ResultGallery.vue
+++ b/src/components/sidebar/tabs/queue/ResultGallery.vue
@@ -45,7 +45,7 @@ import Galleria from 'primevue/galleria'
 import { computed, onMounted, onUnmounted, ref, watch } from 'vue'
 
 import ComfyImage from '@/components/common/ComfyImage.vue'
-import type { ResultItemImpl } from '@/stores/queueStore'
+import type { ResultItemImpl } from '@/queue/stores/queueStore'
 
 import ResultAudio from './ResultAudio.vue'
 import ResultVideo from './ResultVideo.vue'
diff --git a/src/components/sidebar/tabs/queue/ResultVideo.vue b/src/components/sidebar/tabs/queue/ResultVideo.vue
index d8b0764fe..142538f1a 100644
--- a/src/components/sidebar/tabs/queue/ResultVideo.vue
+++ b/src/components/sidebar/tabs/queue/ResultVideo.vue
@@ -10,7 +10,7 @@ import { computed } from 'vue'
 
 import { useSettingStore } from '@/platform/settings/settingStore'
 import { useExtensionStore } from '@/stores/extensionStore'
-import type { ResultItemImpl } from '@/stores/queueStore'
+import type { ResultItemImpl } from '@/queue/stores/queueStore'
 
 const props = defineProps<{
   result: ResultItemImpl
diff --git a/src/composables/useCoreCommands.ts b/src/composables/useCoreCommands.ts
index 6ba9ac2a7..17b050f82 100644
--- a/src/composables/useCoreCommands.ts
+++ b/src/composables/useCoreCommands.ts
@@ -39,7 +39,7 @@ import { useLitegraphService } from '@/services/litegraphService'
 import type { ComfyCommand } from '@/stores/commandStore'
 import { useExecutionStore } from '@/stores/executionStore'
 import { useHelpCenterStore } from '@/stores/helpCenterStore'
-import { useQueueSettingsStore, useQueueStore } from '@/stores/queueStore'
+import { useQueueSettingsStore, useQueueStore } from '@/queue/stores/queueStore'
 import { useSubgraphNavigationStore } from '@/stores/subgraphNavigationStore'
 import { useSubgraphStore } from '@/stores/subgraphStore'
 import { useBottomPanelStore } from '@/stores/workspace/bottomPanelStore'
diff --git a/src/platform/assets/components/AssetsListCard.stories.ts b/src/platform/assets/components/AssetsListCard.stories.ts
index 03221f726..d67713144 100644
--- a/src/platform/assets/components/AssetsListCard.stories.ts
+++ b/src/platform/assets/components/AssetsListCard.stories.ts
@@ -1,7 +1,7 @@
 import type { Meta, StoryObj } from '@storybook/vue3-vite'
 
 import Button from '@/components/ui/button/Button.vue'
-import { iconForJobState } from '@/utils/queueDisplay'
+import { iconForJobState } from '@/queue/utils/queueDisplay'
 
 import AssetsListCard from './AssetsListCard.vue'
 
diff --git a/src/platform/assets/composables/media/assetMappers.ts b/src/platform/assets/composables/media/assetMappers.ts
index c03b277bd..bcacf1a6a 100644
--- a/src/platform/assets/composables/media/assetMappers.ts
+++ b/src/platform/assets/composables/media/assetMappers.ts
@@ -2,7 +2,7 @@ import type { AssetItem } from '@/platform/assets/schemas/assetSchema'
 import type { OutputAssetMetadata } from '@/platform/assets/schemas/assetMetadataSchema'
 import type { AssetContext } from '@/platform/assets/schemas/mediaAssetSchema'
 import { api } from '@/scripts/api'
-import type { ResultItemImpl, TaskItemImpl } from '@/stores/queueStore'
+import type { ResultItemImpl, TaskItemImpl } from '@/queue/stores/queueStore'
 
 /**
  * Extract asset type from tags array
diff --git a/src/platform/assets/composables/useMediaAssetGalleryStore.test.ts b/src/platform/assets/composables/useMediaAssetGalleryStore.test.ts
index f2ac7bd8f..f8269cdcb 100644
--- a/src/platform/assets/composables/useMediaAssetGalleryStore.test.ts
+++ b/src/platform/assets/composables/useMediaAssetGalleryStore.test.ts
@@ -1,12 +1,12 @@
 import { createPinia, setActivePinia } from 'pinia'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
-import { ResultItemImpl } from '@/stores/queueStore'
+import { ResultItemImpl } from '@/queue/stores/queueStore'
 
 import type { AssetMeta } from '../schemas/mediaAssetSchema'
 import { useMediaAssetGalleryStore } from './useMediaAssetGalleryStore'
 
-vi.mock('@/stores/queueStore', () => ({
+vi.mock('@/queue/stores/queueStore', () => ({
   ResultItemImpl: vi
     .fn<typeof ResultItemImpl>()
     .mockImplementation(function (data) {
diff --git a/src/platform/assets/composables/useMediaAssetGalleryStore.ts b/src/platform/assets/composables/useMediaAssetGalleryStore.ts
index e7bd5d5c3..400fc5cf5 100644
--- a/src/platform/assets/composables/useMediaAssetGalleryStore.ts
+++ b/src/platform/assets/composables/useMediaAssetGalleryStore.ts
@@ -1,7 +1,7 @@
 import { defineStore } from 'pinia'
 import { ref, shallowRef } from 'vue'
 
-import { ResultItemImpl } from '@/stores/queueStore'
+import { ResultItemImpl } from '@/queue/stores/queueStore'
 
 import type { AssetMeta } from '../schemas/mediaAssetSchema'
 
diff --git a/src/platform/assets/schemas/assetMetadataSchema.ts b/src/platform/assets/schemas/assetMetadataSchema.ts
index 1a9b02f82..55e701da2 100644
--- a/src/platform/assets/schemas/assetMetadataSchema.ts
+++ b/src/platform/assets/schemas/assetMetadataSchema.ts
@@ -1,5 +1,5 @@
 import type { ComfyWorkflowJSON } from '@/platform/workflow/validation/schemas/workflowSchema'
-import type { ResultItemImpl } from '@/stores/queueStore'
+import type { ResultItemImpl } from '@/queue/stores/queueStore'
 
 /**
  * Metadata for output assets from queue store
diff --git a/src/components/queue/CompletionSummaryBanner.stories.ts b/src/queue/components/CompletionSummaryBanner.stories.ts
similarity index 100%
rename from src/components/queue/CompletionSummaryBanner.stories.ts
rename to src/queue/components/CompletionSummaryBanner.stories.ts
diff --git a/src/components/queue/CompletionSummaryBanner.test.ts b/src/queue/components/CompletionSummaryBanner.test.ts
similarity index 100%
rename from src/components/queue/CompletionSummaryBanner.test.ts
rename to src/queue/components/CompletionSummaryBanner.test.ts
diff --git a/src/components/queue/CompletionSummaryBanner.vue b/src/queue/components/CompletionSummaryBanner.vue
similarity index 98%
rename from src/components/queue/CompletionSummaryBanner.vue
rename to src/queue/components/CompletionSummaryBanner.vue
index c0bf7aeb9..64fe6e151 100644
--- a/src/components/queue/CompletionSummaryBanner.vue
+++ b/src/queue/components/CompletionSummaryBanner.vue
@@ -89,7 +89,7 @@ import Button from '@/components/ui/button/Button.vue'
 import type {
   CompletionSummary,
   CompletionSummaryMode
-} from '@/composables/queue/useCompletionSummary'
+} from '@/queue/composables/useCompletionSummary'
 
 type Props = {
   mode: CompletionSummaryMode
diff --git a/src/components/queue/QueueOverlayActive.test.ts b/src/queue/components/QueueOverlayActive.test.ts
similarity index 100%
rename from src/components/queue/QueueOverlayActive.test.ts
rename to src/queue/components/QueueOverlayActive.test.ts
diff --git a/src/components/queue/QueueOverlayActive.vue b/src/queue/components/QueueOverlayActive.vue
similarity index 100%
rename from src/components/queue/QueueOverlayActive.vue
rename to src/queue/components/QueueOverlayActive.vue
diff --git a/src/components/queue/QueueOverlayEmpty.test.ts b/src/queue/components/QueueOverlayEmpty.test.ts
similarity index 96%
rename from src/components/queue/QueueOverlayEmpty.test.ts
rename to src/queue/components/QueueOverlayEmpty.test.ts
index 76509dc3d..a97564171 100644
--- a/src/components/queue/QueueOverlayEmpty.test.ts
+++ b/src/queue/components/QueueOverlayEmpty.test.ts
@@ -3,7 +3,7 @@ import { describe, expect, it } from 'vitest'
 import { createI18n } from 'vue-i18n'
 
 import QueueOverlayEmpty from './QueueOverlayEmpty.vue'
-import type { CompletionSummary } from '@/composables/queue/useCompletionSummary'
+import type { CompletionSummary } from '@/queue/composables/useCompletionSummary'
 
 const i18n = createI18n({
   legacy: false,
diff --git a/src/components/queue/QueueOverlayEmpty.vue b/src/queue/components/QueueOverlayEmpty.vue
similarity index 82%
rename from src/components/queue/QueueOverlayEmpty.vue
rename to src/queue/components/QueueOverlayEmpty.vue
index 83a55aec2..23b11cb28 100644
--- a/src/components/queue/QueueOverlayEmpty.vue
+++ b/src/queue/components/QueueOverlayEmpty.vue
@@ -14,8 +14,8 @@
 <script setup lang="ts">
 import { useI18n } from 'vue-i18n'
 
-import CompletionSummaryBanner from '@/components/queue/CompletionSummaryBanner.vue'
-import type { CompletionSummary } from '@/composables/queue/useCompletionSummary'
+import CompletionSummaryBanner from '@/queue/components/CompletionSummaryBanner.vue'
+import type { CompletionSummary } from '@/queue/composables/useCompletionSummary'
 
 defineProps<{ summary: CompletionSummary }>()
 
diff --git a/src/components/queue/QueueOverlayExpanded.vue b/src/queue/components/QueueOverlayExpanded.vue
similarity index 96%
rename from src/components/queue/QueueOverlayExpanded.vue
rename to src/queue/components/QueueOverlayExpanded.vue
index 1d2004098..3d47d1315 100644
--- a/src/components/queue/QueueOverlayExpanded.vue
+++ b/src/queue/components/QueueOverlayExpanded.vue
@@ -79,9 +79,9 @@ import type {
   JobListItem,
   JobSortMode,
   JobTab
-} from '@/composables/queue/useJobList'
-import type { MenuEntry } from '@/composables/queue/useJobMenu'
-import { useJobMenu } from '@/composables/queue/useJobMenu'
+} from '@/queue/composables/useJobList'
+import type { MenuEntry } from '@/queue/composables/useJobMenu'
+import { useJobMenu } from '@/queue/composables/useJobMenu'
 
 import QueueOverlayHeader from './QueueOverlayHeader.vue'
 import JobContextMenu from './job/JobContextMenu.vue'
diff --git a/src/components/queue/QueueOverlayHeader.test.ts b/src/queue/components/QueueOverlayHeader.test.ts
similarity index 100%
rename from src/components/queue/QueueOverlayHeader.test.ts
rename to src/queue/components/QueueOverlayHeader.test.ts
diff --git a/src/components/queue/QueueOverlayHeader.vue b/src/queue/components/QueueOverlayHeader.vue
similarity index 100%
rename from src/components/queue/QueueOverlayHeader.vue
rename to src/queue/components/QueueOverlayHeader.vue
diff --git a/src/components/queue/QueueProgressOverlay.vue b/src/queue/components/QueueProgressOverlay.vue
similarity index 93%
rename from src/components/queue/QueueProgressOverlay.vue
rename to src/queue/components/QueueProgressOverlay.vue
index 78efb7a78..78d526adb 100644
--- a/src/components/queue/QueueProgressOverlay.vue
+++ b/src/queue/components/QueueProgressOverlay.vue
@@ -63,16 +63,16 @@
 import { computed, nextTick, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 
-import QueueOverlayActive from '@/components/queue/QueueOverlayActive.vue'
-import QueueOverlayEmpty from '@/components/queue/QueueOverlayEmpty.vue'
-import QueueOverlayExpanded from '@/components/queue/QueueOverlayExpanded.vue'
-import QueueClearHistoryDialog from '@/components/queue/dialogs/QueueClearHistoryDialog.vue'
+import QueueOverlayActive from '@/queue/components/QueueOverlayActive.vue'
+import QueueOverlayEmpty from '@/queue/components/QueueOverlayEmpty.vue'
+import QueueOverlayExpanded from '@/queue/components/QueueOverlayExpanded.vue'
+import QueueClearHistoryDialog from '@/queue/components/dialogs/QueueClearHistoryDialog.vue'
 import ResultGallery from '@/components/sidebar/tabs/queue/ResultGallery.vue'
-import { useCompletionSummary } from '@/composables/queue/useCompletionSummary'
-import { useJobList } from '@/composables/queue/useJobList'
-import type { JobListItem } from '@/composables/queue/useJobList'
-import { useQueueProgress } from '@/composables/queue/useQueueProgress'
-import { useResultGallery } from '@/composables/queue/useResultGallery'
+import { useCompletionSummary } from '@/queue/composables/useCompletionSummary'
+import { useJobList } from '@/queue/composables/useJobList'
+import type { JobListItem } from '@/queue/composables/useJobList'
+import { useQueueProgress } from '@/queue/composables/useQueueProgress'
+import { useResultGallery } from '@/queue/composables/useResultGallery'
 import { useErrorHandling } from '@/composables/useErrorHandling'
 import { useAssetSelectionStore } from '@/platform/assets/composables/useAssetSelectionStore'
 import { isCloud } from '@/platform/distribution/types'
@@ -81,7 +81,7 @@ import { useAssetsStore } from '@/stores/assetsStore'
 import { useCommandStore } from '@/stores/commandStore'
 import { useDialogStore } from '@/stores/dialogStore'
 import { useExecutionStore } from '@/stores/executionStore'
-import { useQueueStore } from '@/stores/queueStore'
+import { useQueueStore } from '@/queue/stores/queueStore'
 import { useSidebarTabStore } from '@/stores/workspace/sidebarTabStore'
 
 type OverlayState = 'hidden' | 'empty' | 'active' | 'expanded'
diff --git a/src/components/queue/dialogs/QueueClearHistoryDialog.vue b/src/queue/components/dialogs/QueueClearHistoryDialog.vue
similarity index 97%
rename from src/components/queue/dialogs/QueueClearHistoryDialog.vue
rename to src/queue/components/dialogs/QueueClearHistoryDialog.vue
index 0884dcf6f..faeb1104f 100644
--- a/src/components/queue/dialogs/QueueClearHistoryDialog.vue
+++ b/src/queue/components/dialogs/QueueClearHistoryDialog.vue
@@ -53,7 +53,7 @@ import { useI18n } from 'vue-i18n'
 import Button from '@/components/ui/button/Button.vue'
 import { useErrorHandling } from '@/composables/useErrorHandling'
 import { useDialogStore } from '@/stores/dialogStore'
-import { useQueueStore } from '@/stores/queueStore'
+import { useQueueStore } from '@/queue/stores/queueStore'
 
 const dialogStore = useDialogStore()
 const queueStore = useQueueStore()
diff --git a/src/components/queue/job/JobContextMenu.vue b/src/queue/components/job/JobContextMenu.vue
similarity index 96%
rename from src/components/queue/job/JobContextMenu.vue
rename to src/queue/components/job/JobContextMenu.vue
index 5ed96ad9e..9f82f1520 100644
--- a/src/components/queue/job/JobContextMenu.vue
+++ b/src/queue/components/job/JobContextMenu.vue
@@ -47,7 +47,7 @@ import Popover from 'primevue/popover'
 import { ref } from 'vue'
 
 import Button from '@/components/ui/button/Button.vue'
-import type { MenuEntry } from '@/composables/queue/useJobMenu'
+import type { MenuEntry } from '@/queue/composables/useJobMenu'
 
 defineProps<{ entries: MenuEntry[] }>()
 
diff --git a/src/components/queue/job/JobDetailsPopover.stories.ts b/src/queue/components/job/JobDetailsPopover.stories.ts
similarity index 99%
rename from src/components/queue/job/JobDetailsPopover.stories.ts
rename to src/queue/components/job/JobDetailsPopover.stories.ts
index 2343a8fa2..3cbe5f3ac 100644
--- a/src/components/queue/job/JobDetailsPopover.stories.ts
+++ b/src/queue/components/job/JobDetailsPopover.stories.ts
@@ -2,7 +2,7 @@ import type { Meta, StoryObj } from '@storybook/vue3-vite'
 
 import type { TaskStatus } from '@/schemas/apiSchema'
 import { useExecutionStore } from '@/stores/executionStore'
-import { TaskItemImpl, useQueueStore } from '@/stores/queueStore'
+import { TaskItemImpl, useQueueStore } from '@/queue/stores/queueStore'
 
 import JobDetailsPopover from './JobDetailsPopover.vue'
 
diff --git a/src/components/queue/job/JobDetailsPopover.vue b/src/queue/components/job/JobDetailsPopover.vue
similarity index 98%
rename from src/components/queue/job/JobDetailsPopover.vue
rename to src/queue/components/job/JobDetailsPopover.vue
index d2d3a7ad1..1bc45c3b1 100644
--- a/src/components/queue/job/JobDetailsPopover.vue
+++ b/src/queue/components/job/JobDetailsPopover.vue
@@ -101,10 +101,10 @@ import { isCloud } from '@/platform/distribution/types'
 import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
 import { useDialogService } from '@/services/dialogService'
 import { useExecutionStore } from '@/stores/executionStore'
-import { useQueueStore } from '@/stores/queueStore'
-import type { TaskItemImpl } from '@/stores/queueStore'
+import { useQueueStore } from '@/queue/stores/queueStore'
+import type { TaskItemImpl } from '@/queue/stores/queueStore'
 import { formatClockTime } from '@/utils/dateTimeUtil'
-import { jobStateFromTask } from '@/utils/queueUtil'
+import { jobStateFromTask } from '@/queue/utils/queueUtil'
 
 import { useJobErrorReporting } from './useJobErrorReporting'
 import { formatElapsedTime, useQueueEstimates } from './useQueueEstimates'
diff --git a/src/components/queue/job/JobFiltersBar.vue b/src/queue/components/job/JobFiltersBar.vue
similarity index 98%
rename from src/components/queue/job/JobFiltersBar.vue
rename to src/queue/components/job/JobFiltersBar.vue
index 6631d4b38..2a242d02a 100644
--- a/src/components/queue/job/JobFiltersBar.vue
+++ b/src/queue/components/job/JobFiltersBar.vue
@@ -137,8 +137,8 @@ import { computed, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 
 import Button from '@/components/ui/button/Button.vue'
-import { jobSortModes, jobTabs } from '@/composables/queue/useJobList'
-import type { JobSortMode, JobTab } from '@/composables/queue/useJobList'
+import { jobSortModes, jobTabs } from '@/queue/composables/useJobList'
+import type { JobSortMode, JobTab } from '@/queue/composables/useJobList'
 import { buildTooltipConfig } from '@/composables/useTooltipConfig'
 import { isCloud } from '@/platform/distribution/types'
 
diff --git a/src/components/queue/job/JobGroupsList.vue b/src/queue/components/job/JobGroupsList.vue
similarity index 95%
rename from src/components/queue/job/JobGroupsList.vue
rename to src/queue/components/job/JobGroupsList.vue
index 482016d34..b0b369ada 100644
--- a/src/components/queue/job/JobGroupsList.vue
+++ b/src/queue/components/job/JobGroupsList.vue
@@ -38,8 +38,8 @@
 <script setup lang="ts">
 import { onBeforeUnmount, ref, watch } from 'vue'
 
-import QueueJobItem from '@/components/queue/job/QueueJobItem.vue'
-import type { JobGroup, JobListItem } from '@/composables/queue/useJobList'
+import QueueJobItem from '@/queue/components/job/QueueJobItem.vue'
+import type { JobGroup, JobListItem } from '@/queue/composables/useJobList'
 
 const props = defineProps<{ displayedJobGroups: JobGroup[] }>()
 
diff --git a/src/components/queue/job/QueueAssetPreview.vue b/src/queue/components/job/QueueAssetPreview.vue
similarity index 100%
rename from src/components/queue/job/QueueAssetPreview.vue
rename to src/queue/components/job/QueueAssetPreview.vue
diff --git a/src/components/queue/job/QueueJobItem.stories.ts b/src/queue/components/job/QueueJobItem.stories.ts
similarity index 100%
rename from src/components/queue/job/QueueJobItem.stories.ts
rename to src/queue/components/job/QueueJobItem.stories.ts
diff --git a/src/components/queue/job/QueueJobItem.vue b/src/queue/components/job/QueueJobItem.vue
similarity index 97%
rename from src/components/queue/job/QueueJobItem.vue
rename to src/queue/components/job/QueueJobItem.vue
index 7e71840bc..5c5051cc1 100644
--- a/src/components/queue/job/QueueJobItem.vue
+++ b/src/queue/components/job/QueueJobItem.vue
@@ -198,12 +198,12 @@
 import { computed, nextTick, ref, watch } from 'vue'
 import { useI18n } from 'vue-i18n'
 
-import JobDetailsPopover from '@/components/queue/job/JobDetailsPopover.vue'
-import QueueAssetPreview from '@/components/queue/job/QueueAssetPreview.vue'
+import JobDetailsPopover from '@/queue/components/job/JobDetailsPopover.vue'
+import QueueAssetPreview from '@/queue/components/job/QueueAssetPreview.vue'
 import Button from '@/components/ui/button/Button.vue'
 import { buildTooltipConfig } from '@/composables/useTooltipConfig'
-import type { JobState } from '@/types/queue'
-import { iconForJobState } from '@/utils/queueDisplay'
+import type { JobState } from '@/queue/types/queue'
+import { iconForJobState } from '@/queue/utils/queueDisplay'
 import { cn } from '@/utils/tailwindUtil'
 
 const props = withDefaults(
diff --git a/src/components/queue/job/useJobErrorReporting.ts b/src/queue/components/job/useJobErrorReporting.ts
similarity index 97%
rename from src/components/queue/job/useJobErrorReporting.ts
rename to src/queue/components/job/useJobErrorReporting.ts
index afc0baf3e..76d77a081 100644
--- a/src/components/queue/job/useJobErrorReporting.ts
+++ b/src/queue/components/job/useJobErrorReporting.ts
@@ -2,7 +2,7 @@ import { computed } from 'vue'
 import type { ComputedRef } from 'vue'
 
 import type { ExecutionErrorWsMessage } from '@/schemas/apiSchema'
-import type { TaskItemImpl } from '@/stores/queueStore'
+import type { TaskItemImpl } from '@/queue/stores/queueStore'
 
 type CopyHandler = (value: string) => void | Promise<void>
 
diff --git a/src/components/queue/job/useQueueEstimates.test.ts b/src/queue/components/job/useQueueEstimates.test.ts
similarity index 98%
rename from src/components/queue/job/useQueueEstimates.test.ts
rename to src/queue/components/job/useQueueEstimates.test.ts
index 2a73078d5..d0a2a0f6e 100644
--- a/src/components/queue/job/useQueueEstimates.test.ts
+++ b/src/queue/components/job/useQueueEstimates.test.ts
@@ -1,8 +1,8 @@
 import { computed, ref } from 'vue'
 import { describe, expect, it } from 'vitest'
 
-import type { TaskItemImpl } from '@/stores/queueStore'
-import type { JobState } from '@/types/queue'
+import type { TaskItemImpl } from '@/queue/stores/queueStore'
+import type { JobState } from '@/queue/types/queue'
 
 import { formatElapsedTime, useQueueEstimates } from './useQueueEstimates'
 import type { UseQueueEstimatesOptions } from './useQueueEstimates'
diff --git a/src/components/queue/job/useQueueEstimates.ts b/src/queue/components/job/useQueueEstimates.ts
similarity index 97%
rename from src/components/queue/job/useQueueEstimates.ts
rename to src/queue/components/job/useQueueEstimates.ts
index c0d9937ba..7b379f924 100644
--- a/src/components/queue/job/useQueueEstimates.ts
+++ b/src/queue/components/job/useQueueEstimates.ts
@@ -2,8 +2,8 @@ import { computed } from 'vue'
 import type { ComputedRef, Ref } from 'vue'
 
 import type { useExecutionStore } from '@/stores/executionStore'
-import type { TaskItemImpl, useQueueStore } from '@/stores/queueStore'
-import type { JobState } from '@/types/queue'
+import type { TaskItemImpl, useQueueStore } from '@/queue/stores/queueStore'
+import type { JobState } from '@/queue/types/queue'
 
 type QueueStore = ReturnType<typeof useQueueStore>
 type ExecutionStore = ReturnType<typeof useExecutionStore>
diff --git a/src/composables/queue/useCompletionSummary.ts b/src/queue/composables/useCompletionSummary.ts
similarity index 96%
rename from src/composables/queue/useCompletionSummary.ts
rename to src/queue/composables/useCompletionSummary.ts
index ea240c430..b0077b1e9 100644
--- a/src/composables/queue/useCompletionSummary.ts
+++ b/src/queue/composables/useCompletionSummary.ts
@@ -1,8 +1,8 @@
 import { computed, ref, watch } from 'vue'
 
 import { useExecutionStore } from '@/stores/executionStore'
-import { useQueueStore } from '@/stores/queueStore'
-import { jobStateFromTask } from '@/utils/queueUtil'
+import { useQueueStore } from '@/queue/stores/queueStore'
+import { jobStateFromTask } from '@/queue/utils/queueUtil'
 
 export type CompletionSummaryMode = 'allSuccess' | 'mixed' | 'allFailed'
 
diff --git a/src/composables/queue/useJobActions.ts b/src/queue/composables/useJobActions.ts
similarity index 88%
rename from src/composables/queue/useJobActions.ts
rename to src/queue/composables/useJobActions.ts
index f5be45399..214ee2e68 100644
--- a/src/composables/queue/useJobActions.ts
+++ b/src/queue/composables/useJobActions.ts
@@ -2,9 +2,9 @@ import { computed, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 
 import { useErrorHandling } from '@/composables/useErrorHandling'
-import type { JobListItem } from '@/composables/queue/useJobList'
-import { useJobMenu } from '@/composables/queue/useJobMenu'
-import type { JobState } from '@/types/queue'
+import type { JobListItem } from '@/queue/composables/useJobList'
+import { useJobMenu } from '@/queue/composables/useJobMenu'
+import type { JobState } from '@/queue/types/queue'
 
 type JobActionKey = 'cancel'
 
diff --git a/src/composables/queue/useJobList.ts b/src/queue/composables/useJobList.ts
similarity index 96%
rename from src/composables/queue/useJobList.ts
rename to src/queue/composables/useJobList.ts
index 47996636b..d307f7a37 100644
--- a/src/composables/queue/useJobList.ts
+++ b/src/queue/composables/useJobList.ts
@@ -1,14 +1,14 @@
 import { computed, onUnmounted, ref, watch } from 'vue'
 import { useI18n } from 'vue-i18n'
 
-import { useQueueProgress } from '@/composables/queue/useQueueProgress'
+import { useQueueProgress } from '@/queue/composables/useQueueProgress'
 import { st } from '@/i18n'
 import { isCloud } from '@/platform/distribution/types'
 import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
 import { useExecutionStore } from '@/stores/executionStore'
-import { useQueueStore } from '@/stores/queueStore'
-import type { TaskItemImpl } from '@/stores/queueStore'
-import type { JobState } from '@/types/queue'
+import { useQueueStore } from '@/queue/stores/queueStore'
+import type { TaskItemImpl } from '@/queue/stores/queueStore'
+import type { JobState } from '@/queue/types/queue'
 import {
   dateKey,
   formatClockTime,
@@ -17,8 +17,8 @@ import {
   isYesterday
 } from '@/utils/dateTimeUtil'
 import { normalizeI18nKey } from '@/utils/formatUtil'
-import { buildJobDisplay } from '@/utils/queueDisplay'
-import { jobStateFromTask } from '@/utils/queueUtil'
+import { buildJobDisplay } from '@/queue/utils/queueDisplay'
+import { jobStateFromTask } from '@/queue/utils/queueUtil'
 
 /** Tabs for job list filtering */
 export const jobTabs = ['All', 'Completed', 'Failed'] as const
diff --git a/src/composables/queue/useJobMenu.ts b/src/queue/composables/useJobMenu.ts
similarity index 98%
rename from src/composables/queue/useJobMenu.ts
rename to src/queue/composables/useJobMenu.ts
index db8a1cbc3..eedf9d577 100644
--- a/src/composables/queue/useJobMenu.ts
+++ b/src/queue/composables/useJobMenu.ts
@@ -1,7 +1,7 @@
 import { computed } from 'vue'
 
 import { downloadFile } from '@/base/common/downloadUtil'
-import type { JobListItem } from '@/composables/queue/useJobList'
+import type { JobListItem } from '@/queue/composables/useJobList'
 import { useCopyToClipboard } from '@/composables/useCopyToClipboard'
 import { st, t } from '@/i18n'
 import { mapTaskOutputToAssetItem } from '@/platform/assets/composables/media/assetMappers'
@@ -19,8 +19,8 @@ import { downloadBlob } from '@/scripts/utils'
 import { useDialogService } from '@/services/dialogService'
 import { useLitegraphService } from '@/services/litegraphService'
 import { useNodeDefStore } from '@/stores/nodeDefStore'
-import { useQueueStore } from '@/stores/queueStore'
-import type { ResultItemImpl, TaskItemImpl } from '@/stores/queueStore'
+import { useQueueStore } from '@/queue/stores/queueStore'
+import type { ResultItemImpl, TaskItemImpl } from '@/queue/stores/queueStore'
 import { createAnnotatedPath } from '@/utils/createAnnotatedPath'
 import { appendJsonExt } from '@/utils/formatUtil'
 
diff --git a/src/composables/queue/useQueueProgress.ts b/src/queue/composables/useQueueProgress.ts
similarity index 100%
rename from src/composables/queue/useQueueProgress.ts
rename to src/queue/composables/useQueueProgress.ts
diff --git a/src/composables/queue/useResultGallery.ts b/src/queue/composables/useResultGallery.ts
similarity index 86%
rename from src/composables/queue/useResultGallery.ts
rename to src/queue/composables/useResultGallery.ts
index 0e9934165..cb2507c37 100644
--- a/src/composables/queue/useResultGallery.ts
+++ b/src/queue/composables/useResultGallery.ts
@@ -1,7 +1,7 @@
 import { ref, shallowRef } from 'vue'
 
-import type { JobListItem } from '@/composables/queue/useJobList'
-import type { ResultItemImpl } from '@/stores/queueStore'
+import type { JobListItem } from '@/queue/composables/useJobList'
+import type { ResultItemImpl } from '@/queue/stores/queueStore'
 
 /**
  * Manages result gallery state and activation for queue items.
diff --git a/src/services/autoQueueService.ts b/src/queue/services/autoQueueService.ts
similarity index 97%
rename from src/services/autoQueueService.ts
rename to src/queue/services/autoQueueService.ts
index ffbc5dede..502428ed7 100644
--- a/src/services/autoQueueService.ts
+++ b/src/queue/services/autoQueueService.ts
@@ -3,7 +3,7 @@ import { app } from '@/scripts/app'
 import {
   useQueuePendingTaskCountStore,
   useQueueSettingsStore
-} from '@/stores/queueStore'
+} from '@/queue/stores/queueStore'
 
 export function setupAutoQueueHandler() {
   const queueCountStore = useQueuePendingTaskCountStore()
diff --git a/src/stores/queueStore.ts b/src/queue/stores/queueStore.ts
similarity index 100%
rename from src/stores/queueStore.ts
rename to src/queue/stores/queueStore.ts
diff --git a/src/types/queue.ts b/src/queue/types/queue.ts
similarity index 100%
rename from src/types/queue.ts
rename to src/queue/types/queue.ts
diff --git a/src/utils/queueDisplay.ts b/src/queue/utils/queueDisplay.ts
similarity index 97%
rename from src/utils/queueDisplay.ts
rename to src/queue/utils/queueDisplay.ts
index e0e0bce18..c93038965 100644
--- a/src/utils/queueDisplay.ts
+++ b/src/queue/utils/queueDisplay.ts
@@ -1,5 +1,5 @@
-import type { TaskItemImpl } from '@/stores/queueStore'
-import type { JobState } from '@/types/queue'
+import type { TaskItemImpl } from '@/queue/stores/queueStore'
+import type { JobState } from '@/queue/types/queue'
 import { formatDuration } from '@/utils/formatUtil'
 import { clampPercentInt, formatPercent0 } from '@/utils/numberUtil'
 
diff --git a/src/utils/queueUtil.ts b/src/queue/utils/queueUtil.ts
similarity index 84%
rename from src/utils/queueUtil.ts
rename to src/queue/utils/queueUtil.ts
index cf9f47b6b..da0e9abe6 100644
--- a/src/utils/queueUtil.ts
+++ b/src/queue/utils/queueUtil.ts
@@ -1,5 +1,5 @@
-import type { TaskItemImpl } from '@/stores/queueStore'
-import type { JobState } from '@/types/queue'
+import type { TaskItemImpl } from '@/queue/stores/queueStore'
+import type { JobState } from '@/queue/types/queue'
 
 /**
  * Map a task to a UI job state, including initialization override.
diff --git a/src/renderer/extensions/vueNodes/widgets/components/WidgetSelectDropdown.vue b/src/renderer/extensions/vueNodes/widgets/components/WidgetSelectDropdown.vue
index f460390a2..b7ea7553c 100644
--- a/src/renderer/extensions/vueNodes/widgets/components/WidgetSelectDropdown.vue
+++ b/src/renderer/extensions/vueNodes/widgets/components/WidgetSelectDropdown.vue
@@ -18,7 +18,7 @@ import { useAssetWidgetData } from '@/renderer/extensions/vueNodes/widgets/compo
 import type { ResultItemType } from '@/schemas/apiSchema'
 import { api } from '@/scripts/api'
 import { useAssetsStore } from '@/stores/assetsStore'
-import { useQueueStore } from '@/stores/queueStore'
+import { useQueueStore } from '@/queue/stores/queueStore'
 import type { SimplifiedWidget } from '@/types/simplifiedWidget'
 import type { AssetKind } from '@/types/widgetTypes'
 import {
diff --git a/src/stores/README.md b/src/stores/README.md
index a24a106e5..2167ffc97 100644
--- a/src/stores/README.md
+++ b/src/stores/README.md
@@ -130,9 +130,6 @@ The following table lists ALL 46 store instances in the system as of 2025-09-01:
 | nodeBookmarkStore.ts | useNodeBookmarkStore | Manages node bookmarks and favorites | Nodes |
 | nodeDefStore.ts | useNodeDefStore | Manages node definitions and schemas | Nodes |
 | nodeDefStore.ts | useNodeFrequencyStore | Tracks node usage frequency | Nodes |
-| queueStore.ts | useQueueStore | Manages execution queue and task history | Execution |
-| queueStore.ts | useQueuePendingTaskCountStore | Tracks pending task counts | Execution |
-| queueStore.ts | useQueueSettingsStore | Manages queue execution settings | Execution |
 | releaseStore.ts | useReleaseStore | Manages application release information | System |
 | serverConfigStore.ts | useServerConfigStore | Handles server configuration | Config |
 | settingStore.ts | useSettingStore | Manages application settings | Config |
@@ -148,6 +145,8 @@ The following table lists ALL 46 store instances in the system as of 2025-09-01:
 | workflowTemplatesStore.ts | useWorkflowTemplatesStore | Manages workflow templates | Workflows |
 | workspaceStore.ts | useWorkspaceStore | Manages overall workspace state | Workspace |
 
+Note: queue stores live in `src/queue/stores/queueStore.ts`.
+
 ### Workspace Stores
 Located in `stores/workspace/`:
 
@@ -386,4 +385,4 @@ describe('useExampleStore', () => {
 })
 ```
 
-For more information on Pinia, refer to the [Pinia documentation](https://pinia.vuejs.org/introduction.html).
\ No newline at end of file
+For more information on Pinia, refer to the [Pinia documentation](https://pinia.vuejs.org/introduction.html).
diff --git a/src/stores/assetsStore.ts b/src/stores/assetsStore.ts
index 634c08a41..46ca45b0f 100644
--- a/src/stores/assetsStore.ts
+++ b/src/stores/assetsStore.ts
@@ -11,7 +11,7 @@ import { isCloud } from '@/platform/distribution/types'
 import type { TaskItem } from '@/schemas/apiSchema'
 import { api } from '@/scripts/api'
 
-import { TaskItemImpl } from './queueStore'
+import { TaskItemImpl } from '@/queue/stores/queueStore'
 
 const INPUT_LIMIT = 100
 
diff --git a/src/stores/workspaceStore.ts b/src/stores/workspaceStore.ts
index 4b5b03df6..6d5bc14b7 100644
--- a/src/stores/workspaceStore.ts
+++ b/src/stores/workspaceStore.ts
@@ -12,7 +12,7 @@ import type { SidebarTabExtension, ToastManager } from '@/types/extensionTypes'
 import { useApiKeyAuthStore } from './apiKeyAuthStore'
 import { useCommandStore } from './commandStore'
 import { useFirebaseAuthStore } from './firebaseAuthStore'
-import { useQueueSettingsStore } from './queueStore'
+import { useQueueSettingsStore } from '@/queue/stores/queueStore'
 import { useBottomPanelStore } from './workspace/bottomPanelStore'
 import { useSidebarTabStore } from './workspace/sidebarTabStore'
 
diff --git a/src/storybook/mocks/useJobActions.ts b/src/storybook/mocks/useJobActions.ts
index d7c2c1be8..f0125e646 100644
--- a/src/storybook/mocks/useJobActions.ts
+++ b/src/storybook/mocks/useJobActions.ts
@@ -1,7 +1,7 @@
 import { ref } from 'vue'
 
-import type { JobAction } from '../../composables/queue/useJobActions'
-import type { JobListItem } from '../../composables/queue/useJobList'
+import type { JobAction } from '@/queue/composables/useJobActions'
+import type { JobListItem } from '@/queue/composables/useJobList'
 
 const actionsByJobId = ref<Record<string, JobAction[]>>({})
 
diff --git a/src/storybook/mocks/useJobList.ts b/src/storybook/mocks/useJobList.ts
index 1f0f76e8d..db73cdfb8 100644
--- a/src/storybook/mocks/useJobList.ts
+++ b/src/storybook/mocks/useJobList.ts
@@ -1,12 +1,12 @@
 import { computed, ref } from 'vue'
 
-import type { TaskItemImpl } from '../../stores/queueStore'
+import type { TaskItemImpl } from '@/queue/stores/queueStore'
 import type {
   JobGroup,
   JobListItem,
   JobSortMode,
   JobTab
-} from '../../composables/queue/useJobList'
+} from '@/queue/composables/useJobList'
 
 const jobItems = ref<JobListItem[]>([])
 
diff --git a/src/views/GraphView.vue b/src/views/GraphView.vue
index 58b428afd..0be9e9f0c 100644
--- a/src/views/GraphView.vue
+++ b/src/views/GraphView.vue
@@ -58,7 +58,7 @@ import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
 import type { StatusWsMessageStatus } from '@/schemas/apiSchema'
 import { api } from '@/scripts/api'
 import { app } from '@/scripts/app'
-import { setupAutoQueueHandler } from '@/services/autoQueueService'
+import { setupAutoQueueHandler } from '@/queue/services/autoQueueService'
 import { useKeybindingService } from '@/services/keybindingService'
 import { useAssetsStore } from '@/stores/assetsStore'
 import { useCommandStore } from '@/stores/commandStore'
@@ -70,7 +70,7 @@ import { useNodeDefStore, useNodeFrequencyStore } from '@/stores/nodeDefStore'
 import {
   useQueuePendingTaskCountStore,
   useQueueStore
-} from '@/stores/queueStore'
+} from '@/queue/stores/queueStore'
 import { useServerConfigStore } from '@/stores/serverConfigStore'
 import { useBottomPanelStore } from '@/stores/workspace/bottomPanelStore'
 import { useColorPaletteStore } from '@/stores/workspace/colorPaletteStore'
diff --git a/src/views/LinearView.vue b/src/views/LinearView.vue
index 4ce74a4d0..e66e335ca 100644
--- a/src/views/LinearView.vue
+++ b/src/views/LinearView.vue
@@ -26,7 +26,7 @@ import WidgetInputNumberInput from '@/renderer/extensions/vueNodes/widgets/compo
 import { app } from '@/scripts/app'
 import { useCommandStore } from '@/stores/commandStore'
 import { useNodeOutputStore } from '@/stores/imagePreviewStore'
-import { useQueueSettingsStore } from '@/stores/queueStore'
+import { useQueueSettingsStore } from '@/queue/stores/queueStore'
 import { isElectron } from '@/utils/envUtil'
 
 const nodeOutputStore = useNodeOutputStore()
diff --git a/tests-ui/tests/components/queue/JobGroupsList.test.ts b/tests-ui/tests/components/queue/JobGroupsList.test.ts
index b9635eca8..c2c5855e2 100644
--- a/tests-ui/tests/components/queue/JobGroupsList.test.ts
+++ b/tests-ui/tests/components/queue/JobGroupsList.test.ts
@@ -2,8 +2,8 @@ import { mount } from '@vue/test-utils'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import { defineComponent, nextTick } from 'vue'
 
-import JobGroupsList from '@/components/queue/job/JobGroupsList.vue'
-import type { JobGroup, JobListItem } from '@/composables/queue/useJobList'
+import JobGroupsList from '@/queue/components/job/JobGroupsList.vue'
+import type { JobGroup, JobListItem } from '@/queue/composables/useJobList'
 
 const QueueJobItemStub = defineComponent({
   name: 'QueueJobItemStub',
@@ -22,7 +22,6 @@ const QueueJobItemStub = defineComponent({
     runningNodeName: { type: String, default: undefined },
     activeDetailsId: { type: String, default: null }
   },
-  emits: ['cancel', 'delete', 'menu', 'view', 'details-enter', 'details-leave'],
   template: '<div class="queue-job-item-stub"></div>'
 })
 
diff --git a/tests-ui/tests/components/queue/useJobErrorReporting.test.ts b/tests-ui/tests/components/queue/useJobErrorReporting.test.ts
index abd444dbe..06908896d 100644
--- a/tests-ui/tests/components/queue/useJobErrorReporting.test.ts
+++ b/tests-ui/tests/components/queue/useJobErrorReporting.test.ts
@@ -3,12 +3,12 @@ import { computed, ref } from 'vue'
 import type { ComputedRef } from 'vue'
 
 import type { ExecutionErrorWsMessage } from '@/schemas/apiSchema'
-import type { TaskItemImpl } from '@/stores/queueStore'
+import type { TaskItemImpl } from '@/queue/stores/queueStore'
 import type {
   JobErrorDialogService,
   UseJobErrorReportingOptions
-} from '@/components/queue/job/useJobErrorReporting'
-import * as jobErrorReporting from '@/components/queue/job/useJobErrorReporting'
+} from '@/queue/components/job/useJobErrorReporting'
+import * as jobErrorReporting from '@/queue/components/job/useJobErrorReporting'
 
 const createExecutionErrorMessage = (
   overrides: Partial<ExecutionErrorWsMessage> = {}
diff --git a/tests-ui/tests/composables/useCompletionSummary.test.ts b/tests-ui/tests/composables/useCompletionSummary.test.ts
index 34ec42ff6..83e293304 100644
--- a/tests-ui/tests/composables/useCompletionSummary.test.ts
+++ b/tests-ui/tests/composables/useCompletionSummary.test.ts
@@ -1,9 +1,9 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { nextTick, reactive } from 'vue'
 
-import { useCompletionSummary } from '@/composables/queue/useCompletionSummary'
+import { useCompletionSummary } from '@/queue/composables/useCompletionSummary'
 import { useExecutionStore } from '@/stores/executionStore'
-import { useQueueStore } from '@/stores/queueStore'
+import { useQueueStore } from '@/queue/stores/queueStore'
 
 type MockTask = {
   displayStatus: 'Completed' | 'Failed' | 'Cancelled' | 'Running' | 'Pending'
@@ -14,7 +14,7 @@ type MockTask = {
   }
 }
 
-vi.mock('@/stores/queueStore', () => {
+vi.mock('@/queue/stores/queueStore', () => {
   const state = reactive({
     runningTasks: [] as MockTask[],
     historyTasks: [] as MockTask[]
diff --git a/tests-ui/tests/composables/useJobList.test.ts b/tests-ui/tests/composables/useJobList.test.ts
index 2e453bcf1..f72353812 100644
--- a/tests-ui/tests/composables/useJobList.test.ts
+++ b/tests-ui/tests/composables/useJobList.test.ts
@@ -3,11 +3,11 @@ import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest'
 import { nextTick, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
 
-import { useJobList } from '@/composables/queue/useJobList'
-import type { JobState } from '@/types/queue'
-import { buildJobDisplay } from '@/utils/queueDisplay'
-import type { BuildJobDisplayCtx } from '@/utils/queueDisplay'
-import type { TaskItemImpl } from '@/stores/queueStore'
+import { useJobList } from '@/queue/composables/useJobList'
+import type { JobState } from '@/queue/types/queue'
+import { buildJobDisplay } from '@/queue/utils/queueDisplay'
+import type { BuildJobDisplayCtx } from '@/queue/utils/queueDisplay'
+import type { TaskItemImpl } from '@/queue/stores/queueStore'
 
 type TestTask = {
   promptId: string
@@ -57,7 +57,7 @@ const ensureProgressRefs = () => {
   if (!currentNodePercent) currentNodePercent = ref(0) as Ref<number>
   return { totalPercent, currentNodePercent }
 }
-vi.mock('@/composables/queue/useQueueProgress', () => ({
+vi.mock('@/queue/composables/useQueueProgress', () => ({
   useQueueProgress: () => {
     ensureProgressRefs()
     return {
@@ -67,7 +67,7 @@ vi.mock('@/composables/queue/useQueueProgress', () => ({
   }
 }))
 
-vi.mock('@/utils/queueDisplay', () => ({
+vi.mock('@/queue/utils/queueDisplay', () => ({
   buildJobDisplay: vi.fn(
     (task: TaskItemImpl, state: JobState, options: BuildJobDisplayCtx) => ({
       primary: `Job ${task.promptId}`,
@@ -80,7 +80,7 @@ vi.mock('@/utils/queueDisplay', () => ({
   )
 }))
 
-vi.mock('@/utils/queueUtil', () => ({
+vi.mock('@/queue/utils/queueUtil', () => ({
   jobStateFromTask: vi.fn(
     (task: TestTask, isInitializing?: boolean): JobState =>
       task.mockState ?? (isInitializing ? 'running' : 'completed')
@@ -102,7 +102,7 @@ const ensureQueueStore = () => {
   }
   return queueStoreMock
 }
-vi.mock('@/stores/queueStore', () => ({
+vi.mock('@/queue/stores/queueStore', () => ({
   useQueueStore: () => {
     return ensureQueueStore()
   }
diff --git a/tests-ui/tests/composables/useJobMenu.test.ts b/tests-ui/tests/composables/useJobMenu.test.ts
index 0bd876951..4c82ab6e4 100644
--- a/tests-ui/tests/composables/useJobMenu.test.ts
+++ b/tests-ui/tests/composables/useJobMenu.test.ts
@@ -2,8 +2,8 @@ import { describe, it, expect, beforeEach, vi } from 'vitest'
 import { nextTick, ref } from 'vue'
 import type { Ref } from 'vue'
 
-import type { JobListItem } from '@/composables/queue/useJobList'
-import type { MenuEntry } from '@/composables/queue/useJobMenu'
+import type { JobListItem } from '@/queue/composables/useJobList'
+import type { MenuEntry } from '@/queue/composables/useJobMenu'
 
 const downloadFileMock = vi.fn()
 vi.mock('@/base/common/downloadUtil', () => ({
@@ -99,7 +99,7 @@ const queueStoreMock = {
   update: vi.fn(),
   delete: vi.fn()
 }
-vi.mock('@/stores/queueStore', () => ({
+vi.mock('@/queue/stores/queueStore', () => ({
   useQueueStore: () => queueStoreMock
 }))
 
@@ -116,7 +116,7 @@ vi.mock('@/utils/formatUtil', () => ({
     appendJsonExtMock(...args)
 }))
 
-import { useJobMenu } from '@/composables/queue/useJobMenu'
+import { useJobMenu } from '@/queue/composables/useJobMenu'
 
 const createJobItem = (overrides: Partial<JobListItem> = {}): JobListItem => ({
   id: overrides.id ?? 'job-1',
diff --git a/tests-ui/tests/composables/useQueueProgress.test.ts b/tests-ui/tests/composables/useQueueProgress.test.ts
index 2f9c194ad..fac4dc234 100644
--- a/tests-ui/tests/composables/useQueueProgress.test.ts
+++ b/tests-ui/tests/composables/useQueueProgress.test.ts
@@ -4,7 +4,7 @@ import { nextTick, ref } from 'vue'
 import type { Ref } from 'vue'
 import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest'
 
-import { useQueueProgress } from '@/composables/queue/useQueueProgress'
+import { useQueueProgress } from '@/queue/composables/useQueueProgress'
 import { formatPercent0 } from '@/utils/numberUtil'
 
 type ProgressValue = number | null
diff --git a/tests-ui/tests/composables/useResultGallery.test.ts b/tests-ui/tests/composables/useResultGallery.test.ts
index 21ab1462e..542c07d1c 100644
--- a/tests-ui/tests/composables/useResultGallery.test.ts
+++ b/tests-ui/tests/composables/useResultGallery.test.ts
@@ -1,7 +1,7 @@
 import { describe, it, expect } from 'vitest'
 
-import { useResultGallery } from '@/composables/queue/useResultGallery'
-import type { JobListItem } from '@/composables/queue/useJobList'
+import { useResultGallery } from '@/queue/composables/useResultGallery'
+import type { JobListItem } from '@/queue/composables/useJobList'
 
 type PreviewLike = { url: string; supportsPreview: boolean }
 
diff --git a/tests-ui/tests/renderer/extensions/vueNodes/widgets/composables/useWidgetRenderer.test.ts b/tests-ui/tests/renderer/extensions/vueNodes/widgets/composables/useWidgetRenderer.test.ts
index c50061582..3276023f5 100644
--- a/tests-ui/tests/renderer/extensions/vueNodes/widgets/composables/useWidgetRenderer.test.ts
+++ b/tests-ui/tests/renderer/extensions/vueNodes/widgets/composables/useWidgetRenderer.test.ts
@@ -22,7 +22,7 @@ const {
   WidgetToggleSwitch
 } = FOR_TESTING
 
-vi.mock('@/stores/queueStore', () => ({
+vi.mock('@/queue/stores/queueStore', () => ({
   useQueueStore: vi.fn(() => ({
     historyTasks: []
   }))
diff --git a/tests-ui/tests/store/assetsStore.test.ts b/tests-ui/tests/store/assetsStore.test.ts
index 9f9d003fa..ec7c3d338 100644
--- a/tests-ui/tests/store/assetsStore.test.ts
+++ b/tests-ui/tests/store/assetsStore.test.ts
@@ -32,7 +32,7 @@ vi.mock('@/platform/distribution/types', () => ({
 }))
 
 // Mock TaskItemImpl
-vi.mock('@/stores/queueStore', () => ({
+vi.mock('@/queue/stores/queueStore', () => ({
   TaskItemImpl: class {
     public flatOutputs: Array<{
       supportsPreview: boolean
diff --git a/tests-ui/tests/store/queueStore.test.ts b/tests-ui/tests/store/queueStore.test.ts
index e01ec5afd..3620ebaa4 100644
--- a/tests-ui/tests/store/queueStore.test.ts
+++ b/tests-ui/tests/store/queueStore.test.ts
@@ -10,7 +10,7 @@ import type {
   TaskStatus
 } from '@/schemas/apiSchema'
 import { api } from '@/scripts/api'
-import { TaskItemImpl, useQueueStore } from '@/stores/queueStore'
+import { TaskItemImpl, useQueueStore } from '@/queue/stores/queueStore'
 
 // Fixture factories
 const createTaskPrompt = (
diff --git a/tests-ui/tests/stores/queueStore.loadWorkflow.test.ts b/tests-ui/tests/stores/queueStore.loadWorkflow.test.ts
index 3ff57f593..bfb45d15c 100644
--- a/tests-ui/tests/stores/queueStore.loadWorkflow.test.ts
+++ b/tests-ui/tests/stores/queueStore.loadWorkflow.test.ts
@@ -3,7 +3,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 import type { ComfyApp } from '@/scripts/app'
 import type { ComfyWorkflowJSON } from '@/platform/workflow/validation/schemas/workflowSchema'
-import { TaskItemImpl } from '@/stores/queueStore'
+import { TaskItemImpl } from '@/queue/stores/queueStore'
 import * as getWorkflowModule from '@/platform/workflow/cloud'
 
 vi.mock('@/platform/distribution/types', () => ({