diff --git a/frontend/app/app.tsx b/frontend/app/app.tsx
index f8400db9..07cd24f6 100644
--- a/frontend/app/app.tsx
+++ b/frontend/app/app.tsx
@@ -2,13 +2,13 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { Workspace } from "@/app/workspace/workspace";
-import { getLayoutStateAtomForTab, globalLayoutTransformsMap } from "@/faraday/lib/layoutAtom";
 import { ContextMenuModel } from "@/store/contextmenu";
 import { PLATFORM, WOS, atoms, globalStore, setBlockFocus } from "@/store/global";
 import * as services from "@/store/services";
 import * as keyutil from "@/util/keyutil";
 import * as layoututil from "@/util/layoututil";
 import * as util from "@/util/util";
+import { getLayoutStateAtomForTab, globalLayoutTransformsMap } from "frontend/layout/lib/layoutAtom";
 import * as jotai from "jotai";
 import * as React from "react";
 import { DndProvider } from "react-dnd";
diff --git a/frontend/app/store/global.ts b/frontend/app/store/global.ts
index eabd97e6..723b423d 100644
--- a/frontend/app/store/global.ts
+++ b/frontend/app/store/global.ts
@@ -1,9 +1,14 @@
 // Copyright 2024, Command Line Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-import { LayoutTreeAction, LayoutTreeActionType, LayoutTreeInsertNodeAction, newLayoutNode } from "@/faraday/index";
-import { getLayoutStateAtomForTab } from "@/faraday/lib/layoutAtom";
-import { layoutTreeStateReducer } from "@/faraday/lib/layoutState";
+import {
+    LayoutTreeAction,
+    LayoutTreeActionType,
+    LayoutTreeInsertNodeAction,
+    newLayoutNode,
+} from "frontend/layout/index";
+import { getLayoutStateAtomForTab } from "frontend/layout/lib/layoutAtom";
+import { layoutTreeStateReducer } from "frontend/layout/lib/layoutState";
 
 import { handleIncomingRpcMessage } from "@/app/store/wshrpc";
 import { getWSServerEndpoint, getWebServerEndpoint } from "@/util/endpoints";
diff --git a/frontend/app/tab/tabbar.tsx b/frontend/app/tab/tabbar.tsx
index b918b68d..2b7e73ec 100644
--- a/frontend/app/tab/tabbar.tsx
+++ b/frontend/app/tab/tabbar.tsx
@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { WindowDrag } from "@/element/windowdrag";
-import { deleteLayoutStateAtomForTab } from "@/faraday/lib/layoutAtom";
 import { atoms } from "@/store/global";
 import * as services from "@/store/services";
+import { deleteLayoutStateAtomForTab } from "frontend/layout/lib/layoutAtom";
 import { useAtomValue } from "jotai";
 import { OverlayScrollbars } from "overlayscrollbars";
 import React, { createRef, useCallback, useEffect, useRef, useState } from "react";
diff --git a/frontend/app/tab/tabcontent.tsx b/frontend/app/tab/tabcontent.tsx
index 3ff42f34..7eba645b 100644
--- a/frontend/app/tab/tabcontent.tsx
+++ b/frontend/app/tab/tabcontent.tsx
@@ -8,8 +8,8 @@ import * as WOS from "@/store/wos";
 import * as React from "react";
 
 import { CenteredDiv, CenteredLoadingDiv } from "@/element/quickelems";
-import { TileLayout } from "@/faraday/index";
-import { getLayoutStateAtomForTab } from "@/faraday/lib/layoutAtom";
+import { TileLayout } from "frontend/layout/index";
+import { getLayoutStateAtomForTab } from "frontend/layout/lib/layoutAtom";
 import { useAtomValue } from "jotai";
 import { useMemo } from "react";
 import "./tabcontent.less";
diff --git a/frontend/faraday/index.ts b/frontend/layout/index.ts
similarity index 100%
rename from frontend/faraday/index.ts
rename to frontend/layout/index.ts
diff --git a/frontend/faraday/lib/TileLayout.stories.tsx b/frontend/layout/lib/TileLayout.stories.tsx
similarity index 100%
rename from frontend/faraday/lib/TileLayout.stories.tsx
rename to frontend/layout/lib/TileLayout.stories.tsx
diff --git a/frontend/faraday/lib/TileLayout.tsx b/frontend/layout/lib/TileLayout.tsx
similarity index 100%
rename from frontend/faraday/lib/TileLayout.tsx
rename to frontend/layout/lib/TileLayout.tsx
diff --git a/frontend/faraday/lib/layoutAtom.ts b/frontend/layout/lib/layoutAtom.ts
similarity index 99%
rename from frontend/faraday/lib/layoutAtom.ts
rename to frontend/layout/lib/layoutAtom.ts
index 9fdddbd2..3088acb7 100644
--- a/frontend/faraday/lib/layoutAtom.ts
+++ b/frontend/layout/lib/layoutAtom.ts
@@ -4,7 +4,7 @@
 import { WOS } from "@/app/store/global";
 import { Atom, Getter, PrimitiveAtom, WritableAtom, atom, useAtom } from "jotai";
 import { useCallback } from "react";
