diff --git a/easy-rules-mvel/src/test/java/org/jeasy/rules/mvel/MVELJsonRuleFactoryTest.java b/easy-rules-mvel/src/test/java/org/jeasy/rules/mvel/MVELJsonRuleFactoryTest.java
index fc85c2b..e8c3e80 100644
--- a/easy-rules-mvel/src/test/java/org/jeasy/rules/mvel/MVELJsonRuleFactoryTest.java
+++ b/easy-rules-mvel/src/test/java/org/jeasy/rules/mvel/MVELJsonRuleFactoryTest.java
@@ -26,7 +26,7 @@ package org.jeasy.rules.mvel;
 import org.jeasy.rules.api.Rule;
 import org.jeasy.rules.api.Rules;
 import org.jeasy.rules.support.reader.JsonRuleDefinitionReader;
-import org.jeasy.rules.support.UnitRuleGroup;
+import org.jeasy.rules.support.composite.UnitRuleGroup;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
diff --git a/easy-rules-mvel/src/test/java/org/jeasy/rules/mvel/MVELYamlRuleFactoryTest.java b/easy-rules-mvel/src/test/java/org/jeasy/rules/mvel/MVELYamlRuleFactoryTest.java
index a863e4d..c7530b7 100644
--- a/easy-rules-mvel/src/test/java/org/jeasy/rules/mvel/MVELYamlRuleFactoryTest.java
+++ b/easy-rules-mvel/src/test/java/org/jeasy/rules/mvel/MVELYamlRuleFactoryTest.java
@@ -26,7 +26,7 @@ package org.jeasy.rules.mvel;
 import org.jeasy.rules.api.Rule;
 import org.jeasy.rules.api.Rules;
 import org.jeasy.rules.support.reader.YamlRuleDefinitionReader;
-import org.jeasy.rules.support.UnitRuleGroup;
+import org.jeasy.rules.support.composite.UnitRuleGroup;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
diff --git a/easy-rules-spel/src/test/java/org/jeasy/rules/spel/SpELJsonRuleFactoryTest.java b/easy-rules-spel/src/test/java/org/jeasy/rules/spel/SpELJsonRuleFactoryTest.java
index 51162c1..2ed05f5 100644
--- a/easy-rules-spel/src/test/java/org/jeasy/rules/spel/SpELJsonRuleFactoryTest.java
+++ b/easy-rules-spel/src/test/java/org/jeasy/rules/spel/SpELJsonRuleFactoryTest.java
@@ -26,7 +26,7 @@ package org.jeasy.rules.spel;
 import org.jeasy.rules.api.Rule;
 import org.jeasy.rules.api.Rules;
 import org.jeasy.rules.support.reader.JsonRuleDefinitionReader;
-import org.jeasy.rules.support.UnitRuleGroup;
+import org.jeasy.rules.support.composite.UnitRuleGroup;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
diff --git a/easy-rules-spel/src/test/java/org/jeasy/rules/spel/SpELYamlRuleFactoryTest.java b/easy-rules-spel/src/test/java/org/jeasy/rules/spel/SpELYamlRuleFactoryTest.java
index 77f1588..3f78f39 100644
--- a/easy-rules-spel/src/test/java/org/jeasy/rules/spel/SpELYamlRuleFactoryTest.java
+++ b/easy-rules-spel/src/test/java/org/jeasy/rules/spel/SpELYamlRuleFactoryTest.java
@@ -25,7 +25,7 @@ package org.jeasy.rules.spel;
 
 import org.jeasy.rules.api.Rule;
 import org.jeasy.rules.api.Rules;
-import org.jeasy.rules.support.UnitRuleGroup;
+import org.jeasy.rules.support.composite.UnitRuleGroup;
 import org.jeasy.rules.support.reader.YamlRuleDefinitionReader;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
diff --git a/easy-rules-support/src/main/java/org/jeasy/rules/support/AbstractRuleFactory.java b/easy-rules-support/src/main/java/org/jeasy/rules/support/AbstractRuleFactory.java
index e7be647..7d18a58 100644
--- a/easy-rules-support/src/main/java/org/jeasy/rules/support/AbstractRuleFactory.java
+++ b/easy-rules-support/src/main/java/org/jeasy/rules/support/AbstractRuleFactory.java
@@ -24,6 +24,10 @@
 package org.jeasy.rules.support;
 
 import org.jeasy.rules.api.Rule;
