diff --git a/scie-grammar/src/grammar/grammar/mod.rs b/scie-grammar/src/grammar/grammar/mod.rs
index 3aa6eed44803f3ea9f95727ceb47110fabe22426..e660f2067913092c9a7b0074f1a3c54fce2d2001 100644
--- a/scie-grammar/src/grammar/grammar/mod.rs
+++ b/scie-grammar/src/grammar/grammar/mod.rs
@@ -2,12 +2,11 @@ use std::collections::BTreeMap as Map;
 
 use onig::*;
 
-use crate::grammar::grammar::stack_element::StackElement;
+use crate::grammar::line_tokens::{LineTokens, TokenTypeMatcher};
+use crate::grammar::{ScopeListElement, StackElement};
 use crate::inter::{IRawGrammar, IRawRepository, IRawRepositoryMap, IRawRule};
-use crate::rule::{IGrammarRegistry, IRuleFactoryHelper, IRuleRegistry, EmptyRule, AbstractRule};
+use crate::rule::{AbstractRule, EmptyRule, IGrammarRegistry, IRuleFactoryHelper, IRuleRegistry};
 use crate::rule::rule_factory::RuleFactory;
-use crate::grammar::line_tokens::{LineTokens, TokenTypeMatcher};
-use crate::grammar::grammar::scope_list_element::ScopeListElement;
 
 pub mod scope_list_element;
 pub mod scope_metadata;
@@ -251,7 +250,7 @@ mod tests {
     use std::io::{Read, Write};
     use std::path::Path;
 
-    use crate::grammar::grammar::Grammar;
+    use crate::grammar::Grammar;
     use crate::inter::IRawGrammar;
 
     #[test]
diff --git a/scie-grammar/src/grammar/grammar/stack_element.rs b/scie-grammar/src/grammar/grammar/stack_element.rs
index 29ff2a98aff1dbf051136734f712a1cd12404ee3..96c97e88c1145449aff5fc6075beaba654eab708 100644
--- a/scie-grammar/src/grammar/grammar/stack_element.rs
+++ b/scie-grammar/src/grammar/grammar/stack_element.rs
@@ -1,6 +1,5 @@
-use crate::grammar::grammar::scope_list_element::ScopeListElement;
 use core::ptr;
-use crate::grammar::grammar::Grammar;
+use crate::grammar::{Grammar, ScopeListElement};
 use crate::grammar::grammar_registry::GrammarRegistry;
 use crate::rule::{IRuleRegistry, AbstractRule};
 
diff --git a/scie-grammar/src/grammar/mod.rs b/scie-grammar/src/grammar/mod.rs
index 5bd58b3ed520b1ed86f7fa282d0078a143516e81..4d5af068c55bd944c1a6460915e41a048a270a3c 100644
--- a/scie-grammar/src/grammar/mod.rs
+++ b/scie-grammar/src/grammar/mod.rs
@@ -2,3 +2,8 @@ pub mod grammar;
 pub mod grammar_reader;
 pub mod line_tokens;
 pub mod grammar_registry;
+
+pub use self::grammar::Grammar;
+pub use self::grammar::stack_element::StackElement;
+pub use self::grammar::scope_list_element::ScopeListElement;
+pub use self::grammar::scope_metadata::ScopeMetadata;
diff --git a/scie-grammar/src/rule/rule_convert.rs b/scie-grammar/src/rule/rule_convert.rs
index ca0b1b52e10ad38434790837910c8953a8edc413..57f074e5aef0a9d6b97f3ccac7c2cd29772695b1 100644
--- a/scie-grammar/src/rule/rule_convert.rs
+++ b/scie-grammar/src/rule/rule_convert.rs
@@ -50,7 +50,7 @@ fn abstract_rule_to_json(map: Map<i32, Box<dyn AbstractRule>>) {
 
 #[cfg(test)]
 mod tests {
-    use crate::grammar::grammar::Grammar;
+    use crate::grammar::Grammar;
     use std::path::Path;
     use std::fs::File;
     use crate::inter::IRawGrammar;
diff --git a/scie-grammar/src/rule/rule_factory.rs b/scie-grammar/src/rule/rule_factory.rs
index 225ccceabb79777107cb7b7788aadf6cd71d8757..68943a40f6a3562805f436cc45d093258f42105e 100644
--- a/scie-grammar/src/rule/rule_factory.rs
+++ b/scie-grammar/src/rule/rule_factory.rs
@@ -1,4 +1,4 @@
-use crate::grammar::grammar::Grammar;
+use crate::grammar::Grammar;
 use crate::inter::{IRawCaptures, IRawRepository, IRawRule, ILocation};
 use crate::rule::{BeginEndRule, BeginWhileRule, CaptureRule, IRuleRegistry, IncludeOnlyRule, MatchRule, AbstractRule, Rule};