From acb3bd303b07212b64014b799877034a90d5ae31 Mon Sep 17 00:00:00 2001
From: Red Adaya <red.adaya@gmail.com>
Date: Thu, 8 Feb 2024 13:37:02 +0800
Subject: [PATCH] rename model to models

---
 src/app/app.tsx                                        | 2 +-
 src/app/bookmarks/bookmarks.tsx                        | 2 +-
 src/app/clientsettings/clientsettings.tsx              | 2 +-
 src/app/common/elements/markdown.tsx                   | 2 +-
 src/app/common/elements/resizablesidebar.tsx           | 2 +-
 src/app/common/elements/showwaveshellinstallprompt.tsx | 2 +-
 src/app/common/modals/about.tsx                        | 2 +-
 src/app/common/modals/alert.tsx                        | 2 +-
 src/app/common/modals/clientstop.tsx                   | 2 +-
 src/app/common/modals/createremoteconn.tsx             | 2 +-
 src/app/common/modals/disconnected.tsx                 | 2 +-
 src/app/common/modals/editremoteconn.tsx               | 2 +-
 src/app/common/modals/linesettings.tsx                 | 2 +-
 src/app/common/modals/provider.tsx                     | 2 +-
 src/app/common/modals/screensettings.tsx               | 2 +-
 src/app/common/modals/sessionsettings.tsx              | 2 +-
 src/app/common/modals/tabswitcher.tsx                  | 4 ++--
 src/app/common/modals/tos.tsx                          | 2 +-
 src/app/common/modals/viewremoteconndetail.tsx         | 2 +-
 src/app/common/prompt/prompt.tsx                       | 2 +-
 src/app/connections/connections.tsx                    | 2 +-
 src/app/history/history.tsx                            | 2 +-
 src/app/line/linecomps.tsx                             | 2 +-
 src/app/line/renderer/basicrenderer.tsx                | 2 +-
 src/app/pluginsview/pluginsview.tsx                    | 2 +-
 src/app/sidebar/sidebar.tsx                            | 2 +-
 src/app/workspace/cmdinput/aichat.tsx                  | 2 +-
 src/app/workspace/cmdinput/cmdinput.tsx                | 2 +-
 src/app/workspace/cmdinput/historyinfo.tsx             | 2 +-
 src/app/workspace/cmdinput/infomsg.tsx                 | 2 +-
 src/app/workspace/cmdinput/textareainput.tsx           | 2 +-
 src/app/workspace/screen/screenview.tsx                | 2 +-
 src/app/workspace/screen/tab.tsx                       | 2 +-
 src/app/workspace/screen/tabs.tsx                      | 2 +-
 src/app/workspace/workspaceview.tsx                    | 2 +-
 src/{model => models}/bookmarks.ts                     | 0
 src/{model => models}/clientsettingsview.ts            | 0
 src/{model => models}/cmd.ts                           | 0
 src/{model => models}/connectionsview.ts               | 0
 src/{model => models}/forwardlinecontainer.ts          | 0
 src/{model => models}/historyview.ts                   | 0
 src/{model => models}/index.ts                         | 0
 src/{model => models}/input.ts                         | 0
 src/{model => models}/mainsidebar.ts                   | 0
 src/{model => models}/modals.ts                        | 0
 src/{model => models}/model.ts                         | 0
 src/{model => models}/plugins.ts                       | 0
 src/{model => models}/remotes.ts                       | 0
 src/{model => models}/screen.ts                        | 0
 src/{model => models}/screenlines.ts                   | 0
 src/{model => models}/session.ts                       | 0
 src/{model => models}/speciallinecontainer.ts          | 0
 src/{model => models}/ws.ts                            | 0
 src/plugins/code/code.tsx                              | 2 +-
 src/plugins/core/basicrenderer.tsx                     | 2 +-
 src/plugins/csv/csv.tsx                                | 2 +-
 src/plugins/mustache/mustache.tsx                      | 2 +-
 src/plugins/terminal/term.ts                           | 4 ++--
 src/plugins/terminal/terminal.tsx                      | 2 +-
 src/types/types.ts                                     | 2 +-
 src/util/modelutil.ts                                  | 2 +-
 61 files changed, 45 insertions(+), 45 deletions(-)
 rename src/{model => models}/bookmarks.ts (100%)
 rename src/{model => models}/clientsettingsview.ts (100%)
 rename src/{model => models}/cmd.ts (100%)
 rename src/{model => models}/connectionsview.ts (100%)
 rename src/{model => models}/forwardlinecontainer.ts (100%)
 rename src/{model => models}/historyview.ts (100%)
 rename src/{model => models}/index.ts (100%)
 rename src/{model => models}/input.ts (100%)
 rename src/{model => models}/mainsidebar.ts (100%)
 rename src/{model => models}/modals.ts (100%)
 rename src/{model => models}/model.ts (100%)
 rename src/{model => models}/plugins.ts (100%)
 rename src/{model => models}/remotes.ts (100%)
 rename src/{model => models}/screen.ts (100%)
 rename src/{model => models}/screenlines.ts (100%)
 rename src/{model => models}/session.ts (100%)
 rename src/{model => models}/speciallinecontainer.ts (100%)
 rename src/{model => models}/ws.ts (100%)