+import org.jeasy.rules.support.composite.ActivationRuleGroup;
+import org.jeasy.rules.support.composite.CompositeRule;
+import org.jeasy.rules.support.composite.ConditionalRuleGroup;
+import org.jeasy.rules.support.composite.UnitRuleGroup;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/easy-rules-support/src/main/java/org/jeasy/rules/support/ActivationRuleGroup.java b/easy-rules-support/src/main/java/org/jeasy/rules/support/composite/ActivationRuleGroup.java
similarity index 98%
rename from easy-rules-support/src/main/java/org/jeasy/rules/support/ActivationRuleGroup.java
rename to easy-rules-support/src/main/java/org/jeasy/rules/support/composite/ActivationRuleGroup.java
index ddb13fc..5586e42 100644
--- a/easy-rules-support/src/main/java/org/jeasy/rules/support/ActivationRuleGroup.java
+++ b/easy-rules-support/src/main/java/org/jeasy/rules/support/composite/ActivationRuleGroup.java
@@ -21,7 +21,7 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
-package org.jeasy.rules.support;
+package org.jeasy.rules.support.composite;
 
 import org.jeasy.rules.api.Facts;
 import org.jeasy.rules.api.Rule;
diff --git a/easy-rules-support/src/main/java/org/jeasy/rules/support/CompositeRule.java b/easy-rules-support/src/main/java/org/jeasy/rules/support/composite/CompositeRule.java
similarity index 98%
rename from easy-rules-support/src/main/java/org/jeasy/rules/support/CompositeRule.java
rename to easy-rules-support/src/main/java/org/jeasy/rules/support/composite/CompositeRule.java
index 0345134..ea1a2bf 100644
--- a/easy-rules-support/src/main/java/org/jeasy/rules/support/CompositeRule.java
+++ b/easy-rules-support/src/main/java/org/jeasy/rules/support/composite/CompositeRule.java
@@ -21,7 +21,7 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
-package org.jeasy.rules.support;
+package org.jeasy.rules.support.composite;
 
 import org.jeasy.rules.api.Facts;
 import org.jeasy.rules.api.Rule;
diff --git a/easy-rules-support/src/main/java/org/jeasy/rules/support/ConditionalRuleGroup.java b/easy-rules-support/src/main/java/org/jeasy/rules/support/composite/ConditionalRuleGroup.java
similarity index 99%
rename from easy-rules-support/src/main/java/org/jeasy/rules/support/ConditionalRuleGroup.java
rename to easy-rules-support/src/main/java/org/jeasy/rules/support/composite/ConditionalRuleGroup.java
index 1f30245..8ffcaa8 100644
--- a/easy-rules-support/src/main/java/org/jeasy/rules/support/ConditionalRuleGroup.java
+++ b/easy-rules-support/src/main/java/org/jeasy/rules/support/composite/ConditionalRuleGroup.java
@@ -21,7 +21,7 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
-package org.jeasy.rules.support;
+package org.jeasy.rules.support.composite;
 
 import org.jeasy.rules.api.Facts;
 import org.jeasy.rules.api.Rule;
diff --git a/easy-rules-support/src/main/java/org/jeasy/rules/support/UnitRuleGroup.java b/easy-rules-support/src/main/java/org/jeasy/rules/support/composite/UnitRuleGroup.java
similarity index 98%
rename from easy-rules-support/src/main/java/org/jeasy/rules/support/UnitRuleGroup.java
rename to easy-rules-support/src/main/java/org/jeasy/rules/support/composite/UnitRuleGroup.java
index 2c3431f..645b3e9 100644
--- a/easy-rules-support/src/main/java/org/jeasy/rules/support/UnitRuleGroup.java
+++ b/easy-rules-support/src/main/java/org/jeasy/rules/support/composite/UnitRuleGroup.java
@@ -21,7 +21,7 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
-package org.jeasy.rules.support;
+package org.jeasy.rules.support.composite;
 
 import org.jeasy.rules.api.Facts;
 import org.jeasy.rules.api.Rule;