-import { layoutTreeStateReducer, newLayoutTreeState } from "./layoutState";
+import { layoutTreeStateReducer, newLayoutTreeState } from "./layoutState.js";
 import {
     LayoutNode,
     LayoutNodeWaveObj,
diff --git a/frontend/faraday/lib/layoutNode.ts b/frontend/layout/lib/layoutNode.ts
similarity index 100%
rename from frontend/faraday/lib/layoutNode.ts
rename to frontend/layout/lib/layoutNode.ts
diff --git a/frontend/faraday/lib/layoutState.ts b/frontend/layout/lib/layoutState.ts
similarity index 100%
rename from frontend/faraday/lib/layoutState.ts
rename to frontend/layout/lib/layoutState.ts
diff --git a/frontend/faraday/lib/model.ts b/frontend/layout/lib/model.ts
similarity index 100%
rename from frontend/faraday/lib/model.ts
rename to frontend/layout/lib/model.ts
diff --git a/frontend/faraday/lib/nodeRefMap.ts b/frontend/layout/lib/nodeRefMap.ts
similarity index 100%
rename from frontend/faraday/lib/nodeRefMap.ts
rename to frontend/layout/lib/nodeRefMap.ts
diff --git a/frontend/faraday/lib/tilelayout.less b/frontend/layout/lib/tilelayout.less
similarity index 100%
rename from frontend/faraday/lib/tilelayout.less
rename to frontend/layout/lib/tilelayout.less
diff --git a/frontend/faraday/lib/tilelayout.stories.less b/frontend/layout/lib/tilelayout.stories.less
similarity index 100%
rename from frontend/faraday/lib/tilelayout.stories.less
rename to frontend/layout/lib/tilelayout.stories.less
diff --git a/frontend/faraday/lib/utils.ts b/frontend/layout/lib/utils.ts
similarity index 100%
rename from frontend/faraday/lib/utils.ts
rename to frontend/layout/lib/utils.ts
diff --git a/frontend/faraday/tests/layoutNode.test.ts b/frontend/layout/tests/layoutNode.test.ts
similarity index 100%
rename from frontend/faraday/tests/layoutNode.test.ts
rename to frontend/layout/tests/layoutNode.test.ts
diff --git a/frontend/faraday/tests/layoutState.test.ts b/frontend/layout/tests/layoutState.test.ts
similarity index 100%
rename from frontend/faraday/tests/layoutState.test.ts
rename to frontend/layout/tests/layoutState.test.ts
diff --git a/frontend/faraday/tests/model.ts b/frontend/layout/tests/model.ts
similarity index 100%
rename from frontend/faraday/tests/model.ts
rename to frontend/layout/tests/model.ts
diff --git a/frontend/faraday/tests/utils.test.ts b/frontend/layout/tests/utils.test.ts
similarity index 100%
rename from frontend/faraday/tests/utils.test.ts
rename to frontend/layout/tests/utils.test.ts
diff --git a/frontend/util/layoututil.ts b/frontend/util/layoututil.ts
index 3a27588b..b118d615 100644
--- a/frontend/util/layoututil.ts
+++ b/frontend/util/layoututil.ts
@@ -1,7 +1,7 @@
 // Copyright 2024, Command Line Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-import { LayoutTreeState } from "@/faraday/index";
+import { LayoutTreeState } from "frontend/layout/index";
 
 function findLeafIdFromBlockId(layoutTree: LayoutTreeState<TabLayoutData>, blockId: string): string {
     if (layoutTree?.leafs == null) {
diff --git a/tsconfig.json b/tsconfig.json
index 09dd412d..729a3620 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -17,7 +17,7 @@
         "paths": {
             "@/app/*": ["frontend/app/*"],
             "@/util/*": ["frontend/util/*"],
-            "@/faraday/*": ["frontend/faraday/*"],
+            "@/layout/*": ["frontend/layout/*"],
             "@/store/*": ["frontend/app/store/*"],
             "@/view/*": ["frontend/app/view/*"],
             "@/element/*": ["frontend/app/element/*"],