diff --git a/Cargo.lock b/Cargo.lock
index c068ca3b..a42a61b2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1221,7 +1221,7 @@ dependencies = [
 
 [[package]]
 name = "meli"
-version = "0.7.2"
+version = "0.7.3"
 dependencies = [
  "async-task",
  "bitflags",
@@ -1258,7 +1258,7 @@ dependencies = [
 
 [[package]]
 name = "melib"
-version = "0.7.2"
+version = "0.8.0"
 dependencies = [
  "async-stream",
  "base64 0.13.1",
@@ -1804,9 +1804,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.37.22"
+version = "0.37.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8818fa822adcc98b18fedbb3632a6a33213c070556b5aa7c4c8cc21cff565c4c"
+checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06"
 dependencies = [
  "bitflags",
  "errno",
@@ -1981,9 +1981,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.10.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
+checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
 dependencies = [
  "serde",
 ]
@@ -2217,18 +2217,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "tools"
-version = "0.4.1"
-dependencies = [
- "crossbeam",
- "meli",
- "melib",
- "nix",
- "signal-hook",
- "signal-hook-registry",
-]
-
 [[package]]
 name = "tracing"
 version = "0.1.37"
diff --git a/Cargo.toml b/Cargo.toml
index 83f0e1ce..c5edee9c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,74 +1,9 @@
-[package]
-name = "meli"
-version = "0.7.2"
-authors = ["Manos Pitsidianakis <el13635@mail.ntua.gr>"]
-edition = "2018"
-rust-version = "1.65.0"
+[workspace]
 
-license = "GPL-3.0-or-later"
-readme = "README.md"
-description = "terminal mail client"
-homepage = "https://meli.delivery"
-repository = "https://git.meli.delivery/meli/meli.git"
-keywords = ["mail", "mua", "maildir", "terminal", "imap"]
-categories = ["command-line-utilities", "email"]
-default-run = "meli"
-
-[[bin]]
-name = "meli"
-path = "src/main.rs"
-
-[lib]
-name = "meli"
-path = "src/lib.rs"
-
-[[bin]]
-name = "managesieve-client"
-path = "src/managesieve.rs"
-required-features = ["melib/imap_backend"]
-
-[dependencies]
-async-task = "^4.2.0"
-bitflags = "1.0"
-crossbeam = { version = "^0.8" }
-flate2 = { version = "1", optional = true }
-futures = "0.3.5"
-indexmap = { version = "^1.6", features = ["serde-1", ] }
-libc = { version = "0.2.125", default-features = false, features = ["extra_traits",] }
-linkify = { version = "^0.8", default-features = false }
-melib = { path = "melib", version = "0.7.2" }
-nix = { version = "^0.24", default-features = false }
-notify = { version = "4.0.1", default-features = false } # >:c
-num_cpus = "1.12.0"
-pcre2 = { version = "0.2.3", optional = true }
-
-serde = "1.0.71"
-serde_derive = "1.0.71"
-serde_json = "1.0"
-signal-hook = { version = "^0.3", default-features = false }
-signal-hook-registry = { version = "1.2.0", default-features = false }
-smallvec = { version = "^1.5.0", features = ["serde", ] }
-structopt = { version = "0.3.14", default-features = false }
-svg_crate = { version = "^0.13", optional = true, package = "svg" }
-termion = { version = "1.5.1", default-features = false }
-toml = { version = "0.5.6", default-features = false, features = ["preserve_order", ] }
-unicode-segmentation = "1.2.1" # >:c
-xdg = "2.1.0"
-
-[target.'cfg(target_os="linux")'.dependencies]
-notify-rust = { version = "^4", default-features = false, features = ["dbus", ], optional = true }
-
-[build-dependencies]
-flate2 = { version = "1", optional = true }
-proc-macro2 = "1.0.37"
-quote = "^1.0"
-regex = "1"
-syn = { version = "1", features = [] }
-
-[dev-dependencies]
-flate2 = { version = "1" }
-regex = "1"
-tempfile = "3.3"
+members = [
+    "meli",
+    "melib",
+]
 
 [profile.release]
 lto = "fat"
@@ -76,22 +11,3 @@ codegen-units = 1
 opt-level = "s"
 debug = false
 strip = true
-
-[workspace]
-members = ["melib", "tools", ]
-
-[features]
-default = ["sqlite3", "notmuch", "regexp", "smtp", "dbus-notifications", "gpgme", "cli-docs"]
-notmuch = ["melib/notmuch_backend", ]
-jmap = ["melib/jmap_backend",]
-sqlite3 = ["melib/sqlite3"]
-smtp = ["melib/smtp"]
-regexp = ["pcre2"]
-dbus-notifications = ["notify-rust",]
-cli-docs = ["flate2"]
-svgscreenshot = ["svg_crate"]
-gpgme = ["melib/gpgme"]
-
-# Print tracing logs as meli runs in stderr
-# enable for debug tracing logs: build with --features=debug-tracing
-debug-tracing = ["melib/debug-tracing", ]
diff --git a/Makefile b/Makefile
index 96fbbf5d..c1cdc30c 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ BINDIR ?= ${EXPANDED_PREFIX}/bin
 MANDIR ?= ${EXPANDED_PREFIX}/share/man
 
 # Installation parameters
-DOCS_SUBDIR ?= docs/
+DOCS_SUBDIR ?= meli/docs/
 MANPAGES ?= meli.1 meli.conf.5 meli-themes.5
 FEATURES ?= --features "${MELI_FEATURES}"
 
diff --git a/meli/Cargo.toml b/meli/Cargo.toml
new file mode 100644
index 00000000..22c058c4
--- /dev/null
+++ b/meli/Cargo.toml
@@ -0,0 +1,87 @@
+[package]
+name = "meli"
+version = "0.7.3"
+authors = ["Manos Pitsidianakis <manos@pitsidianak.is>"]
+edition = "2018"
+rust-version = "1.65.0"
+
+license = "GPL-3.0-or-later"
+readme = "README.md"
+description = "terminal mail client"
+homepage = "https://meli.delivery"
+repository = "https://git.meli.delivery/meli/meli.git"
+keywords = ["mail", "mua", "maildir", "terminal", "imap"]
+categories = ["command-line-utilities", "email"]
+default-run = "meli"
+
+[[bin]]
+name = "meli"
+path = "src/main.rs"
+
+[lib]
+name = "meli"
+path = "src/lib.rs"
+
+[[bin]]
+name = "managesieve-client"
+path = "src/managesieve.rs"
+required-features = ["melib/imap_backend"]
+
+[dependencies]
+async-task = "^4.2.0"
+bitflags = "1.0"
+crossbeam = { version = "^0.8" }
+flate2 = { version = "1", optional = true }
+futures = "0.3.5"
+indexmap = { version = "^1.6", features = ["serde-1", ] }
+libc = { version = "0.2.125", default-features = false, features = ["extra_traits",] }
+linkify = { version = "^0.8", default-features = false }
+melib = { path = "../melib", version = "0.8.0" }
+nix = { version = "^0.24", default-features = false }
+notify = { version = "4.0.1", default-features = false } # >:c
+num_cpus = "1.12.0"
+pcre2 = { version = "0.2.3", optional = true }
+
+serde = "1.0.71"
+serde_derive = "1.0.71"
+serde_json = "1.0"
+signal-hook = { version = "^0.3", default-features = false }
+signal-hook-registry = { version = "1.2.0", default-features = false }
+smallvec = { version = "^1.5.0", features = ["serde", ] }
+structopt = { version = "0.3.14", default-features = false }
+svg_crate = { version = "^0.13", optional = true, package = "svg" }
+termion = { version = "1.5.1", default-features = false }
+toml = { version = "0.5.6", default-features = false, features = ["preserve_order", ] }
+unicode-segmentation = "1.2.1" # >:c
+xdg = "2.1.0"
+
+[target.'cfg(target_os="linux")'.dependencies]
+notify-rust = { version = "^4", default-features = false, features = ["dbus", ], optional = true }
+
+[build-dependencies]
+flate2 = { version = "1", optional = true }
+proc-macro2 = "1.0.37"
+quote = "^1.0"
+regex = "1"
+syn = { version = "1", features = [] }
+
+[dev-dependencies]
+flate2 = { version = "1" }
+regex = "1"
+tempfile = "3.3"
+
+[features]
+default = ["sqlite3", "notmuch", "regexp", "smtp", "dbus-notifications", "gpgme", "cli-docs"]
+notmuch = ["melib/notmuch_backend", ]
+jmap = ["melib/jmap_backend",]
+sqlite3 = ["melib/sqlite3"]
+smtp = ["melib/smtp"]
+regexp = ["pcre2"]
+dbus-notifications = ["notify-rust",]
+cli-docs = ["flate2"]
+svgscreenshot = ["svg_crate"]
+gpgme = ["melib/gpgme"]
+
+# Print tracing logs as meli runs in stderr
+# enable for debug tracing logs: build with --features=debug-tracing
+debug-tracing = ["melib/debug-tracing", ]
diff --git a/build.rs b/meli/build.rs
similarity index 100%
rename from build.rs
rename to meli/build.rs
diff --git a/config_macros.rs b/meli/config_macros.rs
similarity index 100%
rename from config_macros.rs
rename to meli/config_macros.rs
diff --git a/docs/external-tools.md b/meli/docs/external-tools.md
similarity index 100%
rename from docs/external-tools.md
rename to meli/docs/external-tools.md
diff --git a/docs/mail.vim b/meli/docs/mail.vim
similarity index 100%
rename from docs/mail.vim
rename to meli/docs/mail.vim
diff --git a/docs/meli-themes.5 b/meli/docs/meli-themes.5
similarity index 100%
rename from docs/meli-themes.5
rename to meli/docs/meli-themes.5
diff --git a/docs/meli.1 b/meli/docs/meli.1
similarity index 100%
rename from docs/meli.1
rename to meli/docs/meli.1
diff --git a/docs/meli.7 b/meli/docs/meli.7
similarity index 100%
rename from docs/meli.7
rename to meli/docs/meli.7
diff --git a/docs/meli.conf.5 b/meli/docs/meli.conf.5
similarity index 100%
rename from docs/meli.conf.5
rename to meli/docs/meli.conf.5
diff --git a/docs/samples/sample-config.toml b/meli/docs/samples/sample-config.toml
similarity index 100%
rename from docs/samples/sample-config.toml
rename to meli/docs/samples/sample-config.toml
diff --git a/docs/samples/themes/nord.toml b/meli/docs/samples/themes/nord.toml
similarity index 100%
rename from docs/samples/themes/nord.toml
rename to meli/docs/samples/themes/nord.toml
diff --git a/docs/samples/themes/orca.toml b/meli/docs/samples/themes/orca.toml
similarity index 100%
rename from docs/samples/themes/orca.toml
rename to meli/docs/samples/themes/orca.toml
diff --git a/docs/samples/themes/sail.toml b/meli/docs/samples/themes/sail.toml
similarity index 100%
rename from docs/samples/themes/sail.toml
rename to meli/docs/samples/themes/sail.toml
diff --git a/docs/samples/themes/spooky.toml b/meli/docs/samples/themes/spooky.toml
similarity index 100%
rename from docs/samples/themes/spooky.toml
rename to meli/docs/samples/themes/spooky.toml
diff --git a/docs/samples/themes/watermelon.toml b/meli/docs/samples/themes/watermelon.toml
similarity index 100%
rename from docs/samples/themes/watermelon.toml
rename to meli/docs/samples/themes/watermelon.toml
diff --git a/docs/screenshots/compact.svg b/meli/docs/screenshots/compact.svg
similarity index 100%
rename from docs/screenshots/compact.svg
rename to meli/docs/screenshots/compact.svg
diff --git a/docs/screenshots/compact.webp b/meli/docs/screenshots/compact.webp
similarity index 100%
rename from docs/screenshots/compact.webp
rename to meli/docs/screenshots/compact.webp
diff --git a/docs/screenshots/compose.svg b/meli/docs/screenshots/compose.svg
similarity index 100%
rename from docs/screenshots/compose.svg
rename to meli/docs/screenshots/compose.svg
diff --git a/docs/screenshots/compose.webp b/meli/docs/screenshots/compose.webp
similarity index 100%
rename from docs/screenshots/compose.webp
rename to meli/docs/screenshots/compose.webp
diff --git a/docs/screenshots/main.svg b/meli/docs/screenshots/main.svg
similarity index 100%
rename from docs/screenshots/main.svg
rename to meli/docs/screenshots/main.svg
diff --git a/docs/screenshots/main.webp b/meli/docs/screenshots/main.webp
similarity index 100%
rename from docs/screenshots/main.webp
rename to meli/docs/screenshots/main.webp
diff --git a/src/args.rs b/meli/src/args.rs
similarity index 100%
rename from src/args.rs
rename to meli/src/args.rs
diff --git a/src/command.rs b/meli/src/command.rs
similarity index 100%
rename from src/command.rs
rename to meli/src/command.rs
diff --git a/src/command/actions.rs b/meli/src/command/actions.rs
similarity index 100%
rename from src/command/actions.rs
rename to meli/src/command/actions.rs
diff --git a/src/command/history.rs b/meli/src/command/history.rs
similarity index 100%
rename from src/command/history.rs
rename to meli/src/command/history.rs
diff --git a/src/components.rs b/meli/src/components.rs
similarity index 100%
rename from src/components.rs
rename to meli/src/components.rs
diff --git a/src/components/contacts.rs b/meli/src/components/contacts.rs
similarity index 100%
rename from src/components/contacts.rs
rename to meli/src/components/contacts.rs
diff --git a/src/components/contacts/contact_list.rs b/meli/src/components/contacts/contact_list.rs
similarity index 100%
rename from src/components/contacts/contact_list.rs
rename to meli/src/components/contacts/contact_list.rs
diff --git a/src/components/mail.rs b/meli/src/components/mail.rs
similarity index 100%
rename from src/components/mail.rs
rename to meli/src/components/mail.rs
diff --git a/src/components/mail/compose.rs b/meli/src/components/mail/compose.rs
similarity index 100%
rename from src/components/mail/compose.rs
rename to meli/src/components/mail/compose.rs
diff --git a/src/components/mail/compose/edit_attachments.rs b/meli/src/components/mail/compose/edit_attachments.rs
similarity index 100%
rename from src/components/mail/compose/edit_attachments.rs
rename to meli/src/components/mail/compose/edit_attachments.rs
diff --git a/src/components/mail/compose/gpg.rs b/meli/src/components/mail/compose/gpg.rs
similarity index 100%
rename from src/components/mail/compose/gpg.rs
rename to meli/src/components/mail/compose/gpg.rs
diff --git a/src/components/mail/compose/hooks.rs b/meli/src/components/mail/compose/hooks.rs
similarity index 100%
rename from src/components/mail/compose/hooks.rs
rename to meli/src/components/mail/compose/hooks.rs
diff --git a/src/components/mail/listing.rs b/meli/src/components/mail/listing.rs
similarity index 100%
rename from src/components/mail/listing.rs
rename to meli/src/components/mail/listing.rs
diff --git a/src/components/mail/listing/compact.rs b/meli/src/components/mail/listing/compact.rs
similarity index 100%
rename from src/components/mail/listing/compact.rs
rename to meli/src/components/mail/listing/compact.rs
diff --git a/src/components/mail/listing/conversations.rs b/meli/src/components/mail/listing/conversations.rs
similarity index 100%
rename from src/components/mail/listing/conversations.rs
rename to meli/src/components/mail/listing/conversations.rs
diff --git a/src/components/mail/listing/offline.rs b/meli/src/components/mail/listing/offline.rs
similarity index 100%
rename from src/components/mail/listing/offline.rs
rename to meli/src/components/mail/listing/offline.rs
diff --git a/src/components/mail/listing/plain.rs b/meli/src/components/mail/listing/plain.rs
similarity index 100%
rename from src/components/mail/listing/plain.rs
rename to meli/src/components/mail/listing/plain.rs
diff --git a/src/components/mail/listing/thread.rs b/meli/src/components/mail/listing/thread.rs
similarity index 100%
rename from src/components/mail/listing/thread.rs
rename to meli/src/components/mail/listing/thread.rs
diff --git a/src/components/mail/pgp.rs b/meli/src/components/mail/pgp.rs
similarity index 100%
rename from src/components/mail/pgp.rs
rename to meli/src/components/mail/pgp.rs
diff --git a/src/components/mail/status.rs b/meli/src/components/mail/status.rs
similarity index 100%
rename from src/components/mail/status.rs
rename to meli/src/components/mail/status.rs
diff --git a/src/components/mail/view.rs b/meli/src/components/mail/view.rs
similarity index 100%
rename from src/components/mail/view.rs
rename to meli/src/components/mail/view.rs
diff --git a/src/components/mail/view/envelope.rs b/meli/src/components/mail/view/envelope.rs
similarity index 100%
rename from src/components/mail/view/envelope.rs
rename to meli/src/components/mail/view/envelope.rs
diff --git a/src/components/mail/view/html.rs b/meli/src/components/mail/view/html.rs
similarity index 100%
rename from src/components/mail/view/html.rs
rename to meli/src/components/mail/view/html.rs
diff --git a/src/components/mail/view/state.rs b/meli/src/components/mail/view/state.rs
similarity index 100%
rename from src/components/mail/view/state.rs
rename to meli/src/components/mail/view/state.rs
diff --git a/src/components/mail/view/thread.rs b/meli/src/components/mail/view/thread.rs
similarity index 100%
rename from src/components/mail/view/thread.rs
rename to meli/src/components/mail/view/thread.rs
diff --git a/src/components/mail/view/types.rs b/meli/src/components/mail/view/types.rs
similarity index 100%
rename from src/components/mail/view/types.rs
rename to meli/src/components/mail/view/types.rs
diff --git a/src/components/mail/view/utils.rs b/meli/src/components/mail/view/utils.rs
similarity index 100%
rename from src/components/mail/view/utils.rs
rename to meli/src/components/mail/view/utils.rs
diff --git a/src/components/mailbox_management.rs b/meli/src/components/mailbox_management.rs
similarity index 100%
rename from src/components/mailbox_management.rs
rename to meli/src/components/mailbox_management.rs
diff --git a/src/components/notifications.rs b/meli/src/components/notifications.rs
similarity index 100%
rename from src/components/notifications.rs
rename to meli/src/components/notifications.rs
diff --git a/src/components/svg.rs b/meli/src/components/svg.rs
similarity index 100%
rename from src/components/svg.rs
rename to meli/src/components/svg.rs
diff --git a/src/components/utilities.rs b/meli/src/components/utilities.rs
similarity index 100%
rename from src/components/utilities.rs
rename to meli/src/components/utilities.rs
diff --git a/src/components/utilities/dialogs.rs b/meli/src/components/utilities/dialogs.rs
similarity index 100%
rename from src/components/utilities/dialogs.rs
rename to meli/src/components/utilities/dialogs.rs
diff --git a/src/components/utilities/layouts.rs b/meli/src/components/utilities/layouts.rs
similarity index 100%
rename from src/components/utilities/layouts.rs
rename to meli/src/components/utilities/layouts.rs
diff --git a/src/components/utilities/pager.rs b/meli/src/components/utilities/pager.rs
similarity index 100%
rename from src/components/utilities/pager.rs
rename to meli/src/components/utilities/pager.rs
diff --git a/src/components/utilities/tables.rs b/meli/src/components/utilities/tables.rs
similarity index 100%
rename from src/components/utilities/tables.rs
rename to meli/src/components/utilities/tables.rs
diff --git a/src/components/utilities/text.rs b/meli/src/components/utilities/text.rs
similarity index 100%
rename from src/components/utilities/text.rs
rename to meli/src/components/utilities/text.rs
diff --git a/src/components/utilities/widgets.rs b/meli/src/components/utilities/widgets.rs
similarity index 100%
rename from src/components/utilities/widgets.rs
rename to meli/src/components/utilities/widgets.rs
diff --git a/src/conf.rs b/meli/src/conf.rs
similarity index 100%
rename from src/conf.rs
rename to meli/src/conf.rs
diff --git a/src/conf/.rebuild.overrides.rs b/meli/src/conf/.rebuild.overrides.rs
similarity index 100%
rename from src/conf/.rebuild.overrides.rs
rename to meli/src/conf/.rebuild.overrides.rs
diff --git a/src/conf/accounts.rs b/meli/src/conf/accounts.rs
similarity index 100%
rename from src/conf/accounts.rs
rename to meli/src/conf/accounts.rs
diff --git a/src/conf/composing.rs b/meli/src/conf/composing.rs
similarity index 100%
rename from src/conf/composing.rs
rename to meli/src/conf/composing.rs
diff --git a/src/conf/listing.rs b/meli/src/conf/listing.rs
similarity index 100%
rename from src/conf/listing.rs
rename to meli/src/conf/listing.rs
diff --git a/src/conf/notifications.rs b/meli/src/conf/notifications.rs
similarity index 100%
rename from src/conf/notifications.rs
rename to meli/src/conf/notifications.rs
diff --git a/src/conf/overrides.rs b/meli/src/conf/overrides.rs
similarity index 100%
rename from src/conf/overrides.rs
rename to meli/src/conf/overrides.rs
diff --git a/src/conf/pager.rs b/meli/src/conf/pager.rs
similarity index 100%
rename from src/conf/pager.rs
rename to meli/src/conf/pager.rs
diff --git a/src/conf/pgp.rs b/meli/src/conf/pgp.rs
similarity index 100%
rename from src/conf/pgp.rs
rename to meli/src/conf/pgp.rs
diff --git a/src/conf/shortcuts.rs b/meli/src/conf/shortcuts.rs
similarity index 100%
rename from src/conf/shortcuts.rs
rename to meli/src/conf/shortcuts.rs
diff --git a/src/conf/tags.rs b/meli/src/conf/tags.rs
similarity index 100%
rename from src/conf/tags.rs
rename to meli/src/conf/tags.rs
diff --git a/src/conf/terminal.rs b/meli/src/conf/terminal.rs
similarity index 100%
rename from src/conf/terminal.rs
rename to meli/src/conf/terminal.rs
diff --git a/src/conf/themes.rs b/meli/src/conf/themes.rs
similarity index 100%
rename from src/conf/themes.rs
rename to meli/src/conf/themes.rs
diff --git a/src/jobs.rs b/meli/src/jobs.rs
similarity index 100%
rename from src/jobs.rs
rename to meli/src/jobs.rs
diff --git a/src/lib.rs b/meli/src/lib.rs
similarity index 100%
rename from src/lib.rs
rename to meli/src/lib.rs
diff --git a/src/mailcap.rs b/meli/src/mailcap.rs
similarity index 100%
rename from src/mailcap.rs
rename to meli/src/mailcap.rs
diff --git a/src/main.rs b/meli/src/main.rs
similarity index 100%
rename from src/main.rs
rename to meli/src/main.rs
diff --git a/src/managesieve.rs b/meli/src/managesieve.rs
similarity index 100%
rename from src/managesieve.rs
rename to meli/src/managesieve.rs
diff --git a/src/plugins.rs b/meli/src/plugins.rs
similarity index 100%
rename from src/plugins.rs
rename to meli/src/plugins.rs
diff --git a/src/plugins/backend.rs b/meli/src/plugins/backend.rs
similarity index 100%
rename from src/plugins/backend.rs
rename to meli/src/plugins/backend.rs
diff --git a/src/plugins/python3/ansi-plugin.py b/meli/src/plugins/python3/ansi-plugin.py
similarity index 100%
rename from src/plugins/python3/ansi-plugin.py
rename to meli/src/plugins/python3/ansi-plugin.py
diff --git a/src/plugins/python3/libmeliapi.py b/meli/src/plugins/python3/libmeliapi.py
similarity index 100%
rename from src/plugins/python3/libmeliapi.py
rename to meli/src/plugins/python3/libmeliapi.py
diff --git a/src/plugins/python3/nntp-backend.py b/meli/src/plugins/python3/nntp-backend.py
similarity index 100%
rename from src/plugins/python3/nntp-backend.py
rename to meli/src/plugins/python3/nntp-backend.py
diff --git a/src/plugins/rpc.rs b/meli/src/plugins/rpc.rs
similarity index 100%
rename from src/plugins/rpc.rs
rename to meli/src/plugins/rpc.rs
diff --git a/src/sqlite3.rs b/meli/src/sqlite3.rs
similarity index 100%
rename from src/sqlite3.rs
rename to meli/src/sqlite3.rs
diff --git a/src/state.rs b/meli/src/state.rs
similarity index 100%
rename from src/state.rs
rename to meli/src/state.rs
diff --git a/src/subcommands.rs b/meli/src/subcommands.rs
similarity index 100%
rename from src/subcommands.rs
rename to meli/src/subcommands.rs
diff --git a/src/terminal.rs b/meli/src/terminal.rs
similarity index 100%
rename from src/terminal.rs
rename to meli/src/terminal.rs
diff --git a/src/terminal/cells.rs b/meli/src/terminal/cells.rs
similarity index 100%
rename from src/terminal/cells.rs
rename to meli/src/terminal/cells.rs
diff --git a/src/terminal/color.rs b/meli/src/terminal/color.rs
similarity index 100%
rename from src/terminal/color.rs
rename to meli/src/terminal/color.rs
diff --git a/src/terminal/embed.rs b/meli/src/terminal/embed.rs
similarity index 100%
rename from src/terminal/embed.rs
rename to meli/src/terminal/embed.rs
diff --git a/src/terminal/embed/grid.rs b/meli/src/terminal/embed/grid.rs
similarity index 100%
rename from src/terminal/embed/grid.rs
rename to meli/src/terminal/embed/grid.rs
diff --git a/src/terminal/keys.rs b/meli/src/terminal/keys.rs
similarity index 100%
rename from src/terminal/keys.rs
rename to meli/src/terminal/keys.rs
diff --git a/src/terminal/position.rs b/meli/src/terminal/position.rs
similarity index 100%
rename from src/terminal/position.rs
rename to meli/src/terminal/position.rs
diff --git a/src/terminal/text_editing.rs b/meli/src/terminal/text_editing.rs
similarity index 100%
rename from src/terminal/text_editing.rs
rename to meli/src/terminal/text_editing.rs
diff --git a/src/types.rs b/meli/src/types.rs
similarity index 100%
rename from src/types.rs
rename to meli/src/types.rs
diff --git a/src/types/helpers.rs b/meli/src/types/helpers.rs
similarity index 100%
rename from src/types/helpers.rs
rename to meli/src/types/helpers.rs
diff --git a/melib/Cargo.toml b/melib/Cargo.toml
index 3d163dee..2d5aa225 100644
--- a/melib/Cargo.toml
+++ b/melib/Cargo.toml
@@ -1,8 +1,7 @@
 [package]
 name = "melib"
-version = "0.7.2"
-authors = ["Manos Pitsidianakis <epilys@nessuent.xyz>"]
-workspace = ".."
+version = "0.8.0"
+authors = ["Manos Pitsidianakis <manos@pitsidianak.is>"]
 edition = "2018"
 build = "build.rs"
 rust-version = "1.65.0"
diff --git a/melib/src/utils/logging.rs b/melib/src/utils/logging.rs
index 4a6b0448..98238d1e 100644
--- a/melib/src/utils/logging.rs
+++ b/melib/src/utils/logging.rs
@@ -180,9 +180,6 @@ impl StderrLogger {
                 level: Arc::new(AtomicU8::new(level as u8)),
                 print_level: true,
                 print_module_names: true,
-                #[cfg(feature = "debug-tracing")]
-                debug_dest: Destination::Stderr,
-                #[cfg(not(feature = "debug-tracing"))]
                 debug_dest: Destination::None,
             }
         };
diff --git a/tests/PATCH-Put-sha1dc-on-a-diet.mbox.gz b/melib/tests/PATCH-Put-sha1dc-on-a-diet.mbox.gz
similarity index 100%
rename from tests/PATCH-Put-sha1dc-on-a-diet.mbox.gz
rename to melib/tests/PATCH-Put-sha1dc-on-a-diet.mbox.gz
diff --git a/tests/PATCH-Put-sha1dc-on-a-diet_op.mbox.gz b/melib/tests/PATCH-Put-sha1dc-on-a-diet_op.mbox.gz
similarity index 100%
rename from tests/PATCH-Put-sha1dc-on-a-diet_op.mbox.gz
rename to melib/tests/PATCH-Put-sha1dc-on-a-diet_op.mbox.gz
diff --git a/tests/generated_email.eml.gz b/melib/tests/generated_email.eml.gz
similarity index 100%
rename from tests/generated_email.eml.gz
rename to melib/tests/generated_email.eml.gz
diff --git a/tests/generating_email.rs b/melib/tests/generating_email.rs
similarity index 100%
rename from tests/generating_email.rs
rename to melib/tests/generating_email.rs
diff --git a/tests/git-am-breakage-with-MIME-decoding.mbox.gz b/melib/tests/git-am-breakage-with-MIME-decoding.mbox.gz
similarity index 100%
rename from tests/git-am-breakage-with-MIME-decoding.mbox.gz
rename to melib/tests/git-am-breakage-with-MIME-decoding.mbox.gz
diff --git a/tests/git-am-breakage-with-MIME-decoding_op.mbox.gz b/melib/tests/git-am-breakage-with-MIME-decoding_op.mbox.gz
similarity index 100%
rename from tests/git-am-breakage-with-MIME-decoding_op.mbox.gz
rename to melib/tests/git-am-breakage-with-MIME-decoding_op.mbox.gz
diff --git a/tests/mbox_parse.rs b/melib/tests/mbox_parse.rs
similarity index 100%
rename from tests/mbox_parse.rs
rename to melib/tests/mbox_parse.rs
diff --git a/tests/test_image.gif b/melib/tests/test_image.gif
similarity index 100%
rename from tests/test_image.gif
rename to melib/tests/test_image.gif
diff --git a/scripts/pre-release-checks.sh b/scripts/pre-release-checks.sh
new file mode 100755
index 00000000..2191476d
--- /dev/null
+++ b/scripts/pre-release-checks.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+#
+# Copyright 2017 Manos Pitsidianakis
+# 
+# This file is part of meli.
+# 
+# meli is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# meli is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with meli. If not, see <http://www.gnu.org/licenses/>.
+
+set -euxo pipefail
+
+cargo check -p melib --all-features
+cargo clippy -p melib --all-features
+cargo test -p melib --all-features --all
+cargo publish -p melib --dry-run
+
+cargo check -p meli --all-features
+cargo clippy -p meli --all-features
+cargo test -p meli --all-features --all
+cargo publish -p meli --dry-run
diff --git a/tools/Cargo.toml b/tools/Cargo.toml
index d2f71252..d77b1782 100644
--- a/tools/Cargo.toml
+++ b/tools/Cargo.toml
@@ -2,7 +2,6 @@
 name = "tools"
 version = "0.4.1"
 authors = ["Manos Pitsidianakis <el13635@mail.ntua.gr>"]
-workspace = ".."
 edition = "2018"
 rust-version = "1.65.0"
 
@@ -11,6 +10,10 @@ homepage = "https://meli.delivery"
 repository = "https://git.meli.delivery/meli/meli.git"
 publish = false
 
+# Prevent this from interfering with workspaces
+[workspace]
+members = ["."]
+
 [[bin]]
 name = "emailparse"
 path = "src/email_parse.rs"
@@ -35,8 +38,8 @@ path = "src/embed.rs"
 
 [dependencies]
 crossbeam = { version = "^0.8" }
-meli = { path = "..", version = "*" }
-melib = { path = "../melib", version = "*", features = ["debug-tracing", "unicode_algorithms"] }
+meli = { version = "0.7" }
+melib = { version = "0.7", features = ["debug-tracing", "unicode_algorithms"] }
 nix = { version = "^0.24", default-features = false }
 signal-hook = { version = "^0.3", default-features = false }
 signal-hook-registry = { version = "1.2.0", default-features = false }