diff --git a/README.md b/README.md
index 3ac496e..699b3f2 100644
--- a/README.md
+++ b/README.md
@@ -83,13 +83,14 @@ If you want to pass something 'as is' to the subprocesses, do not enable the `ch
 ## Optional features
 There are a few compile-time features that can be enabled/disabled for additional functionality.
 
-| Name           | Description                                            | Default |
-|----------------|--------------------------------------------------------|---------|
-| `splash`       | Show program information when printing help            | On      |
-| `colour`       | Enable colouring of certain outputs, like warnings     | On      |
-| `progress`     | Enable progress bar                                    | On      |
-| `threads`      | Enable threaded scheduler                              | Off     |
-| `checked_pass` | Check the arguments sent to leanify with `passthrough` | Off     |
+| Name           | Description                                                    | Default |
+|----------------|----------------------------------------------------------------|---------|
+| `splash`       | Show program information when printing help                    | On      |
+| `colour`       | Enable colouring of certain outputs, like warnings             | On      |
+| `progress`     | Enable progress bar                                            | On      |
+| `collect_err`  | Collect children's `stderr` instead of printing it immediately | On      |
+| `threads`      | Enable threaded scheduler                                      | Off     |
+| `checked_pass` | Check the arguments sent to leanify with `passthrough`         | Off     |
 
 When building with Rust nightly, some other optimisations and features will be present.
 
diff --git a/other/Leanify/Leanify-0.4.3.ebuild b/contrib/Leanify/Leanify-0.4.3.ebuild
similarity index 100%
rename from other/Leanify/Leanify-0.4.3.ebuild
rename to contrib/Leanify/Leanify-0.4.3.ebuild
diff --git a/other/Leanify/Manifest b/contrib/Leanify/Manifest
similarity index 100%
rename from other/Leanify/Manifest
rename to contrib/Leanify/Manifest
diff --git a/other/leanify-many/Manifest b/contrib/leanify-many/Manifest
similarity index 100%
rename from other/leanify-many/Manifest
rename to contrib/leanify-many/Manifest
diff --git a/other/leanify-many/leanify-many-1.0.0.ebuild b/contrib/leanify-many/leanify-many-1.0.0.ebuild
similarity index 99%
rename from other/leanify-many/leanify-many-1.0.0.ebuild
rename to contrib/leanify-many/leanify-many-1.0.0.ebuild
index 80528f2..4422073 100644
--- a/other/leanify-many/leanify-many-1.0.0.ebuild
+++ b/contrib/leanify-many/leanify-many-1.0.0.ebuild
@@ -78,7 +78,7 @@ SRC_URI="$(cargo_crate_uris ${CRATES} leanify-many-1.0.0)"
 RESTRICT="mirror"
 # License set may be more restrictive as OR is not respected
 # use cargo-license for a more accurate license picture
-LICENSE="GPL3+"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="+splash +progress +colour threads checked_pass"
diff --git a/other/leanify-many/leanify-many-1.0.1.ebuild b/contrib/leanify-many/leanify-many-1.0.1.ebuild
similarity index 99%
rename from other/leanify-many/leanify-many-1.0.1.ebuild
rename to contrib/leanify-many/leanify-many-1.0.1.ebuild
index 46f9394..49bcd39 100644
--- a/other/leanify-many/leanify-many-1.0.1.ebuild
+++ b/contrib/leanify-many/leanify-many-1.0.1.ebuild
@@ -78,7 +78,7 @@ SRC_URI="$(cargo_crate_uris ${CRATES} leanify-many-1.0.1)"
 RESTRICT="mirror"
 # License set may be more restrictive as OR is not respected
 # use cargo-license for a more accurate license picture
-LICENSE="GPL3+"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="+splash +progress +colour threads checked_pass"
diff --git a/other/leanify-many/leanify-many-1.1.0.ebuild b/contrib/leanify-many/leanify-many-1.1.0.ebuild
similarity index 99%
rename from other/leanify-many/leanify-many-1.1.0.ebuild
rename to contrib/leanify-many/leanify-many-1.1.0.ebuild
index 9d5d931..9ecb81c 100644
--- a/other/leanify-many/leanify-many-1.1.0.ebuild
+++ b/contrib/leanify-many/leanify-many-1.1.0.ebuild
@@ -78,7 +78,7 @@ SRC_URI="$(cargo_crate_uris ${CRATES} leanify-many-1.1.0)"
 RESTRICT="mirror"
 # License set may be more restrictive as OR is not respected
 # use cargo-license for a more accurate license picture
-LICENSE="GPL3+"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="+splash +progress +colour threads checked_pass +collect_err"
diff --git a/other/leanify-many/metadata.xml b/contrib/leanify-many/metadata.xml
similarity index 100%
rename from other/leanify-many/metadata.xml
rename to contrib/leanify-many/metadata.xml