diff --git a/src/app/app.tsx b/src/app/app.tsx
index 48295fdcf..2d11394cc 100644
--- a/src/app/app.tsx
+++ b/src/app/app.tsx
@@ -9,7 +9,7 @@ import { If } from "tsx-control-statements/components";
 import dayjs from "dayjs";
 import type { ContextMenuOpts } from "../types/types";
 import localizedFormat from "dayjs/plugin/localizedFormat";
-import { GlobalModel } from "../model";
+import { GlobalModel } from "../models";
 import { isBlank } from "../util/util";
 import { WorkspaceView } from "./workspace/workspaceview";
 import { PluginsView } from "./pluginsview/pluginsview";
diff --git a/src/app/bookmarks/bookmarks.tsx b/src/app/bookmarks/bookmarks.tsx
index fda4ce580..206d38f06 100644
--- a/src/app/bookmarks/bookmarks.tsx
+++ b/src/app/bookmarks/bookmarks.tsx
@@ -8,7 +8,7 @@ import { boundMethod } from "autobind-decorator";
 import { If, For } from "tsx-control-statements/components";
 import cn from "classnames";
 import type { BookmarkType } from "../../types/types";
-import { Model } from "../../model";
+import { Model } from "../../models";
 import { CmdStrCode, Markdown } from "../common/elements";
 
 import { ReactComponent as XmarkIcon } from "../assets/icons/line/xmark.svg";
diff --git a/src/app/clientsettings/clientsettings.tsx b/src/app/clientsettings/clientsettings.tsx
index 932696e1f..3786e594b 100644
--- a/src/app/clientsettings/clientsettings.tsx
+++ b/src/app/clientsettings/clientsettings.tsx
@@ -6,7 +6,7 @@ import * as mobxReact from "mobx-react";
 import * as mobx from "mobx";
 import { boundMethod } from "autobind-decorator";
 import cn from "classnames";
-import { GlobalModel, GlobalCommandRunner, RemotesModel } from "../../model";
+import { GlobalModel, GlobalCommandRunner, RemotesModel } from "../../models";
 import { Toggle, InlineSettingsTextEdit, SettingsError, Dropdown } from "../common/elements";
 import * as types from "../../types/types";
 import { commandRtnHandler, isBlank } from "../../util/util";
diff --git a/src/app/common/elements/markdown.tsx b/src/app/common/elements/markdown.tsx
index 0c3b66577..89ea05a37 100644
--- a/src/app/common/elements/markdown.tsx
+++ b/src/app/common/elements/markdown.tsx
@@ -6,7 +6,7 @@ import * as mobxReact from "mobx-react";
 import ReactMarkdown from "react-markdown";
 import remarkGfm from "remark-gfm";
 import cn from "classnames";
-import { GlobalModel } from "../../../model";
+import { GlobalModel } from "../../../models";
 
 import "./markdown.less";
 
diff --git a/src/app/common/elements/resizablesidebar.tsx b/src/app/common/elements/resizablesidebar.tsx
index 959553fd5..e34f7424c 100644
--- a/src/app/common/elements/resizablesidebar.tsx
+++ b/src/app/common/elements/resizablesidebar.tsx
@@ -6,7 +6,7 @@ import * as mobxReact from "mobx-react";
 import * as mobx from "mobx";
 import { boundMethod } from "autobind-decorator";
 import cn from "classnames";
-import { GlobalModel, GlobalCommandRunner } from "../../../model";
+import { GlobalModel, GlobalCommandRunner } from "../../../models";
 import { MagicLayout } from "../../magiclayout";
 
 import "./resizablesidebar.less";
diff --git a/src/app/common/elements/showwaveshellinstallprompt.tsx b/src/app/common/elements/showwaveshellinstallprompt.tsx
index 60bdec137..42679ecd0 100644
--- a/src/app/common/elements/showwaveshellinstallprompt.tsx
+++ b/src/app/common/elements/showwaveshellinstallprompt.tsx
@@ -1,7 +1,7 @@
 // Copyright 2023, Command Line Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-import { GlobalModel } from "../../../model";
