diff --git a/packages/renderer-vue/src/components.ts b/packages/renderer-vue/src/components.ts
index 3d71d2f1..eaa0fdc4 100644
--- a/packages/renderer-vue/src/components.ts
+++ b/packages/renderer-vue/src/components.ts
@@ -1,9 +1,9 @@
+export { default as Minimap } from "./components/Minimap.vue";
 export { default as Connection } from "./connection/ConnectionView.vue";
 export { default as ConnectionWrapper } from "./connection/ConnectionWrapper.vue";
 export { default as TemporaryConnection } from "./connection/TemporaryConnection.vue";
+export { ContextMenu } from "./contextmenu";
 export { default as Node } from "./node/Node.vue";
 export { default as NodeInterface } from "./node/NodeInterface.vue";
 export { default as NodePalette } from "./nodepalette/NodePalette.vue";
-export { default as ContextMenu } from "./components/ContextMenu.vue";
-export { default as Minimap } from "./components/Minimap.vue";
 export { default as Sidebar } from "./sidebar/Sidebar.vue";
diff --git a/packages/renderer-vue/src/components/ContextMenu.vue b/packages/renderer-vue/src/contextmenu/ContextMenu.vue
similarity index 95%
rename from packages/renderer-vue/src/components/ContextMenu.vue
rename to packages/renderer-vue/src/contextmenu/ContextMenu.vue
index b0390064..bb55798e 100644
--- a/packages/renderer-vue/src/components/ContextMenu.vue
+++ b/packages/renderer-vue/src/contextmenu/ContextMenu.vue
@@ -41,16 +41,9 @@
 </template>
 
 <script setup lang="ts">
-import { computed, Ref, ref, watch } from "vue";
+import { computed, ref, watch } from "vue";
 import { onClickOutside } from "@vueuse/core";
-
-export interface IMenuItem {
-    label?: string;
-    value?: any;
-    isDivider?: boolean;
-    submenu?: IMenuItem[];
-    disabled?: boolean | Readonly<Ref<boolean>>;
-}
+import { IMenuItem } from "./types";
 
 const props = withDefaults(
     defineProps<{
diff --git a/packages/renderer-vue/src/contextmenu/index.ts b/packages/renderer-vue/src/contextmenu/index.ts
new file mode 100644
index 00000000..2f7481fd
--- /dev/null
+++ b/packages/renderer-vue/src/contextmenu/index.ts
@@ -0,0 +1,2 @@
+export { default as ContextMenu } from "./ContextMenu.vue";
+export * from "./types";
diff --git a/packages/renderer-vue/src/contextmenu/types.ts b/packages/renderer-vue/src/contextmenu/types.ts
new file mode 100644
index 00000000..93f43e52
--- /dev/null
+++ b/packages/renderer-vue/src/contextmenu/types.ts
@@ -0,0 +1,9 @@
+import type { Ref } from "vue";
+
+export interface IMenuItem {
+    label?: string;
+    value?: any;
+    isDivider?: boolean;
+    submenu?: IMenuItem[];
+    disabled?: boolean | Readonly<Ref<boolean>>;
+}
diff --git a/packages/renderer-vue/src/editor/Editor.vue b/packages/renderer-vue/src/editor/Editor.vue
index ab5b08fb..5a93167d 100644
--- a/packages/renderer-vue/src/editor/Editor.vue
+++ b/packages/renderer-vue/src/editor/Editor.vue
@@ -90,10 +90,10 @@ import { computed, provide, Ref, ref, toRef } from "vue";
 
 import { AbstractNode } from "@baklavajs/core";
 import { IBaklavaViewModel } from "../viewModel";
+import { providePlugin, useDragMove } from "../utility";
 import { usePanZoom } from "./panZoom";
 import { useTemporaryConnection } from "./temporaryConnection";
-import { useContextMenu } from "../contextMenu";
-import { providePlugin, useDragMove } from "../utility";
+import { useContextMenu } from "./contextMenu";
 
 import Background from "./Background.vue";
 import Node from "../node/Node.vue";
@@ -103,7 +103,7 @@ import Sidebar from "../sidebar/Sidebar.vue";
 import Minimap from "../components/Minimap.vue";
 import NodePalette from "../nodepalette/NodePalette.vue";
 import Toolbar from "../toolbar/Toolbar.vue";
-import ContextMenu from "../components/ContextMenu.vue";
+import ContextMenu from "../contextmenu/ContextMenu.vue";
 
 const props = defineProps<{ viewModel: IBaklavaViewModel }>();
 
diff --git a/packages/renderer-vue/src/contextMenu.ts b/packages/renderer-vue/src/editor/contextMenu.ts
similarity index 95%
rename from packages/renderer-vue/src/contextMenu.ts
rename to packages/renderer-vue/src/editor/contextMenu.ts
index 08edb38e..13a0ba6a 100644
--- a/packages/renderer-vue/src/contextMenu.ts
+++ b/packages/renderer-vue/src/editor/contextMenu.ts
@@ -1,8 +1,8 @@
 import { Ref, computed, ref, reactive } from "vue";
 import { AbstractNode } from "@baklavajs/core";
-import { IMenuItem } from "./components/ContextMenu.vue";
-import { IBaklavaViewModel } from "./viewModel";
-import { useNodeCategories, useTransform } from "./utility";
+import { IMenuItem } from "../contextmenu";
+import { IBaklavaViewModel } from "../viewModel";
+import { useNodeCategories, useTransform } from "../utility";
 
 export function useContextMenu(viewModel: Ref<IBaklavaViewModel>) {
     const show = ref(false);
diff --git a/packages/renderer-vue/src/node/Node.vue b/packages/renderer-vue/src/node/Node.vue
index d7688a72..f805a79b 100644
--- a/packages/renderer-vue/src/node/Node.vue
+++ b/packages/renderer-vue/src/node/Node.vue
@@ -69,7 +69,7 @@ import { ref, computed, nextTick, onUpdated, onMounted, onBeforeUnmount } from "
 import { AbstractNode, GRAPH_NODE_TYPE_PREFIX, IGraphNode } from "@baklavajs/core";
 import { useGraph, useViewModel } from "../utility";
 
-import ContextMenu from "../components/ContextMenu.vue";
+import { ContextMenu } from "../contextmenu";
 import VerticalDots from "../icons/VerticalDots.vue";
 import NodeInterface from "./NodeInterface.vue";
 
diff --git a/packages/renderer-vue/src/nodepalette/PaletteEntry.vue b/packages/renderer-vue/src/nodepalette/PaletteEntry.vue
index 30572e88..8b9ce44c 100644
--- a/packages/renderer-vue/src/nodepalette/PaletteEntry.vue
+++ b/packages/renderer-vue/src/nodepalette/PaletteEntry.vue
@@ -23,7 +23,7 @@
 import { computed, defineComponent, ref } from "vue";
 import { GRAPH_NODE_TYPE_PREFIX } from "@baklavajs/core";
 
-import ContextMenu, { IMenuItem } from "../components/ContextMenu.vue";
+import { IMenuItem, ContextMenu } from "../contextmenu";
 import VerticalDots from "../icons/VerticalDots.vue";
 import { useGraph, useViewModel } from "../utility";