diff --git a/Cargo.toml b/Cargo.toml
index 2d8c3a9..6a887e8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,32 +10,15 @@ license     = "MIT"
 
 edition = "2018"
 publish = false
-build   = "src/build.rs"
+
+[workspace]
+members = ["src/leela", "src/tycho"]
 
 [dependencies]
-argparse      = "0.2"
 bitflags      = "1.0"
 failure       = "0.1"
 generic-array = "0.12"
-memmap        = "0.7"
 serde         = {version = "1.0", features = ["derive"]}
-serde_yaml    = "0.8"
-
-# note: these have to be updated all at once, check the gtk crate for versions
-atk          = "0.6"
-cairo-rs     = "0.6"
-cairo-sys-rs = "0.8"
-gdk          = "0.10"
-gdk-pixbuf   = "0.6"
-gio          = "0.6"
-gio-sys      = "0.8"
-glib         = "0.7"
-glib-sys     = "0.8"
-gobject-sys  = "0.8"
-gtk          = "0.6"
-gtk-sys      = "0.8"
-pango        = "0.6"
-pango-sys    = "0.8"
 
 [profile.dev]
 opt-level = 1
@@ -47,11 +30,3 @@ lto           = true
 [lib]
 name = "maraiah"
 path = "src/lib.rs"
-
-[[bin]]
-name = "leela"
-path = "src/leela/main.rs"
-
-[[bin]]
-name = "tycho"
-path = "src/tycho/main.rs"
diff --git a/src/leela/Cargo.toml b/src/leela/Cargo.toml
new file mode 100644
index 0000000..ff3fac6
--- /dev/null
+++ b/src/leela/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+name        = "maraiah-leela"
+version     = "0.1.0"
+authors     = ["Alison Sanderson <marrub@greyserv.net>"]
+description = "Maraiah testbed program."
+
+edition = "2018"
+
+[dependencies]
+argparse   = "0.2"
+maraiah    = {path = "../.."}
+memmap     = "0.7"
+serde      = "1.0"
+serde_yaml = "0.8"
+
+[[bin]]
+name = "leela"
+path = "main.rs"
diff --git a/src/tycho/Cargo.toml b/src/tycho/Cargo.toml
new file mode 100644
index 0000000..a06f161
--- /dev/null
+++ b/src/tycho/Cargo.toml
@@ -0,0 +1,31 @@
+[package]
+name        = "maraiah-tycho"
+version     = "0.1.0"
+authors     = ["Alison Sanderson <marrub@greyserv.net>"]
+description = "Tycho map editor."
+
+edition = "2018"
+build   = "build.rs"
+
+[dependencies]
+maraiah = {path = "../.."}
+
+# note: these have to be updated all at once, check the gtk crate for versions
+atk          = "0.6"
+cairo-rs     = "0.6"
+cairo-sys-rs = "0.8"
+gdk          = "0.10"
+gdk-pixbuf   = "0.6"
+gio          = "0.6"
+gio-sys      = "0.8"
+glib         = "0.7"
+glib-sys     = "0.8"
+gobject-sys  = "0.8"
+gtk          = "0.6"
+gtk-sys      = "0.8"
+pango        = "0.6"
+pango-sys    = "0.8"
+
+[[bin]]
+name = "tycho"
+path = "main.rs"
diff --git a/src/build.rs b/src/tycho/build.rs
similarity index 100%
rename from src/build.rs
rename to src/tycho/build.rs
diff --git a/data/icons.psd b/src/tycho/data/icons.psd
similarity index 100%
rename from data/icons.psd
rename to src/tycho/data/icons.psd
diff --git a/data/lines.png b/src/tycho/data/lines.png
similarity index 100%
rename from data/lines.png
rename to src/tycho/data/lines.png
diff --git a/data/points.png b/src/tycho/data/points.png
similarity index 100%
rename from data/points.png
rename to src/tycho/data/points.png
diff --git a/data/polys.png b/src/tycho/data/polys.png
similarity index 100%
rename from data/polys.png
rename to src/tycho/data/polys.png
diff --git a/src/tycho/data/tycho.res b/src/tycho/data/tycho.res
new file mode 100644
index 0000000..4d3ec3a
Binary files /dev/null and b/src/tycho/data/tycho.res differ
diff --git a/data/tycho.xml b/src/tycho/data/tycho.xml
similarity index 100%
rename from data/tycho.xml
rename to src/tycho/data/tycho.xml
diff --git a/data/tycho1.png b/src/tycho/data/tycho1.png
similarity index 100%
rename from data/tycho1.png
rename to src/tycho/data/tycho1.png
diff --git a/data/tycho2.png b/src/tycho/data/tycho2.png
similarity index 100%
rename from data/tycho2.png
rename to src/tycho/data/tycho2.png
diff --git a/data/tycho_res.xml b/src/tycho/data/tycho_res.xml
similarity index 100%
rename from data/tycho_res.xml
rename to src/tycho/data/tycho_res.xml
diff --git a/src/tycho/main.rs b/src/tycho/main.rs
index 9d00d3a..204a322 100644
--- a/src/tycho/main.rs
+++ b/src/tycho/main.rs
@@ -53,8 +53,7 @@ fn run_app(app: &gtk::Application) -> ResultS<()>
 fn main() -> ResultS<()>
 {
    // get jacked, punk. opaque data structures are for nerds.
-   const RESOURCE_DATA: &'static [u8] =
-      include_bytes!(concat!(env!("CARGO_MANIFEST_DIR"), "/data/tycho.res"));
+   const RESOURCE_DATA: &'static [u8] = include_bytes!("data/tycho.res");
 
    let mut static_resource =
       gio_sys::GStaticResource{data:     RESOURCE_DATA.as_ptr(),