diff --git a/config/mixer.edn b/.old/todo_project1.edn
similarity index 100%
rename from config/mixer.edn
rename to .old/todo_project1.edn
diff --git a/config/clip.edn b/config/clip.edn
deleted file mode 100644
index e69de29b..00000000
diff --git a/config/arranger_keys.edn b/config/keys_arranger.edn
similarity index 100%
rename from config/arranger_keys.edn
rename to config/keys_arranger.edn
diff --git a/config/arranger_keys_clip.edn b/config/keys_arranger_clip.edn
similarity index 100%
rename from config/arranger_keys_clip.edn
rename to config/keys_arranger_clip.edn
diff --git a/config/arranger_keys_mix.edn b/config/keys_arranger_mix.edn
similarity index 100%
rename from config/arranger_keys_mix.edn
rename to config/keys_arranger_mix.edn
diff --git a/config/arranger_keys_scene.edn b/config/keys_arranger_scene.edn
similarity index 100%
rename from config/arranger_keys_scene.edn
rename to config/keys_arranger_scene.edn
diff --git a/config/arranger_keys_track.edn b/config/keys_arranger_track.edn
similarity index 100%
rename from config/arranger_keys_track.edn
rename to config/keys_arranger_track.edn
diff --git a/config/groovebox_keys.edn b/config/keys_groovebox.edn
similarity index 100%
rename from config/groovebox_keys.edn
rename to config/keys_groovebox.edn
diff --git a/config/sampler_keys.edn b/config/keys_sampler.edn
similarity index 100%
rename from config/sampler_keys.edn
rename to config/keys_sampler.edn
diff --git a/config/sequencer_keys.edn b/config/keys_sequencer.edn
similarity index 100%
rename from config/sequencer_keys.edn
rename to config/keys_sequencer.edn
diff --git a/config/plugin-keys.edn b/config/plugin-keys.edn
deleted file mode 100644
index e69de29b..00000000
diff --git a/config/plugin-view.edn b/config/plugin-view.edn
deleted file mode 100644
index e69de29b..00000000
diff --git a/config/arranger.edn b/config/view_arranger.edn
similarity index 100%
rename from config/arranger.edn
rename to config/view_arranger.edn
diff --git a/config/groovebox.edn b/config/view_groovebox.edn
similarity index 100%
rename from config/groovebox.edn
rename to config/view_groovebox.edn
diff --git a/config/sampler.edn b/config/view_sampler.edn
similarity index 100%
rename from config/sampler.edn
rename to config/view_sampler.edn
diff --git a/config/sequencer.edn b/config/view_sequencer.edn
similarity index 100%
rename from config/sequencer.edn
rename to config/view_sequencer.edn
diff --git a/config/transport.edn b/config/view_transport.edn
similarity index 100%
rename from config/transport.edn
rename to config/view_transport.edn
diff --git a/crates/app/src/keys.rs b/crates/app/src/keys.rs
index 9082d642..bbab075d 100644
--- a/crates/app/src/keys.rs
+++ b/crates/app/src/keys.rs
@@ -14,7 +14,7 @@ pub fn handle_arranger (app: &mut Tek, input: &TuiIn) -> Perhaps<bool> {
         }
     }
     // Handle from root keymap
