From d926422c67539e217bf007366cc4d0a9b16714d4 Mon Sep 17 00:00:00 2001
From: unspeaker <hora.nqma@protonmail.com>
Date: Sun, 29 Dec 2024 00:10:30 +0100
Subject: [PATCH] flatten workspace into 1 crate
---
{crates/tek.old => .old}/Cargo.toml | 0
{crates/tek.old => .old}/README.md | 0
{crates/tek.old => .old}/example.edn | 0
{crates/tek.old => .old}/src/app.rs | 0
{crates/tek.old => .old}/src/app_focus.rs | 0
{crates/tek.old => .old}/src/app_paths.rs | 0
{crates/tek.old => .old}/src/cli.rs | 0
{crates/tek.old => .old}/src/control.rs | 0
{crates/tek.old => .old}/src/edn.rs | 0
{crates/tek.old => .old}/src/help.rs | 0
{crates/tek.old => .old}/src/main.rs | 0
{crates/tek.old => .old}/src/setup.rs | 0
Cargo.lock | 39 +---------
Cargo.toml | 71 +++++++++++++++++--
{crates/cli/src => bin}/cli_arranger.rs | 0
{crates/cli/src => bin}/cli_groovebox.rs | 0
{crates/cli/src => bin}/cli_sampler.rs | 0
{crates/cli/src => bin}/cli_sequencer.rs | 0
{crates/cli/src => bin}/cli_transport.rs | 0
{crates/cli/src => bin}/lib.rs | 0
{crates/cli/src => bin}/todo_cli_mixer.rs | 0
{crates/cli/src => bin}/todo_cli_plugin.rs | 0
{crates/cli/src => bin}/todo_cli_sampler.rs | 0
crates/cli/Cargo.toml | 40 -----------
crates/edn/Cargo.toml | 8 ---
crates/tek/Cargo.toml | 31 --------
.../tek/examples => examples}/demo.rs.fixme | 0
.../examples => examples}/demo_bsp.rs.fixme | 0
.../midi_import.rs.fixme | 0
{crates/tek/examples => examples}/mixer.edn | 0
.../tek/examples => examples}/sequencer.edn | 0
{crates/tek => src}/README.md | 0
{crates/tek/src => src}/api.rs | 0
{crates/tek => src}/architecture.svg | 0
{crates/tek/src => src}/arranger.rs | 0
.../src => src}/arranger/arranger_command.rs | 0
.../tek/src => src}/arranger/arranger_h.rs | 0
.../tek/src => src}/arranger/arranger_mode.rs | 0
.../src => src}/arranger/arranger_scene.rs | 0
.../src => src}/arranger/arranger_select.rs | 0
.../src => src}/arranger/arranger_track.rs | 0
.../tek/src => src}/arranger/arranger_v.rs | 0
.../arranger/arranger_v/v_clips.rs | 0
.../arranger/arranger_v/v_cursor.rs | 0
.../src => src}/arranger/arranger_v/v_head.rs | 0
.../src => src}/arranger/arranger_v/v_io.rs | 0
.../src => src}/arranger/arranger_v/v_sep.rs | 0
{crates/tek/src => src}/audio.rs | 0
{crates/tek/src => src}/core.rs | 0
{crates/tek/src => src}/core/color.rs | 0
{crates/tek/src => src}/core/command.rs | 0
{crates/tek/src => src}/core/engine.rs | 0
{crates/tek/src => src}/core/focus.rs | 0
{crates/tek/src => src}/core/input.rs | 0
{crates/tek/src => src}/core/output.rs | 0
{crates/tek/src => src}/core/test.rs | 0
crates/edn/src/lib.rs => src/edn.rs | 3 +-
{crates/tek/src => src}/groovebox.rs | 0
{crates/tek/src => src}/jack.rs | 0
{crates/tek/src => src}/jack/activate.rs | 0
{crates/tek/src => src}/jack/client.rs | 0
{crates/tek/src => src}/jack/jack_event.rs | 0
{crates/tek/src => src}/jack/ports.rs | 0
{crates/tek/src => src}/lib.rs | 0
{crates/tek/src => src}/meter.rs | 0
{crates/tek/src => src}/midi.rs | 0
{crates/tek/src => src}/midi/midi_clip.rs | 0
{crates/tek/src => src}/midi/midi_editor.rs | 0
{crates/tek/src => src}/midi/midi_launch.rs | 0
{crates/tek/src => src}/midi/midi_note.rs | 0
{crates/tek/src => src}/midi/midi_play.rs | 0
{crates/tek/src => src}/midi/midi_point.rs | 0
{crates/tek/src => src}/midi/midi_pool.rs | 0
{crates/tek/src => src}/midi/midi_range.rs | 0
{crates/tek/src => src}/midi/midi_rec.rs | 0
{crates/tek/src => src}/midi/midi_view.rs | 0
{crates/tek/src => src}/mixer.rs | 0
{crates/tek/src => src}/piano_h.rs | 0
.../tek/src => src}/piano_h/piano_h_cursor.rs | 0
.../tek/src => src}/piano_h/piano_h_keys.rs | 0
.../tek/src => src}/piano_h/piano_h_notes.rs | 0
.../tek/src => src}/piano_h/piano_h_time.rs | 0
{crates/tek/src => src}/piano_v.rs | 0
{crates/tek/src => src}/plugin.rs | 0
{crates/tek/src => src}/plugin/lv2.rs | 0
{crates/tek/src => src}/plugin/lv2_gui.rs | 0
{crates/tek/src => src}/plugin/lv2_tui.rs | 0
{crates/tek/src => src}/plugin/vst2_tui.rs | 0
{crates/tek/src => src}/plugin/vst3_tui.rs | 0
{crates/tek/src => src}/pool.rs | 0
{crates/tek/src => src}/pool/phrase_length.rs | 0
{crates/tek/src => src}/pool/phrase_rename.rs | 0
.../tek/src => src}/pool/phrase_selector.rs | 0
{crates/tek/src => src}/sampler.rs | 0
{crates/tek/src => src}/sampler/sample.rs | 0
.../tek/src => src}/sampler/sample_import.rs | 0
.../tek/src => src}/sampler/sample_viewer.rs | 0
.../tek/src => src}/sampler/sampler_tui.rs | 0
{crates/tek/src => src}/sampler/voice.rs | 0
{crates/tek/src => src}/sequencer.rs | 0
{crates/tek/src => src}/space.rs | 0
{crates/tek/src => src}/space/align.rs | 0
{crates/tek/src => src}/space/bsp.rs | 0
{crates/tek/src => src}/space/collect.rs | 0
{crates/tek/src => src}/space/cond.rs | 0
{crates/tek/src => src}/space/fill.rs | 0
{crates/tek/src => src}/space/fixed.rs | 0
{crates/tek/src => src}/space/inset_outset.rs | 0
{crates/tek/src => src}/space/layers.rs | 0
{crates/tek/src => src}/space/map_reduce.rs | 0
{crates/tek/src => src}/space/measure.rs | 0
{crates/tek/src => src}/space/min_max.rs | 0
{crates/tek/src => src}/space/push_pull.rs | 0
{crates/tek/src => src}/space/scroll.rs | 0
{crates/tek/src => src}/space/shrink_grow.rs | 0
{crates/tek/src => src}/space/split.rs | 0
{crates/tek/src => src}/space/stack.rs | 0
{crates/tek/src => src}/status.rs | 0
.../tek/src => src}/status/status_arranger.rs | 0
{crates/tek/src => src}/status/status_edit.rs | 0
.../src => src}/status/status_groovebox.rs | 0
.../src => src}/status/status_sequencer.rs | 0
{crates/tek/src => src}/test.rs | 0
{crates/tek/src => src}/time.rs | 0
{crates/tek/src => src}/time/clock.rs | 0
{crates/tek/src => src}/time/moment.rs | 0
{crates/tek/src => src}/time/perf.rs | 0
{crates/tek/src => src}/time/pulse.rs | 0
{crates/tek/src => src}/time/sr.rs | 0
{crates/tek/src => src}/time/unit.rs | 0
{crates/tek/src => src}/transport.rs | 0
{crates/tek/src => src}/tui.rs | 0
{crates/tek/src => src}/tui/file_browser.rs | 0
{crates/tek/src => src}/tui/tui_border.rs | 0
{crates/tek/src => src}/tui/tui_input.rs | 0
{crates/tek/src => src}/tui/tui_output.rs | 0
{crates/tek/src => src}/tui/tui_style.rs | 0
{crates/tek/src => src}/tui/tui_theme.rs | 0
{crates/suil => suil}/Cargo.toml | 0
{crates/suil => suil}/build.rs | 0
{crates/suil => suil}/src/bound.rs | 0
{crates/suil => suil}/src/gtk.rs | 0
{crates/suil => suil}/src/lib.rs | 0
{crates/suil => suil}/src/test.rs | 0
{crates/suil => suil}/stdbool.h | 0
{crates/suil => suil}/stdint.h | 0
{crates/suil => suil}/wrapper.h | 0
147 files changed, 66 insertions(+), 126 deletions(-)
rename {crates/tek.old => .old}/Cargo.toml (100%)
rename {crates/tek.old => .old}/README.md (100%)
rename {crates/tek.old => .old}/example.edn (100%)
rename {crates/tek.old => .old}/src/app.rs (100%)
rename {crates/tek.old => .old}/src/app_focus.rs (100%)
rename {crates/tek.old => .old}/src/app_paths.rs (100%)
rename {crates/tek.old => .old}/src/cli.rs (100%)
rename {crates/tek.old => .old}/src/control.rs (100%)
rename {crates/tek.old => .old}/src/edn.rs (100%)
rename {crates/tek.old => .old}/src/help.rs (100%)
rename {crates/tek.old => .old}/src/main.rs (100%)
rename {crates/tek.old => .old}/src/setup.rs (100%)
rename {crates/cli/src => bin}/cli_arranger.rs (100%)
rename {crates/cli/src => bin}/cli_groovebox.rs (100%)
rename {crates/cli/src => bin}/cli_sampler.rs (100%)
rename {crates/cli/src => bin}/cli_sequencer.rs (100%)
rename {crates/cli/src => bin}/cli_transport.rs (100%)
rename {crates/cli/src => bin}/lib.rs (100%)
rename {crates/cli/src => bin}/todo_cli_mixer.rs (100%)
rename {crates/cli/src => bin}/todo_cli_plugin.rs (100%)
rename {crates/cli/src => bin}/todo_cli_sampler.rs (100%)
delete mode 100644 crates/cli/Cargo.toml
delete mode 100644 crates/edn/Cargo.toml
delete mode 100644 crates/tek/Cargo.toml
rename {crates/tek/examples => examples}/demo.rs.fixme (100%)
rename {crates/tek/examples => examples}/demo_bsp.rs.fixme (100%)
rename {crates/tek/examples => examples}/midi_import.rs.fixme (100%)
rename {crates/tek/examples => examples}/mixer.edn (100%)
rename {crates/tek/examples => examples}/sequencer.edn (100%)
rename {crates/tek => src}/README.md (100%)
rename {crates/tek/src => src}/api.rs (100%)
rename {crates/tek => src}/architecture.svg (100%)
rename {crates/tek/src => src}/arranger.rs (100%)
rename {crates/tek/src => src}/arranger/arranger_command.rs (100%)
rename {crates/tek/src => src}/arranger/arranger_h.rs (100%)
rename {crates/tek/src => src}/arranger/arranger_mode.rs (100%)
rename {crates/tek/src => src}/arranger/arranger_scene.rs (100%)
rename {crates/tek/src => src}/arranger/arranger_select.rs (100%)
rename {crates/tek/src => src}/arranger/arranger_track.rs (100%)
rename {crates/tek/src => src}/arranger/arranger_v.rs (100%)
rename {crates/tek/src => src}/arranger/arranger_v/v_clips.rs (100%)
rename {crates/tek/src => src}/arranger/arranger_v/v_cursor.rs (100%)
rename {crates/tek/src => src}/arranger/arranger_v/v_head.rs (100%)
rename {crates/tek/src => src}/arranger/arranger_v/v_io.rs (100%)
rename {crates/tek/src => src}/arranger/arranger_v/v_sep.rs (100%)
rename {crates/tek/src => src}/audio.rs (100%)
rename {crates/tek/src => src}/core.rs (100%)
rename {crates/tek/src => src}/core/color.rs (100%)
rename {crates/tek/src => src}/core/command.rs (100%)
rename {crates/tek/src => src}/core/engine.rs (100%)
rename {crates/tek/src => src}/core/focus.rs (100%)
rename {crates/tek/src => src}/core/input.rs (100%)
rename {crates/tek/src => src}/core/output.rs (100%)
rename {crates/tek/src => src}/core/test.rs (100%)
rename crates/edn/src/lib.rs => src/edn.rs (99%)
rename {crates/tek/src => src}/groovebox.rs (100%)
rename {crates/tek/src => src}/jack.rs (100%)
rename {crates/tek/src => src}/jack/activate.rs (100%)
rename {crates/tek/src => src}/jack/client.rs (100%)
rename {crates/tek/src => src}/jack/jack_event.rs (100%)
rename {crates/tek/src => src}/jack/ports.rs (100%)
rename {crates/tek/src => src}/lib.rs (100%)
rename {crates/tek/src => src}/meter.rs (100%)
rename {crates/tek/src => src}/midi.rs (100%)
rename {crates/tek/src => src}/midi/midi_clip.rs (100%)
rename {crates/tek/src => src}/midi/midi_editor.rs (100%)
rename {crates/tek/src => src}/midi/midi_launch.rs (100%)
rename {crates/tek/src => src}/midi/midi_note.rs (100%)
rename {crates/tek/src => src}/midi/midi_play.rs (100%)
rename {crates/tek/src => src}/midi/midi_point.rs (100%)
rename {crates/tek/src => src}/midi/midi_pool.rs (100%)
rename {crates/tek/src => src}/midi/midi_range.rs (100%)
rename {crates/tek/src => src}/midi/midi_rec.rs (100%)
rename {crates/tek/src => src}/midi/midi_view.rs (100%)
rename {crates/tek/src => src}/mixer.rs (100%)
rename {crates/tek/src => src}/piano_h.rs (100%)
rename {crates/tek/src => src}/piano_h/piano_h_cursor.rs (100%)
rename {crates/tek/src => src}/piano_h/piano_h_keys.rs (100%)
rename {crates/tek/src => src}/piano_h/piano_h_notes.rs (100%)
rename {crates/tek/src => src}/piano_h/piano_h_time.rs (100%)
rename {crates/tek/src => src}/piano_v.rs (100%)
rename {crates/tek/src => src}/plugin.rs (100%)
rename {crates/tek/src => src}/plugin/lv2.rs (100%)
rename {crates/tek/src => src}/plugin/lv2_gui.rs (100%)
rename {crates/tek/src => src}/plugin/lv2_tui.rs (100%)
rename {crates/tek/src => src}/plugin/vst2_tui.rs (100%)
rename {crates/tek/src => src}/plugin/vst3_tui.rs (100%)
rename {crates/tek/src => src}/pool.rs (100%)
rename {crates/tek/src => src}/pool/phrase_length.rs (100%)
rename {crates/tek/src => src}/pool/phrase_rename.rs (100%)
rename {crates/tek/src => src}/pool/phrase_selector.rs (100%)
rename {crates/tek/src => src}/sampler.rs (100%)
rename {crates/tek/src => src}/sampler/sample.rs (100%)
rename {crates/tek/src => src}/sampler/sample_import.rs (100%)
rename {crates/tek/src => src}/sampler/sample_viewer.rs (100%)
rename {crates/tek/src => src}/sampler/sampler_tui.rs (100%)
rename {crates/tek/src => src}/sampler/voice.rs (100%)
rename {crates/tek/src => src}/sequencer.rs (100%)
rename {crates/tek/src => src}/space.rs (100%)
rename {crates/tek/src => src}/space/align.rs (100%)
rename {crates/tek/src => src}/space/bsp.rs (100%)
rename {crates/tek/src => src}/space/collect.rs (100%)
rename {crates/tek/src => src}/space/cond.rs (100%)
rename {crates/tek/src => src}/space/fill.rs (100%)
rename {crates/tek/src => src}/space/fixed.rs (100%)
rename {crates/tek/src => src}/space/inset_outset.rs (100%)
rename {crates/tek/src => src}/space/layers.rs (100%)
rename {crates/tek/src => src}/space/map_reduce.rs (100%)
rename {crates/tek/src => src}/space/measure.rs (100%)
rename {crates/tek/src => src}/space/min_max.rs (100%)
rename {crates/tek/src => src}/space/push_pull.rs (100%)
rename {crates/tek/src => src}/space/scroll.rs (100%)
rename {crates/tek/src => src}/space/shrink_grow.rs (100%)
rename {crates/tek/src => src}/space/split.rs (100%)
rename {crates/tek/src => src}/space/stack.rs (100%)
rename {crates/tek/src => src}/status.rs (100%)
rename {crates/tek/src => src}/status/status_arranger.rs (100%)
rename {crates/tek/src => src}/status/status_edit.rs (100%)
rename {crates/tek/src => src}/status/status_groovebox.rs (100%)
rename {crates/tek/src => src}/status/status_sequencer.rs (100%)
rename {crates/tek/src => src}/test.rs (100%)
rename {crates/tek/src => src}/time.rs (100%)
rename {crates/tek/src => src}/time/clock.rs (100%)
rename {crates/tek/src => src}/time/moment.rs (100%)
rename {crates/tek/src => src}/time/perf.rs (100%)
rename {crates/tek/src => src}/time/pulse.rs (100%)
rename {crates/tek/src => src}/time/sr.rs (100%)
rename {crates/tek/src => src}/time/unit.rs (100%)
rename {crates/tek/src => src}/transport.rs (100%)
rename {crates/tek/src => src}/tui.rs (100%)
rename {crates/tek/src => src}/tui/file_browser.rs (100%)
rename {crates/tek/src => src}/tui/tui_border.rs (100%)
rename {crates/tek/src => src}/tui/tui_input.rs (100%)
rename {crates/tek/src => src}/tui/tui_output.rs (100%)
rename {crates/tek/src => src}/tui/tui_style.rs (100%)
rename {crates/tek/src => src}/tui/tui_theme.rs (100%)
rename {crates/suil => suil}/Cargo.toml (100%)
rename {crates/suil => suil}/build.rs (100%)
rename {crates/suil => suil}/src/bound.rs (100%)
rename {crates/suil => suil}/src/gtk.rs (100%)
rename {crates/suil => suil}/src/lib.rs (100%)
rename {crates/suil => suil}/src/test.rs (100%)
rename {crates/suil => suil}/stdbool.h (100%)
rename {crates/suil => suil}/stdint.h (100%)
rename {crates/suil => suil}/wrapper.h (100%)
diff --git a/crates/tek.old/Cargo.toml b/.old/Cargo.toml
similarity index 100%
rename from crates/tek.old/Cargo.toml
rename to .old/Cargo.toml
diff --git a/crates/tek.old/README.md b/.old/README.md
similarity index 100%
rename from crates/tek.old/README.md
rename to .old/README.md
diff --git a/crates/tek.old/example.edn b/.old/example.edn
similarity index 100%
rename from crates/tek.old/example.edn
rename to .old/example.edn
diff --git a/crates/tek.old/src/app.rs b/.old/src/app.rs
similarity index 100%
rename from crates/tek.old/src/app.rs
rename to .old/src/app.rs
diff --git a/crates/tek.old/src/app_focus.rs b/.old/src/app_focus.rs
similarity index 100%
rename from crates/tek.old/src/app_focus.rs
rename to .old/src/app_focus.rs
diff --git a/crates/tek.old/src/app_paths.rs b/.old/src/app_paths.rs
similarity index 100%
rename from crates/tek.old/src/app_paths.rs
rename to .old/src/app_paths.rs
diff --git a/crates/tek.old/src/cli.rs b/.old/src/cli.rs
similarity index 100%
rename from crates/tek.old/src/cli.rs
rename to .old/src/cli.rs
diff --git a/crates/tek.old/src/control.rs b/.old/src/control.rs
similarity index 100%
rename from crates/tek.old/src/control.rs
rename to .old/src/control.rs
diff --git a/crates/tek.old/src/edn.rs b/.old/src/edn.rs
similarity index 100%
rename from crates/tek.old/src/edn.rs
rename to .old/src/edn.rs
diff --git a/crates/tek.old/src/help.rs b/.old/src/help.rs
similarity index 100%
rename from crates/tek.old/src/help.rs
rename to .old/src/help.rs
diff --git a/crates/tek.old/src/main.rs b/.old/src/main.rs
similarity index 100%
rename from crates/tek.old/src/main.rs
rename to .old/src/main.rs
diff --git a/crates/tek.old/src/setup.rs b/.old/src/setup.rs
similarity index 100%
rename from crates/tek.old/src/setup.rs
rename to .old/src/setup.rs
diff --git a/Cargo.lock b/Cargo.lock
index 9b015ea2..012efc81 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -261,15 +261,6 @@ dependencies = [
"windows-sys 0.52.0",
]
-[[package]]
-name = "crossbeam-channel"
-version = "0.5.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ba6d68e24814cb8de6bb986db8222d3a027d15872cabc0d18817bc3c0e4471"
-dependencies = [
- "crossbeam-utils",
-]
-
[[package]]
name = "crossbeam-deque"
version = "0.8.5"
@@ -320,16 +311,6 @@ dependencies = [
"winapi",
]
-[[package]]
-name = "ctor"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a2785755761f3ddc1492979ce1e48d2c00d09311c39e4466429188f3dd6501"
-dependencies = [
- "quote",
- "syn",
-]
-
[[package]]
name = "either"
version = "1.13.0"
@@ -462,10 +443,7 @@ checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
name = "jack"
version = "0.13.0"
dependencies = [
- "approx",
"bitflags 2.6.0",
- "crossbeam-channel",
- "ctor",
"jack-sys",
"lazy_static",
"libc",
@@ -1286,6 +1264,7 @@ dependencies = [
"atomic_float",
"backtrace",
"better-panic",
+ "clap",
"clojure-reader",
"crossterm",
"jack",
@@ -1302,22 +1281,6 @@ dependencies = [
"wavers",
]
-[[package]]
-name = "tek_cli"
-version = "0.2.0"
-dependencies = [
- "clap",
- "tek",
-]
-
-[[package]]
-name = "tek_edn"
-version = "0.2.0"
-dependencies = [
- "clojure-reader",
- "tek",
-]
-
[[package]]
name = "thiserror"
version = "1.0.69"
diff --git a/Cargo.toml b/Cargo.toml
index b502f8c8..b97ec445 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,10 +1,67 @@
-[workspace]
-resolver = "2"
-members = [
- "crates/tek",
- "crates/cli",
- "crates/edn",
-]
+[package]
+name = "tek"
+edition = "2021"
+version = "0.2.0"
+
+[dependencies]
+#no_deadlocks = "1.3.2"
+#vst3 = "0.1.0"
+atomic_float = "1.0.0"
+backtrace = "0.3.72"
+better-panic = "0.3.0"
+clojure-reader = "0.1.0"
+crossterm = "0.27"
+jack = { path = "./rust-jack" }
+livi = "0.7.4"
+midly = "0.5"
+once_cell = "1.19.0"
+palette = { version = "0.7.6", features = [ "random" ] }
+quanta = "0.12.3"
+rand = "0.8.5"
+ratatui = { version = "0.26.3", features = [ "unstable-widget-ref", "underline-color" ] }
+#suil-rs = { path = "../suil" }
+symphonia = { version = "0.5.4", features = [ "all" ] }
+toml = "0.8.12"
+uuid = { version = "1.10.0", features = [ "v4" ] }
+#vst = "0.4.0"
+wavers = "1.4.3"
+#winit = { version = "0.30.4", features = [ "x11" ] }
+clap = { version = "4.5.4", features = [ "derive" ] }
+
+[[bin]]
+name = "tek_arranger"
+path = "bin/cli_arranger.rs"
+
+[[bin]]
+name = "tek_sequencer"
+path = "bin/cli_sequencer.rs"
+
+[[bin]]
+name = "tek_groovebox"
+path = "bin/cli_groovebox.rs"
+
+[[bin]]
+name = "tek_transport"
+path = "bin/cli_transport.rs"
+
+[[bin]]
+name = "tek_sampler"
+path = "bin/cli_sampler.rs"
+
+#[[bin]]
+#name = "tek_mixer"
+#path = "src/cli_mixer.rs"
+
+#[[bin]]
+#name = "tek_track"
+#path = "src/cli_track.rs"
+
+#[[bin]]
+#name = "tek_plugin"
+#path = "src/cli_plugin.rs"
+
+[lib]
+path = "src/lib.rs"
[profile.release]
lto = true
diff --git a/crates/cli/src/cli_arranger.rs b/bin/cli_arranger.rs
similarity index 100%
rename from crates/cli/src/cli_arranger.rs
rename to bin/cli_arranger.rs
diff --git a/crates/cli/src/cli_groovebox.rs b/bin/cli_groovebox.rs
similarity index 100%
rename from crates/cli/src/cli_groovebox.rs
rename to bin/cli_groovebox.rs
diff --git a/crates/cli/src/cli_sampler.rs b/bin/cli_sampler.rs
similarity index 100%
rename from crates/cli/src/cli_sampler.rs
rename to bin/cli_sampler.rs
diff --git a/crates/cli/src/cli_sequencer.rs b/bin/cli_sequencer.rs
similarity index 100%
rename from crates/cli/src/cli_sequencer.rs
rename to bin/cli_sequencer.rs
diff --git a/crates/cli/src/cli_transport.rs b/bin/cli_transport.rs
similarity index 100%
rename from crates/cli/src/cli_transport.rs
rename to bin/cli_transport.rs
diff --git a/crates/cli/src/lib.rs b/bin/lib.rs
similarity index 100%
rename from crates/cli/src/lib.rs
rename to bin/lib.rs
diff --git a/crates/cli/src/todo_cli_mixer.rs b/bin/todo_cli_mixer.rs
similarity index 100%
rename from crates/cli/src/todo_cli_mixer.rs
rename to bin/todo_cli_mixer.rs
diff --git a/crates/cli/src/todo_cli_plugin.rs b/bin/todo_cli_plugin.rs
similarity index 100%
rename from crates/cli/src/todo_cli_plugin.rs
rename to bin/todo_cli_plugin.rs
diff --git a/crates/cli/src/todo_cli_sampler.rs b/bin/todo_cli_sampler.rs
similarity index 100%
rename from crates/cli/src/todo_cli_sampler.rs
rename to bin/todo_cli_sampler.rs
diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml
deleted file mode 100644
index 75d1321f..00000000
--- a/crates/cli/Cargo.toml
+++ /dev/null
@@ -1,40 +0,0 @@
-[package]
-name = "tek_cli"
-edition = "2021"
-version = "0.2.0"
-
-[dependencies]
-tek = { path = "../tek" }
-clap = { version = "4.5.4", features = [ "derive" ] }
-
-[[bin]]
-name = "tek_arranger"
-path = "src/cli_arranger.rs"
-
-[[bin]]
-name = "tek_sequencer"
-path = "src/cli_sequencer.rs"
-
-[[bin]]
-name = "tek_groovebox"
-path = "src/cli_groovebox.rs"
-
-[[bin]]
-name = "tek_transport"
-path = "src/cli_transport.rs"
-
-[[bin]]
-name = "tek_sampler"
-path = "src/cli_sampler.rs"
-
-#[[bin]]
-#name = "tek_mixer"
-#path = "src/cli_mixer.rs"
-
-#[[bin]]
-#name = "tek_track"
-#path = "src/cli_track.rs"
-
-#[[bin]]
-#name = "tek_plugin"
-#path = "src/cli_plugin.rs"
diff --git a/crates/edn/Cargo.toml b/crates/edn/Cargo.toml
deleted file mode 100644
index 01bab065..00000000
--- a/crates/edn/Cargo.toml
+++ /dev/null
@@ -1,8 +0,0 @@
-[package]
-name = "tek_edn"
-edition = "2021"
-version = "0.2.0"
-
-[dependencies]
-tek = { path = "../tek" }
-clojure-reader = "0.1.0"
diff --git a/crates/tek/Cargo.toml b/crates/tek/Cargo.toml
deleted file mode 100644
index 00c324a6..00000000
--- a/crates/tek/Cargo.toml
+++ /dev/null
@@ -1,31 +0,0 @@
-[package]
-name = "tek"
-edition = "2021"
-version = "0.2.0"
-
-[dependencies]
-#no_deadlocks = "1.3.2"
-#vst3 = "0.1.0"
-atomic_float = "1.0.0"
-backtrace = "0.3.72"
-better-panic = "0.3.0"
-clojure-reader = "0.1.0"
-crossterm = "0.27"
-jack = { path = "../../rust-jack" }
-livi = "0.7.4"
-midly = "0.5"
-once_cell = "1.19.0"
-palette = { version = "0.7.6", features = [ "random" ] }
-quanta = "0.12.3"
-rand = "0.8.5"
-ratatui = { version = "0.26.3", features = [ "unstable-widget-ref", "underline-color" ] }
-#suil-rs = { path = "../suil" }
-symphonia = { version = "0.5.4", features = [ "all" ] }
-toml = "0.8.12"
-uuid = { version = "1.10.0", features = [ "v4" ] }
-#vst = "0.4.0"
-wavers = "1.4.3"
-#winit = { version = "0.30.4", features = [ "x11" ] }
-
-[lib]
-path = "src/lib.rs"
diff --git a/crates/tek/examples/demo.rs.fixme b/examples/demo.rs.fixme
similarity index 100%
rename from crates/tek/examples/demo.rs.fixme
rename to examples/demo.rs.fixme
diff --git a/crates/tek/examples/demo_bsp.rs.fixme b/examples/demo_bsp.rs.fixme
similarity index 100%
rename from crates/tek/examples/demo_bsp.rs.fixme
rename to examples/demo_bsp.rs.fixme
diff --git a/crates/tek/examples/midi_import.rs.fixme b/examples/midi_import.rs.fixme
similarity index 100%
rename from crates/tek/examples/midi_import.rs.fixme
rename to examples/midi_import.rs.fixme
diff --git a/crates/tek/examples/mixer.edn b/examples/mixer.edn
similarity index 100%
rename from crates/tek/examples/mixer.edn
rename to examples/mixer.edn
diff --git a/crates/tek/examples/sequencer.edn b/examples/sequencer.edn
similarity index 100%
rename from crates/tek/examples/sequencer.edn
rename to examples/sequencer.edn
diff --git a/crates/tek/README.md b/src/README.md
similarity index 100%
rename from crates/tek/README.md
rename to src/README.md
diff --git a/crates/tek/src/api.rs b/src/api.rs
similarity index 100%
rename from crates/tek/src/api.rs
rename to src/api.rs
diff --git a/crates/tek/architecture.svg b/src/architecture.svg
similarity index 100%
rename from crates/tek/architecture.svg
rename to src/architecture.svg
diff --git a/crates/tek/src/arranger.rs b/src/arranger.rs
similarity index 100%
rename from crates/tek/src/arranger.rs
rename to src/arranger.rs
diff --git a/crates/tek/src/arranger/arranger_command.rs b/src/arranger/arranger_command.rs
similarity index 100%
rename from crates/tek/src/arranger/arranger_command.rs
rename to src/arranger/arranger_command.rs
diff --git a/crates/tek/src/arranger/arranger_h.rs b/src/arranger/arranger_h.rs
similarity index 100%
rename from crates/tek/src/arranger/arranger_h.rs
rename to src/arranger/arranger_h.rs
diff --git a/crates/tek/src/arranger/arranger_mode.rs b/src/arranger/arranger_mode.rs
similarity index 100%
rename from crates/tek/src/arranger/arranger_mode.rs
rename to src/arranger/arranger_mode.rs
diff --git a/crates/tek/src/arranger/arranger_scene.rs b/src/arranger/arranger_scene.rs
similarity index 100%
rename from crates/tek/src/arranger/arranger_scene.rs
rename to src/arranger/arranger_scene.rs
diff --git a/crates/tek/src/arranger/arranger_select.rs b/src/arranger/arranger_select.rs
similarity index 100%
rename from crates/tek/src/arranger/arranger_select.rs
rename to src/arranger/arranger_select.rs
diff --git a/crates/tek/src/arranger/arranger_track.rs b/src/arranger/arranger_track.rs
similarity index 100%
rename from crates/tek/src/arranger/arranger_track.rs
rename to src/arranger/arranger_track.rs
diff --git a/crates/tek/src/arranger/arranger_v.rs b/src/arranger/arranger_v.rs
similarity index 100%
rename from crates/tek/src/arranger/arranger_v.rs
rename to src/arranger/arranger_v.rs
diff --git a/crates/tek/src/arranger/arranger_v/v_clips.rs b/src/arranger/arranger_v/v_clips.rs
similarity index 100%
rename from crates/tek/src/arranger/arranger_v/v_clips.rs
rename to src/arranger/arranger_v/v_clips.rs
diff --git a/crates/tek/src/arranger/arranger_v/v_cursor.rs b/src/arranger/arranger_v/v_cursor.rs
similarity index 100%
rename from crates/tek/src/arranger/arranger_v/v_cursor.rs
rename to src/arranger/arranger_v/v_cursor.rs
diff --git a/crates/tek/src/arranger/arranger_v/v_head.rs b/src/arranger/arranger_v/v_head.rs
similarity index 100%
rename from crates/tek/src/arranger/arranger_v/v_head.rs
rename to src/arranger/arranger_v/v_head.rs
diff --git a/crates/tek/src/arranger/arranger_v/v_io.rs b/src/arranger/arranger_v/v_io.rs
similarity index 100%
rename from crates/tek/src/arranger/arranger_v/v_io.rs
rename to src/arranger/arranger_v/v_io.rs
diff --git a/crates/tek/src/arranger/arranger_v/v_sep.rs b/src/arranger/arranger_v/v_sep.rs
similarity index 100%
rename from crates/tek/src/arranger/arranger_v/v_sep.rs
rename to src/arranger/arranger_v/v_sep.rs
diff --git a/crates/tek/src/audio.rs b/src/audio.rs
similarity index 100%
rename from crates/tek/src/audio.rs
rename to src/audio.rs
diff --git a/crates/tek/src/core.rs b/src/core.rs
similarity index 100%
rename from crates/tek/src/core.rs
rename to src/core.rs
diff --git a/crates/tek/src/core/color.rs b/src/core/color.rs
similarity index 100%
rename from crates/tek/src/core/color.rs
rename to src/core/color.rs
diff --git a/crates/tek/src/core/command.rs b/src/core/command.rs
similarity index 100%
rename from crates/tek/src/core/command.rs
rename to src/core/command.rs
diff --git a/crates/tek/src/core/engine.rs b/src/core/engine.rs
similarity index 100%
rename from crates/tek/src/core/engine.rs
rename to src/core/engine.rs
diff --git a/crates/tek/src/core/focus.rs b/src/core/focus.rs
similarity index 100%
rename from crates/tek/src/core/focus.rs
rename to src/core/focus.rs
diff --git a/crates/tek/src/core/input.rs b/src/core/input.rs
similarity index 100%
rename from crates/tek/src/core/input.rs
rename to src/core/input.rs
diff --git a/crates/tek/src/core/output.rs b/src/core/output.rs
similarity index 100%
rename from crates/tek/src/core/output.rs
rename to src/core/output.rs
diff --git a/crates/tek/src/core/test.rs b/src/core/test.rs
similarity index 100%
rename from crates/tek/src/core/test.rs
rename to src/core/test.rs
diff --git a/crates/edn/src/lib.rs b/src/edn.rs
similarity index 99%
rename from crates/edn/src/lib.rs
rename to src/edn.rs
index 1465b951..8067b562 100644
--- a/crates/edn/src/lib.rs
+++ b/src/edn.rs
@@ -1,7 +1,6 @@
-#[allow(unused_imports)] use tek::{*, jack::*, plugin::*};
+use crate::*;
use std::sync::{Arc, RwLock};
use std::collections::BTreeMap;
-
pub use clojure_reader::edn::Edn;
//pub use clojure_reader::{edn::{read, Edn}, error::Error as EdnError};
diff --git a/crates/tek/src/groovebox.rs b/src/groovebox.rs
similarity index 100%
rename from crates/tek/src/groovebox.rs
rename to src/groovebox.rs
diff --git a/crates/tek/src/jack.rs b/src/jack.rs
similarity index 100%
rename from crates/tek/src/jack.rs
rename to src/jack.rs
diff --git a/crates/tek/src/jack/activate.rs b/src/jack/activate.rs
similarity index 100%
rename from crates/tek/src/jack/activate.rs
rename to src/jack/activate.rs
diff --git a/crates/tek/src/jack/client.rs b/src/jack/client.rs
similarity index 100%
rename from crates/tek/src/jack/client.rs
rename to src/jack/client.rs
diff --git a/crates/tek/src/jack/jack_event.rs b/src/jack/jack_event.rs
similarity index 100%
rename from crates/tek/src/jack/jack_event.rs
rename to src/jack/jack_event.rs
diff --git a/crates/tek/src/jack/ports.rs b/src/jack/ports.rs
similarity index 100%
rename from crates/tek/src/jack/ports.rs
rename to src/jack/ports.rs
diff --git a/crates/tek/src/lib.rs b/src/lib.rs
similarity index 100%
rename from crates/tek/src/lib.rs
rename to src/lib.rs
diff --git a/crates/tek/src/meter.rs b/src/meter.rs
similarity index 100%
rename from crates/tek/src/meter.rs
rename to src/meter.rs
diff --git a/crates/tek/src/midi.rs b/src/midi.rs
similarity index 100%
rename from crates/tek/src/midi.rs
rename to src/midi.rs
diff --git a/crates/tek/src/midi/midi_clip.rs b/src/midi/midi_clip.rs
similarity index 100%
rename from crates/tek/src/midi/midi_clip.rs
rename to src/midi/midi_clip.rs
diff --git a/crates/tek/src/midi/midi_editor.rs b/src/midi/midi_editor.rs
similarity index 100%
rename from crates/tek/src/midi/midi_editor.rs
rename to src/midi/midi_editor.rs
diff --git a/crates/tek/src/midi/midi_launch.rs b/src/midi/midi_launch.rs
similarity index 100%
rename from crates/tek/src/midi/midi_launch.rs
rename to src/midi/midi_launch.rs
diff --git a/crates/tek/src/midi/midi_note.rs b/src/midi/midi_note.rs
similarity index 100%
rename from crates/tek/src/midi/midi_note.rs
rename to src/midi/midi_note.rs
diff --git a/crates/tek/src/midi/midi_play.rs b/src/midi/midi_play.rs
similarity index 100%
rename from crates/tek/src/midi/midi_play.rs
rename to src/midi/midi_play.rs
diff --git a/crates/tek/src/midi/midi_point.rs b/src/midi/midi_point.rs
similarity index 100%
rename from crates/tek/src/midi/midi_point.rs
rename to src/midi/midi_point.rs
diff --git a/crates/tek/src/midi/midi_pool.rs b/src/midi/midi_pool.rs
similarity index 100%
rename from crates/tek/src/midi/midi_pool.rs
rename to src/midi/midi_pool.rs
diff --git a/crates/tek/src/midi/midi_range.rs b/src/midi/midi_range.rs
similarity index 100%
rename from crates/tek/src/midi/midi_range.rs
rename to src/midi/midi_range.rs
diff --git a/crates/tek/src/midi/midi_rec.rs b/src/midi/midi_rec.rs
similarity index 100%
rename from crates/tek/src/midi/midi_rec.rs
rename to src/midi/midi_rec.rs
diff --git a/crates/tek/src/midi/midi_view.rs b/src/midi/midi_view.rs
similarity index 100%
rename from crates/tek/src/midi/midi_view.rs
rename to src/midi/midi_view.rs
diff --git a/crates/tek/src/mixer.rs b/src/mixer.rs
similarity index 100%
rename from crates/tek/src/mixer.rs
rename to src/mixer.rs
diff --git a/crates/tek/src/piano_h.rs b/src/piano_h.rs
similarity index 100%
rename from crates/tek/src/piano_h.rs
rename to src/piano_h.rs
diff --git a/crates/tek/src/piano_h/piano_h_cursor.rs b/src/piano_h/piano_h_cursor.rs
similarity index 100%
rename from crates/tek/src/piano_h/piano_h_cursor.rs
rename to src/piano_h/piano_h_cursor.rs
diff --git a/crates/tek/src/piano_h/piano_h_keys.rs b/src/piano_h/piano_h_keys.rs
similarity index 100%
rename from crates/tek/src/piano_h/piano_h_keys.rs
rename to src/piano_h/piano_h_keys.rs
diff --git a/crates/tek/src/piano_h/piano_h_notes.rs b/src/piano_h/piano_h_notes.rs
similarity index 100%
rename from crates/tek/src/piano_h/piano_h_notes.rs
rename to src/piano_h/piano_h_notes.rs
diff --git a/crates/tek/src/piano_h/piano_h_time.rs b/src/piano_h/piano_h_time.rs
similarity index 100%
rename from crates/tek/src/piano_h/piano_h_time.rs
rename to src/piano_h/piano_h_time.rs
diff --git a/crates/tek/src/piano_v.rs b/src/piano_v.rs
similarity index 100%
rename from crates/tek/src/piano_v.rs
rename to src/piano_v.rs
diff --git a/crates/tek/src/plugin.rs b/src/plugin.rs
similarity index 100%
rename from crates/tek/src/plugin.rs
rename to src/plugin.rs
diff --git a/crates/tek/src/plugin/lv2.rs b/src/plugin/lv2.rs
similarity index 100%
rename from crates/tek/src/plugin/lv2.rs
rename to src/plugin/lv2.rs
diff --git a/crates/tek/src/plugin/lv2_gui.rs b/src/plugin/lv2_gui.rs
similarity index 100%
rename from crates/tek/src/plugin/lv2_gui.rs
rename to src/plugin/lv2_gui.rs
diff --git a/crates/tek/src/plugin/lv2_tui.rs b/src/plugin/lv2_tui.rs
similarity index 100%
rename from crates/tek/src/plugin/lv2_tui.rs
rename to src/plugin/lv2_tui.rs
diff --git a/crates/tek/src/plugin/vst2_tui.rs b/src/plugin/vst2_tui.rs
similarity index 100%
rename from crates/tek/src/plugin/vst2_tui.rs
rename to src/plugin/vst2_tui.rs
diff --git a/crates/tek/src/plugin/vst3_tui.rs b/src/plugin/vst3_tui.rs
similarity index 100%
rename from crates/tek/src/plugin/vst3_tui.rs
rename to src/plugin/vst3_tui.rs
diff --git a/crates/tek/src/pool.rs b/src/pool.rs
similarity index 100%
rename from crates/tek/src/pool.rs
rename to src/pool.rs
diff --git a/crates/tek/src/pool/phrase_length.rs b/src/pool/phrase_length.rs
similarity index 100%
rename from crates/tek/src/pool/phrase_length.rs
rename to src/pool/phrase_length.rs
diff --git a/crates/tek/src/pool/phrase_rename.rs b/src/pool/phrase_rename.rs
similarity index 100%
rename from crates/tek/src/pool/phrase_rename.rs
rename to src/pool/phrase_rename.rs
diff --git a/crates/tek/src/pool/phrase_selector.rs b/src/pool/phrase_selector.rs
similarity index 100%
rename from crates/tek/src/pool/phrase_selector.rs
rename to src/pool/phrase_selector.rs
diff --git a/crates/tek/src/sampler.rs b/src/sampler.rs
similarity index 100%
rename from crates/tek/src/sampler.rs
rename to src/sampler.rs
diff --git a/crates/tek/src/sampler/sample.rs b/src/sampler/sample.rs
similarity index 100%
rename from crates/tek/src/sampler/sample.rs
rename to src/sampler/sample.rs
diff --git a/crates/tek/src/sampler/sample_import.rs b/src/sampler/sample_import.rs
similarity index 100%
rename from crates/tek/src/sampler/sample_import.rs
rename to src/sampler/sample_import.rs
diff --git a/crates/tek/src/sampler/sample_viewer.rs b/src/sampler/sample_viewer.rs
similarity index 100%
rename from crates/tek/src/sampler/sample_viewer.rs
rename to src/sampler/sample_viewer.rs
diff --git a/crates/tek/src/sampler/sampler_tui.rs b/src/sampler/sampler_tui.rs
similarity index 100%
rename from crates/tek/src/sampler/sampler_tui.rs
rename to src/sampler/sampler_tui.rs
diff --git a/crates/tek/src/sampler/voice.rs b/src/sampler/voice.rs
similarity index 100%
rename from crates/tek/src/sampler/voice.rs
rename to src/sampler/voice.rs
diff --git a/crates/tek/src/sequencer.rs b/src/sequencer.rs
similarity index 100%
rename from crates/tek/src/sequencer.rs
rename to src/sequencer.rs
diff --git a/crates/tek/src/space.rs b/src/space.rs
similarity index 100%
rename from crates/tek/src/space.rs
rename to src/space.rs
diff --git a/crates/tek/src/space/align.rs b/src/space/align.rs
similarity index 100%
rename from crates/tek/src/space/align.rs
rename to src/space/align.rs
diff --git a/crates/tek/src/space/bsp.rs b/src/space/bsp.rs
similarity index 100%
rename from crates/tek/src/space/bsp.rs
rename to src/space/bsp.rs
diff --git a/crates/tek/src/space/collect.rs b/src/space/collect.rs
similarity index 100%
rename from crates/tek/src/space/collect.rs
rename to src/space/collect.rs
diff --git a/crates/tek/src/space/cond.rs b/src/space/cond.rs
similarity index 100%
rename from crates/tek/src/space/cond.rs
rename to src/space/cond.rs
diff --git a/crates/tek/src/space/fill.rs b/src/space/fill.rs
similarity index 100%
rename from crates/tek/src/space/fill.rs
rename to src/space/fill.rs
diff --git a/crates/tek/src/space/fixed.rs b/src/space/fixed.rs
similarity index 100%
rename from crates/tek/src/space/fixed.rs
rename to src/space/fixed.rs
diff --git a/crates/tek/src/space/inset_outset.rs b/src/space/inset_outset.rs
similarity index 100%
rename from crates/tek/src/space/inset_outset.rs
rename to src/space/inset_outset.rs
diff --git a/crates/tek/src/space/layers.rs b/src/space/layers.rs
similarity index 100%
rename from crates/tek/src/space/layers.rs
rename to src/space/layers.rs
diff --git a/crates/tek/src/space/map_reduce.rs b/src/space/map_reduce.rs
similarity index 100%
rename from crates/tek/src/space/map_reduce.rs
rename to src/space/map_reduce.rs
diff --git a/crates/tek/src/space/measure.rs b/src/space/measure.rs
similarity index 100%
rename from crates/tek/src/space/measure.rs
rename to src/space/measure.rs
diff --git a/crates/tek/src/space/min_max.rs b/src/space/min_max.rs
similarity index 100%
rename from crates/tek/src/space/min_max.rs
rename to src/space/min_max.rs
diff --git a/crates/tek/src/space/push_pull.rs b/src/space/push_pull.rs
similarity index 100%
rename from crates/tek/src/space/push_pull.rs
rename to src/space/push_pull.rs
diff --git a/crates/tek/src/space/scroll.rs b/src/space/scroll.rs
similarity index 100%
rename from crates/tek/src/space/scroll.rs
rename to src/space/scroll.rs
diff --git a/crates/tek/src/space/shrink_grow.rs b/src/space/shrink_grow.rs
similarity index 100%
rename from crates/tek/src/space/shrink_grow.rs
rename to src/space/shrink_grow.rs
diff --git a/crates/tek/src/space/split.rs b/src/space/split.rs
similarity index 100%
rename from crates/tek/src/space/split.rs
rename to src/space/split.rs
diff --git a/crates/tek/src/space/stack.rs b/src/space/stack.rs
similarity index 100%
rename from crates/tek/src/space/stack.rs
rename to src/space/stack.rs
diff --git a/crates/tek/src/status.rs b/src/status.rs
similarity index 100%
rename from crates/tek/src/status.rs
rename to src/status.rs
diff --git a/crates/tek/src/status/status_arranger.rs b/src/status/status_arranger.rs
similarity index 100%
rename from crates/tek/src/status/status_arranger.rs
rename to src/status/status_arranger.rs
diff --git a/crates/tek/src/status/status_edit.rs b/src/status/status_edit.rs
similarity index 100%
rename from crates/tek/src/status/status_edit.rs
rename to src/status/status_edit.rs
diff --git a/crates/tek/src/status/status_groovebox.rs b/src/status/status_groovebox.rs
similarity index 100%
rename from crates/tek/src/status/status_groovebox.rs
rename to src/status/status_groovebox.rs
diff --git a/crates/tek/src/status/status_sequencer.rs b/src/status/status_sequencer.rs
similarity index 100%
rename from crates/tek/src/status/status_sequencer.rs
rename to src/status/status_sequencer.rs
diff --git a/crates/tek/src/test.rs b/src/test.rs
similarity index 100%
rename from crates/tek/src/test.rs
rename to src/test.rs
diff --git a/crates/tek/src/time.rs b/src/time.rs
similarity index 100%
rename from crates/tek/src/time.rs
rename to src/time.rs
diff --git a/crates/tek/src/time/clock.rs b/src/time/clock.rs
similarity index 100%
rename from crates/tek/src/time/clock.rs
rename to src/time/clock.rs
diff --git a/crates/tek/src/time/moment.rs b/src/time/moment.rs
similarity index 100%
rename from crates/tek/src/time/moment.rs
rename to src/time/moment.rs
diff --git a/crates/tek/src/time/perf.rs b/src/time/perf.rs
similarity index 100%
rename from crates/tek/src/time/perf.rs
rename to src/time/perf.rs
diff --git a/crates/tek/src/time/pulse.rs b/src/time/pulse.rs
similarity index 100%
rename from crates/tek/src/time/pulse.rs
rename to src/time/pulse.rs
diff --git a/crates/tek/src/time/sr.rs b/src/time/sr.rs
similarity index 100%
rename from crates/tek/src/time/sr.rs
rename to src/time/sr.rs
diff --git a/crates/tek/src/time/unit.rs b/src/time/unit.rs
similarity index 100%
rename from crates/tek/src/time/unit.rs
rename to src/time/unit.rs
diff --git a/crates/tek/src/transport.rs b/src/transport.rs
similarity index 100%
rename from crates/tek/src/transport.rs
rename to src/transport.rs
diff --git a/crates/tek/src/tui.rs b/src/tui.rs
similarity index 100%
rename from crates/tek/src/tui.rs
rename to src/tui.rs
diff --git a/crates/tek/src/tui/file_browser.rs b/src/tui/file_browser.rs
similarity index 100%
rename from crates/tek/src/tui/file_browser.rs
rename to src/tui/file_browser.rs
diff --git a/crates/tek/src/tui/tui_border.rs b/src/tui/tui_border.rs
similarity index 100%
rename from crates/tek/src/tui/tui_border.rs
rename to src/tui/tui_border.rs
diff --git a/crates/tek/src/tui/tui_input.rs b/src/tui/tui_input.rs
similarity index 100%
rename from crates/tek/src/tui/tui_input.rs
rename to src/tui/tui_input.rs
diff --git a/crates/tek/src/tui/tui_output.rs b/src/tui/tui_output.rs
similarity index 100%
rename from crates/tek/src/tui/tui_output.rs
rename to src/tui/tui_output.rs
diff --git a/crates/tek/src/tui/tui_style.rs b/src/tui/tui_style.rs
similarity index 100%
rename from crates/tek/src/tui/tui_style.rs
rename to src/tui/tui_style.rs
diff --git a/crates/tek/src/tui/tui_theme.rs b/src/tui/tui_theme.rs
similarity index 100%
rename from crates/tek/src/tui/tui_theme.rs
rename to src/tui/tui_theme.rs
diff --git a/crates/suil/Cargo.toml b/suil/Cargo.toml
similarity index 100%
rename from crates/suil/Cargo.toml
rename to suil/Cargo.toml
diff --git a/crates/suil/build.rs b/suil/build.rs
similarity index 100%
rename from crates/suil/build.rs
rename to suil/build.rs
diff --git a/crates/suil/src/bound.rs b/suil/src/bound.rs
similarity index 100%
rename from crates/suil/src/bound.rs
rename to suil/src/bound.rs
diff --git a/crates/suil/src/gtk.rs b/suil/src/gtk.rs
similarity index 100%
rename from crates/suil/src/gtk.rs
rename to suil/src/gtk.rs
diff --git a/crates/suil/src/lib.rs b/suil/src/lib.rs
similarity index 100%
rename from crates/suil/src/lib.rs
rename to suil/src/lib.rs
diff --git a/crates/suil/src/test.rs b/suil/src/test.rs
similarity index 100%
rename from crates/suil/src/test.rs
rename to suil/src/test.rs
diff --git a/crates/suil/stdbool.h b/suil/stdbool.h
similarity index 100%
rename from crates/suil/stdbool.h
rename to suil/stdbool.h
diff --git a/crates/suil/stdint.h b/suil/stdint.h
similarity index 100%
rename from crates/suil/stdint.h
rename to suil/stdint.h
diff --git a/crates/suil/wrapper.h b/suil/wrapper.h
similarity index 100%
rename from crates/suil/wrapper.h
rename to suil/wrapper.h