diff --git a/easy-rules-support/src/test/java/org/jeasy/rules/support/ActivationRuleGroupTest.java b/easy-rules-support/src/test/java/org/jeasy/rules/support/composite/ActivationRuleGroupTest.java
similarity index 99%
rename from easy-rules-support/src/test/java/org/jeasy/rules/support/ActivationRuleGroupTest.java
rename to easy-rules-support/src/test/java/org/jeasy/rules/support/composite/ActivationRuleGroupTest.java
index 1fe124f..8a544e1 100644
--- a/easy-rules-support/src/test/java/org/jeasy/rules/support/ActivationRuleGroupTest.java
+++ b/easy-rules-support/src/test/java/org/jeasy/rules/support/composite/ActivationRuleGroupTest.java
@@ -21,7 +21,7 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
-package org.jeasy.rules.support;
+package org.jeasy.rules.support.composite;
 
 import org.jeasy.rules.annotation.Action;
 import org.jeasy.rules.annotation.Condition;
diff --git a/easy-rules-support/src/test/java/org/jeasy/rules/support/ConditionalRuleGroupTest.java b/easy-rules-support/src/test/java/org/jeasy/rules/support/composite/ConditionalRuleGroupTest.java
similarity index 99%
rename from easy-rules-support/src/test/java/org/jeasy/rules/support/ConditionalRuleGroupTest.java
rename to easy-rules-support/src/test/java/org/jeasy/rules/support/composite/ConditionalRuleGroupTest.java
index 73aa686..a87c971 100644
--- a/easy-rules-support/src/test/java/org/jeasy/rules/support/ConditionalRuleGroupTest.java
+++ b/easy-rules-support/src/test/java/org/jeasy/rules/support/composite/ConditionalRuleGroupTest.java
@@ -21,7 +21,7 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
-package org.jeasy.rules.support;
+package org.jeasy.rules.support.composite;
 
 import org.jeasy.rules.annotation.Action;
 import org.jeasy.rules.annotation.Condition;
diff --git a/easy-rules-support/src/test/java/org/jeasy/rules/support/UnitRuleGroupTest.java b/easy-rules-support/src/test/java/org/jeasy/rules/support/composite/UnitRuleGroupTest.java
similarity index 98%
rename from easy-rules-support/src/test/java/org/jeasy/rules/support/UnitRuleGroupTest.java
rename to easy-rules-support/src/test/java/org/jeasy/rules/support/composite/UnitRuleGroupTest.java
index 6e88135..f516302 100644
--- a/easy-rules-support/src/test/java/org/jeasy/rules/support/UnitRuleGroupTest.java
+++ b/easy-rules-support/src/test/java/org/jeasy/rules/support/composite/UnitRuleGroupTest.java
@@ -21,7 +21,7 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
-package org.jeasy.rules.support;
+package org.jeasy.rules.support.composite;
 
 import org.jeasy.rules.annotation.Action;
 import org.jeasy.rules.annotation.Condition;
@@ -51,7 +51,7 @@ public class UnitRuleGroupTest {
 
     private DefaultRulesEngine rulesEngine = new DefaultRulesEngine();
 
-    private org.jeasy.rules.support.UnitRuleGroup unitRuleGroup;
+    private UnitRuleGroup unitRuleGroup;
 
 
     @Before
diff --git a/easy-rules-tutorials/src/main/java/org/jeasy/rules/tutorials/fizzbuzz/FizzBuzzRule.java b/easy-rules-tutorials/src/main/java/org/jeasy/rules/tutorials/fizzbuzz/FizzBuzzRule.java
index bc107ff..89c981f 100644
--- a/easy-rules-tutorials/src/main/java/org/jeasy/rules/tutorials/fizzbuzz/FizzBuzzRule.java
+++ b/easy-rules-tutorials/src/main/java/org/jeasy/rules/tutorials/fizzbuzz/FizzBuzzRule.java
@@ -23,7 +23,7 @@
  */
 package org.jeasy.rules.tutorials.fizzbuzz;
 
-import org.jeasy.rules.support.UnitRuleGroup;
+import org.jeasy.rules.support.composite.UnitRuleGroup;
 
 public class FizzBuzzRule extends UnitRuleGroup {