-    if let Some(command) = SourceIter(include_str!("../../../config/arranger_keys.edn"))
+    if let Some(command) = SourceIter(include_str!("../../../config/keys_arranger.edn"))
         .command::<_, TekCommand, _>(app, input)
     {
         if let Some(undo) = command.execute(app)? { app.history.push(undo); }
@@ -22,10 +22,10 @@ pub fn handle_arranger (app: &mut Tek, input: &TuiIn) -> Perhaps<bool> {
     }
     // Handle from selection-dependent keymaps
     if let Some(command) = match app.selected() {
-        Selection::Clip(_, _) => SourceIter(include_str!("../../../config/arranger_keys_clip.edn")),
-        Selection::Track(_)   => SourceIter(include_str!("../../../config/arranger_keys_track.edn")),
-        Selection::Scene(_)   => SourceIter(include_str!("../../../config/arranger_keys_scene.edn")),
-        Selection::Mix        => SourceIter(include_str!("../../../config/arranger_keys_mix.edn")),
+        Selection::Clip(_, _) => SourceIter(include_str!("../../../config/keys_arranger_clip.edn")),
+        Selection::Track(_)   => SourceIter(include_str!("../../../config/keys_arranger_track.edn")),
+        Selection::Scene(_)   => SourceIter(include_str!("../../../config/keys_arranger_scene.edn")),
+        Selection::Mix        => SourceIter(include_str!("../../../config/keys_arranger_mix.edn")),
     }.command::<_, TekCommand, _>(app, input) {
         if let Some(undo) = command.execute(app)? {
             app.history.push(undo);
@@ -39,7 +39,7 @@ pub fn handle_sequencer (app: &mut Tek, input: &TuiIn) -> Perhaps<bool> {
     if app.editor.handle(input)? == Some(true) {
         return Ok(Some(true))
     }
-    if let Some(command) = SourceIter(include_str!("../../../config/sequencer_keys.edn"))
+    if let Some(command) = SourceIter(include_str!("../../../config/keys_sequencer.edn"))
         .command::<_, TekCommand, _>(app, input)
     {
         if let Some(undo) = command.execute(app)? {
@@ -54,7 +54,7 @@ pub fn handle_groovebox (app: &mut Tek, input: &TuiIn) -> Perhaps<bool> {
     if app.editor.handle(input)? == Some(true) {
         return Ok(Some(true))
     }
-    if let Some(command) = SourceIter(include_str!("../../../config/groovebox_keys.edn"))
+    if let Some(command) = SourceIter(include_str!("../../../config/keys_groovebox.edn"))
         .command::<_, TekCommand, _>(app, input)
     {
         if let Some(undo) = command.execute(app)? {
@@ -67,7 +67,7 @@ pub fn handle_groovebox (app: &mut Tek, input: &TuiIn) -> Perhaps<bool> {
 
 pub fn handle_sampler (app: &mut Tek, input: &TuiIn) -> Perhaps<bool> {
     let sampler = app.tracks[0].sampler_mut(0).expect("no sampler");
-    if let Some(command) = SourceIter(include_str!("../../../config/sampler_keys.edn"))
+    if let Some(command) = SourceIter(include_str!("../../../config/keys_sampler.edn"))
         .command::<_, SamplerCommand, _>(sampler, input)
     {
         if let Some(undo) = command.execute(sampler)? {
diff --git a/crates/app/src/view.rs b/crates/app/src/view.rs
index 3dc4fb01..97ad9a75 100644
--- a/crates/app/src/view.rs
+++ b/crates/app/src/view.rs
@@ -868,7 +868,7 @@ impl Modal {
         Bsp::s(Tui::bold(true, "tek!"), Bsp::s("", Map::south(1, options, option)))
     }
     fn view_help (&self) -> impl Content<TuiOut> {
-        let bindings = ||TokenIter::new(include_str!("../../../config/groovebox_keys.edn"))
+        let bindings = ||TokenIter::new(include_str!("../../../config/keys_groovebox.edn"))
             .filter_map(|x|if let Value::Exp(_, iter)=x.value{
                 Some(iter)
             } else {
diff --git a/crates/cli/tek.rs b/crates/cli/tek.rs
index 4d3fd216..a8c131ba 100644
--- a/crates/cli/tek.rs
+++ b/crates/cli/tek.rs
@@ -106,11 +106,11 @@ impl Cli {
                 color: ItemTheme::random(),
                 clock: Clock::new(jack, self.bpm)?,
                 view: SourceIter(match mode {
-                    LaunchMode::Clock           => include_str!("../../config/transport.edn"),
-                    LaunchMode::Sequencer       => include_str!("../../config/sequencer.edn"),
-                    LaunchMode::Groovebox       => include_str!("../../config/groovebox.edn"),
-                    LaunchMode::Arranger { .. } => include_str!("../../config/arranger.edn"),
-                    LaunchMode::Sampler         => include_str!("../../config/sampler.edn"),
+                    LaunchMode::Clock           => include_str!("../../config/view_transport.edn"),
+                    LaunchMode::Sequencer       => include_str!("../../config/view_sequencer.edn"),
+                    LaunchMode::Groovebox       => include_str!("../../config/view_groovebox.edn"),
+                    LaunchMode::Arranger { .. } => include_str!("../../config/view_arranger.edn"),
+                    LaunchMode::Sampler         => include_str!("../../config/view_sampler.edn"),
                     _ => todo!("{mode:?}"),
                 }),
                 pool: match mode {