diff --git a/app/edn/arranger.edn b/.old/todo_arranger.edn
similarity index 99%
rename from app/edn/arranger.edn
rename to .old/todo_arranger.edn
index d75e4150..81fc7dc7 100644
--- a/app/edn/arranger.edn
+++ b/.old/todo_arranger.edn
@@ -80,3 +80,4 @@
   (@lt     clip swap-prev)
   (@gt     clip swap-next)
   (@l      clip loop-toggle)}
+
diff --git a/app/src/keys.rs b/app/src/keys.rs
index 9f6d4788..25db6d9a 100644
--- a/app/src/keys.rs
+++ b/app/src/keys.rs
@@ -4,11 +4,6 @@ mod keys_ins;   pub use self::keys_ins::*;
 mod keys_outs;  pub use self::keys_outs::*;
 mod keys_scene; pub use self::keys_scene::*;
 mod keys_track; pub use self::keys_track::*;
-pub const KEYS_APP:   &str = include_str!("../edn/keys.edn");
-pub const KEYS_CLIP:  &str = include_str!("../edn/keys_clip.edn");
-pub const KEYS_TRACK: &str = include_str!("../edn/keys_track.edn");
-pub const KEYS_SCENE: &str = include_str!("../edn/keys_scene.edn");
-pub const KEYS_MIX:   &str = include_str!("../edn/keys_mix.edn");
 handle!(TuiIn: |self: Tek, input|Ok({
     // If editing, editor keys take priority
     if self.is_editing() {
diff --git a/cli/view_arranger.edn b/cli/edn/arranger.edn
similarity index 100%
rename from cli/view_arranger.edn
rename to cli/edn/arranger.edn
diff --git a/app/edn/keys.edn b/cli/edn/arranger_keys.edn
similarity index 100%
rename from app/edn/keys.edn
rename to cli/edn/arranger_keys.edn
diff --git a/app/edn/keys_clip.edn b/cli/edn/arranger_keys_clip.edn
similarity index 100%
rename from app/edn/keys_clip.edn
rename to cli/edn/arranger_keys_clip.edn
diff --git a/app/edn/keys_mix.edn b/cli/edn/arranger_keys_mix.edn
similarity index 100%
rename from app/edn/keys_mix.edn
rename to cli/edn/arranger_keys_mix.edn
diff --git a/app/edn/keys_scene.edn b/cli/edn/arranger_keys_scene.edn
similarity index 100%
rename from app/edn/keys_scene.edn
rename to cli/edn/arranger_keys_scene.edn
diff --git a/app/edn/keys_track.edn b/cli/edn/arranger_keys_track.edn
similarity index 100%
rename from app/edn/keys_track.edn
rename to cli/edn/arranger_keys_track.edn
diff --git a/cli/view_groovebox.edn b/cli/edn/groovebox.edn
similarity index 100%
rename from cli/view_groovebox.edn
rename to cli/edn/groovebox.edn
diff --git a/cli/view_sequencer.edn b/cli/edn/sequencer.edn
similarity index 100%
rename from cli/view_sequencer.edn
rename to cli/edn/sequencer.edn
diff --git a/cli/view_transport.edn b/cli/edn/transport.edn
similarity index 100%
rename from cli/view_transport.edn
rename to cli/edn/transport.edn
diff --git a/cli/tek.rs b/cli/tek.rs
index f736cb52..14d0a427 100644
--- a/cli/tek.rs
+++ b/cli/tek.rs
@@ -96,10 +96,10 @@ impl Cli {
             let mut app = Tek {
                 jack: jack.clone(),
                 view: SourceIter(match mode {
-                    Mode::Clock           => include_str!("./view_transport.edn"),
-                    Mode::Sequencer       => include_str!("./view_sequencer.edn"),
-                    Mode::Groovebox       => include_str!("./view_groovebox.edn"),
-                    Mode::Arranger { .. } => include_str!("./view_arranger.edn"),
+                    Mode::Clock           => include_str!("./edn/transport.edn"),
+                    Mode::Sequencer       => include_str!("./edn/sequencer.edn"),
+                    Mode::Groovebox       => include_str!("./edn/groovebox.edn"),
+                    Mode::Arranger { .. } => include_str!("./edn/arranger.edn"),
                     _ => todo!("{mode:?}"),
                 }),
                 pool: match mode {
@@ -121,11 +121,11 @@ impl Cli {
                 },
                 color:      ItemPalette::random(),
                 clock:      Clock::new(jack, self.bpm)?,
-                keys:       SourceIter(KEYS_APP),
-                keys_clip:  SourceIter(KEYS_CLIP),
-                keys_track: SourceIter(KEYS_TRACK),
-                keys_scene: SourceIter(KEYS_SCENE),
-                keys_mix:   SourceIter(KEYS_MIX),
+                keys:       SourceIter(include_str!("./edn/arranger_keys.edn")),
+                keys_clip:  SourceIter(include_str!("./edn/arranger_keys_clip.edn")),
+                keys_track: SourceIter(include_str!("./edn/arranger_keys_track.edn")),
+                keys_scene: SourceIter(include_str!("./edn/arranger_keys_scene.edn")),
+                keys_mix:   SourceIter(include_str!("./edn/arranger_keys_mix.edn")),
                 tracks: match mode {
                     Mode::Sequencer => vec![Track::default()],
                     Mode::Groovebox => vec![Track {
diff --git a/midi/src/keys_clip_length.edn b/midi/edn/keys_clip_length.edn
similarity index 100%
rename from midi/src/keys_clip_length.edn
rename to midi/edn/keys_clip_length.edn
diff --git a/midi/src/keys_clip_rename.edn b/midi/edn/keys_clip_rename.edn
similarity index 100%
rename from midi/src/keys_clip_rename.edn
rename to midi/edn/keys_clip_rename.edn
diff --git a/midi/src/keys_edit.edn b/midi/edn/keys_edit.edn
similarity index 100%
rename from midi/src/keys_edit.edn
rename to midi/edn/keys_edit.edn
diff --git a/midi/src/keys_pool.edn b/midi/edn/keys_pool.edn
similarity index 100%
rename from midi/src/keys_pool.edn
rename to midi/edn/keys_pool.edn
diff --git a/midi/src/keys_pool_file.edn b/midi/edn/keys_pool_file.edn
similarity index 100%
rename from midi/src/keys_pool_file.edn
rename to midi/edn/keys_pool_file.edn
diff --git a/midi/src/piano-view-h.edn b/midi/edn/piano-view-h.edn
similarity index 100%
rename from midi/src/piano-view-h.edn
rename to midi/edn/piano-view-h.edn
diff --git a/midi/src/piano-view-v.edn b/midi/edn/piano-view-v.edn
similarity index 100%
rename from midi/src/piano-view-v.edn
rename to midi/edn/piano-view-v.edn
diff --git a/midi/src/view_pool.edn b/midi/edn/view_pool.edn
similarity index 100%
rename from midi/src/view_pool.edn
rename to midi/edn/view_pool.edn
diff --git a/midi/src/lib.rs b/midi/src/lib.rs
index 8954960a..c3f1e713 100644
--- a/midi/src/lib.rs
+++ b/midi/src/lib.rs
@@ -30,11 +30,11 @@ pub(crate) use std::fmt::Debug;
 
 pub use ::midly; pub(crate) use ::midly::{*, num::*, live::*};
 
-pub(crate) const KEYS_EDIT:   &str = include_str!("keys_edit.edn");
-pub(crate) const KEYS_POOL:   &str = include_str!("keys_pool.edn");
-pub(crate) const KEYS_FILE:   &str = include_str!("keys_pool_file.edn");
-pub(crate) const KEYS_LENGTH: &str = include_str!("keys_clip_length.edn");
-pub(crate) const KEYS_RENAME: &str = include_str!("keys_clip_rename.edn");
+pub(crate) const KEYS_EDIT:   &str = include_str!("../edn/keys_edit.edn");
+pub(crate) const KEYS_POOL:   &str = include_str!("../edn/keys_pool.edn");
+pub(crate) const KEYS_FILE:   &str = include_str!("../edn/keys_pool_file.edn");
+pub(crate) const KEYS_LENGTH: &str = include_str!("../edn/keys_clip_length.edn");
+pub(crate) const KEYS_RENAME: &str = include_str!("../edn/keys_clip_rename.edn");
 
 /// Add "all notes off" to the start of a buffer.
 pub fn all_notes_off (output: &mut [Vec<Vec<u8>>]) {