+import { GlobalModel } from "../../../models";
 import * as appconst from "../../appconst";
 
 function ShowWaveShellInstallPrompt(callbackFn: () => void) {
diff --git a/src/app/common/modals/about.tsx b/src/app/common/modals/about.tsx
index e2a144830..c8ab58f74 100644
--- a/src/app/common/modals/about.tsx
+++ b/src/app/common/modals/about.tsx
@@ -5,7 +5,7 @@ import * as React from "react";
 import * as mobxReact from "mobx-react";
 import * as mobx from "mobx";
 import { boundMethod } from "autobind-decorator";
-import { GlobalModel } from "../../../model";
+import { GlobalModel } from "../../../models";
 import { Modal, LinkButton } from "../elements";
 import * as util from "../../../util/util";
 import * as appconst from "../../appconst";
diff --git a/src/app/common/modals/alert.tsx b/src/app/common/modals/alert.tsx
index 1bb6eb6de..b6fbf99c7 100644
--- a/src/app/common/modals/alert.tsx
+++ b/src/app/common/modals/alert.tsx
@@ -6,7 +6,7 @@ import * as mobxReact from "mobx-react";
 import { boundMethod } from "autobind-decorator";
 import { If } from "tsx-control-statements/components";
 import { Markdown, Modal, Button, Checkbox } from "../elements";
-import { GlobalModel, GlobalCommandRunner } from "../../../model";
+import { GlobalModel, GlobalCommandRunner } from "../../../models";
 
 import "./alert.less";
 
diff --git a/src/app/common/modals/clientstop.tsx b/src/app/common/modals/clientstop.tsx
index 39005c559..9b381fe01 100644
--- a/src/app/common/modals/clientstop.tsx
+++ b/src/app/common/modals/clientstop.tsx
@@ -5,7 +5,7 @@ import * as React from "react";
 import * as mobxReact from "mobx-react";
 import { boundMethod } from "autobind-decorator";
 import { If } from "tsx-control-statements/components";
-import { GlobalModel } from "../../../model";
+import { GlobalModel } from "../../../models";
 import { Modal, Button } from "../elements";
 
 import "./clientstop.less";
diff --git a/src/app/common/modals/createremoteconn.tsx b/src/app/common/modals/createremoteconn.tsx
index d8498ebf3..08cb18eca 100644
--- a/src/app/common/modals/createremoteconn.tsx
+++ b/src/app/common/modals/createremoteconn.tsx
@@ -6,7 +6,7 @@ import * as mobxReact from "mobx-react";
 import * as mobx from "mobx";
 import { boundMethod } from "autobind-decorator";
 import { If } from "tsx-control-statements/components";
-import { GlobalModel, GlobalCommandRunner, RemotesModel } from "../../../model";
+import { GlobalModel, GlobalCommandRunner, RemotesModel } from "../../../models";
 import * as T from "../../../types/types";
 import {
     Modal,
diff --git a/src/app/common/modals/disconnected.tsx b/src/app/common/modals/disconnected.tsx
index caae7d292..97f42b695 100644
--- a/src/app/common/modals/disconnected.tsx
+++ b/src/app/common/modals/disconnected.tsx
@@ -5,7 +5,7 @@ import * as React from "react";
 import * as mobxReact from "mobx-react";
 import * as mobx from "mobx";
 import { boundMethod } from "autobind-decorator";
-import { GlobalModel } from "../../../model";
+import { GlobalModel } from "../../../models";
 import { Modal, Button } from "../elements";
 
 import "./disconnected.less";
diff --git a/src/app/common/modals/editremoteconn.tsx b/src/app/common/modals/editremoteconn.tsx
index aaa3e5beb..3184de618 100644
--- a/src/app/common/modals/editremoteconn.tsx
+++ b/src/app/common/modals/editremoteconn.tsx
@@ -6,7 +6,7 @@ import * as mobxReact from "mobx-react";
 import * as mobx from "mobx";
 import { If } from "tsx-control-statements/components";
 import { boundMethod } from "autobind-decorator";
-import { GlobalModel, GlobalCommandRunner, RemotesModel } from "../../../model";
+import { GlobalModel, GlobalCommandRunner, RemotesModel } from "../../../models";
 import * as T from "../../../types/types";
 import { Modal, TextField, InputDecoration, Dropdown, PasswordField, Tooltip } from "../elements";
 import * as util from "../../../util/util";
diff --git a/src/app/common/modals/linesettings.tsx b/src/app/common/modals/linesettings.tsx
index 9d67350f9..8ce648b22 100644
--- a/src/app/common/modals/linesettings.tsx
+++ b/src/app/common/modals/linesettings.tsx
@@ -5,7 +5,7 @@ import * as React from "react";
 import * as mobxReact from "mobx-react";
 import * as mobx from "mobx";
 import { boundMethod } from "autobind-decorator";
-import { GlobalModel, GlobalCommandRunner } from "../../../model";
+import { GlobalModel, GlobalCommandRunner } from "../../../models";
 import { SettingsError, Modal, Dropdown } from "../elements";
 import { LineType, RendererPluginType } from "../../../types/types";
 import { PluginModel } from "../../../plugins/plugins";
diff --git a/src/app/common/modals/provider.tsx b/src/app/common/modals/provider.tsx
index 047eb9e02..dd6b4ec24 100644
--- a/src/app/common/modals/provider.tsx
+++ b/src/app/common/modals/provider.tsx
@@ -3,7 +3,7 @@
 
 import * as React from "react";
 import * as mobxReact from "mobx-react";
-import { GlobalModel } from "../../../model";
+import { GlobalModel } from "../../../models";
 import { TosModal } from "./tos";
 
 @mobxReact.observer
diff --git a/src/app/common/modals/screensettings.tsx b/src/app/common/modals/screensettings.tsx
index fbf336c6d..3f657fc78 100644
--- a/src/app/common/modals/screensettings.tsx
+++ b/src/app/common/modals/screensettings.tsx
@@ -7,7 +7,7 @@ import * as mobx from "mobx";
 import { boundMethod } from "autobind-decorator";
 import { If, For } from "tsx-control-statements/components";
 import cn from "classnames";
-import { GlobalModel, GlobalCommandRunner, Screen } from "../../../model";
+import { GlobalModel, GlobalCommandRunner, Screen } from "../../../models";
 import { Toggle, InlineSettingsTextEdit, SettingsError, Modal, Dropdown, Tooltip } from "../elements";
 import { RemoteType } from "../../../types/types";
 import * as util from "../../../util/util";
diff --git a/src/app/common/modals/sessionsettings.tsx b/src/app/common/modals/sessionsettings.tsx
index d17d7fbb2..e0be3f09c 100644
--- a/src/app/common/modals/sessionsettings.tsx
+++ b/src/app/common/modals/sessionsettings.tsx
@@ -5,7 +5,7 @@ import * as React from "react";
 import * as mobxReact from "mobx-react";
 import * as mobx from "mobx";
 import { boundMethod } from "autobind-decorator";
-import { GlobalModel, GlobalCommandRunner, Session } from "../../../model";
+import { GlobalModel, GlobalCommandRunner, Session } from "../../../models";
 import { Toggle, InlineSettingsTextEdit, SettingsError, Modal, Tooltip } from "../elements";
 import * as util from "../../../util/util";
 import { commandRtnHandler } from "../../../util/util";
diff --git a/src/app/common/modals/tabswitcher.tsx b/src/app/common/modals/tabswitcher.tsx
index 1bd3e9a1d..5a4b213e3 100644
--- a/src/app/common/modals/tabswitcher.tsx
+++ b/src/app/common/modals/tabswitcher.tsx
@@ -7,10 +7,10 @@ import * as mobx from "mobx";
 import { boundMethod } from "autobind-decorator";
 import { For } from "tsx-control-statements/components";
 import cn from "classnames";
-import { GlobalModel, GlobalCommandRunner } from "../../../model";
+import { GlobalModel, GlobalCommandRunner } from "../../../models";
 import { Modal, TextField, InputDecoration, Tooltip } from "../elements";
 import * as util from "../../../util/util";
-import { Screen } from "../../../model";
+import { Screen } from "../../../models";
 import { ReactComponent as SquareIcon } from "../../assets/icons/tab/square.svg";
 
 import "./tabswitcher.less";
diff --git a/src/app/common/modals/tos.tsx b/src/app/common/modals/tos.tsx
index 326952097..3ef78cbf8 100644
--- a/src/app/common/modals/tos.tsx
+++ b/src/app/common/modals/tos.tsx
@@ -4,7 +4,7 @@
 import * as React from "react";
 import * as mobxReact from "mobx-react";
 import { boundMethod } from "autobind-decorator";
-import { GlobalModel, GlobalCommandRunner } from "../../../model";
+import { GlobalModel, GlobalCommandRunner } from "../../../models";
 import { Toggle, Modal, Button } from "../elements";
 import * as util from "../../../util/util";
 import { ClientDataType } from "../../../types/types";
diff --git a/src/app/common/modals/viewremoteconndetail.tsx b/src/app/common/modals/viewremoteconndetail.tsx
index e01125028..bd83dabe7 100644
--- a/src/app/common/modals/viewremoteconndetail.tsx
+++ b/src/app/common/modals/viewremoteconndetail.tsx
@@ -7,7 +7,7 @@ import * as mobx from "mobx";
 import { boundMethod } from "autobind-decorator";
 import { If, For } from "tsx-control-statements/components";
 import cn from "classnames";
-import { GlobalModel, GlobalCommandRunner, RemotesModel } from "../../../model";
+import { GlobalModel, GlobalCommandRunner, RemotesModel } from "../../../models";
 import * as T from "../../../types/types";
 import { Modal, Tooltip, Button, Status } from "../elements";
 import * as util from "../../../util/util";
diff --git a/src/app/common/prompt/prompt.tsx b/src/app/common/prompt/prompt.tsx
index 05e5216fd..8c5642bbf 100644
--- a/src/app/common/prompt/prompt.tsx
+++ b/src/app/common/prompt/prompt.tsx
@@ -6,7 +6,7 @@ import * as mobxReact from "mobx-react";
 import * as mobx from "mobx";
 import dayjs from "dayjs";
 import localizedFormat from "dayjs/plugin/localizedFormat";
-import { GlobalModel, LineContainerModel } from "../../../model";
+import { GlobalModel, LineContainerModel } from "../../../models";
 import type { LineType, RemoteType, RemotePtrType, LineHeightChangeCallbackType } from "../../../types/types";
 import cn from "classnames";
 import { isBlank } from "../../../util/util";
diff --git a/src/app/connections/connections.tsx b/src/app/connections/connections.tsx
index 50ad03f41..0d01f703b 100644
--- a/src/app/connections/connections.tsx
+++ b/src/app/connections/connections.tsx
@@ -7,7 +7,7 @@ import * as mobx from "mobx";
 import { boundMethod } from "autobind-decorator";
 import { If, For } from "tsx-control-statements/components";
 import cn from "classnames";
-import { GlobalModel, RemotesModel, GlobalCommandRunner } from "../../model";
+import { GlobalModel, RemotesModel, GlobalCommandRunner } from "../../models";
 import { Button, Status, ShowWaveShellInstallPrompt } from "../common/elements";
 import * as T from "../../types/types";
 import * as util from "../../util/util";
diff --git a/src/app/history/history.tsx b/src/app/history/history.tsx
index 4dcffcb3c..ddb9ffb16 100644
--- a/src/app/history/history.tsx
+++ b/src/app/history/history.tsx
@@ -8,7 +8,7 @@ import { If, For } from "tsx-control-statements/components";
 import { sprintf } from "sprintf-js";
 import { boundMethod } from "autobind-decorator";
 import cn from "classnames";
-import { GlobalModel, GlobalCommandRunner, Cmd } from "../../model";
+import { GlobalModel, GlobalCommandRunner, Cmd } from "../../models";
 import { HistoryItem, RemotePtrType, LineType, CmdDataType } from "../../types/types";
 import dayjs from "dayjs";
 import localizedFormat from "dayjs/plugin/localizedFormat";
diff --git a/src/app/line/linecomps.tsx b/src/app/line/linecomps.tsx
index 11de19e84..43aa2a580 100644
--- a/src/app/line/linecomps.tsx
+++ b/src/app/line/linecomps.tsx
@@ -9,7 +9,7 @@ import { boundMethod } from "autobind-decorator";
 import dayjs from "dayjs";
 import localizedFormat from "dayjs/plugin/localizedFormat";
 import { If } from "tsx-control-statements/components";
-import { GlobalModel, GlobalCommandRunner, Cmd } from "../../model";
+import { GlobalModel, GlobalCommandRunner, Cmd } from "../../models";
 import { termHeightFromRows } from "../../util/textmeasure";
 import type {
     LineType,
diff --git a/src/app/line/renderer/basicrenderer.tsx b/src/app/line/renderer/basicrenderer.tsx
index 2f85e54c7..010e16eb8 100644
--- a/src/app/line/renderer/basicrenderer.tsx
+++ b/src/app/line/renderer/basicrenderer.tsx
@@ -25,7 +25,7 @@ import type {
 } from "../../../types/types";
 import { debounce } from "throttle-debounce";
 import * as util from "../../../util/util";
-import { GlobalModel } from "../../../model";
+import { GlobalModel } from "../../../models";
 
 type OV<V> = mobx.IObservableValue<V>;
 type CV<V> = mobx.IComputedValue<V>;
diff --git a/src/app/pluginsview/pluginsview.tsx b/src/app/pluginsview/pluginsview.tsx
index 51472e5da..377d8d665 100644
--- a/src/app/pluginsview/pluginsview.tsx
+++ b/src/app/pluginsview/pluginsview.tsx
@@ -5,7 +5,7 @@ import * as React from "react";
 import * as mobxReact from "mobx-react";
 import * as mobx from "mobx";
 import { boundMethod } from "autobind-decorator";
-import { GlobalModel } from "../../model";
+import { GlobalModel } from "../../models";
 import { PluginModel } from "../../plugins/plugins";
 import { Markdown } from "../common/elements";
 
diff --git a/src/app/sidebar/sidebar.tsx b/src/app/sidebar/sidebar.tsx
index 76a0f0e6e..af2363701 100644
--- a/src/app/sidebar/sidebar.tsx
+++ b/src/app/sidebar/sidebar.tsx
@@ -17,7 +17,7 @@ import { ReactComponent as WorkspacesIcon } from "../assets/icons/workspaces.svg
 import { ReactComponent as SettingsIcon } from "../assets/icons/settings.svg";
 
 import localizedFormat from "dayjs/plugin/localizedFormat";
-import { GlobalModel, GlobalCommandRunner, Session } from "../../model";
+import { GlobalModel, GlobalCommandRunner, Session } from "../../models";
 import { isBlank, openLink } from "../../util/util";
 import { ResizableSidebar } from "../common/elements";
 import * as appconst from "../appconst";
diff --git a/src/app/workspace/cmdinput/aichat.tsx b/src/app/workspace/cmdinput/aichat.tsx
index b75aacbc0..8bc3471f9 100644
--- a/src/app/workspace/cmdinput/aichat.tsx
+++ b/src/app/workspace/cmdinput/aichat.tsx
@@ -4,7 +4,7 @@
 import * as React from "react";
 import * as mobxReact from "mobx-react";
 import * as mobx from "mobx";
-import { GlobalModel } from "../../../model";
+import { GlobalModel } from "../../../models";
 import { isBlank } from "../../../util/util";
 import { boundMethod } from "autobind-decorator";
 import cn from "classnames";
diff --git a/src/app/workspace/cmdinput/cmdinput.tsx b/src/app/workspace/cmdinput/cmdinput.tsx
index 6241924a6..1b1789a84 100644
--- a/src/app/workspace/cmdinput/cmdinput.tsx
+++ b/src/app/workspace/cmdinput/cmdinput.tsx
@@ -10,7 +10,7 @@ import cn from "classnames";
 import dayjs from "dayjs";
 import type { RemoteType, RemoteInstanceType, RemotePtrType } from "../../../types/types";
 import localizedFormat from "dayjs/plugin/localizedFormat";
-import { GlobalModel, GlobalCommandRunner, Screen } from "../../../model";
+import { GlobalModel, GlobalCommandRunner, Screen } from "../../../models";
 import { renderCmdText } from "../../common/elements";
 import { TextAreaInput } from "./textareainput";
 import { InfoMsg } from "./infomsg";
diff --git a/src/app/workspace/cmdinput/historyinfo.tsx b/src/app/workspace/cmdinput/historyinfo.tsx
index 59f5c444c..31f70ef13 100644
--- a/src/app/workspace/cmdinput/historyinfo.tsx
+++ b/src/app/workspace/cmdinput/historyinfo.tsx
@@ -11,7 +11,7 @@ import cn from "classnames";
 import dayjs from "dayjs";
 import type { HistoryItem, HistoryQueryOpts } from "../../../types/types";
 import localizedFormat from "dayjs/plugin/localizedFormat";
-import { GlobalModel } from "../../../model";
+import { GlobalModel } from "../../../models";
 import { isBlank } from "../../../util/util";
 
 dayjs.extend(localizedFormat);
diff --git a/src/app/workspace/cmdinput/infomsg.tsx b/src/app/workspace/cmdinput/infomsg.tsx
index 9460266ba..b1a9d1ede 100644
--- a/src/app/workspace/cmdinput/infomsg.tsx
+++ b/src/app/workspace/cmdinput/infomsg.tsx
@@ -7,7 +7,7 @@ import { If, For } from "tsx-control-statements/components";
 import cn from "classnames";
 import dayjs from "dayjs";
 import localizedFormat from "dayjs/plugin/localizedFormat";
-import { GlobalModel } from "../../../model";
+import { GlobalModel } from "../../../models";
 import { makeExternLink } from "../../../util/util";
 
 dayjs.extend(localizedFormat);
diff --git a/src/app/workspace/cmdinput/textareainput.tsx b/src/app/workspace/cmdinput/textareainput.tsx
index 5284deaeb..3f8c03180 100644
--- a/src/app/workspace/cmdinput/textareainput.tsx
+++ b/src/app/workspace/cmdinput/textareainput.tsx
@@ -9,7 +9,7 @@ import * as util from "../../../util/util";
 import { If } from "tsx-control-statements/components";
 import { boundMethod } from "autobind-decorator";
 import cn from "classnames";
-import { GlobalModel, GlobalCommandRunner, Screen } from "../../../model";
+import { GlobalModel, GlobalCommandRunner, Screen } from "../../../models";
 import { getMonoFontSize } from "../../../util/textmeasure";
 import { isModKeyPress, hasNoModifiers } from "../../../util/util";
 import * as appconst from "../../appconst";
diff --git a/src/app/workspace/screen/screenview.tsx b/src/app/workspace/screen/screenview.tsx
index 71aad5871..02e0c4dbd 100644
--- a/src/app/workspace/screen/screenview.tsx
+++ b/src/app/workspace/screen/screenview.tsx
@@ -10,7 +10,7 @@ import { If, For } from "tsx-control-statements/components";
 import cn from "classnames";
 import { debounce } from "throttle-debounce";
 import dayjs from "dayjs";
-import { GlobalCommandRunner, ForwardLineContainer, GlobalModel, ScreenLines, Screen, Session } from "../../../model";
+import { GlobalCommandRunner, ForwardLineContainer, GlobalModel, ScreenLines, Screen, Session } from "../../../models";
 import type { LineType, RenderModeType, LineFactoryProps } from "../../../types/types";
 import * as T from "../../../types/types";
 import localizedFormat from "dayjs/plugin/localizedFormat";
diff --git a/src/app/workspace/screen/tab.tsx b/src/app/workspace/screen/tab.tsx
index 8f3a06054..a1528e7d5 100644
--- a/src/app/workspace/screen/tab.tsx
+++ b/src/app/workspace/screen/tab.tsx
@@ -6,7 +6,7 @@ import * as mobxReact from "mobx-react";
 import * as mobx from "mobx";
 import { boundMethod } from "autobind-decorator";
 import cn from "classnames";
-import { GlobalModel, GlobalCommandRunner, Screen } from "../../../model";
+import { GlobalModel, GlobalCommandRunner, Screen } from "../../../models";
 import { ActionsIcon, StatusIndicator, CenteredIcon } from "../../common/icons/icons";
 import { renderCmdText } from "../../common/elements";
 import { ReactComponent as SquareIcon } from "../../assets/icons/tab/square.svg";
diff --git a/src/app/workspace/screen/tabs.tsx b/src/app/workspace/screen/tabs.tsx
index 572f3a580..de27c5f3c 100644
--- a/src/app/workspace/screen/tabs.tsx
+++ b/src/app/workspace/screen/tabs.tsx
@@ -7,7 +7,7 @@ import * as mobx from "mobx";
 import { sprintf } from "sprintf-js";
 import { boundMethod } from "autobind-decorator";
 import { For } from "tsx-control-statements/components";
-import { GlobalModel, GlobalCommandRunner, Session, Screen } from "../../../model";
+import { GlobalModel, GlobalCommandRunner, Session, Screen } from "../../../models";
 import { ReactComponent as AddIcon } from "../../assets/icons/add.svg";
 import { Reorder } from "framer-motion";
 import { ScreenTab } from "./tab";
diff --git a/src/app/workspace/workspaceview.tsx b/src/app/workspace/workspaceview.tsx
index 76dba77c2..1aeba6e83 100644
--- a/src/app/workspace/workspaceview.tsx
+++ b/src/app/workspace/workspaceview.tsx
@@ -7,7 +7,7 @@ import * as mobx from "mobx";
 import cn from "classnames";
 import dayjs from "dayjs";
 import localizedFormat from "dayjs/plugin/localizedFormat";
-import { GlobalModel } from "../../model";
+import { GlobalModel } from "../../models";
 import { CmdInput } from "./cmdinput/cmdinput";
 import { ScreenView } from "./screen/screenview";
 import { ScreenTabs } from "./screen/tabs";
diff --git a/src/model/bookmarks.ts b/src/models/bookmarks.ts
similarity index 100%
rename from src/model/bookmarks.ts
rename to src/models/bookmarks.ts
diff --git a/src/model/clientsettingsview.ts b/src/models/clientsettingsview.ts
similarity index 100%
rename from src/model/clientsettingsview.ts
rename to src/models/clientsettingsview.ts
diff --git a/src/model/cmd.ts b/src/models/cmd.ts
similarity index 100%
rename from src/model/cmd.ts
rename to src/models/cmd.ts
diff --git a/src/model/connectionsview.ts b/src/models/connectionsview.ts
similarity index 100%
rename from src/model/connectionsview.ts
rename to src/models/connectionsview.ts
diff --git a/src/model/forwardlinecontainer.ts b/src/models/forwardlinecontainer.ts
similarity index 100%
rename from src/model/forwardlinecontainer.ts
rename to src/models/forwardlinecontainer.ts
diff --git a/src/model/historyview.ts b/src/models/historyview.ts
similarity index 100%
rename from src/model/historyview.ts
rename to src/models/historyview.ts
diff --git a/src/model/index.ts b/src/models/index.ts
similarity index 100%
rename from src/model/index.ts
rename to src/models/index.ts
diff --git a/src/model/input.ts b/src/models/input.ts
similarity index 100%
rename from src/model/input.ts
rename to src/models/input.ts
diff --git a/src/model/mainsidebar.ts b/src/models/mainsidebar.ts
similarity index 100%
rename from src/model/mainsidebar.ts
rename to src/models/mainsidebar.ts
diff --git a/src/model/modals.ts b/src/models/modals.ts
similarity index 100%
rename from src/model/modals.ts
rename to src/models/modals.ts
diff --git a/src/model/model.ts b/src/models/model.ts
similarity index 100%
rename from src/model/model.ts
rename to src/models/model.ts
diff --git a/src/model/plugins.ts b/src/models/plugins.ts
similarity index 100%
rename from src/model/plugins.ts
rename to src/models/plugins.ts
diff --git a/src/model/remotes.ts b/src/models/remotes.ts
similarity index 100%
rename from src/model/remotes.ts
rename to src/models/remotes.ts
diff --git a/src/model/screen.ts b/src/models/screen.ts
similarity index 100%
rename from src/model/screen.ts
rename to src/models/screen.ts
diff --git a/src/model/screenlines.ts b/src/models/screenlines.ts
similarity index 100%
rename from src/model/screenlines.ts
rename to src/models/screenlines.ts
diff --git a/src/model/session.ts b/src/models/session.ts
similarity index 100%
rename from src/model/session.ts
rename to src/models/session.ts
diff --git a/src/model/speciallinecontainer.ts b/src/models/speciallinecontainer.ts
similarity index 100%
rename from src/model/speciallinecontainer.ts
rename to src/models/speciallinecontainer.ts
diff --git a/src/model/ws.ts b/src/models/ws.ts
similarity index 100%
rename from src/model/ws.ts
rename to src/models/ws.ts
diff --git a/src/plugins/code/code.tsx b/src/plugins/code/code.tsx
index 8897ec1a9..41fbb470e 100644
--- a/src/plugins/code/code.tsx
+++ b/src/plugins/code/code.tsx
@@ -6,7 +6,7 @@ import * as T from "../../types/types";
 import Editor, { Monaco } from "@monaco-editor/react";
 import type * as MonacoTypes from "monaco-editor/esm/vs/editor/editor.api";
 import { Markdown } from "../../app/common/elements";
-import { GlobalModel, GlobalCommandRunner } from "../../model";
+import { GlobalModel, GlobalCommandRunner } from "../../models";
 import Split from "react-split-it";
 import loader from "@monaco-editor/loader";
 loader.config({ paths: { vs: "./node_modules/monaco-editor/min/vs" } });
diff --git a/src/plugins/core/basicrenderer.tsx b/src/plugins/core/basicrenderer.tsx
index 4b5506a5f..cd228f8fa 100644
--- a/src/plugins/core/basicrenderer.tsx
+++ b/src/plugins/core/basicrenderer.tsx
@@ -20,7 +20,7 @@ import type {
 import * as T from "../../types/types";
 import { debounce, throttle } from "throttle-debounce";
 import * as util from "../../util/util";
-import { GlobalModel } from "../../model";
+import { GlobalModel } from "../../models";
 
 type OV<V> = mobx.IObservableValue<V>;
 type CV<V> = mobx.IComputedValue<V>;
diff --git a/src/plugins/csv/csv.tsx b/src/plugins/csv/csv.tsx
index 2580a5568..bc88ce53d 100644
--- a/src/plugins/csv/csv.tsx
+++ b/src/plugins/csv/csv.tsx
@@ -4,7 +4,7 @@
 import React, { FC, useEffect, useState, useRef, useMemo } from "react";
 import { RendererContext, RendererOpts, LineStateType, RendererModelContainerApi } from "../../types/types";
 import * as T from "../../types/types";
-import { GlobalModel } from "../../model";
+import { GlobalModel } from "../../models";
 import Papa from "papaparse";
 import {
     createColumnHelper,
diff --git a/src/plugins/mustache/mustache.tsx b/src/plugins/mustache/mustache.tsx
index 0112c2b97..371488e9f 100644
--- a/src/plugins/mustache/mustache.tsx
+++ b/src/plugins/mustache/mustache.tsx
@@ -9,7 +9,7 @@ import * as T from "../../types/types";
 import { isBlank } from "../../util/util";
 import mustache from "mustache";
 import * as DOMPurify from "dompurify";
-import { GlobalModel } from "../../model";
+import { GlobalModel } from "../../models";
 
 import "./mustache.less";
 
diff --git a/src/plugins/terminal/term.ts b/src/plugins/terminal/term.ts
index 29084fdc9..aefdea294 100644
--- a/src/plugins/terminal/term.ts
+++ b/src/plugins/terminal/term.ts
@@ -9,8 +9,8 @@ import { sprintf } from "sprintf-js";
 import { boundMethod } from "autobind-decorator";
 import { windowWidthToCols, windowHeightToRows } from "../../util/textmeasure";
 import { boundInt } from "../../util/util";
-import { GlobalModel } from "../../model";
-import { Model } from "../../model/model";
+import { GlobalModel } from "../../models";
+import { Model } from "../../models/model";
 import type {
     TermContextUnion,
     TermOptsType,
diff --git a/src/plugins/terminal/terminal.tsx b/src/plugins/terminal/terminal.tsx
index d085adc27..f4e2eb3a7 100644
--- a/src/plugins/terminal/terminal.tsx
+++ b/src/plugins/terminal/terminal.tsx
@@ -8,7 +8,7 @@ import { boundMethod } from "autobind-decorator";
 import dayjs from "dayjs";
 import localizedFormat from "dayjs/plugin/localizedFormat";
 import { If } from "tsx-control-statements/components";
-import { GlobalModel, LineContainerModel } from "../../model";
+import { GlobalModel, LineContainerModel } from "../../models";
 import { termHeightFromRows } from "../../util/textmeasure";
 import type { LineType } from "../../types/types";
 import cn from "classnames";
diff --git a/src/types/types.ts b/src/types/types.ts
index 782e81a63..b7f4c30c4 100644
--- a/src/types/types.ts
+++ b/src/types/types.ts
@@ -4,7 +4,7 @@
 import * as React from "react";
 import * as mobx from "mobx";
 import { TermWrap } from "../plugins/terminal/term";
-import { Cmd, Model } from "../model";
+import { Cmd, Model } from "../models";
 
 type ShareModeType = "local" | "web";
 type FocusTypeStrs = "input" | "cmd";
diff --git a/src/util/modelutil.ts b/src/util/modelutil.ts
index dd1dc308b..c8161ed9b 100644
--- a/src/util/modelutil.ts
+++ b/src/util/modelutil.ts
@@ -1,5 +1,5 @@
 import { sprintf } from "sprintf-js";
-import { Model } from "../model/model";
+import { Model } from "../models/model";
 import {
     SessionDataType,
     LineType,