diff --git a/Cargo.lock b/Cargo.lock
index 6fbed75..40e46bf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1862,7 +1862,7 @@ dependencies = [
 [[package]]
 name = "keybindings"
 version = "0.0.1"
-source = "git+https://github.com/ulyssa/modalkit?rev=5ebcaf1#5ebcaf18289526216a4e852a6c2c9ee03709e717"
+source = "git+https://github.com/ulyssa/modalkit?rev=cb8c8aeb9a499b9b16615ce144f9014d78036e01#cb8c8aeb9a499b9b16615ce144f9014d78036e01"
 dependencies = [
  "textwrap",
  "unicode-segmentation",
@@ -2255,7 +2255,7 @@ dependencies = [
 [[package]]
 name = "modalkit"
 version = "0.0.17"
-source = "git+https://github.com/ulyssa/modalkit?rev=5ebcaf1#5ebcaf18289526216a4e852a6c2c9ee03709e717"
+source = "git+https://github.com/ulyssa/modalkit?rev=cb8c8aeb9a499b9b16615ce144f9014d78036e01#cb8c8aeb9a499b9b16615ce144f9014d78036e01"
 dependencies = [
  "anymap2",
  "arboard",
@@ -2276,7 +2276,7 @@ dependencies = [
 [[package]]
 name = "modalkit-ratatui"
 version = "0.0.17"
-source = "git+https://github.com/ulyssa/modalkit?rev=5ebcaf1#5ebcaf18289526216a4e852a6c2c9ee03709e717"
+source = "git+https://github.com/ulyssa/modalkit?rev=cb8c8aeb9a499b9b16615ce144f9014d78036e01#cb8c8aeb9a499b9b16615ce144f9014d78036e01"
 dependencies = [
  "crossterm 0.27.0",
  "intervaltree",
diff --git a/Cargo.toml b/Cargo.toml
index f9e3db5..905c355 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -58,12 +58,12 @@ edit = "0.1.4"
 [dependencies.modalkit]
 version = "0.0.17"
 git = "https://github.com/ulyssa/modalkit"
-rev = "5ebcaf1"
+rev = "cb8c8aeb9a499b9b16615ce144f9014d78036e01"
 
 [dependencies.modalkit-ratatui]
 version = "0.0.17"
 git = "https://github.com/ulyssa/modalkit"
-rev = "5ebcaf1"
+rev = "cb8c8aeb9a499b9b16615ce144f9014d78036e01"
 
 [dependencies.matrix-sdk]
 version = "^0.6.2"
diff --git a/src/base.rs b/src/base.rs
index c0584cb..091ef09 100644
--- a/src/base.rs
+++ b/src/base.rs
@@ -58,8 +58,8 @@ use matrix_sdk::{
 };
 
 use modalkit::{
+    actions::Action,
     editing::{
-        action::{Action, UIError, UIResult},
         application::{
             ApplicationAction,
             ApplicationContentId,
@@ -78,6 +78,7 @@ use modalkit::{
         command::{CommandContext, CommandDescription, VimCommand, VimCommandMachine},
         keybindings::VimMachine,
     },
+    errors::{UIError, UIResult},
     key::TerminalKey,
     keybindings::SequenceStatus,
     prelude::{CommandType, WordStyle},
diff --git a/src/commands.rs b/src/commands.rs
index 2af7d77..9eefe5f 100644
--- a/src/commands.rs
+++ b/src/commands.rs
@@ -604,7 +604,7 @@ pub fn setup_commands() -> ProgramCommands {
 mod tests {
     use super::*;
     use matrix_sdk::ruma::user_id;
-    use modalkit::editing::action::WindowAction;
+    use modalkit::actions::WindowAction;
     use modalkit::editing::context::EditContext;
 
     #[test]
diff --git a/src/keybindings.rs b/src/keybindings.rs
index 7e748a7..1c10bf8 100644
--- a/src/keybindings.rs
+++ b/src/keybindings.rs
@@ -3,7 +3,7 @@
 //! The keybindings are set up here. We define some iamb-specific keybindings, but the default Vim
 //! keys come from [modalkit::env::vim::keybindings].
 use modalkit::{
-    editing::action::WindowAction,
+    actions::WindowAction,
     env::vim::keybindings::{InputStep, VimBindings},
     env::vim::VimMode,
     key::TerminalKey,
diff --git a/src/main.rs b/src/main.rs
index f921672..a32cd67 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -89,30 +89,23 @@ use crate::{
 };
 
 use modalkit::{
-    editing::{
-        action::{
-            Action,
-            Commandable,
-            EditError,
-            EditInfo,
-            Editable,
-            EditorAction,
-            InfoMessage,
-            InsertTextAction,
-            Jumpable,
-            Promptable,
-            Scrollable,
-            TabAction,
-            TabContainer,
-            TabCount,
-            UIError,
-            WindowAction,
-            WindowContainer,
-        },
-        context::Resolve,
-        key::KeyManager,
-        store::Store,
+    actions::{
+        Action,
+        Commandable,
+        Editable,
+        EditorAction,
+        InsertTextAction,
+        Jumpable,
+        Promptable,
+        Scrollable,
+        TabAction,
+        TabContainer,
+        TabCount,
+        WindowAction,
+        WindowContainer,
     },
+    editing::{context::Resolve, key::KeyManager, store::Store},
+    errors::{EditError, UIError},
     key::TerminalKey,
     keybindings::{
         dialog::{Pager, PromptYesNo},
diff --git a/src/windows/mod.rs b/src/windows/mod.rs
index 9a1629d..ead099a 100644
--- a/src/windows/mod.rs
+++ b/src/windows/mod.rs
@@ -33,23 +33,18 @@ use ratatui::{
 };
 
 use modalkit::{
-    editing::{
-        action::{
-            Action,
-            EditError,
-            EditInfo,
-            EditResult,
-            Editable,
-            EditorAction,
-            Jumpable,
-            PromptAction,
-            Promptable,
-            Scrollable,
-            UIError,
-            WindowAction,
-        },
-        completion::CompletionList,
+    actions::{
+        Action,
+        Editable,
+        EditorAction,
+        Jumpable,
+        PromptAction,
+        Promptable,
+        Scrollable,
+        WindowAction,
     },
+    editing::completion::CompletionList,
+    errors::{EditError, EditResult, UIError},
     prelude::*,
 };
 
diff --git a/src/windows/room/chat.rs b/src/windows/room/chat.rs
index 397cd8f..ea15c51 100644
--- a/src/windows/room/chat.rs
+++ b/src/windows/room/chat.rs
@@ -47,26 +47,22 @@ use modalkit_ratatui::{
     WindowOps,
 };
 
+use modalkit::actions::{
+    Action,
+    Editable,
+    EditorAction,
+    Jumpable,
+    PromptAction,
+    Promptable,
+    Scrollable,
+};
 use modalkit::editing::{
-    action::{
-        Action,
-        EditError,
-        EditInfo,
-        EditResult,
-        Editable,
-        EditorAction,
-        InfoMessage,
-        Jumpable,
-        PromptAction,
-        Promptable,
-        Scrollable,
-        UIError,
-    },
     completion::CompletionList,
     context::Resolve,
     history::{self, HistoryList},
     rope::EditRope,
 };
+use modalkit::errors::{EditError, EditResult, UIError};
 use modalkit::prelude::*;
 
 use crate::base::{
diff --git a/src/windows/room/mod.rs b/src/windows/room/mod.rs
index f0bcf91..83493ac 100644
--- a/src/windows/room/mod.rs
+++ b/src/windows/room/mod.rs
@@ -19,23 +19,18 @@ use ratatui::{
     widgets::{Paragraph, StatefulWidget, Widget},
 };
 
-use modalkit::prelude::*;
-use modalkit::{
-    editing::action::{
-        Action,
-        EditInfo,
-        EditResult,
-        Editable,
-        EditorAction,
-        Jumpable,
-        PromptAction,
-        Promptable,
-        Scrollable,
-        UIError,
-    },
-    editing::completion::CompletionList,
-    keybindings::dialog::PromptYesNo,
+use modalkit::actions::{
+    Action,
+    Editable,
+    EditorAction,
+    Jumpable,
+    PromptAction,
+    Promptable,
+    Scrollable,
 };
+use modalkit::errors::{EditResult, UIError};
+use modalkit::prelude::*;
+use modalkit::{editing::completion::CompletionList, keybindings::dialog::PromptYesNo};
 use modalkit_ratatui::{TermOffset, TerminalCursor, WindowOps};
 
 use crate::base::{
diff --git a/src/windows/room/scrollback.rs b/src/windows/room/scrollback.rs
index 2dee293..4a88e78 100644
--- a/src/windows/room/scrollback.rs
+++ b/src/windows/room/scrollback.rs
@@ -14,28 +14,23 @@ use ratatui::{
     widgets::{Paragraph, StatefulWidget, Widget},
 };
 
+use modalkit::actions::{
+    Action,
+    CursorAction,
+    EditAction,
+    Editable,
+    EditorAction,
+    EditorActions,
+    HistoryAction,
+    InsertTextAction,
+    Jumpable,
+    PromptAction,
+    Promptable,
+    Scrollable,
+    Searchable,
+    SelectionAction,
+};
 use modalkit::editing::{
-    action::{
-        Action,
-        CursorAction,
-        EditAction,
-        EditError,
-        EditInfo,
-        EditResult,
-        Editable,
-        EditorAction,
-        EditorActions,
-        HistoryAction,
-        InsertTextAction,
-        Jumpable,
-        PromptAction,
-        Promptable,
-        Scrollable,
-        Searchable,
-        SelectionAction,
-        UIError,
-        UIResult,
-    },
     completion::CompletionList,
     context::Resolve,
     cursor::{CursorGroup, CursorState},
@@ -43,6 +38,7 @@ use modalkit::editing::{
     rope::EditRope,
     store::{RegisterCell, RegisterPutFlags},
 };
+use modalkit::errors::{EditError, EditResult, UIError, UIResult};
 use modalkit::prelude::*;
 
 use crate::{
diff --git a/src/windows/welcome.rs b/src/windows/welcome.rs
index aa0ae81..91bfe37 100644
--- a/src/windows/welcome.rs
+++ b/src/windows/welcome.rs
@@ -5,7 +5,6 @@ use ratatui::{buffer::Buffer, layout::Rect};
 
 use modalkit_ratatui::{textbox::TextBoxState, TermOffset, TerminalCursor, WindowOps};
 
-use modalkit::editing::action::EditInfo;
 use modalkit::editing::completion::CompletionList;
 use modalkit::prelude::*;
 
diff --git a/src/worker.rs b/src/worker.rs
index ef7e719..23fb105 100644
--- a/src/worker.rs
+++ b/src/worker.rs
@@ -77,7 +77,8 @@ use matrix_sdk::{
     Session,
 };
 
-use modalkit::editing::action::{EditInfo, InfoMessage, UIError};
+use modalkit::errors::UIError;
+use modalkit::prelude::{EditInfo, InfoMessage};
 
 use crate::base::Need;
 use crate::{