diff --git a/Cargo.toml b/Cargo.toml
index 829d119..8bf59a5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,42 +1,12 @@
-[package]
-name = "inboxid"
-version = "0.1.0"
-authors = ["Arne Keller <arne.keller@posteo.de>"]
-edition = "2018"
-license = "GPL-3.0-or-later"
+[workspace]
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-imap = { version = "2.4.1", default-features = false }
-itertools = "0.10.0"
-maildir = { git = "https://github.com/FliegendeWurst/maildir.git", branch = "master", features = ["mmap"] }
-mailparse = "0.13.2"
-rustls-connector = "0.13.1"
-ascii_table = { git = "https://gitlab.com/arnekeller/ascii-table.git", branch = "master" }
-chrono = "0.4.19"
-rusqlite = { version = "0.25.0", features = ["bundled"] }
-rustyline = "8.0.0"
-moins = { git = "https://github.com/FliegendeWurst/moins", branch = "master" }
-anyhow = "1.0.40"
-mailproc = { git = "https://github.com/FliegendeWurst/mailproc.git", branch = "master" }
-subprocess = "0.2.6"
-mime2ext = "0.1.2"
-petgraph = "0.5.1"
-cursive = { version = "0.16.3", default-features = false, features = ["termion-backend"] }
-cursive_tree_view = { git = "https://github.com/FliegendeWurst/cursive_tree_view.git", branch = "master" }
-directories-next = "2.0.0"
-serde_derive = "1.0.25"
-serde = "1.0.25"
-toml = "0.5.8"
-once_cell = "1.7.2"
-parking_lot = "0.11.1"
-log = "0.4.14"
-html2text = "0.2.1"
-
-[patch.crates-io]
-cursive = { path = "../cursive/cursive" }
-cursive_core = { path = "../cursive/cursive-core" } # locally patched at v0.2.2 to improve text rendering perf.
-
-[profile.release]
-overflow-checks = true # useful when debugging
+members = [
+    "inboxid-lib",
+    "inboxid-browse",
+    "inboxid-fetch",
+    "inboxid-filter",
+    "inboxid-list",
+    "inboxid-new",
+    "inboxid-overview",
+    "inboxid-sync",
+]
diff --git a/inboxid-browse/Cargo.toml b/inboxid-browse/Cargo.toml
new file mode 100644
index 0000000..829d119
--- /dev/null
+++ b/inboxid-browse/Cargo.toml
@@ -0,0 +1,42 @@
+[package]
+name = "inboxid"
+version = "0.1.0"
+authors = ["Arne Keller <arne.keller@posteo.de>"]
+edition = "2018"
+license = "GPL-3.0-or-later"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+imap = { version = "2.4.1", default-features = false }
+itertools = "0.10.0"
+maildir = { git = "https://github.com/FliegendeWurst/maildir.git", branch = "master", features = ["mmap"] }
+mailparse = "0.13.2"
+rustls-connector = "0.13.1"
+ascii_table = { git = "https://gitlab.com/arnekeller/ascii-table.git", branch = "master" }
+chrono = "0.4.19"
+rusqlite = { version = "0.25.0", features = ["bundled"] }
+rustyline = "8.0.0"
+moins = { git = "https://github.com/FliegendeWurst/moins", branch = "master" }
+anyhow = "1.0.40"
+mailproc = { git = "https://github.com/FliegendeWurst/mailproc.git", branch = "master" }
+subprocess = "0.2.6"
+mime2ext = "0.1.2"
+petgraph = "0.5.1"
+cursive = { version = "0.16.3", default-features = false, features = ["termion-backend"] }
+cursive_tree_view = { git = "https://github.com/FliegendeWurst/cursive_tree_view.git", branch = "master" }
+directories-next = "2.0.0"
+serde_derive = "1.0.25"
+serde = "1.0.25"
+toml = "0.5.8"
+once_cell = "1.7.2"
+parking_lot = "0.11.1"
+log = "0.4.14"
+html2text = "0.2.1"
+
+[patch.crates-io]
+cursive = { path = "../cursive/cursive" }
+cursive_core = { path = "../cursive/cursive-core" } # locally patched at v0.2.2 to improve text rendering perf.
+
+[profile.release]
+overflow-checks = true # useful when debugging
diff --git a/src/bin/browse.rs b/inboxid-browse/src/main.rs
similarity index 100%
rename from src/bin/browse.rs
rename to inboxid-browse/src/main.rs
diff --git a/inboxid-fetch/Cargo.toml b/inboxid-fetch/Cargo.toml
new file mode 100644
index 0000000..829d119
--- /dev/null
+++ b/inboxid-fetch/Cargo.toml
@@ -0,0 +1,42 @@
+[package]
+name = "inboxid"
+version = "0.1.0"
+authors = ["Arne Keller <arne.keller@posteo.de>"]
+edition = "2018"
+license = "GPL-3.0-or-later"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+imap = { version = "2.4.1", default-features = false }
+itertools = "0.10.0"
+maildir = { git = "https://github.com/FliegendeWurst/maildir.git", branch = "master", features = ["mmap"] }
+mailparse = "0.13.2"
+rustls-connector = "0.13.1"
+ascii_table = { git = "https://gitlab.com/arnekeller/ascii-table.git", branch = "master" }
+chrono = "0.4.19"
+rusqlite = { version = "0.25.0", features = ["bundled"] }
+rustyline = "8.0.0"
+moins = { git = "https://github.com/FliegendeWurst/moins", branch = "master" }
+anyhow = "1.0.40"
+mailproc = { git = "https://github.com/FliegendeWurst/mailproc.git", branch = "master" }
+subprocess = "0.2.6"
+mime2ext = "0.1.2"
+petgraph = "0.5.1"
+cursive = { version = "0.16.3", default-features = false, features = ["termion-backend"] }
+cursive_tree_view = { git = "https://github.com/FliegendeWurst/cursive_tree_view.git", branch = "master" }
+directories-next = "2.0.0"
+serde_derive = "1.0.25"
+serde = "1.0.25"
+toml = "0.5.8"
+once_cell = "1.7.2"
+parking_lot = "0.11.1"
+log = "0.4.14"
+html2text = "0.2.1"
+
+[patch.crates-io]
+cursive = { path = "../cursive/cursive" }
+cursive_core = { path = "../cursive/cursive-core" } # locally patched at v0.2.2 to improve text rendering perf.
+
+[profile.release]
+overflow-checks = true # useful when debugging
diff --git a/src/bin/fetch.rs b/inboxid-fetch/src/main.rs
similarity index 100%
rename from src/bin/fetch.rs
rename to inboxid-fetch/src/main.rs
diff --git a/inboxid-filter/Cargo.toml b/inboxid-filter/Cargo.toml
new file mode 100644
index 0000000..829d119
--- /dev/null
+++ b/inboxid-filter/Cargo.toml
@@ -0,0 +1,42 @@
+[package]
+name = "inboxid"
+version = "0.1.0"
+authors = ["Arne Keller <arne.keller@posteo.de>"]
+edition = "2018"
+license = "GPL-3.0-or-later"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+imap = { version = "2.4.1", default-features = false }
+itertools = "0.10.0"
+maildir = { git = "https://github.com/FliegendeWurst/maildir.git", branch = "master", features = ["mmap"] }
+mailparse = "0.13.2"
+rustls-connector = "0.13.1"
+ascii_table = { git = "https://gitlab.com/arnekeller/ascii-table.git", branch = "master" }
+chrono = "0.4.19"
+rusqlite = { version = "0.25.0", features = ["bundled"] }
+rustyline = "8.0.0"
+moins = { git = "https://github.com/FliegendeWurst/moins", branch = "master" }
+anyhow = "1.0.40"
+mailproc = { git = "https://github.com/FliegendeWurst/mailproc.git", branch = "master" }
+subprocess = "0.2.6"
+mime2ext = "0.1.2"
+petgraph = "0.5.1"
+cursive = { version = "0.16.3", default-features = false, features = ["termion-backend"] }
+cursive_tree_view = { git = "https://github.com/FliegendeWurst/cursive_tree_view.git", branch = "master" }
+directories-next = "2.0.0"
+serde_derive = "1.0.25"
+serde = "1.0.25"
+toml = "0.5.8"
+once_cell = "1.7.2"
+parking_lot = "0.11.1"
+log = "0.4.14"
+html2text = "0.2.1"
+
+[patch.crates-io]
+cursive = { path = "../cursive/cursive" }
+cursive_core = { path = "../cursive/cursive-core" } # locally patched at v0.2.2 to improve text rendering perf.
+
+[profile.release]
+overflow-checks = true # useful when debugging
diff --git a/src/bin/filter.rs b/inboxid-filter/src/main.rs
similarity index 100%
rename from src/bin/filter.rs
rename to inboxid-filter/src/main.rs
diff --git a/inboxid-li b/inboxid-li
new file mode 100644
index 0000000..829d119
--- /dev/null
+++ b/inboxid-li
@@ -0,0 +1,42 @@
+[package]
+name = "inboxid"
+version = "0.1.0"
+authors = ["Arne Keller <arne.keller@posteo.de>"]
+edition = "2018"
+license = "GPL-3.0-or-later"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+imap = { version = "2.4.1", default-features = false }
+itertools = "0.10.0"
+maildir = { git = "https://github.com/FliegendeWurst/maildir.git", branch = "master", features = ["mmap"] }
+mailparse = "0.13.2"
+rustls-connector = "0.13.1"
+ascii_table = { git = "https://gitlab.com/arnekeller/ascii-table.git", branch = "master" }
+chrono = "0.4.19"
+rusqlite = { version = "0.25.0", features = ["bundled"] }
+rustyline = "8.0.0"
+moins = { git = "https://github.com/FliegendeWurst/moins", branch = "master" }
+anyhow = "1.0.40"
+mailproc = { git = "https://github.com/FliegendeWurst/mailproc.git", branch = "master" }
+subprocess = "0.2.6"
+mime2ext = "0.1.2"
+petgraph = "0.5.1"
+cursive = { version = "0.16.3", default-features = false, features = ["termion-backend"] }
+cursive_tree_view = { git = "https://github.com/FliegendeWurst/cursive_tree_view.git", branch = "master" }
+directories-next = "2.0.0"
+serde_derive = "1.0.25"
+serde = "1.0.25"
+toml = "0.5.8"
+once_cell = "1.7.2"
+parking_lot = "0.11.1"
+log = "0.4.14"
+html2text = "0.2.1"
+
+[patch.crates-io]
+cursive = { path = "../cursive/cursive" }
+cursive_core = { path = "../cursive/cursive-core" } # locally patched at v0.2.2 to improve text rendering perf.
+
+[profile.release]
+overflow-checks = true # useful when debugging
diff --git a/inboxid-lib/Cargo.toml b/inboxid-lib/Cargo.toml
new file mode 100644
index 0000000..829d119
--- /dev/null
+++ b/inboxid-lib/Cargo.toml
@@ -0,0 +1,42 @@
+[package]
+name = "inboxid"
+version = "0.1.0"
+authors = ["Arne Keller <arne.keller@posteo.de>"]
+edition = "2018"
+license = "GPL-3.0-or-later"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+imap = { version = "2.4.1", default-features = false }
+itertools = "0.10.0"
+maildir = { git = "https://github.com/FliegendeWurst/maildir.git", branch = "master", features = ["mmap"] }
+mailparse = "0.13.2"
+rustls-connector = "0.13.1"
+ascii_table = { git = "https://gitlab.com/arnekeller/ascii-table.git", branch = "master" }
+chrono = "0.4.19"
+rusqlite = { version = "0.25.0", features = ["bundled"] }
+rustyline = "8.0.0"
+moins = { git = "https://github.com/FliegendeWurst/moins", branch = "master" }
+anyhow = "1.0.40"
+mailproc = { git = "https://github.com/FliegendeWurst/mailproc.git", branch = "master" }
+subprocess = "0.2.6"
+mime2ext = "0.1.2"
+petgraph = "0.5.1"
+cursive = { version = "0.16.3", default-features = false, features = ["termion-backend"] }
+cursive_tree_view = { git = "https://github.com/FliegendeWurst/cursive_tree_view.git", branch = "master" }
+directories-next = "2.0.0"
+serde_derive = "1.0.25"
+serde = "1.0.25"
+toml = "0.5.8"
+once_cell = "1.7.2"
+parking_lot = "0.11.1"
+log = "0.4.14"
+html2text = "0.2.1"
+
+[patch.crates-io]
+cursive = { path = "../cursive/cursive" }
+cursive_core = { path = "../cursive/cursive-core" } # locally patched at v0.2.2 to improve text rendering perf.
+
+[profile.release]
+overflow-checks = true # useful when debugging
diff --git a/src/lib.rs b/inboxid-lib/src/lib.rs
similarity index 100%
rename from src/lib.rs
rename to inboxid-lib/src/lib.rs
diff --git a/inboxid-list/Cargo.toml b/inboxid-list/Cargo.toml
new file mode 100644
index 0000000..829d119
--- /dev/null
+++ b/inboxid-list/Cargo.toml
@@ -0,0 +1,42 @@
+[package]
+name = "inboxid"
+version = "0.1.0"
+authors = ["Arne Keller <arne.keller@posteo.de>"]
+edition = "2018"
+license = "GPL-3.0-or-later"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+imap = { version = "2.4.1", default-features = false }
+itertools = "0.10.0"
+maildir = { git = "https://github.com/FliegendeWurst/maildir.git", branch = "master", features = ["mmap"] }
+mailparse = "0.13.2"
+rustls-connector = "0.13.1"
+ascii_table = { git = "https://gitlab.com/arnekeller/ascii-table.git", branch = "master" }
+chrono = "0.4.19"
+rusqlite = { version = "0.25.0", features = ["bundled"] }
+rustyline = "8.0.0"
+moins = { git = "https://github.com/FliegendeWurst/moins", branch = "master" }
+anyhow = "1.0.40"
+mailproc = { git = "https://github.com/FliegendeWurst/mailproc.git", branch = "master" }
+subprocess = "0.2.6"
+mime2ext = "0.1.2"
+petgraph = "0.5.1"
+cursive = { version = "0.16.3", default-features = false, features = ["termion-backend"] }
+cursive_tree_view = { git = "https://github.com/FliegendeWurst/cursive_tree_view.git", branch = "master" }
+directories-next = "2.0.0"
+serde_derive = "1.0.25"
+serde = "1.0.25"
+toml = "0.5.8"
+once_cell = "1.7.2"
+parking_lot = "0.11.1"
+log = "0.4.14"
+html2text = "0.2.1"
+
+[patch.crates-io]
+cursive = { path = "../cursive/cursive" }
+cursive_core = { path = "../cursive/cursive-core" } # locally patched at v0.2.2 to improve text rendering perf.
+
+[profile.release]
+overflow-checks = true # useful when debugging
diff --git a/src/bin/list.rs b/inboxid-list/src/main.rs
similarity index 100%
rename from src/bin/list.rs
rename to inboxid-list/src/main.rs
diff --git a/inboxid-new/Cargo.toml b/inboxid-new/Cargo.toml
new file mode 100644
index 0000000..829d119
--- /dev/null
+++ b/inboxid-new/Cargo.toml
@@ -0,0 +1,42 @@
+[package]
+name = "inboxid"
+version = "0.1.0"
+authors = ["Arne Keller <arne.keller@posteo.de>"]
+edition = "2018"
+license = "GPL-3.0-or-later"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+imap = { version = "2.4.1", default-features = false }
+itertools = "0.10.0"
+maildir = { git = "https://github.com/FliegendeWurst/maildir.git", branch = "master", features = ["mmap"] }
+mailparse = "0.13.2"
+rustls-connector = "0.13.1"
+ascii_table = { git = "https://gitlab.com/arnekeller/ascii-table.git", branch = "master" }
+chrono = "0.4.19"
+rusqlite = { version = "0.25.0", features = ["bundled"] }
+rustyline = "8.0.0"
+moins = { git = "https://github.com/FliegendeWurst/moins", branch = "master" }
+anyhow = "1.0.40"
+mailproc = { git = "https://github.com/FliegendeWurst/mailproc.git", branch = "master" }
+subprocess = "0.2.6"
+mime2ext = "0.1.2"
+petgraph = "0.5.1"
+cursive = { version = "0.16.3", default-features = false, features = ["termion-backend"] }
+cursive_tree_view = { git = "https://github.com/FliegendeWurst/cursive_tree_view.git", branch = "master" }
+directories-next = "2.0.0"
+serde_derive = "1.0.25"
+serde = "1.0.25"
+toml = "0.5.8"
+once_cell = "1.7.2"
+parking_lot = "0.11.1"
+log = "0.4.14"
+html2text = "0.2.1"
+
+[patch.crates-io]
+cursive = { path = "../cursive/cursive" }
+cursive_core = { path = "../cursive/cursive-core" } # locally patched at v0.2.2 to improve text rendering perf.
+
+[profile.release]
+overflow-checks = true # useful when debugging
diff --git a/src/bin/new.rs b/inboxid-new/src/main.rs
similarity index 100%
rename from src/bin/new.rs
rename to inboxid-new/src/main.rs
diff --git a/inboxid-overview/Cargo.toml b/inboxid-overview/Cargo.toml
new file mode 100644
index 0000000..829d119
--- /dev/null
+++ b/inboxid-overview/Cargo.toml
@@ -0,0 +1,42 @@
+[package]
+name = "inboxid"
+version = "0.1.0"
+authors = ["Arne Keller <arne.keller@posteo.de>"]
+edition = "2018"
+license = "GPL-3.0-or-later"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+imap = { version = "2.4.1", default-features = false }
+itertools = "0.10.0"
+maildir = { git = "https://github.com/FliegendeWurst/maildir.git", branch = "master", features = ["mmap"] }
+mailparse = "0.13.2"
+rustls-connector = "0.13.1"
+ascii_table = { git = "https://gitlab.com/arnekeller/ascii-table.git", branch = "master" }
+chrono = "0.4.19"
+rusqlite = { version = "0.25.0", features = ["bundled"] }
+rustyline = "8.0.0"
+moins = { git = "https://github.com/FliegendeWurst/moins", branch = "master" }
+anyhow = "1.0.40"
+mailproc = { git = "https://github.com/FliegendeWurst/mailproc.git", branch = "master" }
+subprocess = "0.2.6"
+mime2ext = "0.1.2"
+petgraph = "0.5.1"
+cursive = { version = "0.16.3", default-features = false, features = ["termion-backend"] }
+cursive_tree_view = { git = "https://github.com/FliegendeWurst/cursive_tree_view.git", branch = "master" }
+directories-next = "2.0.0"
+serde_derive = "1.0.25"
+serde = "1.0.25"
+toml = "0.5.8"
+once_cell = "1.7.2"
+parking_lot = "0.11.1"
+log = "0.4.14"
+html2text = "0.2.1"
+
+[patch.crates-io]
+cursive = { path = "../cursive/cursive" }
+cursive_core = { path = "../cursive/cursive-core" } # locally patched at v0.2.2 to improve text rendering perf.
+
+[profile.release]
+overflow-checks = true # useful when debugging
diff --git a/src/bin/overview.rs b/inboxid-overview/src/main.rs
similarity index 100%
rename from src/bin/overview.rs
rename to inboxid-overview/src/main.rs
diff --git a/inboxid-sync/Cargo.toml b/inboxid-sync/Cargo.toml
new file mode 100644
index 0000000..829d119
--- /dev/null
+++ b/inboxid-sync/Cargo.toml
@@ -0,0 +1,42 @@
+[package]
+name = "inboxid"
+version = "0.1.0"
+authors = ["Arne Keller <arne.keller@posteo.de>"]
+edition = "2018"
+license = "GPL-3.0-or-later"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+imap = { version = "2.4.1", default-features = false }
+itertools = "0.10.0"
+maildir = { git = "https://github.com/FliegendeWurst/maildir.git", branch = "master", features = ["mmap"] }
+mailparse = "0.13.2"
+rustls-connector = "0.13.1"
+ascii_table = { git = "https://gitlab.com/arnekeller/ascii-table.git", branch = "master" }
+chrono = "0.4.19"
+rusqlite = { version = "0.25.0", features = ["bundled"] }
+rustyline = "8.0.0"
+moins = { git = "https://github.com/FliegendeWurst/moins", branch = "master" }
+anyhow = "1.0.40"
+mailproc = { git = "https://github.com/FliegendeWurst/mailproc.git", branch = "master" }
+subprocess = "0.2.6"
+mime2ext = "0.1.2"
+petgraph = "0.5.1"
+cursive = { version = "0.16.3", default-features = false, features = ["termion-backend"] }
+cursive_tree_view = { git = "https://github.com/FliegendeWurst/cursive_tree_view.git", branch = "master" }
+directories-next = "2.0.0"
+serde_derive = "1.0.25"
+serde = "1.0.25"
+toml = "0.5.8"
+once_cell = "1.7.2"
+parking_lot = "0.11.1"
+log = "0.4.14"
+html2text = "0.2.1"
+
+[patch.crates-io]
+cursive = { path = "../cursive/cursive" }
+cursive_core = { path = "../cursive/cursive-core" } # locally patched at v0.2.2 to improve text rendering perf.
+
+[profile.release]
+overflow-checks = true # useful when debugging
diff --git a/src/bin/rebuild-db.rs b/inboxid-sync/src/bin/rebuild-db.rs
similarity index 100%
rename from src/bin/rebuild-db.rs
rename to inboxid-sync/src/bin/rebuild-db.rs
diff --git a/src/bin/sync.rs b/inboxid-sync/src/main.rs
similarity index 100%
rename from src/bin/sync.rs
rename to inboxid-sync/src/main.rs