diff --git a/src/components/graph/GraphCanvas.vue b/src/components/graph/GraphCanvas.vue
index e0a2cb2db..45024b6f6 100644
--- a/src/components/graph/GraphCanvas.vue
+++ b/src/components/graph/GraphCanvas.vue
@@ -14,7 +14,7 @@
 <script setup lang="ts">
 import SideToolBar from '@/components/sidebar/SideToolBar.vue'
 import LiteGraphCanvasSplitterOverlay from '@/components/LiteGraphCanvasSplitterOverlay.vue'
-import NodeSearchboxPopover from '@/components/NodeSearchBoxPopover.vue'
+import NodeSearchboxPopover from '@/components/searchbox/NodeSearchBoxPopover.vue'
 import NodeTooltip from '@/components/graph/NodeTooltip.vue'
 import { ref, computed, onUnmounted, watch, onMounted } from 'vue'
 import { app as comfyApp } from '@/scripts/app'
diff --git a/src/components/NodePreview.vue b/src/components/node/NodePreview.vue
similarity index 100%
rename from src/components/NodePreview.vue
rename to src/components/node/NodePreview.vue
diff --git a/src/components/NodeSourceChip.vue b/src/components/node/NodeSourceChip.vue
similarity index 100%
rename from src/components/NodeSourceChip.vue
rename to src/components/node/NodeSourceChip.vue
diff --git a/src/components/NodeSearchBox.vue b/src/components/searchbox/NodeSearchBox.vue
similarity index 93%
rename from src/components/NodeSearchBox.vue
rename to src/components/searchbox/NodeSearchBox.vue
index cfa041492..1b7ca08f3 100644
--- a/src/components/NodeSearchBox.vue
+++ b/src/components/searchbox/NodeSearchBox.vue
@@ -54,13 +54,13 @@
 
 <script setup lang="ts">
 import { computed, onMounted, ref } from 'vue'
-import AutoCompletePlus from './primevueOverride/AutoCompletePlus.vue'
+import AutoCompletePlus from '@/components/primevueOverride/AutoCompletePlus.vue'
 import Chip from 'primevue/chip'
 import Badge from 'primevue/badge'
-import NodeSearchFilter from '@/components/NodeSearchFilter.vue'
-import NodeSourceChip from '@/components/NodeSourceChip.vue'
+import NodeSearchFilter from '@/components/searchbox/NodeSearchFilter.vue'
+import NodeSourceChip from '@/components/node/NodeSourceChip.vue'
 import { type FilterAndValue } from '@/services/nodeSearchService'
-import NodePreview from './NodePreview.vue'
+import NodePreview from '@/components/node/NodePreview.vue'
 import { ComfyNodeDefImpl, useNodeDefStore } from '@/stores/nodeDefStore'
 
 const props = defineProps({
diff --git a/src/components/NodeSearchBoxPopover.vue b/src/components/searchbox/NodeSearchBoxPopover.vue
similarity index 100%
rename from src/components/NodeSearchBoxPopover.vue
rename to src/components/searchbox/NodeSearchBoxPopover.vue
diff --git a/src/components/NodeSearchFilter.vue b/src/components/searchbox/NodeSearchFilter.vue
similarity index 100%
rename from src/components/NodeSearchFilter.vue
rename to src/components/searchbox/NodeSearchFilter.vue
diff --git a/src/components/sidebar/tabs/NodeLibrarySideBarTab.vue b/src/components/sidebar/tabs/NodeLibrarySideBarTab.vue
index ce5452d70..12a4998a5 100644
--- a/src/components/sidebar/tabs/NodeLibrarySideBarTab.vue
+++ b/src/components/sidebar/tabs/NodeLibrarySideBarTab.vue
@@ -73,7 +73,7 @@ import { ComfyNodeDefImpl, useNodeDefStore } from '@/stores/nodeDefStore'
 import { computed, ref } from 'vue'
 import type { TreeNode } from 'primevue/treenode'
 import TreePlus from '@/components/primevueOverride/TreePlus.vue'
-import NodePreview from '@/components/NodePreview.vue'
+import NodePreview from '@/components/node/NodePreview.vue'
 import SideBarTabTemplate from '@/components/sidebar/tabs/SideBarTabTemplate.vue'
 
 const nodeDefStore = useNodeDefStore()