1 files changed, 18 insertions, 10 deletions
diff --git a/mingling/src/lib.rs b/mingling/src/lib.rs
index 718d282..5cd53db 100644
--- a/mingling/src/lib.rs
+++ b/mingling/src/lib.rs
@@ -16,12 +16,13 @@ pub mod parser;
 
 /// `Mingling` argument parser (Picker2)
 #[cfg(feature = "picker")]
-pub mod picker {
-    pub use arg_picker::*;
+pub mod picker;
 
-    pub mod parselib {
-        pub use arg_picker::parselib::*;
-    }
+mod constants;
+
+/// Constants used throughout the Mingling framework.
+pub mod consts {
+    pub use crate::constants::*;
 }
 
 /// Re-export of all macros from `mingling_macros`.
@@ -105,6 +106,10 @@ pub mod macros {
     /// `route! { /* ... */ }` - Used to generate a route that either returns a successful result or early returns an error.
     #[cfg(feature = "extra_macros")]
     pub use mingling_macros::route;
+    /// `#[routeify]` - An extension attribute macro that transforms `expr?` into `route!(expr)`.
+    /// Can be used standalone or as a chain/renderer extension: `#[chain(routeify, ...)]`.
+    #[cfg(feature = "extra_macros")]
+    pub use mingling_macros::routeify;
     /// `suggest! { "hello", "bye" }` - Used to generate suggestions
     #[cfg(feature = "comp")]
     pub use mingling_macros::suggest;
@@ -117,9 +122,9 @@ pub mod macros {
 #[cfg(feature = "macros")]
 pub use mingling_macros::EnumTag;
 
-/// derive macro Groupped
+/// derive macro Grouped
 #[cfg(feature = "macros")]
-pub use mingling_macros::Groupped;
+pub use mingling_macros::Grouped;
 
 /// derive macro `StructuralData` — marks a type as supporting structured output
 #[cfg(feature = "structural_renderer")]
@@ -170,9 +175,9 @@ pub mod res;
 /// use mingling::prelude::*;
 /// ```
 pub mod prelude {
-    /// Re-export of the `Groupped` derive macro for grouping types.
+    /// Re-export of the `Grouped` derive macro for grouping types.
     #[cfg(feature = "core")]
-    pub use crate::Groupped;
+    pub use crate::Grouped;
     /// Re-export of the `RenderResult` struct for outputting rendering result
     #[cfg(feature = "core")]
     pub use crate::RenderResult;
@@ -217,7 +222,10 @@ pub mod prelude {
     pub use crate::parser::AsPicker;
 
     #[cfg(feature = "picker")]
-    pub use arg_picker::prelude::*;
+    pub use arg_picker::prelude::arg;
+
+    #[cfg(feature = "picker")]
+    pub use crate::picker::EntryPicker;
 
     /// Used to enable the `writeln!` macro for `RenderResult`
     #[cfg(feature = "core")]