diff --git a/packages/excalidraw/components/Actions.tsx b/packages/excalidraw/components/Actions.tsx
index 492fa4f34..9da667848 100644
--- a/packages/excalidraw/components/Actions.tsx
+++ b/packages/excalidraw/components/Actions.tsx
@@ -34,7 +34,7 @@ import { actionToggleZenMode } from "../src/actions";
 
 import { alignActionsPredicate } from "../src/actions/actionAlign";
 import { trackEvent } from "../analytics";
-import { useTunnels } from "../context/tunnels";
+import { useTunnels } from "../src/context/tunnels";
 
 import { t } from "../i18n";
 import {
diff --git a/packages/excalidraw/components/CommandPalette/CommandPalette.tsx b/packages/excalidraw/components/CommandPalette/CommandPalette.tsx
index a5451ae4a..73264d0a7 100644
--- a/packages/excalidraw/components/CommandPalette/CommandPalette.tsx
+++ b/packages/excalidraw/components/CommandPalette/CommandPalette.tsx
@@ -24,7 +24,7 @@ import {
 } from "../../src/actions/actionElementLink";
 import { getShortcutFromShortcutName } from "../../src/actions/shortcuts";
 import { trackEvent } from "../../analytics";
-import { useUIAppState } from "../../context/ui-appState";
+import { useUIAppState } from "../../src/context/ui-appState";
 import { deburr } from "../../deburr";
 import { atom, useAtom, editorJotaiStore } from "../../editor-jotai";
 import { t } from "../../i18n";
diff --git a/packages/excalidraw/components/DefaultSidebar.tsx b/packages/excalidraw/components/DefaultSidebar.tsx
index 4f1aa91e8..156d90e45 100644
--- a/packages/excalidraw/components/DefaultSidebar.tsx
+++ b/packages/excalidraw/components/DefaultSidebar.tsx
@@ -9,8 +9,8 @@ import {
 
 import type { MarkOptional, Merge } from "@excalidraw/common/utility-types";
 
-import { useTunnels } from "../context/tunnels";
-import { useUIAppState } from "../context/ui-appState";
+import { useTunnels } from "../src/context/tunnels";
+import { useUIAppState } from "../src/context/ui-appState";
 
 import "../components/dropdownMenu/DropdownMenu.scss";
 
diff --git a/packages/excalidraw/components/EyeDropper.tsx b/packages/excalidraw/components/EyeDropper.tsx
index f7f98123d..31d1d0781 100644
--- a/packages/excalidraw/components/EyeDropper.tsx
+++ b/packages/excalidraw/components/EyeDropper.tsx
@@ -5,7 +5,7 @@ import { EVENT, KEYS, rgbToHex } from "@excalidraw/common";
 
 import type { ExcalidrawElement } from "@excalidraw/element/types";
 
-import { useUIAppState } from "../context/ui-appState";
+import { useUIAppState } from "../src/context/ui-appState";
 import { atom } from "../editor-jotai";
 import { useCreatePortalContainer } from "../hooks/useCreatePortalContainer";
 import { useOutsideClick } from "../hooks/useOutsideClick";
diff --git a/packages/excalidraw/components/LayerUI.tsx b/packages/excalidraw/components/LayerUI.tsx
index 057d374ea..581c15917 100644
--- a/packages/excalidraw/components/LayerUI.tsx
+++ b/packages/excalidraw/components/LayerUI.tsx
@@ -21,8 +21,8 @@ import Scene from "../scene/Scene";
 import { actionToggleStats } from "../src/actions";
 import { trackEvent } from "../analytics";
 import { isHandToolActive } from "../appState";
-import { TunnelsContext, useInitializeTunnels } from "../context/tunnels";
-import { UIAppStateContext } from "../context/ui-appState";
+import { TunnelsContext, useInitializeTunnels } from "../src/context/tunnels";
+import { UIAppStateContext } from "../src/context/ui-appState";
 import { useAtom, useAtomValue } from "../editor-jotai";
 
 import { t } from "../i18n";
diff --git a/packages/excalidraw/components/LibraryMenu.tsx b/packages/excalidraw/components/LibraryMenu.tsx
index 62bd235c2..49ad12b8e 100644
--- a/packages/excalidraw/components/LibraryMenu.tsx
+++ b/packages/excalidraw/components/LibraryMenu.tsx
@@ -19,7 +19,7 @@ import type {
 } from "@excalidraw/element/types";
 
 import { trackEvent } from "../analytics";
-import { useUIAppState } from "../context/ui-appState";
+import { useUIAppState } from "../src/context/ui-appState";
 import {
   distributeLibraryItemsOnSquareGrid,
   libraryItemsAtom,
diff --git a/packages/excalidraw/components/LibraryMenuHeaderContent.tsx b/packages/excalidraw/components/LibraryMenuHeaderContent.tsx
index 5b003effa..7144b7f3b 100644
--- a/packages/excalidraw/components/LibraryMenuHeaderContent.tsx
+++ b/packages/excalidraw/components/LibraryMenuHeaderContent.tsx
@@ -3,7 +3,7 @@ import { useCallback, useState } from "react";
 
 import { muteFSAbortError } from "@excalidraw/common";
 
-import { useUIAppState } from "../context/ui-appState";
+import { useUIAppState } from "../src/context/ui-appState";
 import { fileOpen } from "../data/filesystem";
 import { saveLibraryAsJSON } from "../data/json";
 import { libraryItemsAtom } from "../data/library";
diff --git a/packages/excalidraw/components/MobileMenu.tsx b/packages/excalidraw/components/MobileMenu.tsx
index afb29a665..9dc157cd9 100644
--- a/packages/excalidraw/components/MobileMenu.tsx
+++ b/packages/excalidraw/components/MobileMenu.tsx
@@ -5,7 +5,7 @@ import { showSelectedShapeActions } from "@excalidraw/element/showSelectedShapeA
 import type { NonDeletedExcalidrawElement } from "@excalidraw/element/types";
 
 import { isHandToolActive } from "../appState";
-import { useTunnels } from "../context/tunnels";
+import { useTunnels } from "../src/context/tunnels";
 import { t } from "../i18n";
 import { calculateScrollCenter } from "../scene";
 import { SCROLLBAR_WIDTH, SCROLLBAR_MARGIN } from "../scene/scrollbars";
diff --git a/packages/excalidraw/components/OverwriteConfirm/OverwriteConfirm.tsx b/packages/excalidraw/components/OverwriteConfirm/OverwriteConfirm.tsx
index f2de877e0..6f870cb1c 100644
--- a/packages/excalidraw/components/OverwriteConfirm/OverwriteConfirm.tsx
+++ b/packages/excalidraw/components/OverwriteConfirm/OverwriteConfirm.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 
-import { useTunnels } from "../../context/tunnels";
+import { useTunnels } from "../../src/context/tunnels";
 import { useAtom } from "../../editor-jotai";
 import { Dialog } from "../Dialog";
 import { FilledButton } from "../FilledButton";
diff --git a/packages/excalidraw/components/Sidebar/Sidebar.tsx b/packages/excalidraw/components/Sidebar/Sidebar.tsx
index d08ba5f59..c4cfc6bc3 100644
--- a/packages/excalidraw/components/Sidebar/Sidebar.tsx
+++ b/packages/excalidraw/components/Sidebar/Sidebar.tsx
@@ -11,7 +11,7 @@ import React, {
 
 import { EVENT, isDevEnv, KEYS, updateObject } from "@excalidraw/common";
 
-import { useUIAppState } from "../../context/ui-appState";
+import { useUIAppState } from "../../src/context/ui-appState";
 import { atom, useSetAtom } from "../../editor-jotai";
 import { useOutsideClick } from "../../hooks/useOutsideClick";
 import { useDevice, useExcalidrawSetAppState } from "../App";
diff --git a/packages/excalidraw/components/Sidebar/SidebarTabs.tsx b/packages/excalidraw/components/Sidebar/SidebarTabs.tsx
index 448840c4a..65d990a93 100644
--- a/packages/excalidraw/components/Sidebar/SidebarTabs.tsx
+++ b/packages/excalidraw/components/Sidebar/SidebarTabs.tsx
@@ -1,6 +1,6 @@
 import * as RadixTabs from "@radix-ui/react-tabs";
 
-import { useUIAppState } from "../../context/ui-appState";
+import { useUIAppState } from "../../src/context/ui-appState";
 import { useExcalidrawSetAppState } from "../App";
 
 export const SidebarTabs = ({
diff --git a/packages/excalidraw/components/Sidebar/SidebarTrigger.tsx b/packages/excalidraw/components/Sidebar/SidebarTrigger.tsx
index 6e8bf374c..60ae08ae9 100644
--- a/packages/excalidraw/components/Sidebar/SidebarTrigger.tsx
+++ b/packages/excalidraw/components/Sidebar/SidebarTrigger.tsx
@@ -1,6 +1,6 @@
 import clsx from "clsx";
 
-import { useUIAppState } from "../../context/ui-appState";
+import { useUIAppState } from "../../src/context/ui-appState";
 import { useExcalidrawSetAppState } from "../App";
 
 import "./SidebarTrigger.scss";
diff --git a/packages/excalidraw/components/TTDDialog/TTDDialog.tsx b/packages/excalidraw/components/TTDDialog/TTDDialog.tsx
index 68d230d24..6e73e52b2 100644
--- a/packages/excalidraw/components/TTDDialog/TTDDialog.tsx
+++ b/packages/excalidraw/components/TTDDialog/TTDDialog.tsx
@@ -5,7 +5,7 @@ import { isFiniteNumber } from "@excalidraw/math";
 import type { NonDeletedExcalidrawElement } from "@excalidraw/element/types";
 
 import { trackEvent } from "../../analytics";
-import { useUIAppState } from "../../context/ui-appState";
+import { useUIAppState } from "../../src/context/ui-appState";
 import { atom, useAtom } from "../../editor-jotai";
 import { t } from "../../i18n";
 import { useApp, useExcalidrawSetAppState } from "../App";
diff --git a/packages/excalidraw/components/TTDDialog/TTDDialogTrigger.tsx b/packages/excalidraw/components/TTDDialog/TTDDialogTrigger.tsx
index 833b659fe..55d7ca919 100644
--- a/packages/excalidraw/components/TTDDialog/TTDDialogTrigger.tsx
+++ b/packages/excalidraw/components/TTDDialog/TTDDialogTrigger.tsx
@@ -1,5 +1,5 @@
 import { trackEvent } from "../../analytics";
-import { useTunnels } from "../../context/tunnels";
+import { useTunnels } from "../../src/context/tunnels";
 import { t } from "../../i18n";
 import { useExcalidrawSetAppState } from "../App";
 import DropdownMenu from "../dropdownMenu/DropdownMenu";
diff --git a/packages/excalidraw/components/footer/Footer.tsx b/packages/excalidraw/components/footer/Footer.tsx
index b6745201a..208bea916 100644
--- a/packages/excalidraw/components/footer/Footer.tsx
+++ b/packages/excalidraw/components/footer/Footer.tsx
@@ -1,7 +1,7 @@
 import clsx from "clsx";
 
 import { actionShortcuts } from "../../src/actions";
-import { useTunnels } from "../../context/tunnels";
+import { useTunnels } from "../../src/context/tunnels";
 import {
   ExitZenModeAction,
   FinalizeAction,
diff --git a/packages/excalidraw/components/footer/FooterCenter.tsx b/packages/excalidraw/components/footer/FooterCenter.tsx
index 6a44581de..51cdf7471 100644
--- a/packages/excalidraw/components/footer/FooterCenter.tsx
+++ b/packages/excalidraw/components/footer/FooterCenter.tsx
@@ -1,7 +1,7 @@
 import clsx from "clsx";
 
-import { useTunnels } from "../../context/tunnels";
-import { useUIAppState } from "../../context/ui-appState";
+import { useTunnels } from "../../src/context/tunnels";
+import { useUIAppState } from "../../src/context/ui-appState";
 
 import "./FooterCenter.scss";
 
diff --git a/packages/excalidraw/components/hoc/withInternalFallback.tsx b/packages/excalidraw/components/hoc/withInternalFallback.tsx
index 298f58dd9..9dfd65623 100644
--- a/packages/excalidraw/components/hoc/withInternalFallback.tsx
+++ b/packages/excalidraw/components/hoc/withInternalFallback.tsx
@@ -1,6 +1,6 @@
 import React, { useLayoutEffect, useRef } from "react";
 
-import { useTunnels } from "../../context/tunnels";
+import { useTunnels } from "../../src/context/tunnels";
 import { atom } from "../../editor-jotai";
 
 export const withInternalFallback = <P,>(
diff --git a/packages/excalidraw/components/live-collaboration/LiveCollaborationTrigger.tsx b/packages/excalidraw/components/live-collaboration/LiveCollaborationTrigger.tsx
index 1aa187167..701fca725 100644
--- a/packages/excalidraw/components/live-collaboration/LiveCollaborationTrigger.tsx
+++ b/packages/excalidraw/components/live-collaboration/LiveCollaborationTrigger.tsx
@@ -3,7 +3,7 @@ import clsx from "clsx";
 import { t } from "../../i18n";
 import { Button } from "../Button";
 import { share } from "../icons";
-import { useUIAppState } from "../../context/ui-appState";
+import { useUIAppState } from "../../src/context/ui-appState";
 
 import "./LiveCollaborationTrigger.scss";
 
diff --git a/packages/excalidraw/components/main-menu/DefaultItems.tsx b/packages/excalidraw/components/main-menu/DefaultItems.tsx
index 017985ed0..b74553367 100644
--- a/packages/excalidraw/components/main-menu/DefaultItems.tsx
+++ b/packages/excalidraw/components/main-menu/DefaultItems.tsx
@@ -14,7 +14,7 @@ import {
 } from "../../src/actions";
 import { getShortcutFromShortcutName } from "../../src/actions/shortcuts";
 import { trackEvent } from "../../analytics";
-import { useUIAppState } from "../../context/ui-appState";
+import { useUIAppState } from "../../src/context/ui-appState";
 import { useSetAtom } from "../../editor-jotai";
 import { useI18n } from "../../i18n";
 import { activeConfirmDialogAtom } from "../ActiveConfirmDialog";
diff --git a/packages/excalidraw/components/main-menu/MainMenu.tsx b/packages/excalidraw/components/main-menu/MainMenu.tsx
index 7c2b5fb4a..6faac8ad4 100644
--- a/packages/excalidraw/components/main-menu/MainMenu.tsx
+++ b/packages/excalidraw/components/main-menu/MainMenu.tsx
@@ -2,8 +2,8 @@ import React from "react";
 
 import { composeEventHandlers } from "@excalidraw/common";
 
-import { useTunnels } from "../../context/tunnels";
-import { useUIAppState } from "../../context/ui-appState";
+import { useTunnels } from "../../src/context/tunnels";
+import { useUIAppState } from "../../src/context/ui-appState";
 import { t } from "../../i18n";
 import { useDevice, useExcalidrawSetAppState } from "../App";
 import { UserList } from "../UserList";
diff --git a/packages/excalidraw/components/welcome-screen/WelcomeScreen.Center.tsx b/packages/excalidraw/components/welcome-screen/WelcomeScreen.Center.tsx
index 3188eddbb..644f94eee 100644
--- a/packages/excalidraw/components/welcome-screen/WelcomeScreen.Center.tsx
+++ b/packages/excalidraw/components/welcome-screen/WelcomeScreen.Center.tsx
@@ -1,7 +1,7 @@
 import { actionLoadScene, actionShortcuts } from "../../src/actions";
 import { getShortcutFromShortcutName } from "../../src/actions/shortcuts";
-import { useTunnels } from "../../context/tunnels";
-import { useUIAppState } from "../../context/ui-appState";
+import { useTunnels } from "../../src/context/tunnels";
+import { useUIAppState } from "../../src/context/ui-appState";
 import { t, useI18n } from "../../i18n";
 import { useDevice, useExcalidrawActionManager } from "../App";
 import { ExcalidrawLogo } from "../ExcalidrawLogo";
diff --git a/packages/excalidraw/components/welcome-screen/WelcomeScreen.Hints.tsx b/packages/excalidraw/components/welcome-screen/WelcomeScreen.Hints.tsx
index e47a5a1d3..70c31848c 100644
--- a/packages/excalidraw/components/welcome-screen/WelcomeScreen.Hints.tsx
+++ b/packages/excalidraw/components/welcome-screen/WelcomeScreen.Hints.tsx
@@ -1,4 +1,4 @@
-import { useTunnels } from "../../context/tunnels";
+import { useTunnels } from "../../src/context/tunnels";
 import { t } from "../../i18n";
 import {
   WelcomeScreenHelpArrow,
diff --git a/packages/excalidraw/hooks/useCreatePortalContainer.ts b/packages/excalidraw/hooks/useCreatePortalContainer.ts
index fb0d24bc3..781d7b644 100644
--- a/packages/excalidraw/hooks/useCreatePortalContainer.ts
+++ b/packages/excalidraw/hooks/useCreatePortalContainer.ts
@@ -3,7 +3,7 @@ import { useState, useLayoutEffect } from "react";
 import { THEME } from "@excalidraw/common";
 
 import { useDevice, useExcalidrawContainer } from "../components/App";
-import { useUIAppState } from "../context/ui-appState";
+import { useUIAppState } from "../src/context/ui-appState";
 
 export const useCreatePortalContainer = (opts?: {
   className?: string;
diff --git a/packages/excalidraw/context/tunnels.ts b/packages/excalidraw/src/context/tunnels.ts
similarity index 100%
rename from packages/excalidraw/context/tunnels.ts
rename to packages/excalidraw/src/context/tunnels.ts
diff --git a/packages/excalidraw/context/ui-appState.ts b/packages/excalidraw/src/context/ui-appState.ts
similarity index 78%
rename from packages/excalidraw/context/ui-appState.ts
rename to packages/excalidraw/src/context/ui-appState.ts
index 174b6e89c..f1806d2d7 100644
--- a/packages/excalidraw/context/ui-appState.ts
+++ b/packages/excalidraw/src/context/ui-appState.ts
@@ -1,6 +1,6 @@
 import React from "react";
 
-import type { UIAppState } from "../types";
+import type { UIAppState } from "../../types";
 
 export const UIAppStateContext = React.createContext<UIAppState>(null!);
 export const useUIAppState = () => React.useContext(UIAppStateContext);