diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 8488a707c..c3f107bef 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -2667,8 +2667,7 @@ pub mod cmd {
             }
         };
 
-        let mut path = helix_core::runtime_dir();
-        path.push("help");
+        let mut path = helix_core::runtime_dir().join("help/commands");
         path.push(format!("{}.txt", command));
 
         ensure!(path.is_file(), "No help available for '{}'", args.join(" "));
diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs
index fa1082281..a19798bad 100644
--- a/helix-term/src/ui/mod.rs
+++ b/helix-term/src/ui/mod.rs
@@ -233,7 +233,7 @@ pub mod completers {
     }
 
     pub fn help(input: &str) -> Vec<Completion> {
-        let path = helix_core::runtime_dir().join("help");
+        let path = helix_core::runtime_dir().join("help/commands");
         let commands: Vec<String> = std::fs::read_dir(path)
             .map(|entries| {
                 entries
diff --git a/runtime/help/copy_selection_on_next_line.txt b/runtime/help/commands/copy_selection_on_next_line.txt
similarity index 100%
rename from runtime/help/copy_selection_on_next_line.txt
rename to runtime/help/commands/copy_selection_on_next_line.txt
diff --git a/runtime/help/copy_selection_on_prev_line.txt b/runtime/help/commands/copy_selection_on_prev_line.txt
similarity index 100%
rename from runtime/help/copy_selection_on_prev_line.txt
rename to runtime/help/commands/copy_selection_on_prev_line.txt
diff --git a/runtime/help/extend_char_left.txt b/runtime/help/commands/extend_char_left.txt
similarity index 100%
rename from runtime/help/extend_char_left.txt
rename to runtime/help/commands/extend_char_left.txt
diff --git a/runtime/help/extend_char_right.txt b/runtime/help/commands/extend_char_right.txt
similarity index 100%
rename from runtime/help/extend_char_right.txt
rename to runtime/help/commands/extend_char_right.txt
diff --git a/runtime/help/extend_line_down.txt b/runtime/help/commands/extend_line_down.txt
similarity index 100%
rename from runtime/help/extend_line_down.txt
rename to runtime/help/commands/extend_line_down.txt
diff --git a/runtime/help/extend_line_up.txt b/runtime/help/commands/extend_line_up.txt
similarity index 100%
rename from runtime/help/extend_line_up.txt
rename to runtime/help/commands/extend_line_up.txt
diff --git a/runtime/help/extend_next_char.txt b/runtime/help/commands/extend_next_char.txt
similarity index 100%
rename from runtime/help/extend_next_char.txt
rename to runtime/help/commands/extend_next_char.txt
diff --git a/runtime/help/extend_next_word_end.txt b/runtime/help/commands/extend_next_word_end.txt
similarity index 100%
rename from runtime/help/extend_next_word_end.txt
rename to runtime/help/commands/extend_next_word_end.txt
diff --git a/runtime/help/extend_next_word_start.txt b/runtime/help/commands/extend_next_word_start.txt
similarity index 100%
rename from runtime/help/extend_next_word_start.txt
rename to runtime/help/commands/extend_next_word_start.txt
diff --git a/runtime/help/extend_prev_char.txt b/runtime/help/commands/extend_prev_char.txt
similarity index 100%
rename from runtime/help/extend_prev_char.txt
rename to runtime/help/commands/extend_prev_char.txt
diff --git a/runtime/help/extend_prev_word_start.txt b/runtime/help/commands/extend_prev_word_start.txt
similarity index 100%
rename from runtime/help/extend_prev_word_start.txt
rename to runtime/help/commands/extend_prev_word_start.txt
diff --git a/runtime/help/extend_till_char.txt b/runtime/help/commands/extend_till_char.txt
similarity index 100%
rename from runtime/help/extend_till_char.txt
rename to runtime/help/commands/extend_till_char.txt
diff --git a/runtime/help/extend_till_prev_char.txt b/runtime/help/commands/extend_till_prev_char.txt
similarity index 100%
rename from runtime/help/extend_till_prev_char.txt
rename to runtime/help/commands/extend_till_prev_char.txt
diff --git a/runtime/help/find_next_char.txt b/runtime/help/commands/find_next_char.txt
similarity index 100%
rename from runtime/help/find_next_char.txt
rename to runtime/help/commands/find_next_char.txt
diff --git a/runtime/help/find_prev_char.txt b/runtime/help/commands/find_prev_char.txt
similarity index 100%
rename from runtime/help/find_prev_char.txt
rename to runtime/help/commands/find_prev_char.txt
diff --git a/runtime/help/find_till_char.txt b/runtime/help/commands/find_till_char.txt
similarity index 100%
rename from runtime/help/find_till_char.txt
rename to runtime/help/commands/find_till_char.txt
diff --git a/runtime/help/move_char_left.txt b/runtime/help/commands/move_char_left.txt
similarity index 100%
rename from runtime/help/move_char_left.txt
rename to runtime/help/commands/move_char_left.txt
diff --git a/runtime/help/move_char_right.txt b/runtime/help/commands/move_char_right.txt
similarity index 100%
rename from runtime/help/move_char_right.txt
rename to runtime/help/commands/move_char_right.txt
diff --git a/runtime/help/move_line_down.txt b/runtime/help/commands/move_line_down.txt
similarity index 100%
rename from runtime/help/move_line_down.txt
rename to runtime/help/commands/move_line_down.txt
diff --git a/runtime/help/move_line_up.txt b/runtime/help/commands/move_line_up.txt
similarity index 100%
rename from runtime/help/move_line_up.txt
rename to runtime/help/commands/move_line_up.txt
diff --git a/runtime/help/move_next_word_end.txt b/runtime/help/commands/move_next_word_end.txt
similarity index 100%
rename from runtime/help/move_next_word_end.txt
rename to runtime/help/commands/move_next_word_end.txt
diff --git a/runtime/help/move_next_word_start.txt b/runtime/help/commands/move_next_word_start.txt
similarity index 100%
rename from runtime/help/move_next_word_start.txt
rename to runtime/help/commands/move_next_word_start.txt
diff --git a/runtime/help/move_prev_word_start.txt b/runtime/help/commands/move_prev_word_start.txt
similarity index 100%
rename from runtime/help/move_prev_word_start.txt
rename to runtime/help/commands/move_prev_word_start.txt
diff --git a/runtime/help/no_op.txt b/runtime/help/commands/no_op.txt
similarity index 100%
rename from runtime/help/no_op.txt
rename to runtime/help/commands/no_op.txt
diff --git a/runtime/help/till_prev_char.txt b/runtime/help/commands/till_prev_char.txt
similarity index 100%
rename from runtime/help/till_prev_char.txt
rename to runtime/help/commands/till_prev_char.txt